未验证 提交 b54a51b4 编写于 作者: Mr.奇淼('s avatar Mr.奇淼( 提交者: GitHub

Merge pull request #704 from iciness/develop

bug修复:jwt黑名单启动时候未加载及未生效
...@@ -6,6 +6,7 @@ import ( ...@@ -6,6 +6,7 @@ import (
"github.com/flipped-aurora/gin-vue-admin/server/global" "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/initialize"
"github.com/flipped-aurora/gin-vue-admin/server/service/system"
"go.uber.org/zap" "go.uber.org/zap"
) )
...@@ -18,6 +19,12 @@ func RunWindowsServer() { ...@@ -18,6 +19,12 @@ func RunWindowsServer() {
// 初始化redis服务 // 初始化redis服务
initialize.Redis() initialize.Redis()
} }
// 从db加载jwt数据
if global.GVA_DB != nil {
system.LoadAll()
}
Router := initialize.Routers() Router := initialize.Routers()
Router.Static("/form-generator", "./resource/page") Router.Static("/form-generator", "./resource/page")
......
...@@ -7,8 +7,6 @@ import ( ...@@ -7,8 +7,6 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/flipped-aurora/gin-vue-admin/server/service/system"
"github.com/songzhibin97/gkit/cache/local_cache" "github.com/songzhibin97/gkit/cache/local_cache"
"github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/global"
...@@ -61,9 +59,6 @@ func Viper(path ...string) *viper.Viper { ...@@ -61,9 +59,6 @@ func Viper(path ...string) *viper.Viper {
global.GVA_CONFIG.AutoCode.Root, _ = filepath.Abs("..") global.GVA_CONFIG.AutoCode.Root, _ = filepath.Abs("..")
global.BlackCache = local_cache.NewCache( global.BlackCache = local_cache.NewCache(
local_cache.SetDefaultExpire(time.Duration(global.GVA_CONFIG.JWT.ExpiresTime))) local_cache.SetDefaultExpire(time.Duration(global.GVA_CONFIG.JWT.ExpiresTime)))
// 从db加载jwt数据
if global.GVA_DB != nil {
system.LoadAll()
}
return v return v
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册