Commit Graph

478 Commits

Author SHA1 Message Date
YunaiV
d048daf7d6 mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖 2023-10-30 12:53:54 +08:00
YunaiV
52e735f360 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponTemplateApiImpl.java
2023-10-24 19:09:01 +08:00
YunaiV
dd2f5ba2c3 统一 boot 和 cloud 代码 2023-10-24 18:48:02 +08:00
puhui999
6723cae781 营销活动:完善 review 提到的问题 2023-10-23 12:02:13 +08:00
YunaiV
728308cbc0 member:优化部分变量的命名 2023-10-22 16:35:48 +08:00
YunaiV
94c2ad5d1d 修复报错的单元测试 2023-10-22 08:55:27 +08:00
YunaiV
d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-10-22 08:25:27 +08:00
YunaiV
ec27a1bae5 修复报错的单元测试 2023-10-22 08:24:47 +08:00
YunaiV
52ebcaaad7 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/ 2023-10-20 00:31:35 +08:00
YunaiV
14f006088a code review:敏感词 2023-10-19 23:25:17 +08:00
芋道源码
630890d0ac
!665 修复敏感词单字符检验失败问题
Merge pull request !665 from 摸鱼散人/master
2023-10-19 15:18:31 +00:00
YunaiV
979b484d7f saas:支持社交应用的多租户配置(wx 小程序) 2023-10-19 21:42:39 +08:00
YunaiV
6f757e5297 saas:支持社交应用的多租户配置(mp) 2023-10-19 12:54:44 +08:00
YunaiV
d256275099 saas:支持社交应用的多租户配置 2023-10-18 23:48:14 +08:00
zhijiantianya@gmail.com
0af205ede1 Merge remote-tracking branch 'origin/master' 2023-10-17 18:49:59 +08:00
zhijiantianya@gmail.com
c629fd2208 code review:工作流逻辑 2023-10-17 18:49:35 +08:00
daiwencheng
944e3862a5 修复敏感词检验问题
1.修复排序,优先使用较短的前缀失效问题
2.修复敏感词为单个字符校验失败问题
2023-10-15 14:30:43 +08:00
芋道源码
8fd814e0c1
!636 测试站内信接口增加Member 用户类型的支持。
Merge pull request !636 from 风狗/feature/mall_product
2023-10-14 09:53:41 +00:00
YunaiV
3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files 2023-10-14 17:45:49 +08:00
puhui999
c71bdd158a 拼团活动:完善 review 提到的问题 2023-10-08 17:19:39 +08:00
YunaiV
fdb10aeced trade:优化运费模版的实现 2023-10-02 18:30:14 +08:00
YunaiV
5913ee0706 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityDetailRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/bargain/vo/activity/AppBargainActivityRespVO.java
#	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
#	yudao-server/src/main/resources/application-local.yaml
2023-09-28 15:18:59 +08:00
绮梦
5a5f92d2e9 feat: 测试站内信接口增加Member 用户类型的支持。 2023-09-25 15:54:31 +08:00
YunaiV
e384b810bf code review:分销逻辑 2023-09-25 09:39:39 +08:00
YunaiV
9b7c757942 1.8.2 版本发布 2023-09-24 23:24:24 +08:00
owen
e9fd377772 分销:Review代码修改 2023-09-24 20:28:44 +08:00
YunaiV
421bb7d154 code review:分销逻辑 2023-09-24 11:56:00 +08:00
owen
bf0e7d2c77 System:字典数据列表过滤已关闭的数据 2023-09-23 23:42:20 +08:00
owen
637ae8ce1d 分佣: 提现记录 2023-09-22 18:35:43 +08:00
owen
594e4d5fee system: uniapp增加字典数据查询接口 2023-09-22 15:11:06 +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
YunaiV
b81ebe6f19 修复 common 下的 test 引入不正确的问题,减少包依赖大小 2023-09-17 01:37:10 +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
ebb3a04251 优化多租户 Job 的实现,采用 AOP 替代 BeanPostProcessor,提升启动速度 2023-09-16 14:06:15 +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
8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
2023-09-11 16:19:55 +08:00
xingyu
5e9e41c045 fix: required 过期 2023-09-11 12:30:33 +08:00
YunaiV
40e1a879e3 登录:社交登录时,额外返回 openid 2023-09-10 18:01:53 +08:00
YunaiV
65d7b30011 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2023-09-09 10:35:14 +08:00
dhb52
d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 2023-09-09 01:30:51 +08:00
lemoncc
2fd201c7fa
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum 2023-09-08 16:33:49 +08:00
YunaiV
4809e9b462 修复单元测试报错的问题 2023-09-03 18:28:29 +08:00
YunaiV
02bc9d28de 解决 MapStruct 的时区问题 2023-08-27 11:19:48 +08:00
shizhong
eb4434ecbc 解决MapStruct的时区问题 2023-08-23 12:11:47 +08:00
YunaiV
bfc72a9802 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
 Conflicts:
	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/config/MemberPointConfigBaseVO.java
2023-08-20 09:45:34 +08:00
YunaiV
95254341a1 1. 会员用户的找回密码 API 的优化 2023-08-19 23:12:34 +08:00
YunaiV
5d4a7ffa3b 1. 会员用户的修改密码 API 的优化 2023-08-19 20:16:41 +08:00
YunaiV
87e5b2bed1 1. 会员用户的修改手机 API 的优化 2023-08-19 19:23:54 +08:00