Просмотр исходного кода

修改单点登录user_id没有的问题

wangjiang988 5 лет назад
Родитель
Сommit
d6347116d7

+ 0 - 1
src/main/java/platform/modules/oauth/LoginCallback.java

@@ -66,7 +66,6 @@ public class LoginCallback extends BaseController {
         tokenString = tokenString.replace("Bearer ", "");
         log.info("tokenstring: {}", tokenString);
         CookieUtil.createWebCookie(response, "token", tokenString, 7200);
-//        CookieUtil.createWebCookie(response, "user_id", user.getId().toString(), 7200);
         return "redirect:/admin/home";
 
 }

+ 1 - 0
src/main/java/platform/modules/sys/web/IndexController.java

@@ -147,6 +147,7 @@ public class IndexController extends BaseController {
             return BASE_PATH + "editPwd";
         }
         modelMap.addAttribute("user_type", user.getUser_type());
+        modelMap.addAttribute("user_id", user.getId());
         if (user.getUser_type().equals(Constant.UserType.COMPANY)) {
             /*BuildInfo buildInfo = buildInfoService.findById(user.getBuild_id());
             if(null!=buildInfo) {

+ 2 - 9
src/main/resources/templates/admin/index.html

@@ -76,23 +76,16 @@
 
             var user_name = [[${user_name}]];
             var user_type = [[${user_type}]];
+            var user_id = [[${user_id}]];
             localStorage.setItem("user_name", user_name);
             localStorage.setItem("user_Type", user_type);
-            var token = getCookie("token")
-            if(token !=null && token != "") {
-                localStorage.setItem("INDUSTRIAL_CARRIER","Bearer " + token)
-            }
+            localStorage.setItem("user_id", user_id);
             if (localStorage.getItem("INDUSTRIAL_CARRIER") == null
                 || localStorage.getItem("INDUSTRIAL_CARRIER") == '') {
                 var token = getCookie("token")
                 if(token !=null && token != "") {
                     localStorage.setItem("INDUSTRIAL_CARRIER","Bearer " + token)
                 }
-                var user_id = getCookie("user_id")
-                if(user_id !=null && user_id != "") {
-                    localStorage.setItem("user_id", user_id)
-                }
-
             }
         });
          window.onload = function(){