Tankaikai
|
3efa643d82
|
Merge remote-tracking branch 'origin/test' into es_release_0.1
|
2025-01-15 16:00:46 +08:00 |
|
谭凯凯
|
ab674a2ee1
|
测试环境合并集成ES 20240115
|
2025-01-15 15:58:15 +08:00 |
|
谭凯凯
|
5a3ae55492
|
测试环境合并集成ES 20240113
|
2025-01-13 17:38:36 +08:00 |
|
谭凯凯
|
4c28282f6a
|
测试环境合并集成ES 20240113
|
2025-01-13 10:23:39 +08:00 |
|
Tankaikai
|
f27ca3228c
|
Merge remote-tracking branch 'origin/es' into es_release_0.1
# Conflicts:
# src/main/java/com/sqx/modules/app/entity/UserEntity.java
# src/main/java/com/sqx/modules/app/entity/UserInfo.java
# src/main/java/com/sqx/modules/app/entity/UserMoneyDetails.java
# src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
# src/main/java/com/sqx/modules/course/entity/CourseCollect.java
# src/main/java/com/sqx/modules/course/entity/CourseUser.java
# src/main/java/com/sqx/modules/discSpinning/entity/DiscSpinningRecord.java
# src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
# src/main/java/com/sqx/modules/pay/entity/CashOut.java
# src/main/java/com/sqx/modules/pay/entity/PayDetails.java
# src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java
# src/main/java/com/sqx/modules/userSign/entity/UserSignRecord.java
# src/main/resources/application-dev.yml
# src/main/resources/application.yml
|
2025-01-13 10:22:04 +08:00 |
GYJ
|
0dd1ddf829
|
Merge remote-tracking branch 'origin/test' into test
|
2025-01-13 09:58:42 +08:00 |
|
GYJ
|
a17df0ab5e
|
修改 redis 配置
|
2025-01-13 09:58:20 +08:00 |
|
谭凯凯
|
6c45e24c77
|
生产环境关闭swagger
|
2025-01-13 09:41:45 +08:00 |
|
谭凯凯
|
a8f1871a48
|
集成ES
|
2025-01-13 09:40:01 +08:00 |
|
谭凯凯
|
0321b4753a
|
集成ES
|
2025-01-13 09:39:29 +08:00 |
张松
|
6368120a1b
|
拉新奖励去除与邀请人身份信息相同的数据
|
2025-01-10 18:22:49 +08:00 |
 wangw
|
fa285004b3
|
任务领取
|
2025-01-10 17:30:48 +08:00 |
|
wangw
|
a8444e34e6
|
上级为官方 优化执行
|
2025-01-10 17:12:25 +08:00 |
|
wangw
|
a88b6a225c
|
上级为官方时 不统计
|
2025-01-10 17:08:38 +08:00 |
|
wangw
|
27c19e979e
|
邀请人 userID优化
|
2025-01-10 16:53:04 +08:00 |
|
张松
|
29cea2bd7d
|
Merge remote-tracking branch 'origin/test' into test
|
2025-01-10 16:42:49 +08:00 |
|
张松
|
a7147f875d
|
user增加邀请人id，通过邀请码获取用户修改为id获取
|
2025-01-10 16:42:39 +08:00 |
|
Tankaikai
|
d0a5e26834
|
Merge remote-tracking branch 'origin/test' into test
|
2025-01-10 16:41:39 +08:00 |
|
谭凯凯
|
988737d25e
|
邀请用户列表增加字段，显示未认证、新人、老人
|
2025-01-10 16:41:34 +08:00 |
|
wangw
|
1e3cc8b217
|
多余代码移除
|
2025-01-10 16:29:18 +08:00 |
|
张松
|
591929d979
|
userinfo获取不插入记录
|
2025-01-10 16:16:39 +08:00 |
|
谭凯凯
|
61303bf0d6
|
邀请用户列表增加字段，显示未认证、新人、老人
|
2025-01-10 16:12:12 +08:00 |
|
Tankaikai
|
a9252c49ce
|
Merge remote-tracking branch 'origin/test' into test
|
2025-01-10 16:08:13 +08:00 |
|
谭凯凯
|
0d87c9ac50
|
邀请用户列表增加字段，显示未认证、新人、老人
|
2025-01-10 16:08:07 +08:00 |
|
wangw
|
399c68db86
|
任务中心 展示优化
|
2025-01-10 16:05:39 +08:00 |
|
wangw
|
3fde641ce3
|
无邀请人时 return
|
2025-01-10 16:00:45 +08:00 |
|
wangw
|
beb2648726
|
优化任务中心
|
2025-01-10 15:42:53 +08:00 |
|
Tankaikai
|
f7df0eb0d5
|
Merge remote-tracking branch 'origin/test' into test
|
2025-01-10 15:14:17 +08:00 |
|
谭凯凯
|
e5e7962cc3
|
敏感数据脱敏
|
2025-01-10 15:14:11 +08:00 |
|
wangw
|
e3f3e7d654
|
任务中心 处理一次性任务
大转盘抽奖 第三次需要实名后使用
|
2025-01-10 14:58:02 +08:00 |
|
Tankaikai
|
8d12ce9ae5
|
Merge remote-tracking branch 'origin/test' into test
|
2025-01-10 14:33:43 +08:00 |
|
Tankaikai
|
96cb4d934c
|
一个身份证号可以认证三个账号
|
2025-01-10 14:33:35 +08:00 |
|
张松
|
46305060ff
|
15人达标奖励领取条件需要实名认证去除重复认证信息
|
2025-01-10 14:17:35 +08:00 |
|
Tankaikai
|
f3989082cf
|
Merge remote-tracking branch 'origin/test' into test
|
2025-01-10 14:15:43 +08:00 |
|
谭凯凯
|
ad193e1416
|
一个身份证号可以认证三个账号
|
2025-01-10 14:15:36 +08:00 |
|
张松
|
3231f9c3f4
|
15人达标奖励领取条件需要实名认证
|
2025-01-10 13:55:42 +08:00 |
|
wangw
|
9976e12396
|
提现回调 提示描述修改
|
2025-01-10 10:55:22 +08:00 |
|
wangw
|
95fd316f4d
|
nsq消息队列 初始2
|
2025-01-10 10:55:03 +08:00 |
|
张松
|
28112104c4
|
Merge remote-tracking branch 'origin/test' into test
|
2025-01-10 09:56:59 +08:00 |
|
张松
|
3ec519e95f
|
一分钟支付超12次拉入黑名单
|
2025-01-10 09:56:45 +08:00 |
|
谭凯凯
|
f9b6e75def
|
bug修复
|
2025-01-10 09:56:30 +08:00 |
|
谭凯凯
|
9d0ed1ff9c
|
捕获IoException: Broken pip并处理
|
2025-01-10 09:31:18 +08:00 |
|
GYJ
|
230f172b51
|
log
|
2025-01-09 19:09:12 +08:00 |
|
GYJ
|
bece507b11
|
bug fix
|
2025-01-09 19:02:03 +08:00 |
|
GYJ
|
ef3c35fd08
|
bug fix
|
2025-01-09 18:45:37 +08:00 |
|
Tankaikai
|
afbeee7f9d
|
提现策略改动
|
2025-01-09 18:40:38 +08:00 |
|
Tankaikai
|
a15d317e77
|
Merge remote-tracking branch 'origin/test' into test
|
2025-01-09 18:36:04 +08:00 |
|
谭凯凯
|
b870e916f7
|
提现策略改动
|
2025-01-09 18:35:58 +08:00 |
|
wangw
|
d9208a5228
|
多余参数移除
|
2025-01-09 18:20:53 +08:00 |
|
wangw
|
63c1862a2b
|
优化日志打印
|
2025-01-09 17:44:24 +08:00 |