mapstruct lombok冲突修复 加载不到的依赖项先注释，联调问题修改

modules/module-ci-process-biz/pom.xml

@@ -69,7 +69,27 @@
             <artifactId>httpclient5</artifactId>
             <version>5.2.1</version> <!-- 建议使用最新稳定版本 -->
         </dependency>
-
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${mapstruct.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/enums/ContextStateEnum.java

@@ -39,7 +39,6 @@ public enum ContextStateEnum {
             }
             return TRANSITIONS.get(from).contains(to);
         } catch (Exception e){
-            System.out.println("");
             return false;
         }
     }

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java

@@ -135,4 +135,5 @@ public class PipPipeline extends PipBaseElement {
      * 运行实例编号
      */
     private String instanceNum;
+
 }

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java

@@ -573,7 +573,10 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
         return new TreeRunContextResp();
     }
     private String between(LocalDateTime startTime,LocalDateTime endTime){
-        Duration between = Duration.between(startTime, LocalDateTime.now());
+        if (startTime==null||endTime==null) {
+            return "";
+        }
+        Duration between = Duration.between(startTime, endTime);
         long days = between.toDays();
         long hours = between.toHours()%24;
         long minutes = between.toMinutes() % 60;
@@ -588,9 +591,7 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
         if (minutes>0) {
             stringBuilder.append(minutes).append("分");
         }
-        if (seconds>0) {
         stringBuilder.append(seconds).append("秒");
-        }
         return stringBuilder.toString();
     }
 }

modules/module-ci-worker/pom.xml

@@ -50,11 +50,11 @@
             <!--            <version>1.28</version>-->
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.jenkins-ci/version-number -->
-        <dependency>
-            <groupId>org.jenkins-ci</groupId>
-            <artifactId>version-number</artifactId>
-            <version>1.12</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.jenkins-ci</groupId>-->
+<!--            <artifactId>version-number</artifactId>-->
+<!--            <version>1.12</version>-->
+<!--        </dependency>-->
 
         <!-- 外部依赖 -->
         <dependency>

ops-server/src/main/resources/application-local.yaml

@@ -70,7 +70,7 @@ spring:
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data:
     redis:
-      host: 127.0.0.1 # 地址
+      host: 192.168.1.120 # 地址
       port: 6379 # 端口
       database: 0 # 数据库索引
 #    password: dev # 密码，建议生产环境开启