代码生成器更新

renren-cloud-generator/src/main/java/io/renren/utils/GenUtils.java

@@ -129,14 +129,7 @@ public class GenUtils {
 		map.put("columns", tableEntity.getColumns());
 		map.put("hasBigDecimal", hasBigDecimal);
 		map.put("main", main);
-
+        map.put("package", config.getString("package" ));
-		String moduleName = config.getString("moduleName" );
-		if(StringUtils.isNotBlank(moduleName)){
-			map.put("package", config.getString("package" ) + "." + moduleName);
-		}else {
-			map.put("package", config.getString("package" ));
-		}
-
 		map.put("moduleName", config.getString("moduleName" ));
 		map.put("author", config.getString("author"));
 		map.put("version", config.getString("version"));
@@ -202,7 +195,7 @@ public class GenUtils {
 	public static String getFileName(String template, String className, String packageName, String moduleName) {
 		String packagePath = "main" + File.separator + "java" + File.separator;
 		if (StringUtils.isNotBlank(packageName)) {
-			packagePath += packageName.replace(".", File.separator) + File.separator + moduleName + File.separator;
+			packagePath += packageName.replace(".", File.separator) + File.separator;
 		}
 
 		if (template.contains("Entity.java.vm" )) {
@@ -234,7 +227,7 @@ public class GenUtils {
 		}
 
 		if (template.contains("DTO.java.vm" )) {
-			return moduleName + File.separator + "dto" + File.separator + className + "DTO.java";
+			return "dto" + File.separator + className + "DTO.java";
 		}
 
 		if (template.contains("Dao.xml.vm" )) {