dev-保存构建日志

api/buidApi.js

@@ -14,7 +14,8 @@ module.exports = {
                 var result = await buildshell.build(p_id, env_id, branch, version);
                 res.end(result);
             } catch (error) {
-                if (_.isObject) {
+                console.error(error);
+                if (_.isObject(error)) {
                     error = JSON.stringify(error);
                 }
                 console.error(error);

package-lock.json

@@ -472,6 +472,11 @@
         "brace-expansion": "^1.1.7"
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",

package.json

@@ -14,6 +14,7 @@
     "express": "^4.14.1",
     "json-sql-builder2": "^1.0.24",
     "lodash": "^4.17.15",
+    "moment": "^2.24.0",
     "mysql": "^2.13.0",
     "pom-parser": "^1.2.0",
     "replace-in-file": "^5.0.2",

shell/java.js

@@ -5,7 +5,8 @@ const replace = require('replace-in-file');
 const fs = require('fs');
 var sleep = require('sleep');
 var pomParser = require("pom-parser");
-var databaseHelper = require("../tools/databaseHelper")
+var databaseHelper = require("../tools/databaseHelper");
+var moment = require('moment');
 
 /**
  * 构建Java项目
@@ -126,7 +127,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
         // docker_build_str += "    - docker login 10.100.9.22:2080 -u " + username + " -p " + password + "\n";
     }
 
-
+    let image_names = "";
     // 关键替换
     for (let v of module_list) {
         let opt = "";
@@ -149,7 +150,7 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
         }
         var image_name = module_name.toLocaleLowerCase();
         var service_name = _.replace(pom_object.project.name, '-', '_');
-
+        image_names += `${registry_group}/${project_name}/${image_name}` + "|";
         var dockerfile_name = "dockerfile_" + service_name;
         variables_str += "  " + "IMAGE_NAME_" + service_name + ': "${IMAGE_HOST}/' + registry_group + '/${CI_PROJECT_NAME}/' + image_name + '"' + "\n";
         variables_str += "  " + 'IMAGE_VERSION_' + service_name + ': "${IMAGE_HOST}/' + registry_group + '/${CI_PROJECT_NAME}/' + image_name + ':${CI_COMMIT_TAG}"' + "\n";
@@ -170,6 +171,21 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
         await replaceFileByMap(dockerfile_map, `${project_dir}/${dockerfile_name}`);
     }
 
+    // 在这里保存数据正好
+    var log_data = {
+        image_name: image_names,
+        p_id: projectObj.p_id,
+        env_id: envObj.env_id,
+        project_name: projectObj.name,
+        branch: branch,
+        version: version,
+        success: 3,
+        create_time: moment().format("YYYY-MM-DD HH:mm:ss")
+    }
+
+    var logObject = await databaseHelper.saveJsonToDb(log_data, 'build_log', 'log_id');
+    console.log(JSON.stringify(logObject));
+
     // 创建gitlab-ci
     fs.writeFileSync(`${project_dir}/.gitlab-ci.yml`, typeObj.gitlab_ci);
     var gitlab_ci_map = {