Merge branch 'feature/image_content' into debug

services/day_new.go

@@ -81,7 +81,7 @@ func DayNewWeworkMsgRefresh() (err error) {
 			continue
 		}
 		if limitRoomId != "" {
-			if v.RoomID != limitRoomId {
+			if v.RoomID == "wrPhSiBwAAQcw_fTWXizaK3mIBMG9LAA" {
 				continue
 			}
 		}

services/wework/wework_audit_linux.go

@@ -32,7 +32,7 @@ func (w *WeWorkMsgAuditClient) GetMsgAuditContent(seq, limit uint64, timeout int
 			return
 		}
 		if chatInfo.Type == "image" {
-			/*image, _ := chatInfo.GetImageMessage()
+			image, _ := chatInfo.GetImageMessage()
 			sdkFileID := image.Image.SdkFileID
 
 			isFinish := false
@@ -53,14 +53,24 @@ func (w *WeWorkMsgAuditClient) GetMsgAuditContent(seq, limit uint64, timeout int
 				indexBuf = mediaData.OutIndexBuf
 			}
 			filePath, _ := os.Getwd()
-			filePath = path.Join(filePath, "test.png")
+			filePath = path.Join(filePath, image.Image.FileName)
 			err := ioutil.WriteFile(filePath, buffer.Bytes(), 0666)
 			if err != nil {
 				utils.FileLog.Info(fmt.Sprintf("文件存储失败：%v \n", err))
 				errMsg = errors.New("企业微信 文件存储失败："+err.Error())
 				return
 			}
-			break*/
+			utils.FileLog.Info(fmt.Sprintf("文件存储成功：%s \n", filePath))
+			list = append(list, msgaudit.TextMessage{
+				MsgId:      image.MsgID,
+				Action:     image.Action,
+				From:       image.From,
+				ToList:     image.ToList,
+				RoomId:     image.RoomID,
+				MsgTime:    image.MsgTime,
+				MsgType:    image.MsgType,
+				Content: filePath,
+			})
 			continue
 		}else if chatInfo.Type == "text" {
 			msg, err := chatInfo.GetTextMessage()

services/yidong/yidong.go

@@ -55,6 +55,10 @@ type CrmApiUserResponse struct {
 	Data *CrmApiUserData `json:"data"`
 }
 
+type CrmApiCodeResponse struct {
+	Code int `json:"code" comment:"返回码"`
+}
+
 // Data 结构体表示数据部分
 type CrmApiUserData struct {
 	ContactInfo *CrmApiUserContactInfo `json:"contactInfo"`
@@ -74,16 +78,28 @@ func GetClptCrmWorkerRule(mobile string) (statusResp int, err error) {
 	if err != nil {
 		return
 	}
-	item := new(CrmApiUserResponse)
-	err = json.Unmarshal(body, &item)
+
+	// 尝试解析成功的响应
+	var responseCode CrmApiCodeResponse
+	err = json.Unmarshal(body, &responseCode)
 	if err != nil {
+		fmt.Println("JSON解析失败:", err)
 		return
 	}
 	//如果状态码不等于1 ，就把直接返回
-	codeResp := item.Code
-	if codeResp != 1 {
+	if responseCode.Code != 1 {
+		return
+	}
+	item := new(CrmApiUserResponse)
+	err = json.Unmarshal(body, &item)
+	if err != nil {
 		return
 	}
+
+	//codeResp := item.Code
+	//if codeResp != 1 {
+	//	return
+	//}
 	statusResp = item.Data.ContactInfo.Status
 	return
 }