Commit Graph

152 Commits

Author SHA1 Message Date
KilLze
2189575659 修bug 2026-01-11 00:25:19 +08:00
bao
e9d20ccf6c feat:修复接口 2026-01-09 15:41:14 +08:00
bao
d70ca89707 merge feature-init into master
# Conflicts:
#	src/main/java/com/bao/dating/config/WebConfig.java
#	src/main/java/com/bao/dating/controller/UserController.java
#	src/main/java/com/bao/dating/mapper/UserMapper.java
#	src/main/java/com/bao/dating/service/UserService.java
#	src/main/java/com/bao/dating/service/impl/UserServiceImpl.java
#	src/main/resources/com/bao/dating/mapper/UserMapper.xml
2026-01-09 15:35:31 +08:00
bao
a4faa11036 feat: update user module on feature-init 2026-01-09 15:22:18 +08:00
bao
2811a987c0 merge: 合并feature-WebSocket分支到master 2026-01-09 09:46:55 +08:00
bao
88579a382e merge: 合并feature-ip-location分支到master 2026-01-09 09:40:39 +08:00
bao
4f36dd9aeb merge: 合并feature/contacts-friends分支到master 2026-01-09 09:07:12 +08:00
290db24bc4 查询附近的人(可以查看版) 2026-01-08 10:10:25 +08:00
bao
7c0bfbc1de feat: 添加联系人管理和好友关系功能 2026-01-08 10:06:49 +08:00
31b0dffd68 查询附近的人(可以查看版) 2026-01-08 10:06:03 +08:00
31fd23afa8 查询附近的人(可以查看版) 2026-01-08 10:05:58 +08:00
d8d46ab089 查询附近的人(可以查看版) 2026-01-08 10:00:27 +08:00
5624e598ec 完成用户邮箱登录和获得ip地址 2026-01-08 08:36:28 +08:00
KilLze
cf6f9b8b7c 完成消息撤回功能 2026-01-08 01:20:11 +08:00
KilLze
c83d86ad1a Ciallo~(∠·ω< )⌒★ 2026-01-08 00:09:26 +08:00
KilLze
0a17eb8deb 简单优化 2026-01-08 00:07:25 +08:00
KilLze
448ce1d3d6 完成聊天文件上传OSS 2026-01-08 00:06:10 +08:00
KilLze
a4e66b39d1 完成会话状态更新、置顶状态更新、免打扰状态更新 2026-01-07 23:35:49 +08:00
KilLze
0a1425c7ab Ciallo~(∠·ω< )⌒★ 2026-01-07 22:59:46 +08:00
KilLze
21c0a94a5d 优化会话,当对删除的会话发送信息时返回error 2026-01-07 03:43:33 +08:00
KilLze
b6953cb8d0 完成会话列表查询并校验会话状态 2026-01-07 03:33:34 +08:00
KilLze
f6769c8c69 完成会话列表查询 2026-01-07 02:58:44 +08:00
KilLze
5e1f3b7e8a 优化代码 2026-01-07 01:36:23 +08:00
KilLze
e30a0dba97 优化代码 2026-01-07 01:12:28 +08:00
KilLze
74d47d586f 加注释 2026-01-07 00:49:32 +08:00
KilLze
0bb69075f7 完成进入会话消息自动已读 2026-01-07 00:47:38 +08:00
KilLze
1d179da910 将查询历史消息修改为只查询消息,不进行多余操作 2026-01-06 23:38:11 +08:00
KilLze
c0969406b3 完成历史信息查询,并且可以通过内容模糊查询,通过时间查询,通过消息类型查询 2026-01-06 04:18:30 +08:00
KilLze
2a9acb946e 优化代码,顺便准备写历史聊天记录查询 2026-01-06 02:25:36 +08:00
KilLze
fb2b7823b8 完成创建会话添加对方昵称 2026-01-05 22:48:53 +08:00
KilLze
951cd7249d 完成基本对话功能、消息入库和创建会话功能 2026-01-05 21:33:03 +08:00
KilLze
b12128fad6 添加websocket的依赖 2026-01-05 15:29:14 +08:00
KilLze
212668ae1c 删除不要的类 2026-01-05 11:32:50 +08:00
KilLze
a648ecad2a 删除不要的方法 2026-01-05 11:28:12 +08:00
KilLze
b8ec4a434d 复活MD5 2026-01-05 11:22:32 +08:00
KilLze
3bc00334ea Merge branch 'feature-KilLze'
# Conflicts:
#	src/main/java/com/bao/dating/controller/PostController.java
#	src/main/java/com/bao/dating/controller/UserController.java
#	src/main/java/com/bao/dating/handler/GlobalExceptionHandler.java
#	src/main/java/com/bao/dating/interceptor/TokenInterceptor.java
#	src/main/java/com/bao/dating/mapper/PostMapper.java
#	src/main/java/com/bao/dating/pojo/dto/UserInfoUpdateDTO.java
#	src/main/java/com/bao/dating/service/UserService.java
#	src/main/java/com/bao/dating/service/impl/PostServiceImpl.java
#	src/main/java/com/bao/dating/service/impl/UserServiceImpl.java
2026-01-05 11:21:26 +08:00
KilLze
a6259875f2 修消失的MD5 2026-01-05 10:49:32 +08:00
bao
34cad7457b 邮箱验证码
(cherry picked from commit eb2b0cb999)
2026-01-05 10:43:10 +08:00
bao
eb2b0cb999 邮箱验证码 2026-01-05 10:38:29 +08:00
bao
61c4c9d442 统一redis服务器
(cherry picked from commit 30db5ad706)
2026-01-05 10:02:56 +08:00
bao
30db5ad706 统一redis服务器 2026-01-05 09:55:41 +08:00
KilLze
717c0a0507 优化redis配置类 2026-01-05 01:52:10 +08:00
KilLze
413bafa275 优化和完善批量删除动态功能
实现动态软删除,被删除的动态的状态将改为3,将动态关联的评论,点赞,收藏硬删除
2026-01-03 20:57:37 +08:00
KilLze
2ce8116126 优化一下喵 2026-01-03 19:14:11 +08:00
KilLze
60df001385 用户退出功能实现
用户退出将Redis的token自动添加到黑名单
2026-01-02 12:46:44 +08:00
KilLze
27c64b1106 优化喵 2026-01-02 11:56:21 +08:00
KilLze
0762b84c36 加注释喵 2026-01-02 11:40:14 +08:00
KilLze
61d100fac0 全局异常优化 2026-01-02 11:09:12 +08:00
KilLze
8a6e44e1cb 全局日志打印 2026-01-02 10:38:00 +08:00
KilLze
a004982355 将token令牌存入redis,确保安全性 2026-01-01 21:26:09 +08:00