Browse Source

Default Changelist

anderx 2 years ago
parent
commit
60169d8ea3

+ 451 - 474
pom.xml

@@ -1,476 +1,453 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.goafanti</groupId>
-	<artifactId>basics-server</artifactId>
-	<name>basics-server</name>
-
-	<packaging>war</packaging>
-	<version>1.0.0-BUILD-SNAPSHOT</version>
-
-	<properties>
-		<java-version>1.8</java-version>
-		<org.springframework-version>4.2.5.RELEASE</org.springframework-version>
-		<org.slf4j-version>1.7.21</org.slf4j-version>
-		<shiro-version>1.3.2</shiro-version>
-		<mybatis-version>3.2.8</mybatis-version>
-		<mybatis-spring-version>1.2.2</mybatis-spring-version>
-		<org.aspectj-version>1.6.10</org.aspectj-version>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<profiles>  
-        <profile>  
-            <id>aft_local</id>  
-            <activation>  
-                <activeByDefault>true</activeByDefault>  
-            </activation>  
-            <properties>  
-                <profiles.activation>local</profiles.activation>  
-            </properties>  
-        </profile>  
-        <profile>  
-            <id>aft_dev</id>  
-            <properties>  
-                <profiles.activation>dev</profiles.activation>  
-            </properties>  
-        </profile>  
-        <profile>  
-            <id>aft_prod</id>  
-            <properties>  
-                <profiles.activation>prod</profiles.activation>  
-            </properties>  
-        </profile>  
-        <profile>  
-            <id>aft_test</id>  
-            <properties>  
-                <profiles.activation>test</profiles.activation>  
-            </properties>  
-        </profile>  
-	</profiles> 
-
-	<dependencies>
-		<!-- spring -->
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-			<version>${org.springframework-version}</version>
-			<exclusions>
-				<!-- Exclude Commons Logging in favor of SLF4j -->
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-jdbc</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context-support</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-websocket</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-messaging</artifactId>
-			<version>${org.springframework-version}</version>
-		</dependency>
-		
-		<dependency>
-		    <groupId>org.springframework.data</groupId>
-		    <artifactId>spring-data-redis</artifactId>
-		    <version>1.8.3.RELEASE</version>
-		</dependency>
-		
-		<dependency>
-		    <groupId>org.thymeleaf</groupId>
-		    <artifactId>thymeleaf-spring4</artifactId>
-		    <version>3.0.5.RELEASE</version>
-		</dependency>
-		<dependency>
-		    <groupId>nz.net.ultraq.thymeleaf</groupId>
-		    <artifactId>thymeleaf-layout-dialect</artifactId>
-		    <version>2.2.1</version>
-		</dependency>
-		<dependency>
-            <groupId>com.github.theborakompanioni</groupId>
-            <artifactId>thymeleaf-extras-shiro</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-		<!-- spring end -->
-
-		<!-- redis begin -->
-		<dependency>
-			<groupId>redis.clients</groupId>
-			<artifactId>jedis</artifactId>
-			<version>2.9.0</version>
-		</dependency>
-		<!-- redis end -->
-
-		<!-- mybatis start -->
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>${mybatis-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis-spring</artifactId>
-			<version>${mybatis-spring-version}</version>
-		</dependency>
-		<!-- mybatis end -->
-		<!-- Javax Annotation -->  
-        <dependency>  
-            <groupId>javax.annotation</groupId>  
-            <artifactId>jsr250-api</artifactId>  
-            <version>1.0</version>  
-        </dependency>
-        <dependency>
-     <groupId>javax.xml.bind</groupId>
-     <artifactId>jaxb-api</artifactId>
-     <version>2.3.0</version>
- </dependency>
- <dependency>
-     <groupId>com.sun.xml.bind</groupId>
-     <artifactId>jaxb-impl</artifactId>
-     <version>2.3.0</version>
- </dependency>
- <dependency>
-     <groupId>com.sun.xml.bind</groupId>
-     <artifactId>jaxb-core</artifactId>
-     <version>2.3.0</version>
- </dependency>
- <dependency>
-     <groupId>javax.activation</groupId>
-     <artifactId>activation</artifactId>
-     <version>1.1.1</version>
- </dependency>
-        
-		
-
-		<!-- JDBC connections pooling -->
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>druid</artifactId>
-			<version>1.0.25</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.alibaba</groupId>
-					<artifactId>jconsole</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.alibaba</groupId>
-					<artifactId>tools</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<!-- JDBC connections pooling end -->
-
-		<!-- jackson start -->
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.8.2</version>
-		</dependency>
-		<!-- jackson end -->
-
-		<!-- mysql -->
-		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.40</version>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>${org.slf4j-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${org.slf4j-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>${org.slf4j-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.mail</groupId>
-					<artifactId>mail</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.jms</groupId>
-					<artifactId>jms</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jdmk</groupId>
-					<artifactId>jmxtools</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>com.sun.jmx</groupId>
-					<artifactId>jmxri</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<!-- common lang -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.4</version>
-		</dependency>
-		<!-- common codec -->
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
-		</dependency>
-
-		<!-- common fileupload -->
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.1</version>
-		</dependency>
-
-		<!-- quartz -->
-		<dependency>
-			<groupId>org.quartz-scheduler</groupId>
-			<artifactId>quartz</artifactId>
-			<version>1.8.5</version>
-		</dependency>
-		<!-- Servlet -->
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.1.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- shiro -->
-		<dependency>
-			<groupId>org.apache.shiro</groupId>
-			<artifactId>shiro-web</artifactId>
-			<version>${shiro-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.shiro</groupId>
-			<artifactId>shiro-quartz</artifactId>
-			<version>${shiro-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.shiro</groupId>
-			<artifactId>shiro-spring</artifactId>
-			<version>${shiro-version}</version>
-		</dependency>
-		<!-- Test -->
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${org.springframework-version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>1.2.31</version>
-		</dependency>
-
-		<!-- AspectJ -->
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjrt</artifactId>
-			<version>${org.aspectj-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-			<version>${org.aspectj-version}</version>
-		</dependency>
-		<dependency>
-			<groupId>cglib</groupId>
-			<artifactId>cglib</artifactId>
-			<version>2.2.2</version>
-		</dependency>
-		<!-- JSR-303 bean validator -->
-		<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<version>5.2.4.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
-			<version>1.1.0.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.logging</groupId>
-			<artifactId>jboss-logging</artifactId>
-			<version>3.2.1.Final</version>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml</groupId>
-			<artifactId>classmate</artifactId>
-			<version>1.1.0</version>
-		</dependency>
-	    <dependency>
-		    <groupId>com.googlecode.json-simple</groupId>
-		    <artifactId>json-simple</artifactId>
-		    <version>1.1.1</version>
-		</dependency>
-		<dependency>
-		    <groupId>org.apache.poi</groupId>
-		    <artifactId>poi-ooxml</artifactId>
-		    <version>3.17</version>
-		</dependency>
-       <dependency>
- 		 	<groupId>com.aliyun</groupId>
-  			<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-  			<version>1.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.aliyun</groupId>
-			<artifactId>aliyun-java-sdk-core</artifactId>
-			<version>3.5.0</version>
-		</dependency>
-        <dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpasyncclient</artifactId>
-			<version>4.1.3</version>
-		</dependency>
-		<!-- javaMail -->
-		<dependency>
-		    <groupId>javax.mail</groupId>
-		    <artifactId>mail</artifactId>
-		    <version>1.4.7</version>
-		</dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/resources</directory>
-				<includes>
-					<include>**/*.properties</include>
-					<include>**/*.xml</include>
-					<include>**/*.ini</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/*.xml</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5.1</version>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-					<encoding>utf8</encoding>
-					<compilerArgument>-Xlint:all</compilerArgument>
-					<showWarnings>true</showWarnings>
-					<showDeprecation>true</showDeprecation>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-			<plugin>    
-			    <groupId>org.apache.maven.plugins</groupId>    
-			    <artifactId>maven-surefire-plugin</artifactId>    
-			    <version>2.5</version>    
-			    <configuration>    
-			        <skip>true</skip>    
-			    </configuration>    
-			</plugin> 
-			<plugin>  
-                <groupId>org.apache.maven.plugins</groupId>  
-                <artifactId>maven-war-plugin</artifactId>  
-                <version>3.1.0</version>  
-                <configuration>  
-                    <warName>${profiles.activation}</warName>  
-                    <!-- 激活spring profile -->  
-                    <webResources>  
-                        <resource>  
-                            <filtering>true</filtering>  
-                            <directory>src/main/webapp</directory>  
-                            <includes>  
-                                <include>**/**</include>  
-                            </includes>  
-                        </resource>  
-                        <resource>  
-                            <filtering>true</filtering>  
-                            <directory>src/main/resources</directory>
-                            <targetPath>WEB-INF/classes</targetPath>
-                            <includes>  
-                                <include>**/**</include>  
-                            </includes>  
-                        </resource>  
-                    </webResources>  
-                    <warSourceDirectory>src/main/webapp</warSourceDirectory>  
-                    <webXml>src/main/webapp/WEB-INF/web.xml</webXml>  
-                </configuration>  
-			</plugin>
-		</plugins>
-	</build>
-	
-	<repositories>
-		<repository>
-			<id>aliyun-repos</id>
-			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
-
-    
-	<pluginRepositories>
-		<pluginRepository>
-			<id>aliyun-plugin</id>
-			<url>http://maven.aliyun.com/nexus/content/groups/public/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">  
+  <modelVersion>4.0.0</modelVersion>  
+  <groupId>com.goafanti</groupId>  
+  <artifactId>basics-server</artifactId>  
+  <name>basics-server</name>  
+  <packaging>war</packaging>  
+  <version>1.0.0-BUILD-SNAPSHOT</version>  
+  <properties> 
+    <java-version>1.8</java-version>  
+    <org.springframework-version>4.2.5.RELEASE</org.springframework-version>  
+    <org.slf4j-version>1.7.21</org.slf4j-version>  
+    <shiro-version>1.3.2</shiro-version>  
+    <mybatis-version>3.2.8</mybatis-version>  
+    <mybatis-spring-version>1.2.2</mybatis-spring-version>  
+    <org.aspectj-version>1.6.10</org.aspectj-version>  
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> 
+  </properties>  
+  <profiles> 
+    <profile> 
+      <id>aft_local</id>  
+      <activation> 
+        <activeByDefault>true</activeByDefault> 
+      </activation>  
+      <properties> 
+        <profiles.activation>local</profiles.activation> 
+      </properties> 
+    </profile>  
+    <profile> 
+      <id>aft_dev</id>  
+      <properties> 
+        <profiles.activation>dev</profiles.activation> 
+      </properties> 
+    </profile>  
+    <profile> 
+      <id>aft_prod</id>  
+      <properties> 
+        <profiles.activation>prod</profiles.activation> 
+      </properties> 
+    </profile>  
+    <profile> 
+      <id>aft_test</id>  
+      <properties> 
+        <profiles.activation>test</profiles.activation> 
+      </properties> 
+    </profile> 
+  </profiles>  
+  <dependencies> 
+    <!-- spring -->  
+    <dependency> 
+      <groupId>org.springframework</groupId>  
+      <artifactId>spring-context</artifactId>  
+      <version>${org.springframework-version}</version>  
+      <exclusions> 
+        <!-- Exclude Commons Logging in favor of SLF4j -->  
+        <exclusion> 
+          <groupId>commons-logging</groupId>  
+          <artifactId>commons-logging</artifactId> 
+        </exclusion> 
+      </exclusions> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.springframework</groupId>  
+      <artifactId>spring-web</artifactId>  
+      <version>${org.springframework-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.springframework</groupId>  
+      <artifactId>spring-webmvc</artifactId>  
+      <version>${org.springframework-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.springframework</groupId>  
+      <artifactId>spring-jdbc</artifactId>  
+      <version>${org.springframework-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.springframework</groupId>  
+      <artifactId>spring-context-support</artifactId>  
+      <version>${org.springframework-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.springframework</groupId>  
+      <artifactId>spring-websocket</artifactId>  
+      <version>${org.springframework-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.springframework</groupId>  
+      <artifactId>spring-messaging</artifactId>  
+      <version>${org.springframework-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.springframework.data</groupId>  
+      <artifactId>spring-data-redis</artifactId>  
+      <version>1.8.3.RELEASE</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.thymeleaf</groupId>  
+      <artifactId>thymeleaf-spring4</artifactId>  
+      <version>3.0.5.RELEASE</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>nz.net.ultraq.thymeleaf</groupId>  
+      <artifactId>thymeleaf-layout-dialect</artifactId>  
+      <version>2.2.1</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>com.github.theborakompanioni</groupId>  
+      <artifactId>thymeleaf-extras-shiro</artifactId>  
+      <version>2.0.0</version> 
+    </dependency>  
+    <!-- spring end -->  
+    <!-- redis begin -->  
+    <dependency> 
+      <groupId>redis.clients</groupId>  
+      <artifactId>jedis</artifactId>  
+      <version>2.9.0</version> 
+    </dependency>  
+    <!-- redis end -->  
+    <!-- mybatis start -->  
+    <dependency> 
+      <groupId>org.mybatis</groupId>  
+      <artifactId>mybatis</artifactId>  
+      <version>${mybatis-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.mybatis</groupId>  
+      <artifactId>mybatis-spring</artifactId>  
+      <version>${mybatis-spring-version}</version> 
+    </dependency>  
+    <!-- mybatis end -->  
+    <!-- Javax Annotation -->  
+    <dependency> 
+      <groupId>javax.annotation</groupId>  
+      <artifactId>jsr250-api</artifactId>  
+      <version>1.0</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>javax.xml.bind</groupId>  
+      <artifactId>jaxb-api</artifactId>  
+      <version>2.3.0</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>com.sun.xml.bind</groupId>  
+      <artifactId>jaxb-impl</artifactId>  
+      <version>2.3.0</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>com.sun.xml.bind</groupId>  
+      <artifactId>jaxb-core</artifactId>  
+      <version>2.3.0</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>javax.activation</groupId>  
+      <artifactId>activation</artifactId>  
+      <version>1.1.1</version> 
+    </dependency>  
+    <!-- JDBC connections pooling -->  
+    <dependency> 
+      <groupId>com.alibaba</groupId>  
+      <artifactId>druid</artifactId>  
+      <version>1.0.25</version>  
+      <exclusions> 
+        <exclusion> 
+          <groupId>com.alibaba</groupId>  
+          <artifactId>jconsole</artifactId> 
+        </exclusion>  
+        <exclusion> 
+          <groupId>com.alibaba</groupId>  
+          <artifactId>tools</artifactId> 
+        </exclusion> 
+      </exclusions> 
+    </dependency>  
+    <!-- JDBC connections pooling end -->  
+    <!-- jackson start -->  
+    <dependency> 
+      <groupId>com.fasterxml.jackson.core</groupId>  
+      <artifactId>jackson-databind</artifactId>  
+      <version>2.8.2</version> 
+    </dependency>  
+    <!-- jackson end -->  
+    <!-- mysql -->  
+    <dependency> 
+      <groupId>mysql</groupId>  
+      <artifactId>mysql-connector-java</artifactId>  
+      <version>5.1.40</version> 
+    </dependency>  
+    <!-- Logging -->  
+    <dependency> 
+      <groupId>org.slf4j</groupId>  
+      <artifactId>slf4j-api</artifactId>  
+      <version>${org.slf4j-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.slf4j</groupId>  
+      <artifactId>jcl-over-slf4j</artifactId>  
+      <version>${org.slf4j-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.slf4j</groupId>  
+      <artifactId>slf4j-log4j12</artifactId>  
+      <version>${org.slf4j-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>log4j</groupId>  
+      <artifactId>log4j</artifactId>  
+      <version>1.2.17</version>  
+      <exclusions> 
+        <exclusion> 
+          <groupId>javax.mail</groupId>  
+          <artifactId>mail</artifactId> 
+        </exclusion>  
+        <exclusion> 
+          <groupId>javax.jms</groupId>  
+          <artifactId>jms</artifactId> 
+        </exclusion>  
+        <exclusion> 
+          <groupId>com.sun.jdmk</groupId>  
+          <artifactId>jmxtools</artifactId> 
+        </exclusion>  
+        <exclusion> 
+          <groupId>com.sun.jmx</groupId>  
+          <artifactId>jmxri</artifactId> 
+        </exclusion> 
+      </exclusions> 
+    </dependency>  
+    <!-- common lang -->  
+    <dependency> 
+      <groupId>org.apache.commons</groupId>  
+      <artifactId>commons-lang3</artifactId>  
+      <version>3.4</version> 
+    </dependency>  
+    <!-- common codec -->  
+    <dependency> 
+      <groupId>commons-codec</groupId>  
+      <artifactId>commons-codec</artifactId>  
+      <version>1.10</version> 
+    </dependency>  
+    <!-- common fileupload -->  
+    <dependency> 
+      <groupId>commons-fileupload</groupId>  
+      <artifactId>commons-fileupload</artifactId>  
+      <version>1.3.1</version> 
+    </dependency>  
+    <!-- quartz -->  
+    <dependency> 
+      <groupId>org.quartz-scheduler</groupId>  
+      <artifactId>quartz</artifactId>  
+      <version>1.8.5</version> 
+    </dependency>  
+    <!-- Servlet -->  
+    <dependency> 
+      <groupId>javax.servlet</groupId>  
+      <artifactId>javax.servlet-api</artifactId>  
+      <version>3.1.0</version>  
+      <scope>provided</scope> 
+    </dependency>  
+    <!-- shiro -->  
+    <dependency> 
+      <groupId>org.apache.shiro</groupId>  
+      <artifactId>shiro-web</artifactId>  
+      <version>${shiro-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.apache.shiro</groupId>  
+      <artifactId>shiro-quartz</artifactId>  
+      <version>${shiro-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.apache.shiro</groupId>  
+      <artifactId>shiro-spring</artifactId>  
+      <version>${shiro-version}</version> 
+    </dependency>  
+    <!-- Test -->  
+    <dependency> 
+      <groupId>junit</groupId>  
+      <artifactId>junit</artifactId>  
+      <version>4.12</version>  
+      <scope>test</scope> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.springframework</groupId>  
+      <artifactId>spring-test</artifactId>  
+      <version>${org.springframework-version}</version>  
+      <scope>test</scope> 
+    </dependency>  
+    <dependency> 
+      <groupId>com.alibaba</groupId>  
+      <artifactId>fastjson</artifactId>  
+      <version>1.2.31</version> 
+    </dependency>  
+    <!-- AspectJ -->  
+    <dependency> 
+      <groupId>org.aspectj</groupId>  
+      <artifactId>aspectjrt</artifactId>  
+      <version>${org.aspectj-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.aspectj</groupId>  
+      <artifactId>aspectjweaver</artifactId>  
+      <version>${org.aspectj-version}</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>cglib</groupId>  
+      <artifactId>cglib</artifactId>  
+      <version>2.2.2</version> 
+    </dependency>  
+    <!-- JSR-303 bean validator -->  
+    <!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->  
+    <dependency> 
+      <groupId>org.hibernate</groupId>  
+      <artifactId>hibernate-validator</artifactId>  
+      <version>5.2.4.Final</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>javax.validation</groupId>  
+      <artifactId>validation-api</artifactId>  
+      <version>1.1.0.Final</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.jboss.logging</groupId>  
+      <artifactId>jboss-logging</artifactId>  
+      <version>3.2.1.Final</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>com.fasterxml</groupId>  
+      <artifactId>classmate</artifactId>  
+      <version>1.1.0</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>com.googlecode.json-simple</groupId>  
+      <artifactId>json-simple</artifactId>  
+      <version>1.1.1</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.apache.poi</groupId>  
+      <artifactId>poi-ooxml</artifactId>  
+      <version>3.17</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>com.aliyun</groupId>  
+      <artifactId>aliyun-java-sdk-dysmsapi</artifactId>  
+      <version>1.0.0</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>com.aliyun</groupId>  
+      <artifactId>aliyun-java-sdk-core</artifactId>  
+      <version>3.5.0</version> 
+    </dependency>  
+    <dependency> 
+      <groupId>org.apache.httpcomponents</groupId>  
+      <artifactId>httpasyncclient</artifactId>  
+      <version>4.1.3</version> 
+    </dependency>  
+    <!-- javaMail -->  
+    <dependency> 
+      <groupId>javax.mail</groupId>  
+      <artifactId>mail</artifactId>  
+      <version>1.4.7</version> 
+    </dependency> 
+  </dependencies>  
+  <build> 
+    <resources> 
+      <resource> 
+        <directory>src/resources</directory>  
+        <includes> 
+          <include>**/*.properties</include>  
+          <include>**/*.xml</include>  
+          <include>**/*.ini</include> 
+        </includes>  
+        <filtering>false</filtering> 
+      </resource>  
+      <resource> 
+        <directory>src/main/java</directory>  
+        <includes> 
+          <include>**/*.xml</include> 
+        </includes>  
+        <filtering>false</filtering> 
+      </resource> 
+    </resources>  
+    <plugins> 
+      <plugin> 
+        <groupId>org.apache.maven.plugins</groupId>  
+        <artifactId>maven-compiler-plugin</artifactId>  
+        <version>3.5.1</version>  
+        <configuration> 
+          <source>1.8</source>  
+          <target>1.8</target>  
+          <encoding>utf8</encoding>  
+          <compilerArgument>-Xlint:all</compilerArgument>  
+          <showWarnings>true</showWarnings>  
+          <showDeprecation>true</showDeprecation>  
+          <skip>true</skip> 
+        </configuration> 
+      </plugin>  
+      <plugin> 
+        <groupId>org.apache.maven.plugins</groupId>  
+        <artifactId>maven-surefire-plugin</artifactId>  
+        <version>2.5</version>  
+        <configuration> 
+          <skip>true</skip> 
+        </configuration> 
+      </plugin>  
+      <plugin> 
+        <groupId>org.apache.maven.plugins</groupId>  
+        <artifactId>maven-war-plugin</artifactId>  
+        <version>3.1.0</version>  
+        <configuration> 
+          <warName>${profiles.activation}</warName>  
+          <!-- 激活spring profile -->  
+          <webResources> 
+            <resource> 
+              <filtering>true</filtering>  
+              <directory>src/main/webapp</directory>  
+              <includes> 
+                <include>**/**</include> 
+              </includes> 
+            </resource>  
+            <resource> 
+              <filtering>true</filtering>  
+              <directory>src/main/resources</directory>  
+              <targetPath>WEB-INF/classes</targetPath>  
+              <includes> 
+                <include>**/**</include> 
+              </includes> 
+            </resource> 
+          </webResources>  
+          <warSourceDirectory>src/main/webapp</warSourceDirectory>  
+          <webXml>src/main/webapp/WEB-INF/web.xml</webXml> 
+        </configuration> 
+      </plugin>
+    </plugins> 
+  </build>  
+  <repositories> 
+    <repository> 
+      <id>aliyun-repos</id>  
+      <url>http://maven.aliyun.com/nexus/content/groups/public/</url>  
+      <snapshots> 
+        <enabled>false</enabled> 
+      </snapshots> 
+    </repository> 
+  </repositories>  
+  <pluginRepositories> 
+    <pluginRepository> 
+      <id>aliyun-plugin</id>  
+      <url>http://maven.aliyun.com/nexus/content/groups/public/</url>  
+      <snapshots> 
+        <enabled>false</enabled> 
+      </snapshots> 
+    </pluginRepository> 
+  </pluginRepositories> 
+</project>

+ 6 - 7
src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java

@@ -78,25 +78,24 @@ public interface TChangeTaskMapper {
 	void insertSelectiveList(@Param("list")List<TChangeTask> list);
 
 	List<TChangeTaskOut> selectByCid(@Param("id")Integer id, @Param("splitStatus")Integer splitStatus);
-	
+
 	/**
-	 * 
+	 *
 	 * @param tid �更项目id
 	 * @param sid �更拆分父项目id
 	 * @param type 处�类型
-	 * @param i 
 	 * @return
 	 */
 	int updateByTid(@Param("tid")Integer tid,@Param("sid")Integer sid,@Param("cid")Integer cid,@Param("type")Integer type);
-	
+
 	int deleteByTid(Integer tid);
 
 	/**
-	 *   获��更�项�??
+	 *   获��更�项目
 	 * @param splitSuper
-	 * @param cid 
+	 * @param cid
 	 * @return
 	 */
 	List<TChangeTask> selectBySuper(@Param("splitSuper")Integer splitSuper, @Param("cid")Integer cid);
 
-}
+}

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql://localhost:3306/spms?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
 jdbc.password=123456
 #测试

+ 12 - 31
src/main/webapp/WEB-INF/web.xml

@@ -1,11 +1,9 @@
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-	version="3.1">
-		
-	<display-name>basics</display-name>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
 
-	<!-- The definition of the Root Spring Container shared by all Servlets 
+	<display-name>basics-server</display-name>
+
+	<!-- The definition of the Root Spring Container shared by all Servlets
 		and Filters -->
 	<context-param>
 		<param-name>spring.profiles.active</param-name>
@@ -16,10 +14,10 @@
 	<listener>
 		<listener-class>org.springframework.web.util.IntrospectorCleanupListener</listener-class>
 	</listener>
-	
+
 	<filter>
 		<filter-name>CorsFilter</filter-name>
-		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class> 
+		<filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
 		<async-supported>true</async-supported>
 	</filter>
 	<filter-mapping>
@@ -27,7 +25,6 @@
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 	<filter>
-	
 		<filter-name>encodingFilter</filter-name>
 		<filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
 		<async-supported>true</async-supported>
@@ -78,22 +75,22 @@
 		<load-on-startup>1</load-on-startup>
 		<async-supported>true</async-supported>
 	</servlet>
-	
+
 	<!-- <servlet>
 		<servlet-name>DruidStatView</servlet-name>
 		<servlet-class>com.alibaba.druid.support.http.StatViewServlet</servlet-class>
 		<init-param>
-			
+
 			<param-name>resetEnable</param-name>
 			<param-value>true</param-value>
 		</init-param>
 		<init-param>
-			
+
 			<param-name>loginUsername</param-name>
 			<param-value>druid</param-value>
 		</init-param>
 		<init-param>
-			
+
 			<param-name>loginPassword</param-name>
 			<param-value>aft@2016</param-value>
 		</init-param>
@@ -104,22 +101,6 @@
 	</servlet-mapping> -->
 	<!-- url -->
 	<servlet-mapping>
-	    <servlet-name>default</servlet-name>
-	    <url-pattern>*.jpg</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-	    <servlet-name>default</servlet-name>
-	    <url-pattern>*.png</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-	    <servlet-name>default</servlet-name>
-	    <url-pattern>*.js</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
-	    <servlet-name>default</servlet-name>
-	    <url-pattern>*.css</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
 		<servlet-name>aft</servlet-name>
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>
@@ -139,5 +120,5 @@
 		<error-code>500</error-code>
 		<location>/WEB-INF/views/error.jsp</location>
 	</error-page>
-	
+
 </web-app>