Merge branches 'rsm' and 'rsm' of https://e.coding.net/rosydev/jx-callback into rsm

business/jxstore/event/print_test.go

@@ -86,3 +86,7 @@ func toHex(ten int) string {
 	}
 	return strings.Join(hexStr, "")
 }
+
+func TestInt2Int64(t *testing.T) {
+	fmt.Println(int64(19930826391))
+}

business/model/print.go

@@ -5,7 +5,7 @@ type PrintMsg struct {
 
 	PrintNo           string `json:"print_no" db:"print_no"`                //打印机编号
 	Content           string `orm:"type(text)" json:"content" db:"content"` //订单内容
-	OrderNo           int    `json:"order_no" db:"order_no"`                //订单序号
+	OrderNo           int64  `json:"order_no" db:"order_no"`                //订单序号
 	Status            int    `json:"status" db:"status"`                    //打印状态
 	Comment           string `json:"comment" db:"comment"`                  //失败原因
 	MsgID             string `orm:"column(msg_id)" json:"msgID" db:"msg_id"`

globals/beegodb/beegodb.go

@@ -9,9 +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"))
 		//用户
 		orm.RegisterModel(&model.AuthBind{}, &model.User{})
 		orm.RegisterModel(&model.UserMember{})
@@ -51,12 +50,12 @@ 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)
-	//orm.RunSyncdb("jxd_dev_0", false, true)
 }