201 Commits (5b13c07e01f4f8fc44511d957e51f163c25edc8e)

Author SHA1 Message Date
xingyu 5b13c07e01 chore: up springboot 2.7.11 3 years ago
xingyu be01cd4894 chore: up mapstruct 1.5.5.Final 3 years ago
xingyu 023322cb25 chore: up hutool 5.8.18 3 years ago
YunaiV 535413804b 1.7.2 版本发布 3 years ago
xingyuv 67ac794c62 feat: knife4j 4.1.0 3 years ago
xingyuv 7265300f31 chore: 升级最新依赖 3 years ago
xingyuv e3d74b1713 chore: 升级最新依赖 3 years ago
xingyuv 844d102a65 chore: up springboot 2.7.10 3 years ago
xingyuv 01902c4345 chore: up minio 8.5.2 3 years ago
xingyuv f839f89e93 chore: up esayexcel 3.2.1 3 years ago
xingyuv 70f632852b chore: up hutool 5.8.15 3 years ago
wangzhs f9569f910f 切换 Mybatis-plus-join 依赖 3 years ago
wangzhs 670f67e551 新增 mybatis-plus-join 3 years ago
YunaiV 47d3f0bc9a 1.7.1 版本发布 3 years ago
YunaiV de7d26129c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
3 years ago
YunaiV c3eb9022b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml
3 years ago
xingyu 8c4bdccd48 up captcha-plus 1.0.2 3 years ago
xingyu c6f880bfc1 up springboot 2.7.8 3 years ago
xingyu 08a4de37c2 Merge remote-tracking branch 'origin/master' into feature/springdoc
# Conflicts:
#	README.md
3 years ago
YunaiV c04ef59e81 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 3 years ago
YunaiV ca8bb72417 版本 1.7.0 发布:增加微信公众号、站内信、邮箱、数据脱敏! 3 years ago
xingyu ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 3 years ago
xingyu 756dca6332 update: springboot 2.7.8 3 years ago
xingyu 40f6fed29f update: springboot 2.7.8 3 years ago
芋道源码 e7f8e0c507
!372 支持 vo 返回脱敏
Merge pull request !372 from 与或非/issues/I3QPZV
3 years ago
芋道源码 2a332a95f9
!376 重构 滑块验证码实现 vue3 自动引入
Merge pull request !376 from xingyu/dev
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 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 3d390d0d8f feat: knife4j 3 years ago
xingyu 8c4bc638a4 chore: captcha-plus 3 years ago
gaibu 7b3fca2844 feat: 脱敏组件代码规范更新 3 years ago
xingyu 4d35bcef65 feat: springdoc success 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 860b0301b7 refactor: captcha-plus 3 years ago
xingyu fffe3008b5 refactor: captcha-plus 3 years ago
xingyu 865f101070 feat: 将aj-captcha换为源码导入 3 years ago
xingyu 57aec5f11c update: minio 8.5.1 3 years ago
gaibu cd9bcda935 feat: 支持 vo 返回的脱敏 3 years ago
xingyu 3df825034b chore: update deps 3 years ago
gaibu 099754c26e fix: xss 启用后编辑器上传图片错误 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
YunaiV 24f0e4dd1f 1.6.6 发版:完善 Vue3 管理后台、新增 IP & 地区库 3 years ago
芋道源码 4c0275fbf4
!348 增加webSocket连接测试以及文件优化
Merge pull request !348 from 咱哥丶/dev
3 years ago