1
0
Azure 2 лет назад
Родитель
Сommit
b53bc49a2e

+ 2 - 2
seecoder-build-server/src/main/java/cn/seecoder/build/server/service/facade/jenkins/entity/InternalBuild.java

@@ -1,11 +1,11 @@
 package cn.seecoder.build.server.service.facade.jenkins.entity;
 
 import cn.seecoder.build.server.util.ApplicationProperties;
-import com.offbytwo.jenkins.client.JenkinsHttpConnection;
+import com.offbytwo.jenkins.client.JenkinsHttpClient;
 import com.offbytwo.jenkins.model.Build;
 
 public class InternalBuild extends Build {
-    public InternalBuild(Build build, ApplicationProperties.Jenkins jenkinsProperties, JenkinsHttpConnection client){
+    public InternalBuild(Build build, ApplicationProperties.Jenkins jenkinsProperties, JenkinsHttpClient client){
         super();
         this.setNumber(build.getNumber());
         this.setQueueId(build.getQueueId());

+ 2 - 2
seecoder-build-server/src/main/java/cn/seecoder/build/server/service/facade/jenkins/entity/InternalBuildWithDetails.java

@@ -1,11 +1,11 @@
 package cn.seecoder.build.server.service.facade.jenkins.entity;
 
 import cn.seecoder.build.server.util.ApplicationProperties;
-import com.offbytwo.jenkins.client.JenkinsHttpConnection;
+import com.offbytwo.jenkins.client.JenkinsHttpClient;
 import com.offbytwo.jenkins.model.BuildWithDetails;
 
 public class InternalBuildWithDetails extends BuildWithDetails {
-    public InternalBuildWithDetails(BuildWithDetails buildWithDetails, ApplicationProperties.Jenkins jenkinsProperties, JenkinsHttpConnection client){
+    public InternalBuildWithDetails(BuildWithDetails buildWithDetails, ApplicationProperties.Jenkins jenkinsProperties, JenkinsHttpClient client){
         super(buildWithDetails);
         this.setNumber(buildWithDetails.getNumber());
         this.setQueueId(buildWithDetails.getQueueId());

+ 2 - 2
seecoder-build-server/src/main/java/cn/seecoder/build/server/service/facade/jenkins/entity/InternalJob.java

@@ -1,11 +1,11 @@
 package cn.seecoder.build.server.service.facade.jenkins.entity;
 
 import cn.seecoder.build.server.util.ApplicationProperties;
-import com.offbytwo.jenkins.client.JenkinsHttpConnection;
+import com.offbytwo.jenkins.client.JenkinsHttpClient;
 import com.offbytwo.jenkins.model.Job;
 
 public class InternalJob extends Job {
-    public InternalJob(Job job, ApplicationProperties.Jenkins jenkinsProperties, JenkinsHttpConnection client){
+    public InternalJob(Job job, ApplicationProperties.Jenkins jenkinsProperties, JenkinsHttpClient client){
         super(job.getName(),
                 job.getUrl().replace(jenkinsProperties.getExternalHost(), jenkinsProperties.getInternalHost()),
                 job.getFullName());

+ 2 - 2
seecoder-build-server/src/main/java/cn/seecoder/build/server/service/facade/jenkins/impl/JenkinsApiImpl.java

@@ -37,7 +37,7 @@ public class JenkinsApiImpl implements JenkinsApi {
 
     @Autowired
     //public JenkinsApiImpl(ApplicationProperties properties, JenkinsInternalApi jenkinsInternalApi) {
-    
+
     public JenkinsApiImpl(JenkinsInternalApi jenkinsInternalApi) {
         //this.properties = properties;
         this.jenkinsInternalApi = jenkinsInternalApi;
@@ -79,7 +79,7 @@ public class JenkinsApiImpl implements JenkinsApi {
             JobWithDetails jobWithDetails = server.getJob(jobName);
             logger.info("getJobWithDetails成功");
             reference = jenkinsInternalApi.invokeBuild(jobWithDetails, params);
-            logger.info("invokeBuild成功");
+            logger.info("invokeBuild成功 referenceUrl:"+reference.getQueueItemUrlPart());
             QueueItem item = server.getQueueItem(reference);
             logger.info("第一次getQueueItem成功");
             while (item.getExecutable() == null) {

+ 1 - 1
seecoder-build-server/src/main/java/cn/seecoder/build/server/service/facade/jenkins/impl/JenkinsInternalApiImpl.java

@@ -58,7 +58,7 @@ public class JenkinsInternalApiImpl implements JenkinsInternalApi {
         if (params == null) {
             reference = internalJob.build();
             //下面确定了是reference的链接是外部链接
-            //logger.info("reference url part:" + reference.getQueueItemUrlPart());
+            logger.info("reference url part:" + reference.getQueueItemUrlPart());
         } else {
             reference = internalJob.build(params, false);
             //logger.info("reference url part:" + reference.getQueueItemUrlPart());