fix(notify): add subcontact fail details

This commit is contained in:
马鸿飞
2023-04-20 20:31:33 +08:00
parent e2c91e6f5e
commit ef5e95b11c
3 changed files with 18 additions and 6 deletions
+6 -2
View File
@@ -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 {
+6 -2
View File
@@ -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 {
+6 -2
View File
@@ -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 {