u

code/go-project/base-farmework/pkg/middleware/auth.go

@@ -21,6 +21,7 @@ func Auth() router.HandlerFunc {
 		// 缺少登录信息
 		if tokenHeader == "" || userIdHeader == "" || orgIDHeader == "" {
 			response.Error(c).Code(response.CodeNoLogin).Send()
+			c.Abort()
 			return
 		}
 
@@ -28,6 +29,7 @@ func Auth() router.HandlerFunc {
 		parts := strings.Fields(tokenHeader)
 		if len(parts) != 2 || strings.ToLower(parts[0]) != "bearer" {
 			response.Error(c).Code(response.CodeInvalidToken).Send()
+			c.Abort()
 			return
 		}
 
@@ -41,18 +43,21 @@ func Auth() router.HandlerFunc {
 			default:
 				response.Error(c).Code(response.CodeInvalidToken).Send()
 			}
+			c.Abort()
 			return
 		}
 
 		// user_id 校验
 		if claims.UserID != userIdHeader {
 			response.Error(c).Code(response.CodeInvalidToken).Send()
+			c.Abort()
 			return
 		}
 
 		// org_id 校验
 		if claims.OrgID != orgIDHeader {
 			response.Error(c).Code(response.CodeInvalidToken).Send()
+			c.Abort()
 			return
 		}
 
@@ -70,6 +75,8 @@ func Auth() router.HandlerFunc {
 			return
 		}
 
+		c.Set("orgId", orgIDHeader)
+
 		c.Next()
 	}
 }

code/go-project/base-farmework/pkg/middleware/recover.go

@@ -3,7 +3,6 @@ package middleware
 import (
 	"base-framework/pkg/router"
 	"log"
-	"net/http"
 	"runtime/debug"
 )
 
@@ -12,9 +11,6 @@ func Recover() router.HandlerFunc {
 		defer func() {
 			if err := recover(); err != nil {
 				log.Printf("[PANIC] %v\n%s", err, debug.Stack())
-				c.JSON(http.StatusInternalServerError, map[string]string{
-					"error": "Internal Server Error",
-				})
 			}
 		}()
 		c.Next()