唐潇凯
|
62b0caa3da
|
阿里云oss
|
2025-06-04 14:50:33 +08:00 |
|
唐潇凯
|
4815b590c4
|
Merge remote-tracking branch 'origin/jenkins-engin' into jenkins-engin
# Conflicts:
# modules/module-ci-machine/src/main/java/cd/casic/module/machine/controller/SecretKeyController.java
# modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/SecretKeyService.java
# modules/module-ci-machine/src/main/java/cd/casic/module/machine/service/impl/SecretKeyServiceImpl.java
# modules/module-ci-machine/src/main/java/cd/casic/module/machine/utils/AliOssUtil.java
|
2025-06-04 14:45:15 +08:00 |
|
唐潇凯
|
a238538106
|
密钥模块修改测试完毕
|
2025-06-04 14:40:30 +08:00 |
|
zyj
|
ea35ed1f0b
|
机器管理代码格式化提交
|
2025-06-04 14:19:29 +08:00 |
|
zyj
|
c26a183209
|
Merge remote-tracking branch 'origin/jenkins-engin' into jenkins-engin
|
2025-06-04 11:03:55 +08:00 |
|
zyj
|
4b8dfe978a
|
机器管理调试更改
|
2025-06-04 11:03:35 +08:00 |
|
even
|
ac2ed85474
|
流水线执行修改，bug修复
|
2025-06-04 10:19:25 +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 |
|
唐潇凯
|
30c201a230
|
sql修改
|
2025-06-03 14:22:43 +08:00 |
|
唐潇凯
|
818c2e0198
|
Merge remote-tracking branch 'origin/jenkins-engin' into jenkins-engin
|
2025-06-03 14:14:54 +08:00 |
|
唐潇凯
|
a7398d265c
|
代码测试完成
|
2025-06-03 14:13:39 +08:00 |
|
zyj
|
04afb442cf
|
机器管理测试更改
|
2025-06-03 14:03:04 +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 |
|
唐潇凯
|
b65bdd95bc
|
get方法修改
|
2025-06-03 09:35:34 +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 |
|
唐潇凯
|
790193d0c9
|
controller返回值统一，机器相关实体类修改
|
2025-05-31 14:16:20 +08:00 |
|
蒲先生
|
1028cc0705
|
调整完毕
|
2025-05-31 09:58:28 +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 |
|
蒲先生
|
a7738d2add
|
变更包名
|
2025-05-30 17:23:48 +08:00 |
|
蒲先生
|
1d8a1f6eb9
|
清除无需要的
|
2025-05-30 16:57:03 +08:00 |
|
蒲先生
|
db95a112bc
|
清理
|
2025-05-30 16:37:31 +08:00 |
|
蒲先生
|
5410bd4374
|
机器管理迁移到ops-pro
|
2025-05-30 16:30:16 +08:00 |
|
