crabatool 1.0.194 → 1.0.195

package/package.json

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

package/tool/checkgspx.js

@@ -13,7 +13,9 @@ module.exports.getResults = function() {
     warnList: {},
     errorList: []
   };
-  if (!config.checkgspx) return data;
+  if (!config.checkgspx) {
+    return data;
+  }
 
   var gspxFiles = utils.getFiles({ source: config.webPath, exts: '.gspx' });
   data.count = gspxFiles.length;
@@ -25,6 +27,7 @@ module.exports.getResults = function() {
   Object.keys(data.tags).forEach((tag, index) => {
     data.tagList.push({ name: tag, count: data.tags[tag] });
   });
+
   data.tagList.sort(function(item0, item1) {
     return item0.count > item1.count ? -1 : 1;
   });
@@ -37,6 +40,9 @@ function readGspxToJSON(fileName, data) {
   var node;
   var byte = fs.readFileSync(fileName);
   var gspxXML = utils.toUtf8(byte);
+  if (!gspxXML.startsWith('<?xml')) {
+    data.errorList.push({ fileName: fileName, tag: '', error: 'gspx文件第一行必须是:<?xml version="1.0" encoding="UTF-8"?>' });
+  }
   var level = 0;
 
   fileName = fileName.replace(config.webPath, '');  // 简化文件路径

package/tool/checkjs.js

@@ -213,6 +213,10 @@ module.exports.start = async function() {
   webhookList.push(`1. 共检测 ${jsFiles.length}个 js文件 `);
   webhookList.push(`1. 共检测 ${gspxData.count}个 gspx文件 `);
 
+  if (gspxData.errorList.length > 0) {
+    webhookList.push(`1. gspx语法错误数：${gspxData.errorList.length}个，占比${calc(gspxData.errorList.length, gspxData.count)}`);
+  }
+
   // 输出到钉钉的简易报告
   //if (errKeys.length > 0) {
   webhookList.push(`1. 语法异常文件数Error：${errKeys.length}个，占比${calc(errKeys.length, jsFiles.length)}`);
@@ -251,9 +255,7 @@ module.exports.start = async function() {
   if (warnGspxCount > 0) {
     webhookList.push(`1. gspx建议优化数：${warnGspxCount}个，占比${calc(warnGspxCount, gspxData.count)}`);
   }
-  if (gspxData.errorList.length > 0) {
-    webhookList.push(`1. gspx语法错误数：${gspxData.errorList.length}个，占比${calc(gspxData.errorList.length, gspxData.count)}`);
-  }
+
 
   // 代码质量管理需要格式
   var sonar = {
@@ -334,7 +336,7 @@ module.exports.start = async function() {
   }
 
   if (gspxData.errorList.length > 0) {
-    detail.push(`# 出错页面清单如下`);
+    detail.push(`# 出错gspx页面清单如下`);
     gspxData.errorList.forEach((info, index) => {
       detail.push(`${index + 1}. ${info.name}`);
       detail.push(`> 错误标签: ${info.tag}`);