机器管理迁移到ops-pro

modules/module-ci-machine/pom.xml

@@ -3,42 +3,24 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.13-SNAPSHOT</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <groupId>cd.casic.boot</groupId>
+        <artifactId>modules</artifactId>
+        <version>${revision}</version>
     </parent>
-    <artifactId>machine-management-module</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>machine</name>
-    <description>machine</description>
-    <url/>
-    <licenses>
-        <license/>
-    </licenses>
-    <developers>
-        <developer/>
-    </developers>
-    <scm>
-        <connection/>
-        <developerConnection/>
-        <tag/>
-        <url/>
-    </scm>
-    <properties>
-        <java.version>17</java.version>
-    </properties>
+
+    <artifactId>module-ci-machine</artifactId>
+
+    <packaging>jar</packaging>
+    <version>${revision}</version>
+    <name>${project.artifactId}</name>
+
     <dependencies>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <groupId>cd.casic.boot</groupId>
+            <artifactId>commons</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.aliyun.oss</groupId>
@@ -60,11 +42,6 @@
             <version>0.1.55</version>
         </dependency>
 
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.33</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -89,13 +66,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineEnv.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.*;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * 环境变量实体类

modules/module-ci-machine/src/main/java/com/casic/machine/entity/MachineInfo.java

@@ -1,6 +1,5 @@
 package com.casic.machine.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.casic.machine.enums.AuthenticationType;

modules/module-ci-machine/src/main/java/com/casic/machine/service/impl/MachineEnvServiceImpl.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import java.util.Date;
+
 import java.util.List;
 import java.util.stream.Collectors;
 

modules/module-ci-machine/src/test/java/com/casic/machine/service/impl/MachineinfoServiceImplTest.java

@@ -16,7 +16,6 @@ import org.springframework.test.context.jdbc.Sql;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collections;
-import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 

modules/pom.xml

@@ -14,6 +14,7 @@
         <module>module-infra-biz</module>
         <module>module-system-api</module>
         <module>module-system-biz</module>
+        <module>module-ci-machine</module>
     </modules>
 
     <artifactId>modules</artifactId>

ops-server/pom.xml

@@ -25,6 +25,11 @@
             <artifactId>module-system-biz</artifactId>
             <version>${revision}</version>
         </dependency>
+        <dependency>
+            <groupId>cd.casic.boot</groupId>
+            <artifactId>module-ci-machine</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
         <dependency>
             <groupId>cd.casic.boot</groupId>