From dee5b84e605818c41fc55f938855beeba6bff1ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 10 Jul 2025 14:09:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6osstoken=E9=9C=80=E7=99=BB=E5=BD=95=E6=89=8D?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/AliOssController.java     |  4 ++--
 .../system/controller/SettingController.java    | 17 +++++++++++++++--
 src/main/resources/application.yml              |  4 ++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java
index 4d3319d..36b79ab 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java
@@ -205,8 +205,8 @@ public class AliOssController extends BaseController {
     // STS接入地址，例如sts.cn-hangzhou.aliyuncs.com。
     String endpoint = "sts.cn-shenzhen.aliyuncs.com";
     // 填写步骤1生成的RAM用户访问密钥AccessKey ID和AccessKey Secret。
-    String accessKeyId = "LTAI5tCjTtR7TwrzerB1yUML";
-    String accessKeySecret = "n4fbWMer3sHI8K32mKpg47Ba9rR4yp";
+    String accessKeyId = "LTAI5tBVtVkfKfJ5Fm6mzQzF";
+    String accessKeySecret = "fsDI64rWJj9EXpqf7bNLn5YjigMUQe";
     // 填写步骤3获取的角色ARN。
     String roleArn = "acs:ram::1470199532233684:role/wsoss";
     // 自定义角色会话名称，用来区分不同的令牌，例如可填写为SessionTest。
diff --git a/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java b/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java
index 5420d06..6084820 100644
--- a/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java
+++ b/src/main/java/com/gxwebsoft/common/system/controller/SettingController.java
@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.utils.JSONUtil;
 import com.gxwebsoft.common.core.utils.RedisUtil;
 import com.gxwebsoft.common.core.web.*;
 import com.gxwebsoft.common.system.entity.Setting;
 import com.gxwebsoft.common.system.entity.Tenant;
+import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.param.SettingParam;
 import com.gxwebsoft.common.system.service.SettingService;
 import com.gxwebsoft.common.system.service.TenantService;
@@ -86,9 +88,13 @@ public class SettingController extends BaseController {
     @ApiOperation("修改系统设置")
     @PutMapping()
     public ApiResult<?> update(@RequestBody Setting setting) {
-        if (settingService.updateById(setting)) {
+      final User loginUser = getLoginUser();
+      if(loginUser == null){
+        return fail("请先登录");
+      }
+      if (settingService.updateById(setting)) {
           // 更新系统设置信息到缓存 key = ""
-          String key = setting.getSettingKey().concat(":").concat(setting.getTenantId().toString());
+          String key = setting.getSettingKey().concat(":").concat(loginUser.getTenantId().toString());
           redisUtil.set(key, JSON.parseObject(setting.getContent()));
           // 更新租户信息
           if (setting.getSettingKey().equals("setting")) {
@@ -159,6 +165,13 @@ public class SettingController extends BaseController {
       return success(settingService.getData("setting"));
     }
 
+    @PreAuthorize("hasAuthority('sys:setting:list')")
+    @ApiOperation("根据key查询系统设置")
+    @GetMapping("/{key}")
+    public ApiResult<JSONObject> getByKey(@PathVariable("key") String key) {
+      return success(settingService.getBySettingKey(key));
+    }
+
     @PreAuthorize("hasAuthority('sys:setting:save')")
     @OperationLog
     @ApiOperation("更新主题皮肤")
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 96fbc02..289e6a1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -95,8 +95,8 @@ config:
 
   # 阿里云OSS云存储
   endpoint: https://oss-cn-shenzhen.aliyuncs.com
-  accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP
-  accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM
+  accessKeyId: LTAI5tGXuJku8MK7TA6gQMZw
+  accessKeySecret: rimTK5ldtCtNZ9V9S5np6JToJtYuh2
   bucketName: oss-gxwebsoft
   bucketDomain: https://oss.wsdns.cn
   aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com