From 81db7b3b070c003e6f5f0d1c757ab30b6f42c944 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 10 十月 2020 18:49:41 +0800
Subject: [PATCH] 百度内容联盟

---
 src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 6d0fc91..c47cf4d 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -7,10 +7,13 @@
 import javax.servlet.http.HttpServletRequest;
 
 import com.yeshi.buwan.domain.DetailSystem;
+import com.yeshi.buwan.log.LogHelper;
 import com.yeshi.buwan.service.imp.SystemService;
 import com.yeshi.buwan.util.IPUtil;
 import com.yeshi.buwan.util.StringUtil;
 import com.yeshi.buwan.vo.AcceptData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 
 import com.google.gson.Gson;
@@ -21,12 +24,14 @@
 
 @Controller
 public class ConfigParser {
+
+    Logger logger = LoggerFactory.getLogger(ConfigParser.class);
     @Resource
     private ConfigService configService;
     @Resource
     private SystemService systemService;
 
-    private String getAdShowType(String key, String channel, int version, Map<String, String> map) {
+    public String getAdShowType(String key, String channel, int version, Map<String, String> map) {
         String splash = map.get(key);
         JSONObject jsonObject = JSONObject.fromObject(splash);
         ADConfig splashAD = null;
@@ -58,14 +63,16 @@
 
         //寮�灞忕殑鍦板尯灞忚斀瑙勫垯
         String shieldProvince = map.get("shield_province");
-        if(!StringUtil.isNullOrEmpty(shieldProvince)) {
+        if (!StringUtil.isNullOrEmpty(shieldProvince)) {
             JSONObject json = JSONObject.fromObject(shieldProvince);
             //鑾峰彇娓犻亾闇�瑕佸睆钄界殑鍩庡競
             String province = json.optString(acceptData.getChannel().toLowerCase());
             if (!StringUtil.isNullOrEmpty(splash) && !StringUtil.isNullOrEmpty(province)) {
                 String pro = IPUtil.getIPProvince(ip);
+                LogHelper.print("鍩庡競灞忚斀锛�" + ip + ":" + pro);
                 if (pro != null && pro.contains(province)) {//灞忚斀IP
                     splash = "";
+                    LogHelper.print("鍩庡競灞忚斀:" + pro);
                 }
             }
         }
@@ -78,6 +85,8 @@
         ad.put("videoPlayPre", getAdShowType("ad_play_video_pre", acceptData.getChannel(), acceptData.getVersion(), map));
         //APP閫�鍑�
         ad.put("exitApp", getAdShowType("ad_exit_app", acceptData.getChannel(), acceptData.getVersion(), map));
+        //鍏ㄥ睆骞垮憡鎺у埗
+        ad.put("videoDetailFullVideo", getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map));
 
         data.put("ad", ad);
         out.print(JsonUtil.loadTrueJson(data.toString()));

--
Gitblit v1.8.0