From 7def9937241d8c5fada7a63c8a0fd144bf0c05ff Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 三月 2021 19:32:21 +0800
Subject: [PATCH] IOS上线版本资源隐藏

---
 src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 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 36d846f..427168a 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -15,12 +15,15 @@
 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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +38,7 @@
 @Controller
 public class ConfigParser {
 
+
     Logger logger = LoggerFactory.getLogger(ConfigParser.class);
     @Resource
     private DetailSystemConfigService configService;
@@ -47,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";
         }
@@ -120,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();
@@ -213,9 +221,7 @@
         //PPTV鍏嶅箍鍛婃潈鐩婃椂闀�,鏆傛椂璁剧疆涓�3灏忔椂
         data.put("pptvNoAdRewardHour", 3);
         //璁剧疆缃戦〉鍔犻�熷煙鍚�
-        data.put("webSpeedUpHost",map.get("web_speed_up_host"));
-
-
+        data.put("webSpeedUpHost", map.get("web_speed_up_host"));
 
 
         out.print(JsonUtil.loadTrueJson(data.toString()));
@@ -230,7 +236,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