Browse Source

修复文件发送问题

boweniac 4 months ago
parent
commit
dfbc9d0473
2 changed files with 5 additions and 3 deletions
  1. 4 2
      crontask/send_wx.go
  2. 1 1
      hook/message.go

+ 4 - 2
crontask/send_wx.go

@@ -123,7 +123,7 @@ func (l *CronTask) sendWx() {
 				l.Logger.Errorf("update messageRecords failed id=%v err=%v", v.ID, err)
 				continue
 			}
-			
+
 			hookClient := hook.NewHook(serverIp, adminPort, wxPort)
 			if v.ContentType == 1 {
 				content := v.Content
@@ -133,7 +133,9 @@ func (l *CronTask) sendWx() {
 				}
 				err = hookClient.SendTextMsg(v.ContactWxid, content, v.BotWxid)
 			} else {
-				err = hookClient.SendPicMsg(v.ContactWxid, v.Content, v.Meta.Filename, v.BotWxid)
+				re := regexp.MustCompile(`[^/]+$`)
+				fileName := re.FindString(v.Content)
+				err = hookClient.SendPicMsg(v.ContactWxid, v.Content, fileName, v.BotWxid)
 			}
 
 			if err != nil {

+ 1 - 1
hook/message.go

@@ -134,7 +134,7 @@ func (h *Hook) SendPicMsg(wxid, picpath, diyfilename, wxWxid string) (err error)
 			"Content": map[string]interface{}{
 				"WeChatId":    wxWxid,
 				"FriendId":    wxid,
-				"ContentType": "Picture",
+				"ContentType": "File",
 				"Content":     encodedString,
 			},
 		}