fix: 修改日志记录

pom.xml

@@ -12,14 +12,14 @@
     <groupId>cn.seecoder</groupId>
     <artifactId>seecoder-build</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.2</version>
+    <version>0.1.3</version>
     <modules>
         <module>seecoder-build-client</module>
         <module>seecoder-build-server</module>
         <module>seecoder-build-common</module>
     </modules>
     <properties>
-        <seecoder-build-version>0.1.2</seecoder-build-version>
+        <seecoder-build-version>0.1.3</seecoder-build-version>
     </properties>
     <dependencyManagement>
         <dependencies>

seecoder-build-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>seecoder-build</artifactId>
         <groupId>cn.seecoder</groupId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

seecoder-build-client/src/main/java/cn/seecoder/build/client/SeecoderBuildClient.java

@@ -79,11 +79,11 @@ public class SeecoderBuildClient implements SeecoderBuildApi {
             if (create) {
                 builder = builder
                         .url(host + "/api/pipeline")
-                        .post(RequestBody.create(MediaType.parse("application/json; charset=utf-8"), objectMapper.writeValueAsString(vo)));
+                        .post(RequestBody.create(objectMapper.writeValueAsString(vo), MediaType.parse("application/json; charset=utf-8")));
             } else {
                 builder = builder
                         .url(host + "/api/pipeline/" + vo.getId())
-                        .put(RequestBody.create(MediaType.parse("application/json; charset=utf-8"), objectMapper.writeValueAsString(vo)));
+                        .put(RequestBody.create(objectMapper.writeValueAsString(vo), MediaType.parse("application/json; charset=utf-8")));
             }
             Request request = builder.build();
             final Call call = client.newCall(request);
@@ -165,7 +165,7 @@ public class SeecoderBuildClient implements SeecoderBuildApi {
             }
             Request request = new Request.Builder()
                     .url(host + "/api/job")
-                    .post(RequestBody.create(MediaType.parse("application/json; charset=utf-8"), objectMapper.writeValueAsString(params)))
+                    .post(RequestBody.create(objectMapper.writeValueAsString(params), MediaType.parse("application/json; charset=utf-8")))
                     .addHeader("Authorization", token)
                     .build();
             final Call call = client.newCall(request);
@@ -263,7 +263,7 @@ public class SeecoderBuildClient implements SeecoderBuildApi {
             paramsMap.put("params", params);
             Request request = new Request.Builder()
                     .url(host + "/api/job/run")
-                    .post(RequestBody.create(MediaType.parse("application/json; charset=utf-8"), objectMapper.writeValueAsString(paramsMap)))
+                    .post(RequestBody.create(objectMapper.writeValueAsString(paramsMap), MediaType.parse("application/json; charset=utf-8")))
                     .addHeader("Authorization", token)
                     .build();
             final Call call = client.newCall(request);

seecoder-build-client/src/test/java/cn/seecoder/client/SeecoderBuildClientTest.java

@@ -24,7 +24,7 @@ public class SeecoderBuildClientTest {
 
     @Before
     public void init() throws URISyntaxException, IOException {
-        client = new SeecoderBuildClient("http://localhost:8080", "3b861b052fd085887b5462fe5ae0c3a916b2c281d776a4d87e7bd5572ad24608");
+        client = new SeecoderBuildClient("https://seecoder-build.seec.seecoder.cn", "3b861b052fd085887b5462fe5ae0c3a916b2c281d776a4d87e7bd5572ad24608");
         template = IOUtils.readLines(getClass().getClassLoader().getResourceAsStream("config.xml")).stream().collect(Collectors.joining("\n"));
     }
 
@@ -71,18 +71,18 @@ public class SeecoderBuildClientTest {
     }
     @Test
     public void createJob() {
-        String jobName = client.createJob(2, null);
+        String jobName = client.createJob(1, "coder-test");
         System.out.println(jobName);
     }
     @Test
     public void deleteJob() {
-        String jobName = client.createJob(2, null);
+        String jobName = client.createJob(1, "coder-test-2");
         System.out.println(jobName);
         client.deleteJob(jobName);
     }
     @Test
     public void getBuildDetails() {
-        BuildDetailsVO detailsVO = client.getBuildDetails("Test", 15);
+        BuildDetailsVO detailsVO = client.getBuildDetails("coder-18617-18618", 2);
         System.out.println(detailsVO);
     }
     @Test
@@ -98,7 +98,7 @@ public class SeecoderBuildClientTest {
         params.put("EXECUTE_SHELL", "mvn cobertura:cobertura");
         params.put("PROB_TARGET", "COVERAGE");
         params.put("JAR_ARTIFACT", "org.jacoco.examples.maven.java-1.0-SNAPSHOT.jar");
-        client.invokeBuild(2, "Test", params);
+        System.out.println(client.invokeBuild(1, "coder-test", params));
     }
     @Test
     public void getEntity() {

seecoder-build-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>seecoder-build</artifactId>
         <groupId>cn.seecoder</groupId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

seecoder-build-common/src/main/java/cn/seecoder/build/model/vo/BuildDetailsVO.java

@@ -10,7 +10,7 @@ import lombok.ToString;
 import java.util.List;
 
 @Data
-@ToString
+@ToString(exclude = "consoleOutput")
 public class BuildDetailsVO {
 
     private String jobName;

seecoder-build-server/pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>cn.seecoder</groupId>
         <artifactId>seecoder-build</artifactId>
-        <version>0.1.2</version>
+        <version>0.1.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -101,7 +101,7 @@ public class JenkinsApiImpl implements JenkinsApi {
             }
             return build;
         } catch (IOException e) {
-            logger.error("deleteJob exception={}, jobName={}, buildNumber={}, waitFinished", e, jobName, buildNumber, waitFinished);
+            logger.error("fetchBuildDetails exception={}, jobName={}, buildNumber={}, waitFinished", e, jobName, buildNumber, waitFinished);
             throw new ServiceException("101", e.getMessage());
         }
     }