Commit Graph

2262 Commits

Author SHA1 Message Date
cbs
e0291782bc 添加机器人信息 2025-01-13 11:58:10 +08:00
aikai
281522adca Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud-wcs into aikai
# Conflicts:
#	yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java
2025-01-13 11:23:11 +08:00
aikai
f94062a262 地图相关 2025-01-13 11:19:36 +08:00
furongxin
8345840129 Merge branch 'cbs' of http://git.znkjfw.com/ak/zn-cloud-wcs into dev
# Conflicts:
#	pom.xml
#	yudao-module-grpc/yudao-module-grpc-biz/src/main/java/cn/iocoder/yudao/module/grpc/service/geometry/GeometryServiceImpl.java
2025-01-13 10:03:31 +08:00
cbs
491250852b 搬运任务回传 2025-01-13 09:10:19 +08:00
cbs
89fa21411d 搬运任务校验 2025-01-09 13:59:39 +08:00
cbs
9fe8245ed5 下发搬运任务 2025-01-08 10:46:50 +08:00
cbs
84980c31f7 机器人任务 2025-01-07 10:39:14 +08:00
cbs
101be5a8ad 巷道、库区、库位、车辆、设备 2025-01-04 17:34:56 +08:00
aikai
9aac8442f1 调整grpc和protobuf版本 2025-01-03 17:55:11 +08:00
cbs
0017ab3778 GRPC注册nacos 2025-01-03 16:59:48 +08:00
aikai
ed3e68278b Merge branch 'cbs' of http://git.znkjfw.com/ak/zn-cloud-wcs into aikai
# Conflicts:
#	yudao-module-grpc/yudao-module-grpc-biz/src/main/java/cn/iocoder/yudao/module/grpc/service/geometry/GeometryServiceImpl.java
2025-01-03 15:56:02 +08:00
cbs
bb03dd010f wcs设备注册 2025-01-03 15:54:13 +08:00
aikai
a780ac5139 调整grpc和protobuf版本 2025-01-03 15:52:43 +08:00
cbs
1a0881f0ad GRPC集成skywalking 2024-12-31 15:57:42 +08:00
cbs
4945cf542e MQTT服务添加日志和策略 2024-12-31 15:46:37 +08:00
cbs
363fa30fef MQTT服务发送 2024-12-31 14:47:29 +08:00
cbs
0c4ca50b3f 服务注册 2024-12-28 10:26:00 +08:00
cbs
37f93355df 调整pom文件依赖 2024-12-27 15:12:43 +08:00
cbs
3fe31b65b4 grpc客户端调通 2024-12-27 14:34:00 +08:00
cbs
9889059f53 grpc模块调试 2024-12-26 17:50:50 +08:00
cbs
48a222ee31 创建grpc模块 2024-12-25 17:56:15 +08:00
YunaiV
6e85cf3c2e V2.3.0 版本发布
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
2024-10-07 16:42:57 +08:00
YunaiV
5592940f64 Merge remote-tracking branch 'origin/master' 2024-10-07 16:42:46 +08:00
YunaiV
1cbf4901c1 V2.2.0 版本发布 2024-10-07 16:41:25 +08:00
YunaiV
a98531828e 【同步】新增 jdk8/11 精简版! 2024-10-07 16:41:22 +08:00
YunaiV
5723d0c73e 【同步】对齐 boot 和 cloud 的逻辑 2024-10-07 16:41:19 +08:00
YunaiV
86d61c569b 【同步】新增 jdk8/11 精简版! 2024-10-07 16:41:18 +08:00
YunaiV
c13424649b 【同步】新增 jdk8/11 精简版! 2024-10-07 16:41:16 +08:00
YunaiV
6f997ef1e6 【同步】对齐 boot 和 cloud 的逻辑 2024-10-07 16:41:15 +08:00
YunaiV
d00bd2e2ec 【同步】对齐 boot 和 cloud 的逻辑 2024-10-07 16:41:13 +08:00
YunaiV
a452567318 【同步】对齐 boot 和 cloud 的逻辑 2024-10-07 16:41:10 +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