gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix:代码生成文件路径从类名改为模块名，修复包名为模块名导致的报错，路径分隔符修改，前端页面路径存放在类名文件夹下

pull/22/head
#s 2020-12-27 00:45:44 +08:00 committed by Gitee
parent e9e5a1d63d
commit be4e0ddab7
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/core/config/Config.java
View File

@ -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
};

4
xiaonuo-base/xiaonuo-gen/src/main/java/com/cn/xiaonuo/generate/modular/service/impl/CodeGenerateServiceImpl.java
View File

@ -266,7 +266,7 @@ public class CodeGenerateServiceImpl extends ServiceImpl<CodeGenerateMapper, Cod
//实例化一个VelocityEngine对象
VelocityEngine velocityEngine=new VelocityEngine(properties);
String[] filePath = Config.xnCodeGenFilePath(xnCodeGenParam.getClassName().toLowerCase(), xnCodeGenParam.getPackageName());
String[] filePath = Config.xnCodeGenFilePath(xnCodeGenParam.getBusName(), xnCodeGenParam.getPackageName(), xnCodeGenParam.getClassName());
for (int i = 0; i < filePath.length; i++) {
String templateName = Config.xnCodeGenTempFile[i];
@ -308,7 +308,7 @@ public class CodeGenerateServiceImpl extends ServiceImpl<CodeGenerateMapper, Cod
Util.initVelocity();
XnVelocityContext context = new XnVelocityContext();
String[] filePath = Config.xnCodeGenFilePath(xnCodeGenParam.getClassName().toLowerCase(), xnCodeGenParam.getPackageName());
String[] filePath = Config.xnCodeGenFilePath(xnCodeGenParam.getBusName(), xnCodeGenParam.getPackageName(), xnCodeGenParam.getClassName());
for (int a = 0; a < filePath.length; a++) {
String templateName = Config.xnCodeGenTempFile[a];