Commit Graph

5868 Commits

Author SHA1 Message Date
YunaiV
962f2bbf69 code review:提现逻辑 2023-09-19 23:58:16 +08:00
YunaiV
9630f236f8 Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	README.md
2023-09-19 22:28:45 +08:00
芋道源码
de7699d972
!624 trade: 分销业务 - 佣金提现
Merge pull request !624 from 疯狂的世界/brokerate
2023-09-19 14:25:43 +00:00
owen
e22c577f7a trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:20:32 +08:00
YunaiV
8cfb738db3 code review:分销逻辑 2023-09-19 22:16:25 +08:00
owen
32e1fc66ce trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
芋道源码
581f9d4101
!622 trade: 分销业务review代码修改
Merge pull request !622 from 疯狂的世界/brokerate
2023-09-19 13:48:07 +00:00
芋道源码
edfa7bcefb
update README.md.
Signed-off-by: 芋道源码 <zhijiantianya@gmail.com>
2023-09-19 11:34:35 +00:00
puhui999
04a391cd4b Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationActivityApiImpl.java
2023-09-19 18:58:53 +08:00
puhui999
408df683d8 秒杀活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 18:57:28 +08:00
owen
f998d43e68 infra: 修正 查询实体列表方法,传入的ID集合为空时,会导致异常的问题 2023-09-19 17:14:42 +08:00
owen
a3e161a9a3 trade: 分销业务review代码修改 2023-09-19 16:50:43 +08:00
xingyu
6c80ef38f5 docs: spring boot3 2023-09-19 16:37:54 +08:00
owen
a3e8b42be6 trade: 分销业务review代码修改 2023-09-19 16:37:51 +08:00
puhui999
af6016bba5 砍价活动: 完善 app 端获取活动分页、列表、详情接口 2023-09-19 16:35:21 +08:00
owen
75874035a4 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-19 15:31:14 +08:00
YunaiV
be1ecf96d4 code review:会员签到逻辑 2023-09-18 22:18:42 +08:00
YunaiV
477342d324 Merge branch 'feature/mall_product' of https://gitee.com/SummerQing/ruoyi-vue-pro into feature/mall_product 2023-09-18 13:49:07 +08:00
YunaiV
080c32b9f3 code review:钱包充值 2023-09-18 13:07:54 +08:00
YunaiV
b81ebe6f19 修复 common 下的 test 引入不正确的问题,减少包依赖大小 2023-09-17 01:37:10 +08:00
YunaiV
436fef7efa 1. 移除 netty-all,减少依赖
2. 修复 xss 无法禁用的问题
2023-09-17 00:37:11 +08:00
YunaiV
222daa5366 pay 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 2023-09-16 23:22:58 +08:00
YunaiV
a51579a77d fileConfig 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 2023-09-16 21:35:05 +08:00
YunaiV
48fd4972da sms 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 2023-09-16 20:58:34 +08:00
YunaiV
ab800aa891 1. 简化 JsonUtils 初始化方式,去掉 BeanPostProcessor
2. 减少日志打印

目的:优化启动速度
2023-09-16 18:05:50 +08:00
YunaiV
50371b3676 1. 禁用 member 模块
2. 减少 mybatis 日志打印
3. 降低 local 环境的初始连接

目的:提升项目的启动速度
2023-09-16 17:04:59 +08:00
YunaiV
62c4838ba7 默认禁用 spring boot admin 的启动 2023-09-16 15:30:02 +08:00
YunaiV
ebb3a04251 优化多租户 Job 的实现,采用 AOP 替代 BeanPostProcessor,提升启动速度 2023-09-16 14:06:15 +08:00
YunaiV
6a371f06b0 默认禁用 spring data redis repositories,一方面没用到,一方面提高启动速度 2023-09-16 13:29:47 +08:00
YunaiV
808ff6abb9 默认禁用 lock4j 依赖,保证启动速度 2023-09-16 13:14:40 +08:00
YunaiV
f0f5b52150 默认禁用 quartz 依赖,保证启动速度 2023-09-16 12:50:36 +08:00
YunaiV
08d39d4593 默认禁用 resilience4j 依赖,保证启动速度 2023-09-16 12:01:49 +08:00
owen
a52e490c86 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-16 08:41:06 +08:00
xiaqing
d4a891e6c4 新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
2023-09-15 23:21:11 +08:00
xiaqing
0907ca2081 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-15 22:09:13 +08:00
jason
bbc16bb937 钱包充值 Mapper 类 2023-09-15 16:14:04 +08:00
owen
73e4976ae4 Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-15 16:11:01 +08:00
xiaqing
e893cfd757 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
2023-09-15 15:27:59 +08:00
xiaqing
9d262e8e7f 新增两个APP端接口
1.获取用户个人签到信息
2.用户签到接接口
2023-09-15 15:20:39 +08:00
owen
2c821d2bbf Merge remote-tracking branch 'origin/feature/mall_product' into brokerate 2023-09-15 14:13:48 +08:00
jason
ebd4ea548c Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationApiImpl.java
2023-09-14 16:59:05 +08:00
jason
0e1b8126dd 新增钱包充值。启动报错修复 2023-09-14 16:55:31 +08:00
YunaiV
cfaffd3c88 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-09-13 23:26:38 +08:00
YunaiV
1b9a3f9f63 code review:调整操作日志的封装 2023-09-13 23:25:52 +08:00
jason
bcb3b19418 钱包充值 表结构设计 2023-09-13 17:28:42 +08:00
puhui999
a10d77cdfe mall+order: 完善部分 TODO 提到的问题 2023-09-13 12:04:13 +08:00
xingyu
437131cc7a Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
#	yudao-dependencies/pom.xml
2023-09-13 12:00:10 +08:00
YunaiV
9358639c41 code review:订单部分逻辑 2023-09-12 23:01:12 +08:00
YunaiV
e8bdd8349c code review:订单部分逻辑 2023-09-12 13:54:52 +08:00
Shimada666
a2ba5518e0
fix: 使初始化数据脚本兼容 mysql5.7
官方文档中,推荐使用 mysql5.7
"项目使用 MySQL 存储数据,所以需要启动一个 MySQL 服务,建议使用 5.7 版本。"
但实际上,现在的初始化数据脚本中包含 mysql8.0 才引入的排序规则,与 5.7 不兼容。
故修改排序规则,将 utf8mb4_0900_ai_ci 均改为 utf8mb4_unicode_ci,以支持 mysql5.7
2023-09-12 13:06:20 +08:00