IP白名单 验证成功 返回code 200

Backend/sample/src/main/java/com/dji/sample/common/error/CommonErrorEnum.java

@@ -33,7 +33,9 @@ public enum CommonErrorEnum implements IErrorInfo {
 
     TOKEN_INVALID(600103, "token invalid"),
 
-    SIGN_INVALID(600104, "sign invalid");
+    SIGN_INVALID(600104, "sign invalid"),
+
+    IP_INVALID(600103, "IP invalid");
 
     private String msg;
 

Backend/sample/src/main/java/com/dji/sample/component/AuthInterceptor.java

@@ -63,25 +63,30 @@ public class AuthInterceptor implements HandlerInterceptor {
 
         boolean result = checkToken(request,response);
         if(!result) {
-            return checkIP(request);
+            result = checkIP(request,response);
         }
-        return true;
+        return result;
 
     }
 
-    private boolean checkIP(HttpServletRequest request) {
+    private boolean checkIP(HttpServletRequest request, HttpServletResponse response) {
         String uri = request.getRequestURI();
         String ip = ReqUtils.getClientIp();
         log.info("====================客户端请求信息：request uri: {}, IP: {}", uri, ip);
         boolean check = RedisOpsUtils.checkExist(ip);
         if (!check) {
-            boolean flg = whiteListService.selIp(ip);
-            if (flg) {
+            check = whiteListService.selIp(ip);
+            if (check) {
                 RedisOpsUtils.set(ip, ip);
                 RedisOpsUtils.setWithExpire(ip, ip, RedisConst.WHITELIST_ALIVE_SECOND);
-                return true;
             }
         }
+        if(check) {
+            response.setStatus(HttpStatus.OK.value());
+        } else {
+            response.setStatus(HttpStatus.UNAUTHORIZED.value());
+            log.error(CommonErrorEnum.IP_INVALID.getMessage());
+        }
         return check;
     }
 

Web/src/websocket/index.ts

@@ -57,15 +57,15 @@ class ConnectWebSocket {
   }
 
   _onOpen() {
-    // console.log('连接成功')
+     console.log('ws连接成功')
   }
 
   _onClose() {
-    // console.log('连接已断开')
+     console.log('ws连接已断开')
   }
 
   _onError() {
-    // console.log('连接 error')
+     console.log('ws连接 error')
   }
 
   registerMessageHandler(messageHandler: MessageHandler) {
@@ -75,7 +75,7 @@ class ConnectWebSocket {
   _onMessage(msg: MessageEvent) {
     const data = JSON.parse(msg.data)
     this._messageHandler && this._messageHandler(data)
-    // console.log('接受消息', message)
+    console.log('ws接受消息', data)
   }
 
   sendMessage = (message: WebSocketOptions): void => {