diff --git a/http/router/client.go b/http/router/client.go index 2f51dc1..b4118c1 100644 --- a/http/router/client.go +++ b/http/router/client.go @@ -10,7 +10,7 @@ import ( // @description: 登陆相关API // @param r func ClientApi(r *gin.RouterGroup) { - client := r.Group("client", middleware.Authorization(), middleware.RequestLog()) + client := r.Group("client", middleware.RequestLog(), middleware.Authorization()) { client.POST("", api.Client().Save) // 新增/编辑客户端 client.DELETE("/:id", api.Client().Delete) // 删除客户端 diff --git a/http/router/dashboard.go b/http/router/dashboard.go index c1f3147..c4b5210 100644 --- a/http/router/dashboard.go +++ b/http/router/dashboard.go @@ -10,7 +10,7 @@ import ( // @description: 控制台相关接口 // @param r func DashboardApi(r *gin.RouterGroup) { - dashboard := r.Group("dashboard", middleware.Authorization(), middleware.RequestLog()) + dashboard := r.Group("dashboard", middleware.RequestLog(), middleware.Authorization()) { dashboard.GET("/request/list", api.Dashboard().List) // 请求日志 dashboard.GET("/daily-poetry", api.Dashboard().DailyPoetry) // 每日诗词 diff --git a/http/router/setting.go b/http/router/setting.go index fd80496..5f0d830 100644 --- a/http/router/setting.go +++ b/http/router/setting.go @@ -10,7 +10,7 @@ import ( // @description: 设置相关API // @param r func SettingApi(r *gin.RouterGroup) { - setting := r.Group("setting", middleware.Authorization(), middleware.RequestLog()) + setting := r.Group("setting", middleware.RequestLog(), middleware.Authorization()) { setting.POST("", api.Setting().Set) // 新增/编辑设置 setting.DELETE("/:code", api.Setting().Delete) // 删除配置 diff --git a/http/router/user.go b/http/router/user.go index 5a5687b..9b5b0b7 100644 --- a/http/router/user.go +++ b/http/router/user.go @@ -10,7 +10,7 @@ import ( // @description: 用户相关API // @param r func UserApi(r *gin.RouterGroup) { - userApi := r.Group("user", middleware.Authorization(), middleware.RequestLog()) + userApi := r.Group("user", middleware.RequestLog(), middleware.Authorization()) { userApi.GET("/info", api.User().GetLoginUser) // 获取当前登陆用户信息 userApi.POST("", api.User().SaveUser) // 新增/编辑用户 diff --git a/model/wireguard.go b/model/wireguard.go index 82ed45e..bdf3e13 100644 --- a/model/wireguard.go +++ b/model/wireguard.go @@ -22,16 +22,3 @@ type Client struct { func (Client) TableName() string { return "t_client" } - -// Watcher -// @description: 监听日志 -type Watcher struct { - Base - ClientId string `json:"clientId" gorm:"type:char(36);not null;comment:'客户端id'"` - NotifyResult string `json:"notifyResult" gorm:"type:text;default null;comment:'通知结果'"` - IsSend int `json:"isSend" gorm:"type:tinyint(1);default 0;comment:'是否已通知'"` -} - -func (Watcher) TableName() string { - return "t_watcher" -}