From be4e0ddab746cf23e6190b079afb894b49a606cb Mon Sep 17 00:00:00 2001 From: #s Date: Sun, 27 Dec 2020 00:45:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E4=BB=8E=E7=B1=BB=E5=90=8D?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=A8=A1=E5=9D=97=E5=90=8D=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=8C=85=E5=90=8D=E4=B8=BA=E6=A8=A1=E5=9D=97=E5=90=8D?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8A=A5=E9=94=99=EF=BC=8C=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=88=86=E9=9A=94=E7=AC=A6=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E8=B7=AF=E5=BE=84=E5=AD=98?= =?UTF-8?q?=E6=94=BE=E5=9C=A8=E7=B1=BB=E5=90=8D=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaonuo/generate/core/config/Config.java | 28 +++++++++---------- .../service/impl/CodeGenerateServiceImpl.java | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/config/Config.java b/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/config/Config.java index c9f54672..7397d8f5 100644 --- a/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/config/Config.java +++ b/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/config/Config.java @@ -63,20 +63,20 @@ public class Config { /** * 各个代码存放路径文件夹 */ - public static String[] xnCodeGenFilePath (String busName, String packageName) { - String packageNameString = packageName.replace(".","\\") + "\\"; - controllerPath = BASE_JAVA_PAHT + packageNameString + MODULAR_NAME + "\\" + busName + "\\" + "controller" + "\\"; - entityPath = BASE_JAVA_PAHT + packageNameString + MODULAR_NAME + "\\" + busName + "\\" + "entity" + "\\"; - enumsPath = BASE_JAVA_PAHT+ packageNameString + MODULAR_NAME + "\\" + busName + "\\" + "enums" + "\\"; - mapperPath = BASE_JAVA_PAHT + packageNameString + MODULAR_NAME + "\\" + busName + "\\" + "mapper" + "\\"; - mappingPath = mapperPath + "\\" + "mapping" + "\\"; - paramPath = BASE_JAVA_PAHT+ "\\" + packageNameString + MODULAR_NAME + "\\" + busName + "\\" + "param" + "\\"; - servicePath = BASE_JAVA_PAHT+ "\\" + packageNameString + MODULAR_NAME + "\\" + busName + "\\" + "service" + "\\"; - serviceImplPath = servicePath + "\\" + "impl" + "\\"; - manageJsPath = BASE_VUE_PAHT + "\\" + "api\\" + MODULAR_NAME + "\\main\\" + busName + "\\"; - vueIndexPath = BASE_VUE_PAHT + "\\" + "views\\main\\" + busName + "\\"; - vueAddFromPath = BASE_VUE_PAHT + "\\" + "views\\main\\" + busName + "\\"; - vueEditFromPath = BASE_VUE_PAHT + "\\" + "views\\main\\" + busName + "\\"; + public static String[] xnCodeGenFilePath (String busName, String packageName, String className) { + String packageNameString = packageName.replace(".",File.separator) + File.separator; + controllerPath = BASE_JAVA_PAHT + packageNameString + MODULAR_NAME + File.separator + busName + File.separator + "controller" + File.separator; + entityPath = BASE_JAVA_PAHT + packageNameString + MODULAR_NAME + File.separator + busName + File.separator + "entity" + File.separator; + enumsPath = BASE_JAVA_PAHT+ packageNameString + MODULAR_NAME + File.separator + busName + File.separator + "enums" + File.separator; + mapperPath = BASE_JAVA_PAHT + packageNameString + MODULAR_NAME + File.separator + busName + File.separator + "mapper" + File.separator; + mappingPath = mapperPath + File.separator + "mapping" + File.separator; + paramPath = BASE_JAVA_PAHT+ File.separator + packageNameString + MODULAR_NAME + File.separator + busName + File.separator + "param" + File.separator; + servicePath = BASE_JAVA_PAHT+ File.separator + packageNameString + MODULAR_NAME + File.separator + busName + File.separator + "service" + File.separator; + serviceImplPath = servicePath + File.separator + "impl" + File.separator; + manageJsPath = BASE_VUE_PAHT + File.separator + "api" + File.separator + MODULAR_NAME + File.separator + "main" + File.separator + busName + File.separator; + vueIndexPath = BASE_VUE_PAHT + File.separator + "views" + File.separator + "main" + File.separator + busName + File.separator + StrUtil.lowerFirst(className) + File.separator; + vueAddFromPath = BASE_VUE_PAHT + File.separator + "views" + File.separator + "main" + File.separator + busName + File.separator + StrUtil.lowerFirst(className) + File.separator; + vueEditFromPath = BASE_VUE_PAHT + File.separator + "views" + File.separator + "main" + File.separator + busName + File.separator + StrUtil.lowerFirst(className) + File.separator; return new String[] { controllerPath, entityPath, enumsPath, mapperPath, mappingPath, paramPath, servicePath, serviceImplPath, manageJsPath, vueIndexPath, vueAddFromPath, vueEditFromPath }; diff --git a/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java b/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java index 0e8ce91d..c61bcff9 100644 --- a/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java +++ b/xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java @@ -266,7 +266,7 @@ public class CodeGenerateServiceImpl extends ServiceImpl