crabatool 1.0.230 → 1.0.249

package/lib/server.js

@@ -5,6 +5,7 @@ var path = require('path');
 var config = require('./config.js');
 var utils = require('./utils.js');
 var compression = require('compression');
+const { off } = require('process');
 var app = new express();
 //app.use(express.json({ limit: '50mb' })); // post数据包大小限制
 app.use(compression()); // 开启压缩
@@ -36,8 +37,14 @@ app.use(express.static(config.webPath))
 // 业务ap的代理转发
 if (config.proxy) {
   var { createProxyMiddleware } = require('http-proxy-middleware');
-  for (let key in config.proxy) {
-    app.use(key, createProxyMiddleware(config.proxy[key]));
+  if (Array.isArray(config.proxy)) { // 兼容代理配置是数组
+    for (const item of config.proxy) {
+      app.use(createProxyMiddleware(item))
+    }
+  } else {
+    for (let key in config.proxy) {
+      app.use(key, createProxyMiddleware(config.proxy[key]));
+    }
   }
 }
 

package/lib/utils.js

@@ -645,14 +645,19 @@ class Utils {
         return ips.join(',');
     }
 
-    getCrabaPackgePath(packagePath) {
-        var temp = os.tmpdir();
-        var temppath = path.join(temp, '__crabaPackage', config.version, 'package.json');
-        if (!fs.existsSync(temppath)) {
-            this.mkdirsSync(temppath);
-            fs.copyFileSync(packagePath, temppath);
-        }
-        return temppath;
+    gitpush(branchName, msg) {
+        const execSync = require('child_process').execSync;
+        console.log('git add --all');  // 暂存
+        execSync('git add --all'); // 暂存
+
+        console.log('git commit -m \"' + msg + '\"'); // 提交日志
+        execSync('git commit -m \"' + msg + '\"'); // 提交日志
+
+        console.log('git pull --rebase origin ' + branchName); // 拉取分支
+        execSync('git pull --rebase origin ' + branchName); // 拉取分支
+
+        console.log('git push origin ' + branchName); // 推送
+        execSync('git push origin ' + branchName); // 推送
     }
 
     addPackageVersion(packagePath, v1, v2) {

package/package.json

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

package/test/craba.js

@@ -2,7 +2,7 @@
  * 项目环境使用工具包
  */
 
-var crabaTool = require('crabatool'); // 引入craba脚手架工具包
+var crabaTool = require('../index'); // 引入craba脚手架工具包
 
 
 // 当前项目相关配置，注意必填项和非必填项哦
@@ -10,7 +10,7 @@ var config = {
   //【必填】
   // 告诉工具当前项目的端路径地址，填绝对路径哦
   //webPath: "F:/shell_master/web/src/main/resources/static/shell",
-  webPath: "F:\\crabaevery\\www",
+  webPath: "/Users/yangyj/Desktop/test-craba/www",
 
   //【必填】
   // 告诉工具当前项目前端服务器端口地址
@@ -18,7 +18,7 @@ var config = {
 
   //【ngp必填】【非ngp项目不是必填】
   // 当前项目模块名称，各组按需修改
-  modName: "shell", // 如：modName:"jxc"
+  modName: "", // 如：modName:"jxc"
 
   // 【不是必填】
   // 告诉工具当webPath目录下面的js、css、gspx文件发生改变就自动刷新网页
@@ -35,12 +35,22 @@ var config = {
   ignoreCompress: true,
 
   proxy: {
-    '/apis/': {
-      target: 'http://127.0.0.1:8987',
-      changeOrigin: true, //是否重写请求头中的host
+    '/www': {
+      target: "http://127.0.0.1:3001",
+      pathRewrite: {
+        '^/www': ''
+      },
+      router: function (req) {
+        if (req.url.includes('.gspx')) {
+          return 'http://127.0.0.1:3000'
+        }
+      },
+      changeOrigin: false, //是否重写请求头中的host
+    },
+    '/api': {
+      target: "http://127.0.0.1:3000"
     }
   }
-
 }
 
 crabaTool.run(config); // 传入配置参数，启动工具

package/tool/compress.js

@@ -20,7 +20,7 @@ module.exports.run = function() {
   _zipName = path.join(config.targetPath, 'craba.zip');
   _tempJsPath = path.join(_tempPath, 'js');
   _tempSkinPath = path.join(_tempPath, 'skins');
-  _pkgPath = utils.getCrabaPackgePath(path.join(_jsPath, 'package.json'));
+  _pkgPath = path.join(_jsPath, 'package.json');
 
   if (fs.existsSync(_zipName)) {
     fs.unlinkSync(_zipName);
@@ -28,6 +28,10 @@ module.exports.run = function() {
 
   utils.addPackageVersion(_pkgPath); // 版本号+1
 
+
+  var branchName = config.branchName || config.version;
+  utils.gitpush(branchName, '版本号+1');
+
   doCompress(); // 打包、压缩、合并js和css到临时目录下
 }
 

package/tool/crabapublish.js

@@ -9,7 +9,7 @@ const FormData = require('form-data');
 var _tempPath = path.join(config.targetPath, '__build');
 var _zipName = path.join(config.targetPath, 'craba.zip');
 var _jsPath = path.join(config.targetPath, 'src/Carpa.Web/js');
-var _pkgPath = utils.getCrabaPackgePath(path.join(_jsPath, 'package.json'));
+var _pkgPath = path.join(_jsPath, 'package.json');
 var pkg = utils.readPackage(_pkgPath);
 
 module.exports.upload = function() {
@@ -107,7 +107,10 @@ function doAutoTest() {
   if (version == 'master') {
     version = 'NewCraba';
   }
+
   var url = 'http://jci.ca.com/job/craba-uitest/buildWithParameters?token=remoteBuild&remoteBuild=yes&version=' + version;
+  console.log('自动化测试Jenkins:', url);
+
   axios({
     method: 'GET',
     url: url

package/tool/upgrade.js

@@ -87,7 +87,6 @@ class Upgrade {
         //console.log(data.remark);
         that.gitLogs = data.remark; // 先记录日志列表
         that.updateCraba(); // 需要更新平台
-        that.clearLog(); // 每次更新后都要清除标记，避免下次又去更新；
       } else {
         console.log('没有检测到更新标记，无需更新平台资源');
       }
@@ -137,6 +136,9 @@ class Upgrade {
 
     if (localData.version == newData.version) {
       console.log(':::本地已经是最新版本，不需要更新:::');
+      if (this.hasLogs()) {
+        this.clearLog();
+      }
       if (cb) cb();
       return;
     }
@@ -170,24 +172,30 @@ class Upgrade {
     this.downloadCraba()
   }
 
+  hasLogs() {
+    if (!this.gitLogs || this.gitLogs.length < 1) {
+      return false;
+    }
+    return true;
+  }
+
   // 更新完成后推送平台并提交日志
   pushGitLog() {
-    if (!this.gitLogs || this.gitLogs.length < 1) {
+    if (!this.hasLogs()) {
       return;
     }
 
-    const execSync = require('child_process').execSync;
 
     var logs = [];
     this.gitLogs.forEach(function(log, index) {
-      logs.push((index + 1) + '.【日志】' + log.branch_log + '  【时间】' + log.create_time);
+      logs.push('【日志' + (index + 1) + '】' + log.branch_log + '，时间:' + log.create_time);
     });
+    var msg = logs.join(';\t');
 
-    //console.log(config);
+    var branchName = config.branchName || config.version;
+    utils.gitpush(branchName, msg);
 
-    execSync('git add ' + config.webPath);
-    execSync('git commit -m \"' + logs.join(';\t') + '\"');
-    execSync('git push -u origin ' + (config.branchName || config.version));
+    this.clearLog(); // 每次更新后都要清除标记，避免下次又去更新；
   }
 
   _updateDone() {