mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-09-24 16:03:43 +08:00
fix(notify): add subcontact fail details
This commit is contained in:
@@ -97,7 +97,7 @@ func (dingSender *SDingTalkSender) ValidateConfig(config api.NotifyConfig) (stri
|
||||
}
|
||||
|
||||
func (dingSender *SDingTalkSender) ContactByMobile(mobile, domainId string) (string, error) {
|
||||
err := dingSender.GetAccessToken(fmt.Sprintf("%s-%s", api.DINGTALK, domainId))
|
||||
err := dingSender.GetAccessToken(domainId)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
@@ -110,7 +110,11 @@ func (dingSender *SDingTalkSender) ContactByMobile(mobile, domainId string) (str
|
||||
if err != nil {
|
||||
return "", errors.Wrap(err, "get user by mobile")
|
||||
}
|
||||
return res.GetString("result", "userid")
|
||||
userId, err := res.GetString("result", "userid")
|
||||
if err != nil {
|
||||
return "", errors.Wrapf(err, "user result:%v", res)
|
||||
}
|
||||
return userId, err
|
||||
}
|
||||
|
||||
func (dingSender *SDingTalkSender) IsPersonal() bool {
|
||||
|
||||
@@ -98,7 +98,7 @@ func (feishuSender *SFeishuSender) ContactByMobile(mobile, domainId string) (str
|
||||
body.Set("mobiles", jsonutils.NewArray(jsonutils.NewString(mobile)))
|
||||
header := http.Header{}
|
||||
// 考虑到获取用户id需求较少,可通过直接更新token来避免token失效
|
||||
err := feishuSender.GetAccessToken(fmt.Sprintf("%s-%s", api.FEISHU, domainId))
|
||||
err := feishuSender.GetAccessToken(domainId)
|
||||
if err != nil {
|
||||
return "", errors.Wrap(err, "GetAccessToken")
|
||||
}
|
||||
@@ -120,7 +120,11 @@ func (feishuSender *SFeishuSender) ContactByMobile(mobile, domainId string) (str
|
||||
return "", errors.Wrap(err, "jsonutils.JSONObject.GetArray")
|
||||
}
|
||||
// len(list) must be positive
|
||||
return list[0].GetString("open_id")
|
||||
userId, err := list[0].GetString("open_id")
|
||||
if err != nil {
|
||||
return "", errors.Wrapf(err, "user result:%v", resp)
|
||||
}
|
||||
return userId, nil
|
||||
}
|
||||
|
||||
func (feishuSender *SFeishuSender) IsPersonal() bool {
|
||||
|
||||
@@ -69,7 +69,7 @@ func (workwxSender *SWorkwxSender) ValidateConfig(config api.NotifyConfig) (stri
|
||||
}
|
||||
|
||||
func (workwxSender *SWorkwxSender) ContactByMobile(mobile, domainId string) (string, error) {
|
||||
err := workwxSender.GetAccessToken(fmt.Sprintf("%s-%s", api.WORKWX, domainId))
|
||||
err := workwxSender.GetAccessToken(domainId)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
@@ -80,7 +80,11 @@ func (workwxSender *SWorkwxSender) ContactByMobile(mobile, domainId string) (str
|
||||
if err != nil {
|
||||
return "", errors.Wrap(err, "get user by mobile")
|
||||
}
|
||||
return res.GetString("userid")
|
||||
userId, err := res.GetString("userid")
|
||||
if err != nil {
|
||||
return "", errors.Wrapf(err, "user result:%v", res)
|
||||
}
|
||||
return userId, nil
|
||||
}
|
||||
|
||||
func (workwxSender *SWorkwxSender) IsPersonal() bool {
|
||||
|
||||
Reference in New Issue
Block a user