crabatool 1.0.222 → 1.0.230

package/lib/utils.js

@@ -71,7 +71,7 @@ class Utils {
             for (var i = 0; i < files.length; i++) {
                 var fileName = files[i];
                 var filePath = utils.join(source, fileName);
-                //console.log(filePath);
+                utils.debug(filePath);
                 var stat = fs.statSync(filePath);
                 if (stat.isDirectory()) {
                     basename = path.basename(fileName);
@@ -458,6 +458,10 @@ class Utils {
 
         var files = fs.readdirSync(source);
         files.forEach(function(fileName) {
+            if (fileName == 'node_modules') {
+                return;
+            }
+
             var filePath = utils.join(source, fileName);
             // 包含路径或文件名，都忽略掉
             if (options.ignores && (options.ignores.includes(filePath))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.222",
+  "version": "1.0.230",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -15,7 +15,7 @@
     "checkUpdate": "node run.js -checkUpdate -version master -webPath F:\\crabaevery\\www",
     "upload": "node run.js -upload -version master -Debug true -host http://127.0.0.1:9998 -hidejspath true -targetPath F:\\CarpaNET_NEW",
     "crabaNgp": "node run.js -mergejs -hidejspath true -targetPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\js\\crabaNgp -inNames initMs.js,businessControl.js -outName F:\\CarpaMS\\src\\js\\crabaNgp.js",
-    "webPath": "node ./test/test.js -checkjs -webhooks 0 -webPath F:\\newcrabadoc\\www -modName crabadoc -ignoreCheck ueditor,iconfont,biconfont,js\\math.min.js,js\\es6-promise.auto.min.js,js\\craba.rollup.min.js"
+    "webPath": "node ./test/test.js -checkjs -webhooks 0 -webPath F:\\crabaevery\\www -modName crabaevery"
   },
   "author": "wssf",
   "dependencies": {

package/tool/checkjs.js

@@ -51,6 +51,8 @@ module.exports.start = async function() {
   var notUtf8List = [];
   var utf8List = [];
 
+  utils.debug('开始检测js');
+
   // 开始检测
   var pb = new ProgressBar('检查进度', jsFiles.length);
   //jsFiles.forEach(async function(filePath) {
@@ -59,6 +61,8 @@ module.exports.start = async function() {
     var basename = path.basename(filePath);
     if (blackList.includes(basename)) continue;
 
+    utils.debug(filePath);
+
     var byte = fs.readFileSync(filePath);
     var content = byte.toString();
     // eslint检查

package/tool/crabapublish.js

@@ -91,7 +91,7 @@ function doAutoTest() {
   var type = process.env.REMOTE_BUILD != 'no' ? '正式环境' : '临时环境';
 
   var msg = new Date().toString() + "\r\n" + config.modName + type + '发版完成。';
-  msg += '\r\n对应分支:' + config.version + '\r\n对应版本:' + pkg.version;
+  msg += '\r\n资源包名:' + config.version + '\r\n平台版本:' + pkg.version;
 
   if (process.env.REMOTE_BUILD != 'no') {
     utils.postWeebhooks(msg);

package/tool/upgrade.js

@@ -84,7 +84,7 @@ class Upgrade {
       // 如果没有手工记录更新日志，就不需要更新平台，即便是补丁也要手动标记
       var data = response.data;
       if (data.success && data.remark && data.remark.length > 0) {
-        console.log(data.remark);
+        //console.log(data.remark);
         that.gitLogs = data.remark; // 先记录日志列表
         that.updateCraba(); // 需要更新平台
         that.clearLog(); // 每次更新后都要清除标记，避免下次又去更新；
@@ -140,6 +140,11 @@ class Upgrade {
       if (cb) cb();
       return;
     }
+    if (newData.version == "network error") {
+      console.log(':::获取平台版本失败:::');
+      if (cb) cb();
+      return;
+    }
 
     this.done = this._updateDone;
     this.downloadCraba();
@@ -175,15 +180,14 @@ class Upgrade {
 
     var logs = [];
     this.gitLogs.forEach(function(log, index) {
-      logs.push((index + 1) + '. 修改日志:' + log.branch_log + ', 修改时间:' + log.create_time);
+      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));
+    execSync('git add ' + config.webPath);
+    execSync('git commit -m \"' + logs.join(';\t') + '\"');
+    execSync('git push -u origin ' + (config.branchName || config.version));
   }
 
   _updateDone() {