From 55a2d4b80f168455789d15e6269c66d7e98ebde4 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 17 Aug 2021 11:21:47 +0800
Subject: [PATCH] aa

---
 controllers/dingding_callback.go | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/controllers/dingding_callback.go b/controllers/dingding_callback.go
index 791b017ba..b6696ff23 100644
--- a/controllers/dingding_callback.go
+++ b/controllers/dingding_callback.go
@@ -1,12 +1,10 @@
 package controllers
 
 import (
-	"bytes"
-	"encoding/base64"
-	"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
 	"net/http"
 
 	"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"
@@ -24,23 +22,13 @@ 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)
-		_, 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(dataMap)
-		//	if callbackResponse == nil {
-		//		callbackResponse = api.DingDingAPI.Err2CallbackResponse(nil)
-		//	}
-		//}
-		aesKey := api.DingDingAPI.GetCallbackAESKey()
-		buf := bytes.NewBuffer(nil)
-		//buf.WriteString(utils.GetUUID()[:16])
-		//binary.Write(buf, binary.BigEndian, int32(len("success")))
-		buf.WriteString("success")
-		//buf.WriteString(a.corpID)
-		binResult, _ := utils.AESCBCEncpryt(buf.Bytes(), aesKey, aesKey[:16])
-		callbackResponse = &dingdingapi.CallbackResponse{
-			Encrypt: base64.StdEncoding.EncodeToString(binResult),
+		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(dataMap)
+			if callbackResponse == nil {
+				callbackResponse = api.DingDingAPI.Err2CallbackResponse(nil)
+			}
 		}
 		c.Data["json"] = callbackResponse
 		c.ServeJSON()