xiao12feng8
3209a6b1bc
feat: 添加主播管理、群组管理功能及Android端相关页面
2025-12-31 19:41:22 +08:00
xiao12feng8
f7a0291b8c
修复：所有许愿树视图文件API引用路径统一为小写wishtree
2025-12-31 15:02:54 +08:00
xiao12feng8
077e4613bd
修复：统一许愿树模块路径大小写
2025-12-31 14:59:17 +08:00
xiao12feng8
8345dca1a1
解决合并冲突：许愿树对话框布局文件
2025-12-31 14:47:07 +08:00
xiao12feng8
750f4c8c1e
更新：许愿树对话框、通话功能、环境配置等多项优化
2025-12-31 14:44:51 +08:00
cxytw
3c9b31185f
12月31号许愿树优化
2025-12-31 14:24:51 +08:00
cxytw
20f2e342ce
Merge remote master: keep local admin code, accept remote for others
2025-12-30 20:50:55 +08:00
cxytw
fe46b0ebac
12月30号最后的管理端界面优化，前后端配置，数据添加测试
2025-12-30 20:36:50 +08:00
xiao12feng8
e7649df1af
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
2025-12-30 19:21:00 +08:00
xiao12feng8
b3726557e5
question：未修复好直播功能+未部署
2025-12-30 19:20:52 +08:00
userName
2d88a55348
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
2025-12-30 19:15:31 +08:00
userName
dbd9a04c9b
美化界面
2025-12-30 19:15:23 +08:00
xiao12feng8
37ee807c8a
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
2025-12-30 19:00:25 +08:00
3e9a65af3f
管理端缘池，许愿树。
2025-12-30 18:53:46 +08:00
xiao12feng8
184bbcbf6e
Merge remote-tracking branch 'origin/IM-gift'
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2025-12-30 18:31:37 +08:00
xiao12feng8
91a58d090b
Merge conflict resolved
2025-12-30 18:26:21 +08:00
ShiQi
f76e098175
修改了配置文件
2025-12-30 18:03:32 +08:00
userName
eb5daad9de
缘池，和许愿树的内容
2025-12-30 17:57:42 +08:00
userName
e2b4d04420
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
2025-12-30 17:42:43 +08:00
userName
3e90031acf
缘池，和许愿树的内容
2025-12-30 17:33:27 +08:00
xiao12feng8
a121ec6572
部署流程
2025-12-30 17:28:20 +08:00
cxytw
2c73d0c552
12月30号管理端界面优化，前后端配置
2025-12-30 17:27:55 +08:00
ShiQi
17c409e4ee
修改了登录接口
2025-12-30 17:20:06 +08:00
ShiQi
4e2366ce49
安卓端的代码编写
2025-12-30 16:22:47 +08:00
cxytw
ce0e27f9e7
管理端前端页面修复完善
2025-12-30 16:22:27 +08:00
ShiQi
8f8a3ef03d
安卓端的代码编写
2025-12-30 16:19:12 +08:00
xiao12feng8
c37cf4884b
功能：增加语音和视频通话的功能
2025-12-30 16:08:43 +08:00
ShiQi
86709109a5
文档的上传
2025-12-30 15:28:07 +08:00
ShiQi
3535009dba
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift
2025-12-30 15:24:47 +08:00
ShiQi
b804f9d2d9
还剩余模块文档中的11和18没有对接
2025-12-30 15:23:16 +08:00
ShiQi
05b23b7a3b
修复编译报错
2025-12-30 11:22:07 +08:00
xiao12feng8
b97c82899f
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
2025-12-30 11:13:09 +08:00
ShiQi
f6a6a59a32
新的文档的编写
2025-12-30 11:11:11 +08:00
xiao12feng8
e83568f5fb
bug：修复消息不能撤回
2025-12-30 11:11:07 +08:00
xiao12feng8
7d1896d9d2
bug：修复消息不能正确判断位置
2025-12-30 10:10:35 +08:00
xiao12feng8
72e90f4e0e
Merge remote-tracking branch 'origin/master' - resolve ApiService conflict
2025-12-30 09:42:28 +08:00
xiao12feng8
5b0c786f1f
修复app的bug
2025-12-30 09:31:15 +08:00
ShiQi
d8f9cc8959
接口的对接
2025-12-30 09:29:30 +08:00
ShiQi
e3df41657a
接口的对接和一些前端页面的修改
2025-12-29 18:02:28 +08:00
ShiQi
5c4faae97b
bug的修改
2025-12-29 15:42:13 +08:00
ShiQi
db1b8d8f90
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift
...
# Conflicts:
# Zhibo/zhibo-h/crmeb-common/src/main/java/com/zbkj/common/annotation/RateLimit.java
# Zhibo/zhibo-h/crmeb-common/src/main/java/com/zbkj/common/model/call/CallRecord.java
# Zhibo/zhibo-h/crmeb-common/src/main/java/com/zbkj/common/model/gift/GiftRecord.java
# Zhibo/zhibo-h/crmeb-common/src/main/java/com/zbkj/common/page/CommonPage.java
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/controller/CategoryController.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/aspect/RateLimitAspect.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/RateLimitService.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/RateLimitServiceImpl.java
# Zhibo/zhibo-h/开发进度总结.md
# Zhibo/zhibo-h/直播IM系统开发指南.md
2025-12-29 15:23:19 +08:00
ShiQi
721d588971
前后端接口对接
2025-12-29 15:12:12 +08:00
cxytw
892b84e070
管理端界面优化
2025-12-29 14:56:26 +08:00
ShiQi
0de2709339
业务模块编写完成
2025-12-29 11:57:36 +08:00
cxytw
7d151996c0
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
...
# Conflicts:
# Zhibo/admin/src/theme/app.scss
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/config/WebSocketConfig.java
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/controller/CallController.java
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/websocket/CallSignalingHandler.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/CallServiceImpl.java
# Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/ConversationServiceImpl.java
2025-12-29 10:43:09 +08:00
cxytw
0049afbf5c
管理端界面优化
2025-12-29 10:20:34 +08:00
ShiQi
fb3204b0bb
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift
...
# Conflicts:
# Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/controller/CallController.java
2025-12-29 08:43:35 +08:00
userName
ca9789ba72
修改后台管理界面
2025-12-27 18:32:29 +08:00
userName
e8bfa466e4
Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo
2025-12-26 18:37:57 +08:00
userName
8d96082064
feat: Android端接口对接完成，新增42个API接口
2025-12-26 18:37:36 +08:00
