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 |
|
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 |
|
刘华
|
06d322f9f7
|
修正ERP业务类型枚举-销售出库
|
2024-05-05 12:06:56 +08:00 |
|
YunaiV
|
4ca583cbe8
|
【发版】全局：2.1.0 发版
|
2024-05-04 09:52:40 +08:00 |
|
YunaiV
|
2bd9fd97bb
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-dependencies/pom.xml
# yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/db/DatabaseTableServiceImpl.java
|
2024-05-04 09:48:50 +08:00 |
|
YunaiV
|
328445f7c0
|
【发版】全局：2.1.0 发版
|
2024-05-04 09:47:03 +08:00 |
|
YunaiV
|
1e106844e8
|
【同步】boot 和 cloud 版本
|
2024-05-04 09:45:51 +08:00 |
|
YunaiV
|
6fc6fb1bc8
|
【优化】GlobalExceptionHandler 新增 IGNORE_ERROR_MESSAGES，用于忽略“无效的刷新令牌”等非关键提示
|
2024-05-03 09:53:00 +08:00 |
|
YunaiV
|
1e23316fb1
|
【修复】MySQL jdbc 连接 5.7 示例不正确
|
2024-05-03 09:11:22 +08:00 |
|
YunaiV
|
d1ed445298
|
【优化】将 jdk17 的 List.of 替换成 ListUtil.of，提供更好的 jdk8 兼容性
|
2024-05-01 12:45:45 +08:00 |
|
YunaiV
|
86e5149ac6
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPortraitServiceImpl.java
|
2024-05-01 12:45:15 +08:00 |
|
YunaiV
|
61d8836c2d
|
【优化】将 jdk17 的 List.of 替换成 ListUtil.of，提供更好的 jdk8 兼容性
|
2024-05-01 12:44:48 +08:00 |
|
YunaiV
|
d10e5fc63f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
|
2024-05-01 12:14:42 +08:00 |
|
YunaiV
|
bed86d84d4
|
【优化】README，将版本说明提前
|
2024-05-01 12:14:13 +08:00 |
|
YunaiV
|
74bc3b3fd2
|
【同步】对齐 boot 和 cloud 的逻辑
|
2024-05-01 09:36:34 +08:00 |
|
YunaiV
|
9d8f924fec
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts:
# pom.xml
# yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/portrait/CrmStatisticsPortraitReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/post/PostSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataPageReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuRespVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuSaveVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleRespVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleSaveReqVO.java
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
|
2024-05-01 09:32:36 +08:00 |