xingyu
|
0ef05fba7c
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
|
2023-01-17 21:18:53 +08:00 |
|
xingyu
|
3d390d0d8f
|
feat: knife4j
|
2023-01-17 20:42:18 +08:00 |
|
xingyu
|
8c4bc638a4
|
chore: captcha-plus
|
2023-01-17 16:57:10 +08:00 |
|
xingyu
|
4d35bcef65
|
feat: springdoc success
|
2023-01-16 22:58:56 +08:00 |
|
xingyu
|
cba69e94df
|
revert: file
|
2023-01-16 15:15:31 +08:00 |
|
xingyu
|
1c0d8fc1eb
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
# Conflicts:
# yudao-dependencies/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/pom.xml
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
# yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
|
2023-01-16 14:25:03 +08:00 |
|
xingyu
|
b4b23596a5
|
feat: 升级 knife4j 4.0
|
2023-01-16 14:22:39 +08:00 |
|
xingyu
|
55db35e31b
|
chore: update deps
|
2023-01-16 13:43:05 +08:00 |
|
xingyu
|
860b0301b7
|
refactor: captcha-plus
|
2023-01-16 11:12:30 +08:00 |
|
xingyu
|
fffe3008b5
|
refactor: captcha-plus
|
2023-01-16 10:47:39 +08:00 |
|
xingyu
|
865f101070
|
feat: 将aj-captcha换为源码导入
|
2023-01-12 20:57:11 +08:00 |
|
xingyu
|
57aec5f11c
|
update: minio 8.5.1
|
2023-01-12 20:45:40 +08:00 |
|
xingyu
|
3df825034b
|
chore: update deps
|
2023-01-12 13:58:32 +08:00 |
|
gaibu
|
099754c26e
|
fix: xss 启用后编辑器上传图片错误
|
2023-01-10 19:27:24 +08:00 |
|
gaibu
|
d7bec143fd
|
fix: xss 启用后编辑器上传图片错误
|
2023-01-09 13:23:45 +08:00 |
|
xingyu
|
6954150fcb
|
feat: websocket init
|
2023-01-06 17:30:48 +08:00 |
|
xingyu
|
c5f29f18d3
|
Merge remote-tracking branch 'origin/master' into dev
|
2023-01-05 09:41:54 +08:00 |
|
YunaiV
|
24f0e4dd1f
|
1.6.6 发版：完善 Vue3 管理后台、新增 IP & 地区库
|
2023-01-04 22:36:38 +08:00 |
|
芋道源码
|
4c0275fbf4
|
!348 增加webSocket连接测试以及文件优化
Merge pull request !348 from 咱哥丶/dev
|
2023-01-04 14:30:40 +00:00 |
|
xingyu
|
d6fdd924e9
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
2023-01-04 10:58:34 +08:00 |
|
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
|
2023-01-04 10:48:18 +08:00 |
|
xingyu
|
c98965cd55
|
chore: update spring boot 2.7.7
hutool 5.8.11
mybaits-plus 3.5.3
flowable 6.8.0
|
2023-01-04 10:12:00 +08:00 |
|
咱哥丶
|
2d1ff0aff7
|
commit 增加webSocket
|
2023-01-02 22:53:55 +08:00 |
|
YunaiV
|
a83b8e8fbc
|
修复报错的单元测试
|
2022-12-30 00:27:14 +08:00 |
|
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
|
2022-12-23 19:12:45 +08:00 |
|
xingyu
|
cacefb4eea
|
feat: knife4j springdoc
|
2022-12-22 00:25:22 +08:00 |
|
xingyu
|
69420c0a9c
|
feat: 适配springboot 2.7 configuration ==> AutoConfiguration
|
2022-12-21 22:52:47 +08:00 |
|
xingyu
|
4f2c08f8db
|
Merge remote-tracking branch 'origin/dev' into feature/springdoc
|
2022-12-21 22:46:52 +08:00 |
|
xingyu
|
91abae8898
|
refactor: cropper
|
2022-12-21 16:10:28 +08:00 |
|
xingyu
|
2d79130106
|
chore: update deps
|
2022-12-20 14:21:27 +08:00 |
|
xingyu
|
6c521fd5e0
|
chore: update deps
|
2022-12-19 22:21:36 +08:00 |
|
xingyu
|
46c93b637f
|
chore: update deps
|
2022-12-19 10:51:36 +08:00 |
|
YunaiV
|
bddbedd781
|
增加城市库
|
2022-12-10 00:17:08 +08:00 |
|
xingyu4j
|
88ce5e540e
|
refactor: springdoc 替换 springfox
|
2022-12-09 14:24:09 +08:00 |
|
xingyu4j
|
9fc6e0f00b
|
refactor: springdoc 替换 springfox
|
2022-12-09 13:43:15 +08:00 |
|
xingyu4j
|
4397d47da1
|
升级版本，保证统一的版本号
|
2022-12-06 17:04:43 +08:00 |
|
xingyu4j
|
1bdde35dc9
|
fix: codegen
|
2022-12-06 14:12:43 +08:00 |
|
xingyu4j
|
fea1ad8f8d
|
升级最新依赖
|
2022-12-02 11:37:36 +08:00 |
|
YunaiV
|
03c7e60092
|
发布 v1.6.5 版本！
|
2022-12-01 09:30:11 +08:00 |
|
xingyu
|
0a8a41dea1
|
chore: update tencentcloud version
|
2022-11-30 01:29:26 +08:00 |
|
xingyu
|
b079513dc8
|
chore: 升级springboot 2.7.6
|
2022-11-30 00:41:24 +08:00 |
|
xingyu4j
|
ba547e9e2d
|
chore: 升级积木报表 1.5.4
|
2022-11-29 14:52:44 +08:00 |
|
xingyu
|
005a3e6ab0
|
fix: bugs
|
2022-11-28 16:50:53 +08:00 |
|
xingyu
|
693288d33d
|
Merge remote-tracking branch 'origin/master' into feature/vue3
# Conflicts:
# yudao-dependencies/pom.xml
|
2022-11-26 13:07:51 +08:00 |
|
YunaiV
|
2d78b02086
|
移除云片短信渠道，解决云片的安全风险
|
2022-11-25 21:04:40 +08:00 |
|
YunaiV
|
ea95115ffd
|
移除云片短信渠道，解决云片的安全风险
|
2022-11-25 20:22:04 +08:00 |
|
xingyu
|
0a6d93fefa
|
chore: update deps
|
2022-11-24 12:07:50 +08:00 |
|
xingyu
|
914b7dde60
|
chore: update deps
|
2022-11-23 23:01:46 +08:00 |
|
xingyu4j
|
407ac853cb
|
feat: tenant
|
2022-11-22 13:15:07 +08:00 |
|
xingyu4j
|
b081bb8e71
|
chore: devs
|
2022-11-18 17:25:37 +08:00 |
|