From b6bb175b185fe3337dfbc5293c5b8cf44e0015a1 Mon Sep 17 00:00:00 2001
From: Kinsonkl <jingxingwjx@gmail.com>
Date: Tue, 21 Apr 2020 17:15:56 +0800
Subject: [PATCH] code generator use mapper/model package in service/controller

---
 src/test/java/CodeGenerator.java                             | 3 +++
 src/test/resources/generator/template/controller-restful.ftl | 2 +-
 src/test/resources/generator/template/controller.ftl         | 2 +-
 src/test/resources/generator/template/service-impl.ftl       | 4 ++--
 src/test/resources/generator/template/service.ftl            | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/test/java/CodeGenerator.java b/src/test/java/CodeGenerator.java
index 05928e2bf..01da55bb7 100644
--- a/src/test/java/CodeGenerator.java
+++ b/src/test/java/CodeGenerator.java
@@ -142,6 +142,8 @@ public static void genService(String tableName, String modelName) {
             data.put("modelNameUpperCamel", modelNameUpperCamel);
             data.put("modelNameLowerCamel", tableNameConvertLowerCamel(tableName));
             data.put("basePackage", BASE_PACKAGE);
+            data.put("modelPackage", MODEL_PACKAGE);
+            data.put("mapperPackage", MAPPER_PACKAGE);
 
             File file = new File(PROJECT_PATH + JAVA_PATH + PACKAGE_PATH_SERVICE + modelNameUpperCamel + "Service.java");
             if (!file.getParentFile().exists()) {
@@ -175,6 +177,7 @@ public static void genController(String tableName, String modelName) {
             data.put("modelNameUpperCamel", modelNameUpperCamel);
             data.put("modelNameLowerCamel", CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, modelNameUpperCamel));
             data.put("basePackage", BASE_PACKAGE);
+            data.put("modelPackage", MODEL_PACKAGE);
 
             File file = new File(PROJECT_PATH + JAVA_PATH + PACKAGE_PATH_CONTROLLER + modelNameUpperCamel + "Controller.java");
             if (!file.getParentFile().exists()) {
diff --git a/src/test/resources/generator/template/controller-restful.ftl b/src/test/resources/generator/template/controller-restful.ftl
index 76a38566d..990688be8 100644
--- a/src/test/resources/generator/template/controller-restful.ftl
+++ b/src/test/resources/generator/template/controller-restful.ftl
@@ -2,7 +2,7 @@ package ${basePackage}.web;
 
 import ${basePackage}.core.Result;
 import ${basePackage}.core.ResultGenerator;
-import ${basePackage}.model.${modelNameUpperCamel};
+import ${modelPackage}.${modelNameUpperCamel};
 import ${basePackage}.service.${modelNameUpperCamel}Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
diff --git a/src/test/resources/generator/template/controller.ftl b/src/test/resources/generator/template/controller.ftl
index 720cbc039..6dacb8b52 100644
--- a/src/test/resources/generator/template/controller.ftl
+++ b/src/test/resources/generator/template/controller.ftl
@@ -1,7 +1,7 @@
 package ${basePackage}.web;
 import ${basePackage}.core.Result;
 import ${basePackage}.core.ResultGenerator;
-import ${basePackage}.model.${modelNameUpperCamel};
+import ${modelPackage}.${modelNameUpperCamel};
 import ${basePackage}.service.${modelNameUpperCamel}Service;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
diff --git a/src/test/resources/generator/template/service-impl.ftl b/src/test/resources/generator/template/service-impl.ftl
index cd4764033..1289b9020 100644
--- a/src/test/resources/generator/template/service-impl.ftl
+++ b/src/test/resources/generator/template/service-impl.ftl
@@ -1,7 +1,7 @@
 package ${basePackage}.service.impl;
 
-import ${basePackage}.dao.${modelNameUpperCamel}Mapper;
-import ${basePackage}.model.${modelNameUpperCamel};
+import ${mapperPackage}.${modelNameUpperCamel}Mapper;
+import ${modelPackage}.${modelNameUpperCamel};
 import ${basePackage}.service.${modelNameUpperCamel}Service;
 import ${basePackage}.core.AbstractService;
 import org.springframework.stereotype.Service;
diff --git a/src/test/resources/generator/template/service.ftl b/src/test/resources/generator/template/service.ftl
index 9479e9393..94a1a71d7 100644
--- a/src/test/resources/generator/template/service.ftl
+++ b/src/test/resources/generator/template/service.ftl
@@ -1,5 +1,5 @@
 package ${basePackage}.service;
-import ${basePackage}.model.${modelNameUpperCamel};
+import ${modelPackage}.${modelNameUpperCamel};
 import ${basePackage}.core.Service;