536 Commits (e35b8c45a03a65697a0adfa7def8b358f34c6b73)

Author SHA1 Message Date
YunaiV 1eff9822ce 同步最新 master 代码 2 years ago
YunaiV 787de1be94 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	sql/mysql/mall.sql
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/wallet/vo/recharge/AppPayWalletRechargeCreateReqVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserService.java
2 years ago
YunaiV 87bc3f510c 优化:社交登录、用户的管理 2 years ago
YunaiV e9317bf293 Merge branch 'feature/mall_product_tmp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/social/SocialUserServiceImplTest.java
2 years ago
YunaiV d048daf7d6 mq 重构:默认的 mq 实现,采用 event,减少对 redis、rocketmq 等消息队列的依赖 2 years ago
puhui999 8552e86d8a 完善三方登录 2 years ago
puhui999 12ae5bf128 新增社交用户 RUD 2 years ago
puhui999 738fcef453 新增社交客户端 CRUD 2 years ago
puhui999 eb4b719b4b 添加社交客户端测试 sql 2 years ago
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
2 years ago
YunaiV dd2f5ba2c3 统一 boot 和 cloud 代码 2 years ago
puhui999 6723cae781 营销活动:完善 review 提到的问题 2 years ago
YunaiV 728308cbc0 member:优化部分变量的命名 2 years ago
YunaiV 94c2ad5d1d 修复报错的单元测试 2 years ago
YunaiV d0caa77f80 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2 years ago
YunaiV ec27a1bae5 修复报错的单元测试 2 years ago
YunaiV 52ebcaaad7 同步 https://gitee.com/zhijiantianya/yudao-cloud/pulls/59/ 2 years ago
YunaiV 14f006088a code review:敏感词 2 years ago
芋道源码 630890d0ac
!665 修复敏感词单字符检验失败问题
Merge pull request !665 from 摸鱼散人/master
2 years ago
YunaiV 979b484d7f saas:支持社交应用的多租户配置(wx 小程序) 2 years ago
YunaiV 6f757e5297 saas:支持社交应用的多租户配置(mp) 2 years ago
YunaiV d256275099 saas:支持社交应用的多租户配置 2 years ago
zhijiantianya@gmail.com 0af205ede1 Merge remote-tracking branch 'origin/master' 2 years ago
zhijiantianya@gmail.com c629fd2208 code review:工作流逻辑 2 years ago
daiwencheng 944e3862a5 修复敏感词检验问题
1.修复排序,优先使用较短的前缀失效问题
2.修复敏感词为单个字符校验失败问题
2 years ago
芋道源码 8fd814e0c1
!636 测试站内信接口增加Member 用户类型的支持。
Merge pull request !636 from 风狗/feature/mall_product
2 years ago
YunaiV 3110e427fb 同步 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/647/files 2 years ago
puhui999 c71bdd158a 拼团活动:完善 review 提到的问题 2 years ago
YunaiV fdb10aeced trade:优化运费模版的实现 3 years ago
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
3 years ago
绮梦 5a5f92d2e9 feat: 测试站内信接口增加Member 用户类型的支持。 3 years ago
YunaiV e384b810bf code review:分销逻辑 3 years ago
YunaiV 9b7c757942 1.8.2 版本发布 3 years ago
owen e9fd377772 分销:Review代码修改 3 years ago
YunaiV 421bb7d154 code review:分销逻辑 3 years ago
owen bf0e7d2c77 System:字典数据列表过滤已关闭的数据 3 years ago
owen 637ae8ce1d 分佣: 提现记录 3 years ago
owen 594e4d5fee system: uniapp增加字典数据查询接口 3 years ago
YunaiV 9630f236f8 Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
 Conflicts:
	README.md
3 years ago
YunaiV b81ebe6f19 修复 common 下的 test 引入不正确的问题,减少包依赖大小 3 years ago
YunaiV 222daa5366 pay 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 3 years ago
YunaiV a51579a77d fileConfig 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 3 years ago
YunaiV 48fd4972da sms 缓存,使用 guava 替代 job 扫描,目的:提升启动速度,加快缓存失效 3 years ago
YunaiV ebb3a04251 优化多租户 Job 的实现,采用 AOP 替代 BeanPostProcessor,提升启动速度 3 years ago
xingyu 437131cc7a Merge remote-tracking branch 'origin/master' into feature/auth
# Conflicts:
#	yudao-dependencies/pom.xml
3 years ago
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
3 years ago
xingyu 5e9e41c045 fix: required 过期 3 years ago
YunaiV 40e1a879e3 登录:社交登录时,额外返回 openid 3 years ago
YunaiV 65d7b30011 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 3 years ago
dhb52 d7488e70b0 使用下划线分割ErrorCodeConstants的ErrorCode 3 years ago
lemoncc 2fd201c7fa
🌈 style: 描述错误, 社交类型的枚举为 SocialTypeEnum 而不是 SysUserSocialTypeEnum 3 years ago
YunaiV 4809e9b462 修复单元测试报错的问题 3 years ago
YunaiV 02bc9d28de 解决 MapStruct 的时区问题 3 years ago
shizhong eb4434ecbc 解决MapStruct的时区问题 3 years ago
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
3 years ago
YunaiV 95254341a1 1. 会员用户的找回密码 API 的优化 3 years ago
YunaiV 5d4a7ffa3b 1. 会员用户的修改密码 API 的优化 3 years ago
YunaiV 87e5b2bed1 1. 会员用户的修改手机 API 的优化 3 years ago
wanglei 6446b753d3 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 3 years ago
YunaiV ee53d2ad51 修复租户套餐修改时,查询角色报错问题 3 years ago
YunaiV b5515799dc !557 修改创建菜单时permission为空,缓存KEY 为空的BUG 3 years ago
杜继强 14c7465bc6 修改创建菜单时permission为空,缓存KEY 为空的BUG ,判断 reqVO.permission 为空时,不做 @CacheEvict 的操作 3 years ago
YunaiV 1f3794db77 fix: 修复MailAccountService 更新/删除缓存未清空 3 years ago
YunaiV c4755c49b1 fix: 修复MailAccountService 更新/删除缓存未清空 3 years ago
zhangjiayu 508ad76cb8 fix: 修复MailAccountService 更新/删除缓存未清空 3 years ago
YunaiV dfa09c787a 短信渠道的本地缓存,使用 Job 轮询,替代 MQ 广播 3 years ago
YunaiV 27e70e73a3 敏感词的本地缓存,使用 Job 轮询,替代 MQ 广播 3 years ago
YunaiV 5e7e3d816c 彻底移除 RedisKeyDefine 3 years ago
YunaiV 95edd1d451 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-redis
 Conflicts:
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/auth/AuthConvert.java
	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
3 years ago
YunaiV 5d6308e4bb 对齐 boot 与 cloud 的代码 3 years ago
YunaiV 859cf74a6c 对齐 boot 与 cloud 的代码 3 years ago
YunaiV 6c174d9c83 对齐 boot 与 cloud 的代码 3 years ago
YunaiV 14d7db0c60 对齐 boot 与 cloud 的代码 3 years ago
YunaiV 114f1e4833 对齐 boot 与 cloud 的代码 3 years ago
lwf 414c1be128 feature(使用redis缓存): 功能合并
1、缓存改为Redis缓存,不在启动时缓存,使用时候根据数据源缓存
2、前端登录接口调整
3 years ago
芋道源码 870873e480
!540 修复部分问题,升级依赖
Merge pull request !540 from xingyu/feature/captcha
3 years ago
YunaiV 3a24d05bdc mall + pay:
1. 修复单元测试的报错
3 years ago
xingyu d556877b13 chore: use xingyuv jushauth 3 years ago
xingyu c95a1d0a7d chore: up springboot 2.10.13 3 years ago
YunaiV 67d60e32f8 mall + pay:
1、调整微信支付,修复 v2 传递的时间不正确
2、调整 mp js ticket 接口到 system 模块
3 years ago
YunaiV 23e3c4d0d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 3 years ago
芋道源码 11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 3 years ago
xingyu 7ad3b6ad2b chore: use com.xingyuv.justauth 3 years ago
YunaiV 7036a6652c mall + member:
1、调整收获地址的返回
3 years ago
YunaiV 16dd86a8db 498 解决解决 Set access token expire time to 0 报错问题和邮件发送用户编号为空问题 3 years ago
xingyu 573ad59edc Merge remote-tracking branch 'origin/master' into feature/mall_product
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/string/StrUtils.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/brand/vo/ProductBrandBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/category/vo/ProductCategoryBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/sku/vo/ProductSkuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuBaseVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuPageItemRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/sku/AppProductSkuBaseRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartItemUpdateSelectedReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppTradeCartResetReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderGetCreateInfoRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderPageItemRespVO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
3 years ago
puhui999 5bfca56efa fix:完善 TODO 提到的问题 3 years ago
shizhong 6ca09af97e 解决邮件发送用户编号为空问题 3 years ago
shizhong 3e350151bc 解决 Set access token expire time to 0 报错问题 3 years ago
JiangQi 8004a11036 master代码错误 3 years ago
YunaiV cc049566d1 修复邮件日志 sendTime 类型不一致(应该为 LocalDateTime) 3 years ago
YunaiV 0631c51d93 mall + trade:review 配置管理列表 3 years ago
jason 55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 3 years ago
YunaiV 0083d12404 mall:review + mall:快递费用 3 years ago
jason 16956a6501 运费模板,区域选择使用懒加载优化性能 3 years ago
芋道源码 7bfb426a9d
!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误
Merge pull request !484 from Rundeepin/feature/mall_product
3 years ago
jason 01a67289a9 mall: 订单中心新增运费模板功能 3 years ago
杨文 e25099a49e 发送邮件逻辑优化,邮件标题支持模版参数 3 years ago
崔家辉 fbeaa06100 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 3 years ago
xingyu 0b3640a522 fix: required = true ==> requiredMode = Schema.RequiredMode.REQUIRED 3 years ago