crabatool 1.0.32 → 1.0.35

package/lib/config.js

@@ -1,11 +1,13 @@
 var path = require('path');
 var os = require('os');
+var pg = require('../package.json');
 
 class Config {
   constructor() {
     this.reportHost = "http://crabadoc.ca.com"; // 用于接收检测报告的服务器，可配置的。由于产品没有提供服务，目前统一放到平台的文档服务器
     this.webhooks = "https://oapi.dingtalk.com/robot/send?access_token=ce27b1b1540881540d44c0bd05ba738d865363758892ede137dc1020bd36bd5a";
 
+    this.Version = pg.version;
     this.Debug = false;
     this.Host = "http://crabadoc.mygjp.com.cn";
     this.TempPath = path.join(os.tmpdir(), '_crabatemp');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.32",
+  "version": "1.0.35",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {
@@ -8,7 +8,7 @@
     "test": "node ./test/test.js",
     "run": "node ./test/test.js -run",
     "checkjs": "node ./test/test.js -checkjs",
-    "webPath": "node ./test/test.js -checkjs -webPath F:\\crabaevery\\www -modName crabademo -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:\\newcrabadoc\\www -modName crabadoc -ignoreCheck ueditor,iconfont,biconfont,js\\math.min.js,js\\es6-promise.auto.min.js,js\\craba.rollup.min.js"
   },
   "author": "wssf",
   "dependencies": {

package/tool/checkjs.js

@@ -72,11 +72,15 @@ module.exports.start = function() {
   }
 
   var modName = config.modName || 'noname';
+  var dtList = [];
   var info = [];
   info.push(`# ${modName}代码检测报告——${status}`);
+  dtList.push(info[0]);
+
   info.push("| 名称 | 结果 |");
   info.push("| ------ | ------ |");
-  info.push('| 生成报告时间 | ' + new Date().toString() + ' |');
+  info.push(`| 助手版本 | ${config.Version} |`);
+  info.push(`| 生成报告时间 | ${new Date().toString()} |`);
   info.push(`| 共检查 | ${jsFiles.length}个js文件 |`);
   if (config.ignoreCheck) {
     info.push(`| 忽略目录和文件 | ${config.ignoreCheck.join('、') + ' |'}`);
@@ -86,8 +90,17 @@ module.exports.start = function() {
   info.push("| 异常类型 | 数量 |");
   info.push("| ------ | ------ |");
   info.push(`| 语法异常文件数 | ${errList.length}个 |`);
-  if (notUtf8List.length > 0) info.push(`| 非utf8文件数 | ${notUtf8List.length}个 |`);
-  if (bigList.length > 0) info.push(`| 超过${fileSize}kb的文件数 | ${bigList.length}个 |`);
+  dtList.push(`1. 语法异常文件数：${errList.length}个`);
+
+  if (notUtf8List.length > 0) {
+    info.push(`| 非utf8文件数 | ${notUtf8List.length}个 |`);
+    dtList.push(`1. 非utf8文件数：${notUtf8List.length}个`);
+  }
+  if (bigList.length > 0) {
+    info.push(`| 超过${fileSize}kb的文件数 | ${bigList.length}个 |`);
+    dtList.push(`1. 超过${fileSize}kb的文件数：${bigList.length}个`);
+  }
+
 
   var detail = [];
   if (errList.length > 0) {
@@ -101,7 +114,7 @@ module.exports.start = function() {
       detail.push("| 异常字符 | 位置 |");
       detail.push("| ----- | ------ |");
       err.list.forEach((item) => {
-        detail.push(`| ${item.char} | ${item.index} |`);
+        detail.push(`| ${item.char.trim()} | ${item.index} |`);
       });
     });
   }
@@ -124,7 +137,7 @@ module.exports.start = function() {
 
   //console.log(detail.join('\r\n'));
   var id = modName + '_' + new Date().getTime();
-  var content = info.concat(detail).join('  \n');
+  var content = info.concat(detail).join('  \r\n');
   console.log(content);
 
   var data = {
@@ -158,16 +171,16 @@ module.exports.start = function() {
   //utils.openProcess(reportUrl);
 
   //return;
-  if (!config.webhooks) {
-    config.log("::: craba.js里面配置config.webhooks，用于语法检测报告推送地址");
+  if (!config.webhooks || config.webhooks == '0') {
+    console.log("::: craba.js里面配置config.webhooks，用于语法检测报告推送地址");
     return;
   }
 
   if (status == '健康') return; // 检查结果检查就不发到钉钉了
 
   // 推送到钉钉只推送详情
-  info.push(`[报告详情](${reportUrl})`);
-  data.markdown.text = info.join('  \n');
+  dtList.push(`[报告详情](${reportUrl})`);
+  data.markdown.text = dtList.join('  \n');
 
   axios({
     method: 'post',