修复:获取临时osstoken需登录才可以访问
This commit is contained in:
@@ -205,8 +205,8 @@ public class AliOssController extends BaseController {
|
|||||||
// STS接入地址,例如sts.cn-hangzhou.aliyuncs.com。
|
// STS接入地址,例如sts.cn-hangzhou.aliyuncs.com。
|
||||||
String endpoint = "sts.cn-shenzhen.aliyuncs.com";
|
String endpoint = "sts.cn-shenzhen.aliyuncs.com";
|
||||||
// 填写步骤1生成的RAM用户访问密钥AccessKey ID和AccessKey Secret。
|
// 填写步骤1生成的RAM用户访问密钥AccessKey ID和AccessKey Secret。
|
||||||
String accessKeyId = "LTAI5tCjTtR7TwrzerB1yUML";
|
String accessKeyId = "LTAI5tBVtVkfKfJ5Fm6mzQzF";
|
||||||
String accessKeySecret = "n4fbWMer3sHI8K32mKpg47Ba9rR4yp";
|
String accessKeySecret = "fsDI64rWJj9EXpqf7bNLn5YjigMUQe";
|
||||||
// 填写步骤3获取的角色ARN。
|
// 填写步骤3获取的角色ARN。
|
||||||
String roleArn = "acs:ram::1470199532233684:role/wsoss";
|
String roleArn = "acs:ram::1470199532233684:role/wsoss";
|
||||||
// 自定义角色会话名称,用来区分不同的令牌,例如可填写为SessionTest。
|
// 自定义角色会话名称,用来区分不同的令牌,例如可填写为SessionTest。
|
||||||
|
|||||||
@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSON;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.gxwebsoft.common.core.annotation.OperationLog;
|
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.utils.RedisUtil;
|
||||||
import com.gxwebsoft.common.core.web.*;
|
import com.gxwebsoft.common.core.web.*;
|
||||||
import com.gxwebsoft.common.system.entity.Setting;
|
import com.gxwebsoft.common.system.entity.Setting;
|
||||||
import com.gxwebsoft.common.system.entity.Tenant;
|
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.param.SettingParam;
|
||||||
import com.gxwebsoft.common.system.service.SettingService;
|
import com.gxwebsoft.common.system.service.SettingService;
|
||||||
import com.gxwebsoft.common.system.service.TenantService;
|
import com.gxwebsoft.common.system.service.TenantService;
|
||||||
@@ -86,9 +88,13 @@ public class SettingController extends BaseController {
|
|||||||
@ApiOperation("修改系统设置")
|
@ApiOperation("修改系统设置")
|
||||||
@PutMapping()
|
@PutMapping()
|
||||||
public ApiResult<?> update(@RequestBody Setting setting) {
|
public ApiResult<?> update(@RequestBody Setting setting) {
|
||||||
|
final User loginUser = getLoginUser();
|
||||||
|
if(loginUser == null){
|
||||||
|
return fail("请先登录");
|
||||||
|
}
|
||||||
if (settingService.updateById(setting)) {
|
if (settingService.updateById(setting)) {
|
||||||
// 更新系统设置信息到缓存 key = ""
|
// 更新系统设置信息到缓存 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()));
|
redisUtil.set(key, JSON.parseObject(setting.getContent()));
|
||||||
// 更新租户信息
|
// 更新租户信息
|
||||||
if (setting.getSettingKey().equals("setting")) {
|
if (setting.getSettingKey().equals("setting")) {
|
||||||
@@ -159,6 +165,13 @@ public class SettingController extends BaseController {
|
|||||||
return success(settingService.getData("setting"));
|
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')")
|
@PreAuthorize("hasAuthority('sys:setting:save')")
|
||||||
@OperationLog
|
@OperationLog
|
||||||
@ApiOperation("更新主题皮肤")
|
@ApiOperation("更新主题皮肤")
|
||||||
|
|||||||
@@ -95,8 +95,8 @@ config:
|
|||||||
|
|
||||||
# 阿里云OSS云存储
|
# 阿里云OSS云存储
|
||||||
endpoint: https://oss-cn-shenzhen.aliyuncs.com
|
endpoint: https://oss-cn-shenzhen.aliyuncs.com
|
||||||
accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP
|
accessKeyId: LTAI5tGXuJku8MK7TA6gQMZw
|
||||||
accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM
|
accessKeySecret: rimTK5ldtCtNZ9V9S5np6JToJtYuh2
|
||||||
bucketName: oss-gxwebsoft
|
bucketName: oss-gxwebsoft
|
||||||
bucketDomain: https://oss.wsdns.cn
|
bucketDomain: https://oss.wsdns.cn
|
||||||
aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com
|
aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com
|
||||||
|
|||||||
Reference in New Issue
Block a user