From b0a4190f109b3cd986b55978675ade38ddc128a4 Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Tue, 24 Mar 2020 10:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93base=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=8E=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E4=B8=AD=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=20=E6=9C=AA=E8=8E=B7=E5=8F=96=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E8=B5=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QMPlusServer/main.go | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/QMPlusServer/main.go b/QMPlusServer/main.go
index 21f41ce8..95f74ef8 100644
--- a/QMPlusServer/main.go
+++ b/QMPlusServer/main.go
@@ -29,17 +29,12 @@ var (
 func main() {
 	qmlog.InitLog() // 初始化日志
 
-	// 可以通过环境变量来覆盖默认值
-	// 未设定有效的环境变量时，使用默认值
+	// 可以通过环境变量来覆盖配置值
+	// 未设定有效的环境变量时，使用配置值
 	mysqlConfig := config.GinVueAdminconfig.MysqlAdmin
-	if mysqlHost == "" {
-		mysqlHost = "localhost"
+	if mysqlHost != "" && mysqlPort != "" {
+		mysqlConfig.Path = mysqlHost + ":" + mysqlPort
 	}
-	if mysqlPort == "" {
-		mysqlPort = "3306"
-	}
-	mysqlConfig.Path = mysqlHost + ":" + mysqlPort
-
 	db := qmsql.InitMysql(mysqlConfig) // 链接初始化数据库
 	if config.GinVueAdminconfig.System.UseMultipoint {
 		_ = initRedis.InitRedis() // 初始化redis服务
-- 
GitLab