From 9f99b1571df99d90235b52c5b118051b0a849b5f Mon Sep 17 00:00:00 2001
From: Ink-33 <quhyu@qq.com>
Date: Sun, 17 Jan 2021 01:47:45 +0800
Subject: [PATCH] fix: golangci-lint gosimple

---
 coolq/cqcode.go       |  2 +-
 global/codec.go       |  2 +-
 global/codec/codec.go |  2 +-
 global/filter.go      |  4 ++--
 global/net.go         | 24 ++++++++++++------------
 server/apiAdmin.go    |  2 --
 server/http.go        |  6 ++----
 7 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/coolq/cqcode.go b/coolq/cqcode.go
index 52866cd..7b7e697 100644
--- a/coolq/cqcode.go
+++ b/coolq/cqcode.go
@@ -1032,7 +1032,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon
 	xml := ""
 	var suf message.IMessageElement
 	if i, ok := elem.(*LocalImageElement); ok {
-		if group == false {
+		if !group {
 			gm, err := bot.UploadLocalImageAsPrivate(1, i)
 			if err != nil {
 				log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
diff --git a/global/codec.go b/global/codec.go
index 4bb9cfd..22df9fa 100644
--- a/global/codec.go
+++ b/global/codec.go
@@ -23,7 +23,7 @@ func InitCodec() {
 }
 
 func EncoderSilk(data []byte) ([]byte, error) {
-	if useSilkCodec == false {
+	if !useSilkCodec {
 		return nil, errors.New("no silk encoder")
 	}
 	h := md5.New()
diff --git a/global/codec/codec.go b/global/codec/codec.go
index 695bbc9..139a964 100644
--- a/global/codec/codec.go
+++ b/global/codec/codec.go
@@ -79,7 +79,7 @@ func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error)
 	if err = cmd.Run(); err != nil {
 		return nil, err
 	}
-	if useCache == false {
+	if !useCache {
 		defer os.Remove(silkPath)
 	}
 	return ioutil.ReadFile(silkPath)
diff --git a/global/filter.go b/global/filter.go
index c617167..85ed6b2 100644
--- a/global/filter.go
+++ b/global/filter.go
@@ -104,7 +104,7 @@ func (andOperator *AndOperator) Eval(payload MSG) bool {
 			res = res && operand.filter.Eval(val)
 		}
 
-		if res == false {
+		if !res {
 			break
 		}
 	}
@@ -131,7 +131,7 @@ func (op *OrOperator) Eval(payload MSG) bool {
 	res := false
 	for _, operand := range op.operands {
 		res = res || operand.Eval(payload)
-		if res == true {
+		if res {
 			break
 		}
 	}
diff --git a/global/net.go b/global/net.go
index 7bdf83f..e9d6069 100644
--- a/global/net.go
+++ b/global/net.go
@@ -86,11 +86,11 @@ func DownloadFile(url, path string, limit int64, headers map[string]string) erro
 	if err != nil {
 		return err
 	}
-	if headers != nil {
-		for k, v := range headers {
-			req.Header.Set(k, v)
-		}
+
+	for k, v := range headers {
+		req.Header.Set(k, v)
 	}
+
 	if _, ok := headers["User-Agent"]; ok {
 		req.Header["User-Agent"] = []string{UserAgent}
 	}
@@ -138,10 +138,10 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 		if err != nil {
 			return err
 		}
-		if headers != nil {
-			for k, v := range headers {
-				req.Header.Set(k, v)
-			}
+
+		for k, v := range headers {
+			req.Header.Set(k, v)
+
 		}
 		if _, ok := headers["User-Agent"]; ok {
 			req.Header["User-Agent"] = []string{UserAgent}
@@ -202,11 +202,11 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 		_, _ = file.Seek(block.BeginOffset, io.SeekStart)
 		writer := bufio.NewWriter(file)
 		defer writer.Flush()
-		if headers != nil {
-			for k, v := range headers {
-				req.Header.Set(k, v)
-			}
+
+		for k, v := range headers {
+			req.Header.Set(k, v)
 		}
+
 		if _, ok := headers["User-Agent"]; ok {
 			req.Header["User-Agent"] = []string{UserAgent}
 		}
diff --git a/server/apiAdmin.go b/server/apiAdmin.go
index 64af4d6..3b0aae6 100644
--- a/server/apiAdmin.go
+++ b/server/apiAdmin.go
@@ -472,7 +472,6 @@ func AdminDoRestart(s *webServer, c *gin.Context) {
 	s.Cli = nil
 	s.DoReLogin()
 	c.JSON(200, coolq.OK(coolq.MSG{}))
-	return
 }
 
 // 进程重启
@@ -485,7 +484,6 @@ func AdminProcessRestart(s *webServer, c *gin.Context) {
 func AdminDoRestartDocker(s *webServer, c *gin.Context) {
 	Console <- os.Kill
 	c.JSON(200, coolq.OK(coolq.MSG{}))
-	return
 }
 
 // web输入 html 页面
diff --git a/server/http.go b/server/http.go
index b312d82..f3900f8 100644
--- a/server/http.go
+++ b/server/http.go
@@ -576,9 +576,7 @@ func (s *httpServer) ShutDown() {
 	if err := s.Http.Shutdown(ctx); err != nil {
 		log.Fatal("http Server Shutdown:", err)
 	}
-	select {
-	case <-ctx.Done():
-		log.Println("timeout of 5 seconds.")
-	}
+	<-ctx.Done()
+	log.Println("timeout of 5 seconds.")
 	log.Println("http Server exiting")
 }