优化代码

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/BuildService.java

@@ -53,7 +53,7 @@ public class BuildService {
         results.setHasNext(apps.hasNext());
 
         // TODO 待优化代码，使用一条 SQL 语句完成？
-        // 找出每个 app 最新的构建日志
+        // 找出每个 app 最新的部署日志
         List<BuildDeployResult> list = new ArrayList<>();
         for (AppOrchestration app : apps.getContent()) {
             BuildLog buildLog = buildLogRepository.findFirstByIsDeleteFalseAndAppIdOrderByCreateTimeDesc(app.getAppId());
@@ -62,8 +62,6 @@ public class BuildService {
                 List<DeployLog> deployLogs = deployLogRepository.findByIsDeleteFalseAndBuildLog(buildLog);
                 if (!deployLogs.isEmpty()) {
                     list.add(BuildDeployResult.fromDeployLogs(deployLogs));
-                } else {
-                    list.add(BuildDeployResult.fromBuildLog(buildLog));
                 }
             } else {
                 list.add(new BuildDeployResult(app.getAppId()));

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/build/AppIntegrate.java

@@ -191,7 +191,7 @@ public class AppIntegrate {
     private void buildException(BuildLog buildLog, Exception e) {
         buildLog.setStatusCode(1);
         buildLog.setMsg("构建失败");
-        buildLog.setErrDetail(ExceptionUtil.errorMsg(e).substring(0, 1000));
+        buildLog.setErrDetail(ExceptionUtil.errorMsg(e));
         buildLog.setBuildTime(LocalDateTime.now());
     }
 

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/updater/GitImpl.java

@@ -136,7 +136,11 @@ public class GitImpl implements CodeUpdater {
             commitLog.setCommitId(objectId.name().substring(0, 8));
             commitLog.setCommitTime(commitTime*1000);
             commitLog.setCommitAuthor(commitAuthor);
-            commitLog.setCommitMsg(commitMsg.substring(0, 1000));
+            if (commitMsg.length() > 1000) {
+                commitLog.setCommitMsg(commitMsg.substring(0, 1000));
+            } else {
+                commitLog.setCommitMsg(commitMsg);
+            }
             return commitLog;
         }
     }

dmaster/src/main/java/cn/reghao/autodop/dmaster/app/service/tools/updater/SvnImpl.java

@@ -110,7 +110,11 @@ public class SvnImpl implements CodeUpdater {
             Map<String, SVNLogEntryPath> changedPaths = logEntry.getChangedPaths();
 
             commitLog.setCommitId(commitId);
-            commitLog.setCommitMsg(commitMsg.substring(0, 1000));
+            if (commitMsg.length() > 1000) {
+                commitLog.setCommitMsg(commitMsg.substring(0, 1000));
+            } else {
+                commitLog.setCommitMsg(commitMsg);
+            }
             commitLog.setCommitAuthor(commitAuthor);
             commitLog.setCommitTime(commitTime);
             commitLog.setChangedFiles(changedFileList(changedPaths));

dmaster/src/main/java/cn/reghao/autodop/dmaster/auth/controller/IndexController.java

@@ -54,12 +54,17 @@ public class IndexController {
     }
 
     @PostMapping("/logout")
-    public ResponseEntity<String> logout() {
-        Map<String, String> map = new HashMap<>();
-        map.put("code", "20000");
-        map.put("data", "success");
+    public ResponseEntity<String> logout(@RequestBody String body) {
+        LogoutData logoutData = new LogoutData();
+        logoutData.setCode(20000);
+        logoutData.setData("success");
+        return ResponseEntity.ok().body(JsonUtil.objectToJson(logoutData));
+    }
 
-        return ResponseEntity.ok().body(JsonUtil.objectToJson(map));
+    @Data
+    static class LogoutData {
+        private int code;
+        private String data;
     }
 
     @Data

dmaster/src/main/java/cn/reghao/autodop/dmaster/common/exception/ExceptionUtil.java

@@ -10,7 +10,12 @@ import java.util.List;
 public class ExceptionUtil {
     public static String errorMsg(Exception e) {
         String stack = stackTrace(e);
-        return e.getMessage();
+        String errMsg = e.getMessage();
+        if (errMsg.length() > 1000) {
+            return errMsg.substring(0, 1000);
+        } else {
+            return errMsg;
+        }
     }
 
     public static String stackTrace(Exception e) {