Merge branch 'master' of 115.28.80.125:templates/springmvcprojecttemplate

.gitignore

@@ -29,7 +29,7 @@ dep2.sh
 
 web/src/main/filters/dev.properties
 
-dao/src/main/java/com/haomostudio/SpringMVCProjectTemplate/
-domain/src/main/java/com/haomostudio/SpringMVCProjectTemplate/
-web/src/main/resources/mybatis/com/haomostudio/SpringMVCProjectTemplate/
-service/src/main/java/com/haomostudio/SpringMVCProjectTemplate/service/*.java
+dao/src/main/java/com/haomostudio/SeekTruthBackend/
+domain/src/main/java/com/haomostudio/SeekTruthBackend/
+web/src/main/resources/mybatis/com/haomostudio/SeekTruthBackend/
+service/src/main/java/com/haomostudio/SeekTruthBackend/service/*.java

clean_mybatis_generated.sh

 #!/bin/bash
-rm -rf dao/src/main/java/com/haomostudio/SpringMVCProjectTemplate/*
-rm -rf domain/src/main/java/com/haomostudio/SpringMVCProjectTemplate/*
-rm -rf web/src/main/resources/mybatis/com/haomostudio/SpringMVCProjectTemplate/*
+rm -rf dao/src/main/java/com/haomostudio/SeekTruthBackend/*
+rm -rf domain/src/main/java/com/haomostudio/SeekTruthBackend/*
+rm -rf web/src/main/resources/mybatis/com/haomostudio/SeekTruthBackend/*

dao/pom.xml

@@ -3,8 +3,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
-        <artifactId>SpringMVCProjectTemplate</artifactId>
+		<groupId>com.haomostudio.SeekTruthBackend</groupId>
+        <artifactId>SeekTruthBackend</artifactId>
         <version>0.0.1-SNAPSHOT</version>
 	</parent>
 
@@ -21,9 +21,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<groupId>com.haomostudio.SeekTruthBackend</groupId>
 			<artifactId>domain</artifactId>
-			<version>${SpringMVCProjectTemplate.domain.version}</version>
+			<version>${SeekTruthBackend.domain.version}</version>
 		</dependency>
 	</dependencies>
 

domain/pom.xml

@@ -3,8 +3,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
-        <artifactId>SpringMVCProjectTemplate</artifactId>
+		<groupId>com.haomostudio.SeekTruthBackend</groupId>
+        <artifactId>SeekTruthBackend</artifactId>
         <version>0.0.1-SNAPSHOT</version>
 	</parent>
 

pom.xml

@@ -4,8 +4,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
-    <artifactId>SpringMVCProjectTemplate</artifactId>
+    <groupId>com.haomostudio.SeekTruthBackend</groupId>
+    <artifactId>SeekTruthBackend</artifactId>
     <packaging>pom</packaging>
     <version>0.0.1-SNAPSHOT</version>
     <modules>
@@ -16,10 +16,10 @@
     </modules>
 
     <properties>
-        <SpringMVCProjectTemplate.web.version>0.0.1-SNAPSHOT</SpringMVCProjectTemplate.web.version>
-        <SpringMVCProjectTemplate.service.version>0.0.1-SNAPSHOT</SpringMVCProjectTemplate.service.version>
-        <SpringMVCProjectTemplate.dao.version>0.0.1-SNAPSHOT</SpringMVCProjectTemplate.dao.version>
-        <SpringMVCProjectTemplate.domain.version>0.0.1-SNAPSHOT</SpringMVCProjectTemplate.domain.version>
+        <SeekTruthBackend.web.version>0.0.1-SNAPSHOT</SeekTruthBackend.web.version>
+        <SeekTruthBackend.service.version>0.0.1-SNAPSHOT</SeekTruthBackend.service.version>
+        <SeekTruthBackend.dao.version>0.0.1-SNAPSHOT</SeekTruthBackend.dao.version>
+        <SeekTruthBackend.domain.version>0.0.1-SNAPSHOT</SeekTruthBackend.domain.version>
         <spring.version>4.1.4.RELEASE</spring.version>
         <spring-data-jpa.version>1.9.1.RELEASE</spring-data-jpa.version>
         <jackson.version>2.5.0</jackson.version>
@@ -394,7 +394,7 @@
                     <artifactId>maven-war-plugin</artifactId>
                     <version>2.4</version>
                     <configuration>
-                        <warName>SpringMVCProjectTemplate</warName>
+                        <warName>SeekTruthBackend</warName>
                         <webXml>src/main/resources/webapp/WEB-INF/web.xml</webXml>
                     </configuration>
                 </plugin>

service/pom.xml

@@ -3,8 +3,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
-		<artifactId>SpringMVCProjectTemplate</artifactId>
+		<groupId>com.haomostudio.SeekTruthBackend</groupId>
+		<artifactId>SeekTruthBackend</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
@@ -21,14 +21,14 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<groupId>com.haomostudio.SeekTruthBackend</groupId>
 			<artifactId>dao</artifactId>
-			<version>${SpringMVCProjectTemplate.dao.version}</version>
+			<version>${SeekTruthBackend.dao.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<groupId>com.haomostudio.SeekTruthBackend</groupId>
 			<artifactId>domain</artifactId>
-			<version>${SpringMVCProjectTemplate.dao.version}</version>
+			<version>${SeekTruthBackend.dao.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sap</groupId>

service/src/main/java/com/haomostudio/SpringMVCProjectTemplate/service/HmUtils/MybatisExampleHelper.java → service/src/main/java/com/haomostudio/SeekTruthBackend/service/HmUtils/MybatisExampleHelper.java

-package com.haomostudio.SpringMVCProjectTemplate.service.HmUtils;
+package com.haomostudio.SeekTruthBackend.service.HmUtils;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.CaseFormat;
-import com.google.common.util.concurrent.ExecutionError;
-import com.haomostudio.SpringMVCProjectTemplate.domain.ActivityExample;
 
 import java.lang.reflect.Method;
 import java.util.*;

web/pom.xml

@@ -3,8 +3,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
-		<artifactId>SpringMVCProjectTemplate</artifactId>
+		<groupId>com.haomostudio.SeekTruthBackend</groupId>
+		<artifactId>SeekTruthBackend</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
 
@@ -20,19 +20,19 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<groupId>com.haomostudio.SeekTruthBackend</groupId>
 			<artifactId>service</artifactId>
-			<version>${SpringMVCProjectTemplate.service.version}</version>
+			<version>${SeekTruthBackend.service.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<groupId>com.haomostudio.SeekTruthBackend</groupId>
 			<artifactId>dao</artifactId>
-			<version>${SpringMVCProjectTemplate.dao.version}</version>
+			<version>${SeekTruthBackend.dao.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.haomostudio.SpringMVCProjectTemplate</groupId>
+			<groupId>com.haomostudio.SeekTruthBackend</groupId>
 			<artifactId>domain</artifactId>
-			<version>${SpringMVCProjectTemplate.domain.version}</version>
+			<version>${SeekTruthBackend.domain.version}</version>
 		</dependency>
 	</dependencies>
 

web/src/main/java/com/haomostudio/SpringMVCProjectTemplate/common/Resp.java → web/src/main/java/com/haomostudio/SeekTruthBackend/common/Resp.java

-package com.haomostudio.SpringMVCProjectTemplate.common;
+package com.haomostudio.SeekTruthBackend.common;
 
 import java.util.HashMap;
 import java.util.Map;

web/src/main/java/com/haomostudio/SpringMVCProjectTemplate/controller/EndpointDocController.java → web/src/main/java/com/haomostudio/SeekTruthBackend/controller/EndpointDocController.java

-package com.haomostudio.SpringMVCProjectTemplate.controller;
+package com.haomostudio.SeekTruthBackend.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

web/src/main/java/com/haomostudio/SpringMVCProjectTemplate/servlet/DefaultHandlerExceptionResolver.java → web/src/main/java/com/haomostudio/SeekTruthBackend/servlet/DefaultHandlerExceptionResolver.java

-package com.haomostudio.SpringMVCProjectTemplate.servlet;
+package com.haomostudio.SeekTruthBackend.servlet;
 
-import com.haomostudio.SpringMVCProjectTemplate.common.Resp;
+import com.haomostudio.SeekTruthBackend.common.Resp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.HandlerExceptionResolver;

web/src/main/java/com/haomostudio/SpringMVCProjectTemplate/servlet/EmptyRequestParamResolver.java → web/src/main/java/com/haomostudio/SeekTruthBackend/servlet/EmptyRequestParamResolver.java

-package com.haomostudio.SpringMVCProjectTemplate.servlet;
+package com.haomostudio.SeekTruthBackend.servlet;
 
 
 import org.springframework.core.MethodParameter;

web/src/main/resources/mybatis/mysqlGeneratorConfig.xml

@@ -22,21 +22,21 @@
         </javaTypeResolver>
 
         <!-- 生成model模型，对应的包，存放位置可以指定具体的路径,如/ProjectName/src，也可以使用MAVEN来自动生成 -->
-        <javaModelGenerator targetPackage="com.haomostudio.SpringMVCProjectTemplate.domain"
+        <javaModelGenerator targetPackage="com.haomostudio.SeekTruthBackend.domain"
                             targetProject="domain/src/main/java/">
             <property name="enableSubPackages"
                       value="true"/>
         </javaModelGenerator>
 
         <!--对应的xml mapper文件  -->
-        <sqlMapGenerator targetPackage="com.haomostudio.SpringMVCProjectTemplate"
+        <sqlMapGenerator targetPackage="com.haomostudio.SeekTruthBackend"
                          targetProject="web/src/main/resources/mybatis/">
             <property name="enableSubPackages" value="true"/>
         </sqlMapGenerator>
 
         <!-- 对应的dao接口 -->
         <javaClientGenerator type="XMLMAPPER"
-                             targetPackage="com.haomostudio.SpringMVCProjectTemplate.dao"
+                             targetPackage="com.haomostudio.SeekTruthBackend.dao"
                              targetProject="dao/src/main/java/">
             <property name="enableSubPackages"
                       value="true"/>

web/src/main/resources/mybatis/oracleGeneratorConfig.xml

@@ -22,14 +22,14 @@
         </javaTypeResolver>
 
         <!-- 生成model模型，对应的包，存放位置可以指定具体的路径,如/ProjectName/src，也可以使用MAVEN来自动生成 -->
-        <javaModelGenerator targetPackage="com.haomostudio.SpringMVCProjectTemplate.domain"
+        <javaModelGenerator targetPackage="com.haomostudio.SeekTruthBackend.domain"
                             targetProject="domain/src/main/java/">
             <property name="enableSubPackages"
                       value="false"/>
         </javaModelGenerator>
 
         <!--对应的xml mapper文件  -->
-        <sqlMapGenerator targetPackage="com.haomostudio.SpringMVCProjectTemplate"
+        <sqlMapGenerator targetPackage="com.haomostudio.SeekTruthBackend"
                          targetProject="web/src/main/resources/mybatis/">
             <property name="enableSubPackages"
                       value="true"/>
@@ -37,7 +37,7 @@
 
         <!-- 对应的dao接口 -->
         <javaClientGenerator type="XMLMAPPER"
-                             targetPackage="com.haomostudio.SpringMVCProjectTemplate.dao"
+                             targetPackage="com.haomostudio.SeekTruthBackend.dao"
                              targetProject="dao/src/main/java/">
             <property name="enableSubPackages"
                       value="false"/>

web/src/main/resources/spring/spring-mvc-config.xml

@@ -20,7 +20,7 @@
     </context:component-scan>
 
     <!--<mvc:interceptors>-->
-        <!--<bean class="com.haomostudio.SpringMVCProjectTemplate.web.servlet.AuthenticationInterceptor"/>-->
+        <!--<bean class="com.haomostudio.SeekTruthBackend.web.servlet.AuthenticationInterceptor"/>-->
     <!--</mvc:interceptors>-->
 
     <!-- 定义首页 -->
@@ -43,7 +43,7 @@
     <!-- 支持上传文件 -->
     <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>
 
-    <bean id="handlerExceptionResolver" class="com.haomostudio.SpringMVCProjectTemplate.servlet.DefaultHandlerExceptionResolver"/>
+    <bean id="handlerExceptionResolver" class="com.haomostudio.SeekTruthBackend.servlet.DefaultHandlerExceptionResolver"/>
     <mvc:annotation-driven>
         <mvc:message-converters register-defaults="true">
             <bean class="org.springframework.http.converter.BufferedImageHttpMessageConverter"/>