配置抽取

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/configure/RedisSessionConfiguration.java

@@ -1,5 +1,6 @@
 package cn.iselab.mooctest.user.configure;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -18,12 +19,16 @@ import org.springframework.session.web.http.DefaultCookieSerializer;
 @Configuration
 @EnableRedisHttpSession
 public class RedisSessionConfiguration {
+
+    @Value("${website.domainName}")
+    private String domainName;
+
     @Bean
     public CookieSerializer cookieSerializer() {
         DefaultCookieSerializer serializer = new DefaultCookieSerializer();
 //        serializer.setCookieName("SESSION");
         serializer.setCookiePath("/");
-        serializer.setDomainName(".mooctest.net");
+        serializer.setDomainName(domainName);
 //        serializer.setDomainNamePattern("^.+?\\.(\\w+\\.[a-z]+)$");
         return serializer;
     }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/constants/UrlConstants.java

@@ -1,11 +1,15 @@
 package cn.iselab.mooctest.user.constants;
 
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
 /**
  * @Author ROKG
  * @Description
  * @Date: Created in 下午2:45 2018/2/14
  * @Modified By:
  */
+@Component
 public class UrlConstants {
 
     public static final String API_INTEGRAL="/api/integral";
@@ -16,12 +20,23 @@ public class UrlConstants {
 
     public static final String API="/api/";
 
-    public static final String DFAULT_GOTO="http://crowd.mooctest.net/api/session/get";
+
+    public static String DEFAULT_GOTO="http://www.callfortest.com";
 
     public static final String GET_GITHUB_LOGIN_ACCESSTOKEN = "https://github.com/login/oauth/access_token?code=CODE&client_id=CLIENTID&client_secret=CLIENTSECRET";
 
     public static final String GET_GITHUB_USER_INFO = "https://api.github.com/user?access_token=ACCESSTOKEN";
 
-    public static final String GO_LOGIN = "http://user.callfortest.com/page/login";
+    public static String GO_LOGIN = "http://user.callfortest.com/page/login";
+
+    @Value("${default.goto}")
+    public void setDefaultGoto(String defaultGoto){
+        DEFAULT_GOTO = defaultGoto;
+    }
+
+    @Value("${default.login}")
+    public void setGoLogin(String goLogin){
+        GO_LOGIN = goLogin;
+    }
 
 }

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/PageController.java

@@ -57,7 +57,7 @@ public class PageController extends BaseController{
         }
         if (redirectUrl==null || redirectUrl.isEmpty() || !redirectUrl.startsWith("http")){
             if (request.getSession().getAttribute("redirectURL")==null)
-                redirectUrl = UrlConstants.DFAULT_GOTO;
+                redirectUrl = UrlConstants.DEFAULT_GOTO;
             else
                 redirectUrl = (String) request.getSession().getAttribute(("redirectURL"));
         }
@@ -84,7 +84,7 @@ public class PageController extends BaseController{
             // return "redirect:http://www.mooctest.net/api/test/login";
             LOG.info((String)session.getAttribute("redirectURL"));
             String afterLogin = session.getAttribute("redirectURL")==null?
-                    UrlConstants.DFAULT_GOTO:(String)session.getAttribute("redirectURL");
+                    UrlConstants.DEFAULT_GOTO:(String)session.getAttribute("redirectURL");
             userLogic.recordLoginAction(request, ((UserDTO)result.getData()).getId() , "password");
             LOG.info("redirectURL: "+afterLogin);
             return "redirect:" + afterLogin;
@@ -112,7 +112,7 @@ public class PageController extends BaseController{
         session.setAttribute("userName", ((UserDTO)result.getData()).getEmail());
         userLogic.recordLoginAction(request, ((UserDTO)result.getData()).getId(), "mobile");
         String redirectURL = (String) request.getSession().getAttribute("redirectURL");
-        redirectURL = redirectURL==null?UrlConstants.DFAULT_GOTO:redirectURL;
+        redirectURL = redirectURL==null?UrlConstants.DEFAULT_GOTO:redirectURL;
         return "redirect:"+redirectURL;
     }
 
@@ -153,7 +153,7 @@ public class PageController extends BaseController{
         userLogic.recordLoginAction(request, user.getId(), "github");
         String redirectUrl = (String)request.getSession().getAttribute("redirectURL");
         if (redirectUrl==null || redirectUrl.isEmpty())
-            redirectUrl = UrlConstants.DFAULT_GOTO;
+            redirectUrl = UrlConstants.DEFAULT_GOTO;
         return "redirect:"+redirectUrl;
     }
 
@@ -175,7 +175,7 @@ public class PageController extends BaseController{
         userLogic.recordLoginAction(request,userWechatDTO.getUser().getId(), "wechat");
         String redirectUrl = (String) session.getAttribute("redirectURL");
         if (redirectUrl==null || redirectUrl.isEmpty())
-            redirectUrl = UrlConstants.DFAULT_GOTO;
+            redirectUrl = UrlConstants.DEFAULT_GOTO;
         return "redirect:"+redirectUrl;
     }
 
@@ -224,7 +224,7 @@ public class PageController extends BaseController{
         session.setAttribute("userName", ((UserDTO)result.getData()).getEmail());
         String redirectUrl = (String)request.getSession().getAttribute("redirectURL");
         if (redirectUrl==null || redirectUrl.isEmpty())
-            redirectUrl = UrlConstants.DFAULT_GOTO;
+            redirectUrl = UrlConstants.DEFAULT_GOTO;
         return "redirect:"+redirectUrl;
     }
 
@@ -236,13 +236,13 @@ public class PageController extends BaseController{
         }
         if (redirect==null){
             redirect = request.getSession().getAttribute("redirectURL")==null ?
-                    UrlConstants.DFAULT_GOTO : (String) request.getSession().getAttribute("redirectURL");
+                    UrlConstants.DEFAULT_GOTO : (String) request.getSession().getAttribute("redirectURL");
         } else{
             try {
                 redirect = URLDecoder.decode(redirect, "UTF-8");
             } catch (Exception e) {
                 LOG.error("redirectUrl 解码出错", e);
-                redirect = UrlConstants.DFAULT_GOTO;
+                redirect = UrlConstants.DEFAULT_GOTO;
             }
         }
         request.getSession().setAttribute("redirectURL", redirect);

mooctest-user-server/src/main/java/cn/iselab/mooctest/user/web/ctrl/TestController.java

@@ -3,6 +3,7 @@ package cn.iselab.mooctest.user.web.ctrl;
 import cn.iselab.mooctest.rpc.user.data.UserDTO;
 import cn.iselab.mooctest.user.configure.ThirdPartyAuthConfiguration;
 import cn.iselab.mooctest.user.constants.ResponseStatus;
+import cn.iselab.mooctest.user.constants.UrlConstants;
 import cn.iselab.mooctest.user.data.ResponseResult;
 import cn.iselab.mooctest.user.model.VerifyCode;
 import cn.iselab.mooctest.user.service.MailService;
@@ -149,4 +150,9 @@ public class TestController extends BaseController{
         return str;
     }
 
+    @RequestMapping(value = "/test/url", method = RequestMethod.GET)
+    public String tttttt(){
+        return UrlConstants.GO_LOGIN + "\n" + UrlConstants.DEFAULT_GOTO;
+    }
+
 }

mooctest-user-server/src/main/resources/bootstrap.yaml

@@ -1,4 +1,4 @@
-spring.profiles.active: crowdprod
+spring.profiles.active: crowd
 spring:
   application:
     name: mooctest-user-server