From d6f5a0b5bf572e2e0e48ab7c6850a3a27fa7a323 Mon Sep 17 00:00:00 2001
From: ZJY <764763903@qq.com>
Date: Wed, 15 Sep 2021 22:31:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=97=A7=E7=89=88V4=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=20=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/demo_config.yaml |  1 +
 models/bot.go         | 10 ++++-----
 models/config.go      |  1 +
 models/container.go   | 52 ++++++++++++++++++++++++++++++-------------
 readme.txt            |  4 ++++
 5 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/conf/demo_config.yaml b/conf/demo_config.yaml
index f7e9f2b..d37bdd6 100644
--- a/conf/demo_config.yaml
+++ b/conf/demo_config.yaml
@@ -10,6 +10,7 @@ containers:
     limit: 9999
 AtTime:  #填写1-12之间的数  填错自负默认为10  10点容易出现高峰超时。
 IsHelp:   #填写true或者false  false
+IsOldV4: #填写true或者false  false是否新版或者旧版V4
 theme:  
 static: ./static
 master: 
diff --git a/models/bot.go b/models/bot.go
index ec0fdf3..2cdfbe3 100644
--- a/models/bot.go
+++ b/models/bot.go
@@ -71,11 +71,11 @@ var handleMessage = func(msgs ...interface{}) interface{} {
 	if sender.UserID == Config.TelegramUserID || sender.UserID == int(Config.QQID) {
 		sender.IsAdmin = true
 	}
-	logs.Info(sender.UserID)
-	if IsUserAdmin(strconv.Itoa(sender.UserID)) {
-		sender.IsAdmin = true
+	if sender.IsAdmin == false {
+		if IsUserAdmin(strconv.Itoa(sender.UserID)) {
+			sender.IsAdmin = true
+		}
 	}
-
 	for i := range codeSignals {
 		for j := range codeSignals[i].Command {
 			if codeSignals[i].Command[j] == head {
@@ -90,7 +90,7 @@ var handleMessage = func(msgs ...interface{}) interface{} {
 	}
 	switch msg {
 	default:
-        { //沃邮箱
+		{ //沃邮箱
 			ss := regexp.MustCompile(`https://nyan.mail.*3D`).FindStringSubmatch(msg)
 			if len(ss) > 0 {
 				var u User
diff --git a/models/config.go b/models/config.go
index a6bf7d5..82cd824 100644
--- a/models/config.go
+++ b/models/config.go
@@ -33,6 +33,7 @@ type Yaml struct {
 	Version             string `yaml:"version"`
 	CTime               string `yaml:"AtTime"`
 	IsHelp              bool   `yaml:"IsHelp"`
+	IsOldV4             bool   `yaml:"IsOldV4"`
 	Node                string
 	Npm                 string
 	Python              string
diff --git a/models/container.go b/models/container.go
index c8c6141..687b723 100644
--- a/models/container.go
+++ b/models/container.go
@@ -551,21 +551,43 @@ func (c *Container) postConfig(handle func(config string) string) error {
 }
 
 func (c *Container) getSession() error {
-	req := httplib.Post(c.Address + "/api/auth")
-	req.Param("username", c.Username)
-	req.Param("password", c.Password)
-	rsp, err := req.Response()
-	if err != nil {
-		return err
-	}
-	c.Token = rsp.Header.Get("Set-Cookie")
-	if data, err := ioutil.ReadAll(rsp.Body); err != nil {
-		return err
-	} else {
-		err, _ := jsonparser.GetInt(data, "err")
-		if err != 0 {
-			return errors.New(string(data))
+
+	if Config.IsOldV4 {
+		req := httplib.Post(c.Address + "/api/auth")
+		req.Param("username", c.Username)
+		req.Param("password", c.Password)
+		rsp, err := req.Response()
+		if err != nil {
+			return err
 		}
+		c.Token = rsp.Header.Get("Set-Cookie")
+		if data, err := ioutil.ReadAll(rsp.Body); err != nil {
+			return err
+		} else {
+			err, _ := jsonparser.GetInt(data, "err")
+			if err != 0 {
+				return errors.New(string(data))
+			}
+		}
+		return nil
+	} else {
+		req := httplib.Post(c.Address + "/auth")
+		req.Param("username", c.Username)
+		req.Param("password", c.Password)
+		rsp, err := req.Response()
+		if err != nil {
+			return err
+		}
+		c.Token = rsp.Header.Get("Set-Cookie")
+		if data, err := ioutil.ReadAll(rsp.Body); err != nil {
+			return err
+		} else {
+			err, _ := jsonparser.GetInt(data, "err")
+			if err != 0 {
+				return errors.New(string(data))
+			}
+		}
+		return nil
 	}
-	return nil
+
 }
diff --git a/readme.txt b/readme.txt
index 07d9b7b..1bb286c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -28,6 +28,8 @@ Whiskey更新
 修复转换错误自动改为false 修复七次无限转换问题
 新增 AtTime参数 不配置导致失败得别怪我
 AtTime:  #填写1-12之间的数  填错自负默认为10  10点容易出现高峰超时。
+IsHelp:   #填写true或者false  默认false 是否往容器添加助力码
+IsOldV4: #填写true或者false  默认false  是否新版或者旧版V4
 
 以上是做完了 以下是待开发
 
@@ -52,6 +54,8 @@ https://thin-hill-428.notion.site/2-8Faker-QL-pannel-Faker-Repository-environmen
 	修改为
 	req := httplib.Post(c.Address + "/auth")
 
+	修改为可配置
+