Commit Graph

30 Commits

Author SHA1 Message Date
xiao12feng8
b08765e035 功能:礼物功能基本搭建好 2026-01-03 19:22:42 +08:00
xiao12feng8
8b377c53e2 更新:点赞功能完善 2026-01-03 17:01:58 +08:00
xiao12feng8
32984df36b 功能:关注+手机端开播功能 2026-01-03 15:32:31 +08:00
xiao12feng8
f3169b2eba 更新:添加用户和主播切换功能 2026-01-03 12:24:05 +08:00
cxytw
7042137e5b 移动端,首页、缘池、许愿树、我的,页面优化,功能完善。 2026-01-02 20:39:14 +08:00
xiao12feng8
0655b6c8fe Merge remote changes 2025-12-31 19:55:18 +08:00
xiao12feng8
3209a6b1bc feat: 添加主播管理、群组管理功能及Android端相关页面 2025-12-31 19:41:22 +08:00
xiao12feng8
750f4c8c1e 更新:许愿树对话框、通话功能、环境配置等多项优化 2025-12-31 14:44: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
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
ShiQi
f76e098175 修改了配置文件 2025-12-30 18:03:32 +08:00
cxytw
2c73d0c552 12月30号管理端界面优化,前后端配置 2025-12-30 17:27:55 +08:00
cxytw
ce0e27f9e7 管理端前端页面修复完善 2025-12-30 16:22:27 +08:00
xiao12feng8
e83568f5fb bug:修复消息不能撤回 2025-12-30 11:11:07 +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
xiao12feng8
827ef40900 合并远程master分支,解决冲突 2025-12-26 16:11:03 +08:00
xiao12feng8
e85f9c42ad 消息引用+撤回+敏感词接口 2025-12-26 15:16:40 +08:00
ShiQi
c8aaa31212 各个模块的开发、接口的实现、表的创建 2025-12-26 15:06:37 +08:00
xiao12feng8
f4c9a42974 修复问题 2025-12-25 19:02:07 +08:00
ShiQi
e56b32131d IM需求文档的开发,送礼物的功能的实现 2025-12-25 17:09:41 +08:00
xiao12feng8
673ab55599 feat: 修复搜索用户功能和会话列表功能 - 添加 CircleImageView 依赖 - 修复 AuthHelper.getToken 改为 AuthStore.getToken - 添加 AddFriendActivity 调试日志 - 修改 MessagesActivity 从后端 API 获取会话列表 - 添加好友管理相关的 Controller 和 Service 2025-12-24 18:11:39 +08:00
xiao12feng8
9160e6e1a9 连接直播 2025-12-23 15:38:35 +08:00
xiao12feng8
7094cbccbc live: admin live room list + url host fix + app use backend urls 2025-12-23 11:39:57 +08:00
xiao12feng@outlook.com
087e1feae6 chore: avoid committing per-developer live config 2025-12-21 17:32:12 +08:00