298 Commits

Author SHA1 Message Date
HopeLi
9836c649e9 0604 ljc 2025-06-04 17:23:17 +08:00
HopeLi
5b0b142914 0604 ljc 2025-06-04 09:54:16 +08:00
HopeLi
7c91fa725f Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro 2025-06-04 09:53:16 +08:00
even
13943cd7e2 日志相关功能修改 2025-06-03 18:51:10 +08:00
even
4c3d22db3c converter添加与BeanUtils替换 2025-06-03 18:41:38 +08:00
HopeLi
d70b924fe3 Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro 2025-06-03 18:30:38 +08:00
HopeLi
77cbbc687e Update .gitignore 2025-06-03 18:30:28 +08:00
even
c2c5c67c9b Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro 2025-06-03 11:30:19 +08:00
even
a32c0be8d7 包移动 2025-06-03 11:30:05 +08:00
even
70041ea94f 包移动 2025-06-03 11:28:59 +08:00
Hope Li
4a5af80416 0603 ljc 2025-06-02 21:17:08 +08:00
even
f991117d58 Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro 2025-06-02 20:54:07 +08:00
even
17dc808d21 功能单元测试补齐 2025-06-02 20:53:53 +08:00
Hope Li
675de764bf 0603 ljc 2025-06-02 20:26:57 +08:00
even
4a535b48ad Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro
# Conflicts:
#	modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/resource/impl/ResourceManagerServiceImpl.java
2025-06-02 19:47:30 +08:00
Hope Li
ef858413b9 0602 ljc 2025-06-02 10:15:03 +08:00
Hope Li
c7c64cc666 0601 ljc resource模块基础功能开发 2025-06-01 21:52:20 +08:00
even
7a57d6658c 启动问题修复 2025-06-01 18:21:04 +08:00
even
41a0e2cf9f Merge branch 'master' of http://1.14.125.6:3000/mianbin/ops-pro
# Conflicts:
#	modules/module-ci-process-biz/pom.xml
2025-06-01 17:29:26 +08:00
Hope Li
b04fa918b0 0601 ljc resource模块基础功能开发 2025-06-01 17:25:01 +08:00
even
ba5a5ed972 注释补充 2025-06-01 17:24:46 +08:00
even
952e1220ef docker 初试,以及测试类 2025-06-01 17:20:52 +08:00
Hope Li
3ac7291ffe 0601 ljc resource模块基础功能开发 2025-06-01 17:15:30 +08:00
Hope Li
aca9ff8b47 0601 ljc resource模块基础功能开发 2025-06-01 15:22:30 +08:00
even
e8a2d21f7b Merge remote-tracking branch 'origin/temp' 2025-05-31 14:48:54 +08:00
1eb28acf44 1:提交一个ops-ui的代码,可以启动无需nginx ,调试方便
2:processor-api的module当时因为冲突删除了,新建一个
3: 修改了pom文件的引用问题
2025-05-31 00:57:22 +08:00
even
d4f4167fba Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp 2025-05-31 00:30:01 +08:00
even
c1ee42791f 日志修改 ssh执行逻辑修改 2025-05-31 00:29:44 +08:00
HopeLi
c7223f3ff3 0530 ljc 删除无用代码 2025-05-30 20:07:50 +08:00
a80a0a9dba 删除代码,修改配置文件 2025-05-30 19:12:05 +08:00
5ae719b1f3 Merge branch 'temp'
# Conflicts:
#	.gitignore
#	.idea/CopilotChatHistory.xml
#	.idea/compiler.xml
#	.idea/encodings.xml
#	.idea/inspectionProfiles/Project_Default.xml
#	.idea/jarRepositories.xml
#	.idea/misc.xml
#	dependencies/pom.xml
#	framework/spring-boot-starter-biz-tenant/src/main/java/cd/casic/framework/tenant/core/mq/rocketmq/TenantRocketMQConsumeMessageHook.java
#	framework/spring-boot-starter-biz-tenant/src/main/java/cd/casic/framework/tenant/core/mq/rocketmq/TenantRocketMQSendMessageHook.java
#	modules/module-ci-commons/pom.xml
#	modules/module-ci-commons/src/main/java/cd/casic/ci/commons/work/package-info.java
#	modules/module-ci-engine/pom.xml
#	modules/module-ci-execute/pom.xml
#	modules/module-ci-market/pom.xml
#	modules/module-ci-plugin/pom.xml
#	modules/module-ci-process-api/pom.xml
#	modules/module-ci-process-biz/src/main/java/cd/casic/module/process/convert/package-info.java
#	modules/module-ci-process-biz/src/main/java/cd/casic/module/process/toolkit/beans/model/FieldMapping.java
#	modules/module-ci-repository/pom.xml
#	modules/pom.xml
#	ops-server/pom.xml
#	ops-server/src/main/java/cd/casic/server/OpsServerApplication.java
2025-05-30 17:39:13 +08:00
6522e72f20 提交个ignore 2025-05-30 17:34:20 +08:00
16516cb1cf 删除了不需要的 2025-05-30 17:33:22 +08:00
even
ead82b946d 执行逻辑修改-每次启动标记上一次执行为执行失败 2025-05-30 14:52:57 +08:00
even
82f1aaa72f 引擎逻辑修改 2025-05-30 12:53:21 +08:00
even
00a172715f Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp 2025-05-30 11:40:23 +08:00
even
f596fd101e worker修改 2025-05-30 11:39:24 +08:00
HopeLi
952d863a61 0529 ljc 修改删除阶段npe错误 2025-05-30 11:39:00 +08:00
蒲先生
2960b3310e 代码仓管理上 2025-05-30 10:13:54 +08:00
even
65a5b75a84 判空增加 2025-05-29 20:03:04 +08:00
even
c249975546 命令修改 2025-05-29 19:23:28 +08:00
HopeLi
9d6dfdbe16 0529 ljc 2025-05-29 16:36:55 +08:00
even
59cdbf7401 Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp 2025-05-29 16:19:27 +08:00
HopeLi
7b09fcdb01 0529 ljc 2025-05-29 16:16:05 +08:00
even
056f15d68b 阻塞逻辑修改 2025-05-29 14:11:37 +08:00
even
06b1bea076 阻塞逻辑修改 2025-05-29 10:40:07 +08:00
even
1055eb3dcd Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp 2025-05-29 10:36:26 +08:00
even
14c4e9b6e5 阻塞逻辑修改 2025-05-29 10:32:58 +08:00
even
f0b36fad6d 失败状态逻辑更改 2025-05-29 10:15:10 +08:00
HopeLi
6420206095 Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp 2025-05-29 10:14:35 +08:00