Merge branch 'hotfix/1007512' into 'release'

hotfix:[1007512] 修复斗罗首页缓存

See merge request rays/pcloud-book!1620

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.qrcode.QrCodeException;
 import cn.hutool.extra.qrcode.QrCodeUtil;
@@ -208,23 +209,8 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.cron.pattern.CronPatternUtil;
-import cn.hutool.extra.qrcode.QrCodeException;
-import cn.hutool.extra.qrcode.QrCodeUtil;
-import cn.hutool.http.HttpUtil;
-import lombok.extern.slf4j.Slf4j;
-
 import static com.pcloud.book.group.constant.ResourcePageConstants.DL_BOOK_SERVES_CACHE;
 
 /**
@@ -4550,7 +4536,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
 
     @Override
     public List<ResourcePageItemVO> getServerList4Wechat(Long wechatUserId, Long sceneId) {
-        List<ResourcePageItemVO>  itemVOList = JedisClusterUtils.getJsonList(DL_BOOK_SERVES_CACHE +  sceneId, ResourcePageItemVO.class);
+        List<ResourcePageItemVO>  itemVOList = JedisClusterUtils.getJsonList(StrUtil.join(":",DL_BOOK_SERVES_CACHE,sceneId, wechatUserId), ResourcePageItemVO.class);
         if (CollUtil.isEmpty(itemVOList)) {
             ResourcePage bySceneId = resourcePageDao.getBySceneId(sceneId);
             if (null == bySceneId) {
@@ -4583,12 +4569,12 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 }
                 itemVOList.sort(Comparator.comparing(ResourcePageItemVO::getId));
             }
-            if (CollUtil.isNotEmpty(itemVOList)) {
-                JedisClusterUtils.setJsonList(DL_BOOK_SERVES_CACHE +  sceneId, itemVOList, 3600 * 72);
-            }
+            setChannel(itemVOList);
+            fillTaskType(itemVOList);
+        }
+        if (CollUtil.isNotEmpty(itemVOList)) {
+            JedisClusterUtils.setJsonList(StrUtil.join(":",DL_BOOK_SERVES_CACHE,sceneId, wechatUserId), itemVOList, 3600 * 24);
         }
-        setChannel(itemVOList);
-        fillTaskType(itemVOList);
         return itemVOList;
     }