Browse Source

Merge pull request #707 from flipped-aurora/gva-vue3

修复了一些已知bug
main
奇淼(piexlmax 3 years ago
committed by GitHub
parent
commit
3db735ac61
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      server/core/server.go
  2. 9
      server/core/viper.go
  3. 2
      web/package.json

7
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")

9
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"
@ -60,10 +58,7 @@ 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()
}
local_cache.SetDefaultExpire(time.Second * time.Duration(global.GVA_CONFIG.JWT.ExpiresTime))
)
return v
}

2
web/package.json

@ -21,7 +21,7 @@
"screenfull": "^5.0.2",
"script-ext-html-webpack-plugin": "^2.1.4",
"spark-md5": "^3.0.1",
"vue": "^3.0.0",
"vue": "^3.2.0",
"vue-particle-line": "^0.1.4",
"vue-router": "^4.0.0-0",
"vuex": "^4.0.0-0",

Loading…
Cancel
Save