Commit Graph

1809 Commits (b57f6716177f476dada85bb402ff22e4752364d5)

Author SHA1 Message Date
YunaiV b57f671617 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-14 19:00:32 +08:00
YunaiV 653dacfa6f 【代码优化】ERP:移除 bootstrap.yaml,和 boot 保持一致
【代码优化】CRM:移除 bootstrap.yaml,和 boot 保持一致
2024-07-14 19:00:15 +08:00
YunaiV 63c900d02f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-14 18:51:08 +08:00
YunaiV f52ea83b30 【代码优化】AI:移除 bootstrap.yaml,和 boot 保持一致 2024-07-14 18:50:59 +08:00
YunaiV 2ab6ac5d40 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-14 18:45:35 +08:00
YunaiV ee7cde1b03 【代码优化】MP:移除 bootstrap.yaml,和 boot 保持一致 2024-07-14 18:45:25 +08:00
YunaiV 1da56a0b44 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-14 18:37:17 +08:00
YunaiV cc6d0c00b7 【代码优化】MEMBER:移除 bootstrap.yaml,和 boot 保持一致 2024-07-14 18:37:06 +08:00
YunaiV e88c03a040 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-local.yaml
2024-07-14 18:27:33 +08:00
YunaiV e84b1dd91b 【代码优化】BPM:移除 bootstrap.yaml,和 boot 保持一致 2024-07-14 18:26:50 +08:00
YunaiV c1d5a7b094 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/resources/application-local.yaml
2024-07-14 18:26:28 +08:00
YunaiV 9f2addc964 【代码优化】BPM:移除 bootstrap.yaml,和 boot 保持一致 2024-07-14 18:25:56 +08:00
YunaiV 3a1fbcd448 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-07-14 18:10:33 +08:00
YunaiV df4bde2e67 【代码优化】INFRA:移除 bootstrap.yaml,和 boot 保持一致 2024-07-14 18:10:23 +08:00
YunaiV 70b887e43f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
2024-07-14 17:48:09 +08:00
YunaiV 4ae3ac0f6d 【代码优化】SYSTEM:移除 bootstrap.yaml,和 boot 保持一致 2024-07-14 17:47:44 +08:00
YunaiV 41a16b2651 【依赖】spring cloud alibaba from 2022.0.0.0 to 2023.0.1.2 2024-07-14 16:52:21 +08:00
YunaiV d610d74e62 【依赖】spring.cloud from 2021.0.5 to 2021.0.9
【依赖】spring.cloud.alibaba from 2021.0.4.0 to 2021.0.6.1

https://github.com/alibaba/spring-cloud-alibaba/wiki/%E7%89%88%E6%9C%AC%E8%AF%B4%E6%98%8E
2024-07-14 10:33:42 +08:00
YunaiV 1d6c72d001 【依赖】mybatis-plus from 3.5.5 to 3.5.7
【代码优化】全局:复用 MyBatis Plus 数据权限插件,简化项目的数据权限实现
2024-07-14 00:07:33 +08:00
YunaiV 6a20f3cb89 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
#	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-14 00:02:35 +08:00
YunaiV 5bc5909194 【依赖】工具类升级 2024-07-14 00:02:15 +08:00
YunaiV 76e4586e20 【依赖】mybatis-plus from 3.5.5 to 3.5.7
【代码优化】全局:复用 MyBatis Plus 数据权限插件,简化项目的数据权限实现
2024-07-14 00:01:39 +08:00
YunaiV 1902feaf6d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2024-07-13 17:42:14 +08:00
YunaiV 670a2bfad0 【依赖】工具类升级 2024-07-13 17:41:52 +08:00
YunaiV d9fca6334d 【依赖】jedis-mock from 1.0.13 to 1.1.2 2024-07-13 17:20:06 +08:00
YunaiV dd93fd30f1 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
2024-07-13 17:11:46 +08:00
YunaiV 9e76582ae6 【依赖】podam from 8.0.1 to 8.0.2 2024-07-13 17:10:57 +08:00
YunaiV 6694e1dfc9 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
2024-07-13 16:59:04 +08:00
YunaiV f9d2d3a7e2 【依赖】spring boot admin from 3.2.1 to 3.3.2 2024-07-13 16:58:43 +08:00
YunaiV 45c4fff0ac 【依赖】spring boot from 3.2.2 to 3.3.1 2024-07-13 16:51:33 +08:00
YunaiV 58cc529c12 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-dependencies/pom.xml
2024-07-13 16:50:22 +08:00
YunaiV 7e3c290a2d 【依赖】spring boot from 3.2.2 to 3.3.1 2024-07-13 16:50:05 +08:00
YunaiV 59f6d5cdf7 【依赖】spring boot from 3.2.2 to 3.3.1 2024-07-13 16:29:40 +08:00
YunaiV 69562e1463 【同步】Boot 和 Cloud 的功能同步 2024-07-13 15:59:52 +08:00
YunaiV a9d91250f5 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	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-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientService.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
2024-07-13 12:57:43 +08:00
YunaiV b8f1d01733 【同步】Boot 和 Cloud 的功能同步 2024-07-13 12:56:09 +08:00
YunaiV 63393108e9 【同步】Boot 和 Cloud 的功能同步 2024-07-13 12:10:05 +08:00
YunaiV c0b196bd07 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
2024-07-13 12:04:48 +08:00
YunaiV 3b8675dc6a 【同步】Boot 和 Cloud 的功能同步 2024-07-13 12:03:51 +08:00
YunaiV a8a134063f 【模块新增】AI:支持通义千问、文心一言、讯飞星火、智谱、DeepSeek 等国内外大模型能力 2024-07-13 11:32:34 +08:00
YunaiV 700a0996c4 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
#	pom.xml
2024-07-13 11:28:47 +08:00
YunaiV c6937cf199 【模块新增】AI:支持通义千问、文心一言、讯飞星火、智谱、DeepSeek 等国内外大模型能力 2024-07-13 11:26:17 +08:00
YunaiV 95936e4a0b Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17 2024-07-13 10:17:48 +08:00
YunaiV b9fbf762bd README:新增关于 AI 大模型的介绍 2024-07-13 10:17:42 +08:00
芋道源码 e45ccc9e8a
!124 【修复】分销用户绑定时判断是否为新用户逻辑错误问题
Merge pull request !124 from 孙南北/master-jdk17
2024-07-07 01:45:42 +00:00
孙楠博 2414b00083 【修复】分销用户绑定时判断是否为新用户逻辑错误问题 2024-06-25 13:54:21 +08:00
芋道源码 7295b6a10d
!122 【修复】多租户使用同一个流程标识key时查询报错
Merge pull request !122 from 今晚打老虎/master-jdk17
2024-06-22 06:24:20 +00:00
芋道源码 7722162bf3
!120 修复后台获取商品 SPU 分页列表数据时,数据会出现错乱问题。
Merge pull request !120 from dongdong.xiang/master_jdk17_page_v20240618
2024-06-22 00:43:25 +00:00
fengjiajie 42634c0e3f fix(bpm): 多租户使用同一个流程标识key时查询报错 2024-06-21 14:59:33 +08:00
dongdong.xiang 634ef9b5a8 bug修复 后台获取商品 SPU 分页列表数据时,数据会出现错乱问题 2024-06-18 22:16:53 +08:00