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