|
@@ -3,6 +3,7 @@ package util
|
|
import (
|
|
import (
|
|
"crypto/md5"
|
|
"crypto/md5"
|
|
"encoding/hex"
|
|
"encoding/hex"
|
|
|
|
+ "fmt"
|
|
"log"
|
|
"log"
|
|
"math"
|
|
"math"
|
|
"reflect"
|
|
"reflect"
|
|
@@ -18,28 +19,23 @@ import (
|
|
var instance *sqlx.DB
|
|
var instance *sqlx.DB
|
|
var once sync.Once
|
|
var once sync.Once
|
|
|
|
|
|
-var str = "xiaoniao_n:xnC+21%@Ydm@tcp(114.67.232.21:3308)/xn_db_clear"
|
|
|
|
-
|
|
|
|
-//var str = "xiaoniao_web:sy1xn8902^!(@@tcp(101.201.196.166:3308)/xiaoniao_db"
|
|
|
|
-
|
|
|
|
func createSqlDB() {
|
|
func createSqlDB() {
|
|
var err error
|
|
var err error
|
|
var (
|
|
var (
|
|
- //dsec = config.IniConf.Section("database")
|
|
|
|
- //host = dsec.Key("mysql.host").Value()
|
|
|
|
- //user = dsec.Key("mysql.user").Value()
|
|
|
|
- //password = dsec.Key("mysql.password").Value()
|
|
|
|
- //port = dsec.Key("mysql.port").Value()
|
|
|
|
- //database = dsec.Key("mysql.database").Value()
|
|
|
|
- //dns = fmt.Sprintf("%s:%s@(%s:%s)/%s", user, password, host, port, database)
|
|
|
|
|
|
+ dsec = config.IniConf.Section("database")
|
|
|
|
+ host = dsec.Key("mysql.host").Value()
|
|
|
|
+ user = dsec.Key("mysql.user").Value()
|
|
|
|
+ password = dsec.Key("mysql.password").Value()
|
|
|
|
+ port = dsec.Key("mysql.port").Value()
|
|
|
|
+ database = dsec.Key("mysql.database").Value()
|
|
|
|
+ dns = fmt.Sprintf("%s:%s@(%s:%s)/%s", user, password, host, port, database)
|
|
)
|
|
)
|
|
|
|
|
|
if instance != nil {
|
|
if instance != nil {
|
|
instance.Close()
|
|
instance.Close()
|
|
}
|
|
}
|
|
- //instance, err = sqlx.Connect("mysql", dns)
|
|
|
|
|
|
+ instance, err = sqlx.Connect("mysql", dns)
|
|
//instance, err = sqlx.Connect("mysql", "xiaoniao:xn321#@!@tcp(123.57.224.234:3306)/jeecg")
|
|
//instance, err = sqlx.Connect("mysql", "xiaoniao:xn321#@!@tcp(123.57.224.234:3306)/jeecg")
|
|
- instance, err = sqlx.Connect("mysql", str)
|
|
|
|
if err != nil {
|
|
if err != nil {
|
|
log.Println(err)
|
|
log.Println(err)
|
|
}
|
|
}
|
|
@@ -60,18 +56,18 @@ var wonce sync.Once
|
|
func createWriteSqlDB() {
|
|
func createWriteSqlDB() {
|
|
var err error
|
|
var err error
|
|
var (
|
|
var (
|
|
- //dsec = config.IniConf.Section("database")
|
|
|
|
- //host = dsec.Key("mysql.write.host").Value()
|
|
|
|
- //user = dsec.Key("mysql.write.user").Value()
|
|
|
|
- //password = dsec.Key("mysql.write.password").Value()
|
|
|
|
- //port = dsec.Key("mysql.write.port").Value()
|
|
|
|
- //database = dsec.Key("mysql.database").Value()
|
|
|
|
- //dns = fmt.Sprintf("%s:%s@(%s:%s)/%s", user, password, host, port, database)
|
|
|
|
|
|
+ dsec = config.IniConf.Section("database")
|
|
|
|
+ host = dsec.Key("mysql.write.host").Value()
|
|
|
|
+ user = dsec.Key("mysql.write.user").Value()
|
|
|
|
+ password = dsec.Key("mysql.write.password").Value()
|
|
|
|
+ port = dsec.Key("mysql.write.port").Value()
|
|
|
|
+ database = dsec.Key("mysql.database").Value()
|
|
|
|
+ dns = fmt.Sprintf("%s:%s@(%s:%s)/%s", user, password, host, port, database)
|
|
)
|
|
)
|
|
if winstance != nil {
|
|
if winstance != nil {
|
|
winstance.Close()
|
|
winstance.Close()
|
|
}
|
|
}
|
|
- winstance, err = sqlx.Connect("mysql", str)
|
|
|
|
|
|
+ winstance, err = sqlx.Connect("mysql", dns)
|
|
//instance, err = sqlx.Connect("mysql", "xiaoniao:xn321#@!@tcp(123.57.224.234:3306)/jeecg")
|
|
//instance, err = sqlx.Connect("mysql", "xiaoniao:xn321#@!@tcp(123.57.224.234:3306)/jeecg")
|
|
if err != nil {
|
|
if err != nil {
|
|
log.Println(err)
|
|
log.Println(err)
|