From 059c0ff56d9cf00c78a6d0cfd877ac52cdb77af1 Mon Sep 17 00:00:00 2001
From: rikugun <v5.rikugun@gmail.com>
Date: Sun, 12 Apr 2020 11:39:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0sqlite=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/config.yaml                         |   2 +-
 server/config/config.go                    |   2 +-
 server/db/db.db                            | Bin 368640 -> 368640 bytes
 server/main.go                             |   2 +-
 web/src/view/systemTools/system/system.vue |  67 ++++++++++++++-------
 5 files changed, 47 insertions(+), 26 deletions(-)

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 b1991a68ef1d22ad1e6c3057d8c8f2cee56a6df5..73a5833b85ed0d68bbdeb1772c4bb40d01614b55 100644
GIT binary patch
delta 274
zcmZoTAl7g|Y=Sgn=|mZ4)=~yNjm*ZB))dCp6sFb`=B+6#i}XEKFfgp(U&8o+U!QLS
zpBwLE-cnv}p1C}R+$XprxbAV~bAI3qVie%`#?i>Z#6E-Fl<hcMEbDvLW>zVdRV)U~
z2brCimM~T@c}!MRh~iCS6l7v$W#C|vm*=pZzT!Tk%=E+cj3(1-Z!mK6rU@ZS8r(pY
zR6>@Ny@)KSoW_hKDKE{zFVD|-m@(J$daeOu-cLWf6G|JW@2zLF0^2iv%LT@m?WGqP
Z*RgHyxWO32Hr@U{V@#U^%Q6Sn1ORvrO<e#0

delta 62
zcmV-E0Kxx&z!reO7LXeOa*-TE1#$o`JMn>Jg=7JRWCDd`1GQuXqAv)v01ulFKMvZr
U4$uMZ50`M!0R@IY1g1a*V5j*NK>z>%

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 @@
       <el-form-item label="端口值">
         <el-input v-model="config.system.addr"></el-input>
       </el-form-item>
+      <el-form-item label="数据库类型">
+        <el-select v-model="config.system.dbType">
+          <el-option value="sqlite"></el-option>
+          <el-option value="mysql"></el-option>
+        </el-select>
+      </el-form-item>
       <h2>jwt签名</h2>
       <el-form-item label="jwt签名">
         <el-input v-model="config.jwt.signingKey"></el-input>
@@ -19,28 +25,42 @@
       <el-form-item label="模型地址">
         <el-input v-model="config.casbin.modelPath"></el-input>
       </el-form-item>
-      <h2>mysql admin数据库配置</h2>
-      <el-form-item label="username">
-        <el-input v-model="config.mysql.username"></el-input>
-      </el-form-item>
-      <el-form-item label="password">
-        <el-input v-model="config.mysql.password"></el-input>
-      </el-form-item>
-      <el-form-item label="path">
-        <el-input v-model="config.mysql.path"></el-input>
-      </el-form-item>
-      <el-form-item label="dbname">
-        <el-input v-model="config.mysql.dbname"></el-input>
-      </el-form-item>
-      <el-form-item label="maxIdleConns">
-        <el-input v-model.number="config.mysql.maxIdleConns"></el-input>
-      </el-form-item>
-      <el-form-item label="maxOpenConns">
-        <el-input v-model.number="config.mysql.maxOpenConns"></el-input>
-      </el-form-item>
-      <el-form-item label="logMode">
-        <el-checkbox v-model="config.log.logMode"></el-checkbox>
-      </el-form-item>
+      <template v-show="config.system.dbType == 'mysql'">
+        <h2>mysql admin数据库配置</h2>
+        <el-form-item label="username">
+          <el-input v-model="config.mysql.username"></el-input>
+        </el-form-item>
+        <el-form-item label="password">
+          <el-input v-model="config.mysql.password"></el-input>
+        </el-form-item>
+        <el-form-item label="path">
+          <el-input v-model="config.mysql.path"></el-input>
+        </el-form-item>
+        <el-form-item label="dbname">
+          <el-input v-model="config.mysql.dbname"></el-input>
+        </el-form-item>
+        <el-form-item label="maxIdleConns">
+          <el-input v-model.number="config.mysql.maxIdleConns"></el-input>
+        </el-form-item>
+        <el-form-item label="maxOpenConns">
+          <el-input v-model.number="config.mysql.maxOpenConns"></el-input>
+        </el-form-item>
+        <el-form-item label="logMode">
+          <el-checkbox v-model="config.log.logMode"></el-checkbox>
+        </el-form-item>
+      </template>
+      <template v-show="config.system.dbType == 'sqlite'">
+        <h2>sqlite admin数据库配置</h2>
+        <el-form-item label="path">
+          <el-input v-model="config.sqlite.path"></el-input>
+        </el-form-item>
+        <el-form-item label="config">
+          <el-input v-model="config.sqlite.config"></el-input>
+        </el-form-item>
+        <el-form-item label="logMode">
+          <el-checkbox v-model="config.sqlite.logMode"></el-checkbox>
+        </el-form-item>
+      </template>
       <h2>Redis admin数据库配置</h2>
       <el-form-item label="addr">
         <el-input v-model="config.redis.addr"></el-input>
@@ -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
 }
-</style>
\ No newline at end of file
+</style>
-- 
GitLab