Merge branch 'rsm' of e.coding.net:rosydev/jx-callback into rsm

# Conflicts:
#	globals/beegodb/beegodb.go

globals/beegodb/beegodb.go

@@ -9,6 +9,8 @@ import (
 
 func Init() {
 	// set default database
+	orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"))
+	//orm.RegisterDataBase("jxd_dev_0", "mysql", "root:WebServer@1@tcp(test1.jxc4.com:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true")
 	if beego.BConfig.RunMode == "rsm" {
 		orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"))
 		//用户
@@ -50,13 +52,11 @@ func Init() {
 		orm.RegisterModel(&model.OrderPayRefund{})       // 退款表
 		orm.RegisterModel(&model.UserVendorOrder{})      // 物流订单
 		orm.RegisterModel(&model.WithdrawalRecord{})     // 提现申请
-	} else {
-		orm.RegisterDataBase("default", "mysql", "root:WebServer@1@tcp(127.0.0.1:3306)/api?charset=utf8mb4&loc=Local&parseTime=true")
-		//打印机
-		orm.RegisterModel(&model.PrintMsg{})
-		orm.RegisterModel(&model.Printer{})
 	}
 
+	//打印机
+	orm.RegisterModel(&model.PrintMsg{})
+	orm.RegisterModel(&model.Printer{})
 	// create table
 	orm.RunSyncdb("default", false, true)
 }