Merge branch 'master' into feature/sms_1215

pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.2.5.RELEASE</version>
+        <version>1.5.9.RELEASE</version>
         <relativePath/>
         <!-- lookup parent from repository -->
     </parent>
@@ -23,6 +23,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
         <maven.test.skip>true</maven.test.skip>
+        <org.springframework.security.version>3.2.7.RELEASE</org.springframework.security.version>
+
     </properties>
 
     <dependencies>
@@ -39,7 +41,6 @@
         <dependency>
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-rabbit</artifactId>
-            <version>1.4.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -55,6 +56,7 @@
                     <artifactId>log4j-over-slf4j</artifactId>
                 </exclusion>
             </exclusions>
+
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -74,7 +76,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-redis</artifactId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -95,14 +97,14 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>4.2.0.Final</version>
+            <version>5.0.3.Final</version>
             <type>jar</type>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>4.3.10.Final</version>
+            <version>5.0.4.Final</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-collections</groupId>
@@ -117,18 +119,18 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-ehcache</artifactId>
-            <version>4.3.10.Final</version>
+            <version>5.0.4.Final</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.35</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
             <version>4.3.3</version>
         </dependency>
+
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -289,16 +291,19 @@
         </dependency>
 
         <!-- spring security -->
+        <!-- 兼容旧 Spring Session 配置-->
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>3.2.7.RELEASE</version>
+            <version>${org.springframework.security.version}</version>
         </dependency>
+      
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
-            <version>3.2.7.RELEASE</version>
+            <version>${org.springframework.security.version}</version>
         </dependency>
+        <!-- 兼容旧 Spring Session 配置-->
 
 
     </dependencies>

src/main/java/cn/quantgroup/xyqb/config/data/JpaConfig.java

@@ -47,9 +47,9 @@ public class JpaConfig {
 
   @Bean
   @DependsOn(value = "dataSource")
-  public EntityManagerFactory entityManagerFactory() {
+  public EntityManagerFactory entityManagerFactory(DataSource dataSource) {
     LocalContainerEntityManagerFactoryBean entityManager = new LocalContainerEntityManagerFactoryBean();
-    entityManager.setDataSource(ApplicationContextHolder.getBean("dataSource"));
+    entityManager.setDataSource(dataSource);
     entityManager.setPackagesToScan("cn.quantgroup.xyqb");
     entityManager.setPersistenceUnitName("dataSource");
     Properties properties = new Properties();
@@ -62,7 +62,7 @@ public class JpaConfig {
     return entityManager.getObject();
   }
 
-  @Bean
+  @Bean(name = "dataSource")
   public DataSource dataSource() {
     HikariConfig config = new HikariConfig();
     config.setJdbcUrl(xyqbJdbcUrl);

src/main/java/cn/quantgroup/xyqb/config/http/HttpConfig.java

@@ -26,7 +26,7 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.impl.cookie.BestMatchSpecFactory;
 import org.apache.http.impl.cookie.BrowserCompatSpec;
 import org.apache.http.impl.cookie.BrowserCompatSpecFactory;
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.ConverterRegistry;

src/main/java/cn/quantgroup/xyqb/entity/Address.java

@@ -31,7 +31,7 @@ public class Address implements Serializable {
   private Long cityCode;
   @Column(name = "city")
   private String city;
-  @Column(name = "districtCode")
+  @Column(name = "district_code")
   private Long districtCode;
   @Column(name = "district")
   private String district;

src/main/java/cn/quantgroup/xyqb/filter/RequestFilter.java

@@ -22,7 +22,6 @@ import java.io.PrintWriter;
  * Created by 11 on 2016/12/29.
  */
 @Component
-@Order(Ordered.HIGHEST_PRECEDENCE + 100)
 public class RequestFilter implements Filter {
 
   private static final String[] ALLOWED_PATTERNS = {

src/main/java/cn/quantgroup/xyqb/service/http/impl/HttpServiceImpl.java

@@ -4,8 +4,8 @@ import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.util.Utils;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Maps;
+import org.apache.commons.codec.Charsets;
 import org.apache.commons.collections.MapUtils;
-import org.apache.commons.io.Charsets;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.NameValuePair;

src/main/resources/config/dev/logback.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration>
-    <!--<appender name="STDOUT" class="cn.quantgroup.xyqb.util.log.WithOutPhoneRollingFileAppender">
-        <file>/home/quant_group/logs/xyqb_user.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>/home/quant_group/logs/xyqb_user.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <append>true</append>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>-->
-
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-
         <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>%d{ISO8601} [%thread] [%-5level] %logger{36} - %msg%n</pattern>
+            <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
         </layout>
     </appender>
 
@@ -20,8 +11,10 @@
     <logger name="org.hibernate" level="warn"/>
     <logger name="org.apache" level="warn"/>
     <logger name="ch.qos.logback" level="warn"/>
+    <logger name="feign" level="debug"/>
 
     <root level="info">
         <appender-ref ref="STDOUT"/>
     </root>
+
 </configuration>
\ No newline at end of file

src/main/resources/config/release01/logback.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
+        </layout>
+    </appender>
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <!--<appender name="FILE" class="cn.quantgroup.xyqb.util.log.WithOutPhoneRollingFileAppender">-->
+
         <file>/home/quant_group/logs/xyqb_user.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>/home/quant_group/logs/xyqb_user.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <append>true</append>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
         <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>%d{ISO8601} [%thread] [%-5level] %logger{36} - %msg%n</pattern>
+            <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
         </layout>
     </appender>
 

src/main/resources/config/test/logback.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
+        </layout>
+    </appender>
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+
         <file>/home/quant_group/logs/xyqb_user.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>/home/quant_group/logs/xyqb_user.log.%d{yyyy-MM-dd}</fileNamePattern>
-            <append>true</append>
             <maxHistory>30</maxHistory>
         </rollingPolicy>
         <layout class="ch.qos.logback.classic.PatternLayout">
-            <pattern>%d{ISO8601} [%thread] [%-5level] %logger{36} - %msg%n</pattern>
+            <pattern>%d{ISO8601} [%thread] [%-5level] %logger - %msg%n</pattern>
         </layout>
     </appender>
 

src/test/java/demo/DemoApplicationTests.java

@@ -8,12 +8,12 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = Bootstrap.class)
+@SpringBootTest(classes = Bootstrap.class)
 @WebAppConfiguration
 public class DemoApplicationTests {
 

src/test/java/login/LoginForH5Tests.java

@@ -12,7 +12,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -29,7 +29,7 @@ import java.util.Optional;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = Bootstrap.class)
+@SpringBootTest(classes = Bootstrap.class)
 @WebAppConfiguration
 public class LoginForH5Tests {
   final String phoneNo = "13461067662";

src/test/java/token/OneTimeTokenTests.java

@@ -10,7 +10,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -26,7 +26,7 @@ import java.util.Base64;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = Bootstrap.class)
+@SpringBootTest(classes = Bootstrap.class)
 @WebAppConfiguration
 public class OneTimeTokenTests {
   final String userName = "root";

src/test/java/user/TestUserLogin.java

@@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -18,7 +18,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
  * Created by 11 on 2017/1/3.
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = Bootstrap.class)
+@SpringBootTest(classes = Bootstrap.class)
 @WebAppConfiguration
 public class TestUserLogin {