crabatool 1.0.76 → 1.0.79

package/package.json

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

package/test/test.js

@@ -10,11 +10,11 @@ var config = {
   //【必填】
   // 告诉工具当前项目的端路径地址，填绝对路径哦
   //webPath: "F:/shell_master/web/src/main/resources/static/shell",
-  //webPath: "F:\\newcrabadoc\\www",
+  webPath: "F:\\newcrabadoc\\www",
 
   //【必填】
   // 告诉工具当前项目前端服务器端口地址
-  //port: 3001,
+  port: 3001,
 
   //【ngp必填】【非ngp项目不是必填】
   // 当前项目模块名称，各组按需修改

package/tool/install.js

@@ -12,6 +12,10 @@ class Install {
   installIDEA() {
     // AppData
     var p1 = process.env.APPDATA;
+    if (!p1) {
+      //return console.log('本机没有APPDATA目录，本功能暂不支持mac');
+      p1 = path.join(process.env.HOME, "/Library/Application Support");
+    }
     var JetBrains = path.join(p1, "JetBrains");
     if (fs.existsSync(JetBrains)) {
       var folderName = utils.searchFolder("IntelliJIdea", JetBrains);
@@ -37,12 +41,19 @@ class Install {
     console.log('idea路径:' + ideaPath);
 
     // 第1步：gspx智能语法提示
-    var xsdFile = path.join(process.env.ProgramData, "idea/Craba.UI.xsd");
+    var xsdFile = path.join(ideaPath, "Craba.UI.xsd");
     utils.mkdirsSync(xsdFile);
     utils.downloadFile(config.SourceHost + "/setup/Craba.UI.xsd", xsdFile, true);
 
     var extFile = path.join(ideaPath, "options/javaeeExternalResources.xml");
-    utils.downloadFile(config.SourceHost + "/setup/idea/options/javaeeExternalResources.xml", extFile);
+    utils.downloadFile(config.SourceHost + "/setup/idea/options/javaeeExternalResources.xml", extFile, function() {
+      var xml = fs.readFileSync(extFile).toString();
+      var xmldata = JSON.parse(xmljs.xml2json(xml, { compact: true, spaces: 2 }));
+      xmldata.application.component.resource._attributes.location = xsdFile;
+      xml = xmljs.json2xml(xmldata, { compact: true, ignoreComment: true, spaces: 2 });
+      fs.writeFileSync(extFile, xml);
+    });
+
 
     // 第2步：创建页面模板
     var gspxPath = path.join(ideaPath, "fileTemplates/Craba.gspx");

package/tool/start.js

@@ -113,20 +113,20 @@ class Start {
 
   // 启动服务
   runServer() {
-    this.checkPath();
+    start.checkPath();
     require('../lib/server.js');
   }
 
   // 更新平台后启动服务
   update() {
-    this.checkPath();
+    start.checkPath();
     upgrade.updateCraba(start.runServer);
   }
 
   // 查看本地版本
   showLocalVersion(check) {
     if (check && !config.webPath) return;
-    this.checkPath();
+    start.checkPath();
     var localData = upgrade.getLocalVersion();
     console.log(`\r\n本地craba版本：[${localData.version}]\r\n本地craba日期：[${localData.date}]`);
   }
@@ -153,7 +153,7 @@ class Start {
 
   // 按配置对项目init.js和biz.js打包
   mergeInit() {
-    this.checkPath();
+    start.checkPath();
     if (config.modName && config.childModList && config.childModList.length > 0) {
       config.mergeinitjs = true; // 标记仅打包，不监视文件变动
       require('./ngptool.js');
@@ -164,13 +164,13 @@ class Start {
 
   // 校验项目js语法
   checkAllJs() {
-    this.checkPath();
+    start.checkPath();
     require('./checkjs.js').start();
   }
 
   // 对整个项目js打包
   compressAllJs() {
-    this.checkPath();
+    start.checkPath();
     console.log('待实现');
   }