Merge branch 'feature/sync-wx'

* feature/sync-wx:
  调整刷新时间
  fixbug
  fixbug
  fixbug
  增加群组同步

crontask/init.go

@@ -44,7 +44,7 @@ func ScheduleRun(c *cron.Cron, serverCtx *svc.ServiceContext) {
 	})
 
 	syncWx := NewCronTask(context.Background(), serverCtx)
-	c.AddFunc("*/30 * * * *", func() {
+	c.AddFunc("*/15 * * * *", func() {
 		syncWx.syncWx()
 	})
 }

internal/logic/Wxhook/get_friends_and_groups_logic.go

@@ -225,6 +225,16 @@ func (l *GetFriendsAndGroupsLogic) GetFriendsAndGroups(req *types.IDReq) (resp *
 				return nil, err
 			}
 
+			dataChatroom := map[string]interface{}{
+				"MsgType": "TriggerChatroomPushTask",
+				"Content": map[string]interface{}{
+					"WeChatId": wxInfo.Wxid,
+					"Flag":     1,
+				},
+			}
+			jsonStrChatroom, err := json.Marshal(dataChatroom)
+			err = l.svcCtx.WechatWs["default"].SendMsg([]byte(jsonStrChatroom))
+
 			//hookClient = hook.NewHook("", "", "")
 			//wsUrl = "http://chat.gkscrm.com:13086/pc/GetWechatFriendList?cid=" + wxInfo.ProcessID + "&wechatid=" + wxInfo.Wxid
 			//

internal/service/MessageHandlers/chatroom_push_notice.go

@@ -0,0 +1,65 @@
+package MessageHandlers
+
+import (
+	"context"
+	"encoding/json"
+	"github.com/zeromicro/go-zero/core/logx"
+	"wechat-api/ent/wx"
+	"wechat-api/internal/pkg/wechat_ws"
+	"wechat-api/internal/svc"
+	"wechat-api/workphone"
+)
+
+type ChatroomPushNoticeHandler struct {
+	svcCtx *svc.ServiceContext
+}
+
+func NewChatroomPushNoticeHandler(svcCtx *svc.ServiceContext) *ChatroomPushNoticeHandler {
+	return &ChatroomPushNoticeHandler{
+		svcCtx: svcCtx,
+	}
+}
+
+func (f *ChatroomPushNoticeHandler) Handler(msg *wechat_ws.MsgJsonObject) error {
+	if msg.MsgType == "ChatroomPushNotice" {
+		message := workphone.ChatRoomPushNoticeMessage{}
+		err := json.Unmarshal([]byte(msg.Message), &message)
+		if err != nil {
+			return err
+		}
+		// 拿到租户 id
+		wx_info, err := f.svcCtx.DB.Wx.Query().
+			Where(
+				wx.WxidEQ(message.WeChatId), // Additional filter by organizationId
+			).
+			Only(context.TODO())
+		//hookClient := hook.NewHook("", "", "")
+		for _, friend := range message.ChatRooms {
+			friendType := 2
+			//if friend.Type == 1 {
+			//	friendType = 2
+			//	//_ = hookClient.RequestChatRoomInfo(friend.FriendId, message.WeChatId)
+			//} else {
+			//	friendType = 1
+			//}
+			_, err = f.svcCtx.DB.Contact.Create().
+				SetWxWxid(message.WeChatId).
+				SetType(friendType).
+				SetWxid(friend.UserName).
+				SetNickname(friend.NickName).
+				SetHeadimg(friend.Avatar).
+				//SetSex(cast.ToInt(friend.Gender)).
+				SetOrganizationID(wx_info.OrganizationID).
+				OnConflict().
+				UpdateNewValues().
+				SetOrganizationID(wx_info.OrganizationID).
+				ID(context.TODO())
+
+			if err != nil {
+				logx.Error("Contact.Create: ", wx_info.OrganizationID)
+				return err
+			}
+		}
+	}
+	return nil
+}

internal/service/wechat/sync_wx.go

@@ -103,5 +103,15 @@ func SyncAllWx(svcCtx *svc.ServiceContext) {
 			logx.Error("syncWx： ", err)
 			return
 		}
+
+		dataChatroom := map[string]interface{}{
+			"MsgType": "TriggerChatroomPushTask",
+			"Content": map[string]interface{}{
+				"WeChatId": account.Wechatid,
+				"Flag":     1,
+			},
+		}
+		jsonStrChatroom, err := json.Marshal(dataChatroom)
+		err = svcCtx.WechatWs["default"].SendMsg([]byte(jsonStrChatroom))
 	}
 }

wechat.go

@@ -63,6 +63,7 @@ func main() {
 			//	ic = channel.NewWechatChannel(ws, ctx)
 			//}
 			//ws.RegisterMessageHandler(ic.OnMessage)
+			ws.RegisterMessageHandler(MessageHandlers.NewChatroomPushNoticeHandler(ctx).Handler)
 			ws.RegisterMessageHandler(MessageHandlers.NewFriendPushNoticeHandler(ctx).Handler)
 		}
 		logx.Info("注册个微处理通道~")