Ver código fonte

fix:修改同步企微

jimmyyem 2 semanas atrás
pai
commit
9063bfbd6d

+ 8 - 8
internal/logic/WorkPhone/qw_refresh_logic.go

@@ -31,7 +31,7 @@ func NewQwRefreshLogic(ctx context.Context, svcCtx *svc.ServiceContext) *QwRefre
 }
 
 func (l *QwRefreshLogic) QwRefresh() (resp *types.BaseMsgResp, err error) {
-	var result types.WorkPhoneGetWeChatsResp
+	var result types.WeworkGetResp
 	client := req.C().DevMode()
 	client.SetCommonRetryCount(2).
 		SetCommonRetryBackoffInterval(1*time.Second, 5*time.Second).
@@ -47,12 +47,12 @@ func (l *QwRefreshLogic) QwRefresh() (resp *types.BaseMsgResp, err error) {
 	}
 
 	for _, account := range result.Data {
-		if account.Wechatid == "" {
+		if account.WxId == "" {
 			continue
 		}
 		wxinfo, err := l.svcCtx.DB.Wx.Query().
 			Where(
-				wx.WxidEQ(account.Wechatid),
+				wx.WxidEQ(account.WxId),
 				wx.Ctype(3),
 			).
 			Only(l.ctx)
@@ -71,8 +71,8 @@ func (l *QwRefreshLogic) QwRefresh() (resp *types.BaseMsgResp, err error) {
 				SetServerID(0).
 				SetPort(account.Deviceid).
 				SetProcessID(strconv.FormatInt(account.Cid, 10)).
-				SetAccount(account.Wechatno).
-				SetNickname(account.Wechatnick).
+				SetAccount("").
+				SetNickname(account.Name).
 				SetHeadBig(account.Avatar).
 				SetStatus(status).
 				Exec(l.ctx)
@@ -86,10 +86,10 @@ func (l *QwRefreshLogic) QwRefresh() (resp *types.BaseMsgResp, err error) {
 				SetServerID(0).
 				SetPort(account.Deviceid).
 				SetProcessID(strconv.FormatInt(account.Cid, 10)).
-				SetWxid(account.Wechatid).
-				SetAccount(account.Wechatno).
+				SetWxid(account.WxId).
+				SetAccount("").
 				SetHeadBig(account.Avatar).
-				SetNickname(account.Wechatnick).
+				SetNickname(account.Name).
 				SetStatus(status).
 				SetAllowList([]string{}).SetBlockList([]string{}).SetGroupAllowList([]string{}).SetGroupBlockList([]string{}).
 				Save(l.ctx)

+ 29 - 0
internal/types/wework.go

@@ -0,0 +1,29 @@
+package types
+
+type WeworkInfo struct {
+	Accountid   string      `json:"accountid"`
+	Avatar      string      `json:"avatar"`
+	Brand       string      `json:"brand"`
+	Cid         int64       `json:"cid"`
+	Cname       interface{} `json:"cname"`
+	Name        string      `json:"name"`
+	Deviceid    string      `json:"deviceid"`
+	Devnickname string      `json:"devnickname"`
+	Gender      int64       `json:"gender"`
+	ID          int64       `json:"id"`
+	Isonline    int64       `json:"isonline"`
+	LoginTime   int64       `json:"login_time"`
+	ModifyTime  int64       `json:"modify_time"`
+	Module      string      `json:"module"`
+	WxId        string      `json:"wxid"`
+	Alias       string      `json:"alias"`
+	Job         string      `json:"job"`
+	Phone       string      `json:"phone"`
+	Accountname string      `json:"accountname"`
+}
+
+type WeworkGetResp struct {
+	Code int64        `json:"code"`
+	Data []WeworkInfo `json:"data"`
+	Msg  string       `json:"msg"`
+}