xiaozhang/zhibo
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
172 Commits 4 Branches 0 Tags 181 MiB
cc667a7643
Commit Graph

55 Commits

Author SHA1 Message Date
xiao12feng8
cc667a7643 功能：作品编辑和删除 2026-01-07 18:34:31 +08:00
xiao12feng8
c8e22d497e 功能：作品点赞+关注+收藏+作品搜索+作品标签 2026-01-07 17:36:08 +08:00
xiao12feng8
d2fa9a1055 合并IM-gift分支：作品发布、点赞收藏评论等功能 2026-01-06 18:59:23 +08:00
ShiQi
ad0c4ea5b3 作品发布，点赞收藏评论等功能的编写 2026-01-06 18:23:15 +08:00
ShiQi
78447bd093 Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift 
# Conflicts:
#	android-app/app/src/main/java/com/example/livestreaming/net/ApiService.java
 2026-01-05 17:27:18 +08:00
xiao12feng8
1995a37f2f Merge remote master: 合并封禁系统、粉丝团消息等功能 2026-01-05 17:27:05 +08:00
ShiQi
b5fdbf1319 附近地址的代码编写 2026-01-05 17:11:35 +08:00
cxytw
37a4184f55 粉丝团，封禁完善 2026-01-05 16:58:39 +08:00
xiao12feng8
a619bb1750 修复：首页标签分类+我的挚友处理+历史记录 
优化：缘池界面+消息搜索界面
 2026-01-05 16:47:07 +08:00
cxytw
86c37cd688 Resolve stash conflicts: merge local changes with IM-gift branch 2026-01-04 19:24:42 +08:00
cxytw
d234b91836 Merge IM-gift branch: add virtual currency and recharge features 2026-01-04 19:16:46 +08:00
ShiQi
b4a0eee625 feat: update gift system and IM features 2026-01-04 19:00:02 +08:00
cxytw
87674d736e feat: 实现管理端与移动端历史记录功能互通 2026-01-04 10:13:32 +08:00
ShiQi
909d1994a1 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/request/UserEditRequest.java
#	Zhibo/zhibo-h/crmeb-front/src/main/java/com/zbkj/front/controller/LiveRoomController.java
#	Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/FriendServiceImpl.java
#	Zhibo/zhibo-h/crmeb-service/src/main/java/com/zbkj/service/service/impl/UserServiceImpl.java
#	Zhibo/zhibo-h/crmeb-service/src/main/resources/mapper/FollowRecordDao.xml
#	android-app/app/src/main/java/com/example/livestreaming/EditProfileActivity.java
#	android-app/app/src/main/java/com/example/livestreaming/ProfileActivity.java
#	android-app/app/src/main/java/com/example/livestreaming/net/UserEditRequest.java
#	android-app/app/src/main/java/com/example/livestreaming/net/UserInfoResponse.java
 2026-01-04 08:59:19 +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
3209a6b1bc feat: 添加主播管理、群组管理功能及Android端相关页面 2025-12-31 19:41:22 +08:00
ShiQi
c2e2684f52 Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift 
# Conflicts:
#	Zhibo/zhibo-h/crmeb-admin/src/main/java/com/zbkj/admin/task/live/LiveStatusSyncTask.java
#	android-app/app/src/main/java/com/example/livestreaming/RoomDetailActivity.java
#	android-app/app/src/main/res/layout/dialog_make_wish.xml
#	android-app/app/src/main/res/layout/dialog_view_wish.xml
 2025-12-31 18:07:54 +08:00
ShiQi
9f6b72dfcc 接口的编写和接入 2025-12-31 18:05:04 +08:00
cxytw
3c9b31185f 12月31号许愿树优化 2025-12-31 14:24:51 +08:00
ShiQi
162b44bf4f 修复了is_live自动变为0的bug 2025-12-31 11:16:54 +08:00
ShiQi
cec1ab4845 Merge branch 'master' of http://115.190.64.57:8000/xiaozhang/zhibo into IM-gift 2025-12-31 08:41:10 +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
ShiQi
7153a8ca0c 接口的修改 2025-12-30 18:35:50 +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
ce0e27f9e7 管理端前端页面修复完善 2025-12-30 16:22:27 +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
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
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
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
xiao12feng8
0778e5c3ba feat: 完善通话信令功能 - 修复主叫方和被叫方通话状态同步问题 2025-12-26 18:18:36 +08:00
ShiQi
9e39317600 修复了bug 2025-12-26 18:07:55 +08:00
ShiQi
ebbc343a07 作品管理模块和社交功能模块，这两个业务模块的接口的编写 2025-12-26 18:02:04 +08:00
xiao12feng8
827ef40900 合并远程master分支，解决冲突 2025-12-26 16:11:03 +08:00
xiao12feng8
bae216261a 通信 2025-12-26 15:43:37 +08:00
xiao12feng8
e85f9c42ad 消息引用+撤回+敏感词接口 2025-12-26 15:16:40 +08:00
ShiQi
c8aaa31212 各个模块的开发、接口的实现、表的创建 2025-12-26 15:06:37 +08:00
ShiQi
888ed8eb9e 11 2025-12-26 08:46:24 +08:00