p38192567
/
ruoyi-vue-pro1
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,483 Commits 8 Branches 31 Tags 233 MiB
Commit Graph

7483 Commits

Author SHA1 Message Date
YunaiV 8f6be354f9 【依赖】knife4j from 4.3.0 to 4.5.0 2024-07-16 00:02:04 +08:00
YunaiV 15e704d2d1 【依赖】rocketmq from 2.2.3 to 2.3.0 2024-07-15 22:57:56 +08:00
YunaiV c081591403 【依赖】redisson from 3.26.0 to 3.32.0 2024-07-15 22:48:03 +08:00
YunaiV 1df7d2cc52 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-07-15 22:30:29 +08:00
YunaiV 968009cb5e 【依赖】redisson from 3.26.0 to 3.32.0 2024-07-15 22:30:17 +08:00
YunaiV c3a3bf028c 【依赖】easy-trans from 1.6.6 to 1.7.8 2024-07-15 12:41:01 +08:00
YunaiV bc365800b5 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-07-15 12:38:42 +08:00
YunaiV 4de27eb12d 【依赖】easy-trans from 1.6.6 to 1.7.8 2024-07-15 12:38:23 +08:00
YunaiV eca0a0422b 【依赖】jimureport from 1.6.6 to 1.7.8 2024-07-14 22:01:20 +08:00
YunaiV 2e3f998ee7 【依赖】jimureport from 1.6.6 to 1.7.8 2024-07-14 22:01:03 +08:00
YunaiV 438078d28f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-report/yudao-module-report-biz/pom.xml
 2024-07-14 21:58:59 +08:00
YunaiV 211e196fce 【依赖】jimureport from 1.6.6 to 1.7.8 2024-07-14 21:57:52 +08:00
YunaiV 85090b8224 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-07-13 23:35:55 +08:00
YunaiV bea66e5c6f 【代码优化】全局：复用 MyBatis Plus 数据权限插件，简化项目的数据权限实现 2024-07-13 23:35:39 +08:00
YunaiV 0566f5fa93 【依赖】mybatis-plus from 3.5.5 to 3.5.7 2024-07-13 22:52:23 +08:00
YunaiV 3e3407eb99 Merge branch 'master-jdk17' 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/dataobject/file/FileConfigDO.java
#	yudao-module-mp/yudao-module-mp-biz/src/main/java/cn/iocoder/yudao/module/mp/dal/dataobject/message/MpMessageDO.java
 2024-07-13 22:43:33 +08:00
YunaiV 2b39b434fa 【依赖】mybatis-plus from 3.5.5 to 3.5.7 2024-07-13 22:42:54 +08:00
YunaiV ff0c1cfd7f 【依赖】工具类升级 2024-07-13 17:37:45 +08:00
YunaiV d0d951fd48 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
 2024-07-13 17:33:33 +08:00
YunaiV 40deb00a00 【依赖】工具类升级 2024-07-13 17:33:15 +08:00
YunaiV a85c29d642 【升级】podam from 8.0.1 to 8.0.2 2024-07-13 17:09:47 +08:00
YunaiV 477c5d6ab3 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-07-13 17:07:59 +08:00
YunaiV f1c654f5a4 【依赖】podam from 8.0.1 to 8.0.2 2024-07-13 17:07:18 +08:00
YunaiV d71bac7138 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-07-13 16:58:54 +08:00
YunaiV 782f3337dd 【依赖】spring boot admin from 3.2.1 to 3.3.2 2024-07-13 16:58:36 +08:00
YunaiV da4679e247 【依赖】druid from 1.2.21 to 1.2.23 2024-07-13 16:48:16 +08:00
YunaiV 375745828b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
 2024-07-13 16:39:15 +08:00
YunaiV 45805aa761 【依赖】spring boot from 3.2.2 to 3.3.1 2024-07-13 16:38:26 +08:00
YunaiV e591c1869a Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuConversationServiceImpl.java
 2024-07-13 16:31:40 +08:00
YunaiV aff7919780 【同步】Boot 和 Cloud 的功能同步 2024-07-13 12:55:56 +08:00
YunaiV dee820b8fd 【功能新增】MALL：新增 mall 客服 2024-07-13 12:25:55 +08:00
YunaiV 03e07a2902 【功能新增】MALL：新增 mall 客服 2024-07-13 12:24:49 +08:00
YunaiV ce1940e4f3 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/brokerage/AppBrokerageUserController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/social/AppSocialUserController.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
 2024-07-13 12:14:46 +08:00
YunaiV 41afea6818 【功能新增】MALL：新增 mall 客服 2024-07-13 12:14:07 +08:00
芋道源码 b586a09b90
!1011 新增 mall 客服 
Merge pull request !1011 from 芋道源码/develop
 2024-07-13 04:11:46 +00:00
YunaiV e95f69b683 【同步】Boot 和 Cloud 的功能同步 2024-07-13 12:03:44 +08:00
YunaiV 8d1d0c15f7 【同步】Boot 和 Cloud 的功能同步 2024-07-13 12:03:26 +08:00
YunaiV d349557166 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-07-13 11:27:22 +08:00
芋道源码 3aad33c3cd
!1013 新增文心一言、智谱 AI 的绘图能力 
Merge pull request !1013 from 芋道源码/master-jdk21-ai
 2024-07-13 02:47:49 +00:00
YunaiV a18682e874 README：新增关于 AI 大模型的介绍 2024-07-13 10:18:08 +08:00
YunaiV 73502d565f 【代码优化】AI：ChatGlm 替换成 ZhiPuAiImage 实现 2024-07-13 00:06:48 +08:00
YunaiV 8da0807242 【代码评审】SYSTEM：华为云 client 的 review 2024-07-12 23:16:34 +08:00
芋道源码 af5be1bcb2
!1012 【修复】恢复 websocket path 
Merge pull request !1012 from puhui999/develop
 2024-07-12 11:56:52 +00:00
puhui999 ec5a209eed 【修复】恢复 websocket path 2024-07-12 18:01:30 +08:00
cherishsince 4311fe4517 【增加】image 对接 Chatglm 模型 2024-07-12 15:44:59 +08:00
cherishsince 2ae90b9edc Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai 2024-07-12 15:03:41 +08:00
cherishsince d865cc293b 【增加】chatglm 实现 spring ai 标准 2024-07-12 15:03:34 +08:00
芋道源码 528200f326
!997 华为短信client实现，基于API方式 
Merge pull request !997 from scholarli/develop
 2024-07-12 05:07:01 +00:00
YunaiV 88b897ca13 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-07-12 09:34:44 +08:00
YunaiV c3af08900c 【模块新增】AI：支持通义千问、文心一言、讯飞星火、智谱、DeepSeek 等国内外大模型能力 2024-07-12 09:32:17 +08:00