550 Commits (ffb0358ce23ecf5d0f53ebb977a0d6fe81df5af7)

Author SHA1 Message Date
xingyu ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 3 years ago
YunaiV c0b029b244 邮箱模块:完善 template 的单元测试 3 years ago
YunaiV 0895ee7d98 邮箱模块:完善 account 的单元测试 3 years ago
YunaiV 179fdc8464 优化 xss 的代码实现,独立 xss 包 3 years ago
YunaiV c744e115e3 简化本地缓存的实现,萌新更容易看懂! 3 years ago
YunaiV 0763c720d2 优化脱敏组件的注释 3 years ago
芋道源码 e7f8e0c507
!372 支持 vo 返回脱敏
Merge pull request !372 from 与或非/issues/I3QPZV
3 years ago
gaibu 729ec31dab feat: 修改脱敏注解名称 3 years ago
YunaiV 6b1f3140b8 spring doc:移除多余字段~ 3 years ago
YunaiV d193d2dd4a spring doc:支持通过 springdoc.api-docs 禁用 3 years ago
YunaiV 711a39b8e9 spring doc:增加模块分组 3 years ago
gaibu 2aa208f441 feat: 脱敏组件代码规范更新 3 years ago
YunaiV 6593ec4214 code review 脱敏组件的代码 3 years ago
芋道源码 2a332a95f9
!376 重构 滑块验证码实现 vue3 自动引入
Merge pull request !376 from xingyu/dev
3 years ago
xingyu ba65a864fa perf: 优化Springdoc配置 3 years ago
xingyu f2adb441cd Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java
3 years ago
YunaiV 5e9706007e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java
3 years ago
xingyu 13afc3d57a feat: springdoc 3 years ago
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
3 years ago
xingyu 0ebba2eb81 移除springfox配置 3 years ago
xingyu 3d390d0d8f feat: knife4j 3 years ago
xingyu 8c4bc638a4 chore: captcha-plus 3 years ago
gaibu 42bc0d1519 feat: 脱敏组件增加单元测试 3 years ago
gaibu 7b3fca2844 feat: 脱敏组件代码规范更新 3 years ago
YunaiV 32d7d6ab29 code review 脱敏组件的代码 3 years ago
xingyu 4d35bcef65 feat: springdoc success 3 years ago
gaibu e5ab9b71b6 feat: 完善注释 3 years ago
gaibu c60f8d6da2 feat: 支持 vo 返回的脱敏 3 years ago
xingyu cba69e94df revert: file 3 years ago
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
3 years ago
xingyu b4b23596a5 feat: 升级 knife4j 4.0 3 years ago
xingyu 55db35e31b chore: update deps 3 years ago
xingyu fffe3008b5 refactor: captcha-plus 3 years ago
xingyu aaf62982e2 feat: 优化 captcha 代码 3 years ago
xingyu 865f101070 feat: 将aj-captcha换为源码导入 3 years ago
gaibu 61a34ddac5 feat: 支持 vo 返回的脱敏 3 years ago
gaibu 70f15ab60d feat: 增加注释 3 years ago
gaibu cd9bcda935 feat: 支持 vo 返回的脱敏 3 years ago
gaibu 5c8e41b847 feat: 支持 vo 返回的脱敏 3 years ago
xingyu 3df825034b chore: update deps 3 years ago
gaibu 099754c26e fix: xss 启用后编辑器上传图片错误 3 years ago
gaibu e637bff8cd feat: 支持 vo 返回的脱敏 3 years ago
gaibu d7bec143fd fix: xss 启用后编辑器上传图片错误 3 years ago
YunaiV b9246d1543 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp
# Conflicts:
#	yudao-server/src/main/resources/application.yaml
3 years ago
xingyu 6954150fcb feat: websocket init 3 years ago
xingyu c5f29f18d3 Merge remote-tracking branch 'origin/master' into dev 3 years ago
芋道源码 4c0275fbf4
!348 增加webSocket连接测试以及文件优化
Merge pull request !348 from 咱哥丶/dev
3 years ago
芋道源码 661a20dc93
!351 升级最新依赖 && 修复树形 全部展开 全部关闭
Merge pull request !351 from xingyu/dev
3 years ago
xingyu d6fdd924e9 Merge remote-tracking branch 'origin/dev' into feature/springdoc 3 years ago
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