From 32c9e82e30c00b6eb4b326d7ac6f09a8c7acd6ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Fri, 15 Nov 2024 18:50:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E9=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/system/controller/AliOssController.java     | 10 ++++++----
 .../system/controller/ChatMessageController.java       |  8 ++------
 2 files changed, 8 insertions(+), 10 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 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<PageResult<ChatMessage>> 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<ChatMessage>> 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<ChatMessage> 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<ChatMessage> list) {