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

2237 Commits (4c968981eae578d2ed01fe1ec775589f201f03c0)

Author SHA1 Message Date
YunaiV 2cda46df2a Merge branch 'master' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/notify/PayNotifyJob.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderExpireJob.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderSyncJob.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/refund/PayRefundSyncJob.java
 2024-11-22 19:16:36 +08:00
芋道源码 1b6f99deb9
!157 fix: @Resource注解依赖错误 
Merge pull request !157 from Roan123/master
 2024-11-22 11:16:20 +00:00
YunaiV b0dbd40666 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java
 2024-11-22 19:12:53 +08:00
YunaiV 64cdc5f456 【功能修复】全局：jakarta => javax 2024-11-22 19:12:38 +08:00
YunaiV fdd0b28d2b 【缺陷修复】gateway：文档的 ai-server 错误写成 crm-server 2024-11-22 19:10:34 +08:00
Roan 860b099ec4 fix: @Resource注解依赖错误 2024-11-22 16:43:35 +08:00
芋道源码 cf4cbe2f57
!156 fix: 修复 system-api 模块的验证注解导入 
Merge pull request !156 from huangshuai/master
 2024-11-11 05:01:16 +00:00
黄帅 2cd7b0d188 fix: 修复 system-api 模块的验证依赖问题 
将 jakarta.validation 包名改为 javax.validation，以匹配 Spring Boot 2.7.x 版本要求

影响文件：yudao-module-system-api 模块下的 LoginLogCreateReqDTO 类"
 2024-11-11 12:54:28 +08:00
芋道源码 9d4927029b
!155 修复 因 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1053 PR 变更模板变量占用名称导致 订单日志发货快递公司显示异常问题 
Merge pull request !155 from 筱龙缘/N/A
 2024-11-09 10:58:25 +00:00
YunaiV 5912d91abe Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/notify/PayNotifyJob.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderExpireJob.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderSyncJob.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/refund/PayRefundSyncJob.java
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/LoginLogCreateReqDTO.java
 2024-11-09 18:45:01 +08:00
YunaiV dfe018b8ce 【代码优化】infra：s3 minio sdk 替换为 aws sdk 2024-11-09 18:34:50 +08:00
YunaiV d8ae5846cb 【缺陷修复】修复由于多租户定时任务方法返回 void 导致的执行 xxlJob 执行失败的问题。 
ConcurrentHashMap value 不支持 null 值
 2024-11-09 15:13:19 +08:00
筱龙缘 3a1a818c49
修复 因 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1053 PR 变更模板变量占用名称导致 订单日志发货快递公司显示异常问题 
修复 因 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1053 PR 变更模板变量占用名称导致 订单日志发货快递公司显示异常问题

Signed-off-by: 筱龙缘 <794334212@qq.com>
 2024-11-04 03:32:51 +00:00
YunaiV 246c095468 Merge remote-tracking branch 'origin/master' 2024-11-02 20:16:53 +08:00
YunaiV 11fd5c3ff2 【功能修复】报表：修复 JmReportTokenServiceImpl 在 jdk17 和 jdk8 存在差异的问题 2024-11-02 20:16:46 +08:00
YunaiV f9fdca0d6d 【缺陷修复】商城：优惠劵在不限制时，无法发送的问题 2024-10-27 20:33:56 +08:00
YunaiV a887c364f9 146 【功能修复】会员：微信登录注册时，因为 username 为空导致失败的问题 2024-10-27 16:22:58 +08:00
YunaiV 5208f2878e 146 【功能修复】PAY：修复定时任务没有返回值导致的异常 2024-10-27 15:57:05 +08:00
芋道源码 243ad6634a
!146 【功能修复】PAY：修复定时任务没有返回值导致的异常 
Merge pull request !146 from Lcp/master-jdk17
 2024-10-27 07:55:17 +00:00
Lcp 6e8329ef75 【功能修复】PAY：修复定时任务没有返回值导致的异常 2024-10-14 12:15:47 +08:00
YunaiV bcc713f4ae 【依赖降级】weixin-java from 4.6.5B to 4.6.0，避免 privateCertPath 报错 2024-10-13 17:06:07 +08:00
YunaiV 707ea5c48f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-10-13 17:04:28 +08:00
YunaiV 3352eab759 【依赖降级】weixin-java from 4.6.5B to 4.6.0，避免 privateCertPath 报错 2024-10-13 17:03:46 +08:00
芋道源码 7ad63f237a
!144 【代码修复】商城订单的支付回调接口添加@PermitAll和部分DO缺少@KeySequence问题 
Merge pull request !144 from Lcp/pr
 2024-10-12 12:30:34 +00:00
Lcp a57b2e5f87 【代码优化】商城：部分DO缺少KeySequence配置 2024-10-10 15:20:32 +08:00
Lcp f59477d0ac 【代码优化】SYSTEM：部分DO缺少KeySequence配置 2024-10-10 15:20:31 +08:00
Lcp 9635aee9d8 【代码优化】BPM：部分DO缺少KeySequence配置 2024-10-10 15:20:30 +08:00
Lcp 06d2af4e35 【代码优化】AI：部分DO缺少KeySequence配置 2024-10-10 15:20:29 +08:00
Lcp 0cd2f3ca4a 【功能修复】商城：订单的支付回调接口添加@PermitAll 2024-10-10 15:18:48 +08:00
YunaiV 96eed422f9 V2.3.0 版本发布~ 2024-10-07 16:30:11 +08:00
YunaiV 7057be1b73 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
 2024-10-07 16:27:22 +08:00
YunaiV ae0b0ef229 V2.3.0 版本发布~ 2024-10-07 16:26:56 +08:00
YunaiV 4676389d31 【同步】BOOT 和 CLOUD 的功能（BPM 工作流） 2024-10-07 16:26:37 +08:00
YunaiV 39ac641497 【功能新增】商城：积分商城 2024-10-04 20:02:08 +08:00
YunaiV a05961139c 【功能新增】工作流：完善仿钉钉、飞书模式 2024-10-04 17:51:26 +08:00
YunaiV d97f76cd8b 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/AiKnowledgeDocumentServiceImpl.java
#	yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/knowledge/AiKnowledgeSegmentServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModeImportReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelSaveReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelUpdateReqVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptLeaderStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateDeptMemberStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateGroupStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidatePostStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateRoleStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateStartUserSelectStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/BpmTaskCandidateUserStrategy.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/framework/permission/core/aop/CrmPermissionAspect.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
 2024-10-04 17:48:02 +08:00
YunaiV 6c325d99e7 【功能新增】工作流：完善仿钉钉、飞书模式 2024-10-04 17:47:28 +08:00
YunaiV cc1c0b62a3 【功能优化】spring security：antMatchers 替换成 requestMatchers 2024-10-03 09:41:03 +08:00
YunaiV 18f7591b38 【功能修复】商城：虚拟成团时，headId 未使用团长编号 2024-10-02 14:57:44 +08:00
YunaiV 2344332b03 【功能优化】SYSTEM：支持通过 refreshToken 认证，解决部分场景不方便刷新访问令牌场景 2024-10-02 14:54:06 +08:00
YunaiV a4ff54c148 【同步】BOOT 和 CLOUD 的功能（CRM 数据权限） 2024-10-02 14:32:41 +08:00
YunaiV 5858aac8c3 【同步】BOOT 和 CLOUD 的功能（AI 知识库） 2024-10-02 14:27:52 +08:00
YunaiV 5480caa3df 【功能优化】getUserList 查询时，默认禁用数据权限 2024-10-01 17:19:37 +08:00
YunaiV d63a2ae439 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 2024-10-01 16:41:58 +08:00
YunaiV b196c36dfa 【依赖优化】flattenMode 按需调整成 bom 和 oss 2024-10-01 16:41:37 +08:00
YunaiV 1ab73e5cd6 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud 
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
 2024-10-01 16:17:02 +08:00
YunaiV 9443f2885c 【依赖优化】snapshot to SNAPSHOT，解决 https://github.com/YunaiV/ruoyi-vue-pro/issues/417 问题 2024-10-01 16:16:45 +08:00
YunaiV 918c9981cf 【依赖优化】snapshot to SNAPSHOT，解决 https://github.com/YunaiV/ruoyi-vue-pro/issues/417 问题 2024-10-01 16:16:38 +08:00
YunaiV 156818d1c4 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/framework/security/config/SecurityConfiguration.java
 2024-10-01 15:23:14 +08:00
YunaiV ad2cc100d2 【功能优化】spring security：antMatchers 替换成 requestMatchers 2024-10-01 15:22:58 +08:00