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

2091 Commits (14c49629b78b5e09375a6cf32cc4185247f50909)

Author SHA1 Message Date
Lcp 538b5f5d3c 【功能修复】多租户下定时任务结果处理都为失败问题 2024-09-14 22:11:51 +08:00
筱龙缘 74e5d005f7
修复发货后订单操作日志快递公司显示错误问题 
订单操作日志：已发货，快递公司：{deliveryName}，快递单号：90092131231

Signed-off-by: 筱龙缘 <794334212@qq.com>
 2024-09-13 08:25:00 +00:00
YunaiV 85020318db 【功能优化】websocket 允许不传递 token 连接 2024-09-12 13:59:49 +08:00
YunaiV 5f7e089bd1 【功能修复】定时任务在多租户下，没有记录执行的日志结果 2024-09-12 13:39:26 +08:00
YunaiV 628cfe2296 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/seckill/SeckillActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillConfigController.java
 2024-09-09 21:10:50 +08:00
YunaiV 9a49b84f27 【同步】BOOT 和 CLOUD 的功能 2024-09-09 21:08:44 +08:00
YunaiV 1209a63c18 【功能修复】商城：promotion 服务启动失败的问题 2024-09-09 20:58:22 +08:00
YunaiV edcb29d4c6 【同步】BOOT 和 CLOUD 的功能 2024-09-07 21:05:27 +08:00
YunaiV 7d9785ad79 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/apilog/config/YudaoApiLogAutoConfiguration.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/dto/CombinationRecordCreateReqDTO.java
#	yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApi.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/combination/CombinationRecordApiImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/coupon/CouponApiImpl.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/vo/coupon/AppCouponMatchReqVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationRecordServiceImpl.java
#	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/aftersale/AppAfterSaleController.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/brokerage/BrokerageRecordService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageRecordServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/handler/TradeCouponOrderHandler.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.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/service/sms/SmsChannelServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
 2024-09-07 20:57:15 +08:00
YunaiV 134b8e417b 【功能优化】AI：model-uri、tokenizer 地址调整 2024-09-07 14:58:32 +08:00
YunaiV ef3d712e42 【功能优化】商城：拼团中时，禁止发起售后 2024-09-07 14:07:16 +08:00
YunaiV d2f0c00d8f 【同步】BOOT 和 CLOUD 的功能 2024-09-07 12:46:56 +08:00
YunaiV 1dea81fd0c 【同步】BOOT 和 CLOUD 的功能 2024-09-07 08:42:06 +08:00
YunaiV 561edb80ac 【代码优化】框架：简化 api 访问日志、错误日志的记录逻辑 2024-09-06 22:36:22 +08:00
YunaiV 1a5755b03a 【代码优化】框架：简化 api 访问日志、错误日志的记录逻辑 2024-09-06 22:03:08 +08:00
YunaiV 975ed4ce10 【功能修复】框架：操作日志异步记录时，丢失 request 的问题 2024-09-06 21:44:17 +08:00
芋道源码 7889a10846
!139 【修复】CRM查询中审批状态标识问题 
Merge pull request !139 from Lcp/pr
 2024-09-06 13:41:25 +00:00
Lcp 618eb0c21d 【代码修复】CRM：获取已回款金额查询中审批状态标识问题 2024-09-06 16:24:49 +08:00
YunaiV 0081f07a6b 【代码优化】全局：MySQL JDBC 增加 rewriteBatchedStatements 批量插入 2024-09-04 09:17:47 +08:00
YunaiV 8ba1966181 【代码优化】SYSTEM：user_role_ids 忽略多租户 2024-09-03 16:11:41 +08:00
YunaiV b35799b593 【功能修复】API 调用时，相关的 checkData 补充 2024-09-03 11:37:47 +08:00
YunaiV a827109ebf 【同步】BOOT 和 CLOUD 的功能 2024-09-01 13:57:21 +08:00
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