From e796e8ac1c387759c196a00f6f84c4c06312b2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Mon, 29 May 2023 12:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8F=82=E6=95=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E7=BC=93=E5=AD=98=E4=B8=AD=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=EF=BC=8C=E5=88=99=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/net/maku/system/dao/SysParamsDao.java |  6 +++++-
 .../maku/system/service/impl/SysParamsServiceImpl.java  | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysParamsDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysParamsDao.java
index 91c016f..e046ab8 100644
--- a/maku-boot-system/src/main/java/net/maku/system/dao/SysParamsDao.java
+++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysParamsDao.java
@@ -15,6 +15,10 @@ import org.apache.ibatis.annotations.Mapper;
 public interface SysParamsDao extends BaseDao<SysParamsEntity> {
 
     default boolean isExist(String paramKey) {
-        return this.exists(new QueryWrapper<SysParamsEntity>().eq("param_key" , paramKey));
+        return this.exists(new QueryWrapper<SysParamsEntity>().eq("param_key", paramKey));
+    }
+
+    default SysParamsEntity get(String paramKey) {
+        return this.selectOne(new QueryWrapper<SysParamsEntity>().eq("param_key", paramKey));
     }
 }
\ No newline at end of file
diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java
index 9ccdccc..f57bbee 100644
--- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java
+++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysParamsServiceImpl.java
@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.annotation.PostConstruct;
 import lombok.AllArgsConstructor;
 import net.maku.framework.common.exception.ServerException;
+import net.maku.framework.common.utils.JsonUtils;
 import net.maku.framework.common.utils.PageResult;
 import net.maku.framework.mybatis.service.impl.BaseServiceImpl;
-import net.maku.framework.common.utils.JsonUtils;
 import net.maku.system.cache.SysParamsCache;
 import net.maku.system.convert.SysParamsConvert;
 import net.maku.system.dao.SysParamsDao;
@@ -116,11 +116,20 @@ public class SysParamsServiceImpl extends BaseServiceImpl<SysParamsDao, SysParam
     @Override
     public String getString(String paramKey) {
         String value = sysParamsCache.get(paramKey);
-        if (StrUtil.isBlank(value)) {
-            throw new ServerException("参数不能为空，paramKey：" + paramKey);
+        if (StrUtil.isNotBlank(value)) {
+            return value;
         }
 
-        return value;
+        // 如果缓存没有，则查询数据库
+        SysParamsEntity entity = baseMapper.get(paramKey);
+        if (entity == null) {
+            throw new ServerException("参数值不存在，paramKey：" + paramKey);
+        }
+
+        // 保存到缓存
+        sysParamsCache.save(entity.getParamKey(), entity.getParamValue());
+
+        return entity.getParamValue();
     }
 
     @Override