From 78caadc3ea1e5c3841944af7f587cec8bff49c98 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Tue, 19 Jan 2021 10:44:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E8=AE=BE=E7=BD=AE/=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93/=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AF=86=E7=A0=81=E4=B8=AD=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../actions/default/settings/backup/init.go   |  2 +-
 .../default/settings/database/update.go       | 29 ++++++++++---------
 .../settings/settingutils/advanced_helper.go  |  1 +
 .../default/settings/settingutils/helper.go   |  1 -
 .../@default/settings/database/@menu.html     |  2 ++
 .../@default/settings/database/index.html     |  4 ---
 6 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/internal/web/actions/default/settings/backup/init.go b/internal/web/actions/default/settings/backup/init.go
index 0503591f..77540a06 100644
--- a/internal/web/actions/default/settings/backup/init.go
+++ b/internal/web/actions/default/settings/backup/init.go
@@ -11,7 +11,7 @@ func init() {
 	TeaGo.BeforeStart(func(server *TeaGo.Server) {
 		server.
 			Helper(helpers.NewUserMustAuth(configloaders.AdminModuleCodeSetting)).
-			Helper(settingutils.NewHelper("backup")).
+			Helper(settingutils.NewAdvancedHelper("backup")).
 			Prefix("/settings/backup").
 			Get("", new(IndexAction)).
 			EndAll()
diff --git a/internal/web/actions/default/settings/database/update.go b/internal/web/actions/default/settings/database/update.go
index ec7329ce..7c79eafb 100644
--- a/internal/web/actions/default/settings/database/update.go
+++ b/internal/web/actions/default/settings/database/update.go
@@ -3,15 +3,13 @@ package profile
 import (
 	"fmt"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/dbs"
 	"github.com/iwind/TeaGo/maps"
 	"gopkg.in/yaml.v3"
 	"io/ioutil"
-	"net/url"
-	"path/filepath"
-	"regexp"
 	"strings"
 )
 
@@ -57,28 +55,33 @@ func (this *UpdateAction) RunGet(params struct{}) {
 	}
 
 	dsn := dbConfig.Dsn
-	dsn = regexp.MustCompile(`tcp\((.+)\)`).ReplaceAllString(dsn, "$1")
-	dsnURL, err := url.Parse("mysql://" + dsn)
+	cfg, err := mysql.ParseDSN(dsn)
 	if err != nil {
+		this.Data["dbConfig"] = maps.Map{
+			"host":     "",
+			"port":     "",
+			"username": "",
+			"password": "",
+			"database": "",
+		}
 		this.Show()
 		return
 	}
 
-	host := dsnURL.Host
+	host := cfg.Addr
 	port := "3306"
-	index := strings.LastIndex(dsnURL.Host, ":")
+	index := strings.LastIndex(cfg.Addr, ":")
 	if index > 0 {
-		host = dsnURL.Host[:index]
-		port = dsnURL.Host[index+1:]
+		host = cfg.Addr[:index]
+		port = cfg.Addr[index+1:]
 	}
 
-	password, _ := dsnURL.User.Password()
 	this.Data["dbConfig"] = maps.Map{
 		"host":     host,
 		"port":     port,
-		"username": dsnURL.User.Username(),
-		"password": password,
-		"database": filepath.Base(dsnURL.Path),
+		"username": cfg.User,
+		"password": cfg.Passwd,
+		"database": cfg.DBName,
 	}
 
 	this.Show()
diff --git a/internal/web/actions/default/settings/settingutils/advanced_helper.go b/internal/web/actions/default/settings/settingutils/advanced_helper.go
index be7d0dc4..bb4e0156 100644
--- a/internal/web/actions/default/settings/settingutils/advanced_helper.go
+++ b/internal/web/actions/default/settings/settingutils/advanced_helper.go
@@ -34,6 +34,7 @@ func (this *AdvancedHelper) BeforeAction(actionPtr actions.ActionWrapper) (goNex
 		tabbar.Add("API节点", "", "/api", "", this.tab == "apiNodes")
 		tabbar.Add("用户节点", "", "/settings/userNodes", "", this.tab == "userNodes")
 		tabbar.Add("日志数据库", "", "/db", "", this.tab == "dbNodes")
+		//tabbar.Add("备份", "", "/settings/backup", "", this.tab == "backup")
 	}
 	actionutils.SetTabbar(actionPtr, tabbar)
 
diff --git a/internal/web/actions/default/settings/settingutils/helper.go b/internal/web/actions/default/settings/settingutils/helper.go
index c18105dd..016595d4 100644
--- a/internal/web/actions/default/settings/settingutils/helper.go
+++ b/internal/web/actions/default/settings/settingutils/helper.go
@@ -34,7 +34,6 @@ func (this *Helper) BeforeAction(actionPtr actions.ActionWrapper) (goNext bool)
 		tabbar.Add("用户界面设置", "", "/settings/user-ui", "", this.tab == "userUI")
 		tabbar.Add("安全设置", "", "/settings/security", "", this.tab == "security")
 		tabbar.Add("IP库", "", "/settings/ip-library", "", this.tab == "ipLibrary")
-		tabbar.Add("备份", "", "/settings/backup", "", this.tab == "backup")
 	}
 	tabbar.Add("个人资料", "", "/settings/profile", "", this.tab == "profile")
 	tabbar.Add("登录设置", "", "/settings/login", "", this.tab == "login")
diff --git a/web/views/@default/settings/database/@menu.html b/web/views/@default/settings/database/@menu.html
index 1e2542eb..d8903c8d 100644
--- a/web/views/@default/settings/database/@menu.html
+++ b/web/views/@default/settings/database/@menu.html
@@ -1,5 +1,7 @@
 <first-menu>
 	<menu-item href="/settings/database" code="index">详情</menu-item>
 	<menu-item href="/settings/database/update" code="update">修改</menu-item>
+    <span class="item">|</span>
+    <span class="item"><tip-icon content="在这里可以设置API节点可以使用的数据库，修改后请重新配置并启动API节点才能生效。"></tip-icon></span>
 </first-menu>
 <div class="margin"></div>
\ No newline at end of file
diff --git a/web/views/@default/settings/database/index.html b/web/views/@default/settings/database/index.html
index 9c815e35..d6588839 100644
--- a/web/views/@default/settings/database/index.html
+++ b/web/views/@default/settings/database/index.html
@@ -32,7 +32,3 @@
 		</tr>
 	</table>
 </div>
-
-<div class="ui message tiny">
-	<p>在这里可以设置API节点可以使用的数据库。</p>
-</div>
\ No newline at end of file