From 539cac9ef1b939081a8d3aa4a454309b02377d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=92=8B=E5=90=89=E5=85=86?= <303176530@qq.com>
Date: Sat, 23 Oct 2021 22:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/go.mod                              |   6 +-
 server/go.sum                              |  15 +-
 web/src/view/systemTools/system/system.vue | 595 +++++++++++----------
 3 files changed, 311 insertions(+), 305 deletions(-)

diff --git a/server/go.mod b/server/go.mod
index be694c54..d16e623b 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -17,16 +17,15 @@ require (
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gookit/color v1.3.1
 	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
-	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
 	github.com/mojocn/base64Captcha v1.3.1
-	github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
+	github.com/natefinch/lumberjack v2.0.0+incompatible
 	github.com/qiniu/api.v7/v7 v7.4.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/satori/go.uuid v1.2.0
 	github.com/shirou/gopsutil v3.21.1+incompatible
 	github.com/songzhibin97/gkit v1.1.1
 	github.com/spf13/viper v1.7.0
-	github.com/stretchr/testify v1.7.0 // indirect
+	github.com/stretchr/testify v1.7.0
 	github.com/swaggo/gin-swagger v1.3.0
 	github.com/swaggo/swag v1.7.0
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.19
@@ -34,6 +33,7 @@ require (
 	github.com/xuri/excelize/v2 v2.4.1
 	go.uber.org/zap v1.16.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gorm.io/driver/mysql v1.0.1
 	gorm.io/gorm v1.20.11
 	nhooyr.io/websocket v1.8.6
diff --git a/server/go.sum b/server/go.sum
index 4cdf6692..39207481 100644
--- a/server/go.sum
+++ b/server/go.sum
@@ -83,7 +83,6 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU=
 github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/flipped-aurora/gin-vue-admin/server v0.0.0-20210823151324-f5410430faf0/go.mod h1:ksHCxOjTTQDk1Y1MrptfG6e9+s3rDJzQXkIZBHl8sws=
@@ -285,13 +284,11 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uczJe5YQdrYB16oTJlGSC/OyZDqUk9xX4=
 github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84 h1:pS0A6cr4aHYZnYwC7Uw+rwgb39+nzkm2QhwZ+S6Gn5I=
 github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A=
@@ -322,11 +319,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
-github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible h1:4mNlp+/SvALIPFpbXV3kxNJJno9iKFWGxSDE13Kl66Q=
 github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
-github.com/lestrrat-go/strftime v1.0.3 h1:qqOPU7y+TM8Y803I8fG9c/DyKG3xH/xkng6keC1015Q=
 github.com/lestrrat-go/strftime v1.0.3/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -377,6 +371,8 @@ github.com/mojocn/base64Captcha v1.3.1/go.mod h1:wAQCKEc5bDujxKRmbT6/vTnTt5CjStQ
 github.com/mozillazg/go-httpheader v0.2.1 h1:geV7TrjbL8KXSyvghnFm+NyTux/hxwueTSrwhe88TQQ=
 github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/natefinch/lumberjack v2.0.0+incompatible h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM=
+github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
@@ -463,7 +459,6 @@ github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -480,7 +475,6 @@ github.com/swaggo/gin-swagger v1.3.0/go.mod h1:oy1BRA6WvgtCp848lhxce7BnWH4C8Bxa0
 github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y=
 github.com/swaggo/swag v1.7.0 h1:5bCA/MTLQoIqDXXyHfOpMeDvL9j68OY/udlK4pQoo4E=
 github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
-github.com/tebeka/strftime v0.1.3 h1:5HQXOqWKYRFfNyBMNVc9z5+QzuBtIXy03psIhtdJYto=
 github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ=
 github.com/tencentyun/cos-go-sdk-v5 v0.7.19 h1:janAfTO4MglOrUFuKGTQJBuMc66+F7TgtEIt1wPsJ+k=
 github.com/tencentyun/cos-go-sdk-v5 v0.7.19/go.mod h1:wQBO5HdAkLjj2q6XQiIfDSP8DXDNrppDRw2Kp/1BODA=
@@ -744,6 +738,8 @@ gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:a
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.55.0 h1:E8yzL5unfpW3M6fz/eB7Cb5MQAYSZ7GKo4Qth+N2sgQ=
 gopkg.in/ini.v1 v1.55.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
+gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
@@ -769,8 +765,9 @@ gorm.io/driver/sqlserver v0.2.4/go.mod h1:TcPfkdce5b8qlCMgyUeUdm7HQa1ZzWUuxzI+od
 gorm.io/gorm v0.2.19/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v0.2.23/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.9.19/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
-gorm.io/gorm v1.20.7 h1:rMS4CL3pNmYq1V5/X+nHHjh1Dx6dnf27+Cai5zabo+M=
 gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.20.11 h1:jYHQ0LLUViV85V8dM1TP9VBBkfzKTnuTXDjYObkI6yc=
+gorm.io/gorm v1.20.11/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/web/src/view/systemTools/system/system.vue b/web/src/view/systemTools/system/system.vue
index dd04451d..5d64848b 100644
--- a/web/src/view/systemTools/system/system.vue
+++ b/web/src/view/systemTools/system/system.vue
@@ -1,304 +1,303 @@
 <template>
   <div class="system">
-    <el-form ref="form" :model="config" label-width="100px">
+    <el-form ref="form" :model="config" label-width="240px">
       <!--  System start  -->
-      <h2>系统配置</h2>
-      <el-form-item label="环境值">
-        <el-input v-model="config.system.env" />
-      </el-form-item>
-      <el-form-item label="端口值">
-        <el-input v-model.number="config.system.addr" />
-      </el-form-item>
-      <el-form-item label="数据库类型">
-        <el-select v-model="config.system.dbType" style="width:100%">
-          <el-option value="mysql" />
-          <el-option value="sqlite" />
-          <el-option value="sqlserver" />
-          <el-option value="postgresql" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="Oss类型">
-        <el-select v-model="config.system.ossType" style="width:100%">
-          <el-option value="local" />
-          <el-option value="qiniu" />
-          <el-option value="tencent-cos" />
-          <el-option value="aliyun-oss" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="配置文件环境变量名">
-        <el-input v-model.number="config.system.configEnv" />
-      </el-form-item>
-      <el-form-item label="数据初始化">
-        <el-checkbox v-model="config.system.needInitData">开启</el-checkbox>
-      </el-form-item>
-      <el-form-item label="多点登录拦截">
-        <el-checkbox v-model="config.system.useMultipoint">开启</el-checkbox>
-      </el-form-item>
-      <!--  System end  -->
+      <el-collapse v-model="activeNames" @change="handleChange">
+        <el-collapse-item title="系统配置" name="1">
+          <el-form-item label="环境值">
+            <el-input v-model="config.system.env" />
+          </el-form-item>
+          <el-form-item label="端口值">
+            <el-input v-model.number="config.system.addr" />
+          </el-form-item>
+          <el-form-item label="数据库类型">
+            <el-select v-model="config.system.dbType" style="width:100%">
+              <el-option value="mysql" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="Oss类型">
+            <el-select v-model="config.system.ossType" style="width:100%">
+              <el-option value="local" />
+              <el-option value="qiniu" />
+              <el-option value="tencent-cos" />
+              <el-option value="aliyun-oss" />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="多点登录拦截">
+            <el-checkbox v-model="config.system.useMultipoint">开启</el-checkbox>
+          </el-form-item>
+          <el-form-item label="限流次数">
+            <el-input-number v-model.number="config.system.iplimitCount" />
+          </el-form-item>
+          <el-form-item label="限流时间">
+            <el-input-number v-model.number="config.system.iplimitTime" />
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item title="jwt签名" name="2">
+          <el-form-item label="jwt签名">
+            <el-input v-model="config.jwt.signingKey" />
+          </el-form-item>
+          <el-form-item label="有效期（秒）">
+            <el-input v-model="config.jwt.expiresTime" />
+          </el-form-item>
+          <el-form-item label="缓冲期（秒）">
+            <el-input v-model="config.jwt.bufferTime" />
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item title="Zap日志配置" name="3">
+          <el-form-item label="级别">
+            <el-input v-model.number="config.zap.level" />
+          </el-form-item>
+          <el-form-item label="输出">
+            <el-input v-model="config.zap.format" />
+          </el-form-item>
+          <el-form-item label="日志前缀">
+            <el-input v-model="config.zap.prefix" />
+          </el-form-item>
+          <el-form-item label="日志文件夹">
+            <el-input v-model="config.zap.director" />
+          </el-form-item>
+          <el-form-item label="编码级">
+            <el-input v-model="config.zap.encodeLevel" />
+          </el-form-item>
+          <el-form-item label="栈名">
+            <el-input v-model="config.zap.stacktraceKey" />
+          </el-form-item>
+          <el-form-item label="显示行">
+            <el-checkbox v-model="config.zap.showLine" />
+          </el-form-item>
+          <el-form-item label="输出控制台">
+            <el-checkbox v-model="config.zap.logInConsole" />
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item title="Redis admin数据库配置" name="4">
+          <el-form-item label="db">
+            <el-input v-model="config.redis.db" />
+          </el-form-item>
+          <el-form-item label="addr">
+            <el-input v-model="config.redis.addr" />
+          </el-form-item>
+          <el-form-item label="password">
+            <el-input v-model="config.redis.password" />
+          </el-form-item>
+        </el-collapse-item>
 
-      <!--  JWT start  -->
-      <h2>jwt签名</h2>
-      <el-form-item label="jwt签名">
-        <el-input v-model="config.jwt.signingKey" />
-      </el-form-item>
-      <!--  JWT end  -->
+        <el-collapse-item title="邮箱配置" name="5">
+          <el-form-item label="接收者邮箱">
+            <el-input v-model="config.email.to" placeholder="可多个，以逗号分隔" />
+          </el-form-item>
+          <el-form-item label="端口">
+            <el-input v-model.number="config.email.port" />
+          </el-form-item>
+          <el-form-item label="发送者邮箱">
+            <el-input v-model="config.email.from" />
+          </el-form-item>
+          <el-form-item label="host">
+            <el-input v-model="config.email.host" />
+          </el-form-item>
+          <el-form-item label="是否为ssl">
+            <el-checkbox v-model="config.email.isSSL" />
+          </el-form-item>
+          <el-form-item label="secret">
+            <el-input v-model="config.email.secret" />
+          </el-form-item>
+          <el-form-item label="测试邮件">
+            <el-button @click="email">测试邮件</el-button>
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item title="casbin配置" name="6">
+          <el-form-item label="模型地址">
+            <el-input v-model="config.casbin.modelPath" />
+          </el-form-item>
+        </el-collapse-item>
 
-      <!--  Zap start  -->
-      <h2>Zap日志配置</h2>
-      <el-form-item label="级别">
-        <el-input v-model.number="config.zap.level" />
-      </el-form-item>
-      <el-form-item label="输出">
-        <el-input v-model="config.zap.format" />
-      </el-form-item>
-      <el-form-item label="日志前缀">
-        <el-input v-model="config.zap.prefix" />
-      </el-form-item>
-      <el-form-item label="日志文件夹">
-        <el-input v-model="config.zap.director" />
-      </el-form-item>
-      <el-form-item label="软链接名称">
-        <el-input v-model="config.zap.linkName" />
-      </el-form-item>
-      <el-form-item label="编码级">
-        <el-input v-model="config.zap.encodeLevel" />
-      </el-form-item>
-      <el-form-item label="栈名">
-        <el-input v-model="config.zap.stacktraceKey" />
-      </el-form-item>
-      <el-form-item label="显示行">
-        <el-checkbox v-model="config.zap.showLine" />
-      </el-form-item>
-      <el-form-item label="输出控制台">
-        <el-checkbox v-model="config.zap.logInConsole" />
-      </el-form-item>
-      <!--  Zap end  -->
+        <el-collapse-item title="验证码配置" name="7">
+          <el-form-item label="keyLong">
+            <el-input v-model.number="config.captcha.keyLong" />
+          </el-form-item>
+          <el-form-item label="imgWidth">
+            <el-input v-model.number="config.captcha.imgWidth" />
+          </el-form-item>
+          <el-form-item label="imgHeight">
+            <el-input v-model.number="config.captcha.imgHeight" />
+          </el-form-item>
+        </el-collapse-item>
 
-      <!--  Redis start  -->
-      <h2>Redis admin数据库配置</h2>
-      <el-form-item label="db">
-        <el-input v-model="config.redis.db" />
-      </el-form-item>
-      <el-form-item label="addr">
-        <el-input v-model="config.redis.addr" />
-      </el-form-item>
-      <el-form-item label="password">
-        <el-input v-model="config.redis.password" />
-      </el-form-item>
-      <!--  Redis end  -->
+        <el-collapse-item title="验证码配置" name="8">
+          <el-form-item label="keyLong">
+            <el-input v-model.number="config.captcha.keyLong" />
+          </el-form-item>
+          <el-form-item label="imgWidth">
+            <el-input v-model.number="config.captcha.imgWidth" />
+          </el-form-item>
+          <el-form-item label="imgHeight">
+            <el-input v-model.number="config.captcha.imgHeight" />
+          </el-form-item>
+        </el-collapse-item>
 
-      <!--  Email start  -->
-      <h2>邮箱配置</h2>
-      <el-form-item label="接收者邮箱">
-        <el-input v-model="config.email.to" placeholder="可多个，以逗号分隔" />
-      </el-form-item>
-      <el-form-item label="端口">
-        <el-input v-model.number="config.email.port" />
-      </el-form-item>
-      <el-form-item label="发送者邮箱">
-        <el-input v-model="config.email.from" />
-      </el-form-item>
-      <el-form-item label="host">
-        <el-input v-model="config.email.host" />
-      </el-form-item>
-      <el-form-item label="是否为ssl">
-        <el-checkbox v-model="config.email.isSSL" />
-      </el-form-item>
-      <el-form-item label="secret">
-        <el-input v-model="config.email.secret" />
-      </el-form-item>
-      <el-form-item label="测试邮件">
-        <el-button @click="email">测试邮件</el-button>
-      </el-form-item>
-      <!--  Email end  -->
+        <el-collapse-item title="数据库配置" name="9">
+          <template v-if="config.system.dbType === 'mysql'">
+            <el-form-item label="username">
+              <el-input v-model="config.mysql.username" />
+            </el-form-item>
+            <el-form-item label="password">
+              <el-input v-model="config.mysql.password" />
+            </el-form-item>
+            <el-form-item label="path">
+              <el-input v-model="config.mysql.path" />
+            </el-form-item>
+            <el-form-item label="dbname">
+              <el-input v-model="config.mysql.dbname" />
+            </el-form-item>
+            <el-form-item label="maxIdleConns">
+              <el-input v-model.number="config.mysql.maxIdleConns" />
+            </el-form-item>
+            <el-form-item label="maxOpenConns">
+              <el-input v-model.number="config.mysql.maxOpenConns" />
+            </el-form-item>
+            <el-form-item label="logMode">
+              <el-checkbox v-model="config.mysql.logMode" />
+            </el-form-item>
+          </template>
+        </el-collapse-item>
 
-      <!--  Casbin start  -->
-      <h2>casbin配置</h2>
-      <el-form-item label="模型地址">
-        <el-input v-model="config.casbin.modelPath" />
-      </el-form-item>
-      <!--  Casbin end  -->
+        <el-collapse-item title="oss配置" name="10">
+          <template v-if="config.system.ossType === 'local'">
+            <h2>本地文件配置</h2>
+            <el-form-item label="本地文件路径">
+              <el-input v-model="config.local.path" />
+            </el-form-item>
+          </template>
+          <template v-if="config.system.ossType === 'qiniu'">
+            <h2>qiniu上传配置</h2>
+            <el-form-item label="存储区域">
+              <el-input v-model="config.qiniu.zone" />
+            </el-form-item>
+            <el-form-item label="空间名称">
+              <el-input v-model="config.qiniu.bucket" />
+            </el-form-item>
+            <el-form-item label="CDN加速域名">
+              <el-input v-model="config.qiniu.imgPath" />
+            </el-form-item>
+            <el-form-item label="是否使用https">
+              <el-checkbox v-model="config.qiniu.useHttps">开启</el-checkbox>
+            </el-form-item>
+            <el-form-item label="accessKey">
+              <el-input v-model="config.qiniu.accessKey" />
+            </el-form-item>
+            <el-form-item label="secretKey">
+              <el-input v-model="config.qiniu.secretKey" />
+            </el-form-item>
+            <el-form-item label="上传是否使用CDN上传加速">
+              <el-checkbox v-model="config.qiniu.useCdnDomains">开启</el-checkbox>
+            </el-form-item>
+          </template>
+          <template v-if="config.system.ossType === 'tencent-cos'">
+            <h2>腾讯云COS上传配置</h2>
+            <el-form-item label="bucket">
+              <el-input v-model="config.tencentCOS.bucket" />
+            </el-form-item>
+            <el-form-item label="region">
+              <el-input v-model="config.tencentCOS.region" />
+            </el-form-item>
+            <el-form-item label="secretID">
+              <el-input v-model="config.tencentCOS.secretID" />
+            </el-form-item>
+            <el-form-item label="secretKey">
+              <el-input v-model="config.tencentCOS.secretKey" />
+            </el-form-item>
+            <el-form-item label="pathPrefix">
+              <el-input v-model="config.tencentCOS.pathPrefix" />
+            </el-form-item>
+            <el-form-item label="baseURL">
+              <el-input v-model="config.tencentCOS.baseURL" />
+            </el-form-item>
+          </template>
+          <template v-if="config.system.ossType === 'aliyun-oss'">
+            <h2>阿里云OSS上传配置</h2>
+            <el-form-item label="endpoint">
+              <el-input v-model="config.aliyunOSS.endpoint" />
+            </el-form-item>
+            <el-form-item label="accessKeyId">
+              <el-input v-model="config.aliyunOSS.accessKeyId" />
+            </el-form-item>
+            <el-form-item label="accessKeySecret">
+              <el-input v-model="config.aliyunOSS.accessKeySecret" />
+            </el-form-item>
+            <el-form-item label="bucketName">
+              <el-input v-model="config.aliyunOSS.bucketName" />
+            </el-form-item>
+            <el-form-item label="bucketUrl">
+              <el-input v-model="config.aliyunOSS.bucketUrl" />
+            </el-form-item>
+          </template>
 
-      <!--  Captcha start  -->
-      <h2>验证码配置</h2>
-      <el-form-item label="keyLong">
-        <el-input v-model.number="config.captcha.keyLong" />
-      </el-form-item>
-      <el-form-item label="imgWidth">
-        <el-input v-model.number="config.captcha.imgWidth" />
-      </el-form-item>
-      <el-form-item label="imgHeight">
-        <el-input v-model.number="config.captcha.imgHeight" />
-      </el-form-item>
-      <!--  Captcha end  -->
+        </el-collapse-item>
 
-      <!--  dbType start  -->
-      <template v-if="config.system.dbType === 'mysql'">
-        <h2>mysql admin数据库配置</h2>
-        <el-form-item label="username">
-          <el-input v-model="config.mysql.username" />
-        </el-form-item>
-        <el-form-item label="password">
-          <el-input v-model="config.mysql.password" />
-        </el-form-item>
-        <el-form-item label="path">
-          <el-input v-model="config.mysql.path" />
-        </el-form-item>
-        <el-form-item label="dbname">
-          <el-input v-model="config.mysql.dbname" />
-        </el-form-item>
-        <el-form-item label="maxIdleConns">
-          <el-input v-model.number="config.mysql.maxIdleConns" />
-        </el-form-item>
-        <el-form-item label="maxOpenConns">
-          <el-input v-model.number="config.mysql.maxOpenConns" />
-        </el-form-item>
-        <el-form-item label="logMode">
-          <el-checkbox v-model="config.mysql.logMode" />
-        </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-form-item>
-        <el-form-item label="maxIdleConns">
-          <el-input v-model.number="config.mysql.maxIdleConns" />
-        </el-form-item>
-        <el-form-item label="maxOpenConns">
-          <el-input v-model.number="config.mysql.maxOpenConns" />
-        </el-form-item>
-        <el-form-item label="logger">
-          <el-checkbox v-model="config.mysql.logger" />
-        </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-form-item>
-        <el-form-item label="password">
-          <el-input v-model="config.sqlserver.password" />
-        </el-form-item>
-        <el-form-item label="path">
-          <el-input v-model="config.sqlserver.path" />
-        </el-form-item>
-        <el-form-item label="dbname">
-          <el-input v-model="config.sqlserver.dbname" />
-        </el-form-item>
-        <el-form-item label="maxIdleConns">
-          <el-input v-model.number="config.sqlserver.maxIdleConns" />
-        </el-form-item>
-        <el-form-item label="maxOpenConns">
-          <el-input v-model.number="config.sqlserver.maxOpenConns" />
-        </el-form-item>
-        <el-form-item label="logger">
-          <el-checkbox v-model="config.sqlserver.logger" />
-        </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-form-item>
-        <el-form-item label="password">
-          <el-input v-model="config.mysql.password" />
-        </el-form-item>
-        <el-form-item label="dbName">
-          <el-input v-model="config.mysql.dbName" />
-        </el-form-item>
-        <el-form-item label="port">
-          <el-input v-model="config.mysql.port" />
-        </el-form-item>
-        <el-form-item label="config">
-          <el-input v-model="config.mysql.config" />
-        </el-form-item>
-        <el-form-item label="maxIdleConns">
-          <el-input v-model.number="config.mysql.maxIdleConns" />
-        </el-form-item>
-        <el-form-item label="maxOpenConns">
-          <el-input v-model.number="config.mysql.maxOpenConns" />
-        </el-form-item>
-        <el-form-item label="logger">
-          <el-checkbox v-model="config.mysql.logger" />
-        </el-form-item>
-        <el-form-item label="prefer-simple-protocol">
-          <el-checkbox v-model="config.mysql.preferSimpleProtocol" />
-        </el-form-item>
-      </template>
-      <!--  dbType end  -->
+        <el-collapse-item title="Excel上传配置" name="11">
+          <el-form-item label="合成目标地址">
+            <el-input v-model="config.excel.dir" />
+          </el-form-item>
+        </el-collapse-item>
 
-      <!--  ossType start  -->
-      <template v-if="config.system.ossType === 'local'">
-        <h2>本地上传配置</h2>
-        <el-form-item label="本地文件路径">
-          <el-input v-model="config.local.path" />
-        </el-form-item>
-      </template>
-      <template v-if="config.system.ossType === 'qiniu'">
-        <h2>qiniu上传配置</h2>
-        <el-form-item label="存储区域">
-          <el-input v-model="config.qiniu.zone" />
-        </el-form-item>
-        <el-form-item label="空间名称">
-          <el-input v-model="config.qiniu.bucket" />
-        </el-form-item>
-        <el-form-item label="CDN加速域名">
-          <el-input v-model="config.qiniu.imgPath" />
-        </el-form-item>
-        <el-form-item label="是否使用https">
-          <el-checkbox v-model="config.qiniu.useHttps">开启</el-checkbox>
-        </el-form-item>
-        <el-form-item label="accessKey">
-          <el-input v-model="config.qiniu.accessKey" />
-        </el-form-item>
-        <el-form-item label="secretKey">
-          <el-input v-model="config.qiniu.secretKey" />
-        </el-form-item>
-        <el-form-item label="上传是否使用CDN上传加速">
-          <el-checkbox v-model="config.qiniu.useCdnDomains">开启</el-checkbox>
-        </el-form-item>
-      </template>
-      <template v-if="config.system.ossType === 'tencent-cos'">
-        <h2>腾讯云COS上传配置</h2>
-        <el-form-item label="bucket">
-          <el-input v-model="config.tencentCOS.bucket" />
-        </el-form-item>
-        <el-form-item label="region">
-          <el-input v-model="config.tencentCOS.region" />
-        </el-form-item>
-        <el-form-item label="secretID">
-          <el-input v-model="config.tencentCOS.secretID" />
-        </el-form-item>
-        <el-form-item label="secretKey">
-          <el-input v-model="config.tencentCOS.secretKey" />
-        </el-form-item>
-        <el-form-item label="pathPrefix">
-          <el-input v-model="config.tencentCOS.pathPrefix" />
-        </el-form-item>
-        <el-form-item label="baseURL">
-          <el-input v-model="config.tencentCOS.baseURL" />
-        </el-form-item>
-      </template>
-      <template v-if="config.system.ossType === 'aliyun-oss'">
-        <h2>阿里云OSS上传配置</h2>
-        <el-form-item label="endpoint">
-          <el-input v-model="config.aliyunOSS.endpoint" />
-        </el-form-item>
-        <el-form-item label="accessKeyId">
-          <el-input v-model="config.aliyunOSS.accessKeyId" />
-        </el-form-item>
-        <el-form-item label="accessKeySecret">
-          <el-input v-model="config.aliyunOSS.accessKeySecret" />
-        </el-form-item>
-        <el-form-item label="bucketName">
-          <el-input v-model="config.aliyunOSS.bucketName" />
-        </el-form-item>
-        <el-form-item label="bucketUrl">
-          <el-input v-model="config.aliyunOSS.bucketUrl" />
-        </el-form-item>
-      </template>
-      <!--  ossType end  -->
+        <el-collapse-item title="自动化代码配置" name="12">
+          <el-form-item label="是否自动重启(linux)">
+            <el-checkbox v-model="config.autoCode.transferRestart" />
+          </el-form-item>
+          <el-form-item label="root(项目根路径)">
+            <el-input v-model="config.autoCode.root" disabled />
+          </el-form-item>
+          <el-form-item label="Server(后端代码地址)">
+            <el-input v-model="config.autoCode.transferRestart" />
+          </el-form-item>
+          <el-form-item label="SApi(后端api文件夹地址)">
+            <el-input v-model="config.autoCode.serverApi" />
+          </el-form-item>
+          <el-form-item label="SInitialize(后端Initialize文件夹)">
+            <el-input v-model="config.autoCode.serverInitialize" />
+          </el-form-item>
+          <el-form-item label="SModel(后端Model文件地址)">
+            <el-input v-model="config.autoCode.serverModel" />
+          </el-form-item>
+          <el-form-item label="SRequest(后端Request文件夹地址)">
+            <el-input v-model="config.autoCode.serverRequest" />
+          </el-form-item>
+          <el-form-item label="SRouter(后端Router文件夹地址)">
+            <el-input v-model="config.autoCode.serverRouter" />
+          </el-form-item>
+          <el-form-item label="SService(后端Service文件夹地址)">
+            <el-input v-model="config.autoCode.serverService" />
+          </el-form-item>
+          <el-form-item label="Web(前端文件夹地址)">
+            <el-input v-model="config.autoCode.web" />
+          </el-form-item>
+          <el-form-item label="WApi(后端WApi文件夹地址)">
+            <el-input v-model="config.autoCode.webApi" />
+          </el-form-item>
+          <el-form-item label="WForm(后端WForm文件夹地址)">
+            <el-input v-model="config.autoCode.webForm" />
+          </el-form-item>
+          <el-form-item label="WTable(后端WTable文件夹地址)">
+            <el-input v-model="config.autoCode.webTable" />
+          </el-form-item>
+        </el-collapse-item>
+
+        <el-collapse-item title="Timer(定时任务)" name="13">
+          <el-form-item label="Start（是否启用）">
+            <el-select v-model="config.timer.wTable" />
+          </el-form-item>
+          <el-form-item label="Spec(CRON表达式)">
+            <el-input v-model="config.timer.spec" />
+          </el-form-item>
+          <template v-for="(item,k) in config.timer.detail">
+            <div v-for="(key,k2) in item" :key="k2">
+              <el-form-item :key="k+k2" :label="k2">
+                <el-input v-model="item[k2]" />
+              </el-form-item>
+            </div>
+          </template>
+        </el-collapse-item>
+      </el-collapse>
     </el-form>
     <div class="gva-btn-list">
       <el-button type="primary" size="mini" @click="update">立即更新</el-button>
@@ -319,7 +318,8 @@ export default {
         jwt: {},
         casbin: {},
         mysql: {},
-        sqlite: {},
+        excel: {},
+        autoCode: {},
         redis: {},
         qiniu: {},
         tencentCOS: {},
@@ -327,7 +327,10 @@ export default {
         captcha: {},
         zap: {},
         local: {},
-        email: {}
+        email: {},
+        timer: {
+          detail: {}
+        }
       }
     }
   },
@@ -374,7 +377,7 @@ export default {
 <style lang="scss">
 .system {
   background: #fff;
-  padding:12px;
+  padding:36px;
   border-radius: 2px;
   h2 {
     padding: 10px;
@@ -382,5 +385,11 @@ export default {
     font-size: 16px;
     box-shadow: -4px 0px 0px 0px #e7e8e8;
   }
+  ::v-deep(.el-input-number__increase){
+    top:5px !important;
+  }
+  .gva-btn-list{
+    margin-top:16px;
+  }
 }
 </style>