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

1969 Commits (e40d1f105e5b5b35fe65f66262bfbed92a22e209)

Author SHA1 Message Date
YunaiV e40d1f105e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/DocServiceImpl.java
 2024-09-01 09:23:30 +08:00
YunaiV b1f6110406 【代码评审】AI 大模型：知识库的逻辑 
【代码优化】AI 大模型：transformer 的 onnx、tokenizer 走 CDN，避免 github
【代码优化】AI 大模型：将 spring-ai 调整成 group.springframework.ai，解决 spring-ai 暂时无法使用阿里云 maven 加速的问题
 2024-09-01 09:23:00 +08:00
YunaiV 7255d25681 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityAutoConfiguration.java
 2024-08-31 13:31:44 +08:00
芋道源码 c5909e4672
Merge pull request #167 from hoha/patch_bpm 
工作流-代办任务查询-时间范围字段
 2024-08-31 13:30:00 +08:00
YunaiV 047252d4fc 【代码修复】SYSTEM：角色标识的提示不正确问题 2024-08-31 13:29:34 +08:00
YunaiV fac4b4f3ae Merge branch 'master' of https://github.com/YunaiV/yudao-cloud 2024-08-31 12:18:07 +08:00
芋道源码 ab0a6b753c
Merge pull request #171 from baymaxxjf/master 
修复nacos-client=2.0.4控制台异常,升级spring.cloud.alibaba.version=2021.0.5.0
 2024-08-31 12:17:01 +08:00
芋道源码 df5077f499
!135 【工作流】：流程模型分页数量查询不正确 
Merge pull request !135 from 今晚打老虎/master-jdk17
 2024-08-31 02:20:54 +00:00
芋道源码 67245d98c9
!130 企业级应用pr 
Merge pull request !130 from 陈晨成/master-jdk17-dev
 2024-08-31 02:19:25 +00:00
YunaiV d39681e98c 【代码修复】SYSTEM：角色标识的提示不正确问题 2024-08-31 10:15:04 +08:00
YunaiV ad59c54fdb 【同步】BOOT 和 CLOUD 的功能 2024-08-31 10:01:47 +08:00
YunaiV d97e54b5cd Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
 2024-08-31 09:57:59 +08:00
芋道源码 e893caf3ad
!131 bugfix 
Merge pull request !131 from 尹先生/master-jdk17
 2024-08-31 01:56:00 +00:00
YunaiV 4bcdfc07ec 【同步】BOOT 和 CLOUD 的功能 2024-08-31 09:53:49 +08:00
YunaiV b160d409f3 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateBaseVO.java
#	yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ApproveServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2CodeServiceImplTest.java
 2024-08-31 09:51:54 +08:00
YunaiV daef8d3b03 【同步】BOOT 和 CLOUD 的功能 2024-08-31 09:51:21 +08:00
DESKTOP-10IP77O\13403 63833c9d61 Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-08-28 22:23:16 +08:00
今晚打老虎 f1412c032c
【工作流】：流程模型分页数量查询不正确 
Signed-off-by: 今晚打老虎 <fengjiajie11@qq.com>
 2024-08-26 07:29:14 +00:00
YunaiV f63b75241b Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-08-26 12:38:48 +08:00
YunaiV 51a37f885b 【代码优化】增强 JDK17、JDK8 之间的兼容性 2024-08-26 12:38:00 +08:00
yinyilong 532e8333f2 bugfix-去除RoleExportExcelVO 2024-08-26 09:28:17 +08:00
1351515658@qq.com b63886ad6c revert 操作日志、访问日志、错误日志 2024-08-24 11:48:24 +08:00
YunaiV 4e200c57f7 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogRespDTO.java
 2024-08-24 11:16:48 +08:00
YunaiV 87955a9751 【功能修复】系统：OperateLogRespDTO 的字段读取 2024-08-24 11:15:52 +08:00
芋道源码 c940d6b48e
!134 翻译userName，RPC报错，修复 
Merge pull request !134 from 口口口/N/A
 2024-08-23 11:55:47 +00:00
口口口 a4abdefa60
翻译userName，RPC报错，修复 
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogRespDTO.java
翻译userName，RPC报错，修复

Signed-off-by: 口口口 <17975121@qq.com>
 2024-08-22 08:58:46 +00:00
jhb 0c7d568244 工作流-代办任务-时间范围 2024-08-19 12:28:16 +08:00
1351515658@qq.com 00ba2d6da9 add 填充日志的创建人和修改人 代码规范整改 2024-08-18 18:42:50 +08:00
1351515658@qq.com be38af728b add ApiSignatureTest代码规范整改 2024-08-18 18:25:37 +08:00
1351515658@qq.com 131fe3a69f fallback 容器使用默认的tomcat 2024-08-18 18:24:59 +08:00
1351515658@qq.com 464fd60637 fallback Api接口还是使用默认的接口实现 2024-08-18 18:24:06 +08:00
YunaiV a4ca9800a4 【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识 2024-08-18 17:30:56 +08:00
YunaiV 68f6270f6a Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	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-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/job/product/ProductStatisticsJob.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/framework/order/config/TradeOrderProperties.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/vo/PayAppBaseVO.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderServiceImpl.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/alipay/AlipayPayClientConfig.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/TencentSmsClient.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/property/SmsChannelProperties.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/SmsClientTests.java
 2024-08-18 17:25:08 +08:00
YunaiV 4ca68ff56a 【功能优化】支付：支付应用，增加 appKey 标识，用于不同接入方的标识 
【更多】同步 boot 最新代码到 cloud
 2024-08-18 17:18:03 +08:00
YunaiV 76e85018f0 【功能优化】添加商品属性时允许选择已有的属性值 2024-08-14 22:58:30 +08:00
YunaiV ac6ebbf421 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/AiMindMapController.java
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/apikey/AiApiKeySaveReqVO.java
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/chatModel/AiChatModelSaveReqVO.java
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/chatRole/AiChatRoleSaveReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java
 2024-08-14 22:56:42 +08:00
YunaiV 720b426f5e 【功能优化】添加商品属性时允许选择已有的属性值 2024-08-14 22:56:15 +08:00
yinyilong 59fc020616 bugfix-增加RoleExportExcelVO，数据范围导出字段从字典表中取值；RoleSaveReqVO中code字段名改为角色标识，保持提示文案一致 2024-08-13 15:35:13 +08:00
yinyilong 35f5ee4677 bugfix-调整GlobalExceptionHandler，增加InvalidFormatException处理对应RequestBody实体中 xx 属性类型为 Integer，结果传递 xx 参数类型为 String 2024-08-12 14:33:01 +08:00
yinyilong 7a86121585 Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17 2024-08-12 14:09:44 +08:00
yinyilong 99a26defa2 bugfix-RoleSaveReqVO备注字段长度限制为500 2024-08-12 14:09:34 +08:00
yinyilong 2c1b6cd16f bugfix-RoleSaveReqVO增加状态字段 2024-08-12 14:08:37 +08:00
YunaiV a2a6e9ad2e 【功能新增】AI：集成 Azure 的 OpenAI 模型 
【功能新增】AI 大模型：支持思维导图的管理
 2024-08-10 19:08:37 +08:00
YunaiV 373c780fee 【代码优化】SYSTEM：移除阿里云、腾讯云 maven 依赖，直接 HTTP 对接 2024-08-09 22:19:34 +08:00
YunaiV cef4c14286 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculator.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/HuaweiSmsClient.java
 2024-08-09 22:13:34 +08:00
YunaiV 4139769131 【代码优化】SYSTEM：移除阿里云、腾讯云 maven 依赖，直接 HTTP 对接 2024-08-09 22:13:01 +08:00
1351515658@qq.com bd706ecfd8 optimize oauth2TokenApi\permissionApi尽量用本地实现类，提升执行效率 2024-08-08 15:42:43 +08:00
YunaiV a042a4c366 【优化】数据脱敏支持 Spring el 表达式，支持根据权限控制脱敏 2024-08-03 19:13:11 +08:00
YunaiV 96b3188c3e V2.2.0 版本发布 2024-08-02 23:27:46 +08:00
YunaiV 7cc51f3945 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
 2024-08-02 23:26:35 +08:00