yudao
/
spring-cloud
mirror of https://gitee.com/zhijiantianya/yudao-cloud.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,243 Commits
3 Branches
33 Tags
59 MiB
Commit Graph

2243 Commits (5a2668a5e5b42e3fd7132c3566a8717795ce09f8)

Author SHA1 Message Date
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
zk 67696f9d51 bugfix：修复vue2版本导出undefined问题 2024-07-09 15:47:05 +08:00
芋道源码 e45ccc9e8a
!124 【修复】分销用户绑定时判断是否为新用户逻辑错误问题 
Merge pull request !124 from 孙南北/master-jdk17
 2024-07-07 01:45:42 +00:00
DESKTOP-10IP77O\13403 20416d842e 修复nacos-client=2.0.4控制台异常,升级spring.cloud.alibaba.version=2021.0.5.0 2024-07-04 20:36:22 +08:00
孙楠博 2414b00083 【修复】分销用户绑定时判断是否为新用户逻辑错误问题 2024-06-25 13:54:21 +08:00
今晚打老虎 ced838f29f
fix(bpm): 发起用户可能没有部门 
发起用户可能没有部门，导致查询部门信息时报错

Signed-off-by: 今晚打老虎 <fengjiajie11@qq.com>
 2024-06-25 04:42:14 +00: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
YunaiV 0ba330f3fe Merge branch 'master' of https://github.com/YunaiV/yudao-cloud 2024-06-04 21:44:23 +08:00
YunaiV bad90e3471 Merge remote-tracking branch 'origin/master' 2024-06-04 21:44:02 +08:00
YunaiV 5c610b2df5 同步 HTTP 请求签名 2024-06-04 21:43:56 +08:00
YunaiV 0ee01346d0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/pom.xml
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
 2024-06-04 21:34:48 +08:00
YunaiV d1e13f4b82 【修复】docker build yudao-module-pay-biz image fail 2024-06-04 21:12:40 +08:00
芋道源码 bbf7231bf6
Merge pull request #157 from testwill/Dockerfile 
fix: docker build yudao-module-pay-biz image fail
 2024-06-04 21:10:54 +08:00
芋道源码 61f82468c4
Merge pull request #159 from dengyumin/patch-2 
fix: Remove duplicate dependencies in pom.xml
 2024-06-04 21:10:18 +08:00
YunaiV 873fbf596c 【修复】CRM：CrmBusinessStatusDO 缺少 BaseDO 2024-06-04 19:38:53 +08:00
YunaiV 025857c9f2 【同步】对齐 boot 和 cloud 的逻辑 2024-06-04 19:23:20 +08:00
小民同学 ab642c615e
fix: Remove duplicate dependencies in pom.xml 2024-05-31 16:46:59 +08:00
guoguangwu f9be4f7448 fix: docker build yudao-module-pay-biz image fail 
Signed-off-by: guoguangwu <guoguangwug@gmail.com>
 2024-05-30 16:27:45 +08:00
芋道源码 1889822deb
!114 更新角色时，记录修改内容 
Merge pull request !114 from syubun/master
 2024-05-11 15:53:22 +00:00
芋道源码 cab5ce9856
!113 修正ERP业务类型枚举中的销售出库 
Merge pull request !113 from 咖啡不苦/fixbug
 2024-05-11 15:52:35 +00:00
芋道源码 972e795d6b
!116 【System模块】短信验证码前置补零对其endCode长度 
Merge pull request !116 from aqiangaqiang/master
 2024-05-11 15:46:44 +00:00
aqiangaqiang b4151b62eb
【System模块】短信验证码前置补零对其endCode长度 
Signed-off-by: aqiangaqiang <11317238+aqiangaqiang@user.noreply.gitee.com>
 2024-05-10 00:59:31 +00:00
syubun fbc6ae07e4 更新角色时，记录修改内容 2024-05-07 11:09:56 +08:00