liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-10-22 22:44:39 +08:00
parent 04f1190953
commit 5a47102894
37 changed files with 4 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/auth2.go
View File

@@ -24,7 +24,6 @@ import (
func GetComposedCode(c *web.Controller, code string) (composedCode string) {
composedCode = code
referer := c.Ctx.Request.Referer()
globals.SugarLogger.Debugf("GetComposedCode referer:%s", referer)
index := strings.Index(referer, "//")
if index > 0 {
list := strings.Split(referer[index+2:], "/")
@@ -38,7 +37,6 @@ func GetComposedCode(c *web.Controller, code string) (composedCode string) {
func GetComposedCode2(c *web.Controller, code string) (composedCode string) {
composedCode = code
referer := c.Ctx.Request.UserAgent()
globals.SugarLogger.Debugf("GetComposedCode referer:%s", referer)
index := strings.Index(referer, "//")
if index > 0 {
list := strings.Split(referer[index+2:], "/")
@@ -133,17 +131,14 @@ func (c *Auth2Controller) Login() {
params.AuthSecret = GetComposedCode2(&c.Controller, params.AuthSecret)
}
ctx := auth2.NewContext(c.Ctx.ResponseWriter, c.Ctx.Request)
globals.SugarLogger.Debug("params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret==============", params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret)
authInfo, err := auth2.Login(ctx, params.AuthType, params.AuthID, params.AuthIDType, params.AuthSecret)
// TODO 兼容没有取到authid2的错误
if err == nil && authInfo.AuthBindInfo != nil {
if authInfo.AuthBindInfo.AuthID2 == "" {
globals.SugarLogger.Debug("fgfggggggg")
authInfo.AuthBindInfo.AuthID2 = authInfo.AuthBindInfo.AuthID
}
retVal = authInfo
}
globals.SugarLogger.Debug("retVal==============", retVal)
return retVal, "", err
})
}
@@ -248,7 +243,6 @@ func (c *Auth2Controller) WeixinMPOAuth2() {
redirectURL = fmt.Sprintf("%s?info=%s", params.Block, base64.StdEncoding.EncodeToString(utils.MustMarshal(callResult)))
return retVal, model.ErrorCodeIgnore, err
})
globals.SugarLogger.Debugf("WeixinMPOAuth2, callResult:%s, redirectURL:%s", utils.Format4Output(callResult, true), redirectURL)
c.Redirect(redirectURL, http.StatusTemporaryRedirect)
}
@@ -289,7 +283,6 @@ func (c *Auth2Controller) DingDingOAuth2() {
}
return retVal, model.ErrorCodeIgnore, err
})
globals.SugarLogger.Debugf("DingDingOAuth2, callResult:%s, redirectURL:%s", utils.Format4Output(callResult, true), redirectURL)
if redirectURL != "" {
c.Redirect(redirectURL, http.StatusTemporaryRedirect)
}

2
controllers/cms_sku.go
View File

@@ -8,7 +8,6 @@ import (
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
"git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego/server/web"
)
@@ -401,7 +400,6 @@ func (c *SkuController) UpdateSensitiveWord() {
// VendorID: params.VendorID,
// Word: params.Word,
//}
globals.SugarLogger.Debug("UpdateSensitiveWord入参params:", params)
words, err := dao.GetSensitiveWordList(params.VendorID)
word := words[0]
word.Word = params.Word

2
controllers/cms_sync.go
View File

@@ -3,7 +3,6 @@ package controllers
import (
"fmt"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/globals"
"github.com/panjf2000/ants"
"io"
"sync"
@@ -144,7 +143,6 @@ func (c *SyncController) CompareStoreWithOperator() {
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.VendorIDs, &vendorIDs); err != nil {
return retVal, "", err
}
globals.SugarLogger.Debug(params.StoreIDs, params.VendorIDs)
p, _ := ants.NewPoolWithFunc(10, func(data interface{}) {
task := data.(*CompareTask)
task.Do()

2
controllers/dada_order.go
View File

@@ -6,7 +6,6 @@ import (
"git.rosy.net.cn/baseapi/platformapi/dadaapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/partner/delivery/dada"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/server/web"
)
@@ -41,7 +40,6 @@ func (c *DadaDeliveryController) Notify() {
if err != nil {
notifyResponse = dadaapi.FailedNotifyResponse
}
globals.SugarLogger.Debugf("dada notify, obj:%s, err:%v", utils.Format4Output(obj, false), err)
}
if notifyResponse == nil {
notifyResponse = dadaapi.SuccessNotifyResponse

3
controllers/dingding_callback.go
View File

@@ -5,7 +5,6 @@ import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxstore/cms"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/server/web"
)
@@ -19,12 +18,10 @@ func init() {
}
func (c *DingDingController) Msg() {
globals.SugarLogger.Debugf("dingding msg:%s", string(c.Ctx.Input.RequestBody))
if c.Ctx.Input.Method() == http.MethodPost {
dataMap := utils.URLValues2Map(c.Ctx.Request.Form)
obj, callbackResponse := api.DingDingAPI.GetCallbackMsg(dataMap, c.Ctx.Input.RequestBody)
if callbackResponse == nil {
globals.SugarLogger.Debugf("dingding msg, obj:%s", utils.Format4Output(obj, false))
callbackResponse = cms.OnDingDingMsg(obj)
if callbackResponse == nil {
callbackResponse = api.DingDingAPI.Err2CallbackResponse(nil)

3
controllers/enterprise_callback.go
View File

@@ -35,7 +35,6 @@ func (e *EnterpriseController) EnterpriseCallback() {
wxcpt := call.NewWXBizMsgCrypt(call.Token, call.EncodingAeskey, call.ReceiverId, call.JsonType)
msg, err_ := wxcpt.DecryptMsg(msg_signature, timestamp, nonce, body)
globals.SugarLogger.Debug("==============企业微信通知回调String", string(msg))
if err_ != nil {
e.Abort("404")
return
@@ -62,9 +61,7 @@ func (e *EnterpriseController) EnterpriseCallback() {
//}
//
if strings.Contains(string(msg), "SuiteTicket") {
globals.SugarLogger.Debug("==============企业微信通知回调SuiteTicket")
data, err := api.EnterpriseChatHeadApi.GetEnterpriseMsg(msg)
globals.SugarLogger.Debug("==============企业微信通知回调SuiteTicket->data", data.SuiteTicket)
if err != nil {
globals.SugarLogger.Debug("Unmarshal SuiteTicket err : ", err)
} else {

4
controllers/event.go
View File

@@ -172,7 +172,6 @@ func (c *EventController) TestWebsocket() {
//接收客户端的消息
err := ws.ReadJSON(&s)
if err != nil {
globals.SugarLogger.Debugf("页面可能断开啦 ws.ReadJSON error: %v", err.Error())
index := 0
for k, v := range clients[vendorOrderID] {
if v == ws {
@@ -205,15 +204,12 @@ func handleMessages() {
for {
//读取通道中的消息
msg := <-broadcast
globals.SugarLogger.Debugf("clients len %v", len(clients))
//循环map客户端
for vendorOrderID, mmsg := range msg {
for _, client := range clients[vendorOrderID] {
//把通道中的消息发送给客户端
globals.SugarLogger.Debugf("msg %v", utils.Format4Output(mmsg, false))
err := client.WriteJSON(mmsg)
if err != nil {
globals.SugarLogger.Debugf("client.WriteJSON error: %v", err)
client.Close() //关闭
index := 0
for k, v := range clients[vendorOrderID] {

2
controllers/jd2_callback.go
View File

@@ -19,7 +19,6 @@ type Djsw2Controller struct {
func (c *Djsw2Controller) handleMsg(handler func(*jdapi.API, interface{}) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) {
callbackMsg, _, callbackResponse := jdapi.GetCallbackMsg(getUsefulRequest(c.Ctx))
globals.SugarLogger.Debug(utils.Format4Output(callbackMsg, true))
if callbackResponse == nil {
callbackResponse = handler(api.FakeJdAPI, callbackMsg.Param)
}
@@ -130,7 +129,6 @@ func (c *Djsw2Controller) transferResponse(funcName string, inCallbackResponse *
if inCallbackResponse == nil {
return jdapi.SuccessResponse
}
globals.SugarLogger.Debugf("%s callbackResponse:%s", funcName, utils.Format4Output(inCallbackResponse, true))
return inCallbackResponse
}

2
controllers/jd_callback.go
View File

@@ -22,7 +22,6 @@ type DjswController struct {
func (c *DjswController) handleMsg(handler func(*jdapi.API, interface{}) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) {
callbackMsg, mapData, callbackResponse := jdapi.GetCallbackMsg(getUsefulRequest(c.Ctx))
globals.SugarLogger.Debug(utils.Format4Output(callbackMsg, true))
if callbackResponse == nil {
if jdAPI := jd.GetAPIbyKey(callbackMsg.AppKey); jdAPI != nil {
if callbackResponse = jdAPI.CheckCallbackValidation(mapData, callbackMsg.Sign); callbackResponse == nil {
@@ -166,7 +165,6 @@ func (c *DjswController) transferResponse(funcName string, inCallbackResponse *j
if inCallbackResponse == nil {
return jdapi.SuccessResponse
}
globals.SugarLogger.Debugf("%s callbackResponse:%s", funcName, utils.Format4Output(inCallbackResponse, true))
return inCallbackResponse
}

2
controllers/jx_order.go
View File

@@ -15,7 +15,6 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego/server/web"
)
@@ -266,7 +265,6 @@ func (c *OrderController) ExportMTWaybills() {
toDate = fromDate
}
content, err = orderman.FixedOrderManager.ExportMTWaybills(params.Ctx, params.FromDate, params.ToDate)
globals.SugarLogger.Debug(err)
return retVal, model.ErrorCodeIgnore, err
})
if content != nil {

4
controllers/tictok_callback.go
View File

@@ -8,9 +8,6 @@ import (
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego/server/web"
"github.com/astaxie/beego/server/web/context"
)
@@ -40,7 +37,6 @@ func MsgFail() *TicktockRes {
func (c *TicTocController) TiktokMsg() {
call, refund, payType, err := api.TiktokApi.GetCallbackMsg(getPayInfo(c.Ctx))
globals.SugarLogger.Debugf("tictok callback callbackResponse:%s", utils.Format4Output(call, true))
if err != nil || call == nil {
c.Data["json"] = MsgFail()
c.ServeJSON()

3
controllers/tiktok_delivery.go
View File

@@ -37,7 +37,6 @@ func (c *LogisticsController) LogisticsRegister() {
register := &LogisticsRegisterReq{}
if err := json.Unmarshal(body, register); err != nil {
globals.SugarLogger.Debugf("小时达订阅接口类型转换异常:%s", err)
c.Data["json"] = LogisticsRegisterResp{
Result: false,
ReturnCode: "1007",
@@ -61,7 +60,6 @@ func (c *LogisticsController) LogisticsRegister() {
globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err)
}
if len(data) <= 0 {
globals.SugarLogger.Debugf("单号存在但是本地数据不存,推送平台运单号错误,或者运单错误:%s", err)
c.Data["json"] = LogisticsRegisterResp{
Result: false,
ReturnCode: "1002",
@@ -158,7 +156,6 @@ func (c *LogisticsController) LogisticsQuery() {
globals.SugarLogger.Debugf("根据单号查询运单数据错误:%s", err)
}
if len(data) <= 0 {
globals.SugarLogger.Debugf("单号存在但是本地数据不存,推送平台运单号错误,或者运单错误:%s", err)
c.Data["json"] = LogisticsRegisterResp{
Result: false,
ReturnCode: "1002",

3
controllers/tiktok_order.go
View File

@@ -3,7 +3,6 @@ package controllers
import (
"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/server/web"
"strings"
@@ -29,9 +28,7 @@ func (t *TiktokController) CallbackTiktokOrderMsg() {
}
// 2.参数解析
globals.SugarLogger.Debug("抖音订单回调数据参数打印===========", string(byteList))
orderStatus, resp := api.TiktokStore.CreateOrderCallback(byteList)
globals.SugarLogger.Debug("抖音订单回调数据打印测试===========", orderStatus)
if resp.Code != 0 {
t.Data["json"] = resp
t.ServeJSON()

3
controllers/tiktok_store.go
View File

@@ -18,7 +18,6 @@ type TiktokShopController struct {
// TokenMsg 抖音用户授权
func (c *TiktokShopController) TokenMsg() {
code := c.Ctx.Request.URL.Query().Get("code")
globals.SugarLogger.Debugf("tictok callback callbackResponse:%s", code)
result, err := api.TiktokStore.CreateToken(code)
if err != nil {
globals.SugarLogger.Debugf("tictok callback create token:%s", err)
@@ -30,7 +29,6 @@ func (c *TiktokShopController) TokenMsg() {
result.ExpiresIn += time.Now().Unix()
data, err := json.Marshal(result)
if err != nil {
globals.SugarLogger.Debugf("tictok callback Marshal token:%s", err)
c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail}
c.ServeJSON()
return
@@ -50,7 +48,6 @@ func (c *TiktokShopController) TokenMsg() {
AppSecret: "", // web.AppConfig.DefaultString("tiktokShopAppSecret", "c397aa9f-3927-47c4-8cfe-4d84e02602e0")
}
if err := common.AddVendorOrgCode(nil, param); err != nil {
globals.SugarLogger.Debugf("tictok callback insert token:%s", err)
c.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackFailCode, Msg: tiktok_api.CallbackFail}
c.ServeJSON()
return

6
controllers/weixin_callback.go
View File

@@ -2,10 +2,10 @@ package controllers
import (
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/globals"
"io/ioutil"
"net/http"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/server/web"
)
@@ -21,7 +21,7 @@ func (c *WeixinController) Msg() {
nonce := c.GetString("nonce")
echostr := c.GetString("echostr")
isValid := api.WeixinAPI.ValidateWXCallbackURL(signature, timestamp, nonce)
globals.SugarLogger.Debugf("weixin URL check is:%t", isValid)
globals.SugarLogger.Debugf("isvaild %s", utils.Format4Output(isValid, false))
c.Ctx.WriteString(echostr)
} else {
c.Data["json"] = "ok"
@@ -33,7 +33,7 @@ func (c *WeixinController) WifiMsg() {
data, _ := ioutil.ReadAll(c.Ctx.Request.Body)
values, _ := utils.HTTPBody2Values(data, false)
mapData := utils.URLValues2Map(values)
globals.SugarLogger.Debugf("weixin URL check is:%v", mapData)
globals.SugarLogger.Debugf("mapData %s", utils.Format4Output(mapData, false))
c.Data["json"] = "ok"
c.ServeJSON()
}