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

奇淼（piexlmax · web-flow · commit 26e1c0d2034f · 2023-03-27T11:09:19.000+08:00
This reverts commit a4a240e.
diff --git a/server/config.yaml b/server/config.yaml
@@ -69,7 +69,6 @@ mysql:
   max-open-conns: 100
   log-mode: ""
   log-zap: false
-  init-tls: false
 
 # pgsql connect configuration
 # 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
diff --git a/server/config/db_list.go b/server/config/db_list.go
@@ -22,7 +22,6 @@ type GeneralDB struct {
 	MaxOpenConns int    `mapstructure:"max-open-conns" json:"max-open-conns" yaml:"max-open-conns"` // 打开到数据库的最大连接数
 	LogMode      string `mapstructure:"log-mode" json:"log-mode" yaml:"log-mode"`                   // 是否开启Gorm全局日志
 	LogZap       bool   `mapstructure:"log-zap" json:"log-zap" yaml:"log-zap"`                      // 是否通过zap写入日志文件
-	InitTls      bool   `mapstructure:"init-tls" json:"init-tls" yaml:"init-tls"`                   // 初始化时是否开启TLS
 }
 
 type SpecializedDB struct {
diff --git a/server/model/system/request/sys_init.go b/server/model/system/request/sys_init.go
@@ -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",
 		},
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ type GeneralDB struct {`
`22`	`22`	MaxOpenConns int `mapstructure:"max-open-conns" json:"max-open-conns" yaml:"max-open-conns"` // 打开到数据库的最大连接数
`23`	`23`	LogMode string `mapstructure:"log-mode" json:"log-mode" yaml:"log-mode"` // 是否开启Gorm全局日志
`24`	`24`	LogZap bool `mapstructure:"log-zap" json:"log-zap" yaml:"log-zap"` // 是否通过zap写入日志文件
`25`		- InitTls bool `mapstructure:"init-tls" json:"init-tls" yaml:"init-tls"` // 初始化时是否开启TLS
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`type SpecializedDB struct {`