From 010ef2a907e66efd4702443c06cdd18f8a7ffa5b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 30 十月 2024 14:08:53 +0800
Subject: [PATCH] IP归属地查询接口集成

---
 src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
index ad803d4..e04d4f7 100644
--- a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
+++ b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java
@@ -307,12 +307,13 @@
     private VideoResourceUtil videoResourceUtil;
 
 
-    @Cacheable(value = "homeCache", key = "'getPlayUrl'+'-'+#detailSystemId+'-'+#id+'-'+#type+'-'+#resourceid")
+    @Cacheable(value = "homeCache", key = "'getPlayUrl'+'-'+#acceptData.version+'-'+#detailSystemId+'-'+#id+'-'+#type+'-'+#resourceid")
     public PlayUrl getPlayUrl(AcceptData acceptData, String detailSystemId, String id, String type, int resourceid, String videoid) throws VideoPlayException {
         playLogger.info(VideoLogFactory.createPlayUrlLog(detailSystemId, id, type, resourceid, videoid));
         //鍒ゆ柇resourceId鏄惁鍦ㄥ厑璁告挱鏀剧殑鏉ユ簮鍒楄〃涓�
 
         List<Long> resourceIds = videoResourceUtil.getAvailablePlayResourceIds(new DetailSystem(detailSystemId), acceptData.getVersion(), acceptData.getChannel());
+
         if (resourceIds == null || !resourceIds.contains(Long.parseLong(resourceid + ""))) {
             throw new VideoPlayException(1, "鎸囧畾鎾斁婧愭棤娉曟挱鏀�");
         }
@@ -342,7 +343,7 @@
                 playUrl = funTV2Service.getPlayUrl(acceptData, detailSystemId, resourceid, id, videoid);
                 break;
             case FunTVUtil.RESOURCE_ID:
-                playUrl = funTVService.getPlayUrl(detailSystemId, id, type, resourceid, videoid);
+                playUrl = funTVService.getPlayUrl(detailSystemId, id, type, resourceid, videoid, acceptData.getChannel(), acceptData.getVersion());
                 break;
             case SoHuUtil.RESOURCE_ID:
                 playUrl = soHuUtil.getPlayUrl(detailSystemId, resourceid + "", type, id);

--
Gitblit v1.8.0