crabatool 1.0.200 → 1.0.203

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;
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.200",
+  "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

@@ -74,6 +74,7 @@ function doUploadCraba(version) {
     data: formData,
     headers: {
       ...headers,
+      craba: 1,
       version: version,
       token: 'wssf2021' // 临时授权码
     }