diff --git a/server/config.yaml b/server/config.yaml index 1ce80a47..faf67f04 100644 --- a/server/config.yaml +++ b/server/config.yaml @@ -39,7 +39,7 @@ system: use-multipoint: false env: 'public' # Change to "develop" to skip authentication for development mode addr: 8888 - db: sqlite + db-type: sqlite # captcha configuration captcha: diff --git a/server/config/config.go b/server/config/config.go index dec3ca96..cb725086 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -16,7 +16,7 @@ type System struct { UseMultipoint bool `mapstructure:"use-multipoint" json:"useMultipoint"` Env string `mapstructure:"env" json:"env"` Addr int `mapstructure:"addr" json:"addr"` - Db string `mapstructure:"db" json:"db"` + DbType string `mapstructure:"db-type" json:"dbType"` } type JWT struct { diff --git a/server/db/db.db b/server/db/db.db index b1991a68..73a5833b 100644 Binary files a/server/db/db.db and b/server/db/db.db differ diff --git a/server/main.go b/server/main.go index a574a655..ff4f57cd 100644 --- a/server/main.go +++ b/server/main.go @@ -8,7 +8,7 @@ import ( ) func main() { - switch global.GVA_CONFIG.System.Db { + switch global.GVA_CONFIG.System.DbType { case "mysql": initialize.Mysql() case "sqlite": diff --git a/web/src/view/systemTools/system/system.vue b/web/src/view/systemTools/system/system.vue index 83ad7bde..ce10471a 100644 --- a/web/src/view/systemTools/system/system.vue +++ b/web/src/view/systemTools/system/system.vue @@ -11,6 +11,12 @@ + + + + + +

jwt签名

@@ -19,28 +25,42 @@ -

mysql admin数据库配置

- - - - - - - - - - - - - - - - - - - - - + +

Redis admin数据库配置

@@ -104,6 +124,7 @@ export default { jwt: {}, casbin: {}, mysql: {}, + sqlite: {}, redis: {}, qiniu: {}, captcha:{}, @@ -142,4 +163,4 @@ h2 { font-size: 16px; box-shadow:-4px 1px 3px 0px #e7e8e8 } - \ No newline at end of file +