From 1e86dd82926564cd385e87b20d41d22b4e13a584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Mon, 13 Jan 2025 15:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E3=80=81=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E3=80=81=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96?=
 =?UTF-8?q?=20=E8=BF=99=E4=BA=9B=E9=95=BFtext=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=BA=E5=87=8F=E7=BC=93=E5=AE=BD=E5=B8=A6=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=EF=BC=8C=E6=94=BE=E5=88=B0oss=E4=B8=AD=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CommonInfoServiceImpl.java    | 18 ++++++++++++++++--
 .../controller/DiscSpinningController.java     |  4 +++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java b/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java
index 0c9fc7ce..c874766e 100644
--- a/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java
+++ b/src/main/java/com/sqx/modules/common/service/impl/CommonInfoServiceImpl.java
@@ -2,6 +2,7 @@ package com.sqx.modules.common.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -66,6 +67,7 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
         }
         commonInfoDao.updateById(commonInfo);
         cleanAppKv();
+        cleanAppOssKv(commonInfo.getType());
         return Result.success();
     }
 
@@ -77,6 +79,10 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
     @CacheEvict(key = "#id")
     @Override
     public Result delete(long id) {
+        CommonInfo commonInfo = commonInfoDao.selectById(id);
+        if(commonInfo != null){
+            cleanAppOssKv(commonInfo.getType());
+        }
         commonInfoDao.deleteById(id);
         cleanAppKv();
         return Result.success();
@@ -86,7 +92,9 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
     @Override
     public Result updateBody(CommonInfo commonInfo) {
         commonInfoDao.updateById(commonInfo);
+
         cleanAppKv();
+        cleanAppOssKv(commonInfo.getType());
         return Result.success();
     }
 
@@ -122,10 +130,16 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
     @Override
     public void cleanAppKv() {
         cacheManager.getCache("commonInfoAppKv").clear();
-        redisUtils.delete(SYS_OSS_CONFIG_JSON_URL_KEY);
+    }
+
+    private void cleanAppOssKv(Integer key) {
+        if (ArrayUtil.contains(PUT_OSS_KEYS, key)) {
+            redisUtils.delete(SYS_OSS_CONFIG_JSON_URL_KEY);
+        }
     }
 
     private static final String SYS_OSS_CONFIG_JSON_URL_KEY = "SYS_OSS_CONFIG_JSON_URL";
+    private static final Integer[] PUT_OSS_KEYS = {154, 155, 246};
 
     @Override
     public String putOss() {
@@ -135,7 +149,7 @@ public class CommonInfoServiceImpl extends ServiceImpl<CommonInfoDao, CommonInfo
         }
         List<CommonInfo> list = commonInfoDao.selectList(Wrappers.<CommonInfo>lambdaQuery()
                 .eq(CommonInfo::getIsAppUse, 1)
-                .in(CommonInfo::getType, 154, 155, 246));
+                .in(CommonInfo::getType, PUT_OSS_KEYS));
         if (CollUtil.isEmpty(list)) {
             return "";
         }
diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
index cbdd5fdd..3feb9978 100644
--- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
+++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
@@ -180,7 +180,9 @@ public class DiscSpinningController {
         Integer i = recordService.countDraw(userId);
         if ((i != null && i.equals(2)) || !source.equals(1)) {
             boolean auth = userInfoService.isAuth(userId);
-            if(!auth) return Result.error("剩余抽奖活动需要实名认证后进行");
+            if(!auth) {
+                return Result.error("剩余抽奖活动需要实名认证后进行");
+            }
         }
         if (source == null || source.equals(1)) {
             source = 1;