Merge pull request #3 from jinlong-hao/master

update to v0.1.3
eppdev · May 2, 2019 · 4ffd0dc · 4ffd0dc
2 parents 031552d + c44a9e6
commit 4ffd0dc
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 19 deletions.
diff --git a/eppdev-jee-basic/pom.xml b/eppdev-jee-basic/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eppdev-jee-pom</artifactId>
         <groupId>cn.eppdev.jee</groupId>
-        <version>0.1.3-SNAPSHOT</version>
+        <version>0.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/eppdev-jee-basic/src/test/resources/application_test.properties b/eppdev-jee-basic/src/test/resources/application_test.properties
@@ -2,7 +2,7 @@
 #########################################
 # DataBase Configurations
 #########################################
-spring.datasource.url=jdbc:mysql://10.0.2.2:3306/eppdev_jee?useUnicode=true&amp;characterEncoding=UTF-8
+spring.datasource.url=jdbc:mysql://localhost:3306/eppdev_jee?useUnicode=true&amp;characterEncoding=UTF-8
 spring.datasource.username=root
 spring.datasource.password=root
 spring.datasource.type = com.alibaba.druid.pool.DruidDataSource
@@ -39,4 +39,4 @@ pagehelper.params=pageSize=_pageSize;pageNum=_pageNum;
 # Log Configurations
 #########################################
 logging.level.root=INFO
-logging.level.cn.eppdev.jee=DEBUG
+logging.level.cn.eppdev.jee=DEBUG
diff --git a/eppdev-jee-cg/pom.xml b/eppdev-jee-cg/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eppdev-jee-pom</artifactId>
         <groupId>cn.eppdev.jee</groupId>
-        <version>0.1.3-SNAPSHOT</version>
+        <version>0.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/DaoTemplateTest.java b/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/DaoTemplateTest.java
@@ -5,6 +5,7 @@
 
 package cn.eppdev.jee.cg.utils;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,20 +20,20 @@ public class DaoTemplateTest {
     public void testBasicDao(){
         String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/dao/basic_dao.ftl");
         String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.getBasicConf());
-        System.out.println(result);
+        Assert.assertNotNull(result);
     }
 
     @Test
     public void testUpperDao(){
         String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/dao/upper_dao.ftl");
         String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.createSampleTable());
-        System.out.println(result);
+        Assert.assertNotNull(result);
     }
 
     @Test
     public void testDao(){
         String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/dao/dao.ftl");
         String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.createSampleTable());
-        System.out.println(result);
+        Assert.assertNotNull(result);
     }
 }
diff --git a/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/EntityTemplateTest.java b/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/EntityTemplateTest.java
@@ -5,6 +5,7 @@
 
 package cn.eppdev.jee.cg.utils;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,21 +21,21 @@ public class EntityTemplateTest {
     public void testBasicEntity(){
        String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/entity/basic_entity.ftl");
        String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.getBasicConf());
-       System.out.println(result);
+       Assert.assertNotNull(result);
     }
 
     @Test
     public void testUpperEntity(){
         String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/entity/upper_entity.ftl");
         String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.createSampleTable());
-        System.out.println(result);
+       Assert.assertNotNull(result);
     }
 
     @Test
     public void testEntity(){
         String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/entity/entity.ftl");
         String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.createSampleTable());
-        System.out.println(result);
+        Assert.assertNotNull(result);
     }
 
 

diff --git a/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/MapperTemplateTest.java b/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/MapperTemplateTest.java
@@ -9,6 +9,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.junit.Assert;
+
 /**
  * @author jinlong.hao
  */
@@ -19,13 +21,13 @@ public class MapperTemplateTest {
     public void testUpperMapper(){
         String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/mapper/upper_mapper.ftl");
         String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.createSampleTable());
-        System.out.println(result);
+        Assert.assertNotNull(result);
     }
 
     @Test
     public void testEntity(){
         String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/mapper/mapper.ftl");
         String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.createSampleTable());
-        System.out.println(result);
+        Assert.assertNotNull(result);
     }
 }
diff --git a/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/SampleModelBuilder.java b/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/SampleModelBuilder.java
@@ -51,6 +51,7 @@ public static EppdevTable createSampleTable(){
         column.setDbColumnType("char");
         column.setPrimaryKeyFlag(1);
         column.setCreateCompareFlag(0);
+        column.setCreateEqualFlag(1);
         column.setCreateLikeFlag(0);
         column.setCreateLeftLikeFlag(0);
         column.setCreateLikeFlag(0);
@@ -66,6 +67,7 @@ public static EppdevTable createSampleTable(){
         column1.setJavaType("Integer");
         column1.setDbColumnType("Integer");
         column1.setPrimaryKeyFlag(0);
+        column1.setCreateEqualFlag(0);
         column1.setCreateCompareFlag(1);
         column1.setCreateLikeFlag(0);
         column1.setCreateLeftLikeFlag(0);
@@ -82,6 +84,7 @@ public static EppdevTable createSampleTable(){
         column2.setPropertyName("name");
         column2.setJavaType("String");
         column2.setDbColumnType("varchar");
+        column2.setCreateEqualFlag(0);
         column2.setCreateCompareFlag(0);
         column2.setCreateLikeFlag(1);
         column2.setCreateLeftLikeFlag(1);

diff --git a/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/ServiceTemplateTest.java b/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/ServiceTemplateTest.java
@@ -5,6 +5,7 @@
 
 package cn.eppdev.jee.cg.utils;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,13 +20,13 @@ public class ServiceTemplateTest {
     public void testBasicService(){
         String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/service/basic_service.ftl");
         String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.getBasicConf());
-        System.out.println(result);
+        Assert.assertNotNull(result);
     }
 
     @Test
     public void testService(){
         String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/service/service.ftl");
         String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.createSampleTable());
-        System.out.println(result);
+        Assert.assertNotNull(result);
     }
 }
diff --git a/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/UtilsTemplateTest.java b/eppdev-jee-cg/src/test/java/cn/eppdev/jee/cg/utils/UtilsTemplateTest.java
@@ -5,6 +5,7 @@
 
 package cn.eppdev.jee.cg.utils;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,6 +20,6 @@ public class UtilsTemplateTest {
     public void testJsonUtils(){
         String ftl = TemplateFileUtils.readTemplateToString("/eppdev-jee/template/utils/json_utils.ftl");
         String result = FreeMarkerUtils.generate(ftl, SampleModelBuilder.getBasicConf());
-        System.out.println(result);
+        Assert.assertNotNull(result);
     }
 }
diff --git a/eppdev-jee-web/pom.xml b/eppdev-jee-web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>eppdev-jee-pom</artifactId>
         <groupId>cn.eppdev.jee</groupId>
-        <version>0.1.3-SNAPSHOT</version>
+        <version>0.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.eppdev.jee</groupId>
     <artifactId>eppdev-jee-pom</artifactId>
-    <version>0.1.3-SNAPSHOT</version>
+    <version>0.1.3</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -15,8 +15,8 @@
 
     <licenses>
         <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <name>Anti-996 License 1.0</name>
+            <url>https://github.com/996icu/996.ICU/blob/master/LICENSE</url>
         </license>
     </licenses>