From 6310f7b4947c2518f3b904d9f20eb80facea6b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 Aug 2022 09:52:35 +0800 Subject: [PATCH 1/5] 1 --- business/jxstore/event/event_tcp.go | 1 + globals/beegodb/beegodb.go | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index 01dbaf25b..bfcaa4877 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -184,6 +184,7 @@ func (t *TcpClient) HandleTcpMessages(printNo string) { } } } + return } } }() diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 737436b28..e1b90eb16 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -9,9 +9,8 @@ import ( func Init() { // set default database - orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr")) - //orm.RegisterDataBase("api", "mysql", "root:WebServer@1@tcp(gold1.jxc4.com:3306)/api?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,11 +50,13 @@ 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) } From f9e1bb21afc79f6c2b22d0b640cd8a682a384f3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 Aug 2022 09:55:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA=E6=95=B0=E6=8D=AEdb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- globals/beegodb/beegodb.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 070e3c7e0..23743ba22 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -9,8 +9,6 @@ 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")) //用户 From 2867386ea17656a4a1621f4100bcb09e7d279da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 Aug 2022 10:00:30 +0800 Subject: [PATCH 3/5] 1 --- globals/beegodb/beegodb.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index 23743ba22..805151e6d 100644 --- a/globals/beegodb/beegodb.go +++ b/globals/beegodb/beegodb.go @@ -50,11 +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) } From f250957e0fc4d99e96e105929571204deb5e0f3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 Aug 2022 10:26:34 +0800 Subject: [PATCH 4/5] 1 --- business/jxstore/event/event_tcp.go | 1 - 1 file changed, 1 deletion(-) diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index bfcaa4877..01dbaf25b 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -184,7 +184,6 @@ func (t *TcpClient) HandleTcpMessages(printNo string) { } } } - return } } }() From beee8def03a345aace96e0d0f26b1e6ed9de063f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 Aug 2022 10:46:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9orderno=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/event/print_test.go | 4 ++++ business/model/print.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/business/jxstore/event/print_test.go b/business/jxstore/event/print_test.go index 7a905ce63..e63d3401b 100644 --- a/business/jxstore/event/print_test.go +++ b/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)) +} diff --git a/business/model/print.go b/business/model/print.go index 1c7fdc917..c2e714e56 100644 --- a/business/model/print.go +++ b/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"`