Merge pull request #267 from devfeel/aicode-lint-fixes-v2

fix: resolve golangci-lint issues v2

Author: devfeel

cache/redis/cache_redis.go

@@ -71,14 +71,8 @@ func (ca *RedisCache) GetInt(key string) (int, error) {
 	v, err := ca.GetString(key)
 	if err != nil || v == "" {
 		return 0, err
-	} else {
-		i, e := strconv.Atoi(v)
-		if e != nil {
-			return 0, err
-		} else {
-			return i, nil
-		}
 	}
+	return strconv.Atoi(v)
 }
 
 //  returns value int64 format by given key
@@ -87,14 +81,8 @@ func (ca *RedisCache) GetInt64(key string) (int64, error) {
 	v, err := ca.GetString(key)
 	if err != nil || v == "" {
 		return ZeroInt64, err
-	} else {
-		i, e := strconv.ParseInt(v, 10, 64)
-		if e != nil {
-			return ZeroInt64, err
-		} else {
-			return i, nil
-		}
 	}
+	return strconv.ParseInt(v, 10, 64)
 }
 
 // Set cache to redis.

cache/runtime/cache_runtime.go

@@ -66,9 +66,8 @@ func (ca *RuntimeCache) GetString(key string) (string, error) {
 	v, err := ca.Get(key)
 	if err != nil || v == nil {
 		return "", err
-	} else {
-		return fmt.Sprint(v), nil
 	}
+	return fmt.Sprint(v), nil
 }
 
 // returns value int format by given key
@@ -77,14 +76,8 @@ func (ca *RuntimeCache) GetInt(key string) (int, error) {
 	v, err := ca.GetString(key)
 	if err != nil || v == "" {
 		return 0, err
-	} else {
-		i, e := strconv.Atoi(v)
-		if e != nil {
-			return 0, e
-		} else {
-			return i, nil
-		}
 	}
+	return strconv.Atoi(v)
 }
 
 // returns value int64 format by given key
@@ -93,14 +86,8 @@ func (ca *RuntimeCache) GetInt64(key string) (int64, error) {
 	v, err := ca.GetString(key)
 	if err != nil || v == "" {
 		return ZeroInt64, nil
-	} else {
-		i, e := strconv.ParseInt(v, 10, 64)
-		if e != nil {
-			return ZeroInt64, e
-		} else {
-			return i, nil
-		}
 	}
+	return strconv.ParseInt(v, 10, 64)
 }
 
 // Set cache to runtime.

config/configs.go

@@ -3,7 +3,7 @@ package config
 import (
 	"encoding/xml"
 	"errors"
-	"io/ioutil"
+	"os"
 
 	"github.com/devfeel/dotweb/core"
 	"github.com/devfeel/dotweb/framework/file"
@@ -264,7 +264,7 @@ func dealConfigDefaultSet(c *Config) {
 }
 
 func initConfig(configFile string, ctType string, parser func([]byte, interface{}) error) (*Config, error) {
-	content, err := ioutil.ReadFile(configFile)
+	content, err := os.ReadFile(configFile)
 	if err != nil {
 		return nil, errors.New("DotWeb:Config:initConfig current cType:" + ctType + " config file [" + configFile + "] cannot be parsed - " + err.Error())
 	}

config/configset.go

@@ -3,7 +3,7 @@ package config
 import (
 	"encoding/xml"
 	"errors"
-	"io/ioutil"
+	"os"
 
 	"github.com/devfeel/dotweb/core"
 )
@@ -39,7 +39,7 @@ func ParseConfigSetYaml(configFile string) (core.ConcurrenceMap, error) {
 }
 
 func parseConfigSetFile(configFile string, confType string) (core.ConcurrenceMap, error) {
-	content, err := ioutil.ReadFile(configFile)
+	content, err := os.ReadFile(configFile)
 	if err != nil {
 		return nil, errors.New("DotWeb:Config:parseConfigSetFile 配置文件[" + configFile + ", " + confType + "]无法解析 - " + err.Error())
 	}

request.go

@@ -1,7 +1,7 @@
 package dotweb
 
 import (
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/url"
@@ -159,7 +159,7 @@ func (req *Request) PostBody() []byte {
 				req.Body = http.MaxBytesReader(req.httpCtx.Response().Writer(), req.Body, req.httpApp().Config.Server.MaxBodySize)
 			}
 		}
-		bts, err := ioutil.ReadAll(req.Body)
+		bts, err := io.ReadAll(req.Body)
 		if err != nil {
 			//if err, panic it
 			panic(err)

server.go

@@ -541,7 +541,7 @@ func checkIsWebSocketRequest(req *http.Request) bool {
 
 // check request is startwith /debug/
 func checkIsDebugRequest(req *http.Request) bool {
-	if strings.Index(req.RequestURI, "/debug/") == 0 {
+	if strings.HasPrefix(req.RequestURI, "/debug/") {
 		return true
 	}
 	return false

tree.go

@@ -17,7 +17,6 @@ func min(a, b int) int {
 	return b
 }
 
-const maxParamCount uint8 = ^uint8(0)
 
 func countParams(path string) uint8 {
 	var n uint

uploadfile.go

@@ -19,7 +19,6 @@ type UploadFile struct {
 	fileExt        string // file extensions
 	fileName       string
 	randomFileName string
-	fileSize       int64
 }
 
 func NewUploadFile(file multipart.File, header *multipart.FileHeader) *UploadFile {

utils_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"