Commit Graph

42 Commits

Author SHA1 Message Date
Lpz
64d21a574d Merge branch 'dc-feature'
# Conflicts:
#	pom.xml
#	src/main/resources/application.properties
2025-06-05 10:00:41 +08:00
dc
05eb83d68d Redis配置合并 2025-06-04 16:36:36 +08:00
dc
cc0b69362c Merge remote-tracking branch 'origin/main' into dc-feature
# Conflicts:
#	doc/WorkReport/2025-05-杜冲.md
#	pom.xml
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java
#	src/main/resources/application.properties
2025-06-04 15:40:15 +08:00
Lpz
22547031cf Merge branch 'dc-feature' 2025-06-04 15:19:04 +08:00
dc
caeb280396 GlobalExceptionHandler重命名 2025-06-04 15:17:14 +08:00
Lpz
0fe404b717 Merge branch 'dc-feature' 2025-06-04 14:09:46 +08:00
dc
ee8e4709a6 ConfigConstants文件 2025-06-04 13:53:19 +08:00
Lpz
df4ae86ea3 Merge branch 'dc-feature'
# Conflicts:
#	pom.xml
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java
#	src/main/resources/application.properties
2025-06-04 09:34:01 +08:00
dc
b218335558 GPU路径修改 2025-06-03 21:28:40 +08:00
dc
987e5c30fe GPU路径修改 2025-06-03 21:24:02 +08:00
dc
9eef82b642 模型部署资源分配部分 2025-05-30 13:45:01 +08:00
789108aaa3 [提交]:增加了查询数据集列表和生命周期列表 2025-05-30 13:09:47 +08:00
dc
3fb10b1e2f GPU缓存局部更新 2025-05-30 11:40:04 +08:00
Lpz
4a1e6013b3 Merge branch 'xiaohucoding'
# Conflicts:
#	doc/WorkReport/2025-05-hky.md
#	src/main/resources/application.properties
2025-05-29 09:33:57 +08:00
2aaf3d96f0 全局拦截器 2025-05-26 21:50:27 +08:00
77fb43e95d 调度请求 2025-05-26 21:49:13 +08:00
60a71a121c 服务发布(nacos版) 2025-05-25 20:38:36 +08:00
9f348280ea [冲突]:解决合并冲突
# Conflicts:
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/constant/MessageConstant.java
#	src/main/resources/application.properties
2025-05-25 19:41:42 +08:00
999fd82ccc 保留从main分支暂存的所有修改
# Conflicts:
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelDTO.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java
#	src/main/resources/mapper/ModelMapper.xml

# Conflicts:
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelDTO.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java
#	src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java
#	src/main/resources/mapper/ModelMapper.xml
2025-05-25 19:31:25 +08:00
28b5ca1dfc 服务发布(nacos版) 2025-05-25 17:24:57 +08:00
dc
c01e985256 GPU模块设计 2025-05-25 16:14:04 +08:00
dc
73388da706 GPU模块设计 2025-05-22 18:08:28 +08:00
d01f3bfcbf 服务发布 2025-05-22 15:57:15 +08:00
5af1b7a577 服务发布 2025-05-21 22:18:31 +08:00
de32099ea9 服务发布(无redis版) 2025-05-21 15:58:07 +08:00
3599a052a3 服务发布(无redis版) 2025-05-21 15:58:06 +08:00
0b454413c0 数据集生命周期版本2.0 2025-05-21 15:58:03 +08:00
b7913f7a09 Revert "[撤销提交]:撤销提交工作日报"
This reverts commit 370a2d3ce0410fe91c7c1dcacb86881050948754.
2025-05-21 09:49:44 +08:00
370a2d3ce0 [提交]:提交工作日报 2025-05-20 16:36:47 +08:00
lpz
c13ff70f6b Merge pull request '算法生命周期管理' (#10) from my-feature-one into main
Reviewed-on: #10
2025-05-18 14:46:11 +08:00
Lpz
d138f25e4c Merge branch 'xiaohucoding'
# Conflicts:
#	pom.xml
2025-05-18 14:43:24 +08:00
84b9711c57 生命周期 2025-05-16 23:21:04 +08:00
e096b52c7b 数据集生命周期版本2.0 2025-05-15 23:10:15 +08:00
d14afaf3ca [新增]:基本完成模型评估部分的功能开发 2025-05-15 20:50:55 +08:00
lpz
81353344da Merge pull request '数据集分页查询及部分删除代码' (#7) from xiaohucoding into main
Reviewed-on: #7
2025-05-15 08:16:21 +08:00
be5ff6ff74 数据集分页查询及部分删除代码 2025-05-14 23:09:49 +08:00
dc
6943f38d1b GPU模块设计 2025-05-14 21:38:41 +08:00
d6625b52f4 [新增]:完成模型评估模块的一部分开发 2025-05-14 21:16:03 +08:00
Lpz
f64e4062f0 Merge remote-tracking branch 'origin/xiaohucoding'
# Conflicts:
#	src/main/resources/application.properties
2025-05-14 08:30:36 +08:00
b953e85704 数据集新增及修改功能版本1.0 2025-05-13 21:40:14 +08:00
51e80031ba [修改]:修改配置文件以及pom文件、test测试类用于数据库连接,[添加]:新增数据库驱动文件 2025-05-13 10:51:22 +08:00
Lpz
c0734ab70c 添加项目文件 2025-05-11 17:21:07 +08:00