From ef695a60385658a1fa6a84c4d47bedead3bd3a55 Mon Sep 17 00:00:00 2001
From: liangjunhao <3220663807@qq.com>
Date: Wed, 11 Dec 2024 18:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=BF=9E=E6=8E=A5=E9=92=B1?=
 =?UTF-8?q?=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 23 ++----
 activity.log                                  | 72 ++++++++++++++++++
 .../src/components/chessboard/ChessBoard.css  |  8 ++
 .../src/components/chessboard/ChessBoard.jsx  | 14 +---
 .../src/components/web3wallet/Wallet.jsx      | 73 ++++++-------------
 .../src/components/web3wallet/WebOnboard.js   |  3 +
 checkerboard/src/index.css                    |  2 +-
 checkerboard/src/store/index.js               |  2 +-
 checkerboard/src/store/wallet.js              | 14 ++--
 controller/checkerboard.go                    | 13 ++--
 controller/websocket.go                       |  6 ++
 dao/checkboard.go                             |  2 +-
 handle/wshandle.go                            | 24 ++++++
 13 files changed, 159 insertions(+), 97 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 59a3bbe..ca82eb1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,28 +5,19 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="81e28f08-7929-4107-9a7a-4c51f856d31e" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/checkerboard/public/images/picture/X.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/checkerboard/public/images/picture/tg.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/checkerboard/public/tide.ico" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/activity.log" beforeDir="false" afterPath="$PROJECT_DIR$/activity.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/public/vite.svg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/src/App.css" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/src/App.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/App.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/src/apis/manage.js" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/apis/manage.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/src/components/Rule.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/components/Rule.jsx" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/checkerboard/src/components/chessboard/ChessBoard.css" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/components/chessboard/ChessBoard.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/checkerboard/src/components/chessboard/ChessBoard.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/components/chessboard/ChessBoard.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/src/components/header/Header.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/components/header/Header.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/src/components/header/header.css" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/components/header/header.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/src/components/translation/Translation.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/components/translation/Translation.jsx" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/src/components/userinfo/UserInfo.css" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/components/userinfo/UserInfo.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/src/components/userinfo/UserInfo.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/components/userinfo/UserInfo.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/checkerboard/src/components/web3wallet/Wallet.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/components/web3wallet/Wallet.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/checkerboard/src/components/web3wallet/WebOnboard.js" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/components/web3wallet/WebOnboard.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/checkerboard/src/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/checkerboard/src/pages/home/Expand.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/pages/home/Expand.jsx" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/checkerboard/src/store/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/store/index.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/checkerboard/src/store/wallet.js" beforeDir="false" afterPath="$PROJECT_DIR$/checkerboard/src/store/wallet.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/controller/checkerboard.go" beforeDir="false" afterPath="$PROJECT_DIR$/controller/checkerboard.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/model/record.go" beforeDir="false" afterPath="$PROJECT_DIR$/model/record.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/controller/websocket.go" beforeDir="false" afterPath="$PROJECT_DIR$/controller/websocket.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dao/checkboard.go" beforeDir="false" afterPath="$PROJECT_DIR$/dao/checkboard.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/handle/wshandle.go" beforeDir="false" afterPath="$PROJECT_DIR$/handle/wshandle.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/activity.log b/activity.log
index bdaee2d..f05bbb3 100644
--- a/activity.log
+++ b/activity.log
@@ -628,3 +628,75 @@
 {"level":"INFO","time":"2024-12-10T19:29:52.286+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
 {"level":"INFO","time":"2024-12-10T19:29:52.752+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
 {"level":"INFO","time":"2024-12-10T19:29:58.440+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-11T14:12:58.609+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T14:12:58.613+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T14:13:00.579+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T14:13:32.137+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-11T14:14:13.628+0800","caller":"handle/wshandle.go:89","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"ERROR","time":"2024-12-11T14:15:43.129+0800","caller":"handle/wshandle.go:93","msg":"websocket接收到错误消息","error":"websocket: close 1005 (no status)"}
+{"level":"INFO","time":"2024-12-11T14:18:17.780+0800","caller":"handle/wshandle.go:89","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T14:45:44.367+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T14:45:44.372+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T14:45:44.848+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T14:45:52.980+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-11T14:46:18.438+0800","caller":"handle/wshandle.go:103","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T14:47:14.520+0800","caller":"handle/wshandle.go:103","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T14:47:27.734+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T14:47:27.739+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T14:47:29.413+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T14:48:21.263+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T14:48:21.267+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T14:48:23.274+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T14:48:51.971+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-11T14:50:11.942+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T14:50:11.947+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T14:50:12.428+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T14:52:24.923+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T14:52:24.927+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T14:52:27.190+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T14:52:45.211+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-11T14:53:00.334+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T14:55:34.989+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T14:55:50.988+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T14:55:55.264+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"ERROR","time":"2024-12-11T15:52:47.920+0800","caller":"handle/scheduledtasks.go:46","msg":"价格上涨时入库失败","error":"Error 1292 (22007): Incorrect datetime value: '0000-00-00' for column 'start_shield_time' at row 2"}
+{"level":"INFO","time":"2024-12-11T16:18:50.999+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-11T16:21:41.851+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-11T16:22:06.996+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-11T16:22:16.981+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-11T16:22:33.072+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-11T16:24:20.008+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-11T16:24:24.827+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-11T16:24:27.221+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-11T16:24:39.397+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T16:27:35.349+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T16:27:35.355+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T16:27:35.770+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T16:27:40.450+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-11T16:29:57.110+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T16:29:57.116+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T16:29:57.530+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T16:30:02.561+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-11T16:30:41.766+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T16:30:41.771+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T16:30:42.195+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T16:30:47.174+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-11T16:32:27.052+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T16:38:41.391+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T16:39:46.600+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T16:39:46.605+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T16:39:47.018+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T16:39:52.176+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
+{"level":"INFO","time":"2024-12-11T16:45:16.994+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T16:45:32.995+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T16:45:35.889+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T16:51:10.443+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T16:51:14.536+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-11T16:51:20.833+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T16:51:24.888+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=2)连接"}
+{"level":"INFO","time":"2024-12-11T17:01:59.000+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T17:06:47.465+0800","caller":"handle/wshandle.go:95","msg":"用户0x7D24a4398d5b9138451e6d16de31A45521CaACf4通过客户端主动关闭模块%!t(int=1)连接"}
+{"level":"INFO","time":"2024-12-11T17:32:23.248+0800","caller":"utils/init.go:160","msg":"init logger success"}
+{"level":"INFO","time":"2024-12-11T17:32:23.253+0800","caller":"utils/init.go:42","msg":"初始化logger成功"}
+{"level":"INFO","time":"2024-12-11T17:32:23.652+0800","caller":"utils/init.go:47","msg":"初始化mysql成功"}
+{"level":"INFO","time":"2024-12-11T17:32:28.053+0800","caller":"handle/create_shiled.go:26","msg":"初始化盾信息成功"}
diff --git a/checkerboard/src/components/chessboard/ChessBoard.css b/checkerboard/src/components/chessboard/ChessBoard.css
index 6c8b762..3c52ec5 100644
--- a/checkerboard/src/components/chessboard/ChessBoard.css
+++ b/checkerboard/src/components/chessboard/ChessBoard.css
@@ -122,6 +122,14 @@
     box-shadow: 0px 4px 8px rgba(14, 153, 207, 0.5);
 }
 
+.grid-box.have {
+    border: 1px solid #0dec68;
+}
+.grid-box.preempted {
+    border: 1px solid #f40808;
+}
+
+
 .submit-button {
     text-align: center;
     width: 20px;
diff --git a/checkerboard/src/components/chessboard/ChessBoard.jsx b/checkerboard/src/components/chessboard/ChessBoard.jsx
index ef4ebaf..2bb3594 100644
--- a/checkerboard/src/components/chessboard/ChessBoard.jsx
+++ b/checkerboard/src/components/chessboard/ChessBoard.jsx
@@ -1,7 +1,7 @@
 import { useState, useRef, useMemo, useEffect} from 'react';
 import { useParams,useNavigate  } from 'react-router-dom';
 import { AntDesignOutlined } from '@ant-design/icons';
-import { Avatar,Button, Input, Space,InputNumber } from 'antd';
+import { Avatar,Button,Space,InputNumber,Spin } from 'antd';
 import './Chessboard.css';
 import {BoardInfo, SeizeGrid} from '../../apis/manage'
 import UserInfo from '../userinfo/UserInfo';
@@ -187,7 +187,7 @@ const ChessBoard = () => {
                             boxes.map((box) => (
                                 <div
                                     key={box.ID}
-                                    className={`grid-box ${selectedBoxes.includes(box.ID) ? 'selected' : ''}`}
+                                    className={`grid-box ${selectedBoxes.includes(box.ID) ? 'selected' : ''} ${box.status == 1 ? 'have' : `${box.status == 2 ? 'preempted':''}`}`}
                                     onMouseDown={(event) => handleMouseDown(box.ID, event)}
                                     onMouseEnter={(event) => handleMouseEnter(box.ID, event)}
                                     onClick={() => handleBoxClick(box)}
@@ -196,7 +196,7 @@ const ChessBoard = () => {
                                 </div>
                             ))
                         ) : (
-                            <p>加载中...</p>
+                            <Spin />
                         )}
                     </div>
                 </div>
@@ -205,7 +205,6 @@ const ChessBoard = () => {
                     {showPopup && (
                         <div className="popupStyle">
                             <div>
-                                {/* 头像 */}
                                 <Avatar
                                     size={{xs: 24, sm: 32, md: 40, lg: 64, xl: 80, xxl: 100}}
                                     icon={<AntDesignOutlined/>}
@@ -235,19 +234,14 @@ const ChessBoard = () => {
                                             seizeHandle();
                                         }}
                                     >
-                                        抢占
+                                        { message.status == 2 ? '还击':'抢占'}
                                     </Button>
                                 </Space>
-
-                                {/*<button onClick={()=>seizeHandle()}>抢占</button>*/}
-
                                 <button onClick={closePopup}>Close</button>
                             </div>
                         </div>
                     )}
                 </div>
-
-                {/*<button className="submit-button" onClick={handleSubmit}>提交</button>*/}
             </div>
         </>
     );
diff --git a/checkerboard/src/components/web3wallet/Wallet.jsx b/checkerboard/src/components/web3wallet/Wallet.jsx
index 27388b9..257d3d8 100644
--- a/checkerboard/src/components/web3wallet/Wallet.jsx
+++ b/checkerboard/src/components/web3wallet/Wallet.jsx
@@ -1,27 +1,26 @@
-import {useEffect,useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { setWallet, setProvider, clearWallet } from '../../store/wallet';
+import {useEffect, useState} from 'react';
+// import { setProvider,clearProvider } from '../../store/wallet';
 import onboard from './WebOnboard';
 import {loginUser} from '../../apis/manage'
 import { ethers } from 'ethers';
 import usdtAbi from "./useABI.json"; // 引入 USDT 的 ABI
 
 const ConnectWallet = () => {
-  const dispatch = useDispatch();
-  const { wallet } = useSelector((state) => state.wallet);
   const [provider, setProvider] = useState(null);
 
   // 在组件加载时设置语言
   useEffect(() => {
     onboard.state.actions.setLocale('zh')
+    const currentState = onboard.state.get()
+    console.log(currentState);
   }, []);
 
   // 连接钱包
   const connectWallet = async () => {
     const wallets = await onboard.connectWallet();
     if (wallets && wallets.length > 0) {
-      setProvider( wallets[0].provider)  
-      dispatch(setWallet(wallets[0]));
+      setProvider(wallets[0].provider);
+      localStorage.setItem("walletAddress", wallets[0].accounts[0].address);
       const user = {
         user_id: wallets[0].accounts[0].address,
         user_name: "",              
@@ -33,63 +32,36 @@ const ConnectWallet = () => {
       if (response.code == 200) {
         localStorage.setItem("token",response.data)
       }
-       console.log(provider);
       const ethersProvider = new ethers.providers.Web3Provider(
         wallets[0].provider,
         'any',
       );
-      
-      dispatch(setProvider(ethersProvider));
-     
-      
+      const currentState = onboard.state.get()
+      console.log(currentState);
+
+      console.log(ethersProvider);
       // 设置事件监听器
       wallets[0].provider.on('disconnect', handleDisconnect);
-      wallets[0].provider.on('accountsChanged', handleAccountsChanged);
     }
   };
 
   // 处理主动断开连接事件
   const handleDisconnect = () => {
     console.log('钱包主动断开连接');
-    // dispatch(clearWallet());
-  };
-
-  // 处理账户切换事件
-  const handleAccountsChanged = (accounts) => {
-    if (accounts.length === 0) {
-      console.log('钱包账户已断开');
-      handleDisconnect();
-    } else {
-      console.log('钱包账户切换至:', accounts[0]);
-      setWallet((prevWallet) => ({
-        ...prevWallet,
-        accounts: [{ address: accounts[0] }],
-      }));
-    }
   };
 
-  // 发起交易
-  // const sendTransaction = async () => {
-  //   if (!provider) {
-  //     alert('请先连接钱包！',provider);
-  //     return;
+  // // 处理账户切换事件
+  // const handleAccountsChanged = (accounts) => {
+  //   if (accounts.length === 0) {
+  //     console.log('钱包账户已断开');
+  //     handleDisconnect();
+  //   } else {
+  //     console.log('钱包账户切换至:', accounts[0]);
+  //     setWallet((prevWallet) => ({
+  //       ...prevWallet,
+  //       accounts: [{ address: accounts[0] }],
+  //     }));
   //   }
-
-  //   try {
-  //     const signer = provider.getSigner(); 
-  //     const tx = await signer.sendTransaction({
-  //       to: '0x1510472bB6718ca4fb62FA3Bbe9072978EEfd0da', 
-  //       value: ethers.utils.parseEther('0.0001'), 
-  //     });
-
-  //     provider.once(tx.hash, (receipt) => {
-  //       // 在交易成功的时候，增加用户金额
-  //       console.log('Transaction confirmed via listener:', receipt);
-  //       alert(`交易已确认，交易哈希: ${tx.hash}`);
-  //     });
-  // } catch (error) {
-  //   alert(`交易失败: ${error.message}`);
-  // }
   // };
   
   const sendUSDTTransaction = async (amount) => {
@@ -106,7 +78,6 @@ const ConnectWallet = () => {
       // switch (network) {
       //   case
       // }
-      
       const usdtContractAddress = "0xdAC17F958D2ee523a2206206994597C13D831ec7"; // USDT 智能合约地址
       const usdtContract = new ethers.Contract(
         usdtContractAddress,
@@ -130,7 +101,7 @@ const ConnectWallet = () => {
         <button onClick={connectWallet}>连接钱包</button>
       ) : (
         <div>
-          <p>钱包信息: {wallet.accounts[0].address}</p>
+          {/*<p>钱包信息: {wallet.accounts[0].address}</p>*/}
           <button onClick={()=>sendUSDTTransaction(0.001)}>充值</button>
         </div>
       )}
diff --git a/checkerboard/src/components/web3wallet/WebOnboard.js b/checkerboard/src/components/web3wallet/WebOnboard.js
index 827fa9f..a0c576a 100644
--- a/checkerboard/src/components/web3wallet/WebOnboard.js
+++ b/checkerboard/src/components/web3wallet/WebOnboard.js
@@ -20,6 +20,9 @@ const onboard = Onboard({
       rpcUrl: 'https://sepolia.infura.io/v3/512c7938c0084f22bc5369a77c5222ef', // 替换 ${INFURA_ID} 为实际 Infura 项目的 ID
     },
   ],
+  connect: {
+    autoConnectLastWallet: true
+  },
   i18n: {
     en: {
       connect: {
diff --git a/checkerboard/src/index.css b/checkerboard/src/index.css
index e3fde5e..5689cfb 100644
--- a/checkerboard/src/index.css
+++ b/checkerboard/src/index.css
@@ -7,5 +7,5 @@ body {
   height: 100%;
   width: 100%;
   align-items: stretch;
-  justify-content: space-evenly;
+  justify-content: flex-start;
 }
diff --git a/checkerboard/src/store/index.js b/checkerboard/src/store/index.js
index f447d51..880a2a4 100644
--- a/checkerboard/src/store/index.js
+++ b/checkerboard/src/store/index.js
@@ -3,7 +3,7 @@ import walletReducer from './wallet';
 
 const store = configureStore({
   reducer: {
-    wallet: walletReducer, // 注册钱包 slice
+    wallet: walletReducer,
   },
 });
 
diff --git a/checkerboard/src/store/wallet.js b/checkerboard/src/store/wallet.js
index f882003..43605e7 100644
--- a/checkerboard/src/store/wallet.js
+++ b/checkerboard/src/store/wallet.js
@@ -3,22 +3,18 @@ import { createSlice } from '@reduxjs/toolkit';
 const walletSlice = createSlice({
   name: 'wallet',
   initialState: {
-    wallet: null, // 钱包信息
-    provider: null, // ethers.js 的 provider 实例
+    provider: null,  // 用来存储 provider
   },
   reducers: {
-    setWallet(state, action) {
-      state.wallet = action.payload;
-    },
-    setProvider(state, action) {
+    setProvider: (state, action) => {
       state.provider = action.payload;
     },
-    clearWallet(state) {
-      state.wallet = null;
+    clearProvider: (state) => {
       state.provider = null;
     },
   },
 });
 
-export const { setWallet, setProvider, clearWallet } = walletSlice.actions;
+export const { setProvider, clearProvider } = walletSlice.actions;
+
 export default walletSlice.reducer;
diff --git a/controller/checkerboard.go b/controller/checkerboard.go
index 8c48e5f..df76953 100644
--- a/controller/checkerboard.go
+++ b/controller/checkerboard.go
@@ -113,9 +113,6 @@ func (p *CheckerBoardController) GetUserOperateRecords(c *gin.Context) {
 	pageStr := c.Query("page")
 	size, _ := strconv.Atoi(sizeStr)
 	page, _ := strconv.Atoi(pageStr)
-
-	fmt.Println("size", size)
-	fmt.Println("page", page)
 	if size == 0 || page == 0 {
 		page = 1
 		size = 10
@@ -181,12 +178,12 @@ func (p *CheckerBoardController) GetCheckBoardInfo(c *gin.Context) {
 		oldGrid[uint(grid.GridId)] = true
 	}
 
-	for _, board := range boardInfo {
-		if oldGrid[board.ID] {
-			board.Status = pkg.PREEMPTED
+	for i := 0; i < len(boardInfo); i++ {
+		if oldGrid[boardInfo[i].ID] {
+			boardInfo[i].Status = pkg.PREEMPTED
 		}
-		if nowGrid[board.ID] {
-			board.Status = pkg.HAVE
+		if nowGrid[boardInfo[i].ID] {
+			boardInfo[i].Status = pkg.HAVE
 		}
 	}
 	pkg.ResponseSuccess(c, boardInfo)
diff --git a/controller/websocket.go b/controller/websocket.go
index 779681a..d3285d4 100644
--- a/controller/websocket.go
+++ b/controller/websocket.go
@@ -1,8 +1,10 @@
 package controller
 
 import (
+	"activity/handle"
 	"activity/model"
 	"activity/pkg"
+	"activity/utils"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
@@ -53,4 +55,8 @@ func (p *WebSocketController) Connect(c *gin.Context) {
 	m[atoi] = client
 	p.ConnManager[userId] = m
 	mu.Unlock()
+	fmt.Println("连接管理的长度：", len(utils.ConnManager))
+	fmt.Println("数据", utils.ConnManager)
+	//	开启协程监听消息，用于关闭websocket连接及清理连接管理里面的资源
+	go handle.ReceiveWsMessage(client, atoi)
 }
diff --git a/dao/checkboard.go b/dao/checkboard.go
index ee8e92b..ffde9c9 100644
--- a/dao/checkboard.go
+++ b/dao/checkboard.go
@@ -38,7 +38,7 @@ func (p *CheckBoardDao) GetUserGrid(blockId string, userId string) ([]model.Chec
 // GerRecordGrid 查询用户之前拥有格子的信息
 func (p *CheckBoardDao) GerRecordGrid(blockId string, userId string) ([]model.Record, error) {
 	var records []model.Record
-	err := p.DB.Where("block_id = ? AND owner = ?", blockId, userId).Find(&records).Error
+	err := p.DB.Where("block_id = ? AND old_owner = ?", blockId, userId).Find(&records).Error
 	return records, err
 }
 
diff --git a/handle/wshandle.go b/handle/wshandle.go
index 88bf039..44225e4 100644
--- a/handle/wshandle.go
+++ b/handle/wshandle.go
@@ -77,3 +77,27 @@ func checkHeartbeat(client model.Client) bool {
 	})
 	return true
 }
+
+// ReceiveWsMessage 接收websocket消息
+func ReceiveWsMessage(client model.Client, blockId int) {
+	for {
+		_, message, err := client.Conn.ReadMessage()
+		if err != nil {
+			if websocket.IsCloseError(err, websocket.CloseNormalClosure, websocket.CloseGoingAway, websocket.CloseNoStatusReceived) {
+				if c, exist := utils.ConnManager[client.UserId]; exist {
+					if _, exist := c[blockId]; exist {
+						delete(c, blockId)
+						if len(c) == 0 {
+							delete(utils.ConnManager, client.UserId)
+						}
+					}
+				}
+				utils.Tools.LG.Info(fmt.Sprintf("用户%s通过客户端主动关闭模块%t连接", client.UserId, blockId))
+				break
+			}
+			utils.Tools.LG.Error("websocket接收到错误消息", zap.Error(err))
+			break
+		}
+		fmt.Printf("Received message: %s\n", message)
+	}
+}