From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播
---
src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java | 101 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 92 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
index 96b575a..0d343ff 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -2,7 +2,9 @@
import java.io.PrintWriter;
import java.lang.reflect.Type;
+import java.math.BigDecimal;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -12,24 +14,26 @@
import com.google.gson.GsonBuilder;
import com.google.gson.annotations.Expose;
import com.google.gson.reflect.TypeToken;
-import com.yeshi.buwan.domain.Config;
-import com.yeshi.buwan.domain.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.recommend.FloatAD;
import com.yeshi.buwan.dto.config.ADShieldIPConfig;
+import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.log.LogHelper;
import com.yeshi.buwan.service.imp.SystemService;
import com.yeshi.buwan.service.inter.ad.FloatADService;
+import com.yeshi.buwan.service.inter.system.SystemConfigService;
import com.yeshi.buwan.service.manager.IPManager;
import com.yeshi.buwan.util.IPUtil;
import com.yeshi.buwan.util.StringUtil;
+import com.yeshi.buwan.util.log.LoggerUtil;
+import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.vo.AcceptData;
-import net.sf.json.JSONArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import com.google.gson.Gson;
-import com.yeshi.buwan.service.imp.ConfigService;
+import com.yeshi.buwan.service.imp.DetailSystemConfigService;
import com.yeshi.buwan.util.JsonUtil;
import net.sf.json.JSONObject;
@@ -37,9 +41,10 @@
@Controller
public class ConfigParser {
+
Logger logger = LoggerFactory.getLogger(ConfigParser.class);
@Resource
- private ConfigService configService;
+ private DetailSystemConfigService configService;
@Resource
private SystemService systemService;
@@ -49,19 +54,50 @@
@Resource
private IPManager ipManager;
+ @Resource
+ private SystemConfigService systemConfigService;
+
+
public ADConfig getAdShowType(String key, String channel, int version, Map<String, String> map) {
String splash = map.get(key);
JSONObject jsonObject = JSONObject.fromObject(splash);
+ if (jsonObject == null || jsonObject.isEmpty())
+ return null;
ADConfig adConfig = null;
channel = channel.toLowerCase();
- if (jsonObject.optJSONObject(channel) == null) {
+ if (jsonObject == null || jsonObject.optJSONObject(channel) == null) {
// 榛樿涓哄簲鐢ㄥ疂
channel = "qq";
}
- adConfig = new Gson().fromJson(jsonObject.optJSONObject(channel).toString(), ADConfig.class);
+ JSONObject channelAd = jsonObject.optJSONObject(channel);
+ adConfig = new Gson().fromJson(channelAd.toString(), ADConfig.class);
if (version >= adConfig.getVersion()) {
adConfig = null;
}
+ //鏍煎紡濡備笅:
+ //{"typeProperties":{"csj":{"weight":1,"pid":"123123"},"gdt":{"weight":1,"pid":"123123"}}}
+ if (adConfig != null && channelAd.optJSONObject("typeProbability") != null) {
+ JSONObject properties = channelAd.optJSONObject("typeProbability");
+
+ BigDecimal total = new BigDecimal(0);
+ for (Iterator<String> its = properties.keys(); its.hasNext(); ) {
+ String k = its.next();
+ total = total.add(new BigDecimal(properties.optJSONObject(k).optString("weight")));
+ }
+ BigDecimal random = total.multiply(new BigDecimal(Math.random()));
+ total = new BigDecimal(0);
+ for (Iterator<String> its = properties.keys(); its.hasNext(); ) {
+ String k = its.next();
+ total = total.add(new BigDecimal(properties.optJSONObject(k).optString("weight")));
+ if (random.compareTo(total) < 0) {
+ adConfig.setPid(properties.optJSONObject(k).optString("pid"));
+ adConfig.setType(k);
+ break;
+ }
+ }
+
+ }
+
return adConfig;
}
@@ -122,8 +158,9 @@
}
public void getConfig(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createAppSplash(new BaseLog(acceptData, "")));
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
+ Map<String, String> map = configService.getConfigAsMap(acceptData.getChildDetailSystem(), acceptData.getVersion());
JSONObject data = new JSONObject();
JSONObject ad = new JSONObject();
JSONObject adNew = new JSONObject();
@@ -204,8 +241,52 @@
ad.put("videoSearch", adConfig == null ? "" : adConfig.getType());
adNew.put("videoSearch", gson.toJson(adConfig));
+ //pptv鍏嶅箍鍛婃縺鍔辫棰�
+ adConfig = getAdShowType("pptv_no_ad_reward", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hiddenAll)
+ adConfig = null;
+ adNew.put("pptvNoAdReward", gson.toJson(adConfig));
+
+ //鐑惎鍔ㄥ紑灞�
+ adConfig = getAdShowType("ad_splash_hot_start", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hiddenAll)
+ adConfig = null;
+ adNew.put("splashHotStart", gson.toJson(adConfig));
+
+ //鍏朵粬骞垮憡
+ adConfig = getAdShowType("ad_other", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hiddenAll)
+ adConfig = null;
+ adNew.put("other", gson.toJson(adConfig));
+
+ //骞垮憡ID
+ if (!StringUtil.isNullOrEmpty(map.get("gdt_app_id"))) {
+ adNew.put("gdtAppId", map.get("gdt_app_id"));
+ }
+
+ if (!StringUtil.isNullOrEmpty(map.get("csj_app_id"))) {
+ adNew.put("csjAppId", map.get("csj_app_id"));
+ }
+
data.put("ad", ad);
data.put("adNew", adNew);
+ //PPTV鍏嶅箍鍛婃潈鐩婃椂闀�,鏆傛椂璁剧疆涓�3灏忔椂
+ data.put("pptvNoAdRewardHour", 3);
+ //璁剧疆缃戦〉鍔犻�熷煙鍚�
+ data.put("webSpeedUpHost", map.get("web_speed_up_host"));
+ //鎴戠殑椤甸潰banner
+ data.put("minePageBanner", map.get("mine_page_banner"));
+ //鎾斁椤靛璺冲崗璁櫧鍚嶅崟
+ data.put("jumpAppProtocolPrefix", map.get("player_out_jump_protocol_prefix"));
+ //鑾峰彇璐拱璁板綍閾炬帴
+ data.put("buyRecordUrl", systemConfigService.getConfigValueByKeyCache("buyRecordUrl"));
+
+ //鑱旂郴鎴戜滑
+ data.put("contactUsLink", map.get("contact_us_link"));
+ //娉ㄩ攢
+ data.put("unRegisterLink", map.get("unregister_link"));
+
+
out.print(JsonUtil.loadTrueJson(data.toString()));
}
@@ -218,7 +299,7 @@
* @param out
*/
public void getHomeConfig(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
- DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+ LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createAppMainPage(new BaseLog(acceptData, "")));
List<FloatAD> adList = floatADService.listShowAD(1, 1);
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
JSONObject data = new JSONObject();
@@ -260,6 +341,8 @@
public void setPid(String pid) {
this.pid = pid;
}
+
+
}
}
--
Gitblit v1.8.0