使用远程配置,zookeeper/config/mooctest-user-server,dev

mooctest-user-server/Dockerfile

@@ -1,6 +1,6 @@
 FROM openjdk:alpine
 RUN echo "https://mirror.tuna.tsinghua.edu.cn/alpine/v3.4/main/" > /etc/apk/repositories
-EXPOSE 8081
+EXPOSE 80
 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

@@ -230,7 +230,22 @@
             <artifactId>commons-validator</artifactId>
             <version>1.4.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zookeeper-config</artifactId>
+        </dependency>
     </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>Brixton.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <build>
         <finalName>${project.artifactId}</finalName>

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

@@ -18,9 +18,10 @@ public class RedisSessionConfiguration {
     @Bean
     public CookieSerializer cookieSerializer() {
         DefaultCookieSerializer serializer = new DefaultCookieSerializer();
-        serializer.setCookieName("JSESSIONID");
+//        serializer.setCookieName("SESSION");
         serializer.setCookiePath("/");
-        serializer.setDomainNamePattern("^.+?\\.(\\w+\\.[a-z]+)$");
+        serializer.setDomainName(".mooctest.net");
+//        serializer.setDomainNamePattern("^.+?\\.(\\w+\\.[a-z]+)$");
         return serializer;
     }
 

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

@@ -71,7 +71,10 @@ public class PageController extends BaseController{
             redirectUrl = null;
         }
         if (redirectUrl==null || redirectUrl.isEmpty() || !redirectUrl.startsWith("http")){
-            redirectUrl = UrlConstants.DFAULT_GOTO;
+            if (request.getSession().getAttribute("redirectURL")==null)
+                redirectUrl = UrlConstants.DFAULT_GOTO;
+            else
+                redirectUrl = (String) request.getSession().getAttribute(("redirectURL"));
         }
         HttpSession session = request.getSession();
         session.setAttribute("redirectURL", redirectUrl);
@@ -96,6 +99,7 @@ public class PageController extends BaseController{
             // return "redirect:http://www.mooctest.net/api/test/login";
             String afterLogin = session.getAttribute("redirectURL")==null?
                     UrlConstants.DFAULT_GOTO:(String)session.getAttribute("redirectURL");
+            LOG.info("redirectURL: "+afterLogin);
             return "redirect:" + afterLogin;
         }
         else{
@@ -116,7 +120,9 @@ public class PageController extends BaseController{
         if (result.getStatus() != ResponseStatus.SUCCESS){
             return "mobile_login";
         }
-        request.getSession().setAttribute("userId", ((UserDTO)result.getData()).getId());
+        HttpSession session = request.getSession();
+        session.setAttribute("userId", ((UserDTO)result.getData()).getId());
+        session.setAttribute("userName", ((UserDTO)result.getData()).getEmail());
         String redirectURL = (String) request.getSession().getAttribute("redirectURL");
         redirectURL = redirectURL==null?UrlConstants.DFAULT_GOTO:redirectURL;
         return "redirect:"+redirectURL;
@@ -151,7 +157,9 @@ public class PageController extends BaseController{
             model.addAttribute("from", "github");
             return "third_party_bind";
         }
-        request.getSession().setAttribute("userId", ((UserThirdParty)result.getData()).getUserId());
+        HttpSession session = request.getSession();
+        session.setAttribute("userId", ((UserDTO)result.getData()).getId());
+        session.setAttribute("userName", ((UserDTO)result.getData()).getEmail());
         String redirectUrl = (String)request.getSession().getAttribute("redirectURL");
         if (redirectUrl==null || redirectUrl.isEmpty())
             redirectUrl = UrlConstants.DFAULT_GOTO;
@@ -180,7 +188,9 @@ public class PageController extends BaseController{
         userThirdParty.setIsDelete(0);
         System.out.println(userThirdParty.getUserId()+"--"+userThirdParty.getThirdPartyIdentity()+"---"+userThirdParty.getType());
         thirdPartyAuthService.save(userThirdParty);
-        request.getSession().setAttribute("userId", userThirdParty.getUserId());
+        HttpSession session = request.getSession();
+        session.setAttribute("userId", ((UserDTO)result.getData()).getId());
+        session.setAttribute("userName", ((UserDTO)result.getData()).getEmail());
         String redirectUrl = (String)request.getSession().getAttribute("redirectURL");
         if (redirectUrl==null || redirectUrl.isEmpty())
             redirectUrl = UrlConstants.DFAULT_GOTO;

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

@@ -69,6 +69,7 @@ public class UserController extends BaseController {
         Object userId = request.getSession().getAttribute("userId");
         if(userId!=null){
             request.getSession().removeAttribute("userId");
+            request.getSession().invalidate();
             result.init(ResponseStatus.SUCCESS, "用户成功退出", userId);
             LOG.info("用户成功退出--userId--"+(Long)userId);
         } else{

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

@@ -28,23 +28,9 @@ spring:
         encoding: UTF-8
         cache: false
 #        enabled: true
-    redis:
-#        host: 114.55.91.27
-        port: 6379
-        pool:
-            max-idle: 8
-            min-idle: 0
-            max-wait: -1
-            max-active: 8
-        database: 2
-        host: localhost
 #    session:``
 #        stroe-type: redis
 
-
-
-
-
 wechat:
     appId: wx60f06d61f21804be
     appSecret: f84db4dc62377926624093b49ac3be1f
@@ -64,8 +50,8 @@ spring:
     profiles: dev
     datasource:
         driverClassName: com.mysql.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/mooctest_user_service?useUnicode=yes&characterEncoding=UTF-8&serverTimezone=GMT%2B8
-        username: sa
+        url: jdbc:mysql://111.231.143.6:3306/mooctest_user_service?useUnicode=yes&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+        username: root
         password: xuexiaobo.
 
     dubbo:
@@ -79,6 +65,18 @@ spring:
         provider.timeout: 120000
         provider.retries: 0
 
+    redis:
+        host: 114.55.91.27
+        port: 6379
+        pool:
+            max-idle: 8
+            min-idle: 0
+            max-wait: -1
+            max-active: 8
+        database: 2
+#        host: localhost
+#        host: 111.231.143.6
+
 mail:
     host: smtp.126.com
     username: diors_po@126.com

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

@@ -0,0 +1,13 @@
+spring.profiles.active: dev
+spring:
+  application:
+    name: mooctest-user-server
+  cloud:
+    zookeeper:
+      enabled: true  # true:开启zookeeper外部化配置, false:读取本地配置;
+      connect-string: 101.37.175.111:2181
+      config:
+        root: /config
+        enabled: true
+        watcher:
+          enabled: true

mooctest-user-server/src/main/resources/templates/mobile_login.html

@@ -78,9 +78,9 @@
                         <i class="fa fa-qq"></i>
                     </a>
 
-                    <a href="#" class="login100-social-item bg3">
-                        <i class="fa fa-weibo"></i>
-                    </a>
+                    <!--<a href="#" class="login100-social-item bg3">-->
+                        <!--<i class="fa fa-weibo"></i>-->
+                    <!--</a>-->
                 </div>
 
                 <div class="flex-col-c p-t-10">