fix merge err
This commit is contained in:
1 parent
9a70ea3d09
commit
e174f1e740
1 file changed
+3
-3
+3
-3
@@ -4,7 +4,7 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
_ "github.com/go-sql-driver/mysql" //加载mysql
|
_ "github.com/go-sql-driver/mysql" //加载mysql
|
||||||
"github.com/jinzhu/gorm"
|
"github.com/jinzhu/gorm"
|
||||||
config2 "go-admin/config"
|
"go-admin/tools/config"
|
||||||
|
|
||||||
"log"
|
"log"
|
||||||
"strconv"
|
"strconv"
|
||||||
@@ -52,9 +52,9 @@ func Setup() {
|
|||||||
panic("db type unknow")
|
panic("db type unknow")
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalln("%s connect error %v", dbType, err)
|
log.Fatalln("%s connect error %v", DbType, err)
|
||||||
} else {
|
} else {
|
||||||
log.Println("%s connect success!", dbType)
|
log.Println("%s connect success!", DbType)
|
||||||
}
|
}
|
||||||
log.Println("%s connect success!", DbType)
|
log.Println("%s connect success!", DbType)
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user