Commit Graph

73 Commits

Author SHA1 Message Date
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
c24d640de4 全局拦截器 2025-05-26 21:56:51 +08:00
2aaf3d96f0 全局拦截器 2025-05-26 21:50:27 +08:00
77fb43e95d 调度请求 2025-05-26 21:49:13 +08:00
lpz
bcf44161b5 Merge pull request 'nh' (#12) from nh into main
Reviewed-on: #12
2025-05-26 10:08:49 +08:00
5692cca3e7 服务发布(nacos版) 2025-05-25 20:42:25 +08:00
60a71a121c 服务发布(nacos版) 2025-05-25 20:38:36 +08:00
12a9355bb8 [提交]:第二周工作日报 2025-05-25 19:55:07 +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
lpz
56bfdad0c0 Merge pull request '修改代码及服务发布的逻辑代码(无redis)' (#11) from xiaohucoding into main
Reviewed-on: #11
2025-05-22 16:09:16 +08:00
f235f2d111 服务发布 2025-05-22 16:01:31 +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
ed38bb2600 服务发布(无redis版) 2025-05-21 15:58:06 +08:00
3599a052a3 服务发布(无redis版) 2025-05-21 15:58:06 +08:00
eee91c212a 日志提交 2025-05-21 15:58:04 +08:00
0b454413c0 数据集生命周期版本2.0 2025-05-21 15:58:03 +08:00
19e6032ba7 提交工作日报 2025-05-21 10:28:57 +08:00
47717399bd 撤销提交前,更新本地仓库
Merge branch 'main' of http://116.205.121.200:3000/lpz/intelligent-application-orchestration-service
2025-05-21 10:11:47 +08:00
52ea1233e0 Revert "Merge remote-tracking branch 'origin/main'"
This reverts commit 4f9aed896559f17d9007b00470ad63986b1f3070, reversing
changes made to 35f12bc54757b29afe85e9e3b3af4ded79456de4.
2025-05-21 09:53:38 +08:00
b7913f7a09 Revert "[撤销提交]:撤销提交工作日报"
This reverts commit 370a2d3ce0410fe91c7c1dcacb86881050948754.
2025-05-21 09:49:44 +08:00
dc
5654a5a05c 上传文件至 doc/WorkReport 2025-05-20 23:21:48 +08:00
e706d8311f Merge remote-tracking branch 'origin/main' 2025-05-20 16:45:00 +08:00
370a2d3ce0 [提交]:提交工作日报 2025-05-20 16:36:47 +08:00
4f9aed8965 Merge remote-tracking branch 'origin/main' 2025-05-19 22:45:15 +08:00
syc
038a16b428 更新 doc/WorkReport/2025-05-孙一城.md 2025-05-19 22:35:24 +08:00
syc
f96e32816a 更新 doc/WorkReport/2025-05-孙一城.md 2025-05-19 22:35:08 +08:00
syc
9607f38965 更新 doc/WorkReport/2025-05-孙一城.md 2025-05-19 22:34:11 +08:00
35f12bc547 日报上传 2025-05-19 22:18:20 +08:00
e1a59b64f3 日报上传 2025-05-19 22:17:58 +08:00
b61f1bf151 日报上传 2025-05-19 22:10:43 +08:00
8603aad8c5 日报上传 2025-05-19 22:09:35 +08:00
33d96e0aec [提交]:提交工作日报 2025-05-19 21:46:34 +08:00
Lpz
0813f0d99b 调整文档结构 2025-05-18 15:32:24 +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
lpz
aaf265aeb0 Merge pull request '[新增]:基本完成模型评估部分的功能开发' (#8) from nh-feature into main
Reviewed-on: #8
2025-05-18 14:31:25 +08:00
84b9711c57 生命周期 2025-05-16 23:21:04 +08:00
e096b52c7b 数据集生命周期版本2.0 2025-05-15 23:10:15 +08:00
dc
64abd2d824 上传文件至 doc/WorkReport 2025-05-15 22:02:29 +08:00
d14afaf3ca [新增]:基本完成模型评估部分的功能开发 2025-05-15 20:50:55 +08:00
b1772bea6f [提交]:今日工作日报 2025-05-15 20:34:18 +08:00
Lpz
220fdb1121 解决lombok编译报错的问题 2025-05-15 08:33:13 +08:00
Lpz
ec38f39a0e 解决lombok编译报错的问题 2025-05-15 08:28:46 +08:00
lpz
81353344da Merge pull request '数据集分页查询及部分删除代码' (#7) from xiaohucoding into main
Reviewed-on: #7
2025-05-15 08:16:21 +08:00
lpz
b6aa3959ce Merge pull request '更新 doc/算法生命周期设计文档_孙一城.md' (#6) from syc-patch-1 into main
Reviewed-on: #6
2025-05-15 08:14:54 +08:00
lpz
4b5206d1c0 Merge pull request '[新增]:完成模型评估模块的一部分开发' (#5) from nh-feature into main
Reviewed-on: #5
2025-05-15 08:13:52 +08:00