diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..b83d22266ac8aa2f8df2edef68082c789727841d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/lib/org.eclipse.swt.win32.win32.x86_3.5.2.v3557f.jar b/lib/org.eclipse.swt.win32.win32.x86_3.5.2.v3557f.jar new file mode 100644 index 0000000000000000000000000000000000000000..9b10b0dce4b1eafc2bc70016d5c8e6b75d7c7e0b Binary files /dev/null and b/lib/org.eclipse.swt.win32.win32.x86_3.5.2.v3557f.jar differ diff --git a/pom.xml b/pom.xml index 22f856b3e6ac075872e77158c759ad0b2143a1ca..fd4ca2c4d1e18a3d2a1bcba2d0a96d5bb59e20f4 100644 --- a/pom.xml +++ b/pom.xml @@ -83,11 +83,37 @@ org.eclipse swt - win32.win32.x86_64_3.7.2.v3740f + ${swt.version} system - ${basedir}/lib/org.eclipse.swt.win32.win32.x86_64_3.7.2.v3740f.jar + ${basedir}/lib/org.eclipse.swt.${swt.version}.jar + + + + 32 + + win32.win32.x86_3.5.2.v3557f + + + + + true + + + + + 64 + + win32.win32.x86_64_3.7.2.v3740f + + + + false + + + + diff --git a/resources/default.ini b/resources/default.ini deleted file mode 100644 index 60638970f426ab899d437696863ee56e6e392fca..0000000000000000000000000000000000000000 --- a/resources/default.ini +++ /dev/null @@ -1,9 +0,0 @@ - -driver=com.mysql.jdbc.Driver -url=jdbc:mysql://127.0.0.1:3306/test -username=root -password=root -packtext=com.fly -prefixtext=t -overwrite=true -protext=C:\\Users\\00fly\\Desktop\\ diff --git a/resources/jdbc.properties b/resources/jdbc.properties deleted file mode 100644 index 2b23ead56610e76206cef1cd740bc0483bbff408..0000000000000000000000000000000000000000 --- a/resources/jdbc.properties +++ /dev/null @@ -1,5 +0,0 @@ -#creatJDBCProperties for Project by kalin -jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/test?useUnicode\=true&characterEncoding\=utf-8 -jdbc.driver=com.mysql.jdbc.Driver -jdbc.username=root -jdbc.password=root \ No newline at end of file diff --git a/resources/log4j.xml b/resources/log4j.xml deleted file mode 100644 index 812897bb0493f13fd5b618b28710fc73725bd224..0000000000000000000000000000000000000000 --- a/resources/log4j.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/template/dbutils/pom.xml.ftl b/resources/template/dbutils/pom.xml.ftl index 697815f2ac8ab88d7ea72b8115a58cd45f8db96d..21aabbaae78a8fa62585931b973d53c30ed930ba 100644 --- a/resources/template/dbutils/pom.xml.ftl +++ b/resources/template/dbutils/pom.xml.ftl @@ -10,13 +10,29 @@ UTF-8 - - + + org.springframework.boot + spring-boot-starter-parent + 1.5.7.RELEASE + + + 1.8 + + + + org.springframework.boot + spring-boot-starter-web + commons-dbutils commons-dbutils 1.7 + + com.alibaba + druid + 1.1.3 + org.apache.commons commons-lang3 @@ -36,29 +52,23 @@ mysql mysql-connector-java - 5.1.38 + 5.1.44 org.slf4j slf4j-api 1.7.25 - - org.apache.tomcat - tomcat-jdbc - 8.5.20 - + core + + - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - + org.springframework.boot + spring-boot-maven-plugin + \ No newline at end of file diff --git a/resources/template/dbutils/src/main/java/${packagePath}/common/DaoException.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/common/DaoException.java.ftl index d1272f7599c0e473c74409c0646c96ab022e8f44..4b2c8f5733cb06b09a3a540157bab2d57eace4f5 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/common/DaoException.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/common/DaoException.java.ftl @@ -1,13 +1,14 @@ package ${packageName}.common; /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * DaoException - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public class DaoException extends Exception { diff --git a/resources/template/dbutils/src/main/java/${packagePath}/common/PaginationSupport.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/common/PaginationSupport.java.ftl index eb886c519914e3f86e369127292c23fcd6c2c7ed..5ca341b947f65b2bbd1a3e8f12efcfcab8462c9c 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/common/PaginationSupport.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/common/PaginationSupport.java.ftl @@ -4,12 +4,14 @@ import java.util.LinkedList; import java.util.List; /** + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * 分页对象 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public class PaginationSupport { diff --git a/resources/template/dbutils/src/main/java/${packagePath}/common/ServiceException.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/common/ServiceException.java.ftl index 8553df11decb5d7ca78082d788beeb70d1ef66b3..c0769dc6181bd99478d8f356b09aa79e55be07a0 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/common/ServiceException.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/common/ServiceException.java.ftl @@ -1,13 +1,15 @@ package ${packageName}.common; + /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * ServiceException - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public class ServiceException extends Exception { diff --git a/resources/template/dbutils/src/main/java/${packagePath}/core/BaseDAO.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/core/BaseDAO.java.ftl index d000fe9f6a64edb59568985bd9b368de41ab8ae5..224fe466caf3fb62cbb8b3b777e931a98294dbce 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/core/BaseDAO.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/core/BaseDAO.java.ftl @@ -8,13 +8,14 @@ import ${packageName}.common.DaoException; import ${packageName}.common.PaginationSupport; /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * BaseDAO - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ @SuppressWarnings({"rawtypes", "hiding"}) public abstract class BaseDAO diff --git a/resources/template/dbutils/src/main/java/${packagePath}/core/MySqlDBUtil.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/core/MySqlDBUtil.java.ftl index 192bed4870c3b6170507bc76092a852c0d34fee7..8d13b99c5ec1a21eefaa92f7eec1d80f6b63ffe3 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/core/MySqlDBUtil.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/core/MySqlDBUtil.java.ftl @@ -28,13 +28,14 @@ import org.slf4j.LoggerFactory; import ${packageName}.common.PaginationSupport; /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * 数据库操作工具类(Apache Dbutil 封装实现) - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ @SuppressWarnings({"rawtypes", "unchecked"}) public class MySqlDBUtil diff --git a/resources/template/dbutils/src/main/java/${packagePath}/core/TransactionManager.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/core/TransactionManager.java.ftl index 5eb721f915a96981c4f3dd7dc6b441ac387dfa16..5b53931d323040489999a6274f0ccd84f71a23cd 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/core/TransactionManager.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/core/TransactionManager.java.ftl @@ -8,14 +8,16 @@ import org.slf4j.LoggerFactory; import ${packageName}.common.DaoException; + /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * 事务管理器 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public class TransactionManager { diff --git a/resources/template/dbutils/src/main/java/${packagePath}/core/TransactionProvider.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/core/TransactionProvider.java.ftl index 3372a4ad3a5dc9c622f3dec95b7991a08d4ecbf1..6312b5bec676a485599d97aec995ca458a5bc207 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/core/TransactionProvider.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/core/TransactionProvider.java.ftl @@ -6,13 +6,14 @@ import org.slf4j.LoggerFactory; import ${packageName}.common.DaoException; /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * TransactionProvider 事务支持提供类 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public abstract class TransactionProvider { diff --git a/resources/template/dbutils/src/main/java/${packagePath}/dao/${className}DAO.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/dao/${className}DAO.java.ftl index 04bbcea0aaa3432d9d6d49a2548bfac2558ab411..2e106087d7f165d23740a681292e0db9bf9a886d 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/dao/${className}DAO.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/dao/${className}DAO.java.ftl @@ -5,14 +5,16 @@ import ${packageName}.common.DaoException; import ${packageName}.common.PaginationSupport; import ${pknEntity}.${className}; + /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * ${className}DAO 接口 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public interface ${className}DAO { diff --git a/resources/template/dbutils/src/main/java/${packagePath}/dao/impl/${className}DAOImpl.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/dao/impl/${className}DAOImpl.java.ftl index 934af3c87ebc90f7fc44d173e9bba423c4dd7043..a5f21112d00077ed9fcc891caca1ff368fd0c1cb 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/dao/impl/${className}DAOImpl.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/dao/impl/${className}DAOImpl.java.ftl @@ -11,16 +11,19 @@ import ${packageName}.core.BaseDAO; import ${packageName}.dao.${className}DAO; import ${pknEntity}.${className}; + /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * ${className}DAO 接口实现类 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @see ${packageName}.dao.${className}DAO + * @see ${packageName}.core.BaseDAO + * @since 1.0 */ - @SuppressWarnings("unchecked") public class ${className}DAOImpl extends BaseDAO<${className}> implements ${className}DAO { diff --git a/resources/template/dbutils/src/main/java/${packagePath}/entity/${className}.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/entity/${className}.java.ftl index 62e35cf9d954cea868547c2e4ff26096cf479232..3b84ef33380f76501d305ff326fb48ad48369e06 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/entity/${className}.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/entity/${className}.java.ftl @@ -8,13 +8,14 @@ import java.math.BigDecimal; /** - * - * ${tableName}表对应的${className}实体 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** + * ${tableName}表对应的${className}实体 + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public class ${className} { diff --git a/resources/template/dbutils/src/main/java/${packagePath}/service/${className}Service.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/service/${className}Service.java.ftl index cb600d3eedcf1c115cbc8bff05b49af26b4b23c7..7af3e76248fcd96fc1bd7fbb20f8835f51515386 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/service/${className}Service.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/service/${className}Service.java.ftl @@ -6,14 +6,16 @@ import ${packageName}.common.PaginationSupport; import ${packageName}.common.ServiceException; import ${pknEntity}.${className}; + /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * ${className}Service 接口 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public interface ${className}Service { diff --git a/resources/template/dbutils/src/main/java/${packagePath}/service/impl/${className}ServiceImpl.java.ftl b/resources/template/dbutils/src/main/java/${packagePath}/service/impl/${className}ServiceImpl.java.ftl index 635b15399b21f8ecee7f24dcb9b1f389c56445f0..82d1eeed552d60692be5f817578293ed689a6f9b 100644 --- a/resources/template/dbutils/src/main/java/${packagePath}/service/impl/${className}ServiceImpl.java.ftl +++ b/resources/template/dbutils/src/main/java/${packagePath}/service/impl/${className}ServiceImpl.java.ftl @@ -15,14 +15,18 @@ import ${pknDAO}.impl.${className}DAOImpl; import ${pknEntity}.${className}; import ${pknService}.${className}Service; + /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * ${className}Service 接口实现类 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @see ${packageName}.core.TransactionProvider + * @see ${pknService}.${className}Service + * @version 1.0 + * @since 1.0 */ public class ${className}ServiceImpl extends TransactionProvider implements ${className}Service { diff --git a/resources/template/springDbutils/logback.xml.ftl b/resources/template/springDbutils/logback.xml.ftl new file mode 100644 index 0000000000000000000000000000000000000000..decb0a7261fd46bcc1bbdadf0ca4b6f09c82fa28 --- /dev/null +++ b/resources/template/springDbutils/logback.xml.ftl @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + ${r'${OUTPUT_FORMAT}'} + + + + + + + + + + ${r'${LOG_HOME}'}/root.%d{yyyy-MM-dd}.log + 30 + + + ${r'${OUTPUT_FORMAT}'} + + + + + 10MB + + + + + + + + + + + ${r'${LOG_HOME}'}/db2xlsx.%d{yyyy-MM-dd}.log + 30 + + + ${r'${OUTPUT_FORMAT}'} + + + + + 10MB + + + + + + + + + + + ${r'${LOG_HOME}'}/sqlserver.%d{yyyy-MM-dd}.log + 30 + + + ${r'${OUTPUT_FORMAT}'} + + + + + 10MB + + + + + + + + + + + ${r'${LOG_HOME}'}/util.%d{yyyy-MM-dd}.log + 30 + + + ${r'${OUTPUT_FORMAT}'} + + + + + 10MB + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/template/springDbutils/pom.xml.ftl b/resources/template/springDbutils/pom.xml.ftl index 73942ebc28c6c37c7d03d75b615e7c0cdbc886de..c46be64416053dbd0c1ad66ed0795092d95ac726 100644 --- a/resources/template/springDbutils/pom.xml.ftl +++ b/resources/template/springDbutils/pom.xml.ftl @@ -7,13 +7,42 @@ war web_${date?date} http://maven.apache.org + + org.springframework.boot + spring-boot-starter-parent + 1.5.7.RELEASE + + UTF-8 - 4.1.6.RELEASE - 2.6.0 + 1.8 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework + spring-tx + + + org.springframework.boot + spring-boot-starter-jdbc + + + org.apache.tomcat + tomcat-jdbc + + + + + org.springframework.boot + spring-boot-starter-test + test + commons-dbutils commons-dbutils @@ -32,12 +61,10 @@ org.freemarker freemarker - 2.3.18 junit junit - 4.12 test @@ -49,98 +76,43 @@ mysql mysql-connector-java - 5.1.38 org.slf4j slf4j-api - 1.7.25 org.slf4j slf4j-log4j12 - 1.7.25 test - - org.apache.tomcat - tomcat-jdbc - 8.5.20 - - - - - org.springframework - spring-context - ${r'${spring.version}'} - - - org.springframework - spring-tx - ${r'${spring.version}'} - - - org.springframework - spring-orm - ${r'${spring.version}'} - - - org.springframework - spring-test - ${r'${spring.version}'} - - - org.springframework - spring-webmvc - ${r'${spring.version}'} - - - - - com.fasterxml.jackson.core - jackson-core - ${r'${jackson.version}'} - - - com.fasterxml.jackson.core - jackson-databind - ${r'${jackson.version}'} - - - com.fasterxml.jackson.core - jackson-annotations - ${r'${jackson.version}'} - + + org.slf4j + log4j-over-slf4j + + + commons-logging + commons-logging + 1.2 + - javax.servlet - javax.servlet-api - 3.1.0 - - - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.1 + com.alibaba + druid + 1.1.3 - + + core + + - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - maven-war-plugin - 2.6 - - false - + org.springframework.boot + spring-boot-maven-plugin + \ No newline at end of file diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/MainController.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/MainController.java.ftl new file mode 100644 index 0000000000000000000000000000000000000000..122a0daf8b952c4d54682b4bf48116ac99b540cc --- /dev/null +++ b/resources/template/springDbutils/src/main/java/${packagePath}/MainController.java.ftl @@ -0,0 +1,37 @@ +package ${packageName}; + +import org.springframework.boot.*; +import org.springframework.boot.autoconfigure.*; +import org.springframework.web.bind.annotation.*; + + + + +/** + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** + * 整个项目的入口 + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 + */ +@RestController +@SpringBootApplication +public class MainController { + + @RequestMapping("/") + @ResponseBody + String home() { + return "hello world!"; + } + + /** + * 程序入口 + * @param args 参数 + */ + public static void main(String[] args) { + SpringApplication.run(MainController.class, args); + } +} diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/common/DataException.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/common/DataException.java.ftl index 058e122f8437c4b64eb04d373db933b2e3ce5893..54f8fc191389920cf127004fb074e8c2343d00fb 100644 --- a/resources/template/springDbutils/src/main/java/${packagePath}/common/DataException.java.ftl +++ b/resources/template/springDbutils/src/main/java/${packagePath}/common/DataException.java.ftl @@ -1,13 +1,14 @@ package ${packageName}.common; /** - * - * DataBaseException - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** + * DaoException + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public class DataException extends RuntimeException { diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/common/ExceptionHandler.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/common/ExceptionHandler.java.ftl index a289e9be8dac90f02810279fb9ece340d97f9186..955b1893b75002dbef6345bca345aacdc19f1b85 100644 --- a/resources/template/springDbutils/src/main/java/${packagePath}/common/ExceptionHandler.java.ftl +++ b/resources/template/springDbutils/src/main/java/${packagePath}/common/ExceptionHandler.java.ftl @@ -6,16 +6,22 @@ import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.HandlerExceptionResolver; +import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.servlet.ModelAndView; +import org.springframework.stereotype.Component; /** + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** * 统一异常处理器 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @see org.springframework.web.servlet.HandlerExceptionResolver + * @since 1.0 */ +@Component public class ExceptionHandler implements HandlerExceptionResolver { Logger log = LoggerFactory.getLogger(getClass()); diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/common/PaginationSupport.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/common/PaginationSupport.java.ftl index eb886c519914e3f86e369127292c23fcd6c2c7ed..fcddafd8d885b66c19aad9025124a2785225b257 100644 --- a/resources/template/springDbutils/src/main/java/${packagePath}/common/PaginationSupport.java.ftl +++ b/resources/template/springDbutils/src/main/java/${packagePath}/common/PaginationSupport.java.ftl @@ -4,12 +4,14 @@ import java.util.LinkedList; import java.util.List; /** + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** * 分页对象 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public class PaginationSupport { diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/controller/${className}Controller.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/controller/${className}Controller.java.ftl index 7d1659ed3292f4e397bd5c9ef0ab2148e4c836d3..99586e115ce0b2823f2a26333094ee153faa3ea2 100644 --- a/resources/template/springDbutils/src/main/java/${packagePath}/controller/${className}Controller.java.ftl +++ b/resources/template/springDbutils/src/main/java/${packagePath}/controller/${className}Controller.java.ftl @@ -14,12 +14,14 @@ import ${packageName}.entity.${className}; import ${packageName}.service.${className}Service; /** + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** * ${className}Controller - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ @Controller @RequestMapping("/${className?lower_case}") diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/core/BaseDAO.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/core/BaseDAO.java.ftl index 678e8e0f3f3cebd3dbc9ab27b4bf3ca8c43fd5e8..b4c91ecc2afcbb4468b758955a89c17f180323ac 100644 --- a/resources/template/springDbutils/src/main/java/${packagePath}/core/BaseDAO.java.ftl +++ b/resources/template/springDbutils/src/main/java/${packagePath}/core/BaseDAO.java.ftl @@ -24,13 +24,14 @@ import ${packageName}.common.DataException; import ${packageName}.common.PaginationSupport; /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** * BaseDAO - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ @Repository @SuppressWarnings({"rawtypes", "unchecked", "hiding"}) diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/core/DruidConfig.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/core/DruidConfig.java.ftl new file mode 100644 index 0000000000000000000000000000000000000000..7badf43fa6340fd8df3383e1a684c4dd63e003d1 --- /dev/null +++ b/resources/template/springDbutils/src/main/java/${packagePath}/core/DruidConfig.java.ftl @@ -0,0 +1,149 @@ +package ${packageName}.core; + +import java.sql.SQLException; + +import javax.sql.DataSource; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.boot.web.servlet.ServletRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.support.http.StatViewServlet; +import com.alibaba.druid.support.http.WebStatFilter; +/** + * *********************************************************************** + * *********************本类由系统自动生成,请勿手工修改********************* + * *********************************************************************** + * 数据库连接池配置类 + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 + */ +@Configuration +public class DruidConfig { + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Value("${r'${spring.datasource.url}'}") + private String dbUrl; + + @Value("${r'${spring.datasource.username}'}") + private String username; + + @Value("${r'${spring.datasource.password}'}") + private String password; + + @Value("${r'${spring.datasource.driverClassName}'}") + private String driverClassName; + + @Value("${r'${spring.datasource.initialSize}'}") + private int initialSize; + + @Value("${r'${spring.datasource.minIdle}'}") + private int minIdle; + + @Value("${r'${spring.datasource.maxActive}'}") + private int maxActive; + + @Value("${r'${spring.datasource.maxWait}'}") + private int maxWait; + + @Value("${r'${spring.datasource.timeBetweenEvictionRunsMillis}'}") + private int timeBetweenEvictionRunsMillis; + + @Value("${r'${spring.datasource.minEvictableIdleTimeMillis}'}") + private int minEvictableIdleTimeMillis; + + @Value("${r'${spring.datasource.validationQuery}'}") + private String validationQuery; + + @Value("${r'${spring.datasource.testWhileIdle}'}") + private boolean testWhileIdle; + + @Value("${r'${spring.datasource.testOnBorrow}'}") + private boolean testOnBorrow; + + @Value("${r'${spring.datasource.testOnReturn}'}") + private boolean testOnReturn; + + @Value("${r'${spring.datasource.poolPreparedStatements}'}") + private boolean poolPreparedStatements; + + @Value("${r'${spring.datasource.filters}'}") + private String filters; + + @Bean + public ServletRegistrationBean druidServlet() { + + ServletRegistrationBean reg = new ServletRegistrationBean( + new StatViewServlet(), "/druid/*"); + //白名单： + reg.addInitParameter("allow", "127.0.0.1"); + //IP黑名单 (存在共同时，deny优先于allow) : 如果满足deny的话提示:Sorry, you are not permitted to view this page. + //reg.addInitParameter("deny","192.168.1.73"); + + reg.addInitParameter("loginUsername", "druid"); + reg.addInitParameter("loginPassword", "htzhE409"); + //是否能够重置数据. + + reg.addInitParameter("resetEnable", "false"); + return reg; + } + + @Bean + public FilterRegistrationBean filterRegistrationBean() { + + FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean(); + filterRegistrationBean.setFilter(new WebStatFilter()); + filterRegistrationBean.addUrlPatterns("/*"); + filterRegistrationBean.addInitParameter("exclusions", + "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"); + filterRegistrationBean.addInitParameter("profileEnable", "true"); + filterRegistrationBean.addInitParameter("principalCookieName", + "USER_COOKIE"); + filterRegistrationBean.addInitParameter("principalSessionName", + "USER_SESSION"); + return filterRegistrationBean; + } + + /** + * 数据源 + * @return 系统的数据源 + */ + @Bean + @Primary + public DataSource druidDataSource() { + DruidDataSource datasource = new DruidDataSource(); + + datasource.setUrl(this.dbUrl); + datasource.setUsername(username); + datasource.setPassword(password); + datasource.setDriverClassName(driverClassName); + datasource.setInitialSize(initialSize); + datasource.setMinIdle(minIdle); + datasource.setMaxActive(maxActive); + datasource.setMaxWait(maxWait); + datasource.setTimeBetweenEvictionRunsMillis( + timeBetweenEvictionRunsMillis); + datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis); + datasource.setValidationQuery(validationQuery); + datasource.setTestWhileIdle(testWhileIdle); + datasource.setTestOnBorrow(testOnBorrow); + datasource.setTestOnReturn(testOnReturn); + datasource.setPoolPreparedStatements(poolPreparedStatements); + try { + datasource.setFilters(filters); + } catch (SQLException e) { + e.printStackTrace(); + logger.error("druid configuration initialization filter", e); + } + return datasource; + } + +} diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/core/QueryRannerConfig.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/core/QueryRannerConfig.java.ftl new file mode 100644 index 0000000000000000000000000000000000000000..cba68152889c513a5c6b38aaa239c8dead12c432 --- /dev/null +++ b/resources/template/springDbutils/src/main/java/${packagePath}/core/QueryRannerConfig.java.ftl @@ -0,0 +1,41 @@ +package ${packageName}.core; + +import javax.sql.DataSource; + +import org.apache.commons.dbutils.QueryRunner; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.EnableTransactionManagement; +import org.springframework.transaction.annotation.TransactionManagementConfigurer; + +/** + * *********************************************************************** + * *********************本类由系统自动生成,请勿手工修改********************* + * *********************************************************************** + * 事务配置类 + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 + */ +@Configuration +//加上这个注解，使得支持事务 +@EnableTransactionManagement +public class QueryRannerConfig implements TransactionManagementConfigurer { + @Autowired + private DataSource dataSource; + + @Override + public PlatformTransactionManager annotationDrivenTransactionManager() { + return new DataSourceTransactionManager(dataSource); + } + + @Bean(name = "queryRunner") + public QueryRunner QueryRunnerBean() { + + return new QueryRunner(dataSource); + } +} diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/dao/${className}DAO.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/dao/${className}DAO.java.ftl index 4b0f7faf27edd5bd6522ec3e4be1de80d4e9cbd5..0776aa72500435da2763b0b93f5aa6a6233fe317 100644 --- a/resources/template/springDbutils/src/main/java/${packagePath}/dao/${className}DAO.java.ftl +++ b/resources/template/springDbutils/src/main/java/${packagePath}/dao/${className}DAO.java.ftl @@ -6,13 +6,14 @@ import ${packageName}.common.PaginationSupport; import ${pknEntity}.${className}; /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** * ${className}DAO 接口 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public interface ${className}DAO { diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/dao/impl/${className}DAOImpl.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/dao/impl/${className}DAOImpl.java.ftl index 7033063327e5b3c02b30cf7f1e2277f18fb52cea..c35095b92dbac2968af4c0a2e194fed678ccca82 100644 --- a/resources/template/springDbutils/src/main/java/${packagePath}/dao/impl/${className}DAOImpl.java.ftl +++ b/resources/template/springDbutils/src/main/java/${packagePath}/dao/impl/${className}DAOImpl.java.ftl @@ -12,15 +12,17 @@ import ${packageName}.dao.${className}DAO; import ${pknEntity}.${className}; /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** * ${className}DAO 接口实现类 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @see ${packageName}.dao.${className}DAO + * @see ${packageName}.core.BaseDAO + * @since 1.0 */ - @SuppressWarnings("unchecked") @Repository public class ${className}DAOImpl extends BaseDAO<${className}> implements ${className}DAO diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/entity/${className}.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/entity/${className}.java.ftl index c6cee3ffd2d01a0a4785a48dda4c2a38d29f9456..a0ab484f31e2865650a4bd708af98476e2188fd3 100644 --- a/resources/template/springDbutils/src/main/java/${packagePath}/entity/${className}.java.ftl +++ b/resources/template/springDbutils/src/main/java/${packagePath}/entity/${className}.java.ftl @@ -6,14 +6,16 @@ import java.util.Date; <#if hasBigDecimal == true> import java.math.BigDecimal; + /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** * ${tableName}表对应的${className}实体 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public class ${className} { diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/service/${className}Service.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/service/${className}Service.java.ftl index ac96a06d25e91050d3c12dcb5ad95557b862e7c0..402dce5c159152907428db4b4050a9434f54f8e2 100644 --- a/resources/template/springDbutils/src/main/java/${packagePath}/service/${className}Service.java.ftl +++ b/resources/template/springDbutils/src/main/java/${packagePath}/service/${className}Service.java.ftl @@ -5,14 +5,16 @@ import java.util.List; import ${packageName}.common.PaginationSupport; import ${pknEntity}.${className}; + /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** * ${className}Service 接口 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ public interface ${className}Service { diff --git a/resources/template/springDbutils/src/main/java/${packagePath}/service/impl/${className}ServiceImpl.java.ftl b/resources/template/springDbutils/src/main/java/${packagePath}/service/impl/${className}ServiceImpl.java.ftl index cdc0f57ceb5c4a30ea9317f2482a9761c6bae02c..261c629ad06a412bfc2a2616b2ab32dae4a6cafe 100644 --- a/resources/template/springDbutils/src/main/java/${packagePath}/service/impl/${className}ServiceImpl.java.ftl +++ b/resources/template/springDbutils/src/main/java/${packagePath}/service/impl/${className}ServiceImpl.java.ftl @@ -14,13 +14,15 @@ import ${pknEntity}.${className}; import ${pknService}.${className}Service; /** - * + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改******************** + * *********************************************************************** * ${className}Service 接口实现类 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @see ${pknService}.${className}Service + * @version 1.0 + * @since 1.0 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/resources/template/springDbutils/src/main/resources/application.properties.ftl b/resources/template/springDbutils/src/main/resources/application.properties.ftl new file mode 100644 index 0000000000000000000000000000000000000000..8e1cca860185fa393eb5520cad22314348354fc7 --- /dev/null +++ b/resources/template/springDbutils/src/main/resources/application.properties.ftl @@ -0,0 +1,49 @@ +# LOGGING +logging.path=/var/logs +logging.file=framworkCore.log + # location of config file (default classpath:logback.xml for logback) +logging.config=logback.xml + # levels for loggers, e.g. "logging.level.org.springframework=DEBUG" (TRACE, DEBUG, INFO, WARN, ERROR, FATAL, OFF) +logging.level.*= debug + +# EMBEDDED SERVER CONFIGURATION (ServerProperties) +server.port=8080 +#server.address= # bind to a specific NIC +# session timeout in seconds +server.session-timeout= 60 +#server.context-parameters.*= # Servlet context init parameters, e.g. server.context-parameters.a=alpha +# the context path, defaults to '/' +#server.context-path=/ +# the servlet path, defaults to '/' +#server.servlet-path=/ + +# \u9A71\u52A8\u914D\u7F6E\u4FE1\u606F +spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +spring.datasource.url = jdbc:mysql://127.0.0.1:3306/prescription?useUnicode=true&characterEncoding=utf-8 +spring.datasource.username = root +spring.datasource.password = 123456 +spring.datasource.driverClassName = com.mysql.jdbc.Driver + +# \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927 +spring.datasource.initialSize=5 +spring.datasource.minIdle=5 +spring.datasource.maxActive=20 +# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4 +spring.datasource.maxWait=60000 +# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2 +spring.datasource.timeBetweenEvictionRunsMillis=60000 +# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2 +spring.datasource.minEvictableIdleTimeMillis=300000 +spring.datasource.validationQuery=SELECT 1 FROM DUAL +spring.datasource.testWhileIdle=true +spring.datasource.testOnBorrow=false +spring.datasource.testOnReturn=false +# \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F +spring.datasource.poolPreparedStatements=true +spring.datasource.maxPoolPreparedStatementPerConnectionSize=20 +# \u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u65E0\u6CD5\u7EDF\u8BA1\uFF0C'wall'\u7528\u4E8E\u9632\u706B\u5899 +spring.datasource.filters=stat,wall,log4j +# \u901A\u8FC7connectProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55 +spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 +# \u5408\u5E76\u591A\u4E2ADruidDataSource\u7684\u76D1\u63A7\u6570\u636E +#spring.datasource.useGlobalDataSourceStat=true diff --git a/resources/template/springDbutils/src/main/resources/applicationContext.xml.ftl b/resources/template/springDbutils/src/main/resources/applicationContext.xml.ftl deleted file mode 100644 index 211de88935b8f415ea609f124ac8d9b2db6d9c3b..0000000000000000000000000000000000000000 --- a/resources/template/springDbutils/src/main/resources/applicationContext.xml.ftl +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/template/springDbutils/src/main/resources/banner.txt.ftl b/resources/template/springDbutils/src/main/resources/banner.txt.ftl new file mode 100644 index 0000000000000000000000000000000000000000..ca5cb7aeaa192487070d65e874c1f35351c968e8 --- /dev/null +++ b/resources/template/springDbutils/src/main/resources/banner.txt.ftl @@ -0,0 +1,19 @@ + kkkkkkkk + k::::::k + k::::::k + k::::::k + ooooooooooo k:::::k kkkkkkkuuuuuu uuuuuu cccccccccccccccc + oo:::::::::::oo k:::::k k:::::k u::::u u::::u cc:::::::::::::::c +o:::::::::::::::o k:::::k k:::::k u::::u u::::u c:::::::::::::::::c +o:::::ooooo:::::o k:::::k k:::::k u::::u u::::u c:::::::cccccc:::::c +o::::o o::::o k::::::k:::::k u::::u u::::u c::::::c ccccccc +o::::o o::::o k:::::::::::k u::::u u::::u c:::::c +o::::o o::::o k:::::::::::k u::::u u::::u c:::::c +o::::o o::::o k::::::k:::::k u:::::uuuu:::::u c::::::c ccccccc +o:::::ooooo:::::ok::::::k k:::::k u:::::::::::::::uuc:::::::cccccc:::::c +o:::::::::::::::ok::::::k k:::::k u:::::::::::::::u c:::::::::::::::::c + oo:::::::::::oo k::::::k k:::::k uu::::::::uu:::u cc:::::::::::::::c + ooooooooooo kkkkkkkk kkkkkkk uuuuuuuu uuuu cccccccccccccccc + + :: made by okuc :: (v o.o.1) + \ No newline at end of file diff --git a/resources/template/springDbutils/src/main/resources/jdbc.properties.ftl b/resources/template/springDbutils/src/main/resources/jdbc.properties.ftl deleted file mode 100644 index 88382464b9f878fe603cc2d66410cac3d652330b..0000000000000000000000000000000000000000 --- a/resources/template/springDbutils/src/main/resources/jdbc.properties.ftl +++ /dev/null @@ -1,6 +0,0 @@ -#creatJDBCProperties for Project -#${date?date} -jdbc.driver=${driver} -jdbc.url=${dburl} -jdbc.username=${username} -jdbc.password=${password} diff --git a/resources/template/springDbutils/src/main/resources/log4j.xml.ftl b/resources/template/springDbutils/src/main/resources/log4j.xml.ftl deleted file mode 100644 index e8aeea5354fac38c1acc3aaba9c7a2a66ae0cf9b..0000000000000000000000000000000000000000 --- a/resources/template/springDbutils/src/main/resources/log4j.xml.ftl +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/template/springDbutils/src/main/resources/spring-mvc.xml.ftl b/resources/template/springDbutils/src/main/resources/spring-mvc.xml.ftl deleted file mode 100644 index f8f0e0f6987486f67571c5f9ac57a1c0ab76c500..0000000000000000000000000000000000000000 --- a/resources/template/springDbutils/src/main/resources/spring-mvc.xml.ftl +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/template/springDbutils/src/main/webapp/WEB-INF/web.xml.ftl b/resources/template/springDbutils/src/main/webapp/WEB-INF/web.xml.ftl deleted file mode 100644 index cfb6f4a17feed703baaea7c4578b4794ffbc4858..0000000000000000000000000000000000000000 --- a/resources/template/springDbutils/src/main/webapp/WEB-INF/web.xml.ftl +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - contextConfigLocation - classpath:applicationContext.xml - - - org.springframework.web.context.ContextLoaderListener - - - org.springframework.web.context.request.RequestContextListener - - - - - encodingFilter - org.springframework.web.filter.CharacterEncodingFilter - - encoding - UTF-8 - - - - encodingFilter - /* - - - - servlet - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - classpath:spring-mvc.xml - - 1 - - - servlet - /* - - - index.jsp - - diff --git a/resources/template/springDbutils/src/test/java/${packagePath}/test/${className}ServiceTest.java.ftl b/resources/template/springDbutils/src/test/java/${packagePath}/test/${className}ServiceTest.java.ftl index 589da23a851a3ad2b2bb187c43aee9e11444d568..979d83e221869bae8996cbde1d9f68bf4f0b1c8a 100644 --- a/resources/template/springDbutils/src/test/java/${packagePath}/test/${className}ServiceTest.java.ftl +++ b/resources/template/springDbutils/src/test/java/${packagePath}/test/${className}ServiceTest.java.ftl @@ -6,19 +6,22 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; - +import org.springframework.boot.test.context.SpringBootTest; import ${packageName}.service.${className}Service; + /** + * *********************************************************************** + * *********************本类由系统自动生成，请勿手工修改*********************** + * *********************************************************************** * Junit 单元测试 - * - * @author 00fly - * @version [版本号, ${date?date}] - * @see [相关类/方法] - * @since [产品/模块版本] + * 创建日期：${date?date} + * @author okuc + * @version 1.0 + * @since 1.0 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration({"/applicationContext.xml"}) +@SpringBootTest @Transactional public class ${className}ServiceTest {