废弃项目

src/main/java/cn/com/duiba/duiba/generator/MybatisGenerator.java

@@ -7,7 +7,7 @@ import cn.com.duiba.duiba.generator.gencode.JavaDaoGenerator;
 import cn.com.duiba.duiba.generator.gencode.JavaDaoImplGenerator;
 import cn.com.duiba.duiba.generator.gencode.JavaEntityGenerator;
 import cn.com.duiba.duiba.generator.gencode.SQLXmlGenerator;
-import cn.com.duiba.duiba.generator.services.DuibaFreemarkerService;
+import cn.com.duiba.duiba.generator.tpls.DuibaFreemarkerService;
 import cn.com.duiba.duiba.generator.utils.DBUtils;
 
 import java.sql.Connection;

src/main/java/cn/com/duiba/duiba/generator/exceptions/DuibaGeneratorException.java

 package cn.com.duiba.duiba.generator.exceptions;
 
-public class DuibaGeneratorException extends RuntimeException{
+public class DuibaGeneratorException extends RuntimeException {
 
 	private static final long serialVersionUID = -1832371381972592054L;
 
@@ -11,5 +11,4 @@ public class DuibaGeneratorException extends RuntimeException{
 	public DuibaGeneratorException(Throwable cause) {
 		super(cause);
 	}
-
 }

src/main/java/cn/com/duiba/duiba/generator/gencode/AbstractGenerator.java

@@ -3,7 +3,7 @@ package cn.com.duiba.duiba.generator.gencode;
 import cn.com.duiba.duiba.generator.entity.GeneratorConfig;
 import cn.com.duiba.duiba.generator.entity.TableEntity;
 import cn.com.duiba.duiba.generator.exceptions.DuibaGeneratorException;
-import cn.com.duiba.duiba.generator.services.DuibaFreemarkerService;
+import cn.com.duiba.duiba.generator.tpls.DuibaFreemarkerService;
 import org.apache.commons.io.IOUtils;
 
 import java.io.File;

src/main/java/cn/com/duiba/duiba/generator/gencode/JavaDaoGenerator.java

@@ -2,7 +2,7 @@ package cn.com.duiba.duiba.generator.gencode;
 
 import cn.com.duiba.duiba.generator.entity.GeneratorConfig;
 import cn.com.duiba.duiba.generator.entity.TableEntity;
-import cn.com.duiba.duiba.generator.services.DuibaFreemarkerService;
+import cn.com.duiba.duiba.generator.tpls.DuibaFreemarkerService;
 import cn.com.duiba.duiba.generator.utils.PathUtils;
 
 public class JavaDaoGenerator extends AbstractGenerator{

src/main/java/cn/com/duiba/duiba/generator/gencode/JavaDaoImplGenerator.java

@@ -2,7 +2,7 @@ package cn.com.duiba.duiba.generator.gencode;
 
 import cn.com.duiba.duiba.generator.entity.GeneratorConfig;
 import cn.com.duiba.duiba.generator.entity.TableEntity;
-import cn.com.duiba.duiba.generator.services.DuibaFreemarkerService;
+import cn.com.duiba.duiba.generator.tpls.DuibaFreemarkerService;
 import cn.com.duiba.duiba.generator.utils.PathUtils;
 
 /**

src/main/java/cn/com/duiba/duiba/generator/gencode/JavaEntityGenerator.java

@@ -2,7 +2,7 @@ package cn.com.duiba.duiba.generator.gencode;
 
 import cn.com.duiba.duiba.generator.entity.GeneratorConfig;
 import cn.com.duiba.duiba.generator.entity.TableEntity;
-import cn.com.duiba.duiba.generator.services.DuibaFreemarkerService;
+import cn.com.duiba.duiba.generator.tpls.DuibaFreemarkerService;
 import cn.com.duiba.duiba.generator.utils.PathUtils;
 
 /**

src/main/java/cn/com/duiba/duiba/generator/gencode/SQLXmlGenerator.java

@@ -2,7 +2,7 @@ package cn.com.duiba.duiba.generator.gencode;
 
 import cn.com.duiba.duiba.generator.entity.GeneratorConfig;
 import cn.com.duiba.duiba.generator.entity.TableEntity;
-import cn.com.duiba.duiba.generator.services.DuibaFreemarkerService;
+import cn.com.duiba.duiba.generator.tpls.DuibaFreemarkerService;
 
 public class SQLXmlGenerator extends AbstractGenerator{
 

src/main/java/cn/com/duiba/duiba/generator/services/DuibaFreemarkerService.java → src/main/java/cn/com/duiba/duiba/generator/tpls/DuibaFreemarkerService.java

-package cn.com.duiba.duiba.generator.services;
+package cn.com.duiba.duiba.generator.tpls;
 
 import freemarker.template.Configuration;
 import freemarker.template.DefaultObjectWrapper;
@@ -12,18 +12,16 @@ import java.util.Map;
 
 /**
  * FreeMarker模板
+ *
+ * @author sunchangji
  */
 public class DuibaFreemarkerService {
-
 	private String location;
-
 	private String suffix;
-
 	private Configuration cfg = new Configuration();
-	
 	private String encoding = "utf-8";
 
-	public DuibaFreemarkerService(){
+	public DuibaFreemarkerService() {
 		cfg.setDefaultEncoding(encoding);
 		cfg.setClassForTemplateLoading(DuibaFreemarkerService.class, "");
 		cfg.setObjectWrapper(new DefaultObjectWrapper());
@@ -34,14 +32,14 @@ public class DuibaFreemarkerService {
 
 	public String merge(String template, Map<String, Object> model) {
 		try {
-			Template tpl = cfg.getTemplate(template+"."+suffix);
+			Template tpl = cfg.getTemplate(template + "." + suffix);
 			ByteArrayOutputStream bos = new ByteArrayOutputStream();
 			OutputStreamWriter writer = new OutputStreamWriter(bos);
 			tpl.process(model, writer);
 			writer.flush();
 			writer.close();
 			byte[] byteArray = bos.toByteArray();
-			return new String(byteArray,encoding);
+			return new String(byteArray, encoding);
 		} catch (IOException | TemplateException e) {
 			throw new RuntimeException(e);
 		}

src/test/java/cn/com/duiba/duiba/generator/CodeGeneratorTest.java

@@ -12,7 +12,7 @@ public class CodeGeneratorTest {
         String pwd = "dev_fas015";
 
         GeneratorConfig config = new GeneratorConfig(DB_URL, user, pwd);
-        config.setDaoPackage("cn.com.duiba.shark.mybatis.generator.test.dao");
+        config.setDaoPackage("cn.com.duiba..mybatis.generator.test.dao");
         config.setEntityPackage("cn.com.duiba.shark.mybatis.generator.test.entity");
         config.setXmlLocation("src/main/resources");
         config.setTableSchema("act_com_conf");