dev-添加成功回调

api/buidApi.js

@@ -12,10 +12,10 @@ module.exports = {
                 var branch = body.branch;
                 var version = body.version;
                 var result = await buildshell.build(p_id, env_id, branch, version);
-                res.end("{success:true}");
+                res.end("{\"success\":true}");
             } catch (error) {
                 console.log(error);
-                res.end("{success:false}");
+                res.end("{\"success\":false}");
             }
         })();
     }

api/buildLogApi.js

@@ -2,7 +2,8 @@ var helper = require('../tools/helper')
 
 module.exports = {
     //分页查询构建日志
-    pageBuildLog: helper.pagedBuilder('build_log', 'log_id', {},'create_time desc'),
+    // FIXME  查询不支持 可能是原始包的bug 需要修改
+    pageBuildLog: helper.pagedBuilder('build_log', 'log_id', {}, 'log_id'),
     // 成功失败回调使用的修改接口
     // fixme 阻止新添加新的数据
     backCallSuccess: helper.saveBuilder('build_log', 'log_id'),

config/common.js

+/**
+ * 基础配置
+ */
+const config = {
+    host: '10.16.11.106',
+    port: 3000
+}
+module.exports = config;
\ No newline at end of file

shell/java.js

@@ -7,6 +7,7 @@ var sleep = require('sleep');
 var pomParser = require("pom-parser");
 var databaseHelper = require("../tools/databaseHelper");
 var moment = require('moment');
+var config = require("../config/common");
 
 /**
  * 构建Java项目
@@ -186,6 +187,9 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
     var logObject = await databaseHelper.saveJsonToDb(log_data, 'build_log', 'log_id');
     console.log(JSON.stringify(logObject));
 
+    //设置成功回调
+    var success_str = "    - \"curl -X PUT http://" + config.host + ":" + config.port + "/build/log/back -H 'Content-Type: application/json' " + `-d '{\\"log_id\\":${logObject.log_id},\\"success\\":1}'"`;
+
     // 创建gitlab-ci
     fs.writeFileSync(`${project_dir}/.gitlab-ci.yml`, typeObj.gitlab_ci);
     var gitlab_ci_map = {
@@ -195,7 +199,8 @@ const buildJava = async (projectObj, envObj, typeObj, configList, branch, versio
         "{docker_build_str}": _.trimEnd(docker_build_str, "\n"),
         "{docker_tag_str}": _.trimEnd(docker_tag_str, "\n"),
         "{docker_push_str}": _.trimEnd(docker_push_str, "\n"),
-        "{build_str_java}": build_script
+        "{build_str_java}": build_script,
+        "{success_str}": success_str
     };
     await replaceFileByMap(gitlab_ci_map, `${project_dir}/.gitlab-ci.yml`);
     // 提供gitlab-ci

tools/databaseHelper.js

@@ -125,8 +125,8 @@ var pagedDbByJson = (json, table, items, key, page = 1, pageSize = 10, orderby =
                         $limit: pageSize,
                         $offset: (page - 1) * pageSize,
                     }
-                    if (!_.isEmpty) {
-                        extra['$orderby'] = orderby;
+                    if (!_.isEmpty(orderby)) {
+                        extra['$orderBy'] = orderby;
                     }
                     return listDbByJson(json, table, items, extra).then((data) => {
                         resovle({