crabatool 1.0.198 → 1.0.203

package/index.js

@@ -52,6 +52,7 @@ function checkFast(args) {
   // crabatool -update -webPath 项目路径 -version可选参数
   if (args.includes('-update')) {
     start.bindAndCheckConfig('-webPath');
+    start.checkCraba();
     require('./tool/upgrade.js').updateCraba();
     return false;
   }
@@ -59,6 +60,7 @@ function checkFast(args) {
   // crabatool -checkUpdate -version master -webPath F:\\crabaevery\\www
   if (args.includes('-checkUpdate')) {
     start.bindAndCheckConfig('-webPath');
+    start.checkCraba();
     require('./tool/upgrade.js').checkUpdateCraba();
     return false;
   }

package/lib/utils.js

@@ -431,7 +431,9 @@ class Utils {
             });
         }
 
-        if (!fileList) fileList = [];
+        if (!fileList) {
+            fileList = [];
+        }
 
         if (!fs.existsSync(source)) {
             return fileList;
@@ -440,7 +442,8 @@ class Utils {
         var files = fs.readdirSync(source);
         files.forEach(function(fileName) {
             var filePath = utils.join(source, fileName);
-            if (options.ignores && options.ignores.includes(filePath)) {
+            // 包含路径或文件名，都忽略掉
+            if (options.ignores && (options.ignores.includes(filePath) || options.ignores.includes(fileName))) {
                 return;
             }
 
@@ -631,13 +634,16 @@ class Utils {
         return temppath;
     }
 
-    addPackageVersion(packagePath) {
+    addPackageVersion(packagePath, v1, v2) {
         if (!fs.existsSync(packagePath)) {
             return false;
         }
 
+        if (!v1) v1 = 'version';
+        if (!v2) v2 = 'updateTime';
+
         var pkg = JSON.parse(fs.readFileSync(packagePath));
-        var version = pkg.version;
+        var version = pkg[v1];
         if (!version) return false;
 
         var vs = version.split('.');
@@ -651,10 +657,10 @@ class Utils {
         }
 
         var dt = new Date();
-        pkg.updateTime = dt.toString();
+        pkg[v2] = dt.toString();
 
         var versionOk = vs.join(".");
-        pkg.version = versionOk;
+        pkg[v1] = versionOk;
         console.log("date:" + dt.toString() + "--old:" + version + "-----new:" + versionOk);
 
         var content = JSON.stringify(pkg);

package/package.json

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

package/tool/checkjs.js

@@ -275,7 +275,7 @@ module.exports.start = async function() {
     detail.push("| ----- | ------ | ---- | ---- |");
     infoList.forEach((item) => {
       detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
-      sonar.issues.push(getSonarEntity('语法异常', modName, item.char.trim(), fileName, -1, item.line, item.column, item.endLine));
+      sonar.issues.push(getSonarEntity('语法异常', modName, item.char.trim(), fileName, item.line, item.column, item.endLine));
     });
   });
   //}
@@ -292,7 +292,7 @@ module.exports.start = async function() {
     detail.push("| ----- | ------ | ---- | ---- |");
     infoList.forEach((item) => {
       detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
-      sonar.issues.push(getSonarEntity('语法警告', modName, item.char.trim(), fileName, -1, item.line, item.column, item.endLine));
+      sonar.issues.push(getSonarEntity('语法警告', modName, item.char.trim(), fileName, item.line, item.column, item.endLine));
     });
   });
   //}
@@ -310,7 +310,7 @@ module.exports.start = async function() {
     detail.push("| ----- | ------ | ---- | ---- |");
     infoList.forEach((item) => {
       detail.push(`| ${item.char.trim()} | ${item.line || '-'} | ${item.column || '-'} | ${item.msg || '-'} |`);
-      sonar.issues.push(getSonarEntity('语法提示', modName, item.char.trim(), fileName, -1, item.line, item.column, item.endLine));
+      sonar.issues.push(getSonarEntity('语法提示', modName, item.char.trim(), fileName, item.line, item.column, item.endLine));
     });
   });
   //}
@@ -321,7 +321,7 @@ module.exports.start = async function() {
     notUtf8List.forEach((s, index) => {
       detail.push(`${index + 1}. ${s}`);
 
-      sonar.issues.push(getSonarEntity('非utf8', modName, '', s, -1, -1));
+      sonar.issues.push(getSonarEntity('非utf8', modName, '', s, -1, -1,-1));
     });
   }
 
@@ -480,7 +480,10 @@ function getSonarEntity(type, modName, message, filePath, line, column, endLine)
 }
 
 function getReportUrl(id, anchor) {
-  if (!config.reportHost) return '';
+  if (!config.reportHost) {
+    return '';
+  }
+
   var href = config.reportHost + "/index.html#%2FPages%2FReport%2FJsReport.gspx?id=" + id;
   if (anchor) {
     href += "&toc=anchor-" + anchor;
@@ -538,7 +541,10 @@ function postWebhooks(id, reportUrl, webhookList) {
     return;
   }
 
-  if (reportUrl) webhookList.push(`[报告详情](${reportUrl})`);
+  if (reportUrl) {
+    webhookList.push(`[报告详情](${reportUrl})`);
+    webhookList.push("[导出excel](" + config.reportHost + "/apis/downloadReport?id=" + id + ")");
+  }
   var content = webhookList.join('  \n');// 推送到钉钉只推送详情
 
   var data = {

package/tool/crabapublish.js

@@ -13,18 +13,17 @@ var _pkgPath = utils.getCrabaPackgePath(path.join(_jsPath, 'package.json'));
 var pkg = utils.readPackage(_pkgPath);
 
 module.exports.upload = function() {
-  doUploadPkg(); // 先上传package版本信息文件，然后上传craba.zip资源包，再然后调用自动化测试
+  doUploadPkg(config.version, _pkgPath, doZipCraba); // 先上传package版本信息文件，然后上传craba.zip资源包，再然后调用自动化测试
 }
 
-function doUploadPkg() {
-  var version = config.version; // 默认临时目录下
+function doUploadPkg(version, pkgPath, cb) {
   var host = config.host || config.SourceHost;
   var apis = utils.joinPath(host, '/apis/publish/save');
 
 
   const formData = new FormData();
   formData.append('my_field', 'my value');
-  formData.append('my_file', fs.createReadStream(_pkgPath));
+  formData.append('my_file', fs.createReadStream(pkgPath));
   var headers = formData.getHeaders();
 
   axios({
@@ -37,27 +36,26 @@ function doUploadPkg() {
       token: 'wssf2021' // 临时授权码
     }
   }).then(function(response) {
-    console.log(response.data);
-    doZipCraba();
+    //console.log(response.data);
+    if (cb) cb(version);
   }).catch(function(err) {
     console.log(err);
   });
 }
 
-function doZipCraba() {
+function doZipCraba(version) {
   // 将demo文件一起打包
   utils.copyFiles(path.join(_jsPath, 'demo'), _tempPath);
 
   // 打包平台资源
   utils.zip(_tempPath, _zipName, function() {
     console.log('压缩完成');
-    doUploadCraba(); // 根据配置上传到服务端指定路径（分支）下
+    doUploadCraba(version); // 根据配置上传到服务端指定路径（分支）下
   }, { ignoreBase: true }); // 忽略跟路径
 }
 
-function doUploadCraba() {
+function doUploadCraba(version) {
   console.log('上传资源');
-  var version = config.version; // 默认临时目录下
   var host = config.host || config.SourceHost;
   var apis = utils.joinPath(host, '/apis/publish/save');
 
@@ -76,12 +74,13 @@ function doUploadCraba() {
     data: formData,
     headers: {
       ...headers,
+      craba: 1,
       version: version,
       token: 'wssf2021' // 临时授权码
     }
   }).then(function(response) {
-    console.log(response.data);
-    doAutoTest();
+    //console.log(response.data);
+    if (version) doAutoTest();
   }).catch(function(err) {
     utils.postWeebhooks(config.modName + '上传资源失败');
     console.log(err);
@@ -91,15 +90,15 @@ function doUploadCraba() {
 function doAutoTest() {
   var type = process.env.REMOTE_BUILD != 'no' ? '正式环境' : '临时环境';
 
-  var msg = new Date().toString() + " " + config.modName + type + '发版完成。';
-  msg += '对应分支:' + config.version + '，对应版本:' + pkg.version;
+  var msg = new Date().toString() + "\r\n" + config.modName + type + '发版完成。';
+  msg += '\r\n对应分支:' + config.version + '\r\n对应版本:' + pkg.version;
 
   if (process.env.REMOTE_BUILD != 'no') {
     utils.postWeebhooks(msg);
     return;
   }
 
-  utils.postWeebhooks(msg + '，开始触发自动化测试');
+  utils.postWeebhooks(msg + '\r\n开始触发自动化测试');
 
   var url = 'http://jci.ca.com/job/craba-uitest/buildWithParameters?token=remoteBuild&remoteBuild=yes&version';
   axios({

package/tool/start.js

@@ -162,7 +162,7 @@ class Start {
   checkCraba() {
     var crabaJs = utils.join(config.webPath, 'js/craba.min.js');
     if (!fs.existsSync(crabaJs)) {
-      throw new Error('请检查craba.js，平台前端组件不存在，请检查指定的webPath路径是否为craba前端框架的根目录。' + crabaJs);
+      throw new Error('平台前端组件不存在，请检查指定的webPath路径是否为craba前端框架的根目录。' + crabaJs);
     }
   }
 

package/tool/upgrade.js

@@ -82,7 +82,7 @@ class Upgrade {
 
       // 如果没有手工记录更新日志，就不需要更新平台，即便是补丁也要手动标记
       var data = response.data;
-      if (data.success && data.data.remark) {
+      if (data.success && data.remark) {
         updateCraba(); // 需要更新平台
       }
     }).catch(function(err) {