Merge remote-tracking branch 'origin/master'

.gitignore

@@ -26,3 +26,7 @@ Gruntfile.js
 
 coverage-report
 /src/main/websrc/.DS_Store
+
+manager.iml
+manage.iml
+target
\ No newline at end of file

lib/Test.java

-/**
- * Created by mxq on 2018/1/2.
- */
-public class Test {
-}

pom.xml

@@ -85,6 +85,7 @@
     <profile>
       <id>test</id>
       <properties>
+        <label>dev</label>
         <!--数据源配置-->
         <datasource.driver>com.mysql.jdbc.Driver</datasource.driver>
         <!--//office-->
@@ -211,36 +212,6 @@
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-jpa</artifactId>
       <version>1.3.2.RELEASE</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>spring-aop</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-core</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-tx</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-context</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>slf4j-api</artifactId>
-          <groupId>org.slf4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>spring-beans</artifactId>
-          <groupId>org.springframework</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jcl-over-slf4j</artifactId>
-          <groupId>org.slf4j</groupId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -278,6 +249,14 @@
           <artifactId>spring-beans</artifactId>
           <groupId>org.springframework</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>slf4j-api</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>jcl-over-slf4j</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!-- spring end -->
@@ -492,6 +471,14 @@
           <artifactId>commons-logging</artifactId>
           <groupId>commons-logging</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>commons-beanutils</artifactId>
+          <groupId>commons-beanutils</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-collections</artifactId>
+          <groupId>commons-collections</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -570,6 +557,10 @@
           <artifactId>commons-logging</artifactId>
           <groupId>commons-logging</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>joda-time</artifactId>
+          <groupId>joda-time</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -683,11 +674,31 @@
       <groupId>com.google.api-ads</groupId>
       <artifactId>ads-lib</artifactId>
       <version>3.9.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>guice</artifactId>
+          <groupId>com.google.inject</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>slf4j-api</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.api-ads</groupId>
       <artifactId>adwords-axis</artifactId>
       <version>3.9.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- Third party dependencies -->
@@ -695,6 +706,16 @@
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-jackson2</artifactId>
       <version>1.22.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>jackson-core</artifactId>
+          <groupId>com.fasterxml.jackson.core</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>httpclient</artifactId>
+          <groupId>org.apache.httpcomponents</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>
@@ -755,39 +776,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
         <version>2.6</version>
-        <configuration>
-          <webResources>
-            <resource>
-              <directory>${pom.basedir}/lib</directory>
-              <targetPath>WEB-INF/lib</targetPath>
-              <filtering>false</filtering>
-              <includes>
-                <include>**/*.jar</include>
-              </includes>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>src/main/webapp</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${project.basedir}/dist</directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
 
       <plugin>

src/main/java/common/controller/LoginController.java

@@ -2,7 +2,6 @@ package common.controller;
 
 
 
-import com.sun.corba.se.spi.ior.ObjectKey;
 import common.model.User;
 
 import common.repository.RoleRepository;
@@ -17,7 +16,6 @@ import security.RedisLoginStatusManager;
 import security.TokenManager;
 import security.annotation.CurrentAccount;
 
-import security.interceptor.AuthorizationInterceptor;
 import util.*;
 
 import javax.servlet.http.Cookie;

src/main/resources/redis.properties

@@ -6,8 +6,8 @@ redis.maxIdle=300
 redis.testOnBorrow=true
 
 # token
-redis.surl.host=${redis.surl.host}
-redis.surl.port=${redis.surl.port}
+redis.Surl.host=${redis.surl.host}
+redis.Surl.port=${redis.surl.port}
 
 # event
 redis.event.host=${redis.event.host}

src/main/resources/applicationContext.xml → src/main/resources/spring/applicationContext.xml

@@ -2,15 +2,13 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xmlns:context="http://www.springframework.org/schema/context"
-	   xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jee="http://www.springframework.org/schema/jee"
 	   xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-	   xmlns:task="http://www.springframework.org/schema/task" xmlns:p="http://www.springframework.org/schema/p"
+	   xmlns:p="http://www.springframework.org/schema/p"
 	   xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
-		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd
+
+
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
 		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd"
 	   default-lazy-init="true">
@@ -25,8 +23,7 @@
 	<context:component-scan base-package="dmp" />
 	<context:component-scan base-package="security" />
 
-	<context:property-placeholder location="classpath:persistence.properties"/>
-	<context:property-placeholder location="classpath:redis.properties" />
+	<context:property-placeholder location="classpath:persistence.properties,classpath:redis.properties"/>
 
 	<!--Redis配置-->
 	<bean id="poolConfig" class="redis.clients.jedis.JedisPoolConfig">
@@ -36,7 +33,7 @@
 		<property name="testOnBorrow" value="true" />
 	</bean>
 
-	<bean id="connectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" p:hostName="${redis.surl.host}" p:port="${redis.surl.port}" p:poolConfig-ref="poolConfig"/>
+	<bean id="connectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory" p:hostName="${redis.Surl.host}" p:port="${redis.Surl.port}" p:poolConfig-ref="poolConfig"/>
 
 	<bean id="redisTemplate" class="org.springframework.data.redis.core.StringRedisTemplate">
 		<property name="connectionFactory" ref="connectionFactory" />

src/main/webapp/WEB-INF/web.xml

@@ -33,7 +33,7 @@
   </context-param>
   <context-param>
     <param-name>contextConfigLocation</param-name>
-    <param-value>classpath:/applicationContext*.xml</param-value>
+    <param-value>classpath:/spring/applicationContext*.xml</param-value>
   </context-param>
 
   <servlet>