428 Commits (65ba4b6ae097b4e12d2d168e0b54ca7185dc082e)

Author SHA1 Message Date
zy 9b667448ea fix: 加入异步注解配置后redis消费者不能正常消费 3 years ago
YunaiV 969b9c3458 修复 swagger 404 的问题 3 years ago
YunaiV 38f67d4130 将 mall 使用到 Date 的部分,迁移到 LocalDateTime 中 3 years ago
YunaiV 12d045ea58 修复部分单元测试报错的问题 3 years ago
YunaiV 89580e7903 合并 master 代码 3 years ago
YunaiV afc76973ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.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-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue
3 years ago
YunaiV 0e903df380 调整 YudaoDataPermissionAutoConfiguration 的自动配置 3 years ago
YunaiV 1819e0e1d6 异步化 Redis MQ 的初始化,提升启动速度 3 years ago
YunaiV c5b547e0f3 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
YunaiV f5ef87094d 优化,使用 @Configuration(proxyBeanMethods = false) 提升启动速度 3 years ago
YunaiV ff1379d454 优化 README 说明~ 3 years ago
YunaiV c9f6494bb4 【优化】修改短信模板的渠道为云片时,校验 API 模板编号为整数 3 years ago
芋道源码 ae0227c107
!276 阿里云OSS解析region时兼容带https的配置
Merge pull request !276 from huangyemin/master
3 years ago
YunaiV a8cdf74120 【移除】Apollo 配置中心,简化学习成本 3 years ago
YunaiV ce3aefadd7 移除 jasypt-spring-boot-starter 依赖,使用 hutool AES 替代 3 years ago
芋道源码 fb237423b8
!294 修复单元测试报错
Merge pull request !294 from 芋道源码/dev
3 years ago
YunaiV a539bc211d 1. 修复 MemberAuthServiceTest 单元测试
2. 修复 DataPermissionDatabaseInterceptorTest 单元测试
3 years ago
YunaiV 40ba456fde 1. 修复 MenuServiceTest 单元测试 3 years ago
芋道源码 e51dda6b68
!281 fix WXLitePayClient.java 中copy应忽略的字段
Merge pull request !281 from chenlei65368/N/A
3 years ago
YunaiV d3b6a0ca69 1. 修复 refund/index.vue 的报错
2. 优化 DateUtils 的工具类的方法命名
3 years ago
xingyu4j 9c033d0104 DateUtils ==> LocalDateTime 3 years ago
xingyu4j cb006ddf2b DateUtils.buildLocalDateTime ==> LocalDateTime.of 3 years ago
xingyu4j 632a132a6a refactor: Date ==> LocalDateTime 3 years ago
YunaiV edc5d0f1d0 promotion:增加获得优惠劵匹配结果的列表 3 years ago
YunaiV 3c10058dbd promotion:实现部分优惠劵模板的前端逻辑 3 years ago
chenlei65368 bb8204b5a7
fix WXLitePayClient.java 中copy应忽略的字段
小程序支付,copy应忽略 "privateKeyContent","privateCertContent",而不是“KeyContent”

Signed-off-by: chenlei65368 <chenlei65368@sohu.com>
3 years ago
YunaiV 2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
3 years ago
huangyemin 93135363c6 阿里云OSS解析region时兼容带https的配置 3 years ago
xingyu 72ee1206e6 Merge remote-tracking branch 'origin/master' into dev 3 years ago
xingyu 1aca24b636 feat: 升级依赖 3 years ago
YunaiV 034de50999 完善多租户的注释与代码 3 years ago
YunaiV b73cdd15b5 同步 Master 最新代码 3 years ago
YunaiV 25e7c8dceb 同步 Master 最新代码 3 years ago
YunaiV 1be09d092b ♻️优化“通过注解增加多租户缓存”的代码 3 years ago
芋道源码 597a923828
!257 通过注解增加多租户缓存
Merge pull request !257 from CrazyAirhead/master
3 years ago
xingyu 9054a772b0 feat: 升级依赖 3 years ago
YunaiV 38e88b02f5 🐛修复数据权限,不支持隐式内连接的问题 3 years ago
airhead 6b429584bf fix(tenant): 租户缓存增加注释 3 years ago
airhead 0e1babd7f4 feat(redis): 注解支持多租户缓存
1.增加多租户Cache
2.修复Mac M1启动报错
3 years ago
芋道源码 61b0624a59
!262 接口实现-交易订单创建(未完全实现)
Merge pull request !262 from LeeYan9/ly_uniapp
3 years ago
YunaiV 833fd33844 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
 Conflicts:
	sql/optional/mall/mall.sql
3 years ago
YunaiV 9715087b54 管理后台的 uniapp 验证码,增加开关 3 years ago
YunaiV a484cd5193 优化图片验证码的后端实现 3 years ago
YunaiV 926c75d29a 优化图片验证码的后端实现 3 years ago
ex_yang.li@ca-nio.com 19a703b8c9 创建订单接口定义 3 years ago
luowenfeng 0bc2ef1d39 feature(uniapp商品): 商品业务代码调整 4 years ago
xingyu e5bd517829 perf: final方法改为大写命名 4 years ago
xingyu e1b8ae09c9 增加手机号正则验证 4 years ago
xingyu4j 40f730033f 压缩图片尺寸 4 years ago
YunaiV cfde3dcacb mall:优化订单表的设计 4 years ago