From 0b71330b52d05f4f3486f4d4df0c6a6935bc5eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BF=9D=E5=AE=89?= <1409538202@qq.com> Date: Tue, 23 Dec 2025 16:46:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8A=E4=BC=A0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8E=E7=BC=80=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E4=B8=8A=E4=BC=A0=E5=90=8D=E7=A7=B0=E5=92=8C=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E9=A1=BA=E5=BA=8F=E6=94=BE=E5=8F=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++++ .../com/realtime/controller/ChatListController.java | 6 ++++++ .../java/com/realtime/mappers/ChatListMapper.java | 3 +++ .../java/com/realtime/model/query/BaseTeamReq.java | 2 +- .../com/realtime/model/query/GetSessionIdReq.java | 9 +++++++++ .../java/com/realtime/service/ChatListService.java | 3 +++ .../realtime/service/impl/ChatListServiceImpl.java | 6 ++++++ .../com/realtime/service/impl/FileServiceImpl.java | 2 +- src/main/java/com/realtime/utils/SessionUtils.java | 1 + src/main/resources/application.yml | 2 +- src/main/resources/mappers/ChatListMapper.xml | 11 ++++++++++- 11 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/realtime/model/query/GetSessionIdReq.java diff --git a/pom.xml b/pom.xml index ba855e2..4ba611b 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,10 @@ true 1.18.40 + + org.springframework.boot + spring-boot-starter-actuator + diff --git a/src/main/java/com/realtime/controller/ChatListController.java b/src/main/java/com/realtime/controller/ChatListController.java index b503ffa..394d285 100644 --- a/src/main/java/com/realtime/controller/ChatListController.java +++ b/src/main/java/com/realtime/controller/ChatListController.java @@ -4,6 +4,7 @@ package com.realtime.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.realtime.model.pojo.ChatList; import com.realtime.model.query.ChatListPageQueryReq; +import com.realtime.model.query.GetSessionIdReq; import com.realtime.service.ChatListService; import com.realtime.sysconst.Result; import com.realtime.vo.ChatListInfoVo; @@ -44,4 +45,9 @@ public class ChatListController { Result updateChatList(@RequestBody List chatList){ return chatListService.updateChatListFName(chatList); } + + @PostMapping("/querySessionId") + Result querySessionId(@RequestBody GetSessionIdReq getSessionIdReq){ + return chatListService.querySessionId(getSessionIdReq); + } } diff --git a/src/main/java/com/realtime/mappers/ChatListMapper.java b/src/main/java/com/realtime/mappers/ChatListMapper.java index 8c9550f..64db27e 100644 --- a/src/main/java/com/realtime/mappers/ChatListMapper.java +++ b/src/main/java/com/realtime/mappers/ChatListMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.realtime.model.pojo.ChatList; import com.realtime.model.query.ChatListPageQueryReq; +import com.realtime.model.query.GetSessionIdReq; import com.realtime.vo.ChatListInfoVo; import org.apache.ibatis.annotations.Param; @@ -15,6 +16,8 @@ public interface ChatListMapper extends BaseMapper { IPage getChatList(@Param("reqPage") IPage page, @Param("req") ChatListPageQueryReq chatListPageQueryReq); void deleteFriend(@Param("id") String id,@Param("receiver") String receiver); + + Long querySessionId(@Param("req") GetSessionIdReq getSessionIdReq); } diff --git a/src/main/java/com/realtime/model/query/BaseTeamReq.java b/src/main/java/com/realtime/model/query/BaseTeamReq.java index fb84dcd..69528ce 100644 --- a/src/main/java/com/realtime/model/query/BaseTeamReq.java +++ b/src/main/java/com/realtime/model/query/BaseTeamReq.java @@ -15,5 +15,5 @@ public class BaseTeamReq implements Serializable { * 访问令牌 */ @JsonProperty("access_token") - private String accessToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjoiNjhlNzY0ZjBmOTU0ODg3MWMyMmY5M2I4IiwibGFzdExvZ2luIjoiMTc2NTQzNDMyNy41MjA5ODYifQ.Vj0ovpCsziFzeR2qroYnN-3KevR78krx-rDFQ9BKlgU"; + private String accessToken; } diff --git a/src/main/java/com/realtime/model/query/GetSessionIdReq.java b/src/main/java/com/realtime/model/query/GetSessionIdReq.java new file mode 100644 index 0000000..8096b07 --- /dev/null +++ b/src/main/java/com/realtime/model/query/GetSessionIdReq.java @@ -0,0 +1,9 @@ +package com.realtime.model.query; + +import lombok.Data; + +@Data +public class GetSessionIdReq { + private String senderId; + private String receiverId; +} diff --git a/src/main/java/com/realtime/service/ChatListService.java b/src/main/java/com/realtime/service/ChatListService.java index cd47b8a..0a17fd9 100644 --- a/src/main/java/com/realtime/service/ChatListService.java +++ b/src/main/java/com/realtime/service/ChatListService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.realtime.model.pojo.ChatList; import com.realtime.model.query.ChatListPageQueryReq; +import com.realtime.model.query.GetSessionIdReq; import com.realtime.sysconst.Result; import com.realtime.vo.ChatListInfoVo; @@ -25,4 +26,6 @@ public interface ChatListService extends IService { Result deleteSignChatList(ChatList ids); + + Result querySessionId(GetSessionIdReq getSessionIdReq); } diff --git a/src/main/java/com/realtime/service/impl/ChatListServiceImpl.java b/src/main/java/com/realtime/service/impl/ChatListServiceImpl.java index 2dff14b..c29e112 100644 --- a/src/main/java/com/realtime/service/impl/ChatListServiceImpl.java +++ b/src/main/java/com/realtime/service/impl/ChatListServiceImpl.java @@ -9,6 +9,7 @@ import com.realtime.mappers.ChatListMapper; import com.realtime.model.pojo.ChatList; import com.realtime.model.pojo.FriendRelationship; import com.realtime.model.query.ChatListPageQueryReq; +import com.realtime.model.query.GetSessionIdReq; import com.realtime.service.ChatListService; import com.realtime.service.FriendRelationshipService; import com.realtime.sysconst.Result; @@ -140,6 +141,11 @@ public class ChatListServiceImpl extends ServiceImpl return Result.success("ok"); } + @Override + public Result querySessionId(GetSessionIdReq getSessionIdReq) { + return Result.success(baseMapper.querySessionId(getSessionIdReq)); + } + } diff --git a/src/main/java/com/realtime/service/impl/FileServiceImpl.java b/src/main/java/com/realtime/service/impl/FileServiceImpl.java index a5ee7e9..9eba3ce 100644 --- a/src/main/java/com/realtime/service/impl/FileServiceImpl.java +++ b/src/main/java/com/realtime/service/impl/FileServiceImpl.java @@ -69,7 +69,7 @@ public class FileServiceImpl implements FileService { String originalFilename = file.getOriginalFilename(); assert originalFilename != null; UploadVo uploadVo = new UploadVo(); - String storeFileName = originalFilename + Instant.now().getEpochSecond(); + String storeFileName = Instant.now().getEpochSecond() +originalFilename; String url = generateFileUrl(storeFileName); uploadVo.setName(originalFilename); uploadVo.setUrl(url); diff --git a/src/main/java/com/realtime/utils/SessionUtils.java b/src/main/java/com/realtime/utils/SessionUtils.java index b6710a4..762d25f 100644 --- a/src/main/java/com/realtime/utils/SessionUtils.java +++ b/src/main/java/com/realtime/utils/SessionUtils.java @@ -14,6 +14,7 @@ public class SessionUtils { public static final Map userIdChannelMap = new ConcurrentHashMap<>(); + /** * groupId ---> channelgroup 群聊ID和群聊ChannelGroup映射 */ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5b3a75e..0528726 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,7 +11,7 @@ file: picMaxSize: 104857600 # 100MB picMaxCount: 1 picAllowedFormats: png,jpg - allowedFormats: doc,docx,xls,xlsx,ppt,pptx,txt,jpg,jpeg,png,gif,svg,mp3,mp4,zip,rar,exe,dmg,apk,md + allowedFormats: doc,docx,xls,xlsx,ppt,pptx,txt,jpg,jpeg,png,gif,svg,mp3,mp4,zip,rar,exe,dmg,apk,md,py,html spring: servlet: multipart: diff --git a/src/main/resources/mappers/ChatListMapper.xml b/src/main/resources/mappers/ChatListMapper.xml index df8318a..169a4d0 100644 --- a/src/main/resources/mappers/ChatListMapper.xml +++ b/src/main/resources/mappers/ChatListMapper.xml @@ -13,7 +13,10 @@ - delete from chat_list lt where lt.sender = #{id} and lt.receiver = #{receiver} + delete + from chat_list lt + where lt.sender = #{id} + and lt.receiver = #{receiver} @@ -35,4 +38,10 @@ from chat_list ch where ch.sender = #{req.sendId} +