change marshal strategy

This commit is contained in:
hebo
2019-10-08 15:16:42 +08:00
parent 2c54f18374
commit c3531819bd
5 changed files with 20 additions and 7 deletions

View File

@@ -43,12 +43,14 @@ type MysqlDB struct {
DatabaseType string
DBName string
ConnectTimeout int
QueryTimeout int
}
// NewMysqlDB 创建MySQL数据库
func NewMysqlDB() (md *MysqlDB) {
md = new(MysqlDB)
md.DatabaseType = dbTypeMysql
md.QueryTimeout = 5
return
}
@@ -352,7 +354,7 @@ func (md *MysqlDB) fillConnStr() string {
md.UserName, md.Passwd, md.IP, md.Port, md.DBName)
if md.ConnectTimeout > 0 {
dbServerInfoStr = fmt.Sprintf("%s?timeout=%ds&readTimeout=%ds&writeTimeout=%ds",
dbServerInfoStr, md.ConnectTimeout, md.ConnectTimeout, md.ConnectTimeout)
dbServerInfoStr, md.ConnectTimeout, md.QueryTimeout, md.QueryTimeout)
}
return dbServerInfoStr

View File

@@ -6,7 +6,6 @@ import (
"time"
)
// PooledMysqlDB Mysql主机实例
type PooledMysqlDB struct {
MysqlDB
@@ -46,6 +45,7 @@ func NewPooledMysqlDBWithAllParam(
func NewPooledMysqlDB() (pmd *PooledMysqlDB) {
pmd = new(PooledMysqlDB)
pmd.DatabaseType = dbTypeMysql
pmd.QueryTimeout = 5
pmd.lock = new(sync.Mutex)
return
}