From d377b8bdf12791e45ef40254ff8a93c54a8b7394 Mon Sep 17 00:00:00 2001
From: Sam <lau.sam745033858@gmail.com>
Date: Mon, 5 Apr 2021 22:51:12 +0800
Subject: [PATCH] Yaml small fix

---
 .gitignore                       |  4 +++-
 global/config/default_config.yml | 15 ++++++++-------
 server/http.go                   |  4 +++-
 server/websocket.go              |  3 +++
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index fffc7ea..d2ee21b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@ vendor/
 .idea
 .vscode
 config.hjson
+config.yml
+session.token
 device.json
 data/
-logs/
\ No newline at end of file
+logs/
diff --git a/global/config/default_config.yml b/global/config/default_config.yml
index 262f118..add6320 100644
--- a/global/config/default_config.yml
+++ b/global/config/default_config.yml
@@ -3,7 +3,7 @@
 account: # 账号相关
   uin: 1233456 # QQ账号
   password: '' # 密码为空时使用扫码登录
-  encrypt: true  # 是否开启密码加密
+  encrypt: false  # 是否开启密码加密
   relogin:        # 重连设置
     disable: false
     delay: 3      # 重连延迟, 单位秒
@@ -62,7 +62,7 @@ servers:
   # HTTP 通信设置
   - http:
       # 是否关闭正向HTTP服务器
-      disabled: true
+      disabled: false
       # 服务端监听地址
       host: 127.0.0.1
       # 服务端监听端口
@@ -74,15 +74,15 @@ servers:
         <<: *default
       # 反向HTTP POST地址列表
       post:
-        - url: 127.0.0.1:5701 # 地址
-          secret: ''          # 密钥
+        - url: '' # 地址
+          secret: ''           # 密钥
         #- url: 127.0.0.1:5701 # 地址
         #  secret: ''          # 密钥
 
   # 正向WS设置
   - ws:
-      # 是否禁用当前服务
-      disable: true
+      # 是否禁用正向WS服务器
+      disabled: true
       # 正向WS服务器监听地址
       host: 127.0.0.1
       # 正向WS服务器监听端口
@@ -91,7 +91,8 @@ servers:
         <<: *default
 
   - ws-reverse:
-      disable: true
+      # 是否禁用当前反向WS服务
+      disabled: true
       # 反向WS Universal 地址
       # 注意 设置了此项地址后下面两项将会被忽略
       universal: ws://your_websocket_universal.server
diff --git a/server/http.go b/server/http.go
index fb23e21..4b783c4 100644
--- a/server/http.go
+++ b/server/http.go
@@ -118,7 +118,9 @@ func RunHTTPServerAndClients(bot *coolq.CQBot, conf *config.HTTPServer) {
 	}()
 
 	for _, c := range conf.Post {
-		go newHTTPClient().Run(c.URL, c.Secret, conf.Filter, conf.Timeout, bot)
+		if c.URL != "" {
+			go newHTTPClient().Run(c.URL, c.Secret, conf.Filter, conf.Timeout, bot)
+		}
 	}
 }
 
diff --git a/server/websocket.go b/server/websocket.go
index 6688c88..5d4988c 100644
--- a/server/websocket.go
+++ b/server/websocket.go
@@ -56,6 +56,9 @@ var upgrader = websocket.Upgrader{
 
 // RunWebSocketServer 运行一个正向WS server
 func RunWebSocketServer(b *coolq.CQBot, conf *config.WebsocketServer) {
+	if conf.Disabled {
+		return
+	}
 	s := new(webSocketServer)
 	s.conf = conf
 	s.bot = b