xingyu
|
7b98a3f3f3
|
Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
# README.md
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/ProductPropertyViewRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyAndValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyListReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/property/ProductPropertyUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueBaseVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueCreateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValuePageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/vo/value/ProductPropertyValueUpdateReqVO.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/sku/vo/ProductSkuCreateOrUpdateReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.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/ProductSpuDetailRespVO.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/app/spu/AppProductSpuController.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageReqVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuPageRespVO.java
# yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppSpuRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/base/property/AppProductPropertyValueDetailRespVO.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/controller/app/order/vo/AppTradeOrderPageReqVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderItemRespVO.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/TradeOrderRespVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayNotifyOrderReqVO.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/vo/PayRefundOrderReqVO.java
# yudao-server/pom.xml
# yudao-server/src/main/java/cn/iocoder/yudao/module/shop/controller/app/AppShopOrderController.java
|
3 years ago |
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
3 years ago |
|
YunaiV
|
92632c046c
|
Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
# yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
# yudao-ui-admin/src/views/mall/trade/order/index.vue
|
3 years ago |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
3 years ago |
|
xingyu
|
69420c0a9c
|
feat: 适配springboot 2.7 configuration ==> AutoConfiguration
|
3 years ago |
|
xingyu
|
4f2c08f8db
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
3 years ago |
|
xingyu
|
91abae8898
|
refactor: cropper
|
3 years ago |
|
xingyu
|
2d79130106
|
chore: update deps
|
3 years ago |
|
xingyu
|
6c521fd5e0
|
chore: update deps
|
3 years ago |
|
xingyu
|
46c93b637f
|
chore: update deps
|
3 years ago |
|
YunaiV
|
bddbedd781
|
增加城市库
|
3 years ago |
|
xingyu4j
|
88ce5e540e
|
refactor: springdoc 替换 springfox
|
3 years ago |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
3 years ago |
|
xingyu4j
|
4397d47da1
|
升级版本，保证统一的版本号
|
3 years ago |
|
xingyu4j
|
1bdde35dc9
|
fix: codegen
|
3 years ago |
|
xingyu4j
|
fea1ad8f8d
|
升级最新依赖
|
3 years ago |
|
YunaiV
|
03c7e60092
|
发布 v1.6.5 版本！
|
3 years ago |
|
xingyu
|
0a8a41dea1
|
chore: update tencentcloud version
|
3 years ago |
|
xingyu
|
b079513dc8
|
chore: 升级springboot 2.7.6
|
3 years ago |
|
xingyu4j
|
ba547e9e2d
|
chore: 升级积木报表 1.5.4
|
3 years ago |
|
xingyu
|
005a3e6ab0
|
fix: bugs
|
3 years ago |
|
xingyu
|
693288d33d
|
Merge remote-tracking branch 'origin/master' into feature/vue3
# Conflicts:
# yudao-dependencies/pom.xml
|
3 years ago |
|
YunaiV
|
2d78b02086
|
移除云片短信渠道，解决云片的安全风险
|
3 years ago |
|
YunaiV
|
ea95115ffd
|
移除云片短信渠道，解决云片的安全风险
|
3 years ago |
|
xingyu
|
0a6d93fefa
|
chore: update deps
|
3 years ago |
|
xingyu
|
914b7dde60
|
chore: update deps
|
3 years ago |
|
xingyu4j
|
407ac853cb
|
feat: tenant
|
3 years ago |
|
xingyu4j
|
b081bb8e71
|
chore: devs
|
3 years ago |
|
YunaiV
|
a8cdf74120
|
【移除】Apollo 配置中心，简化学习成本
|
3 years ago |
|
YunaiV
|
ce3aefadd7
|
移除 jasypt-spring-boot-starter 依赖，使用 hutool AES 替代
|
3 years ago |
|
xingyu4j
|
77067a11bb
|
chore: update deps
|
3 years ago |
|
xingyu4j
|
2e2cd448bd
|
chore: update devs
|
3 years ago |
|
xingyu
|
70fab167be
|
feat: 升级依赖
|
3 years ago |
|
xingyu
|
566238c2dd
|
feat: 升级依赖
|
3 years ago |
|
xingyu
|
2b9d96c1b8
|
chore: update deps
|
3 years ago |
|
xingyu
|
00fbc7c5ba
|
feat: 升级apollo 到2.0.1
|
3 years ago |
|
xingyu
|
f49a55191c
|
update springboot 2.6.12
|
3 years ago |
|
xingyu
|
a98af3edbc
|
feat: 升级vue3
|
4 years ago |
|
xingyu
|
16eaa5f407
|
feat: 升级依赖
|
4 years ago |
|
xingyu
|
72ee1206e6
|
Merge remote-tracking branch 'origin/master' into dev
|
4 years ago |
|
xingyu
|
1aca24b636
|
feat: 升级依赖
|
4 years ago |
|
YunaiV
|
1be09d092b
|
♻️优化“通过注解增加多租户缓存”的代码
|
4 years ago |
|
xingyu
|
9054a772b0
|
feat: 升级依赖
|
4 years ago |
airhead
|
72883aa975
|
fix(dependencies): 修改合并错误
|
4 years ago |
|
airhead
|
0e1babd7f4
|
feat(redis): 注解支持多租户缓存
1.增加多租户Cache
2.修复Mac M1启动报错
|
4 years ago |
|
芋道源码
|
dd6dc2ac3d
|
!246 集成aj-captcha
Merge pull request !246 from xingyu/master
|
4 years ago |
|
YunaiV
|
185ea9e861
|
发布 1.6.4 版本：新增 uniapp 管理后台、数据报表设计器
|
4 years ago |
|
xingyu
|
020535ab3a
|
Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
|
4 years ago |
史海洋
|
4014587637
|
fix: #I5N0GI 升级xercesImpl以解决工作流分配时的validator失败问题.
|
4 years ago |
|
xingyu
|
2bf09cbfc2
|
升级部分依赖，存在高危漏洞报错问题
|
4 years ago |