Merge pull request #266 from devfeel/aicode-lint-fixes

fix: resolve golangci-lint issues

Author: devfeel

context.go

@@ -29,6 +29,10 @@ const (
 	ItemKeyHandleDuration = "dotweb.HttpContext.HandleDuration"
 )
 
+// ctxKey is a custom type for context keys to avoid staticcheck warnings
+type ctxKey string
+const requestIDKey ctxKey = "RequestID"
+
 const (
 	innerKeyAddView = "inner_AddView"
 )
@@ -200,7 +204,7 @@ func (ctx *HttpContext) Context() context.Context {
 // withvalue RequestID
 func (ctx *HttpContext) SetTimeoutContext(timeout time.Duration) context.Context {
 	ctx.context, ctx.cancel = context.WithTimeout(context.Background(), timeout)
-	ctx.context = context.WithValue(ctx.context, "RequestID", ctx.Request().RequestID())
+	ctx.context = context.WithValue(ctx.context, requestIDKey, ctx.Request().RequestID())
 	return ctx.context
 }
 
@@ -210,7 +214,7 @@ func (ctx *HttpContext) WithContext(runCtx context.Context) {
 		panic("nil context")
 	}
 	ctx.context = runCtx
-	ctx.context = context.WithValue(ctx.context, "RequestID", ctx.Request().RequestID())
+	ctx.context = context.WithValue(ctx.context, requestIDKey, ctx.Request().RequestID())
 }
 
 // HttpServer return HttpServer

dotweb.go

@@ -535,7 +535,7 @@ func (app *DotWeb) initPlugins() {
 func (app *DotWeb) initBindMiddleware() {
 	router := app.HttpServer.Router().(*router)
 	// bind app middlewares
-	for fullExpress, _ := range router.allRouterExpress {
+	for fullExpress := range router.allRouterExpress {
 		expresses := strings.Split(fullExpress, routerExpressSplit)
 		if len(expresses) < 2 {
 			continue
@@ -567,7 +567,7 @@ func (app *DotWeb) initBindMiddleware() {
 		if len(xg.middlewares) <= 0 {
 			continue
 		}
-		for fullExpress, _ := range xg.allRouterExpress {
+		for fullExpress := range xg.allRouterExpress {
 			expresses := strings.Split(fullExpress, routerExpressSplit)
 			if len(expresses) < 2 {
 				continue

dotweb_sysgroup.go

@@ -104,7 +104,7 @@ func showQuery(ctx Context) error {
 func showRouters(ctx Context) error {
 	data := ""
 	routerCount := len(ctx.HttpServer().router.GetAllRouterExpress())
-	for k, _ := range ctx.HttpServer().router.GetAllRouterExpress() {
+	for k := range ctx.HttpServer().router.GetAllRouterExpress() {
 		method := strings.Split(k, routerExpressSplit)[0]
 		router := strings.Split(k, routerExpressSplit)[1]
 		data += "<tr><td>" + method + "</td><td>" + router + "</td></tr>"

framework/crypto/des/des.go

@@ -67,7 +67,7 @@ func ECBDecrypt(crypted, key []byte) ([]byte, error) {
 
 // [golang ECB 3DES Encrypt]
 func TripleEcbDesEncrypt(origData, key []byte) ([]byte, error) {
-	tkey := make([]byte, 24, 24)
+	tkey := make([]byte, 24)
 	copy(tkey, key)
 	k1 := tkey[:8]
 	k2 := tkey[8:16]
@@ -97,7 +97,7 @@ func TripleEcbDesEncrypt(origData, key []byte) ([]byte, error) {
 
 // [golang ECB 3DES Decrypt]
 func TripleEcbDesDecrypt(crypted, key []byte) ([]byte, error) {
-	tkey := make([]byte, 24, 24)
+	tkey := make([]byte, 24)
 	copy(tkey, key)
 	k1 := tkey[:8]
 	k2 := tkey[8:16]

logger/xlog.go

@@ -129,7 +129,6 @@ func (l *xLog) writeLog(chanLog chanLog, level string) {
 	switch level {
 	case "custom":
 		filePath = filePath + "_" + time.Now().Format(defaultDateFormatForFileName) + ".log"
-		break
 	}
 	log := chanLog.Content
 	if !chanLog.isRaw {
@@ -157,10 +156,10 @@ func writeFile(logFile string, log string) {
 	mode = 0666
 	logstr := log + "\r\n"
 	file, err := os.OpenFile(logFile, flag, mode)
-	defer file.Close()
 	if err != nil {
 		fmt.Println(logFile, err)
 		return
 	}
+	defer file.Close()
 	file.WriteString(logstr)
 }

middleware.go

@@ -168,7 +168,7 @@ func (m *RequestLogMiddleware) Handle(ctx Context) error {
 		} else {
 			begin = beginVal.(time.Time)
 		}
-		timeTaken = uint64(time.Now().Sub(begin) / time.Millisecond)
+		timeTaken = uint64(time.Since(begin) / time.Millisecond)
 	}
 	log := ctx.Request().Url() + " " + logContext(ctx, timeTaken)
 	ctx.HttpServer().Logger().Debug(log, LogTarget_HttpRequest)
@@ -217,7 +217,7 @@ func (m *TimeoutHookMiddleware) Handle(ctx Context) error {
 	// Do next
 	err := m.Next(ctx)
 	if m.HookHandle != nil {
-		realDuration := time.Now().Sub(begin)
+		realDuration := time.Since(begin)
 		ctx.Items().Set(ItemKeyHandleDuration, realDuration)
 		if realDuration > m.TimeoutDuration {
 			m.HookHandle(ctx)

request.go

@@ -153,13 +153,10 @@ func (req *Request) PostBody() []byte {
 		if req.httpCtx != nil {
 			switch req.httpCtx.HttpServer().DotApp.Config.Server.MaxBodySize {
 			case -1:
-				break
 			case 0:
 				req.Body = http.MaxBytesReader(req.httpCtx.Response().Writer(), req.Body, maxBodySize)
-				break
 			default:
 				req.Body = http.MaxBytesReader(req.httpCtx.Response().Writer(), req.Body, req.httpApp().Config.Server.MaxBodySize)
-				break
 			}
 		}
 		bts, err := ioutil.ReadAll(req.Body)

router.go

@@ -416,7 +416,7 @@ func (r *router) RegisterServerFile(routeMethod string, path string, fileRoot st
 	var root http.FileSystem
 	root = http.Dir(fileRoot)
 	if !r.server.ServerConfig().EnabledListDir {
-		root = &core.HideReaddirFS{root}
+		root = &core.HideReaddirFS{FileSystem: root}
 	}
 	fileServer := http.FileServer(root)
 	r.add(routeMethod, realPath, r.wrapFileHandle(fileServer, excludeExtension))
@@ -607,7 +607,7 @@ func (r *router) wrapFileHandle(fileHandler http.Handler, excludeExtension []str
 			httpCtx.Handler()(httpCtx)
 		}
 		if r.server.Logger().IsEnabledLog() {
-			timetaken := int64(time.Now().Sub(startTime) / time.Millisecond)
+			timetaken := int64(time.Since(startTime) / time.Millisecond)
 			r.server.Logger().Debug(httpCtx.Request().Url()+" "+logRequest(httpCtx.Request().Request, timetaken), LogTarget_HttpRequest)
 		}
 	}
@@ -645,7 +645,7 @@ func (r *router) wrapWebSocketHandle(handler HttpHandle) websocket.Handler {
 				// increment error count
 				r.server.StateInfo().AddErrorCount(httpCtx.Request().Path(), fmt.Errorf("%v", err), 1)
 			}
-			timetaken := int64(time.Now().Sub(startTime) / time.Millisecond)
+			timetaken := int64(time.Since(startTime) / time.Millisecond)
 			// HttpServer Logging
 			r.server.Logger().Debug(httpCtx.Request().Url()+" "+logWebsocketContext(httpCtx, timetaken), LogTarget_HttpRequest)