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/UserParser.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
index 7a6b741..5f52c26 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -45,9 +45,10 @@
     private BanQuanService banQuanService;
     @Resource
     private VideoInfoService videoInfoService;
-
     @Resource
     private SolrAlbumDataManager solrDataManager;
+    @Resource
+    private ConfigParser configParser;
 
     public void getUid(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
         DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
@@ -64,7 +65,7 @@
             object.put("Uid", uid);
             object.put("Portrait", userInfo.getPortrait());
             object.put("Nickname", userInfo.getNickname());
-            object.put("TopIcon", map.get("top_icon"));
+
             object.put("ZiXun", map.get("zixun_url"));
             if (acceptData.getPlatform().equalsIgnoreCase("ios") && !"涓浗".equalsIgnoreCase(userInfo.getCountry()))// 姝e湪瀹℃牳鐨勭増鏈�
                 object.put("CommentUrl", "");
@@ -85,7 +86,14 @@
             object.put("WXShareIcon", map.get("wx_share_icon"));
             object.put("WXShareUrl", map.get("wx_share_url"));
             object.put("WXShareContent", map.get("wx_share_content"));
-            object.put("TuiGuang", map.get("taobao_tuiguang"));
+
+            if ("qq".equalsIgnoreCase(acceptData.getChannel())) {
+                object.put("TopIcon", "");
+                object.put("TuiGuang", "");
+            } else {
+                object.put("TuiGuang", map.get("taobao_tuiguang"));
+                object.put("TopIcon", map.get("top_icon"));
+            }
             object.put("SOHU_partner", detailSystem.getSohuPartner());
             object.put("SOHU_key", detailSystem.getSohuKey());
 
@@ -134,7 +142,14 @@
                 fullVideoVersion = json.optInt(acceptData.getChannel().toLowerCase(), 0);
             }
 
-            if (acceptData.getVersion() >= fullVideoVersion) {// 鏄惁灞忚斀璇︽儏椤靛叏灞忓箍鍛�
+
+            String type = configParser.getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map);
+
+            if (!StringUtil.isNullOrEmpty(type)) {// 鏄惁灞忚斀璇︽儏椤靛叏灞忓箍鍛�
+                JSONObject adType = JSONObject.fromObject(map.get("ad_type"));
+                adType.put("videoDetailSplashAd", true);
+                object.put("adType", adType.toString());
+            } else {
                 JSONObject adType = JSONObject.fromObject(map.get("ad_type"));
                 adType.put("videoDetailSplashAd", false);
                 object.put("adType", adType.toString());
@@ -911,7 +926,7 @@
         }
 
         if (!verifyCode.equalsIgnoreCase(request.getSession().getAttribute(email) + "")) {
-            out.print(JsonUtil.loadTrueJson("楠岃瘉鐮侀敊璇�"));
+            out.print(JsonUtil.loadFalseJson("楠岃瘉鐮侀敊璇�"));
             return;
         }
 

--
Gitblit v1.8.0