diff --git a/server/core/server.go b/server/core/server.go index 6f30d54db8237c7f81a1b18fdaef203c8f5c74ba..e11b3419528d470ceeede81c52f689d6bb5e4dcb 100644 --- a/server/core/server.go +++ b/server/core/server.go @@ -6,6 +6,7 @@ import ( "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/initialize" + "github.com/flipped-aurora/gin-vue-admin/server/service/system" "go.uber.org/zap" ) @@ -18,6 +19,12 @@ func RunWindowsServer() { // 初始化redis服务 initialize.Redis() } + + // 从db加载jwt数据 + if global.GVA_DB != nil { + system.LoadAll() + } + Router := initialize.Routers() Router.Static("/form-generator", "./resource/page") diff --git a/server/core/viper.go b/server/core/viper.go index bbcfd364a2274a4298084455a1c02a1beee97fef..22ad526331f0a8a49e756722d980262ce8997053 100644 --- a/server/core/viper.go +++ b/server/core/viper.go @@ -7,8 +7,6 @@ import ( "path/filepath" "time" - "github.com/flipped-aurora/gin-vue-admin/server/service/system" - "github.com/songzhibin97/gkit/cache/local_cache" "github.com/flipped-aurora/gin-vue-admin/server/global" @@ -61,9 +59,6 @@ func Viper(path ...string) *viper.Viper { global.GVA_CONFIG.AutoCode.Root, _ = filepath.Abs("..") global.BlackCache = local_cache.NewCache( local_cache.SetDefaultExpire(time.Duration(global.GVA_CONFIG.JWT.ExpiresTime))) - // 从db加载jwt数据 - if global.GVA_DB != nil { - system.LoadAll() - } + return v }