crabatool 1.0.150 → 1.0.151

package/index.js

@@ -9,7 +9,7 @@ module.exports.run = function(options) {
 
   start.checkConfig();  // 检查参数
 
-  console.log('运行参数:', options);
+  if (options) console.log('运行参数:', options);
 
   // 1. 服务端构建环境，自动化，根据命令行参数，直接调用脚手架功能
   if (process.argv.length > 2) {

package/package.json

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

package/tool/start.js

@@ -56,13 +56,14 @@ class Start {
         start.installvscode();
       } else if (num == 8) {
         var options = {};
-        options.projectPath = await waitFolder(question);
         options.type = await question('选择项目类型：1. 普通craba项目;  2. ngp微前端项目; 输入编号：');
         if (options.type != 1 && options.type != 2) options.type = 1;
         if (options.type == 2) {
           options.modName = await question('请输入微服务的模块名称：');
           if (!options.modName) options.modName = 'emptyname';
         }
+        options.projectPath = await waitFolder(question);
+
         rl.close(); // 关闭输入等待
         start.createProject(options);
       } else if (num != 9) {
@@ -251,14 +252,18 @@ function bindConfigByArgv(key, type) {
 }
 
 async function waitFolder(question) {
-  const projectPath = await question('请输入项目生成路径（必须为空路径）：');
+  var tip = '请输入项目生成路径：';
+  const projectPath = await question(tip);
   if (!path.isAbsolute(projectPath)) {
     console.log('路径不合法，请输入绝对路径，如:f:\\craba_web');
     return waitFolder(question);
   }
   if (fs.existsSync(projectPath)) {
     if (fs.readdirSync(projectPath).length > 0) {
-      console.log(':::输入的项目路径不为空，避免文件覆盖或冲突，请重新输入一个空路径或不存在的路径:::');
+      var result = await question('输入的路径下有其他文件，避免文件覆盖或冲突，请确认是否在此路径下创建项目（Y/N)：');
+      if (result && result.toLowerCace() == 'y') {
+        return projectPath;
+      }
       return waitFolder(question);
     }
   }

package/tool/upgrade.js

@@ -81,14 +81,16 @@ class Upgrade {
   }
 
   createProject(options) {
-
     var projectPath = "";
     if (options.type == 1) {
       projectPath = utils.join(options.projectPath, 'www');
     } else if (options.type == 2) {
-      projectPath = `${options.modName}/web/src/main/resources/static/${options.modName}`;
-      projectPath = utils.join(options.projectPath, projectPath);
-      projectPath = projectPath;
+      projectPath = `/web/src/main/resources/static/`;
+      if (!options.projectPath.includes(options.modName)) {
+        projectPath = utils.join(options.projectPath, options.modName, projectPath, options.modName);
+      } else {
+        projectPath = utils.join(options.projectPath, projectPath, options.modName);
+      }
     }
 
     this.done = this._createDone;