From e0bdb2c4015355e428c5e8d567196d607606a38e Mon Sep 17 00:00:00 2001
From: leirensheng <leirensheng@163.com>
Date: Tue, 15 Dec 2020 16:54:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=85=B3=E9=97=ADsocket=E4=BB=8D=E7=84=B6alert=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/server.js | 7 ++++---
 src/global/api.js         | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/controllers/server.js b/src/controllers/server.js
index 1e3158f..4435ab8 100644
--- a/src/controllers/server.js
+++ b/src/controllers/server.js
@@ -321,9 +321,10 @@ const server = {
 
 	        //连接关闭时触发
 	        _this.websocket.onclose = function(){
-				console.info(locale().websocket.close);
-				
-	            alert(locale().websocket.contact);
+							console.info(locale().websocket.close);
+							if(e.code!==1000){
+								alert(locale().websocket.contact);
+							}
 	        }
 	    }
 	    else{
diff --git a/src/global/api.js b/src/global/api.js
index 118f3e3..7554a29 100644
--- a/src/global/api.js
+++ b/src/global/api.js
@@ -6291,8 +6291,7 @@ export function closeWebsocket(){
     if(server.websocket == null){
         return;
     }
-
-    server.websocket.close();
+    server.websocket.close(1000);
 }
 
 

From 94e0020acd49aed50810e6c133688c950690ab3c Mon Sep 17 00:00:00 2001
From: leirensheng <leirensheng@163.com>
Date: Tue, 15 Dec 2020 17:02:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dalert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/server.js b/src/controllers/server.js
index 4435ab8..e6ff453 100644
--- a/src/controllers/server.js
+++ b/src/controllers/server.js
@@ -320,7 +320,7 @@ const server = {
 	        }
 
 	        //连接关闭时触发
-	        _this.websocket.onclose = function(){
+	        _this.websocket.onclose = function(e){
 							console.info(locale().websocket.close);
 							if(e.code!==1000){
 								alert(locale().websocket.contact);

From 82a87319342c698c1a1a58972a9d59ab3b7e91cd Mon Sep 17 00:00:00 2001
From: leirensheng <leirensheng@163.com>
Date: Tue, 15 Dec 2020 18:36:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=85=B3=E9=97=ADsocket=E5=AE=9A=E6=97=B6=E5=99=A8=E4=BB=8D?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/server.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/controllers/server.js b/src/controllers/server.js
index e6ff453..8ff6650 100644
--- a/src/controllers/server.js
+++ b/src/controllers/server.js
@@ -25,7 +25,8 @@ const server = {
     updateUrl: null,
     updateImageUrl: null,
     title: null,
-    loadSheetUrl: null,
+		loadSheetUrl: null,
+		retryTimer:null,
     allowUpdate: false, //共享编辑模式
     historyParam: function(data, sheetIndex, range) {
     	let _this = this;
@@ -162,7 +163,7 @@ const server = {
 				_this.wxErrorCount = 0;
 				
 	            //防止websocket长时间不发送消息导致断连
-	            setInterval(function(){
+							_this.retryTimer = setInterval(function(){
 	                _this.websocket.send("rub");
 	            }, 60000);
 	        }
@@ -322,7 +323,10 @@ const server = {
 	        //连接关闭时触发
 	        _this.websocket.onclose = function(e){
 							console.info(locale().websocket.close);
-							if(e.code!==1000){
+							if(e.code === 1000){
+								clearInterval(_this.retryTimer)
+								_this.retryTimer = null
+							}else{
 								alert(locale().websocket.contact);
 							}
 	        }