OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: update db connect charset and collation

Browse Source
This commit is contained in:
simonzhangsz
2023-11-07 11:02:57 +08:00
parent 56cff767a6
commit b46d4e23d2
12 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crontask/db.go
View File

@@ -28,7 +28,7 @@ var dbClient DBClient
func initDbClient() error { func initDbClient() error {
db := yamlConfig.Database db := yamlConfig.Database
dbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", dbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
db.User, db.Password, db.Host, db.Port, db.Name) db.User, db.Password, db.Host, db.Port, db.Name)
dbClient.dbType = db.Type dbClient.dbType = db.Type
dbClient.dbConnMaxLifetime = 0 dbClient.dbConnMaxLifetime = 0
@@ -63,7 +63,7 @@ func initDbClient() error {
var xEngine *xorm.Engine var xEngine *xorm.Engine
func XormConnectDatabaseWithUri(sql string) (*xorm.Engine, error) { func XormConnectDatabaseWithUri(sql string) (*xorm.Engine, error) {
sqlStr := fmt.Sprintf("%s?charset=utf8&parseTime=true&loc=Local", sql) sqlStr := fmt.Sprintf("%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", sql)
var err error var err error
xEngine, err = xorm.NewEngine("mysql", sqlStr) //1、Create xorm engine xEngine, err = xorm.NewEngine("mysql", sqlStr) //1、Create xorm engine
if err != nil { if err != nil {

4
features/dbrest/dbrest.go
View File

@@ -77,7 +77,7 @@ type DatabaseClient struct {
var DbClient DatabaseClient var DbClient DatabaseClient
func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error { func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error {
DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbUser, dbPassword, dbHost, dbPort, dbName) dbUser, dbPassword, dbHost, dbPort, dbName)
DbClient.dbType = dbType DbClient.dbType = dbType
DbClient.dbConnMaxLifetime = 0 DbClient.dbConnMaxLifetime = 0
@@ -86,7 +86,7 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
if log.GetLevel() == log.LOG_TRACE { if log.GetLevel() == log.LOG_TRACE {
DbClient.IsShowSQL = true DbClient.IsShowSQL = true
} }
log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8&parseTime=true&loc=Local", log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbType, dbUser, dbHost, dbPort, dbName) dbType, dbUser, dbHost, dbPort, dbName)
var err error var err error

8
features/fm/alarm.go
View File

@@ -129,7 +129,7 @@ type DatabaseClient struct {
var DbClient DatabaseClient var DbClient DatabaseClient
func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error { func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error {
DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbUser, dbPassword, dbHost, dbPort, dbName) dbUser, dbPassword, dbHost, dbPort, dbName)
DbClient.dbType = dbType DbClient.dbType = dbType
DbClient.dbConnMaxLifetime = 0 DbClient.dbConnMaxLifetime = 0
@@ -138,7 +138,7 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
if log.GetLevel() == log.LOG_TRACE { if log.GetLevel() == log.LOG_TRACE {
DbClient.IsShowSQL = true DbClient.IsShowSQL = true
} }
log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8&parseTime=true&loc=Local", log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbType, dbUser, dbHost, dbPort, dbName) dbType, dbUser, dbHost, dbPort, dbName)
var err error var err error
@@ -159,9 +159,9 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
} }
func XormConnectDatabase(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) (*xorm.Engine, error) { func XormConnectDatabase(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) (*xorm.Engine, error) {
sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbUser, dbPassword, dbHost, dbPort, dbName) dbUser, dbPassword, dbHost, dbPort, dbName)
log.Debugf("dbType:%s Connect to:%s:******@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", log.Debugf("dbType:%s Connect to:%s:******@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbType, dbUser, dbHost, dbPort, dbName) dbType, dbUser, dbHost, dbPort, dbName)
var err error var err error
xEngine, err = xorm.NewEngine(dbType, sqlStr) //1、Create xorm engine xEngine, err = xorm.NewEngine(dbType, sqlStr) //1、Create xorm engine

4
features/lm/logbak.go
View File

@@ -51,7 +51,7 @@ var DbClient DatabaseClient
// } // }
func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error { func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error {
DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbUser, dbPassword, dbHost, dbPort, dbName) dbUser, dbPassword, dbHost, dbPort, dbName)
DbClient.dbType = dbType DbClient.dbType = dbType
DbClient.dbConnMaxLifetime = 0 DbClient.dbConnMaxLifetime = 0
@@ -60,7 +60,7 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
if log.GetLevel() == log.LOG_TRACE { if log.GetLevel() == log.LOG_TRACE {
DbClient.IsShowSQL = true DbClient.IsShowSQL = true
} }
log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8&parseTime=true&loc=Local", log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbType, dbUser, dbHost, dbPort, dbName) dbType, dbUser, dbHost, dbPort, dbName)
var err error var err error

8
features/pm/performance.go
View File

@@ -94,7 +94,7 @@ type DatabaseClient struct {
var DbClient DatabaseClient var DbClient DatabaseClient
func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error { func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error {
DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbUser, dbPassword, dbHost, dbPort, dbName) dbUser, dbPassword, dbHost, dbPort, dbName)
DbClient.dbType = dbType DbClient.dbType = dbType
DbClient.dbConnMaxLifetime = 0 DbClient.dbConnMaxLifetime = 0
@@ -103,7 +103,7 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
if log.GetLevel() == log.LOG_TRACE { if log.GetLevel() == log.LOG_TRACE {
DbClient.IsShowSQL = true DbClient.IsShowSQL = true
} }
log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8&parseTime=true&loc=Local", log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbType, dbUser, dbHost, dbPort, dbName) dbType, dbUser, dbHost, dbPort, dbName)
var err error var err error
@@ -124,9 +124,9 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
} }
func XormConnectDatabase(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) (*xorm.Engine, error) { func XormConnectDatabase(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) (*xorm.Engine, error) {
sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbUser, dbPassword, dbHost, dbPort, dbName) dbUser, dbPassword, dbHost, dbPort, dbName)
log.Debugf("dbType:%s Connect to:%s:******@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", log.Debugf("dbType:%s Connect to:%s:******@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbType, dbUser, dbHost, dbPort, dbName) dbType, dbUser, dbHost, dbPort, dbName)
var err error var err error
xEngine, err = xorm.NewEngine(dbType, sqlStr) //1、Create xorm engine xEngine, err = xorm.NewEngine(dbType, sqlStr) //1、Create xorm engine

4
features/sm/backup.go
View File

@@ -52,7 +52,7 @@ var dbConfig = config.GetYamlConfig().Database
func DatabaseWhoreBackup() { func DatabaseWhoreBackup() {
// MySQL数据库连接信息 // MySQL数据库连接信息
sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbConfig.User, dbConfig.Password, dbConfig.Host, dbConfig.Port, dbConfig.Name) dbConfig.User, dbConfig.Password, dbConfig.Host, dbConfig.Port, dbConfig.Name)
db, err := sql.Open("mysql", sqlStr) db, err := sql.Open("mysql", sqlStr)
if err != nil { if err != nil {
@@ -91,7 +91,7 @@ func DatabaseWhoreBackup() {
func DatabaseIncrementalBackup() { func DatabaseIncrementalBackup() {
// MySQL数据库连接信息 // MySQL数据库连接信息
sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbConfig.User, dbConfig.Password, dbConfig.Host, dbConfig.Port, dbConfig.Name) dbConfig.User, dbConfig.Password, dbConfig.Host, dbConfig.Port, dbConfig.Name)
db, err := sql.Open("mysql", sqlStr) db, err := sql.Open("mysql", sqlStr)
if err != nil { if err != nil {

8
lib/dborm/dborm.go
View File

@@ -46,7 +46,7 @@ type DatabaseClient struct {
var DbClient DatabaseClient var DbClient DatabaseClient
func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error { func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) error {
DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", DbClient.dbUrl = fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbUser, dbPassword, dbHost, dbPort, dbName) dbUser, dbPassword, dbHost, dbPort, dbName)
DbClient.dbType = dbType DbClient.dbType = dbType
DbClient.dbConnMaxLifetime = 0 DbClient.dbConnMaxLifetime = 0
@@ -55,7 +55,7 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
if log.GetLevel() == log.LOG_TRACE { if log.GetLevel() == log.LOG_TRACE {
DbClient.IsShowSQL = true DbClient.IsShowSQL = true
} }
log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8&parseTime=true&loc=Local", log.Debugf("dbType:%s dbUrl:%s:******@tcp(%s:%s)/%s??charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbType, dbUser, dbHost, dbPort, dbName) dbType, dbUser, dbHost, dbPort, dbName)
var err error var err error
@@ -106,9 +106,9 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
var xEngine *xorm.Engine var xEngine *xorm.Engine
func XormConnectDatabase(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) (*xorm.Engine, error) { func XormConnectDatabase(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) (*xorm.Engine, error) {
sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbUser, dbPassword, dbHost, dbPort, dbName) dbUser, dbPassword, dbHost, dbPort, dbName)
log.Debugf("dbType:%s Connect to:%s:******@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", log.Debugf("dbType:%s Connect to:%s:******@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local",
dbType, dbUser, dbHost, dbPort, dbName) dbType, dbUser, dbHost, dbPort, dbName)
var err error var err error
xEngine, err = xorm.NewEngine(dbType, sqlStr) //1、Create xorm engine xEngine, err = xorm.NewEngine(dbType, sqlStr) //1、Create xorm engine

2
src/framework/datasource/datasource.go
View File

@@ -34,7 +34,7 @@ func loadDialect() map[string]dialectInfo {
// 数据库类型对应的数据库连接 // 数据库类型对应的数据库连接
switch item["type"] { switch item["type"] {
case "mysql": case "mysql":
dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=True&loc=Local", dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&loc=Local",
item["username"], item["username"],
item["password"], item["password"],
item["host"], item["host"],

6
tools/loadcmxls/db.go
View File

@@ -10,9 +10,9 @@ import (
var xEngine *xorm.Engine var xEngine *xorm.Engine
func XormConnectDatabaseWithUri(sql string) (*xorm.Engine, error) { func XormConnectDatabaseWithUri(sql string) (*xorm.Engine, error) {
// sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", db.User, db.Password, db.Host, db.Port, db.Name) // sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", db.User, db.Password, db.Host, db.Port, db.Name)
sqlStr := fmt.Sprintf("%s?charset=utf8&parseTime=true&loc=Local", sql) sqlStr := fmt.Sprintf("%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", sql)
// fmt.Printf("sqlStr:%s:******@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", db.User, db.Host, db.Port, db.Name) // fmt.Printf("sqlStr:%s:******@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", db.User, db.Host, db.Port, db.Name)
var err error var err error
xEngine, err = xorm.NewEngine("mysql", sqlStr) //1、Create xorm engine xEngine, err = xorm.NewEngine("mysql", sqlStr) //1、Create xorm engine
if err != nil { if err != nil {

6
tools/loadmconf/db.go
View File

@@ -13,9 +13,9 @@ import (
var xEngine *xorm.Engine var xEngine *xorm.Engine
func XormConnectDatabaseWithUri(sql string) (*xorm.Engine, error) { func XormConnectDatabaseWithUri(sql string) (*xorm.Engine, error) {
// sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", db.User, db.Password, db.Host, db.Port, db.Name) // sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", db.User, db.Password, db.Host, db.Port, db.Name)
sqlStr := fmt.Sprintf("%s?charset=utf8&parseTime=true&loc=Local", sql) sqlStr := fmt.Sprintf("%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", sql)
// fmt.Printf("sqlStr:%s:******@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", db.User, db.Host, db.Port, db.Name) // fmt.Printf("sqlStr:%s:******@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", db.User, db.Host, db.Port, db.Name)
var err error var err error
xEngine, err = xorm.NewEngine("mysql", sqlStr) //1、Create xorm engine xEngine, err = xorm.NewEngine("mysql", sqlStr) //1、Create xorm engine
if err != nil { if err != nil {

6
tools/loadpconf/db.go
View File

@@ -13,9 +13,9 @@ import (
var xEngine *xorm.Engine var xEngine *xorm.Engine
func XormConnectDatabaseWithUri(sql string) (*xorm.Engine, error) { func XormConnectDatabaseWithUri(sql string) (*xorm.Engine, error) {
// sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", db.User, db.Password, db.Host, db.Port, db.Name) // sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", db.User, db.Password, db.Host, db.Port, db.Name)
sqlStr := fmt.Sprintf("%s?charset=utf8&parseTime=true&loc=Local", sql) sqlStr := fmt.Sprintf("%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", sql)
// fmt.Printf("sqlStr:%s:******@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", db.User, db.Host, db.Port, db.Name) // fmt.Printf("sqlStr:%s:******@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", db.User, db.Host, db.Port, db.Name)
var err error var err error
xEngine, err = xorm.NewEngine("mysql", sqlStr) //1、Create xorm engine xEngine, err = xorm.NewEngine("mysql", sqlStr) //1、Create xorm engine
if err != nil { if err != nil {

6
tools/loadpmxls/db.go
View File

@@ -10,9 +10,9 @@ import (
var xEngine *xorm.Engine var xEngine *xorm.Engine
func XormConnectDatabaseWithUri(sql string) (*xorm.Engine, error) { func XormConnectDatabaseWithUri(sql string) (*xorm.Engine, error) {
// sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", db.User, db.Password, db.Host, db.Port, db.Name) // sqlStr := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", db.User, db.Password, db.Host, db.Port, db.Name)
sqlStr := fmt.Sprintf("%s?charset=utf8&parseTime=true&loc=Local", sql) sqlStr := fmt.Sprintf("%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", sql)
// fmt.Printf("sqlStr:%s:******@tcp(%s:%s)/%s?charset=utf8&parseTime=true&loc=Local", db.User, db.Host, db.Port, db.Name) // fmt.Printf("sqlStr:%s:******@tcp(%s:%s)/%s?charset=utf8mb4&collation=utf8mb4_general_ciparseTime=true&loc=Local", db.User, db.Host, db.Port, db.Name)
var err error var err error
xEngine, err = xorm.NewEngine("mysql", sqlStr) //1、Create xorm engine xEngine, err = xorm.NewEngine("mysql", sqlStr) //1、Create xorm engine
if err != nil { if err != nil {