fix ws授权

nb-auth/src/main/java/com/nb/auth/utils/SecurityUtil.java

@@ -24,6 +24,17 @@ public class SecurityUtil {
     }
 
 
+    /**
+     * 获取用户
+     **/
+    public static LoginUser getLoginUser(String authorization) {
+        try {
+            return (LoginUser) StpUtil.getTokenSessionByToken(authorization).get(LOGIN_USER_KEY);
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
     /**
      * 获取用户
      **/

nb-system/src/main/java/com/nb/bus/websocket/auth/UserAuthFilter.java

@@ -3,6 +3,7 @@ package com.nb.bus.websocket.auth;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.json.JSONUtil;
 import com.nb.auth.bean.LoginUser;
+import com.nb.auth.utils.SecurityUtil;
 import com.nb.common.Constants;
 import com.nb.common.ws.IWebSocketAuthFilter;
 import org.springframework.stereotype.Component;
@@ -11,6 +12,8 @@ import org.tio.http.common.HttpRequest;
 import org.tio.http.common.HttpResponse;
 import org.tio.core.ChannelContext;
 
+import static com.nb.common.Constants.LOGIN_USER_KEY;
+
 /**
  * @author lifang
  * @version 1.0.0
@@ -23,10 +26,9 @@ public class UserAuthFilter implements IWebSocketAuthFilter {
     @Override
     public boolean auth(HttpRequest httpRequest, HttpResponse httpResponse, ChannelContext channelContext) {
         String authorization = httpRequest.getParam("Authorization");
-        Object result = StpUtil.getTokenSessionByToken(authorization).get(Constants.LOGIN_USER_KEY);
+        LoginUser loginUser = SecurityUtil.getLoginUser(authorization);
         Tio.bindToken(channelContext, JSONUtil.toJsonStr(authorization));
-        LoginUser loginUser = (LoginUser)result;
-        channelContext.set(Constants.LOGIN_USER_KEY,loginUser);
-        return result!=null;
+        channelContext.set(LOGIN_USER_KEY,loginUser);
+        return loginUser!=null;
     }
 }

nb-system/src/main/java/com/nb/system/auth/WebAuthGranter.java

@@ -71,7 +71,7 @@ public class WebAuthGranter implements IAuthGranter {
             String requestFrom = request.getHeader("RequestFrom");
             //来自app的请求不需要验证码
             if(!"TuoRenApp".equals(requestFrom)){
-//                captchaTool.ver(source.getCodeKey(),source.getCode());
+                captchaTool.ver(source.getCodeKey(),source.getCode());
             }
         }
         sysUser = sysUserService.getOne(Wrappers.lambdaQuery(SysUser.class).eq(SysUser::getAccount, source.getUsername()));