From a77d5c9e4bf2c5197a54f0e813cc6f990fd8b834 Mon Sep 17 00:00:00 2001
From: yan <zhoutao825638@vip.qq.com>
Date: Sun, 24 Jul 2022 02:44:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?:construction:=20=E5=AE=8C=E5=96=84WS?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E4=BB=A5=E5=8F=8A=E7=99=BB=E5=BD=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/public/index.html                       |   2 +-
 .../src/component/Main/MainSideMenu/index.tsx |   2 +-
 admin/src/component/Main/MainTopNav/index.tsx |   3 +-
 admin/src/layout/LoginLayout/index.tsx        | 154 +++++++++++------
 admin/src/layout/MainLayout/index.tsx         |   4 +-
 admin/src/page/ContainerLogPage/index.tsx     |  12 +-
 admin/src/page/ContainerTerminal/index.jsx    |   4 +-
 .../controller/MonitorController.java         |  25 ++-
 .../ws/ContainerFileWebSocket.java            | 138 +++++----------
 .../ws/ContainerLogWebSocket.java             |  97 +++--------
 .../ws/ContainerTerminalWebSocket.java        | 159 +++++++-----------
 .../simpledocker/ws/ImagePullWebSocket.java   | 132 +++------------
 .../ws/callback/AbstractResultCallback.java   |  73 ++++++--
 .../callback/ContainerLogResultCallback.java  |  77 ++++-----
 .../ws/callback/TerminalResultCallback.java   |  89 +++++-----
 15 files changed, 410 insertions(+), 561 deletions(-)
diff --git a/admin/public/index.html b/admin/public/index.html
index c421724..06bc38a 100644
--- a/admin/public/index.html
+++ b/admin/public/index.html
@@ -15,6 +15,6 @@
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
+    <div id="root" style="height:100%"></div>
   </body>
 </html>
diff --git a/admin/src/component/Main/MainSideMenu/index.tsx b/admin/src/component/Main/MainSideMenu/index.tsx
index f28e420..9e1b90a 100644
--- a/admin/src/component/Main/MainSideMenu/index.tsx
+++ b/admin/src/component/Main/MainSideMenu/index.tsx
@@ -49,5 +49,5 @@ export default function MainSideMenu(props: MainSideMenuProps) {
   }
 
 
-  return <Menu defaultSelectedKeys={["home"]} mode="vertical" items={items} style={style} onClick={navigateByKey}/>;
+  return <Menu defaultSelectedKeys={["home"]} mode="vertical" items={items}  theme="dark" onClick={navigateByKey} style={{height:'100%'}}/>;
 }
diff --git a/admin/src/component/Main/MainTopNav/index.tsx b/admin/src/component/Main/MainTopNav/index.tsx
index eb2250c..cfebca4 100644
--- a/admin/src/component/Main/MainTopNav/index.tsx
+++ b/admin/src/component/Main/MainTopNav/index.tsx
@@ -77,7 +77,8 @@ export default function MainTopNav() {
 
   return (
       <div id="header">
-        <Menu mode="horizontal" theme={"light"} selectedKeys={[]}>
+        <div/>
+        <Menu mode="horizontal" theme={"dark"} selectedKeys={[]} style={{width:'100%'}}>
           <Menu.SubMenu title="源码" icon={<HomeFilled/>} key={"sourceCode"}>
             <Menu.Item icon={<GithubOutlined/>} onClick={() => menuClick('githubSourceCode')}
                        key={"sourceCodeGithub"}>Github</Menu.Item>
diff --git a/admin/src/layout/LoginLayout/index.tsx b/admin/src/layout/LoginLayout/index.tsx
index 1130fbf..5732465 100644
--- a/admin/src/layout/LoginLayout/index.tsx
+++ b/admin/src/layout/LoginLayout/index.tsx
@@ -1,18 +1,37 @@
-import React, {useState} from "react";
-import {Button, Divider, Form, Input, Layout, notification} from "antd";
+import React, { } from "react";
+import { Alert, Button, Divider, Form, Input, Layout, message, notification, Space } from "antd";
 
 import './index.css'
-import {useNavigate} from "react-router-dom";
-import {login} from "../../api/Auth/AuthApi";
+import { login } from "../../api/Auth/AuthApi";
+import WithRouter from "../../router/WithRouter";
+import { RouterProps } from "react-router";
 
-export default function LoginLayout() {
 
-  let [username, setUsername] = useState("")
-  let [password, setPassword] = useState("")
 
-  let navigate = useNavigate()
+interface Props {
+  router: RouterProps
+}
 
-  let userLogin = () => {
+interface State {
+  username: string
+  password: string
+}
+
+class LoginLayout extends React.Component<Props, State> {
+
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      username: '',
+      password: ''
+    }
+  }
+
+
+  // let navigate = useNavigate()
+
+  userLogin = () => {
+    let { username, password } = this.state
     if (username.trim().length === 0 || password.trim().length === 0) {
       notification['error']({
         message: '登录失败',
@@ -22,79 +41,106 @@ export default function LoginLayout() {
     }
 
 
-    login({username, password})
-    .then(resp => {
-      let {data, code, msg} = resp
-      if (code === 0) {
-        localStorage.setItem('token', "Bearer " + data)
-        navigate('/app/home');
-        notification['success']({
-          message: '登录成功',
-          description: '您好，您已经成功登录到SimpleDocker管理界面，祝您使用愉快'
+    login({ username, password })
+      .then(resp => {
+        let { data, code, msg } = resp
+        if (code === 0) {
+          localStorage.setItem('token', "Bearer " + data)
+          //@ts-ignore
+          this.props.router.navigate('/app/home');
+          notification['success']({
+            message: '登录成功',
+            description: '您好，您已经成功登录到SimpleDocker管理界面，祝您使用愉快'
+          });
+          return
+        }
+        notification['error']({
+          message: '登录失败',
+          description: msg
         });
-        return
-      }
-      notification['error']({
-        message: '登录失败',
-        description: msg
-      });
-    })
+      })
+
+  }
+
+  updateUsername = (e: any) => {
+    this.setState({ username: e.target.value })
+  }
 
+  updatePassword = (e: any) => {
+    this.setState({ password: e.target.value })
   }
 
-  let reset = () => {
-    setUsername("")
-    setPassword("")
+  reset = () => {
+    this.setState({ username: '', password: '' })
   }
 
-  return (
-      <Layout style={{minHeight: '100%'}}>
-        <div id="loginPage">
-          <div id="loginForm">
+
+  render() {
+
+    // 如果是开发环境则显示演示账户号码
+    let isDevelopEnv = process.env.NODE_ENV === 'development';
+    let testAccountTipes = isDevelopEnv ?
+      <Alert
+        message="温馨提示"
+        description={"当前环境为开发环境，建议使用演示账号登录(账号: admin 密码: 123456), 如有任何问题可以添加微信 zhoutao825638 或 发送电子邮件 zhoutao825638@vip.qq.com 或 访问 https://gitee.com/taoes_admin/SimpleDocker 提交问题，感谢您的使用!!"}
+        type="warning"
+        showIcon
+        closable
+      /> : undefined
+
+
+    return (
+      <Layout style={{ minHeight: '100%' }}>
+        {testAccountTipes}
+        <div id="loginPage" >
+          <div id="loginForm" className="box p-4">
             <Form
-                name="basic"
-                wrapperCol={{span: 24}}>
+              name="basic"
+
+              wrapperCol={{ span: 24 }}>
 
               <div id="loginTitle">
-                <img src={"/login-icon.png"} style={{height: 30, marginRight: 10}} alt=""/>
-                <h1 style={{textAlign: 'center', fontSize: 30, margin: 0}}>SimpleDocker </h1>
+                <img src={"/login-icon.png"} style={{ height: 30, marginRight: 10 }} alt="" />
+                <h1 style={{ textAlign: 'center', fontSize: 30, margin: 0, fontWeight: 600 }}>SimpleDocker </h1>
               </div>
 
               <Form.Item
-                  label="账 户"
-                  name="username">
-                <Input value={username} onChange={(e) => setUsername(e.target.value)}/>
+                label="账 户"
+                name="username">
+                <Input value={this.state.username} onChange={this.updateUsername} />
               </Form.Item>
 
               <Form.Item
-                  label="密 码"
-                  name="password">
-                <Input.Password value={password} onChange={(e) => setPassword(e.target.value)}/>
+                label="密 码"
+                name="password">
+                <Input.Password value={this.state.password} onChange={this.updatePassword} />
               </Form.Item>
 
-              <div style={{display: 'flex', justifyContent: 'center'}}>
+              <Space style={{ display: 'flex', justifyContent: 'space-around' }}>
 
-                <Button type="primary" htmlType="button" onClick={userLogin}>
+                <Button type="primary" htmlType="button" onClick={this.userLogin}>
                   登录
                 </Button>
 
-                <div style={{margin: 20}}/>
-                <Button danger htmlType="button" onClick={reset}>
+                <Button danger htmlType="button" onClick={this.reset}>
                   重置
                 </Button>
-              </div>
+              </Space>
 
               <div>
                 <Divider orientation="right" plain>
                   <a href="https://gitee.com/taoes_admin/SimpleDocker"
-                     target="_blank"
-                     rel="noreferrer"
-                     style={{color: 'lightgray'}}>源码地址</a>
+                    target="_blank"
+                    rel="noreferrer"
+                    style={{ color: 'lightgray' }}>源码地址</a>
                 </Divider>
               </div>
             </Form>
           </div>
-        </div>
-      </Layout>
-  )
-}
\ No newline at end of file
+        </div >
+      </Layout >
+    )
+  }
+}
+
+export default WithRouter(LoginLayout)
\ No newline at end of file
diff --git a/admin/src/layout/MainLayout/index.tsx b/admin/src/layout/MainLayout/index.tsx
index 2f63f20..801b40e 100644
--- a/admin/src/layout/MainLayout/index.tsx
+++ b/admin/src/layout/MainLayout/index.tsx
@@ -22,8 +22,8 @@ export default function MainLayout() {
           <MainTopNav/>
         </Header>
 
-        <Layout>
-          <Sider trigger={null} collapsible collapsed={mainMenuState} style={{}}>
+        <Layout style={{height:'100%'}}>
+          <Sider trigger={null} collapsible collapsed={mainMenuState} style={{height:'100%'}}>
             <MainSideMenu updateMainMenuState={updateMainMenuState} mainMenuState/>
           </Sider>
 
diff --git a/admin/src/page/ContainerLogPage/index.tsx b/admin/src/page/ContainerLogPage/index.tsx
index c16dcff..71bb53c 100644
--- a/admin/src/page/ContainerLogPage/index.tsx
+++ b/admin/src/page/ContainerLogPage/index.tsx
@@ -32,20 +32,20 @@ class ContainerLogPage extends React.Component<any, any> {
   term: Terminal | null = null
   socket: WebSocket | null = null
 
-  constructor(props: any, context: any) {
-    super(props, context);
+  constructor(props: any) {
+    super(props);
     this.state = {
       containerId: props.router.params.containerId,
       log: [],
-      ws: null
+      ws: `ws://192.168.1.102:3364/api/ws/client/${localStorage.getItem('clientId')}/container/${props.router.params.containerId}/log`
+ 
     }
   }
 
 
   componentDidMount() {
     //  创建日志WS服务
-    let that = this;
-    let websocket = new WebSocket(`ws://192.168.1.102:3364/api/ws/container/${this.state.containerId}/log`);
+    let websocket = new WebSocket(this.state.ws);
     websocket.onopen = function () {
 
     };
@@ -121,7 +121,7 @@ class ContainerLogPage extends React.Component<any, any> {
                     </Space>
                   }/>
 
-          <div id="terminal" style={{width: '100%', height: '80%'}}/>
+          <div id="terminal" style={{width: '100%', height: '100%'}}/>
         </div>
     )
   }
diff --git a/admin/src/page/ContainerTerminal/index.jsx b/admin/src/page/ContainerTerminal/index.jsx
index e20ccf7..de3b3dc 100644
--- a/admin/src/page/ContainerTerminal/index.jsx
+++ b/admin/src/page/ContainerTerminal/index.jsx
@@ -11,7 +11,6 @@ import {
   ReloadOutlined,
   ArrowUpOutlined,
   ArrowDownOutlined,
-  FileZipOutlined,
   HomeOutlined,
   DeleteOutlined
 } from "@ant-design/icons";
@@ -46,7 +45,8 @@ class ContainerTerminal extends React.Component {
     this.clientId = props.router.params.clientId;
     this.socket =null
     this.term = null;
-    this.socketUrl = `ws://192.168.1.102:3364/api/ws/container/${this.containerId}/terminal`
+
+    this.socketUrl = `ws://192.168.1.102:3364/api/ws/client/${localStorage.getItem('clientId')}/container/${this.containerId}/terminal`
   }
 
   componentDidMount() {
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/controller/MonitorController.java b/backend-src/src/main/java/com/taoes/simpledocker/controller/MonitorController.java
index c8bb09e..4089f5e 100644
--- a/backend-src/src/main/java/com/taoes/simpledocker/controller/MonitorController.java
+++ b/backend-src/src/main/java/com/taoes/simpledocker/controller/MonitorController.java
@@ -1,12 +1,18 @@
 package com.taoes.simpledocker.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.sun.xml.internal.ws.server.MonitorRootService;
 import com.taoes.simpledocker.model.ResponseModel;
+import com.taoes.simpledocker.model.Role;
 import com.taoes.simpledocker.service.OperateRecordService;
 import io.swagger.annotations.Api;
+
 import java.util.List;
+
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -16,16 +22,17 @@ import org.springframework.web.bind.annotation.RestController;
 @RequiredArgsConstructor
 public class MonitorController {
 
-  private final OperateRecordService recordService;
+    private final OperateRecordService recordService;
+
 
-  @GetMapping("/container")
-  public ResponseModel<List> container() {
+    @PostMapping("/container")
+    public ResponseModel<List> container() {
 
-    return null;
-  }
+        return null;
+    }
 
-  @GetMapping("/image")
-  public ResponseModel<List> image() {
-    return null;
-  }
+    @GetMapping("/image")
+    public ResponseModel<List> image() {
+        return null;
+    }
 }
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerFileWebSocket.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerFileWebSocket.java
index a0822d8..75a6ba6 100644
--- a/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerFileWebSocket.java
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerFileWebSocket.java
@@ -4,6 +4,7 @@ import com.Ostermiller.util.CircularByteBuffer;
 import com.github.dockerjava.api.DockerClient;
 import com.taoes.simpledocker.config.DockerClientFactory;
 import com.taoes.simpledocker.ws.callback.TerminalResultCallback;
+
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Map;
@@ -11,12 +12,14 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.PostConstruct;
 import javax.websocket.OnClose;
 import javax.websocket.OnError;
 import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
+
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,106 +33,53 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component
-@ServerEndpoint("/api/ws/container/{containerId}/fs")
-public class ContainerFileWebSocket {
-
-
-  private static DockerClientFactory clientFactory;
-
-  @Autowired
-  public void setChatService(DockerClientFactory clientFactory) {
-    ContainerFileWebSocket.clientFactory = clientFactory;
-  }
-
-  // 当前在线数
-  private static final AtomicInteger OnlineCount = new AtomicInteger(0);
-
-  // Session保存
-  private static final Set<Session> SessionSet = new CopyOnWriteArraySet<Session>();
-
-  /**
-   * 输入流，用于接收WebSocket的输入，转发给 ExecStartCmd
-   */
-  private static final Map<String, InputStream> ins = new ConcurrentHashMap<>();
-
-  private static final Map<String, OutputStream> outs = new ConcurrentHashMap<>();
+@ServerEndpoint("/api/ws/client/{clientId}/container/{containerId}/fs")
+public class ContainerFileWebSocket extends AbstractWebSocket {
 
 
-  @OnOpen
-  @SneakyThrows
-  public void onOpen(Session session) {
-    final Map<String, String> parameters = session.getPathParameters();
-    SessionSet.add(session);
-    OnlineCount.incrementAndGet();
+    private static DockerClientFactory clientFactory;
 
-    final String containerId = parameters.get("containerId");
-    final String clientId = parameters.get("clientId");
-
-    final DockerClient client = clientFactory.get(clientId);
-
-    // 创建命令
-    final String execId = client.execCreateCmd(containerId)
-        .withCmd("sh")
-        .withAttachStdin(true)
-        .withAttachStdout(true)
-        .withAttachStderr(true)
-        .withPrivileged(true)
-        .withTty(true)
-        .exec().getId();
-
-    // 循环缓冲区
-    CircularByteBuffer cbb = new CircularByteBuffer();
-    final InputStream in = cbb.getInputStream();
-    final OutputStream out = cbb.getOutputStream();
-
-    ins.put(session.getId(), in);
-    outs.put(session.getId(), out);
-
-    // 执行命令
-    client.execStartCmd(execId)
-        .withStdIn(in)
-        .exec(new TerminalResultCallback(session));
-  }
-
-  /**
-   * Session连接关闭
-   */
-  @OnClose
-  @SneakyThrows
-  public void onClose(Session session) {
-    SessionSet.remove(session);
-    try (InputStream stream = ins.get(session.getId())) {
-      if (stream != null && session.isOpen()) {
-        stream.close();
-      }
-      ins.remove(session.getId());
+    @Autowired
+    public void setChatService(DockerClientFactory clientFactory) {
+        ContainerFileWebSocket.clientFactory = clientFactory;
     }
 
-    try (OutputStream stream = outs.get(session.getId())) {
-      if (stream != null && session.isOpen()) {
-        stream.close();
-      }
-      outs.remove(session.getId());
+    @PostConstruct
+    public void printWsStartInfo() {
+        log.info("文件管理WebSocket初始化完成！");
     }
 
-    OnlineCount.decrementAndGet();
-  }
 
-  /**
-   * 收到客户端消息后写入输出流
-   */
-  @SneakyThrows
-  @OnMessage
-  public void onMessage(String message, Session session) {
-    final String id = session.getId();
-    outs.get(id).write(message.getBytes());
-  }
-
-  /**
-   * 出现错误
-   */
-  @OnError
-  public void onError(Session session, Throwable error) {
-    log.error("发生错误：{}，Session ID： {}", error.getMessage(), session.getId());
-  }
+    @OnOpen
+    @SneakyThrows
+    public void onOpen(Session session) {
+        final Map<String, String> parameters = session.getPathParameters();
+
+        // todo 燕归来兮 检查参数
+        final String containerId = parameters.get("containerId");
+        final String clientId = parameters.get("clientId");
+
+        final DockerClient client = clientFactory.get(clientId);
+
+        try {
+            // 创建命令
+            final String execId = client.execCreateCmd(containerId)
+                    .withCmd("sh")
+                    .withAttachStdin(true)
+                    .withAttachStdout(true)
+                    .withAttachStderr(true)
+                    .withPrivileged(true)
+                    .withTty(true)
+                    .exec().getId();
+
+
+            // 执行命令
+            final TerminalResultCallback callback = client.execStartCmd(execId)
+                    .withStdIn(this.getInput(session))
+                    .exec(new TerminalResultCallback(session));
+            this.addCallback(session, callback);
+        } catch (Exception e) {
+            this.onClose(session);
+        }
+    }
 }
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerLogWebSocket.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerLogWebSocket.java
index 07887c3..9c01c6d 100644
--- a/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerLogWebSocket.java
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerLogWebSocket.java
@@ -5,6 +5,7 @@ import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
 import com.taoes.simpledocker.config.DockerClientFactory;
 import com.taoes.simpledocker.ws.callback.ContainerLogResultCallback;
+
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -16,6 +17,7 @@ import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
+
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +31,8 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component
-@ServerEndpoint("/api/ws/container/{cId}/log")
-public class ContainerLogWebSocket {
+@ServerEndpoint("/api/ws/client/{clientId}/container/{containerId}/log")
+public class ContainerLogWebSocket extends AbstractWebSocket {
 
     private static DockerClientFactory clientFactory;
 
@@ -39,88 +41,33 @@ public class ContainerLogWebSocket {
         ContainerLogWebSocket.clientFactory = clientFactory;
     }
 
-    // 当前在线数
-    private final static AtomicInteger OnlineCount = new AtomicInteger(0);
-
-    private Map<String, ResultCallback<Frame>> callbackMap = new ConcurrentHashMap<>();
-
     @PostConstruct
-    public void init() {
-        log.info("容器日志 WS 初始化 OK！");
+    public void printWsStartInfo() {
+        log.info("容器日志WebSocket初始化完成！");
     }
 
+
     @OnOpen
     public void onOpen(Session session) {
-        final int i = OnlineCount.incrementAndGet();
-        log.info("有连接接入，当前连接数为：{}", i);
-
         final Map<String, String> param = session.getPathParameters();
-        final DockerClient client = clientFactory.get("DEFAULT2");
-        final ResultCallback<Frame> callback = client
-            .logContainerCmd(param.get("cId"))
-            .withFollowStream(true)
-            .withStdErr(true)
-            .withStdOut(true)
-            .withTail(1000)
-            .exec(new ContainerLogResultCallback(session));
-        callbackMap.put(session.getId(), callback);
-    }
-
-    /**
-     * 连接关闭调用的方法
-     */
-    @OnClose
-    @SneakyThrows
-    public void onClose(Session session) {
-        int cnt = OnlineCount.decrementAndGet();
-        final ResultCallback<Frame> resultCallback = callbackMap.get(session.getId());
-        if (resultCallback != null && session.isOpen()) { resultCallback.close(); }
-        log.info("有连接关闭，当前连接数为：{}", cnt);
-    }
-
-    /**
-     * 收到客户端消息后调用的方法
-     *
-     * @param message 客户端发送过来的消息
-     */
-    @OnMessage
-    public void onMessage(String message, Session session) {
-        System.out.println("ContainerLogWebSocket.onMessage");
-        SendMessage(session, "收到消息，消息内容：" + message);
-
-    }
 
-    /**
-     * 出现错误
-     *
-     * @param session
-     * @param error
-     */
-    @OnError
-    @SneakyThrows
-    public void onError(Session session, Throwable error) {
-        System.out.println("ContainerLogWebSocket.onError");
-        log.error("发生错误：{}，Session ID： {}", error.getMessage(), session.getId());
+        // todo 燕归来兮 检查参数
+        final String containerId = param.get("containerId");
+        final String clientId = param.get("clientId");
 
-        final ResultCallback<Frame> resultCallback = callbackMap.get(session.getId());
-        if (resultCallback != null && session.isOpen()) { resultCallback.close(); }
-    }
-
-    /**
-     * 发送消息
-     *
-     * @param session
-     * @param message
-     */
-    public void SendMessage(Session session, String message) {
-        if (!session.isOpen()) {
-            return;
-        }
         try {
-            session.getBasicRemote().sendText(message);
-        } catch (IOException e) {
-            log.error("发送消息出错：{}", e.getMessage());
+            final DockerClient client = clientFactory.get(clientId);
+            this.init(session);
+            final ResultCallback.Adapter<Frame> callback = client
+                    .logContainerCmd(containerId)
+                    .withFollowStream(true)
+                    .withStdErr(true)
+                    .withStdOut(true)
+                    .withTail(1000)
+                    .exec(new ContainerLogResultCallback(session));
+            this.addCallback(session, callback);
+        } catch (Exception e) {
+            this.onClose(session);
         }
     }
-
 }
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerTerminalWebSocket.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerTerminalWebSocket.java
index 1aa0823..751c783 100644
--- a/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerTerminalWebSocket.java
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerTerminalWebSocket.java
@@ -1,19 +1,20 @@
 package com.taoes.simpledocker.ws;
 
-import com.Ostermiller.util.CircularByteBuffer;
 import com.github.dockerjava.api.DockerClient;
 import com.taoes.simpledocker.config.DockerClientFactory;
+import com.taoes.simpledocker.service.ConfigService;
 import com.taoes.simpledocker.ws.callback.TerminalResultCallback;
+
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import javax.websocket.OnClose;
+import javax.annotation.PostConstruct;
 import javax.websocket.OnError;
 import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
+
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,108 +28,64 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component
-@ServerEndpoint("/api/ws/container/{containerId}/terminal")
-public class ContainerTerminalWebSocket {
-
-
-  private static DockerClientFactory clientFactory;
-
-  @Autowired
-  public void setChatService(DockerClientFactory clientFactory) {
-    ContainerTerminalWebSocket.clientFactory = clientFactory;
-  }
-
-
-  /**
-   * 输入流，用于接收WebSocket的输入，转发给 ExecStartCmd
-   */
-  private static final Map<String, InputStream> ins = new ConcurrentHashMap<>();
-
-  private static final Map<String, OutputStream> outs = new ConcurrentHashMap<>();
-
-  private static final Map<String, TerminalResultCallback> backs = new ConcurrentHashMap<>();
-
-
-  @OnOpen
-  @SneakyThrows
-  public void onOpen(Session session) {
-    final Map<String, String> parameters = session.getPathParameters();
-
-    final String containerId = parameters.get("containerId");
-    final DockerClient client = clientFactory.get("DEFAULT2");
-
-    // 创建命令
-    final String execId = client.execCreateCmd(containerId)
-        .withCmd("sh")
-        .withAttachStdin(true)
-        .withAttachStdout(true)
-        .withAttachStderr(true)
-        .withTty(true)
-        .exec().getId();
-
-    // 循环缓冲区
-    CircularByteBuffer cbb = new CircularByteBuffer();
-    final InputStream in = cbb.getInputStream();
-    final OutputStream out = cbb.getOutputStream();
-
-    ins.put(session.getId(), in);
-    outs.put(session.getId(), out);
-
-    // 执行命令
-    final TerminalResultCallback callback = client.execStartCmd(execId)
-        .withStdIn(in)
-        .withTty(true)
-        .exec(new TerminalResultCallback(session));
-    backs.put(session.getId(), callback);
-  }
-
-  /**
-   * Session连接关闭
-   */
-  @OnClose
-  @SneakyThrows
-  public void onClose(Session session) {
-    try (TerminalResultCallback callback = backs.get(session.getId());
-        InputStream inputStream = ins.get(session.getId());
-        OutputStream outputStream = outs.get(session.getId());
-    ) {
-
-      ins.remove(session.getId());
-      outs.remove(session.getId());
-      session.close();
+@ServerEndpoint("/api/ws/client/{clientId}/container/{containerId}/terminal")
+public class ContainerTerminalWebSocket extends AbstractWebSocket {
+
+    private static DockerClientFactory clientFactory;
+
+    private static ConfigService configService;
+
+
+    @Autowired
+    public void setChatService(DockerClientFactory clientFactory) {
+        ContainerTerminalWebSocket.clientFactory = clientFactory;
+    }
+
+    @Autowired
+    private void setConfigService(ConfigService configService) {
+        ContainerTerminalWebSocket.configService = configService;
     }
 
 
-  }
-
-  /**
-   * 收到客户端消息后写入输出流
-   */
-  @SneakyThrows
-  @OnMessage
-  public void onMessage(String message, Session session) {
-    final String id = session.getId();
-    outs.get(id).write(message.getBytes());
-  }
-
-  /**
-   * 出现错误
-   */
-  @OnError
-  @SneakyThrows
-  public void onError(Session session, Throwable error) {
-    log.error("发生错误：{}，Session ID： {}", error.getMessage(), session.getId());
-
-    try (TerminalResultCallback callback = backs.get(session.getId());
-        InputStream inputStream = ins.get(session.getId());
-        OutputStream outputStream = outs.get(session.getId());
-    ) {
-
-      ins.remove(session.getId());
-      outs.remove(session.getId());
-      session.close();
+    @PostConstruct
+    public void printWsStartInfo() {
+        log.info("容器终端WebSocket初始化完成！");
     }
-  }
 
 
+    @OnOpen
+    @SneakyThrows
+    public void onOpen(Session session) {
+        final Map<String, String> parameters = session.getPathParameters();
+
+        // TODO 燕归来兮 检查参数
+        final String containerId = parameters.get("containerId");
+        final String clientId = parameters.get("clientId");
+
+        this.init(session);
+        final TerminalResultCallback callback = new TerminalResultCallback(session);
+
+        try {
+            final DockerClient client = clientFactory.get(clientId);
+
+            // 创建命令
+            final String execId = client.execCreateCmd(containerId)
+                    .withCmd("sh")
+                    .withAttachStdin(true)
+                    .withAttachStdout(true)
+                    .withAttachStderr(true)
+                    .withTty(true)
+                    .exec().getId();
+
+            // 执行命令
+            client.execStartCmd(execId)
+                    .withStdIn(this.getInput(session))
+                    .withTty(true)
+                    .exec(callback);
+
+            this.addCallback(session, callback);
+        } catch (Exception e) {
+            this.onClose(session);
+        }
+    }
 }
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/ImagePullWebSocket.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/ImagePullWebSocket.java
index 25af551..cde39dc 100644
--- a/backend-src/src/main/java/com/taoes/simpledocker/ws/ImagePullWebSocket.java
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/ImagePullWebSocket.java
@@ -15,11 +15,14 @@ import javax.websocket.OnOpen;
 import javax.websocket.Session;
 import javax.websocket.server.ServerEndpoint;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.PullResponseItem;
 import com.taoes.simpledocker.config.DockerClientFactory;
 import com.taoes.simpledocker.utils.JsonUtils;
+import com.taoes.simpledocker.ws.callback.AbstractResultCallback;
+import com.taoes.simpledocker.ws.callback.ImagePullCallback;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,140 +38,49 @@ import org.springframework.util.StringUtils;
 @Slf4j
 @Component
 @ServerEndpoint("/api/ws/image/pull")
-public class ImagePullWebSocket {
+public class ImagePullWebSocket extends AbstractWebSocket {
 
     private static DockerClientFactory clientFactory;
 
+
     @Autowired
     public void setChatService(DockerClientFactory clientFactory) {
         ImagePullWebSocket.clientFactory = clientFactory;
     }
 
-    // 当前在线数
-    private static final AtomicInteger OnlineCount = new AtomicInteger(0);
-
-    // Session保存
-    private static final CopyOnWriteArraySet<Session> SessionSet = new CopyOnWriteArraySet<Session>();
-
-    // 回调通知函数
-    private static final Map<String, ResultCallback<PullResponseItem>> callbackMap = new ConcurrentHashMap<>();
 
     @PostConstruct
-    public void init() {
+    public void printWsStartInfo() {
         log.info("镜像拉取WebSocket初始化完成！");
     }
 
     @OnOpen
     public void onOpen(Session session) {
-        SessionSet.add(session);
-        OnlineCount.incrementAndGet();
+        this.init(session);
 
-        final String imageTag = session.getQueryString().split("=")[1];
-        if (!StringUtils.hasText(imageTag)) {
-            sendMessage(session, "无效的标签ID，请正确输入后重试");
+        final String imageTag = this.parseParams(session).get("imageTag");
+        if (StrUtil.isBlank(imageTag)) {
+            write(session,"无效的标签ID，请正确输入后重试".getBytes());
+            this.onClose(session);
             return;
         }
-        final DockerClient client = clientFactory.get();
-        final ResultCallback callback = new ResultCallback<PullResponseItem>() {
-            @Override
-            public void onStart(Closeable closeable) {}
 
-            @Override
-            public void onNext(PullResponseItem object) {
-                sendMessage(session, JsonUtils.toJsonString(object));
-            }
 
-            @Override
-            public void onError(Throwable throwable) {
-                try {
-                    sendMessage(session, "拉取失败：" + throwable.getMessage());
-                    session.close();
-                } catch (Exception e) {
-                    log.error("发生异常", e);
-                }
-            }
-
-            @Override
-            public void onComplete() {
-                try {
-                    sendMessage(session, "镜像拉取完成");
-                    session.close();
-                } catch (IOException e) {
-                    log.error("发生异常", e);
-                }
-            }
+        final DockerClient client = clientFactory.get();
+        final AbstractResultCallback<PullResponseItem> callback = new ImagePullCallback(session);
 
-            @Override
-            public void close() throws IOException {
-                try {
-                    session.close();
-                } catch (IOException e) {
-                    log.error("发生异常", e);
-                }
+        try {
+            final String[] images = imageTag.split(":");
+            if (images.length >= 2) {
+                client.pullImageCmd(imageTag).exec(callback);
+            } else {
+                client.pullImageCmd(images[0]).withTag("latest").exec(callback);
             }
-        };
-        String[] images = imageTag.split(":");
-        if (images.length >= 2) {
-            client.pullImageCmd(imageTag).exec(callback);
-        } else {
-            client.pullImageCmd(images[0]).withTag("latest").exec(callback);
+            this.addCallback(session, callback);
+        } catch (Exception e) {
+            this.onClose(session);
         }
-        callbackMap.put(session.getId(), callback);
     }
 
-    /**
-     * 连接关闭调用的方法
-     */
-    @OnClose
-    @SneakyThrows
-    public void onClose(Session session) {
-        SessionSet.remove(session);
-        final String sessionId = session.getId();
-        OnlineCount.decrementAndGet();
-        final ResultCallback<PullResponseItem> resultCallback = callbackMap.get(sessionId);
-        if (resultCallback != null && session.isOpen()) {resultCallback.close();}
-        callbackMap.remove(sessionId);
-    }
 
-    /**
-     * 收到客户端消息后调用的方法
-     *
-     * @param message 客户端发送过来的消息
-     */
-    @OnMessage
-    public void onMessage(String message, Session session) {}
-
-    /**
-     * 出现错误
-     *
-     * @param session
-     * @param error
-     */
-    @OnError
-    @SneakyThrows
-    public void onError(Session session, Throwable error) {
-        final String sessionId = session.getId();
-        log.error("发生错误：{}，Session ID： {}", error.getMessage(), sessionId);
-        ResultCallback<PullResponseItem> callback = callbackMap.get(sessionId);
-        if (callback != null && session.isOpen()) {callback.close();}
-        callbackMap.remove(sessionId);
-    }
-
-    /**
-     * 发送消息
-     *
-     * @param session 回话
-     * @param message 消息内容
-     */
-    public void sendMessage(Session session, String message) {
-        if (!session.isOpen()) {
-            log.error("Session 已关闭，停止发送消息");
-            return;
-        }
-        try {
-            session.getBasicRemote().sendText(message);
-        } catch (IOException e) {
-            log.error("发送消息出错：{}", e.getMessage());
-        }
-    }
 }
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/AbstractResultCallback.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/AbstractResultCallback.java
index da451e9..6bc79d2 100644
--- a/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/AbstractResultCallback.java
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/AbstractResultCallback.java
@@ -2,29 +2,68 @@ package com.taoes.simpledocker.ws.callback;
 
 import com.github.dockerjava.api.async.ResultCallback;
 import com.github.dockerjava.api.model.Frame;
+
+import java.io.Closeable;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import javax.websocket.Session;
+
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public abstract class AbstractResultCallback  extends ResultCallback.Adapter<Frame>{
-
-  /**
-   * 发送消息
-   */
-  public void sendMessage(Session session, String message) {
-    try {
-      session.getBasicRemote().sendText(message);
-    } catch (Exception e) {
-      log.error("发送消息出错：{}", e.getMessage());
+public abstract class AbstractResultCallback<T> extends ResultCallback.Adapter<T> {
+
+
+    private final Session session;
+
+    private final String name;
+
+    private Closeable closeable;
+
+
+    public AbstractResultCallback(String name, Session session) {
+        this.name = name;
+        this.session = session;
+    }
+
+    /**
+     * 发送消息
+     */
+    public void sendMessage(String message) {
+        try {
+            log.debug("接收到消息:{}",message);
+            this.session.getBasicRemote().sendText(message);
+        } catch (Exception e) {
+            log.error("发送消息出错：{}", e.getMessage());
+        }
+    }
+
+    public void sendMessage(ByteBuffer message) {
+        try {
+            log.debug("接收到消息:{}",message.toString());
+            this.session.getBasicRemote().sendBinary(message);
+        } catch (Exception e) {
+            log.error("发送消息出错：{}", e.getMessage());
+        }
+    }
+
+
+    @SneakyThrows
+    @Override
+    public void onStart(Closeable closeable) {
+        log.info("WebSocket:{}服务连接成功,id={}", name, session.getId());
+        this.closeable = closeable;
     }
-  }
 
-  public void sendMessage(Session session, ByteBuffer message) {
-    try {
-      session.getBasicRemote().sendBinary(message);
-    } catch (Exception e) {
-      log.error("发送消息出错：{}", e.getMessage());
+    @SneakyThrows
+    @Override
+    public void close() {
+        if (closeable != null) {
+            this.closeable.close();
+        }
+        if (this.session != null && this.session.isOpen()) {
+            this.session.close();
+        }
     }
-  }
 }
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ContainerLogResultCallback.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ContainerLogResultCallback.java
index 9099f69..4216a83 100644
--- a/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ContainerLogResultCallback.java
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ContainerLogResultCallback.java
@@ -1,52 +1,47 @@
 package com.taoes.simpledocker.ws.callback;
 
 import com.github.dockerjava.api.model.Frame;
+
 import java.io.Closeable;
 import java.io.IOException;
 import javax.websocket.Session;
+
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class ContainerLogResultCallback extends AbstractResultCallback {
-
-  private final Session session;
-
-  public ContainerLogResultCallback(Session session) {
-    this.session = session;
-  }
-
-
-  @SneakyThrows
-  @Override
-  public void onStart(Closeable closeable) {
-  }
-
-  @SneakyThrows
-  @Override
-  public void onNext(Frame object) {
-    final byte[] payload = object.getPayload();
-    sendMessage(session, new String(payload) + "\r\n");
-
-  }
-
-  @Override
-  @SneakyThrows
-  public void onError(Throwable throwable) {
-    sendMessage(session, "\u001B[31m 出现异常:" + throwable.getMessage() + "\u001B[0m \n");
-    session.close();
-  }
-
-  @Override
-  @SneakyThrows
-  public void onComplete() {
-    sendMessage(session, "\u001B[31m 终端服务已关闭，如需再次进入请尝试刷新或者在容器管理页进入  \u001B[0m");
-    session.close();
-  }
-
-  @Override
-  @SneakyThrows
-  public void close() throws IOException {
-    session.close();
-  }
+public class ContainerLogResultCallback extends AbstractResultCallback<Frame> {
+
+
+    public ContainerLogResultCallback(Session session) {
+        super("容器日志", session);
+    }
+
+
+    @SneakyThrows
+    @Override
+    public void onStart(Closeable closeable) {
+    }
+
+    @SneakyThrows
+    @Override
+    public void onNext(Frame object) {
+        final byte[] payload = object.getPayload();
+        sendMessage(new String(payload) + "\r\n");
+
+    }
+
+    @Override
+    @SneakyThrows
+    public void onError(Throwable throwable) {
+        sendMessage("\u001B[31m 出现异常:" + throwable.getMessage() + "\u001B[0m \n");
+        this.close();
+    }
+
+    @Override
+    @SneakyThrows
+    public void onComplete() {
+        sendMessage("\u001B[31m 容器日志服务已关闭，如需再次进入请尝试刷新或者重新进入后尝试  \u001B[0m");
+        this.close();
+    }
 }
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/TerminalResultCallback.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/TerminalResultCallback.java
index ded5bf7..15f21ad 100644
--- a/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/TerminalResultCallback.java
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/TerminalResultCallback.java
@@ -1,64 +1,59 @@
 package com.taoes.simpledocker.ws.callback;
 
 import com.github.dockerjava.api.model.Frame;
+
 import java.io.Closeable;
-import java.io.IOException;
+
 import java.nio.ByteBuffer;
 import javax.websocket.Session;
+
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class TerminalResultCallback extends AbstractResultCallback {
+public class TerminalResultCallback extends AbstractResultCallback<Frame> {
 
-  private final Session session;
 
-  public TerminalResultCallback(Session session) {
-    this.session = session;
-  }
+    public TerminalResultCallback(Session session) {
+        super("容器终端", session);
+    }
 
-  private final static String BANNER_CONTENT =
+    private final static String BANNER_CONTENT =
             "\033[31m   _____ _                 __        ____             __\r\n"
-          + "\033[31m  / ___/(_)___ ___  ____  / /__     / __ \\____  _____/ /_____  _____\r\n"
-          + "\033[31m  \\__ \\/ / __ `__ \\/ __ \\/ / _ \\   / / / / __ \\/ ___/ //_/ _ \\/ ___/\r\n"
-          + "\033[31m ___/ / / / / / / / /_/ / /  __/  / /_/ / /_/ / /__/ ,< /  __/ /    \r\n"
-          + "\033[31m/____/_/_/ /_/ /_/ .___/_/\\___/  /_____/\\____/\\___/_/|_|\\___/_/     \r\n"
-          + "\033[31m                /_/                               \t\t\t\t\t   \r\n\r\n"
-          + "\033[32m 欢迎您使用 SimpleDocker, 容器终端已为您连接成功 ...............  \033[0m \r\n \r\n "
-          + "\033[37m 程序默认使用 \033[32m /bin/sh \033[0m 连接，如有必要请手动切换到 /bin/bash 或者其他 shell 环境  \033[0m \r\n \r\n"
-          + "\033[37m 如遇BUG或者Issue 欢迎访问 https://github.com/taoes  或者  https://gitee.com/taoes_admin  联系作者  \033[0m \r\n";
-
-  @SneakyThrows
-  @Override
-  public void onStart(Closeable closeable) {
-    sendMessage(session, BANNER_CONTENT);
-  }
-
-  @SneakyThrows
-  @Override
-  public void onNext(Frame object) {
-    sendMessage(session, ByteBuffer.wrap(object.getPayload()));
-  }
-
-  @Override
-  @SneakyThrows
-  public void onError(Throwable throwable) {
-    sendMessage(session, "\u001B[31m 出现异常:" + throwable.getMessage() + "\u001B[0m \n");
-    session.close();
-  }
-
-  @Override
-  @SneakyThrows
-  public void onComplete() {
-    sendMessage(session, "\u001B[31m 终端服务已关闭，如需再次进入请尝试刷新或者在容器管理页进入  \u001B[0m");
-    session.close();
-  }
-
-  @Override
-  @SneakyThrows
-  public void close() throws IOException {
-    session.close();
-  }
+                    + "\033[31m  / ___/(_)___ ___  ____  / /__     / __ \\____  _____/ /_____  _____\r\n"
+                    + "\033[31m  \\__ \\/ / __ `__ \\/ __ \\/ / _ \\   / / / / __ \\/ ___/ //_/ _ \\/ ___/\r\n"
+                    + "\033[31m ___/ / / / / / / / /_/ / /  __/  / /_/ / /_/ / /__/ ,< /  __/ /    \r\n"
+                    + "\033[31m/____/_/_/ /_/ /_/ .___/_/\\___/  /_____/\\____/\\___/_/|_|\\___/_/     \r\n"
+                    + "\033[31m                /_/                               \t\t\t\t\t   \r\n\r\n"
+                    + "\033[32m 欢迎您使用 SimpleDocker, 容器终端已为您连接成功 ...............  \033[0m \r\n \r\n "
+                    + "\033[37m 程序默认使用 \033[32m /bin/sh \033[0m 连接，如有必要请手动切换到 /bin/bash 或者其他 shell 环境  \033[0m \r\n \r\n"
+                    + "\033[37m 如遇BUG或者Issue 欢迎访问 https://github.com/taoes  或者  https://gitee.com/taoes_admin  联系作者  \033[0m \r\n";
+
+    @SneakyThrows
+    @Override
+    public void onStart(Closeable closeable) {
+        sendMessage(BANNER_CONTENT);
+    }
+
+    @SneakyThrows
+    @Override
+    public void onNext(Frame object) {
+        sendMessage(ByteBuffer.wrap(object.getPayload()));
+    }
+
+    @Override
+    @SneakyThrows
+    public void onError(Throwable throwable) {
+        sendMessage("\u001B[31m 出现异常:" + throwable.getMessage() + "\u001B[0m \n");
+        this.close();
+    }
+
+    @Override
+    @SneakyThrows
+    public void onComplete() {
+        sendMessage("\u001B[31m 终端服务已关闭，如需再次进入请尝试刷新或者在容器管理页进入  \u001B[0m");
+        this.close();
+    }
 
 
 }
-- 
Gitee


From 91f635c16a17db36679d4d675879c5456bcc0faf Mon Sep 17 00:00:00 2001
From: yan <zhoutao825638@vip.qq.com>
Date: Sun, 24 Jul 2022 02:44:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96WS=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E4=BB=A5=E5=8F=8A=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simpledocker/service/MonitorService.java  |  13 ++
 .../service/imple/MonitorServiceImpl.java     |  17 ++
 .../simpledocker/ws/AbstractSocketStream.java |  85 ++++++++++
 .../simpledocker/ws/AbstractWebSocket.java    | 137 +++++++++++++++
 .../ws/ContainerMonitorWebSocket.java         |  59 +++++++
 .../ws/ContainerStatWebSocket.java            | 156 ------------------
 .../ws/callback/ContainerMonitorCallback.java |  49 ++++++
 .../ws/callback/ImagePullCallback.java        |  44 +++++
 8 files changed, 404 insertions(+), 156 deletions(-)
 create mode 100644 backend-src/src/main/java/com/taoes/simpledocker/service/MonitorService.java
 create mode 100644 backend-src/src/main/java/com/taoes/simpledocker/service/imple/MonitorServiceImpl.java
 create mode 100644 backend-src/src/main/java/com/taoes/simpledocker/ws/AbstractSocketStream.java
 create mode 100644 backend-src/src/main/java/com/taoes/simpledocker/ws/AbstractWebSocket.java
 create mode 100644 backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerMonitorWebSocket.java
 delete mode 100644 backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerStatWebSocket.java
 create mode 100644 backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ContainerMonitorCallback.java
 create mode 100644 backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ImagePullCallback.java

diff --git a/backend-src/src/main/java/com/taoes/simpledocker/service/MonitorService.java b/backend-src/src/main/java/com/taoes/simpledocker/service/MonitorService.java
new file mode 100644
index 0000000..931bb0b
--- /dev/null
+++ b/backend-src/src/main/java/com/taoes/simpledocker/service/MonitorService.java
@@ -0,0 +1,13 @@
+package com.taoes.simpledocker.service;
+
+import java.util.List;
+
+/**
+ * 监控服务
+ *
+ * @author zhoutao825638@vip.qq.com
+ */
+public interface MonitorService {
+
+
+}
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/service/imple/MonitorServiceImpl.java b/backend-src/src/main/java/com/taoes/simpledocker/service/imple/MonitorServiceImpl.java
new file mode 100644
index 0000000..b759781
--- /dev/null
+++ b/backend-src/src/main/java/com/taoes/simpledocker/service/imple/MonitorServiceImpl.java
@@ -0,0 +1,17 @@
+package com.taoes.simpledocker.service.imple;
+
+
+import com.taoes.simpledocker.config.DockerClientFactory;
+import com.taoes.simpledocker.service.MonitorService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MonitorServiceImpl implements MonitorService {
+
+    private final DockerClientFactory clientFactory;
+
+}
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/AbstractSocketStream.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/AbstractSocketStream.java
new file mode 100644
index 0000000..d8c6338
--- /dev/null
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/AbstractSocketStream.java
@@ -0,0 +1,85 @@
+package com.taoes.simpledocker.ws;
+
+import com.Ostermiller.util.CircularByteBuffer;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.websocket.Session;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 双向输入输出流
+ */
+@Slf4j
+public abstract class AbstractSocketStream {
+
+    private static final Map<String, InputStream> ins = new ConcurrentHashMap<>();
+
+    private static final Map<String, OutputStream> outs = new ConcurrentHashMap<>();
+
+
+    public void initStream(Session session) {
+        // 循环缓冲区
+        final CircularByteBuffer cbb = new CircularByteBuffer();
+        final InputStream in = cbb.getInputStream();
+        final OutputStream out = cbb.getOutputStream();
+
+        ins.put(session.getId(), in);
+        outs.put(session.getId(), out);
+    }
+
+    @SneakyThrows
+    public void write(Session session, byte[] data) {
+        if (session == null || !session.isOpen()) {
+            String sessionId = Optional.ofNullable(session).map(Session::getId).orElse("未知会话ID");
+            log.error("回话:{}已关闭，停止写入数据", sessionId);
+            return;
+        }
+        final String sessionId = session.getId();
+        final OutputStream stream = outs.get(sessionId);
+        if (stream == null) {
+            return;
+        }
+        stream.write(data);
+    }
+
+
+    /**
+     * 关闭与Session关联的输入输出流
+     *
+     * @param session 回话
+     */
+    protected void closeStream(Session session) {
+        if (session == null) {
+            return;
+        }
+        try (InputStream stream = ins.get(session.getId())) {
+            if (stream != null && session.isOpen()) {
+                stream.close();
+            }
+
+        } catch (Exception ignore) {
+        } finally {
+            ins.remove(session.getId());
+        }
+
+        try (OutputStream stream = outs.get(session.getId())) {
+            if (stream != null && session.isOpen()) {
+                stream.close();
+            }
+            outs.remove(session.getId());
+        } catch (Exception ignore) {
+        } finally {
+            ins.remove(session.getId());
+        }
+    }
+
+
+    protected InputStream getInput(Session session) {
+        return ins.get(session.getId());
+    }
+}
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/AbstractWebSocket.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/AbstractWebSocket.java
new file mode 100644
index 0000000..e0462d0
--- /dev/null
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/AbstractWebSocket.java
@@ -0,0 +1,137 @@
+package com.taoes.simpledocker.ws;
+
+
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
+import com.github.dockerjava.api.async.ResultCallbackTemplate;
+import com.google.common.collect.Maps;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.Session;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Slf4j
+public abstract class AbstractWebSocket extends AbstractSocketStream {
+
+    private static final Set<Session> sessionSet = new HashSet<>();
+
+    private static final Map<String, Session> idAndSessionGroup = Maps.newHashMap();
+
+    private static final Map<String, ResultCallbackTemplate<?, ?>> callbacks = new ConcurrentHashMap<>();
+
+
+    public void init(Session session) {
+        super.initStream(session);
+        this.addSession(session);
+    }
+
+
+    @SneakyThrows
+    public void addCallback(Session session, ResultCallbackTemplate<?, ?> callback) {
+        if (session == null) {
+            return;
+        }
+        callbacks.put(session.getId(), callback);
+    }
+
+    public Map<String, String> parseParams(Session session) {
+        final String queryString = session.getQueryString();
+        if (StrUtil.isBlank(queryString)) {
+            return Collections.emptyMap();
+        }
+
+        final Map<String, String> map = MapUtil.newHashMap();
+
+        String[] params = queryString.split("&");
+        for (String param : params) {
+            try {
+                String[] keyValuePair = param.split("=", 2);
+                String name = URLDecoder.decode(keyValuePair[0], "UTF-8");
+                if (StrUtil.isBlank(name)) {
+                    continue;
+                }
+                String value = keyValuePair.length > 1 ?
+                        URLDecoder.decode(keyValuePair[1], "UTF-8") : "";
+                map.put(name, value);
+            } catch (UnsupportedEncodingException e) {
+                // ignore this parameter if it can't be decoded
+            }
+        }
+        return map;
+    }
+
+
+    /**
+     * 收到客户端消息后写入输出流
+     */
+    @SneakyThrows
+    @OnMessage
+    public void onMessage(String message, Session session) {
+        this.write(session, message.getBytes());
+    }
+
+    /**
+     * Session连接关闭
+     */
+    @OnClose
+    @SneakyThrows
+    public void onClose(Session session) {
+        this.closeCallback(session);
+        this.closeStream(session);
+        this.removeSession(session);
+
+    }
+
+    /**
+     * 出现错误
+     */
+    @OnError
+    @SneakyThrows
+    public void onError(Session session, Throwable error) {
+        log.error("发生错误：{}，Session ID： {}", error.getMessage(), session.getId());
+        this.onClose(session);
+    }
+
+    private void addSession(Session session) {
+        sessionSet.add(session);
+        idAndSessionGroup.put(session.getId(), session);
+        session.getId();
+    }
+
+    @SneakyThrows
+    private void closeCallback(Session session) {
+        if (session == null) {
+            return;
+        }
+
+        final ResultCallbackTemplate<?, ?> template = callbacks.get(session.getId());
+        if (template != null) {
+            template.close();
+        }
+    }
+
+
+    @SneakyThrows
+    private void removeSession(Session session) {
+        if (session == null) {
+            return;
+        }
+        final String sessionId = session.getId();
+        final Session sessionOfExist = idAndSessionGroup.get(sessionId);
+        if (sessionOfExist == null) {
+            return;
+        }
+
+        sessionOfExist.close();
+        idAndSessionGroup.remove(sessionId);
+        sessionSet.remove(sessionOfExist);
+    }
+
+}
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerMonitorWebSocket.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerMonitorWebSocket.java
new file mode 100644
index 0000000..8c23db8
--- /dev/null
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerMonitorWebSocket.java
@@ -0,0 +1,59 @@
+package com.taoes.simpledocker.ws;
+
+import com.github.dockerjava.api.DockerClient;
+import com.taoes.simpledocker.config.DockerClientFactory;
+import com.taoes.simpledocker.ws.callback.ContainerMonitorCallback;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.websocket.*;
+import javax.websocket.server.ServerEndpoint;
+import java.util.Map;
+
+/**
+ * 容器状态监控服务
+ *
+ * @author 枕上江南 zhoutao825638@vip.qq.com
+ * @date 2021/12/5 1:33 上午
+ */
+@Slf4j
+@Component
+@ServerEndpoint("/api/ws/client/{clientId}/container/{containerId}/monitor")
+public class ContainerMonitorWebSocket extends AbstractWebSocket {
+
+    private static DockerClientFactory clientFactory;
+
+    @Autowired
+    public void setChatService(DockerClientFactory clientFactory) {
+        ContainerMonitorWebSocket.clientFactory = clientFactory;
+    }
+
+    @PostConstruct
+    public void printWsStartInfo() {
+        log.info("容器状态WebSocket初始化完成！");
+    }
+
+
+    @OnOpen
+    @SneakyThrows
+    public void onOpen(Session session) {
+        final Map<String, String> parameters = session.getPathParameters();
+
+        final String containerId = parameters.get("containerId");
+        final String clientId = parameters.get("clientId");
+
+        final DockerClient client = clientFactory.get(clientId);
+
+        this.init(session);
+        final ContainerMonitorCallback callback = new ContainerMonitorCallback(session);
+        try {
+            client.statsCmd(containerId).exec(callback);
+            this.addCallback(session, callback);
+        } catch (Exception e) {
+            this.onClose(session);
+        }
+    }
+}
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerStatWebSocket.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerStatWebSocket.java
deleted file mode 100644
index cf7b693..0000000
--- a/backend-src/src/main/java/com/taoes/simpledocker/ws/ContainerStatWebSocket.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.taoes.simpledocker.ws;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.annotation.PostConstruct;
-import javax.websocket.OnClose;
-import javax.websocket.OnError;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.ServerEndpoint;
-
-import com.github.dockerjava.api.DockerClient;
-import com.github.dockerjava.api.async.ResultCallback;
-import com.github.dockerjava.api.model.Statistics;
-import com.taoes.simpledocker.config.DockerClientFactory;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 容器资源使用情况服务
- *
- * @author taozhou.tao@alibaba-inc.com
- * @date 2021/12/5 1:33 上午
- */
-@Slf4j
-@Component
-@ServerEndpoint("/api/ws/container/{cId}/stat")
-public class ContainerStatWebSocket {
-
-    private static DockerClientFactory clientFactory;
-
-    @Autowired
-    public void setChatService(DockerClientFactory clientFactory) {
-        ContainerStatWebSocket.clientFactory = clientFactory;
-    }
-
-    // 当前在线数
-    private AtomicInteger OnlineCount = new AtomicInteger(0);
-
-    // Session保存
-    private static CopyOnWriteArraySet<Session> SessionSet = new CopyOnWriteArraySet<Session>();
-
-    private Map<String, ResultCallback<Statistics>> callbackMap = new ConcurrentHashMap<>();
-
-    @PostConstruct
-    public void init() {
-        log.info("容器资源使用情况 WS 初始化 OK！");
-    }
-
-    @OnOpen
-    public void onOpen(Session session) {
-        SessionSet.add(session);
-        final int i = OnlineCount.incrementAndGet();
-        log.info("有连接接入，当前连接数为：{}", i);
-
-        // TODO 校验容器存在
-
-        final Map<String, String> param = session.getPathParameters();
-        final DockerClient client = clientFactory.get();
-        final ResultCallback<Statistics> callback = client.statsCmd(param.get("cId")).exec(
-            new ResultCallback<Statistics>() {
-                @Override
-                public void onStart(Closeable closeable) {
-
-                }
-
-                @Override
-                public void onNext(Statistics object) {
-                    SendMessage(session, "");
-                }
-
-                @Override
-                public void onError(Throwable throwable) {
-
-                }
-
-                @Override
-                public void onComplete() {
-
-                }
-
-                @Override
-                public void close() throws IOException {
-
-                }
-            });
-        callbackMap.put(session.getId(), callback);
-    }
-
-    /**
-     * 连接关闭调用的方法
-     */
-    @OnClose
-    @SneakyThrows
-    public void onClose(Session session) {
-        SessionSet.remove(session);
-        int cnt = OnlineCount.decrementAndGet();
-        final ResultCallback<Statistics> resultCallback = callbackMap.get(session.getId());
-        if (resultCallback != null && session.isOpen()) { resultCallback.close(); }
-        log.info("有连接关闭，当前连接数为：{}", cnt);
-    }
-
-    /**
-     * 收到客户端消息后调用的方法
-     *
-     * @param message 客户端发送过来的消息
-     */
-    @OnMessage
-    public void onMessage(String message, Session session) {
-        System.out.println("ContainerLogWebSocket.onMessage");
-        SendMessage(session, "收到消息，消息内容：" + message);
-
-    }
-
-    /**
-     * 出现错误
-     *
-     * @param session
-     * @param error
-     */
-    @OnError
-    @SneakyThrows
-    public void onError(Session session, Throwable error) {
-        System.out.println("ContainerLogWebSocket.onError");
-        log.error("发生错误：{}，Session ID： {}", error.getMessage(), session.getId());
-
-        final ResultCallback<Statistics> resultCallback = callbackMap.get(session.getId());
-        if (resultCallback != null && session.isOpen()) { resultCallback.close(); }
-    }
-
-    /**
-     * 发送消息
-     *
-     * @param session
-     * @param message
-     */
-    public void SendMessage(Session session, String message) {
-        if (!session.isOpen()) {
-            return;
-        }
-        try {
-            session.getBasicRemote().sendText(message);
-        } catch (IOException e) {
-            log.error("发送消息出错：{}", e.getMessage());
-        }
-    }
-
-}
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ContainerMonitorCallback.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ContainerMonitorCallback.java
new file mode 100644
index 0000000..767bd77
--- /dev/null
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ContainerMonitorCallback.java
@@ -0,0 +1,49 @@
+package com.taoes.simpledocker.ws.callback;
+
+import com.github.dockerjava.api.async.ResultCallback;
+import com.github.dockerjava.api.model.Frame;
+import com.github.dockerjava.api.model.Statistics;
+import com.taoes.simpledocker.utils.JsonUtils;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import netscape.javascript.JSObject;
+
+import javax.websocket.Session;
+import java.io.Closeable;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+/**
+ * 容器状态监控数据callback
+ */
+@Slf4j
+public class ContainerMonitorCallback extends AbstractResultCallback<Statistics> {
+
+
+    public ContainerMonitorCallback(Session session) {
+        super("容器状态", session);
+    }
+
+
+    @SneakyThrows
+    @Override
+    public void onNext(Statistics statistics) {
+        log.debug("接收到消息:{}", JsonUtils.toJsonString(statistics));
+        sendMessage(JsonUtils.toJsonString(statistics));
+    }
+
+    @Override
+    @SneakyThrows
+    public void onError(Throwable throwable) {
+        sendMessage("\u001B[31m 出现异常:" + throwable.getMessage() + "\u001B[0m \n");
+        this.close();
+    }
+
+    @Override
+    @SneakyThrows
+    public void onComplete() {
+        sendMessage("\u001B[31m 服务已关闭，如需再次进入请尝试刷新或者重新进入  \u001B[0m");
+        this.close();
+    }
+
+}
diff --git a/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ImagePullCallback.java b/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ImagePullCallback.java
new file mode 100644
index 0000000..172965d
--- /dev/null
+++ b/backend-src/src/main/java/com/taoes/simpledocker/ws/callback/ImagePullCallback.java
@@ -0,0 +1,44 @@
+package com.taoes.simpledocker.ws.callback;
+
+import com.github.dockerjava.api.model.PullResponseItem;
+import com.github.dockerjava.api.model.Statistics;
+import com.taoes.simpledocker.utils.JsonUtils;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.websocket.Session;
+
+/**
+ * 镜像拉取 数据callback
+ */
+@Slf4j
+public class ImagePullCallback extends AbstractResultCallback<PullResponseItem> {
+
+
+    public ImagePullCallback(Session session) {
+        super("镜像拉取", session);
+    }
+
+
+    @SneakyThrows
+    @Override
+    public void onNext(PullResponseItem item) {
+        log.debug("接收到消息:{}", JsonUtils.toJsonString(item));
+        sendMessage(JsonUtils.toJsonString(item));
+    }
+
+    @Override
+    @SneakyThrows
+    public void onError(Throwable throwable) {
+        sendMessage("\u001B[31m 出现异常:" + throwable.getMessage() + "\u001B[0m \n");
+        this.close();
+    }
+
+    @Override
+    @SneakyThrows
+    public void onComplete() {
+        sendMessage("镜像拉取操作完成，请手动刷新镜像列表查看");
+        this.close();
+    }
+
+}
-- 
Gitee

