616 Commits

Author SHA1 Message Date
limin
a1df852642 增加数据 查询 2025-01-11 09:37:52 +08:00
ire
50448d6a9d bug 2025-01-10 18:08:05 +08:00
limin
63f5698397 修改aigc调用 2025-01-10 13:11:05 +08:00
limin
259f35f5d9 Merge remote-tracking branch 'origin/master' 2025-01-10 10:59:33 +08:00
ire
bce978afd9 bug 2025-01-10 10:42:15 +08:00
limin
2cb3635da3 模型服务部署 调用后端调试 2025-01-10 10:27:43 +08:00
ire
795d7c81b3 apiurl 可以获取,调用 2025-01-09 15:46:40 +08:00
limin
1f6850b7d9 用户导入修改 2025-01-06 19:50:20 +08:00
ire
9c4ffbd1a9 定时维护,基础模型表信息 2025-01-06 17:42:35 +08:00
ire
cfed3d4d8e 定时维护,基础模型表信息 2025-01-06 16:37:22 +08:00
zhangtao
4177e794c4 微调任务API对接 2025-01-06 15:08:48 +08:00
zhangtao
04efc7f95d 增加模型工厂的租户ID 2025-01-06 14:38:54 +08:00
zhangtao
a7c8073101 增加模型工厂的租户ID 2025-01-06 14:28:45 +08:00
zhangtao
f679922eb3 对接模型工厂 2025-01-06 14:18:31 +08:00
zhangtao
3e0211a248 RAG接口 2025-01-04 16:26:56 +08:00
ire
0cfd5b8228 yaml 2024-12-31 17:48:30 +08:00
ire
f2739828cc yaml 2024-12-31 17:47:16 +08:00
ire
087a7df099 模型训练接口更新 2024-12-31 16:42:34 +08:00
limin
9ed36910f6 数据处理增加 2024-12-31 15:49:27 +08:00
zhangtao
210345984a 增加LLM 后端服务API配置信息 2024-12-30 20:16:13 +08:00
zhangtao
dab041f12d 增加LLM 后端服务API配置信息 2024-12-29 19:01:19 +08:00
ire
9d4cb2f019 rag http service 2024-12-29 18:56:53 +08:00
zhangtao
0ad4e6cb60 增加LLM 后端服务API配置信息 2024-12-29 18:13:11 +08:00
zhangtao
1e9ba55193 增加LLM 后端服务API配置信息 2024-12-29 18:11:58 +08:00
ire
9332cb5a30 rag url 2024-12-29 18:08:19 +08:00
zhangtao
d6026a78b3 增加LLM 后端服务API配置信息 2024-12-29 17:32:18 +08:00
zhangtao
022f86ae54 增加LLM 后端服务API配置信息 2024-12-29 17:30:11 +08:00
zhangtao
4cbcacfd1f 增加LLM 后端服务API配置信息 2024-12-29 17:17:36 +08:00
zhangtao
9ee25e7d3d local配置文件中slave数据库的地址,使用测试环境地址 2024-12-25 11:08:03 +08:00
ire
5d4d797fb4 新增llm模块,新增知识库 2024-12-18 14:08:29 +08:00
zhangtao
f637064c8c 调整local配置文件的数据库地址 2024-12-18 09:49:00 +08:00
zhangtao
713a918759 去掉ERP模块的引用。 增加ERP的数据库sql 2024-12-17 10:09:59 +08:00
zhangtao
2483cbcffa 开启ERP模块 2024-12-05 18:31:35 +08:00
zhangtao
07b9541742 dev环境配置,关闭验证码 2024-12-04 20:14:45 +08:00
zhangtao
4119fe344b dev环境配置,关闭租户 2024-12-04 20:00:28 +08:00
zhangtao
146946d5ab dev环境配置 2024-12-04 19:23:57 +08:00
YunaiV
bbb1bec1b9 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.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/delivery/DeliveryPickUpStoreServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImplTest.java
#	yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApi.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApiImpl.java
#	yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java
2024-11-25 19:32:10 +08:00
YunaiV
c239d9cc56 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
2024-11-19 09:26:44 +08:00
痴货
325d5e6b12 【功能优化】完成转账回调接口 2024-10-08 21:25:52 +08:00
YunaiV
5f75fcb0fb 【代码优化】工作流:删除用不到的方法 2024-10-04 17:17:01 +08:00
YunaiV
eaa22e7a56 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	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/framework/flowable/core/listener/BpmTaskEventListener.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-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.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/api/user/AdminUserApiImpl.java
#	yudao-server/pom.xml
2024-10-04 17:16:23 +08:00
YunaiV
9334edc9ea Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
2024-10-03 11:28:22 +08:00
YunaiV
f7bed6d833 【代码评审】IoT:产品、设备、物模型的代码 2024-10-01 19:56:15 +08:00
YunaiV
44b466c678 Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-server/pom.xml
2024-10-01 19:54:22 +08:00
YunaiV
ef4e7176a2 【依赖优化】snapshot to SNAPSHOT,解决 https://github.com/YunaiV/ruoyi-vue-pro/issues/417 问题 2024-10-01 16:14:58 +08:00
YunaiV
5e9bdcb21f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2024-10-01 16:11:13 +08:00
YunaiV
2bbb7f86fe 【同步】BOOT 和 CLOUD 的功能 2024-10-01 14:39:30 +08:00
YunaiV
9f676fecfa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	README.md
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/AppFileController.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/CodegenServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImplTest.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsCodeServiceImplTest.java
2024-09-29 12:58:49 +08:00
YunaiV
805f80c36a 【功能优化】INFRA:代码生成时,默认禁用单元测试的生成,更符合大家的习惯 2024-09-19 13:10:23 +08:00
YunaiV
4e8e491035 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
2024-09-17 15:34:30 +08:00