From 8ad4f99e07fb2d4d5ad34aaf6ec9c593e1091417 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期一, 27 五月 2024 10:21:28 +0800
Subject: [PATCH] 数据库验证码明示配置文件
---
config/config.go | 10 ++++++----
db/database.go | 8 ++++----
rule/service.go | 2 +-
config/app.yaml | 4 ++--
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/config/app.yaml b/config/app.yaml
index a5a2c20..ec50fea 100644
--- a/config/app.yaml
+++ b/config/app.yaml
@@ -6,8 +6,8 @@
driver: mysql
host: 192.168.20.115
port: 3306
- # username: root
- # password: c++java123
+ username: root
+ password: c++java123
name: faceanalysis
elastic:
host: 192.168.20.115
diff --git a/config/config.go b/config/config.go
index 29c6c33..721adbe 100644
--- a/config/config.go
+++ b/config/config.go
@@ -15,10 +15,12 @@
}
type database struct {
- Driver string `mapstructure: "driver"`
- Host string `mapstructure: "host"`
- Port string `mapstructure: "port"`
- Name string `mapstructure: "name"`
+ Driver string `mapstructure: "driver"`
+ Host string `mapstructure: "host"`
+ Port string `mapstructure: "port"`
+ Name string `mapstructure: "name"`
+ Username string `mapstructure: "username"`
+ Password string `mapstructure: "password"`
}
type elastic struct {
diff --git a/db/database.go b/db/database.go
index f4afe69..01e3bd7 100644
--- a/db/database.go
+++ b/db/database.go
@@ -20,14 +20,14 @@
// return nil
//}
-func ConnectDB() (error) {
- dsn := "root:c++java123@tcp(" + config.DataBase.Host + ":" + config.DataBase.Port + ")/" + config.DataBase.Name + "?charset=utf8mb4&parseTime=True&loc=Local"
+func ConnectDB() error {
+ dsn := config.DataBase.Username + ":" + config.DataBase.Password + "@tcp(" + config.DataBase.Host + ":" + config.DataBase.Port + ")/" + config.DataBase.Name + "?charset=utf8mb4&parseTime=True&loc=Local"
db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
if err != nil {
return err
}
- sqlDb,err := db.DB()
- if err != nil{
+ sqlDb, err := db.DB()
+ if err != nil {
return err
}
sqlDb.SetMaxIdleConns(2)
diff --git a/rule/service.go b/rule/service.go
index 11413f1..c77e096 100644
--- a/rule/service.go
+++ b/rule/service.go
@@ -67,7 +67,7 @@
}
}
- return
+ //return
ruleInfo, err := db.GetAllData()
if err != nil {
logger.Error("GetAllData Error", err)
--
Gitblit v1.8.0