Merge branch 'master' of http://10.100.5.99/jituan/tourist

src/main/java/com/yingying/tourist/business/BusinessConstant.java

@@ -2,11 +2,10 @@ package com.yingying.tourist.business;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.ResourceBundle;
 
 public class BusinessConstant {
 
-    public static final String COOKIEDOMAIN = "tourist.jituan.com";
-
     public enum Identity{
         A("A","自然的崇拜者"), B("B","洒脱的冒险家"), C("C","文化的朝圣者"),D("D","心灵的按摩师");
 

src/main/java/com/yingying/tourist/business/BusinessYml.java

@@ -0,0 +1,13 @@
+package com.yingying.tourist.business;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BusinessYml {
+    @Value("${session.domain}")private String COOKIEDOMAIN;
+
+    public String getCookieDomain() {
+        return COOKIEDOMAIN;
+    }
+}

src/main/java/com/yingying/tourist/config/MybatisPlusConfig.java

@@ -47,18 +47,4 @@ public class MybatisPlusConfig {
         return performanceInterceptor;
     }
 
-    @Bean
-    public FilterRegistrationBean corsFilter() {
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        CorsConfiguration config = new CorsConfiguration();
-        config.addAllowedOrigin("*");
-        config.setAllowCredentials(true);
-        config.addAllowedHeader("*");
-        config.addAllowedMethod("*");
-        config.addExposedHeader("x-auth-token");
-        source.registerCorsConfiguration("/**", config);
-        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
-        bean.setOrder(0);
-        return bean;
-    }
 }

src/main/java/com/yingying/tourist/config/WebMvcConfig.java

@@ -0,0 +1,28 @@
+package com.yingying.tourist.config;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Configuration
+public class WebMvcConfig extends WebMvcConfigurerAdapter {
+
+    @Bean
+    public FilterRegistrationBean corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration config = new CorsConfiguration();
+        config.addAllowedOrigin("*");
+        config.setAllowCredentials(true);
+        config.addAllowedHeader("*");
+        config.addAllowedMethod("*");
+        config.addExposedHeader("x-auth-token");
+        source.registerCorsConfiguration("/**", config);
+        FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source));
+        bean.setOrder(0);
+        return bean;
+    }
+}

src/main/java/com/yingying/tourist/request/SessionFilter.java

@@ -2,6 +2,7 @@ package com.yingying.tourist.request;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yingying.tourist.business.BusinessConstant;
+import com.yingying.tourist.business.BusinessYml;
 import com.yingying.tourist.common.UrlUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -9,6 +10,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.util.WebUtils;
 
+import javax.annotation.Resource;
 import javax.servlet.*;
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.Cookie;
@@ -23,7 +25,9 @@ import java.util.UUID;
 @Slf4j
 public class SessionFilter implements Filter {
 	
-	
+	@Resource
+	private BusinessYml businessYml;
+
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
 		// 检查sessionId的cookie是否存在,不存在即为新连接，需要初始化sessionId到cookie中
@@ -65,7 +69,7 @@ public class SessionFilter implements Filter {
 			}
 			log.info("sessionKey------>>>third:[{}]",sessionKey);
 			sessionKeyCookie.setPath("/");
-			sessionKeyCookie.setDomain(BusinessConstant.COOKIEDOMAIN);
+			sessionKeyCookie.setDomain(businessYml.getCookieDomain());
 			sessionKeyCookie.setMaxAge(SessionAuthorization.DEFAULT_SESSION_COOKIE_EXPIRE);
 			sessionKeyCookie.setHttpOnly(true);
 			response.addCookie(sessionKeyCookie);

src/main/resources/env/dev/application.yml

@@ -1,6 +1,6 @@
 # 内嵌服务器配置tomcat,jetty
 server:
-  port: 8080
+  port: 8800
 
 # mysql
 spring:
@@ -102,4 +102,7 @@ mybatis-plus:
 
 # log
 logging:
-  config: classpath:logback.xml
+  config: classpath:logback.xml
+
+session:
+  domain: wx.yingyinglicai.com

src/main/resources/env/prod/application.yml

@@ -94,4 +94,7 @@ mybatis-plus:
 
 # log
 logging:
-  config: classpath:logback.xml
+  config: classpath:logback.xml
+
+session:
+  domain: wx.yingyinglicai.com

src/main/resources/env/qa/application.yml

@@ -91,4 +91,7 @@ mybatis-plus:
 
 # log
 logging:
-  config: classpath:logback.xml
+  config: classpath:logback.xml
+
+session:
+  domain: wx.yingyinglicai.com