Commit c8fcb6d3ed35266a25af45819c6377aa0ce6698e
1 parent
b8e5eeb2
[fix] 代码格式规范
Showing
1 changed file
with
4 additions
and
4 deletions
yudao-server/src/test/java/cn/iocoder/yudao/ProjectReactor.java
| @@ -50,12 +50,12 @@ public class ProjectReactor { | @@ -50,12 +50,12 @@ public class ProjectReactor { | ||
| 50 | String projectBaseDirNew = projectBaseDir + "-new"; // 一键改名后,“新”项目所在的目录 | 50 | String projectBaseDirNew = projectBaseDir + "-new"; // 一键改名后,“新”项目所在的目录 |
| 51 | log.info("[main][检测新项目目录 ({})是否存在]", projectBaseDirNew); | 51 | log.info("[main][检测新项目目录 ({})是否存在]", projectBaseDirNew); |
| 52 | if (FileUtil.exist(projectBaseDirNew)) { | 52 | if (FileUtil.exist(projectBaseDirNew)) { |
| 53 | - log.info("[main][新项目目录检测 ({})已存在,请更改新的目录,程序退出]", projectBaseDirNew); | 53 | + log.error("[main][新项目目录检测 ({})已存在,请更改新的目录!程序退出]", projectBaseDirNew); |
| 54 | return; | 54 | return; |
| 55 | } | 55 | } |
| 56 | - //如果新目录中存在 PACKAGE_NAME, ARTIFACT_ID 等关键字,路径会被替换,导致生成的文件不在预期目录 | ||
| 57 | - if(StrUtil.containsAny(projectBaseDirNew, PACKAGE_NAME, ARTIFACT_ID, StrUtil.upperFirst(ARTIFACT_ID))) { | ||
| 58 | - log.info("[main][新项目目录检测 ({}) 存在冲突名称「{}」或者「{}」,请更改新的目录,程序退出]", projectBaseDirNew, PACKAGE_NAME, ARTIFACT_ID); | 56 | + // 如果新目录中存在 PACKAGE_NAME,ARTIFACT_ID 等关键字,路径会被替换,导致生成的文件不在预期目录 |
| 57 | + if (StrUtil.containsAny(projectBaseDirNew, PACKAGE_NAME, ARTIFACT_ID, StrUtil.upperFirst(ARTIFACT_ID))) { | ||
| 58 | + log.error("[main][新项目目录检测 ({}) 存在冲突名称「{}」或者「{}」,请更改新的目录!程序退出]", projectBaseDirNew, PACKAGE_NAME, ARTIFACT_ID); | ||
| 59 | return; | 59 | return; |
| 60 | } | 60 | } |
| 61 | log.info("[main][完成新项目目录检测,新项目路径地址 ({})]", projectBaseDirNew); | 61 | log.info("[main][完成新项目目录检测,新项目路径地址 ({})]", projectBaseDirNew); |