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 836ba95..3a71031 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java @@ -1,5 +1,6 @@ package com.gxwebsoft.common.system.controller; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.aliyun.oss.ClientException; @@ -81,12 +82,13 @@ public class AliOssController extends BaseController { JSONObject settingInfo; String key3 = "Upload:" + tenantId; settingInfo = redisUtil.get(key3, JSONObject.class); - if (settingInfo == null) { + if (ObjectUtil.isEmpty(settingInfo)) { settingInfo = settingService.getBySettingKey("upload"); - if(settingInfo == null){ - return fail("上传失败,请检查上传配置",null); + if (ObjectUtil.isNotEmpty(settingInfo)) { + redisUtil.set(key3,settingInfo); + }else { + return fail("请先配置云存储",null); } - redisUtil.set(key3,settingInfo); } String endpoint = settingInfo.getString("bucketEndpoint"); String bucketDomain = settingInfo.getString("bucketDomain"); diff --git a/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java b/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java index 61b973e..e30fc44 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/ChatMessageController.java @@ -31,7 +31,6 @@ public class ChatMessageController extends BaseController { @Resource private ChatMessageService chatMessageService; - @PreAuthorize("hasAuthority('sys:chatMessage:list')") @ApiOperation("分页查询聊天消息表") @GetMapping("/page") public ApiResult> page(ChatMessageParam param) { @@ -39,15 +38,14 @@ public class ChatMessageController extends BaseController { return success(chatMessageService.pageRel(param)); } - @PreAuthorize("hasAuthority('sys:chatMessage:list')") @ApiOperation("查询全部聊天消息表") @GetMapping() public ApiResult> list(ChatMessageParam param) { - // 使用关联查询 + User loginUser = getLoginUser(); + param.setToUserId(loginUser.getUserId()); return success(chatMessageService.listRel(param)); } - @PreAuthorize("hasAuthority('sys:chatMessage:list')") @ApiOperation("根据id查询聊天消息表") @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { @@ -55,7 +53,6 @@ public class ChatMessageController extends BaseController { return success(chatMessageService.getByIdRel(id)); } - @PreAuthorize("hasAuthority('sys:chatMessage:save')") @ApiOperation("添加聊天消息表") @PostMapping() public ApiResult save(@RequestBody ChatMessage chatMessage) { @@ -91,7 +88,6 @@ public class ChatMessageController extends BaseController { return fail("删除失败"); } - @PreAuthorize("hasAuthority('sys:chatMessage:save')") @ApiOperation("批量添加聊天消息表") @PostMapping("/batch") public ApiResult saveBatch(@RequestBody List list) {