crabatool 1.0.280 → 1.0.281

package/package.json

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

package/tool/checkjs.js

@@ -158,6 +158,10 @@ module.exports.start = async function() {
   var errKeys = Object.keys(errDatas);
   var warnKeys = Object.keys(warnDatas);
   var infoKeys = Object.keys(infoDatas);
+  var reportData = {
+    projectName: getModName(),
+    branchName: getBranchName(),
+  }
   if (errKeys.length > 0 || warnKeys.length > 0 || notUtf8List.length > 0 || warnGspxCount > 0 || gspxData.errorList.length > 0) {
     status = '有异常';
   }
@@ -168,6 +172,8 @@ module.exports.start = async function() {
   var webhookList = [];
   var info = [];
   var localVersion = upgrade.getLocalVersion();
+  var generateDate = new Date().toString();
+  reportData.date = generateDate;
   info.push(`# ${modName}代码检测报告`);
   webhookList.push(info[0]);
 
@@ -178,7 +184,7 @@ module.exports.start = async function() {
     info.push(`| 平台版本 | ${localVersion.version} |`);
     info.push(`| 平台日期 | ${localVersion.date} |`);
   }
-  info.push(`| 生成报告时间 | ${new Date().toString()} |`);
+  info.push(`| 生成报告时间 | ${generateDate} |`);
   info.push(`| 分支名 | ${branchName} |`);
   info.push(`| 检测主机 | ${utils.getHostName()}(${utils.getLocalIPs()}) |`);
   info.push(`| 网站路径 | ${config.webPath} |`);
@@ -206,6 +212,17 @@ module.exports.start = async function() {
     info.push(`| gspx页面异常数 | ${gspxData.errorList.length}个 |${calc(gspxData.errorList.length, gspxData.count)}|`);
   }
 
+  reportData.data = {
+    errorCount: errKeys.length,
+    warnCount: errKeys.length,
+    tipCount: errKeys.length,
+    fileSize: fileSize,
+    fileSizeCount: bigList.length,
+    gspxWarnCount: warnGspxCount.length,
+    gspxErrorCount: gspxData.errorList.length,
+    jsTotal: jsFiles.length,
+    gspxTotal: gspxData.count
+  }
 
   webhookList.push(`1. 助手版本：${config.Version} `);
   if (localVersion.version) {
@@ -380,6 +397,7 @@ module.exports.start = async function() {
   var reportUrl = getReportUrl(id);
   var content = info.concat(detail).join('  \r\n');
   postReport(id, reportUrl, content, sonar);
+  postReportData(reportData)
 
   // 推送到钉钉
   if (status != '无异常') { // 检查结果检查就不发到钉钉了； ps:健康也发到钉钉，鼓励开发继续保持；
@@ -588,4 +606,19 @@ function postWebhooks(id, reportUrl, webhookList) {
       //console.log(error);
     });
   }
+}
+
+function postReportData(data) {
+  axios({
+    method: 'post',
+    url: config.reportHost + '/apis/saveReportData',
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  }).then(function(response) {
+    console.log("推送报告数据");
+    //console.log(response.data);
+  }).catch(function(error) {
+    console.log("推送报告数据:" + error.message);
+    //console.log(error);
+  });
 }