gengyang há 5 anos atrás
pai
commit
eca6e17d6d

+ 2 - 16
src/main/java/com/mokamrp/privates/interceptor/AuthIntercepotor.java

@@ -34,27 +34,13 @@ public class AuthIntercepotor extends HandlerInterceptorAdapter {
         if (requestUrl.equals("/ping")) {
             return true;
         }
-//        String token = request.getHeader("Authorization");
-//        //.Authorizetion 不存在token 拦截
-//        if (token == null || token.isEmpty()) {
-//            AjaxResult ajaxResult = AjaxResult.error(450, "token nil");
-//            ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
-//            return false;
-//        }
-//        String userInfoStr = redisCache.getString(RedisKey.AuthToken + token);
-//        Object userObj = JSON.parse(userInfoStr);
-//        if (userObj == null) {
-//            AjaxResult ajaxResult = AjaxResult.error(450, "token timeout");
-//            ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
-//            return false;
-//        }
-//        User user = objectMapper.convertValue(userObj, User.class);
-//        request.setAttribute("auth-user", user);
+
         XxlSsoUser xxlSsoUser = (XxlSsoUser) request.getAttribute(Conf.SSO_USER);
         Map<String, String> plugininfo=xxlSsoUser.getPlugininfo();
         User user=new User();
         user.setId(Integer.valueOf(plugininfo.get("employeeNo")));
         user.setName(xxlSsoUser.getUsername());
+        user.setUserId(xxlSsoUser.getUserid());
         user.setIsSuperAdmin(1);
         request.setAttribute("auth-user", user);
 

+ 10 - 0
src/main/java/com/mokamrp/privates/mapper/pojo/User.java

@@ -49,6 +49,8 @@ public class User extends Model<User> {
      * 职务
      */
     private String position;
+
+    private String userId;
     /**
      * 上一次登陆时间
      */
@@ -78,6 +80,14 @@ public class User extends Model<User> {
         this.id = id;
     }
 
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
     public String getPic() {
         return Pic;
     }