From 0bb777213be2a2b4086b595aad051400928f7b1c Mon Sep 17 00:00:00 2001
From: kongyuebin <kongyuebin@DESKTOP-1VL48PA.localdomain>
Date: Thu, 11 Nov 2021 22:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=B8=80=E4=BA=9B=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 boss/conf/app.conf  |  3 ---
 boss/conf/config.go | 18 ------------------
 boss/models/init.go | 16 ++++++++--------
 3 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 boss/conf/config.go

diff --git a/boss/conf/app.conf b/boss/conf/app.conf
index deae992..8046692 100644
--- a/boss/conf/app.conf
+++ b/boss/conf/app.conf
@@ -13,6 +13,3 @@ dbbase = juhe_pay
 
 [gateway]
 host = http://localhost:12309/
-#orderUrl = http://localhost:12309/gateway/supplier/order/query
-#updateOrderUrl = http://localhost:12309/gateway/update/order
-#payforUrl = http://localhost:12309/gateway/update/order
\ No newline at end of file
diff --git a/boss/conf/config.go b/boss/conf/config.go
deleted file mode 100644
index 8e330d3..0000000
--- a/boss/conf/config.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/***************************************************
- ** @Desc : This file for ...
- ** @Time : 2019/10/26 15:30
- ** @Author : yuebin
- ** @File : conf_pro
- ** @Last Modified by : yuebin
- ** @Last Modified time: 2019/10/26 15:30
- ** @Software: GoLand
-****************************************************/
-package conf
-
-const (
-	DB_HOST     = "localhost"
-	DB_PORT     = "3306"
-	DB_USER     = "root"
-	DB_PASSWORD = "Kyb^15273031604"
-	DB_BASE     = "juhe_pay"
-)
diff --git a/boss/models/init.go b/boss/models/init.go
index 3c1f97b..ca9de92 100644
--- a/boss/models/init.go
+++ b/boss/models/init.go
@@ -10,7 +10,6 @@
 package models
 
 import (
-	"boss/conf"
 	"boss/models/accounts"
 	"boss/models/agent"
 	"boss/models/merchant"
@@ -23,22 +22,23 @@ import (
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/beego/beego/v2/core/logs"
+	"github.com/beego/beego/v2/server/web"
 	_ "github.com/go-sql-driver/mysql"
 )
 
 func init() {
-	dbHost := conf.DB_HOST
-	dbUser := conf.DB_USER
-	dbPassword := conf.DB_PASSWORD
-	dbBase := conf.DB_BASE
-	dbPort := conf.DB_PORT
+	dbHost, _ := web.AppConfig.String("mysql::dbhost")
+	dbUser, _ := web.AppConfig.String("mysql::dbuser")
+	dbPassword, _ := web.AppConfig.String("mysql::dbpasswd")
+	dbBase, _ := web.AppConfig.String("mysql::dbbase")
+	dbPort, _ := web.AppConfig.String("mysql::dbport")
 
 	link := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8", dbUser, dbPassword, dbHost, dbPort, dbBase)
 
 	logs.Info("mysql init.....", link)
 
-	orm.RegisterDriver("mysql", orm.DRMySQL)
-	orm.RegisterDataBase("default", "mysql", link)
+	_ = orm.RegisterDriver("mysql", orm.DRMySQL)
+	_ = orm.RegisterDataBase("default", "mysql", link)
 	orm.RegisterModel(new(user.UserInfo), new(system.MenuInfo), new(system.SecondMenuInfo),
 		new(system.PowerInfo), new(system.RoleInfo), new(system.BankCardInfo), new(road.RoadInfo),
 		new(road.RoadPoolInfo), new(agent.AgentInfo), new(merchant.MerchantInfo), new(merchant.MerchantDeployInfo),