annotation位置修改

dependencies/.flattened-pom.xml

@@ -35,6 +35,7 @@
     <lock4j.version>2.2.7</lock4j.version>
     <commons-io.version>2.17.0</commons-io.version>
     <apk-parser.version>2.6.10</apk-parser.version>
+    <ognl.version>3.2.1</ognl.version>
     <hutool-6.version>6.0.0-M16</hutool-6.version>
     <resilience4j-circuitbreaker.version>2.3.0</resilience4j-circuitbreaker.version>
     <jsoup.version>1.18.1</jsoup.version>
@@ -582,6 +583,11 @@
         <artifactId>resilience4j-circuitbreaker</artifactId>
         <version>${resilience4j-circuitbreaker.version}</version>
       </dependency>
+      <dependency>
+        <groupId>ognl</groupId>
+        <artifactId>ognl</artifactId>
+        <version>${ognl.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 </project>

modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindAll.java

@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.join.annototion;
+package cd.casic.ci.commons.annotation.join;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindList.java

@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.join.annototion;
+package cd.casic.ci.commons.annotation.join;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/FindOne.java

@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.join.annototion;
+package cd.casic.ci.commons.annotation.join;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/Join.java

@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.join.annototion;
+package cd.casic.ci.commons.annotation.join;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/join/JoinProvider.java

@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.join.annototion;
+package cd.casic.ci.commons.annotation.join;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

modules/module-ci-commons/src/main/java/cd/casic/ci/commons/annotation/rpc/Exporter.java

@@ -1,4 +1,4 @@
-package cd.casic.ci.commons.rpc.annototion;
+package cd.casic.ci.commons.annotation.rpc;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

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

@@ -106,6 +106,7 @@ public class PipelineExecServiceImpl implements PipelineExecService {
 
     /**
      * 流水线开始运行
+     *
      * @param runMsg 流水线id
      * @return 是否正在运行
      */
@@ -145,6 +146,7 @@ public class PipelineExecServiceImpl implements PipelineExecService {
 
     /**
      * 放入正在执行的流水线缓存中
+     *
      * @param runMsg 流水线id
      * @return 流水线信息
      */
@@ -171,6 +173,7 @@ public class PipelineExecServiceImpl implements PipelineExecService {
 
     /**
      * 执行流水线
+     *
      * @param runMsg 流水线信息
      * @return 流水线实例
      */

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/postprocess/service/PostprocessService.java

@@ -1,7 +1,7 @@
 package cd.casic.module.process.support.postprocess.service;
 
 import cd.casic.ci.commons.bean.engine.postprocess.Postprocess;
-import cd.casic.ci.commons.join.annototion.JoinProvider;
+import cd.casic.ci.commons.annotation.join.JoinProvider;
 
 import java.util.List;
 

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/TriggerTimeService.java

@@ -1,8 +1,8 @@
 package cd.casic.module.process.support.trigger.service;
 
-import cd.casic.ci.commons.join.annototion.FindList;
+import cd.casic.ci.commons.annotation.join.FindList;
-import cd.casic.ci.commons.join.annototion.FindOne;
+import cd.casic.ci.commons.annotation.join.FindOne;
-import cd.casic.ci.commons.join.annototion.JoinProvider;
+import cd.casic.ci.commons.annotation.join.JoinProvider;
 import cd.casic.module.process.support.trigger.dateObject.TriggerTime;
 
 import java.util.List;

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerServiceImpl.java

@@ -2,7 +2,7 @@ package cd.casic.module.process.support.trigger.service.impl;
 
 import cd.casic.ci.commons.bean.process.definition.Pipeline;
 import cd.casic.ci.commons.bean.utils.PipelineUtil;
-import cd.casic.ci.commons.rpc.annototion.Exporter;
+import cd.casic.ci.commons.annotation.rpc.Exporter;
 import cd.casic.module.process.support.trigger.dao.TriggerDao;
 import cd.casic.module.process.support.trigger.dateObject.Trigger;
 import cd.casic.module.process.support.trigger.dateObject.TriggerQuery;

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/support/trigger/service/impl/TriggerTimeServiceImpl.java

@@ -3,7 +3,7 @@ package cd.casic.module.process.support.trigger.service.impl;
 
 
 import cd.casic.ci.commons.bean.exception.ApplicationException;
-import cd.casic.ci.commons.rpc.annototion.Exporter;
+import cd.casic.ci.commons.annotation.rpc.Exporter;
 import cd.casic.module.process.support.trigger.dao.TriggerTimeDao;
 import cd.casic.module.process.support.trigger.dateObject.TriggerTime;
 import cd.casic.module.process.support.trigger.entity.TriggerTimeDo;

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/TaskArtifactService.java

@@ -7,10 +7,10 @@ package cd.casic.module.process.task.artifact.service;
  * @Version 1.0
  */
 
-import cd.casic.ci.commons.join.annototion.FindAll;
+import cd.casic.ci.commons.annotation.join.FindAll;
-import cd.casic.ci.commons.join.annototion.FindList;
+import cd.casic.ci.commons.annotation.join.FindList;
-import cd.casic.ci.commons.join.annototion.FindOne;
+import cd.casic.ci.commons.annotation.join.FindOne;
-import cd.casic.ci.commons.join.annototion.JoinProvider;
+import cd.casic.ci.commons.annotation.join.JoinProvider;
 import cd.casic.module.process.task.artifact.model.TaskArtifact;
 
 import java.util.List;

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/artifact/service/impl/TaskArtifactServiceImpl.java

@@ -2,7 +2,7 @@ package cd.casic.module.process.task.artifact.service.impl;
 
 import cd.casic.ci.commons.bean.process.setting.AuthHost;
 import cd.casic.ci.commons.bean.process.setting.AuthThird;
-import cd.casic.ci.commons.rpc.annototion.Exporter;
+import cd.casic.ci.commons.annotation.rpc.Exporter;
 import cd.casic.module.process.process.setting.AuthHostService;
 import cd.casic.module.process.process.setting.AuthThirdService;
 import cd.casic.module.process.support.util.util.PipelineFinal;

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/TaskBuildService.java

@@ -10,10 +10,10 @@ package cd.casic.module.process.task.build.service;
 
 
 
-import cd.casic.ci.commons.join.annototion.FindAll;
+import cd.casic.ci.commons.annotation.join.FindAll;
-import cd.casic.ci.commons.join.annototion.FindList;
+import cd.casic.ci.commons.annotation.join.FindList;
-import cd.casic.ci.commons.join.annototion.FindOne;
+import cd.casic.ci.commons.annotation.join.FindOne;
-import cd.casic.ci.commons.join.annototion.JoinProvider;
+import cd.casic.ci.commons.annotation.join.JoinProvider;
 import cd.casic.module.process.task.build.model.TaskBuild;
 
 import java.util.List;

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/impl/TaskBuildProductServiceImpl.java

@@ -8,7 +8,7 @@ package cd.casic.module.process.task.build.service.impl;
  * @Version 1.0
  */
 
-import cd.casic.ci.commons.rpc.annototion.Exporter;
+import cd.casic.ci.commons.annotation.rpc.Exporter;
 import cd.casic.module.process.task.build.dao.TaskBuildProductDao;
 import cd.casic.module.process.task.build.dataobject.TaskBuildProductDo;
 import cd.casic.module.process.task.build.model.TaskBuildProduct;
@@ -17,7 +17,6 @@ import cd.casic.module.process.task.build.service.TaskBuildProductService;
 import cd.casic.module.process.toolkit.beans.BeanMapper;
 import com.alibaba.fastjson.JSONObject;
 import jakarta.annotation.Resource;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/build/service/impl/TaskBuildServiceImpl.java

@@ -8,7 +8,7 @@ package cd.casic.module.process.task.build.service.impl;
  * @Version 1.0
  */
 
-import cd.casic.ci.commons.rpc.annototion.Exporter;
+import cd.casic.ci.commons.annotation.rpc.Exporter;
 import cd.casic.module.process.support.util.util.PipelineFinal;
 import cd.casic.module.process.task.build.dao.TaskBuildDao;
 import cd.casic.module.process.task.build.dataobject.TaskBuildDo;
@@ -17,7 +17,6 @@ import cd.casic.module.process.task.build.service.TaskBuildService;
 import cd.casic.module.process.toolkit.beans.BeanMapper;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/TaskCodeService.java

@@ -7,10 +7,10 @@ package cd.casic.module.process.task.code.service;
  * @Version 1.0
  */
 
-import cd.casic.ci.commons.join.annototion.FindAll;
+import cd.casic.ci.commons.annotation.join.FindAll;
-import cd.casic.ci.commons.join.annototion.FindList;
+import cd.casic.ci.commons.annotation.join.FindList;
-import cd.casic.ci.commons.join.annototion.FindOne;
+import cd.casic.ci.commons.annotation.join.FindOne;
-import cd.casic.ci.commons.join.annototion.JoinProvider;
+import cd.casic.ci.commons.annotation.join.JoinProvider;
 import cd.casic.module.process.task.code.model.TaskCode;
 
 import java.util.List;

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/code/service/impl/TaskCodeServiceImpl.java

@@ -10,7 +10,7 @@ package cd.casic.module.process.task.code.service.impl;
 
 
 import cd.casic.ci.commons.bean.process.setting.AuthThird;
-import cd.casic.ci.commons.rpc.annototion.Exporter;
+import cd.casic.ci.commons.annotation.rpc.Exporter;
 import cd.casic.module.process.process.setting.AuthService;
 import cd.casic.module.process.process.setting.AuthThirdService;
 import cd.casic.module.process.task.code.dao.TaskCodeDao;
@@ -27,7 +27,6 @@ import cd.casic.module.process.task.code.service.TaskCodeService;
 import cd.casic.module.process.toolkit.beans.BeanMapper;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

modules/module-ci-process-biz/src/main/java/cd/casic/module/process/task/codescan/service/impl/TaskCodeScanServiceImpl.java

@@ -9,7 +9,7 @@ package cd.casic.module.process.task.codescan.service.impl;
 
 import cd.casic.ci.commons.bean.process.setting.AuthThird;
 import cd.casic.ci.commons.bean.utils.PipelineUtil;
-import cd.casic.ci.commons.rpc.annototion.Exporter;
+import cd.casic.ci.commons.annotation.rpc.Exporter;
 import cd.casic.module.process.process.setting.AuthHostService;
 import cd.casic.module.process.process.setting.AuthThirdService;
 import cd.casic.module.process.task.codescan.dao.TaskCodeScanDao;