Revert "[feat]: config for TLS connection in init MySQL (#1388)" (#1392)

This reverts commit a4a240eace0b6e3d371b59aa505c330d475ea829.
This commit is contained in:
奇淼(piexlmax
2023-03-27 11:09:19 +08:00
committed by GitHub
parent acd8fa3810
commit 0497cf384d
3 changed files with 2 additions and 12 deletions

View File

@@ -18,17 +18,13 @@ type InitDB struct {
// MysqlEmptyDsn msyql 空数据库 建库链接
// Author SliverHorn
func (i *InitDB) MysqlEmptyDsn() string {
initTls := ""
if config.GeneralDB.InitTls {
initTls = "?tls=true"
}
if i.Host == "" {
i.Host = "127.0.0.1"
}
if i.Port == "" {
i.Port = "3306"
}
return fmt.Sprintf("%s:%s@tcp(%s:%s)/"+initTls, i.UserName, i.Password, i.Host, i.Port)
return fmt.Sprintf("%s:%s@tcp(%s:%s)/", i.UserName, i.Password, i.Host, i.Port)
}
// PgsqlEmptyDsn pgsql 空数据库 建库链接
@@ -46,10 +42,6 @@ func (i *InitDB) PgsqlEmptyDsn() string {
// ToMysqlConfig 转换 config.Mysql
// Author [SliverHorn](https://github.com/SliverHorn)
func (i *InitDB) ToMysqlConfig() config.Mysql {
initTls := ""
if config.GeneralDB.InitTls {
initTls = "&tls=true"
}
return config.Mysql{
GeneralDB: config.GeneralDB{
Path: i.Host,
@@ -60,7 +52,7 @@ func (i *InitDB) ToMysqlConfig() config.Mysql {
MaxIdleConns: 10,
MaxOpenConns: 100,
LogMode: "error",
Config: "charset=utf8mb4&parseTime=True&loc=Local" + initTls,
Config: "charset=utf8mb4&parseTime=True&loc=Local",
},
}
}