zianxin/pigx
1
0 Fork 0
mirror of http://git.pig4cloud.com/pig/pigx.git synced 2026-11-11 21:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

🔀 合并分支。

Browse Source
This commit is contained in:
冷冷 committed 2018-09-30 10:01:01 +08:00
2 parents b76e1c3e3f 0e4ad03e98
commit 8b9b541cee
30 files changed
+4523 -4448
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/GenUtils.java
+6 -5
View File
@@ -24,6 +24,7 @@ import cn.hutool.core.util.StrUtil;
import com.pig4cloud.pigx.codegen.entity.ColumnEntity;
import com.pig4cloud.pigx.codegen.entity.GenConfig;
import com.pig4cloud.pigx.codegen.entity.TableEntity;
import com.pig4cloud.pigx.common.core.constant.CommonConstant;
import com.pig4cloud.pigx.common.core.exception.CheckedException;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.configuration.Configuration;
@@ -239,7 +240,7 @@ public class GenUtils {
* 获取文件名
*/
private static String getFileName(String template, String className, String packageName, String moduleName) {
String packagePath = "pigx" + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator;
String packagePath = CommonConstant.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator;
if (StringUtils.isNotBlank(packageName)) {
packagePath += packageName.replace(".", File.separator) + File.separator + moduleName + File.separator;
}
@@ -265,7 +266,7 @@ public class GenUtils {
}
if (template.contains(MAPPER_XML_VM)) {
return "pigx" + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + className + "Mapper.xml";
return CommonConstant.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + className + "Mapper.xml";
}
if (template.contains(MENU_SQL_VM)) {
@@ -273,16 +274,16 @@ public class GenUtils {
}
if (template.contains(INDEX_VUE_VM)) {
return "pigx-ui" + File.separator + "src" + File.separator + "views" +
return CommonConstant.FRONT_END_PROJECT + File.separator + "src" + File.separator + "views" +
File.separator + moduleName + File.separator + className.toLowerCase() + File.separator + "index.vue";
}
if (template.contains(API_JS_VM)) {
return "pigx-ui" + File.separator + "src" + File.separator + "api" + File.separator + className.toLowerCase() + ".js";
return CommonConstant.FRONT_END_PROJECT + File.separator + "src" + File.separator + "api" + File.separator + className.toLowerCase() + ".js";
}
if (template.contains(CRUD_JS_VM)) {
return "pigx-ui" + File.separator + "src" + File.separator + "const" +
return CommonConstant.FRONT_END_PROJECT + File.separator + "src" + File.separator + "const" +
File.separator + "crud" + File.separator + className.toLowerCase() + ".js";
}
pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml
-3
View File
@@ -21,6 +21,3 @@ eureka:
client:
service-url:
defaultZone: http://pig:pig@192.168.0.20:1025/eureka/
logging:
level:
root: info