From 2a593ddac16e06f1ff55edca22ea568f07b068ba Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 四月 2021 19:15:18 +0800
Subject: [PATCH] 3.9.0bug修改
---
src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 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 3e5e306..6b5a106 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -12,24 +12,25 @@
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.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 +38,10 @@
@Controller
public class ConfigParser {
+
Logger logger = LoggerFactory.getLogger(ConfigParser.class);
@Resource
- private ConfigService configService;
+ private DetailSystemConfigService configService;
@Resource
private SystemService systemService;
@@ -49,12 +51,15 @@
@Resource
private IPManager ipManager;
+
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";
}
@@ -122,6 +127,7 @@
}
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());
JSONObject data = new JSONObject();
@@ -129,7 +135,9 @@
JSONObject adNew = new JSONObject();
String ip = IPUtil.getRemotIP(request);
-
+ //浼氬憳閾炬帴
+ String vipLink = map.get("vip_link");
+ data.put("vipLink", vipLink);
ADConfig splashConfig = getAdShowType("ad_splash_config", acceptData.getChannel(), acceptData.getVersion(), map);
@@ -202,8 +210,27 @@
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));
+
+
data.put("ad", ad);
data.put("adNew", adNew);
+ //PPTV鍏嶅箍鍛婃潈鐩婃椂闀�,鏆傛椂璁剧疆涓�3灏忔椂
+ data.put("pptvNoAdRewardHour", 3);
+ //璁剧疆缃戦〉鍔犻�熷煙鍚�
+ data.put("webSpeedUpHost", map.get("web_speed_up_host"));
+ data.put("minePageBanner", map.get("mine_page_banner"));
+
out.print(JsonUtil.loadTrueJson(data.toString()));
}
@@ -216,7 +243,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();
--
Gitblit v1.8.0