merge: integrate http-handler-abort-error architecture refactor

Resolve user package conflicts by keeping main's service-layer logics and
applying Abort* error handling in routers. Align oauth callback with
listener.EmitAdminLoggedIn from main.
This commit is contained in:
ryan
2026-06-18 10:53:03 +08:00
61 changed files with 2030 additions and 1686 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ func RiskControlMiddleware() gin.HandlerFunc {
// 1. 限流背压检测(检测本地缓冲队列是否已满)
if IsBufferFull() {
c.AbortWithStatusJSON(http.StatusTooManyRequests, response.Err("系统繁忙,请稍后再试"))
response.AbortTooManyRequests(c, "系统繁忙,请稍后再试")
return
}
@@ -13,6 +13,7 @@ import (
"github.com/Rain-kl/Wavelet/internal/apps/oauth"
"github.com/Rain-kl/Wavelet/internal/config"
"github.com/Rain-kl/Wavelet/internal/model"
"github.com/Rain-kl/Wavelet/internal/testhelper"
"github.com/Rain-kl/Wavelet/internal/util"
"github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert"
@@ -25,8 +26,7 @@ func TestRiskControlMiddleware(t *testing.T) {
config.Config.ClickHouse.Enabled = false
defer func() { config.Config.ClickHouse.Enabled = false }()
r := gin.New()
r.Use(RiskControlMiddleware())
r := testhelper.NewTestGinEngine(RiskControlMiddleware())
r.GET("/test", func(c *gin.Context) {
c.String(http.StatusOK, "ok")
})
@@ -91,8 +91,7 @@ func TestRiskControlMiddleware(t *testing.T) {
logChan = nil
}()
r := gin.New()
r.Use(RiskControlMiddleware())
r := testhelper.NewTestGinEngine(RiskControlMiddleware())
r.GET("/test", func(c *gin.Context) {
c.String(http.StatusOK, "ok")
})
@@ -126,8 +125,7 @@ func TestRiskControlMiddleware(t *testing.T) {
logChan <- &UserAccessLog{}
}
r := gin.New()
r.Use(RiskControlMiddleware())
r := testhelper.NewTestGinEngine(RiskControlMiddleware())
r.GET("/test", func(c *gin.Context) {
c.String(http.StatusOK, "ok")
})