Browse Source

!229 关于 一键改包 目录问题
Merge pull request !229 from @C/master

芋道源码 2 years ago
parent
commit
83dc4047a9
1 changed files with 6 additions and 1 deletions
  1. 6 1
      yudao-server/src/test/java/cn/iocoder/yudao/ProjectReactor.java

+ 6 - 1
yudao-server/src/test/java/cn/iocoder/yudao/ProjectReactor.java

@@ -50,7 +50,12 @@ public class ProjectReactor {
         String projectBaseDirNew = projectBaseDir + "-new"; // 一键改名后,“新”项目所在的目录
         log.info("[main][检测新项目目录 ({})是否存在]", projectBaseDirNew);
         if (FileUtil.exist(projectBaseDirNew)) {
-            log.info("[main][新项目目录检测 ({})已存在,请更改新的目录,程序退出]", projectBaseDirNew);
+            log.error("[main][新项目目录检测 ({})已存在,请更改新的目录!程序退出]", projectBaseDirNew);
+            return;
+        }
+        // 如果新目录中存在 PACKAGE_NAME,ARTIFACT_ID 等关键字,路径会被替换,导致生成的文件不在预期目录
+        if (StrUtil.containsAny(projectBaseDirNew, PACKAGE_NAME, ARTIFACT_ID, StrUtil.upperFirst(ARTIFACT_ID))) {
+            log.error("[main][新项目目录检测 ({}) 存在冲突名称「{}」或者「{}」,请更改新的目录!程序退出]", projectBaseDirNew, PACKAGE_NAME, ARTIFACT_ID);
             return;
         }
         log.info("[main][完成新项目目录检测,新项目路径地址 ({})]", projectBaseDirNew);