crabatool 1.0.74 → 1.0.77

package/index.js

@@ -33,7 +33,7 @@ module.exports.run = function(options) {
     }
   }
 
-  start.showLocalVersion();
+  start.showLocalVersion(true);
 
   // 2. 开发环境让开发选择功能
   start.waitInput();

package/lib/config.js

@@ -12,8 +12,9 @@ class Config {
 
     this.Version = pg.version;
     this.Debug = false;
-    this.Host = "http://crabadoc.mygjp.com.cn";
-    //this.Host = "http://127.0.0.1:9998";
+    //this.SourceHost = "http://crabadoc.mygjp.com.cn";
+    this.SourceHost = "http://crabadoc.ca.com";
+    //this.SourceHost = "http://127.0.0.1:9998";
     this.TempPath = path.join(os.tmpdir(), '_crabatemp');
     this.ImageCache = path.join(this.TempPath, "_img");
     this.JsonFile = path.join(this.TempPath, "craba.json");

package/lib/utils.js

@@ -471,7 +471,7 @@ class Utils {
     downloadFile(uri, savePath, callback) {
         if (!uri || !savePath) throw new Error('uri或savePath不能为空');
 
-        console.log('下载文件中');
+        //console.log('下载文件中');
         axios({
             method: 'get',
             url: uri,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.74",
+  "version": "1.0.77",
   "description": "crabatool",
   "main": "index.js",
   "scripts": {

package/tool/install.js

@@ -12,6 +12,9 @@ class Install {
   installIDEA() {
     // AppData
     var p1 = process.env.APPDATA;
+    if (!p1) {
+      return console.log('本机没有APPDATA目录，本功能暂不支持mac');
+    }
     var JetBrains = path.join(p1, "JetBrains");
     if (fs.existsSync(JetBrains)) {
       var folderName = utils.searchFolder("IntelliJIdea", JetBrains);
@@ -30,23 +33,25 @@ class Install {
       return;
     }
 
-    console.log("没有找到IDEA的数据目录，请检查是否已经安装idea；如果有安装请反馈给管理员");
+    console.log("没有找到IDEA的数据目录，请检查是否已经安装idea");
   }
 
   doIDEA(ideaPath) {
+    console.log('idea路径:' + ideaPath);
+
     // 第1步：gspx智能语法提示
     var xsdFile = path.join(process.env.ProgramData, "idea/Craba.UI.xsd");
     utils.mkdirsSync(xsdFile);
-    utils.downloadFile(config.Host + "/setup/Craba.UI.xsd", xsdFile, true);
+    utils.downloadFile(config.SourceHost + "/setup/Craba.UI.xsd", xsdFile, true);
 
     var extFile = path.join(ideaPath, "options/javaeeExternalResources.xml");
-    utils.downloadFile(config.Host + "/setup/idea/options/javaeeExternalResources.xml", extFile);
+    utils.downloadFile(config.SourceHost + "/setup/idea/options/javaeeExternalResources.xml", extFile);
 
     // 第2步：创建页面模板
     var gspxPath = path.join(ideaPath, "fileTemplates/Craba.gspx");
     utils.mkdirsSync(gspxPath);
-    utils.downloadFile(config.Host + "/setup/idea/fileTemplates/Craba.xml", gspxPath);
-    utils.downloadFile(config.Host + "/setup/idea/fileTemplates/CrabaJs.js", path.join(ideaPath, "fileTemplates/CrabaJs.js"));
+    utils.downloadFile(config.SourceHost + "/setup/idea/fileTemplates/Craba.xml", gspxPath);
+    utils.downloadFile(config.SourceHost + "/setup/idea/fileTemplates/CrabaJs.js", path.join(ideaPath, "fileTemplates/CrabaJs.js"));
 
     // 第3步：gspx语法高亮
     var fileTypes = path.join(ideaPath, "options/filetypes.xml");

package/tool/start.js

@@ -83,7 +83,9 @@ class Start {
     bindConfigByArgv('-ignoreCompress', 'boolean');
     bindConfigByArgv('-Debug', 'boolean');
     bindConfigByArgv('-checkgspx', 'boolean');
+  }
 
+  checkPath() {
     if (!config.webPath) {
       throw new Error('请检查craba.js，必须告诉工具当前项目的前端路径地址，填绝对路径哦');
     }
@@ -111,24 +113,27 @@ class Start {
 
   // 启动服务
   runServer() {
+    this.checkPath();
     require('../lib/server.js');
   }
 
   // 更新平台后启动服务
   update() {
+    this.checkPath();
     upgrade.updateCraba(start.runServer);
   }
 
   // 查看本地版本
-  showLocalVersion() {
+  showLocalVersion(check) {
+    if (check && !config.webPath) return;
+    this.checkPath();
     var localData = upgrade.getLocalVersion();
     console.log(`\r\n本地craba版本：[${localData.version}]\r\n本地craba日期：[${localData.date}]`);
   }
 
   // 查看线上版本
   showNewVersion() {
-    start.showLocalVersion();
-
+    start.showLocalVersion(true);
     var data = upgrade.getNewVersion();
     utils.error(`最新craba版本：[${data.version}]`);
     utils.error(`最新craba日期：[${data.date}]`);
@@ -148,6 +153,7 @@ class Start {
 
   // 按配置对项目init.js和biz.js打包
   mergeInit() {
+    this.checkPath();
     if (config.modName && config.childModList && config.childModList.length > 0) {
       config.mergeinitjs = true; // 标记仅打包，不监视文件变动
       require('./ngptool.js');
@@ -158,11 +164,13 @@ class Start {
 
   // 校验项目js语法
   checkAllJs() {
+    this.checkPath();
     require('./checkjs.js').start();
   }
 
   // 对整个项目js打包
   compressAllJs() {
+    this.checkPath();
     console.log('待实现');
   }
 

package/tool/upgrade.js

@@ -11,14 +11,14 @@ class Upgrade {
   }
 
   getVersionUrl() {
-    var url = config.Host;
+    var url = config.SourceHost;
     if (!url.endsWith("/")) url += "/";
     url += "setup/crabaConfig.json";
     return url;
   }
 
   getCrabaFileUrl() {
-    var url = config.Host;
+    var url = config.SourceHost;
     if (!url.endsWith("/")) url += "/";
     url += "setup/craba.zip";
     return url;