fix golangci-lint failed (silenceper#284)

* fix golangci-lint error
shfc · Jun 24, 2020 · 868b31c · 868b31c
1 parent b5c70cc
commit 868b31c
Show file tree

Hide file tree

Showing 31 changed files with 175 additions and 155 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -0,0 +1,53 @@
+linters:
+  # please, do not use `enable-all`: it's deprecated and will be removed soon.
+  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
+  disable-all: true
+  enable:
+    - bodyclose
+    - deadcode
+    - depguard
+    - dogsled
+    - dupl
+    - errcheck
+    - funlen
+    - goconst
+    - gocritic
+    - gocyclo
+    - gofmt
+    - goimports
+    - golint
+    - goprintffuncname
+    - gosimple
+    - govet
+    - ineffassign
+    - interfacer
+    - misspell
+    - nolintlint
+    - rowserrcheck
+    - scopelint
+    - staticcheck
+    - structcheck
+    - stylecheck
+    - typecheck
+    - unconvert
+    - unparam
+    - unused
+    - varcheck
+    - whitespace
+
+issues:
+  # Excluding configuration per-path, per-linter, per-text and per-source
+  exclude-rules:
+    - path: _test\.go
+      linters:
+        - gomnd
+
+    # https://github.com/go-critic/go-critic/issues/926
+    - linters:
+        - gocritic
+      text: "unnecessaryDefer:"
+
+linters-settings:
+  funlen:
+    lines: 66
+    statements: 40
diff --git a/cache/memory.go b/cache/memory.go
@@ -62,13 +62,13 @@ func (mem *Memory) Set(key string, val interface{}, timeout time.Duration) (err
 
 //Delete delete value in memcache.
 func (mem *Memory) Delete(key string) error {
-	return mem.deleteKey(key)
+	mem.deleteKey(key)
+	return nil
 }
 
 // deleteKey
-func (mem *Memory) deleteKey(key string) error {
+func (mem *Memory) deleteKey(key string) {
 	mem.Lock()
 	defer mem.Unlock()
 	delete(mem.data, key)
-	return nil
 }
diff --git a/cache/redis.go b/cache/redis.go
@@ -95,10 +95,7 @@ func (r *Redis) IsExist(key string) bool {
 
 	a, _ := conn.Do("EXISTS", key)
 	i := a.(int64)
-	if i > 0 {
-		return true
-	}
-	return false
+	return i > 0
 }
 
 //Delete 删除

diff --git a/credential/default_js_ticket.go b/credential/default_js_ticket.go
@@ -68,6 +68,9 @@ func GetTicketFromServer(accessToken string) (ticket ResTicket, err error) {
 	var response []byte
 	url := fmt.Sprintf(getTicketURL, accessToken)
 	response, err = util.HTTPGet(url)
+	if err != nil {
+		return
+	}
 	err = json.Unmarshal(response, &ticket)
 	if err != nil {
 		return

diff --git a/miniprogram/encryptor/encryptor.go b/miniprogram/encryptor/encryptor.go
@@ -22,7 +22,6 @@ func NewEncryptor(context *context.Context) *Encryptor {
 	return basic
 }
 
-
 var (
 	// ErrAppIDNotMatch appid不匹配
 	ErrAppIDNotMatch = errors.New("app id not match")
@@ -36,19 +35,19 @@ var (
 
 // PlainData 用户信息/手机号信息
 type PlainData struct {
-	OpenID    string `json:"openId"`
-	UnionID   string `json:"unionId"`
-	NickName  string `json:"nickName"`
-	Gender    int    `json:"gender"`
-	City      string `json:"city"`
-	Province  string `json:"province"`
-	Country   string `json:"country"`
-	AvatarURL string `json:"avatarUrl"`
-	Language  string `json:"language"`
+	OpenID          string `json:"openId"`
+	UnionID         string `json:"unionId"`
+	NickName        string `json:"nickName"`
+	Gender          int    `json:"gender"`
+	City            string `json:"city"`
+	Province        string `json:"province"`
+	Country         string `json:"country"`
+	AvatarURL       string `json:"avatarUrl"`
+	Language        string `json:"language"`
 	PhoneNumber     string `json:"phoneNumber"`
 	PurePhoneNumber string `json:"purePhoneNumber"`
 	CountryCode     string `json:"countryCode"`
-	Watermark struct {
+	Watermark       struct {
 		Timestamp int64  `json:"timestamp"`
 		AppID     string `json:"appid"`
 	} `json:"watermark"`

diff --git a/miniprogram/qrcode/qrcode.go b/miniprogram/qrcode/qrcode.go
@@ -74,15 +74,13 @@ func (qrCode *QRCode) fetchCode(urlStr string, body interface{}) (response []byt
 			err = fmt.Errorf("fetchCode error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
 			return nil, err
 		}
-	} else if contentType == "image/jpeg" {
+	}
+	if contentType == "image/jpeg" {
 		// 返回文件
 		return response, nil
-	} else {
-		err = fmt.Errorf("fetchCode error : unknown response content type - %v", contentType)
-		return nil, err
 	}
-
-	return
+	err = fmt.Errorf("fetchCode error : unknown response content type - %v", contentType)
+	return nil, err
 }
 
 // CreateWXAQRCode 获取小程序二维码，适用于需要的码数量较少的业务场景

diff --git a/miniprogram/subscribe/subscribe.go b/miniprogram/subscribe/subscribe.go
@@ -47,6 +47,8 @@ func (s *Subscribe) Send(msg *Message) (err error) {
 	}
 	uri := fmt.Sprintf("%s?access_token=%s", subscribeSendURL, accessToken)
 	response, err := util.PostJSON(uri, msg)
-
+	if err != nil {
+		return
+	}
 	return util.DecodeWithCommonError(response, "Send")
 }
diff --git a/miniprogram/tcb/file.go b/miniprogram/tcb/file.go
@@ -130,5 +130,5 @@ func (tcb *Tcb) BatchDeleteFile(env string, fileIDList []string) (*BatchDeleteFi
 	}
 	batchDeleteFileRes := &BatchDeleteFileRes{}
 	err = util.DecodeWithError(response, batchDeleteFileRes, "BatchDeleteFile")
-	return batchDeleteFileRes, nil
+	return batchDeleteFileRes, err
 }