szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,820 Commits 13 Branches 41 Tags 244 MiB
Commit Graph

421 Commits

Author SHA1 Message Date
YunaiV 45805aa761 【依赖】spring boot from 3.2.2 to 3.3.1 2024-07-13 16:38:26 +08:00
YunaiV 88b897ca13 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-07-12 09:34:44 +08:00
芋道源码 90fa7be660
!1006 AI 大模型的草稿提交（code review 代码） 
Merge pull request !1006 from 芋道源码/master-jdk21-ai
 2024-07-12 01:29:43 +00:00
YunaiV a19bd126e1 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-07-07 17:00:16 +08:00
YunaiV f78d13a83c 【代码优化】AI：完善各种注释 2024-07-03 21:11:10 +08:00
dhb52 ba40c1f699 fix: 改用kingbase8官方驱动,jdbc-url 2024-06-06 23:30:40 +08:00
dhb52 a5081b94f5 feat: 华为opengauss支持 2024-06-05 23:05:58 +08:00
YunaiV 16a47bde5b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21-ai 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
 2024-05-08 09:12:25 +08:00
YunaiV 8428cc5b99 【发版】全局：2.1.0 发版 2024-05-04 09:44:20 +08:00
YunaiV c52ec92b05 【发版】全局：2.1.0 发版 2024-05-04 09:38:21 +08:00
YunaiV ab00986a1d Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-05-01 08:37:56 +08:00
YunaiV e859b76231 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/DatabaseDocController.java
 2024-04-22 19:14:27 +08:00
YunaiV ff5276998c 【移除】数据库文档，简化项目的复杂度 2024-04-22 19:14:10 +08:00
YunaiV 5d58037d05 优化：将 hutool-all 6.0 版本替换成 hutool-extra，减少依赖 2024-04-22 19:01:25 +08:00
YunaiV bf70707719 解决 rocketmq 在 spring boot 3.x 的兼容性 2024-04-15 12:34:06 +08:00
YunaiV 51999be6b0 移除 resilience4j 组件 2024-04-10 21:01:15 +08:00
YunaiV 2e03dcba69 移除 resilience4j 组件 2024-04-10 20:57:44 +08:00
cherishsince 0e277b71e1 删除 spring-ai-bom 依赖 2024-04-10 20:01:05 +08:00
YunaiV 337ae04551 AI：code review chat 部分的代码（mj） 2024-04-09 09:31:56 +08:00
YunaiV 01cfa60a64 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-biz-operatelog/src/main/java/cn/iocoder/yudao/framework/operatelog/core/aop/OperateLogAspect.java
#	yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo01/Demo01ContactController.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo02/Demo02CategoryController.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/demo/demo03/Demo03StudentController.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobController.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/JobLogController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/PayRefundController.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApi.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogCreateReqDTO.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogV2CreateReqDTO.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/dict/DictDataController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/errorcode/ErrorCodeController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.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/sensitiveword/SensitiveWordController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsLogController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/logger/OperateLogServiceImplTest.java
 2024-04-04 02:14:02 +08:00
YunaiV 20583417a4 【重构】V2 操作日志转正，基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:49:49 +08:00
YunaiV b4e602bbd4 全局：增加 VO 数据翻译的支持 2024-04-01 12:51:45 +08:00
YunaiV beea186507 全局：增加 VO 数据翻译的支持 2024-04-01 12:42:27 +08:00
YunaiV dc466d2286 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/UReportDataController.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/controller/admin/ureport/vo/UReportDataSaveReqVO.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/security/config/SecurityConfiguration.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/config/UReportConfiguration.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDataSource.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportDatabaseProvider.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/framework/ureport/core/UReportFilter.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataService.java
#	yudao-module-report/yudao-module-report-biz/src/main/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImpl.java
#	yudao-module-report/yudao-module-report-biz/src/test/java/cn/iocoder/yudao/module/report/service/ureport/UReportDataServiceImplTest.java
 2024-03-30 20:45:11 +08:00
YunaiV dcf6cc293e BPM：【移除】Ureport 的实现，因为和 Spring Boot 兼容性较差 2024-03-30 20:44:45 +08:00
cherishsince 33d77b9b16 配置 yudao-dependencies spring-ai依赖 2024-03-03 20:19:06 +08:00
YunaiV c3717b68c8 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-02-28 21:42:48 +08:00
YunaiV 1f4889c68e ✨ 全局：将 dict 组件，融合到 excel 组件里，减少 starter 2024-02-28 21:42:32 +08:00
YunaiV 91b3c16a90 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-02-28 21:04:19 +08:00
YunaiV 6dcb1277b3 ✨ 全局：迁移 pay 组件到 pay 模块，迁移 flowable 组件到 bpm 模块 2024-02-28 21:03:40 +08:00
YunaiV 0dc23d38b9 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java
 2024-02-28 20:32:16 +08:00
YunaiV 0317e4279d ✨ 全局：简化 captcha 组件，融合到 system 模块 2024-02-28 20:31:55 +08:00
YunaiV 746133226f Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileContentDAOImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/framework/file/core/s3/S3FileClientTest.java
 2024-02-28 19:08:05 +08:00
YunaiV 77d634038c ✨ 全局：简化 file 组件，融合到 infra 模块 2024-02-28 18:59:33 +08:00
YunaiV fb66b2768e ✨ 2.0.1 版本发布准备 2024-02-17 21:41:02 +08:00
YunaiV 20f8cb1606 ✨ 2.0.1 版本发布准备 2024-02-17 21:01:59 +08:00
YunaiV 3367b4b6d4 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-27 13:09:40 +08:00
YunaiV 35205edff9 ✨ 全局：将 sms 融合到 system 模块里，减少 starter 2024-01-27 13:09:25 +08:00
YunaiV 1b264365d3 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-01-27 10:26:22 +08:00
YunaiV 5b69df074c ✨ 全局：将 banner、error-code、desensitize 融合到 web 组件里，减少 starter 2024-01-27 10:25:25 +08:00
YunaiV 0dff03b8b1 🔥 2.0.0 版本发布准备~ 2024-01-26 20:37:38 +08:00
YunaiV a039ab3a64 bugfix：redisson 版本过高，导致 Tuple NoClassDefFoundError 2024-01-22 21:09:39 +08:00
YunaiV 499134cfa2 ✨ 降低 podam 到 7.2.11，解决 Spring Boot 2.X 单测报错问题 2024-01-20 00:20:51 +08:00
YunaiV 2cdf61a56b ✨ 升级最新依赖 2024-01-19 22:47:30 +08:00
YunaiV fcef0f7f50 ✨ 升级最新依赖 2024-01-19 22:40:59 +08:00
YunaiV a9891405aa ✨ 统一 JDK8 和 JDK21 相关代码 2024-01-19 12:39:10 +08:00
YunaiV 290f45dd6e Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 
# Conflicts:
#	yudao-server/src/main/resources/application-local.yaml
 2023-12-30 20:11:07 +08:00
YunaiV 8a947990f4 🐛 升级 easyexcel 依赖，解决 JDK21 导出报错 2023-12-30 19:22:58 +08:00
YunaiV 078ead536b 🐛 REPORT：支持 SaaS 租户模式 2023-12-30 10:30:47 +08:00
puhui999 3bab9748db 系统操作日志：使用自定义 starter 的方式重新集成 mzt-biz-log 2023-12-19 09:20:47 +08:00
puhui999 c5cc818a49 系统操作日志：集成 mzt-biz-log 2023-12-12 22:29:40 +08:00
YunaiV 98697ee075 ⬆️ 2023-12-07 20:48:11 +08:00
liuhongfeng 8507fa9172 【新增】ureport2 集成 2023-12-06 21:02:25 +08:00
YunaiV eeeafcc10c 1.9.0 版本发布 2023-11-30 21:14:13 +08:00
YunaiV a1e6348a37 移除 weixin starter 组件，直接改成 wxjava starter 2023-11-26 17:08:16 +08:00
芋道源码 ee25b8aedb
!752 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖，减少 starter 
Merge pull request !752 from 芋道源码/feature/justauth-op
 2023-11-26 03:42:16 +00:00
YunaiV 1941a7b3e6 websocket：重新封装 websocket 组件，支持 token 认证，并增加 WebSocketMessageListener 方便处理消息 2023-11-22 23:17:50 +08:00
YunaiV 822e441765 使用 justauth 替代现有 yudao-spring-boot-starter-biz-social 依赖，减少 starter 2023-11-20 23:27:41 +08:00
芋道源码 497d826ac4
!711 增加 RocketMQ、Kafka、RabbitMQ 消息队列的支持 
Merge pull request !711 from 芋道源码/feature/mq-optimize
 2023-11-02 12:53:26 +00:00
zhijiantianya@gmail.com f8ed0e15f0 mq：增加 kafka、rocketmq、rabbitmq 的实现支持 2023-11-01 19:58:56 +08:00
xingyu 7767a8f837 chore: up mybatis-plus-join 1.4.7 2023-10-30 18:17:17 +08:00
YunaiV 3fdc132c17 1.8.3 版本发布 2023-10-24 20:53:37 +08:00
xingyu 98561731f5 chore: update deps 2023-10-23 11:38:55 +08:00
xingyu f0d3614c34 fix: reset config 2023-10-23 11:38:41 +08:00
xingyu f3f2efcced feat: update springboot 2.7.17 2023-10-23 11:38:01 +08:00
wangfy 62f821abf2 wangfangyuan,fix:修改springdoc版本，解决Swagger文档都是form提交。 2023-09-28 23:15:00 +08:00
芋道源码 56c4595058
!633 up springboot 2.7.16 
Merge pull request !633 from xingyu/feature/v2.7.16
 2023-09-25 01:41:32 +00:00
YunaiV 9b7c757942 1.8.2 版本发布 2023-09-24 23:24:24 +08:00
xingyu 63fee66657 chore: update okio fix minio bug 2023-09-24 18:04:48 +08:00
xingyu 13f135abe9 chore: update deps 2023-09-24 17:44:35 +08:00
xingyu a98a7c7645 chore: lombok 1.18.30 2023-09-24 17:38:18 +08:00
xingyu 22041b6f8d chore: hutool 5.8.22 2023-09-24 17:36:42 +08:00
xingyu 8187398bdf chore: springboot 2.7.16 2023-09-24 17:36:09 +08:00
YunaiV 9630f236f8 Merge branch 'feature/auth' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	README.md
 2023-09-19 22:28:45 +08:00
YunaiV 436fef7efa 1. 移除 netty-all，减少依赖 
2. 修复 xss 无法禁用的问题
 2023-09-17 00:37:11 +08:00
YunaiV 62c4838ba7 默认禁用 spring boot admin 的启动 2023-09-16 15:30:02 +08:00
xingyu 437131cc7a Merge remote-tracking branch 'origin/master' into feature/auth 
# Conflicts:
#	yudao-dependencies/pom.xml
 2023-09-13 12:00:10 +08:00
YunaiV 8b50cd9661 Merge branch 'feature/mall_product' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
 Conflicts:
	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationRecordController.java
	yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/ErrorCodeConstants.java
	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
 2023-09-11 16:19:55 +08:00
xingyu 1184b46c40 chore: up justauth 1.0.4 2023-09-11 12:21:46 +08:00
xingyu 97a91e5454 chore: up hutool 5.8.21 2023-09-11 11:29:14 +08:00
xingyu c5b78a2af5 chore: up druid 1.2.19 2023-09-11 11:25:12 +08:00
xingyu e1b92c3d64 chore: up springboot 2.7.15 2023-09-11 11:22:20 +08:00
YunaiV 5808f77ade code review：订单分佣 2023-09-08 00:29:25 +08:00
YunaiV b3d3efc8c4 升级 springdoc、knife4j 版本 2023-09-07 12:59:36 +08:00
YunaiV fcca69d243 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 2023-09-06 20:41:52 +08:00
zhijiantianya@gmail.com beb385aab4 修复 revision 在 Maven install、deploy 时，不替换为版本号的问题 2023-09-06 20:04:29 +08:00
xingyu 1a999cbb75 chore: up mybatis-plus 3.5.3.2 2023-08-12 18:09:19 +08:00
xingyu 59e6006572 chore: up deps version 2023-07-29 11:26:06 +08:00
xingyu 402a3809a3 chore: up springboot 2.7.14 2023-07-29 11:23:13 +08:00
YunaiV 7f657ee931 优化 mp-java 库的依赖管理 2023-07-27 23:15:49 +08:00
YunaiV 859cf74a6c 对齐 boot 与 cloud 的代码 2023-07-27 13:00:52 +08:00
YunaiV 21b3744544 1.8.0 版本发布 2023-07-27 07:45:04 +08:00
芋道源码 870873e480
!540 修复部分问题，升级依赖 
Merge pull request !540 from xingyu/feature/captcha
 2023-07-25 11:20:04 +00:00
xingyu c95a1d0a7d chore: up springboot 2.10.13 2023-07-21 17:53:40 +08:00
YunaiV 23e3c4d0d9 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product 2023-07-02 23:45:48 +08:00
芋道源码 11c4c950b7
回退 'Pull Request !518 : 添加华为云 maven 升级依赖' 2023-07-02 15:41:26 +00:00
xingyu 3e9768374b chore: up justauth 1.0.1 captcha-plus 1.0.5 2023-06-26 22:19:20 +08:00
xingyu 7ad3b6ad2b chore: use com.xingyuv.justauth 2023-06-26 21:08:56 +08:00
xingyu c1782c432f chore: up deps version 2023-06-26 16:50:20 +08:00
xingyu d44c29296d chore: up hutool 5.8.20 Lombok 1.18.28 2023-06-26 16:49:33 +08:00
xingyu 02fe0329e4 chore: up druid 1.2.18 2023-06-26 16:29:26 +08:00
xingyu bdb18b4ced chore: up springboot 2.7.13 2023-06-26 16:26:38 +08:00
chenchen 2672b3e2fa fix 依赖启动问题 2023-06-19 10:19:47 +08:00
xingyu 7fc1016e90 chore: up captcha-plus 1.0.4 2023-06-19 09:47:18 +08:00
YunaiV 8d58b1e862 Bump guava from 31.1-jre to 32.0.0-jre in /yudao-dependencies #96 2023-06-17 14:19:26 +08:00
YunaiV a4c11b890c fix(sec): upgrade commons-net:commons-net to #98 2023-06-17 14:17:24 +08:00
YunaiV 749fe9d515 回退验证码到 1.0.2 2023-06-17 12:19:46 +08:00
xingyu b892a6d2bd feat: captcha-plus 1.0.4 2023-06-14 18:00:14 +08:00
xingyu cd33f68e2b chore: up springboot 2.10.12 2023-06-14 16:50:46 +08:00
YunaiV 382c3a4699 v1.7.3 版本发布啦~~~ 2023-05-29 23:13:45 +08:00
walker_lee 39e52cb145 fix: 修复easyexecl3.3.0 bug引起导出表格异常(java.lang.NoClassDefFoundError: com/alibaba/excel/support/util/CollectionUtils),详见https://github.com/alibaba/easyexcel/issues/3174 2023-05-18 17:30:54 +08:00
芋道源码 12d6c14b1c
!469 修复 vue3 代码生成 api 模版错误 && 修复过期属性 
Merge pull request !469 from xingyu/fix/vue3_codegen
 2023-05-15 14:36:53 +00:00
芋道源码 bb949d991a
!481 解决tika库报错 
Merge pull request !481 from 灬霍霍/master
 2023-05-15 13:27:40 +00:00
YunaiV cf61b6056a !474 增加达梦数据库的驱动和SQL文件 2023-05-15 21:18:48 +08:00
灬霍霍 21499a4d40
update yudao-dependencies/pom.xml. 
解决tika报错，升级common-io到2.11.0

Signed-off-by: 灬霍霍 <416970882@qq.com>
 2023-05-15 01:42:48 +00:00
LiuZijian 8ec0be01a8 新增：达梦数据库驱动，KeyGenerator 2023-05-09 14:03:45 +08:00
xingyu d25062ec81 chore: up springboot 2.7.11 2023-05-08 10:04:57 +08:00
xingyu da2810dece chore: up easyexcel 3.3.0 2023-05-06 16:36:42 +08:00
xingyu 6a4616b6ea chore: up springdoc 1.7.0 2023-05-06 16:32:28 +08:00
xingyu 235882791f chore: up druid 1.2.17 2023-05-06 16:30:05 +08:00
xingyu 5b13c07e01 chore: up springboot 2.7.11 2023-05-06 16:28:53 +08:00
xingyu be01cd4894 chore: up mapstruct 1.5.5.Final 2023-05-06 16:26:31 +08:00
xingyu 023322cb25 chore: up hutool 5.8.18 2023-05-06 16:24:29 +08:00
YunaiV 535413804b 1.7.2 版本发布 2023-04-19 20:44:19 +08:00
xingyuv 67ac794c62 feat: knife4j 4.1.0 2023-04-13 17:39:48 +08:00
xingyuv 7265300f31 chore: 升级最新依赖 2023-04-13 15:46:01 +08:00
xingyuv e3d74b1713 chore: 升级最新依赖 2023-04-13 15:44:20 +08:00
xingyuv 844d102a65 chore: up springboot 2.7.10 2023-04-13 15:43:01 +08:00
xingyuv 01902c4345 chore: up minio 8.5.2 2023-04-13 14:53:36 +08:00
xingyuv f839f89e93 chore: up esayexcel 3.2.1 2023-04-13 14:52:43 +08:00
xingyuv 70f632852b chore: up hutool 5.8.15 2023-04-13 14:51:50 +08:00
wangzhs f9569f910f 切换 Mybatis-plus-join 依赖 2023-03-13 18:32:43 +08:00
wangzhs 670f67e551 新增 mybatis-plus-join 2023-03-11 17:47:15 +08:00
YunaiV 47d3f0bc9a 1.7.1 版本发布 2023-03-05 19:46:03 +08:00
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
 2023-02-04 20:58:09 +08:00
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
 2023-02-04 10:21:45 +08:00
xingyu 8c4bdccd48 up captcha-plus 1.0.2 2023-01-31 09:31:41 +08:00
xingyu c6f880bfc1 up springboot 2.7.8 2023-01-31 09:28:07 +08:00
xingyu 08a4de37c2 Merge remote-tracking branch 'origin/master' into feature/springdoc 
# Conflicts:
#	README.md
 2023-01-30 10:08:31 +08:00
YunaiV c04ef59e81 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 2023-01-30 08:11:24 +08:00
YunaiV ca8bb72417 版本 1.7.0 发布：增加微信公众号、站内信、邮箱、数据脱敏！ 2023-01-30 02:30:42 +08:00
xingyu ffb0358ce2 Merge remote-tracking branch 'origin/master' into feature/springdoc 2023-01-29 16:11:51 +08:00
xingyu 756dca6332 update: springboot 2.7.8 2023-01-29 12:09:41 +08:00
xingyu 40f6fed29f update: springboot 2.7.8 2023-01-28 09:38:03 +08:00
芋道源码 e7f8e0c507
!372 支持 vo 返回脱敏 
Merge pull request !372 from 与或非/issues/I3QPZV
 2023-01-19 13:59:34 +00:00
芋道源码 2a332a95f9
!376 重构 滑块验证码实现 vue3 自动引入 
Merge pull request !376 from xingyu/dev
 2023-01-19 01:24:20 +00:00
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
 2023-01-18 15:39:58 +08:00
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
 2023-01-18 00:38:55 +08:00
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