Merge branch 'master' of http://116.63.33.55/git/read_opc

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/config/Interceptors.java

@@ -44,6 +44,7 @@ public class Interceptors implements HandlerInterceptor {
         } else {
             throw new CustomException(ResultEnum.UNAUTHORIZED.getRespCode(), ResultEnum.UNAUTHORIZED.getRespMsg());
         }
+        redisUtil.set(token, userId, ConstantStr.FIVE_HOUR);
 //        boolean verify = TokenUtil.verify(token);
 //        if (!verify) {
 //            throw new CustomException(ResultEnum.UNAUTHORIZED.getRespCode(), ResultEnum.UNAUTHORIZED.getRespMsg());

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/config/WebSocket.java

@@ -58,12 +58,18 @@ public class WebSocket {
     @OnClose
     public void onClose() {
         webSocketSet.remove(this);
+        redisUtil.set("websocket" + userId, true, 5);
         try {
-            Thread.sleep(10000);
+            Thread.sleep(5000);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
-        if ((Boolean) redisUtil.get("websocket" + userId)) {
+        Boolean flage = false;
+        Object o = redisUtil.get("websocket" + userId);
+        if (Blank.isNotEmpty(o)) {
+            flage = (Boolean) o;
+        }
+        if (flage) {
             return;
         }
         if (Blank.isNotEmpty(userId)) {

chaunyi_opc/opc_da/src/main/java/com/example/opc_da/service/impl/UserServiceImpl.java

@@ -303,6 +303,20 @@ public class UserServiceImpl implements UserService {
     @Override
     public Result userLoginOut() {
         String token = userUtil.getToken();
+        if (Blank.isEmpty(token)) {
+            throw new CustomException(ResultEnum.UNAUTHORIZED.getRespCode(), ResultEnum.UNAUTHORIZED.getRespMsg());
+        }
+        String userId = Convert.toStr(redisUtil.get(token));
+        String userLoginType = token.substring(0, 5);
+        if (userLoginType.equals(ConstantStr.FRONT_USER_String)) {
+            redisUtil.del(ConstantStr.FRONT_USER_String + userId);
+        } else if (userLoginType.equals(ConstantStr.PHONE_USER_String)) {
+            redisUtil.del(ConstantStr.PHONE_USER_String + userId);
+        } else if (userLoginType.equals(ConstantStr.BACK_USER_String)) {
+            redisUtil.del(ConstantStr.BACK_USER_String + userId);
+        } else {
+            throw new CustomException(ResultEnum.UNAUTHORIZED.getRespCode(), ResultEnum.UNAUTHORIZED.getRespMsg());
+        }
         redisUtil.del(token);
         return Result.ok(true);
     }