🐛 fixed websocket connection issue

This commit is contained in:
landaiqing
2024-09-08 16:51:23 +08:00
parent a60739d56d
commit cd60d98e86
2 changed files with 12 additions and 21 deletions

View File

@@ -1,12 +0,0 @@
package middleware
import (
"github.com/gin-gonic/gin"
)
func ValidateSignMiddleware() gin.HandlerFunc {
return func(c *gin.Context) {
c.Next()
}
}

View File

@@ -4,7 +4,6 @@ import (
"github.com/gin-contrib/cors" "github.com/gin-contrib/cors"
ginI18n "github.com/gin-contrib/i18n" ginI18n "github.com/gin-contrib/i18n"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"schisandra-cloud-album/api"
"schisandra-cloud-album/common/result" "schisandra-cloud-album/common/result"
"schisandra-cloud-album/global" "schisandra-cloud-album/global"
"schisandra-cloud-album/middleware" "schisandra-cloud-album/middleware"
@@ -12,8 +11,6 @@ import (
"time" "time"
) )
var oauth = api.Api.OAuthApi
func InitRouter() *gin.Engine { func InitRouter() *gin.Engine {
gin.SetMode(global.CONFIG.System.Env) gin.SetMode(global.CONFIG.System.Env)
router := gin.Default() router := gin.Default()
@@ -34,23 +31,29 @@ func InitRouter() *gin.Engine {
MaxAge: 12 * time.Hour, MaxAge: 12 * time.Hour,
})) }))
// 国际化设置 // 国际化设置
router.Use(middleware.I18n(), middleware.ValidateSignMiddleware()) router.Use(middleware.I18n())
router.Use(middleware.SecurityHeaders())
publicGroup := router.Group("api") // 不需要鉴权的路由组 websocketRouter := router.Group("api")
{ {
modules.ClientRouter(publicGroup) // 注册客户端路由 modules.WebsocketRouter(websocketRouter) // 注册websocket路由
modules.SwaggerRouter(publicGroup) // 注册swagger路由 }
modules.WebsocketRouter(publicGroup) // 注册websocket路由 publicGroup := router.Group("api") // 不需要鉴权的路由
publicGroup.Use(middleware.SecurityHeaders())
{
modules.ClientRouter(publicGroup) // 注册客户端路由
modules.SwaggerRouter(publicGroup) // 注册swagger路由
modules.OauthRouter(publicGroup) modules.OauthRouter(publicGroup)
modules.CaptchaRouter(publicGroup) // 注册验证码路由 modules.CaptchaRouter(publicGroup) // 注册验证码路由
modules.SmsRouter(publicGroup) // 注册短信验证码路由 modules.SmsRouter(publicGroup) // 注册短信验证码路由
modules.UserRouter(publicGroup) // 注册鉴权路由 modules.UserRouter(publicGroup) // 注册鉴权路由
} }
authGroup := router.Group("api") // 需要鉴权的路由组 authGroup := router.Group("api") // 需要鉴权的路由组
authGroup.Use( authGroup.Use(
middleware.JWTAuthMiddleware(), middleware.JWTAuthMiddleware(),
middleware.CasbinMiddleware(), middleware.CasbinMiddleware(),
middleware.SecurityHeaders(),
) )
{ {
modules.UserRouterAuth(authGroup) // 注册鉴权路由 modules.UserRouterAuth(authGroup) // 注册鉴权路由