1
This commit is contained in:
@@ -203,7 +203,6 @@ func (c *PrinterHandler) getOrderContentV2(order *model.GoodsOrder, storeTel str
|
|||||||
<font# bolder=0 height=1 width=1>--------------------------------</font#>
|
<font# bolder=0 height=1 width=1>--------------------------------</font#>
|
||||||
<LEFT><font# bolder=0 height=1 width=1>客户备注:%s</font#></LEFT>
|
<LEFT><font# bolder=0 height=1 width=1>客户备注:%s</font#></LEFT>
|
||||||
<font# bolder=0 height=1 width=1>--------------------------------</font#>
|
<font# bolder=0 height=1 width=1>--------------------------------</font#>
|
||||||
<LEFT><font# bolder=0 height=1 width=1>商品列表</font#></LEFT>
|
|
||||||
商品名` + trenditapi.StrRepeat(" ", 20) + `数量
|
商品名` + trenditapi.StrRepeat(" ", 20) + `数量
|
||||||
` + trenditapi.StrRepeat("-", 32) + `
|
` + trenditapi.StrRepeat("-", 32) + `
|
||||||
`
|
`
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.rosy.net.cn/jx-callback/globals"
|
|
||||||
|
|
||||||
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
|
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
|
||||||
"git.rosy.net.cn/jx-callback/globals/api"
|
"git.rosy.net.cn/jx-callback/globals/api"
|
||||||
"github.com/gazeboxu/mapstructure"
|
"github.com/gazeboxu/mapstructure"
|
||||||
@@ -311,13 +309,6 @@ func GenFullUrl(appID float64) (fullUrl string) {
|
|||||||
retVal := mtwmapi.GetConnTokenResp{}
|
retVal := mtwmapi.GetConnTokenResp{}
|
||||||
err = mapstructure.Decode(resp, &retVal)
|
err = mapstructure.Decode(resp, &retVal)
|
||||||
fullUrl = MTIMPushUrl + "/" + retVal.AppKey + "/" + retVal.ConnectionToken
|
fullUrl = MTIMPushUrl + "/" + retVal.AppKey + "/" + retVal.ConnectionToken
|
||||||
|
|
||||||
//todo 测试
|
|
||||||
tete := api.MtwmAPI.GetAppID()
|
|
||||||
globals.SugarLogger.Debugf("GenFullUrl appID=%s", tete)
|
|
||||||
//todo
|
|
||||||
|
|
||||||
fmt.Printf("GenFullUrl:%s", fullUrl)
|
|
||||||
return fullUrl
|
return fullUrl
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -342,13 +333,6 @@ func GenFullUrl2() *UrlInfo {
|
|||||||
urlInfo.ClientIDSub = r1.AppKey + ":" + r1.ConnectionToken
|
urlInfo.ClientIDSub = r1.AppKey + ":" + r1.ConnectionToken
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//todo 测试
|
|
||||||
tete := api.MtwmAPI.GetAppID()
|
|
||||||
globals.SugarLogger.Debugf("GenFullUrl appID=%s", tete)
|
|
||||||
//todo
|
|
||||||
|
|
||||||
fmt.Printf("GenFullUrl:urlMain=%s, urlSub=%s", urlInfo.UrlMain, urlInfo.UrlSub)
|
|
||||||
return urlInfo
|
return urlInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -82,9 +82,9 @@ func PingTimer() {
|
|||||||
ticker := time.NewTicker(heartbeatInterval)
|
ticker := time.NewTicker(heartbeatInterval)
|
||||||
defer ticker.Stop()
|
defer ticker.Stop()
|
||||||
//测试用
|
//测试用
|
||||||
i := 0
|
//i := 0
|
||||||
for {
|
for {
|
||||||
i++
|
//i++
|
||||||
<-ticker.C
|
<-ticker.C
|
||||||
for clientId, conn := range Manager.AllClient() {
|
for clientId, conn := range Manager.AllClient() {
|
||||||
if conn.ClientType == ClientTypeJx {
|
if conn.ClientType == ClientTypeJx {
|
||||||
@@ -101,7 +101,7 @@ func PingTimer() {
|
|||||||
MtInit()
|
MtInit()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
globals.SugarLogger.Debugf("发送心跳 clientId=%s,i=%d", clientId, i)
|
//globals.SugarLogger.Debugf("发送心跳 clientId=%s,i=%d", clientId, i)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|||||||
Reference in New Issue
Block a user