crabatool 1.0.210 → 1.0.221

package/.eslintrc.json

@@ -20,6 +20,7 @@
     "globals": {
         "Sys": "readonly",
         "Craba": "readonly",
+        "Carpa": "readonly",
         "Type": "readonly",
         "$app": "readonly",
         "$common": "readonly",
@@ -80,6 +81,7 @@
         "convertGridData": "readonly",
         "__pathMapName": "readonly",
         "CrabaLanguage": "readonly",
+        "CarpaLanguage": "readonly",
         "NGPLanguage": "readonly"
     }
 }

package/index.js

@@ -8,10 +8,6 @@ module.exports.run = function(options) {
 
   start.initArgs();  // 检查注册参数
 
-  if (options) {
-    console.log('运行参数:', options);
-  }
-
   if (!checkFast(process.argv)) {
     return;
   }

package/lib/utils.js

@@ -56,7 +56,15 @@ class Utils {
     }
 
     searchRootFolter(name, source) {
-        if (!path.basename(source)) return null;
+        var basename = path.basename(source);
+        if (!basename) {
+            return null;
+        }
+
+        if (basename == 'node_modules' || basename.startsWith('.')) {
+            return null;
+        }
+
         if (fs.existsSync(source)) {
             var files = fs.readdirSync(source);
             //console.log(files);
@@ -66,8 +74,14 @@ class Utils {
                 //console.log(filePath);
                 var stat = fs.statSync(filePath);
                 if (stat.isDirectory()) {
-                    var basename = path.basename(fileName);
-                    if (basename == name) return filePath;
+                    basename = path.basename(fileName);
+                    if (basename == name) {
+                        return filePath;
+                    }
+
+                    if (basename == 'node_modules' || basename.startsWith('.')) {
+                        continue;
+                    }
                 }
             }
         }
@@ -446,7 +460,7 @@ class Utils {
         files.forEach(function(fileName) {
             var filePath = utils.join(source, fileName);
             // 包含路径或文件名，都忽略掉
-            if (options.ignores && (options.ignores.includes(filePath) || options.ignores.includes(fileName))) {
+            if (options.ignores && (options.ignores.includes(filePath))) {
                 return;
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.210",
+  "version": "1.0.221",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/checkjs.js

@@ -492,7 +492,7 @@ function getReportUrl(id, anchor) {
 }
 
 function getBranchName() {
-  return config.branchName || 'null'
+  return config.branchName || 'null';
 }
 
 function getModName() {

package/tool/compress.js

@@ -66,7 +66,7 @@ function updateAgencyVersion() {
 function doCompress() {
 
   var inNames = ['agency.js'];
-  compressCrabaJs(inNames, 'agency.js', null, updateAgencyVersion);
+  compressCrabaJs(inNames, 'agency.js', updateAgencyVersion);
 
   // craba.min.js
   inNames = ['type.js', 'craba.js', 'common.js', 'es6.js', 'controls.js', 'required.js', 'listView.js', 'crabaEx.js', 'crabaFC.js', 'crabaMS.js'];
@@ -119,7 +119,9 @@ function compressJs(inNames, targetJs, onEnd) {
     hidejspath: config.hidejspath
   });
 
-  if (onEnd) onEnd();
+  if (onEnd) {
+    onEnd();
+  }
 
   /*
   var p = fork(_mergeJsPath, [`${[inNames]}`, `${[targetJs]}`, _compressArgs, _blackFilePath, config.hidejspath]);

package/tool/start.js

@@ -82,6 +82,7 @@ class Start {
       { name: '-progress', type: '' },
       { name: '-host', type: '' },
       { name: '-version', type: '' },
+      { name: '-branchName', type: '' },
       { name: '-abortUrl', type: '' },
 
       { name: '-ignoreCheck', type: 'array' },
@@ -142,7 +143,7 @@ class Start {
       config.webPath = utils.join(config.webPath);
     }
 
-    bindBranchName();
+    this.bindBranchName();
   }
 
   checkPath() {
@@ -160,6 +161,7 @@ class Start {
   }
 
   checkCraba() {
+    this.checkWebPath();
     var crabaJs = utils.join(config.webPath, 'js/craba.min.js');
     if (!fs.existsSync(crabaJs)) {
       throw new Error('平台前端组件不存在，请检查指定的webPath路径是否为craba前端框架的根目录。' + crabaJs);
@@ -237,45 +239,53 @@ class Start {
   createProject(options) {
     upgrade.createProject(options);
   }
-}
 
-var start = new Start();
-module.exports = start;
 
+  bindBranchName() {
+    if (config.branchName) {
+      return true;
+    }
 
-function bindBranchName() {
-  var gitPath = utils.searchRootFolter('.git', config.webPath);
-  if (!gitPath) return;
-  var headPath = utils.join(gitPath, 'HEAD');
-  if (!fs.existsSync(headPath)) return;
+    var gitPath = utils.searchRootFolter('.git', config.webPath);
+    if (!gitPath) return;
 
-  // 读取Head文件内容
-  var headStr = fs.readFileSync(headPath).toString().trim();
-  var arr = headStr.split('/');
+    var headPath = utils.join(gitPath, 'HEAD');
+    if (!fs.existsSync(headPath)) return;
 
-  // 情况1：取到分支名包含斜杠
-  if (arr.length > 1) {
-    config.branchName = arr[arr.length - 1]; // 分支名称
-    return;
-  }
+    // 读取Head文件内容
+    var headStr = fs.readFileSync(headPath).toString().trim();
+    var arr = headStr.split('/');
 
-  // 情况2：取到hash值
+    // 情况1：取到分支名包含斜杠
+    if (arr.length > 1) {
+      config.branchName = arr[arr.length - 1];
+      config.branchName = config.branchName.replace(/'/g, ''); // 分支名称
+      return;
+    }
 
-  headPath = utils.join(gitPath, 'FETCH_HEAD');
-  if (!fs.existsSync(headPath)) return;
+    // 情况2：取到hash值
+    headPath = utils.join(gitPath, 'FETCH_HEAD');
+    if (!fs.existsSync(headPath)) return;
 
-  // 读取Head文件内容
-  var content = fs.readFileSync(headPath).toString().trim();
-  arr = content.split('\n');
-  var results = arr.filter(function(str) {
-    if (str.startsWith(headStr)) return true;
-  });
+    // 读取Head文件内容
+    var content = fs.readFileSync(headPath).toString().trim();
+    arr = content.split('\n');
+    var results = arr.filter(function(str) {
+      if (str.startsWith(headStr)) return true;
+    });
 
-  if (!results || results.length == 0) return;
+    if (!results || results.length == 0) {
+      return;
+    }
 
-  config.branchName = results[0].split(' ')[1];
+    config.branchName = results[0].split(' ')[1];
+    config.branchName = config.branchName.replace(/'/g, ''); // 分支名称
+  }
 }
 
+var start = new Start();
+module.exports = start;
+
 
 /*内部私有方法*/
 

package/tool/upgrade.js

@@ -63,6 +63,7 @@ class Upgrade {
     var version = config.version; // 默认临时目录下
     var host = config.host || config.SourceHost;
     var apis = utils.joinPath(host, '/apis/publish/checkUpdate');
+    var that = this;
 
     var data = {
       version: version
@@ -83,13 +84,46 @@ class Upgrade {
       // 如果没有手工记录更新日志，就不需要更新平台，即便是补丁也要手动标记
       var data = response.data;
       if (data.success && data.remark) {
-        updateCraba(); // 需要更新平台
+        console.log(data.remark);
+        that.gitLogs = data.remark; // 先记录日志列表
+        that.updateCraba(); // 需要更新平台
+        that.clearLog(); // 每次更新后都要清除标记，避免下次又去更新；
+      } else {
+        console.log('没有检测到更新标记，无需更新平台资源');
       }
     }).catch(function(err) {
       console.log(err);
     });
   }
 
+  clearLog() {
+    var host = config.SourceHost;
+    var version = config.version; // 默认临时目录下
+    var host = config.host || config.SourceHost;
+    var apis = utils.joinPath(host, '/apis/publish/clearLog');
+    var that = this;
+
+    var data = {
+      version: version
+    };
+
+    // 调用api检查是否需要更新平台,传参数version,返回参数{code:200,success:true,data:{remark:'提交日志备注信息'}}
+    axios({
+      method: 'POST',
+      url: apis,
+      data: data,
+      headers: {
+        version: version,
+        token: 'wssf2021' // 临时授权码
+      }
+    }).then(function(response) {
+      console.log(response.data);
+      console.log('已删除分支标记');
+    }).catch(function(err) {
+      console.log(err);
+    });
+  }
+
   updateCraba(cb) {
     utils.cleardirsSync(config.SaveFilePath);
 
@@ -131,6 +165,27 @@ class Upgrade {
     this.downloadCraba()
   }
 
+  // 更新完成后推送平台并提交日志
+  pushGitLog() {
+    if (!this.gitLogs || this.gitLogs.length < 1) {
+      return;
+    }
+
+    const execSync = require('child_process').execSync;
+
+    var logs = [];
+    this.gitLogs.forEach(function(log, index) {
+      logs.push((index + 1) + '. 修改日志:' + log.branch_log + ', 修改时间:' + log.create_time);
+    });
+
+    //console.log(config);
+
+    execSync('cd ' + config.webPath);
+    execSync('git add .');
+    execSync('git commit -m "' + logs.join(';  ') + '"');
+    execSync('git push origin ' + (config.branchName || config.version));
+  }
+
   _updateDone() {
     this.pb.clear('完成');
 
@@ -139,6 +194,9 @@ class Upgrade {
       delete this.cb;
     }
 
+    // 推送git和日志
+    this.pushGitLog();
+
     // 可能文件占用中
     setTimeout(function() {
       utils.cleardirsSync(config.SaveFilePath);