xiao12feng8
|
1995a37f2f
|
Merge remote master: 合并封禁系统、粉丝团消息等功能
|
2026-01-05 17:27:05 +08:00 |
|
cxytw
|
37a4184f55
|
粉丝团，封禁完善
|
2026-01-05 16:58:39 +08:00 |
|
xiao12feng8
|
a619bb1750
|
修复：首页标签分类+我的挚友处理+历史记录
优化：缘池界面+消息搜索界面
|
2026-01-05 16:47:07 +08:00 |
|
xiao12feng8
|
fd27958b9d
|
合并丢失的提交：部署、清理、分类、支付粉丝团功能
|
2026-01-05 08:52:57 +08:00 |
|
cxytw
|
25274c523b
|
历史记录与用户拉黑，用户封禁功能完善。
|
2026-01-04 19:40:45 +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 |
|
xiao12feng8
|
5614b48ac8
|
功能：支付+粉丝团+用户点赞关注好友
|
2026-01-04 16:34:10 +08:00 |
|
cxytw
|
87674d736e
|
feat: 实现管理端与移动端历史记录功能互通
|
2026-01-04 10:13:32 +08:00 |
|
cxytw
|
4890c98f85
|
fix: remove duplicate wishTree.js (keep wishtree.js with more features)
|
2026-01-04 09:36:27 +08:00 |
|
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
|
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
|
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
|
91a58d090b
|
Merge conflict resolved
|
2025-12-30 18:26:21 +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 |
|
cxytw
|
892b84e070
|
管理端界面优化
|
2025-12-29 14:56:26 +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 |
|
userName
|
ca9789ba72
|
修改后台管理界面
|
2025-12-27 18:32:29 +08:00 |
|
cxytw
|
bb4bf666f4
|
管理端界面优化
|
2025-12-26 18:06:34 +08:00 |
|
cxytw
|
40a95ee5da
|
管理端界面优化
|
2025-12-26 17:58:59 +08:00 |
|
cxytw
|
148297e8d2
|
管理端界面优化
|
2025-12-26 17:55:01 +08:00 |
|
xiao12feng8
|
e85f9c42ad
|
消息引用+撤回+敏感词接口
|
2025-12-26 15:16:40 +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 |
|
