From cba071db4529097598095e2971949dfd109f12b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 十月 2020 16:49:25 +0800
Subject: [PATCH] 图片显示403问题解决

---
 src/main/java/com/yeshi/buwan/controller/parser/UserParser.java |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 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 5f52c26..f3446a4 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -11,6 +11,7 @@
 import com.yeshi.buwan.util.video.VideoCategoryConstant;
 import com.yeshi.buwan.util.video.VideoConstant;
 import com.yeshi.buwan.vo.AcceptData;
+import com.yeshi.buwan.vo.video.VideoListResultVO;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.springframework.stereotype.Controller;
@@ -143,7 +144,8 @@
             }
 
 
-            String type = configParser.getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map);
+            ConfigParser.ADConfig adConfig = configParser.getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map);
+            String type = adConfig == null ? "" : adConfig.getType();
 
             if (!StringUtil.isNullOrEmpty(type)) {// 鏄惁灞忚斀璇︽儏椤靛叏灞忓箍鍛�
                 JSONObject adType = JSONObject.fromObject(map.get("ad_type"));
@@ -326,8 +328,6 @@
 
     // 鎼滅储
     public void searchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
-
-
         //type: 0-鍏ㄩ儴  1-
         String key = request.getParameter("Key");
         String type = request.getParameter("Type");
@@ -342,7 +342,6 @@
             out.print(JsonUtil.loadFalseJson("璇蜂笂浼燭ype"));
             return;
         }
-
 
         int pageIndex = StringUtil.getPage(page);
         if (pageIndex <= 0) {
@@ -366,26 +365,26 @@
                     cacheMD5 += "#" + l;
             cacheMD5 = StringUtil.Md5(cacheMD5);
 
-            List<VideoInfo> list = searchService.searchNew(detailSystem.getId(), request.getRemoteAddr(),
+            VideoListResultVO videoListResultVO = searchService.searchNew(detailSystem.getId(), request.getRemoteAddr(),
                     acceptData.getUid(), key, pageIndex, Integer.parseInt(type),
                     acceptData.getSystem(), resourceList, cacheMD5);
             //缁勭粐鏁版嵁
-            for (VideoInfo video : list) {
+            for (VideoInfo video : videoListResultVO.getVideoList()) {
                 //濡傛灉鏄鐗囷紝涓斾负5澶у垎绫� 灏遍噰鐢ㄧ珫鏉″睍绀�
                 if (video.getShowType() == 1) {
                     video.setVideoDetailList(createSearchVideoDetailsVO(video));
                 }
             }
             cacheMD5 = "0";
-            if (list != null) {
-                for (VideoInfo info : list) {
+            if (videoListResultVO.getVideoList() != null) {
+                for (VideoInfo info : videoListResultVO.getVideoList()) {
                     cacheMD5 += info.getId() + "#";
                 }
             }
-            list = banQuanService.getBanQuanVideo(list, detailSystem.getId(), cacheMD5);
+            List<VideoInfo> list = banQuanService.getBanQuanVideo(videoListResultVO.getVideoList(), detailSystem.getId(), cacheMD5);
 
             JSONObject object = new JSONObject();
-            object.put("count", Constant.isUpdate ? 19 + "" : list.size());
+            object.put("count", Constant.isUpdate ? 19 + "" : videoListResultVO.getCount());
             JSONArray array = new JSONArray();
             for (int i = 0; i < list.size(); i++) {
                 if (JuheVideoUtil.isNeedDelete((VideoInfo) list.get(i), detailSystem.getId())) {

--
Gitblit v1.8.0