From 3f4d6abbd6e93da2912c280bee3293692a4411ab Mon Sep 17 00:00:00 2001
From: zhou-hao <i@hsweb.me>
Date: Fri, 24 Nov 2017 14:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96websocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/socket/handler/WebSocketUtils.java    | 53 -------------------
 .../web/socket/message/WebSocketMessager.java |  2 -
 .../socket/processor/CommandProcessor.java    |  6 ++-
 .../CommandWebSocketAutoConfiguration.java    |  2 -
 4 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100644 hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/handler/WebSocketUtils.java

diff --git a/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/handler/WebSocketUtils.java b/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/handler/WebSocketUtils.java
deleted file mode 100644
index c6c1dc9b1..000000000
--- a/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/handler/WebSocketUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.hswebframework.web.socket.handler;
-
-import org.hswebframework.web.authorization.Authentication;
-import org.hswebframework.web.authorization.token.UserTokenManager;
-import org.springframework.http.HttpHeaders;
-import org.springframework.web.socket.WebSocketSession;
-
-import java.util.*;
-
-/**
- * TODO 完成注释
- *
- * @author zhouhao
- */
-public class WebSocketUtils {
-
-
-    public static Authentication getAuthentication(UserTokenManager container, WebSocketSession session) {
-        Authentication authentication = Authentication
-                .current()
-                .orElseGet(() -> ((Authentication) session.getAttributes().get(Authentication.class.getName())));
-
-        if (authentication != null) {
-            return authentication;
-        }
-        HttpHeaders headers = session.getHandshakeHeaders();
-        List<String> cookies = headers.get("Cookie");
-        if (cookies == null || cookies.isEmpty()) {
-            return null;
-        }
-        String[] cookie = cookies.get(0).split("[;]");
-        Map<String, Set<String>> sessionId = new HashMap<>();
-        for (String aCookie : cookie) {
-            String[] tmp = aCookie.split("[=]");
-            if (tmp.length == 2) {
-                sessionId.computeIfAbsent(tmp[0].trim(), k -> new HashSet<>())
-                        .add(tmp[1].trim());
-            }
-        }
-
-        // TODO: 2017/7/12  修改权限获取方式
-        throw new UnsupportedOperationException();
-//        Function<Set<String>, Optional<Authentication>> userGetter = set ->
-//                set == null ? Optional.empty() : set.stream()
-//                        .map(token::getByToken)
-//                        .filter(Objects::nonNull)
-//                        .findFirst();
-//
-//        return userGetter.apply(sessionId.get("SESSION"))
-//                .orElseGet(() -> userGetter.apply(sessionId.get("JSESSIONID")).orElse(null));
-
-    }
-}
diff --git a/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/message/WebSocketMessager.java b/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/message/WebSocketMessager.java
index e8390d469..f433072d5 100644
--- a/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/message/WebSocketMessager.java
+++ b/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/message/WebSocketMessager.java
@@ -4,8 +4,6 @@ import org.hswebframework.web.socket.WebSocketSessionListener;
 import org.springframework.web.socket.WebSocketSession;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 public interface WebSocketMessager extends WebSocketSessionListener {
diff --git a/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/processor/CommandProcessor.java b/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/processor/CommandProcessor.java
index e71632dea..d2ec6c7fe 100644
--- a/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/processor/CommandProcessor.java
+++ b/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/processor/CommandProcessor.java
@@ -12,7 +12,9 @@ public interface CommandProcessor {
 
     void execute(CommandRequest command);
 
-    void init();
+    default void init() {
+    }
 
-    void destroy();
+    default void destroy() {
+    }
 }
diff --git a/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/starter/CommandWebSocketAutoConfiguration.java b/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/starter/CommandWebSocketAutoConfiguration.java
index abe9c203a..457bf7bae 100644
--- a/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/starter/CommandWebSocketAutoConfiguration.java
+++ b/hsweb-message/hsweb-message-websocket/src/main/java/org/hswebframework/web/socket/starter/CommandWebSocketAutoConfiguration.java
@@ -24,8 +24,6 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry
 import java.util.List;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 @Configuration