From 14b5d5db22ee781a12d355cde74c6864bac2a597 Mon Sep 17 00:00:00 2001 From: yxxhero Date: Fri, 13 Aug 2021 08:56:26 +0800 Subject: [PATCH] fix some issue Signed-off-by: yxxhero --- manager/model/settings.go | 2 +- manager/router/router.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manager/model/settings.go b/manager/model/settings.go index 781187a1b..a90483168 100644 --- a/manager/model/settings.go +++ b/manager/model/settings.go @@ -1,7 +1,7 @@ package model type Settings struct { - ID uint `gorm:"primarykey;comment:id" json:"id"` + Model Key string `gorm:"column:key;type:varchar(256);index:uk_settings_key,unique;not null;comment:setting key" json:"key"` Value string `gorm:"column:value;type:varchar(256);not null;comment:setting value" json:"value"` } diff --git a/manager/router/router.go b/manager/router/router.go index 8620998db..911e19079 100644 --- a/manager/router/router.go +++ b/manager/router/router.go @@ -149,8 +149,8 @@ func Init(console bool, verbose bool, publicPath string, service service.REST, e oa.DELETE("/:id", h.DestroyOauth) oa.PUT("/:id", h.UpdateOauth) oa.POST("", h.CreateOauth) - oa.GET("/:oauth_name/signin", h.OauthSignin) - oa.GET("/:oauth_name/callback", h.OauthCallback(jwt)) + oa.GET("/signin/:oauth_name", h.OauthSignin) + oa.GET("/callback/:oauth_name", h.OauthCallback(jwt)) // Security Group sg := apiv1.Group("/security-groups")