From 024cd86425807039bdd320e6d03045499a68a224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 20 Mar 2023 17:28:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0uniapp=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E9=80=9A=E7=9F=A5,=E5=88=A0=E9=99=A4=E8=80=81=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eventhub/syseventhub/syseventhub.go | 2 +- business/jxutils/tasks/configrefresh.go | 24 ------ business/jxutils/unipush/push.go | 82 +------------------ conf/app.conf | 10 --- globals/api/api.go | 5 -- main.go | 5 +- 6 files changed, 5 insertions(+), 123 deletions(-) diff --git a/business/jxutils/eventhub/syseventhub/syseventhub.go b/business/jxutils/eventhub/syseventhub/syseventhub.go index 3a465e5ec..80f427d2b 100644 --- a/business/jxutils/eventhub/syseventhub/syseventhub.go +++ b/business/jxutils/eventhub/syseventhub/syseventhub.go @@ -105,7 +105,7 @@ func (h *Hub) GetToken(tokenType, oldToken string, waitTime time.Duration) (toke token = string(utils.MustMarshal(weimobToken)) } case EventTypePushToken: - token = api.PushAPI.CBGetToken() + token, _ = api.UniAppApi.CheckTokenIsExpire() case EventTypeWX2Token: token = api.WeixinMiniAPI2.CBGetToken() } diff --git a/business/jxutils/tasks/configrefresh.go b/business/jxutils/tasks/configrefresh.go index 8ad5ca5a4..b4bbd90b2 100644 --- a/business/jxutils/tasks/configrefresh.go +++ b/business/jxutils/tasks/configrefresh.go @@ -218,30 +218,6 @@ func RefreshWeixin2Token() (err error) { return err } -func RefreshPushToken() (err error) { - if api.PushAPI != nil { - err = RefreshConfig("push", pushTokenExpires, func() (token string, expireTimeStr string, invalidParameter string) { - if globals.IsMainProductEnv() { - if tokenInfo, err := api.PushAPI.CBRetrieveToken(); err == nil { - token = tokenInfo.Token - } else { - globals.SugarLogger.Errorf("RefreshPushToken RefreshToken failed with error:%v", err) - } - } else { - if tokenInfo := getPushTokenFromRemote(api.PushAPI.CBGetToken()); tokenInfo != nil { - expireTimeStr = utils.Time2Str(time.Now().Add(-pushTokenExpires)) - token = tokenInfo.Token - } - } - return token, expireTimeStr, "" - }, func(value, v2 string) { - syseventhub.SysEventHub.OnNewPushToken(value) - api.PushAPI.CBSetToken(value) - }) - } - return err -} - func RefreshWeixin3Token() (err error) { // if api.WeixinMiniAPI3 != nil { // err = RefreshConfig("wechat3", weixinTokenExpires, func() (token string, expireTimeStr string) { diff --git a/business/jxutils/unipush/push.go b/business/jxutils/unipush/push.go index 19fb25dbd..003567ba1 100644 --- a/business/jxutils/unipush/push.go +++ b/business/jxutils/unipush/push.go @@ -6,66 +6,17 @@ import ( "fmt" "git.rosy.net.cn/jx-callback/business/authz/autils" "git.rosy.net.cn/jx-callback/globals/api2" - "strings" "time" "git.rosy.net.cn/baseapi/utils" - "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" - beego "github.com/astaxie/beego/server/web" ) -// -//func pushToSingle(content, title string, storeID int) { -// var ( -// db = dao.GetDB() -// ) -// if !globals.IsProductEnv() { -// return -// } -// if storeID == 0 { -// return -// } -// storePushs, err := dao.GetStorePushClient(db, storeID, "") -// if err != nil { -// return -// } -// for _, v := range storePushs { -// -// status, err2 := api.PushAPI.PushToSingle(v.ClientID, false, &unipushapi.Notification{ -// Title: title, -// Body: content, -// }) -// if err = err2; err != nil { -// continue -// } -// if status == unipushapi.SuccessOffLine { -// _, err = api.PushAPI.PushToSingle(v.ClientID, true, &unipushapi.Notification{ -// Body: content, -// }) -// if err != nil { -// globals.SugarLogger.Debugf("NotifyNewOrder push2 error: [%v]", err) -// continue -// } -// } -// -// } -//} - // NotifyNewOrder 推送新订单 func NotifyNewOrder(order *model.GoodsOrder) { - //if order == nil || len(order.Skus) == 0 { - // return - //} - //sb := new(strings.Builder) - //sb.WriteString("老板，") - //sb.WriteString(order.ConsigneeName) - //sb.WriteString("购买了商品") - //sb.WriteString(getOrderDetailBrief(order)) - //pushToSingle(sb.String(), "京西菜市新订单推送", jxutils.GetSaleStoreIDFromOrder(order)) storeId := order.StoreID if storeId <= model.NO { storeId = order.JxStoreID @@ -83,7 +34,7 @@ func NotifyNewOrder(order *model.GoodsOrder) { return } - msg.MsgType = "新订单" + msg.MsgType = "newOrder" msg.VendorName = model.VendorChineseNames[order.VendorID] msg.OrderSqs = utils.Int2Str(order.OrderSeq) msg.StoreTitle = storeDetail.Name @@ -92,30 +43,6 @@ func NotifyNewOrder(order *model.GoodsOrder) { pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context)) } -func getOrderDetailBrief(order *model.GoodsOrder) (brief string) { - sb := new(strings.Builder) - sb.WriteString(order.Skus[0].SkuName) - sb.WriteString("等共") - sb.WriteString(utils.Int2Str(order.Skus[0].Count)) - sb.WriteString("份（") - sb.WriteString(jxutils.IntPrice2StandardString(order.Skus[0].SalePrice)) - sb.WriteString("元/份）等，预计收入") - //TODO 2020-07-20 果园和菜市不同 - var price int64 - if beego.BConfig.RunMode == "jxgy" { - price = order.EarningPrice - } else { - if order.EarningType == model.EarningTypePoints { - price = order.ActualPayPrice - } else { - price = order.EarningPrice - } - } - sb.WriteString(jxutils.IntPrice2StandardString(price)) - sb.WriteString("元") - return sb.String() -} - func NotifyAfsOrder(afsOrder *model.AfsOrder) (err error) { storeId := afsOrder.StoreID if storeId <= model.NO { @@ -134,14 +61,13 @@ func NotifyAfsOrder(afsOrder *model.AfsOrder) (err error) { return } - msg.MsgType = "售后订单" + msg.MsgType = "newAfsOrder" msg.VendorName = model.VendorChineseNames[afsOrder.VendorID] msg.OrderSqs = "0" msg.StoreTitle = storeDetail.Name msg.Context = "老板订单申请退款了" context, _ := json.Marshal(msg) pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context)) - //pushToSingle("老板，您有新的售后单，请尽快处理！", "京西菜市售后单推送", jxutils.GetSaleStoreIDFromAfsOrder(afsOrder)) return err } @@ -163,15 +89,13 @@ func NotifyOrderCanceled(order *model.GoodsOrder) (err error) { return } - msg.MsgType = "取消订单" + msg.MsgType = "newCancelOrder" msg.VendorName = model.VendorChineseNames[order.VendorID] msg.OrderSqs = "0" msg.StoreTitle = storeDetail.Name msg.Context = "老板订单被取消了" context, _ := json.Marshal(msg) pushMsgByUniApp(storeDetail.ID, storeDetail.Name, cid, string(context)) - //title := fmt.Sprintf("老板，您的订单%s第%d号订单, %s被取消了！", model.VendorChineseNames[order.VendorID], order.OrderSeq, order.VendorOrderID) - //pushToSingle(title, "京西菜市取消单推送", jxutils.GetSaleStoreIDFromOrder(order)) return err } diff --git a/conf/app.conf b/conf/app.conf index e9f78ce43..48f8e4dca 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -347,11 +347,6 @@ dingdingCallbackAESKey = "EjTgnEa377fEcgzlQUbcgTzxPNznRjpOuSPgQAwv9aA" dingdingCallbackToken = "ITKIL2FeFHZa48fEK9g3dbJ1DOww7shOrIZ2f" dingdingCallbackURL = "http://callback.jxc4.com/dingding/msg" -pushAppID = "5lyyrvHODG6wC8Sdr3a9h" -pushAppKey = "iFrkUDmR2g5eqQpfh2kQ57" -pushAppSecret = "WTn53qd6WAAdLMXfmXvzb7" -pushMasterSecret= "dGZcR0XGGg7H5Pd7FR3n47" - fnAppID = "6705486294797503379" fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e" fnCode = "uDEyAmTbrfS2qjYbgi20Jm" @@ -680,11 +675,6 @@ dingdingCallbackAESKey = "EjTgnEa377fEcgzlQUbcgTzxPNznRjpOuSPgQAwv9aA" dingdingCallbackToken = "ITKIL2FeFHZa48fEK9g3dbJ1DOww7shOrIZ2f" dingdingCallbackURL = "http://callback.beta.jxc4.com/dingding/msg" -pushAppID = "5lyyrvHODG6wC8Sdr3a9h" -pushAppKey = "iFrkUDmR2g5eqQpfh2kQ57" -pushAppSecret = "WTn53qd6WAAdLMXfmXvzb7" -pushMasterSecret= "dGZcR0XGGg7H5Pd7FR3n47" - fnAppID = "6705486294797503379" fnAppSecret = "c1e6c280-e618-4103-9d0a-673bc54fb22e" fnCode = "uDEyAmTbrfS2qjYbgi20Jm" diff --git a/globals/api/api.go b/globals/api/api.go index 2c7eeb391..81bfcb7bb 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -16,8 +16,6 @@ import ( "git.rosy.net.cn/baseapi/platformapi/fnpsapi" - "git.rosy.net.cn/baseapi/platformapi/unipushapi" - "git.rosy.net.cn/baseapi/platformapi/jdshopapi" "git.rosy.net.cn/baseapi/platformapi/aliupcapi" @@ -115,8 +113,6 @@ var ( ZhongwuAPI *zhongwuapi.API JxPrintAPI *jxprintapi.API - PushAPI *unipushapi.API - Cacher cache.ICacher SMSClient *aliyunsmsclient.SmsClient @@ -313,7 +309,6 @@ func Init() { YilianyunAPI2 = yilianyunapi.New(beego.AppConfig.DefaultString("yilianyunClientID2", ""), beego.AppConfig.DefaultString("yilianyunClientSecret2", "")) XpyunAPI = xpyunapi.New(beego.AppConfig.DefaultString("xpyunUserName", ""), beego.AppConfig.DefaultString("xpyunUserKey", "")) ZhongwuAPI = zhongwuapi.New(beego.AppConfig.DefaultInt("zhongwuAppID", 0), beego.AppConfig.DefaultString("zhongwuAppSecret", "")) - PushAPI = unipushapi.New(beego.AppConfig.DefaultString("pushAppID", ""), beego.AppConfig.DefaultString("pushAppKey", ""), beego.AppConfig.DefaultString("pushAppSecret", ""), beego.AppConfig.DefaultString("pushMasterSecret", "")) JxPrintAPI = jxprintapi.New(beego.AppConfig.DefaultString("jxPrintAppID", ""), beego.AppConfig.DefaultString("jxPrintAppKey", "")) SMSClient = aliyunsmsclient.New("http://dysmsapi.aliyuncs.com/") diff --git a/main.go b/main.go index c3af27c65..0ecae86e0 100644 --- a/main.go +++ b/main.go @@ -155,10 +155,7 @@ func main() { globals.SugarLogger.Errorf("RefreshYilianyunToken failed with error:%s", err) return } - if err := tasks.RefreshPushToken(); err != nil { - globals.SugarLogger.Errorf("RefreshPushToken failed with error:%s", err) - return - } + if web.BConfig.RunMode != "jxgy" { if err := tasks.RefreshFnToken(); err != nil { globals.SugarLogger.Errorf("RefreshFnToken failed with error:%s", err)