From 5e657972b35dd28d8a7f126f09252f54bde2afa5 Mon Sep 17 00:00:00 2001
From: QM303176530 <303176530@qq.com>
Date: Sun, 20 Sep 2020 12:28:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=20xlsx=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=20=E5=90=8E=E7=BB=AD=E4=BD=9C=E4=B8=BA?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E6=8E=A5=E5=8F=A3=E7=A4=BA=E4=BE=8B=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6form=E8=A1=A8=E5=8D=95=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/global/response/response.go         |   2 -
 server/go.mod                              |   1 -
 web/src/view/systemTools/system/system.vue | 358 +++++++++++++--------
 3 files changed, 219 insertions(+), 142 deletions(-)

diff --git a/server/global/response/response.go b/server/global/response/response.go
index 0ac1c93e..35bc3fa2 100644
--- a/server/global/response/response.go
+++ b/server/global/response/response.go
@@ -1,10 +1,8 @@
 package response
 
 import (
-	"github.com/360EntSecGroup-Skylar/excelize"
 	"github.com/gin-gonic/gin"
 	"net/http"
-	"strconv"
 )
 
 type Response struct {
diff --git a/server/go.mod b/server/go.mod
index aefc8e36..9a1da967 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -3,7 +3,6 @@ module gin-vue-admin
 go 1.12
 
 require (
-	github.com/360EntSecGroup-Skylar/excelize v1.4.1 // indirect
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/casbin/casbin v1.9.1
 	github.com/casbin/casbin/v2 v2.11.0
diff --git a/web/src/view/systemTools/system/system.vue b/web/src/view/systemTools/system/system.vue
index 33333cb5..ff2ebcad 100644
--- a/web/src/view/systemTools/system/system.vue
+++ b/web/src/view/systemTools/system/system.vue
@@ -1,138 +1,218 @@
 <template>
-	<div class="system">
-		<el-form :model="config" label-width="100px" ref="form" class="system">
-			<h2>系统配置</h2>
-			<el-form-item label="多点登录拦截">
-				<el-checkbox v-model="config.system.useMultipoint">开启</el-checkbox>
-			</el-form-item>
-			<el-form-item label="环境值">
-				<el-input v-model="config.system.env"></el-input>
-			</el-form-item>
-			<el-form-item label="端口值">
-				<el-input v-model.number="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>
-			</el-form-item>
-			<h2>casbin配置</h2>
-			<el-form-item label="模型地址">
-				<el-input v-model="config.casbin.modelPath"></el-input>
-			</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.mysql.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>
-			</el-form-item>
-			<el-form-item label="password">
-				<el-input v-model="config.redis.password"></el-input>
-			</el-form-item>
-			<el-form-item label="db">
-				<el-input v-model="config.redis.db"></el-input>
-			</el-form-item>
-			<h2>上传配置</h2>
-				<el-form-item label="本地或七牛云">
-					<el-checkbox v-model="config.localUpload.local">本地</el-checkbox>
-				</el-form-item>
-				<el-form-item label="本地文件路径">
-					<el-input v-model="config.localUpload.filePath"></el-input>
-				</el-form-item>
-			<h2>七牛密钥配置</h2>
-			<el-form-item label="accessKey">
-				<el-input v-model="config.qiniu.accessKey"></el-input>
-			</el-form-item>
-			<el-form-item label="secretKey">
-				<el-input v-model="config.qiniu.secretKey"></el-input>
-			</el-form-item>
-			<h2>验证码配置</h2>
-			<el-form-item label="keyLong">
-				<el-input v-model.number="config.captcha.keyLong"></el-input>
-			</el-form-item>
-			<el-form-item label="imgWidth">
-				<el-input v-model.number="config.captcha.imgWidth"></el-input>
-			</el-form-item>
-			<el-form-item label="imgHeight">
-				<el-input v-model.number="config.captcha.imgHeight"></el-input>
-			</el-form-item>
-			<h2>日志配置</h2>
-			<el-form-item label="prefix">
-				<el-input v-model.number="config.log.prefix"></el-input>
-			</el-form-item>
-			<el-form-item label="logFile">
-				<el-checkbox v-model="config.log.logFile"></el-checkbox>
-			</el-form-item>
-			<h2>邮箱配置</h2>
-			<el-form-item label="emailFrom">
-				<el-input v-model="config.email.emailFrom"></el-input>
-			</el-form-item>
-			<el-form-item label="emailNickName">
-				<el-input v-model="config.email.emailNickName"></el-input>
-			</el-form-item>
-			<el-form-item label="emailSecret">
-				<el-input v-model="config.email.emailSecret"></el-input>
-			</el-form-item>
-			<el-form-item label="emailTo">
-				<el-input v-model="config.email.emailTo" placeholder="可多个，以逗号分隔"></el-input>
-			</el-form-item>
-			<el-form-item label="emailHost">
-				<el-input v-model="config.email.emailHost"></el-input>
-			</el-form-item>
-			<el-form-item label="emailPort">
-				<el-input v-model.number="config.email.emailPort"></el-input>
-			</el-form-item>
-			<el-form-item label="emailIsSSL">
-				<el-checkbox v-model="config.email.emailIsSSL"></el-checkbox>
-			</el-form-item>
-			<el-form-item label="测试邮件">
-				<el-button @click="email">测试邮件</el-button>
-			</el-form-item>
-			<el-form-item>
-				<el-button @click="update" type="primary">立即更新</el-button>
-				<el-button @click="reload" type="primary">重启服务（开发中）</el-button>
-			</el-form-item>
-		</el-form>
-	</div>
+  <div class="system">
+    <el-form :model="config" label-width="100px" ref="form" class="system">
+      <h2>系统配置</h2>
+      <el-form-item label="多点登录拦截">
+        <el-checkbox v-model="config.system.useMultipoint">开启</el-checkbox>
+      </el-form-item>
+      <el-form-item label="环境值">
+        <el-input v-model="config.system.env"></el-input>
+      </el-form-item>
+      <el-form-item label="端口值">
+        <el-input v-model.number="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-option value="postgresql"></el-option>
+          <el-option value="sqlserver"></el-option>
+        </el-select>
+      </el-form-item>
+      <h2>jwt签名</h2>
+      <el-form-item label="jwt签名">
+        <el-input v-model="config.jwt.signingKey"></el-input>
+      </el-form-item>
+      <h2>casbin配置</h2>
+      <el-form-item label="模型地址">
+        <el-input v-model="config.casbin.modelPath"></el-input>
+      </el-form-item>
+      <template v-if="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.mysql.logMode"></el-checkbox>
+        </el-form-item>
+      </template>
+      <template v-if="config.system.dbType == 'postgresql'">
+        <h2>postgresql 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="dbName">
+          <el-input v-model="config.mysql.dbName"></el-input>
+        </el-form-item>
+        <el-form-item label="port">
+          <el-input v-model="config.mysql.port"></el-input>
+        </el-form-item>
+        <el-form-item label="config">
+          <el-input v-model="config.mysql.config"></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="logger">
+          <el-checkbox v-model="config.mysql.logger"></el-checkbox>
+        </el-form-item>
+        <el-form-item label="prefer-simple-protocol">
+          <el-checkbox v-model="config.mysql.preferSimpleProtocol"></el-checkbox>
+        </el-form-item>
+      </template>
+      <template v-if="config.system.dbType == 'sqlite'">
+        <h2>sqlite admin数据库配置</h2>
+        <el-form-item label="path">
+          <el-input v-model="config.mysql.path"></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="logger">
+          <el-checkbox v-model="config.mysql.logger"></el-checkbox>
+        </el-form-item>
+      </template>
+      <template v-if="config.system.dbType == 'sqlserver'">
+        <h2>sqlserver admin数据库配置</h2>
+        <el-form-item label="username">
+          <el-input v-model="config.sqlserver.username"></el-input>
+        </el-form-item>
+        <el-form-item label="password">
+          <el-input v-model="config.sqlserver.password"></el-input>
+        </el-form-item>
+        <el-form-item label="path">
+          <el-input v-model="config.sqlserver.path"></el-input>
+        </el-form-item>
+        <el-form-item label="dbname">
+          <el-input v-model="config.sqlserver.dbname"></el-input>
+        </el-form-item>
+        <el-form-item label="maxIdleConns">
+          <el-input v-model.number="config.sqlserver.maxIdleConns"></el-input>
+        </el-form-item>
+        <el-form-item label="maxOpenConns">
+          <el-input v-model.number="config.sqlserver.maxOpenConns"></el-input>
+        </el-form-item>
+        <el-form-item label="logger">
+          <el-checkbox v-model="config.sqlserver.logger"></el-checkbox>
+        </el-form-item>
+      </template>
+      <h2>Redis admin数据库配置</h2>
+      <el-form-item label="addr">
+        <el-input v-model="config.redis.addr"></el-input>
+      </el-form-item>
+      <el-form-item label="password">
+        <el-input v-model="config.redis.password"></el-input>
+      </el-form-item>
+      <el-form-item label="db">
+        <el-input v-model="config.redis.db"></el-input>
+      </el-form-item>
+      <h2>上传配置</h2>
+      <el-form-item label="本地或七牛云">
+        <el-checkbox v-model="config.localUpload.local">本地</el-checkbox>
+      </el-form-item>
+      <el-form-item label="本地文件路径">
+        <el-input v-model="config.localUpload.filePath"></el-input>
+      </el-form-item>
+      <h2>七牛密钥配置</h2>
+      <el-form-item label="accessKey">
+        <el-input v-model="config.qiniu.accessKey"></el-input>
+      </el-form-item>
+      <el-form-item label="secretKey">
+        <el-input v-model="config.qiniu.secretKey"></el-input>
+      </el-form-item>
+      <h2>验证码配置</h2>
+      <el-form-item label="keyLong">
+        <el-input v-model.number="config.captcha.keyLong"></el-input>
+      </el-form-item>
+      <el-form-item label="imgWidth">
+        <el-input v-model.number="config.captcha.imgWidth"></el-input>
+      </el-form-item>
+      <el-form-item label="imgHeight">
+        <el-input v-model.number="config.captcha.imgHeight"></el-input>
+      </el-form-item>
+      <h2>日志配置</h2>
+      <el-form-item label="level">
+        <el-input v-model.number="config.zap.level"></el-input>
+      </el-form-item>
+      <el-form-item label="format">
+        <el-input v-model="config.zap.format"></el-input>
+      </el-form-item>
+      <el-form-item label="prefix">
+        <el-input v-model="config.zap.prefix"></el-input>
+      </el-form-item>
+      <el-form-item label="director">
+        <el-input v-model="config.zap.director"></el-input>
+      </el-form-item>
+      <el-form-item label="link-name">
+        <el-input v-model="config.zap.linkName"></el-input>
+      </el-form-item>
+      <el-form-item label="encode-level">
+        <el-input v-model="config.zap.encodeLevel"></el-input>
+      </el-form-item>
+      <el-form-item label="stacktrace-key">
+        <el-input v-model="config.zap.stacktraceKey"></el-input>
+      </el-form-item>
+      <el-form-item label="show-line">
+        <el-checkbox v-model="config.zap.showLine"></el-checkbox>
+      </el-form-item>
+      <el-form-item label="log-in-console">
+        <el-checkbox v-model="config.zap.logInConsole"></el-checkbox>
+      </el-form-item>
+      <h2>邮箱配置</h2>
+      <el-form-item label="emailFrom">
+        <el-input v-model="config.email.emailFrom"></el-input>
+      </el-form-item>
+      <el-form-item label="emailNickName">
+        <el-input v-model="config.email.emailNickName"></el-input>
+      </el-form-item>
+      <el-form-item label="emailSecret">
+        <el-input v-model="config.email.emailSecret"></el-input>
+      </el-form-item>
+      <el-form-item label="emailTo">
+        <el-input v-model="config.email.emailTo" placeholder="可多个，以逗号分隔"></el-input>
+      </el-form-item>
+      <el-form-item label="emailHost">
+        <el-input v-model="config.email.emailHost"></el-input>
+      </el-form-item>
+      <el-form-item label="emailPort">
+        <el-input v-model.number="config.email.emailPort"></el-input>
+      </el-form-item>
+      <el-form-item label="emailIsSSL">
+        <el-checkbox v-model="config.email.emailIsSSL"></el-checkbox>
+      </el-form-item>
+      <el-form-item label="测试邮件">
+        <el-button @click="email">测试邮件</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="update" type="primary">立即更新</el-button>
+        <el-button @click="reload" type="primary">重启服务（开发中）</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
 </template>
 
 <script>
@@ -151,9 +231,9 @@ export default {
         redis: {},
         qiniu: {},
         captcha: {},
-		log: {},
-		localUpload: {},
-		email: {},
+        log: {},
+        localUpload: {},
+        email: {}
       }
     };
   },
@@ -187,11 +267,11 @@ export default {
         });
         await this.initForm();
       } else {
-		this.$message({
+        this.$message({
           type: "error",
           message: "邮件发送失败"
         });
-	  }
+      }
     }
   }
 };
-- 
GitLab