..

mooctest-user-server/Dockerfile

@@ -0,0 +1,6 @@
+FROM openjdk:alpine
+RUN echo "https://mirror.tuna.tsinghua.edu.cn/alpine/v3.4/main/" > /etc/apk/repositories
+EXPOSE 8081
+ADD target/mooctest-user-server.jar /root
+WORKDIR /root
+ENTRYPOINT ["java", "-jar", "-Djava.security.egd=file:/dev/./urandom", "mooctest-user-server.jar"]

mooctest-user-server/pom.xml

@@ -64,17 +64,16 @@
         </dependency>
 
 
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.boot</groupId>-->
-            <!--<artifactId>spring-boot-starter-redis</artifactId>-->
-            <!--<version>1.4.7.RELEASE</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.springframework.session</groupId>-->
-            <!--<artifactId>spring-session-data-redis</artifactId>-->
-            <!--<version>1.3.2.RELEASE</version>-->
-        <!--</dependency>-->
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-redis</artifactId>
+            <version>1.3.8.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-data-redis</artifactId>
+            <version>1.1.1.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>net.sourceforge.nekohtml</groupId>
             <artifactId>nekohtml</artifactId>

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

@@ -0,0 +1,14 @@
+package cn.iselab.mooctest.user.configure;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+
+/**
+ * @Description: 作用描述
+ * @Author: xuexb
+ * @CreateDate: 19-1-22$ 下午3:59$
+ */
+@Configuration
+@EnableRedisHttpSession
+public class RedisSessionConfiguration {
+}

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

@@ -40,24 +40,43 @@ public class PageController extends BaseController{
     ThirdPartyAuthService thirdPartyAuthService;
 
     @RequestMapping(value = UrlConstants.PAGE + "login", method = RequestMethod.GET)
-    public String login(Callback callback, HttpServletRequest request){
-        System.out.println(System.currentTimeMillis());
-        String afterLogin = null;
-        if(callback.getRedirectURL()!=null && callback.getRedirectURL().trim().length()>0){
-            if(!callback.getRedirectURL().startsWith("http"))
-                callback.setRedirectURL("http://"+callback);
-            afterLogin = callback.getRedirectURL();
-        }else if (request.getSession().getAttribute("RedirectURL")!=null){
-            afterLogin = (String) request.getSession().getAttribute("RedirectURL");
+    public String login(@RequestParam(value = "redirect", required = false)String redirect, HttpServletRequest request){
+//        System.out.println(System.currentTimeMillis());
+//        String afterLogin = null;
+//        if(callback.getRedirectURL()!=null && callback.getRedirectURL().trim().length()>0){
+//            if(!callback.getRedirectURL().startsWith("http"))
+//                callback.setRedirectURL("http://"+callback);
+//            afterLogin = callback.getRedirectURL();
+//        }else if (request.getSession().getAttribute("RedirectURL")!=null){
+//            afterLogin = (String) request.getSession().getAttribute("RedirectURL");
+//        }
+//        else if(callback.getDefaultURL()!=null)
+//            afterLogin = callback.getDefaultURL();
+//        LOG.info("RedirectURL---" + afterLogin);
+//        HttpSession session = request.getSession();
+//        session.setAttribute("redirectURL", afterLogin);
+//        if(session.getAttribute("userId")!=null){
+//            LOG.info("用户已登录!用户ID"+session.getAttribute("userId").toString());
+//            return "redirect:"+afterLogin;
+//        }
+//        return "login";
+
+        String redirectUrl = "";
+        try {
+            redirectUrl = EncryptionUtil.decryptDES(redirect);
+        } catch (Exception e) {
+            LOG.error("redirectUrl 解码出错", e);
+            redirectUrl = null;
+        }
+        if (redirectUrl==null || redirectUrl.isEmpty() || !redirectUrl.startsWith("http")){
+            redirectUrl = UrlConstants.DFAULT_GOTO;
         }
-        else if(callback.getDefaultURL()!=null)
-            afterLogin = callback.getDefaultURL();
-        LOG.info("RedirectURL---" + afterLogin);
         HttpSession session = request.getSession();
-        session.setAttribute("redirectURL", afterLogin);
-        if(session.getAttribute("userId")!=null){
+        session.setAttribute("RedirectUrl", redirectUrl);
+        LOG.info("RedirectUrl" + redirectUrl);
+        if (session.getAttribute("userId") != null){
             LOG.info("用户已登录!用户ID"+session.getAttribute("userId").toString());
-            return "redirect:"+afterLogin;
+            return "redirect:"+redirectUrl;
         }
         return "login";
     }

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

@@ -142,4 +142,6 @@ public class TestController extends BaseController{
                 + "client_secret: "+authConfiguration.getGitHubClientSecret();
     }
 
+
+
 }

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

@@ -28,12 +28,14 @@ spring:
         encoding: UTF-8
         cache: false
 #        enabled: true
-#    redis:
-#        host: localhost
-#        port: 6379
-#        pool:
-#            max-idle: 20
-#            min-idle: 5
+    redis:
+        host: 114.55.91.27
+        port: 6379
+        pool:
+            max-idle: 8
+            min-idle: 0
+            max-wait: -1
+            max-active: 8
 #    session:
 #        stroe-type: redis