Merge pull request #129 from ArtisanCloud/develop

refact(wecom): external contact request media struct

Author: Matrix-X

src/work/externalContact/client.go

@@ -37,7 +37,7 @@ func (comp *Client) GetFollowUsers() (*response.ResponseGetFollowUserList, error
 }
 
 // 获取外部联系人列表.
-// https://work.weixin.qq.com/api/doc/90000/90135/92113
+// https://developer.work.weixin.qq.com/document/path/92113
 func (comp *Client) List(userID string) (*response.ResponseGetList, error) {
 
 	result := &response.ResponseGetList{}
@@ -50,7 +50,7 @@ func (comp *Client) List(userID string) (*response.ResponseGetList, error) {
 }
 
 // 获取外部联系人详情.
-// https://work.weixin.qq.com/api/doc/90000/90135/92114
+// https://developer.work.weixin.qq.com/document/path/92114
 func (comp *Client) Get(externalUserID string, cursor string) (*weCom.ResponseGetExternalContact, error) {
 
 	result := &weCom.ResponseGetExternalContact{}

src/work/externalContact/contactWay/request/requestAddContactWay.go

@@ -1,32 +1,12 @@
 package request
 
-type Text struct {
-	Content string `json:"content"`
-}
-
-type Image struct {
-	MediaID string `json:"media_id"`
-}
-
-type MiniProgram struct {
-	Title      string `json:"title"`
-	PicMediaID string `json:"pic_media_id"`
-	Appid      string `json:"appid"`
-	Page       string `json:"page"`
-}
-
-type Link struct {
-	Title  string `json:"title"`
-	PicURL string `json:"picurl"`
-	Desc   string `json:"desc"`
-	URL    string `json:"url"`
-}
+import "github.com/ArtisanCloud/PowerWeChat/v2/src/work/externalContact/messageTemplate/request"
 
 type Conclusions struct {
-	Text        *Text        `json:"text"`
-	Image       *Image       `json:"image"`
-	Link        *Link        `json:"link"`
-	MiniProgram *MiniProgram `json:"miniprogram"`
+	Text        *request.TextOfMessage `json:"text"`
+	Image       *request.Image         `json:"image"`
+	Link        *request.Link          `json:"link"`
+	MiniProgram *request.MiniProgram   `json:"miniprogram"`
 }
 
 type RequestAddContactWay struct {

src/work/externalContact/messageTemplate/client.go

@@ -81,7 +81,7 @@ func (comp *Client) GetGroupMsgSendResult(msgID string, userID string, limit int
 }
 
 // 发送新客户欢迎语
-// https://work.weixin.qq.com/api/doc/90000/90135/93338
+// https://developer.work.weixin.qq.com/document/path/92599
 func (comp *Client) SendWelcomeMsg(options *request.RequestSendWelcomeMsg) (*response2.ResponseWork, error) {
 
 	result := &response2.ResponseWork{}

src/work/externalContact/messageTemplate/request/requestSendWelcomeMsg.go

@@ -1,9 +1,16 @@
 package request
 
-import "github.com/ArtisanCloud/PowerWeChat/v2/src/kernel/power"
+type Attachment struct {
+	MsgType     string       `json:"msgtype"`
+	Image       *Image       `json:"image,omitempty"`
+	Link        *Link        `json:"link,omitempty"`
+	MiniProgram *MiniProgram `json:"miniprogram,omitempty"`
+	Video       *Video       `json:"video,omitempty"`
+	File        *File        `json:"file,omitempty"`
+}
 
 type RequestSendWelcomeMsg struct {
-	WelcomeCode string           `json:"welcome_code"`
-	Text        *TextOfMessage   `json:"text"`
-	Attachments []*power.HashMap `json:"attachments"`
+	WelcomeCode string         `json:"welcome_code"`
+	Text        *TextOfMessage `json:"text"`
+	Attachments []*Attachment  `json:"attachments"`
 }

src/work/user/client.go

@@ -89,7 +89,7 @@ func (comp *Client) Get(userID string) (*response.ResponseGetUserDetail, error)
 }
 
 // 获取部门的成员
-// https://open.work.weixin.qq.com/api/doc/90000/90135/90200
+// https://developer.work.weixin.qq.com/document/path/90200
 func (comp *Client) GetDepartmentUsers(departmentID int, fetchChild int) (*response.ResponseGetSimpleUserList, error) {
 
 	result := &response.ResponseGetSimpleUserList{}
@@ -103,7 +103,7 @@ func (comp *Client) GetDepartmentUsers(departmentID int, fetchChild int) (*respo
 }
 
 // 获取部门成员详情
-// https://open.work.weixin.qq.com/api/doc/90000/90135/90201
+// https://developer.work.weixin.qq.com/document/path/90201
 func (comp *Client) GetDetailedDepartmentUsers(departmentID int, fetchChild int) (*response.ResponseGetUserList, error) {
 
 	result := &response.ResponseGetUserList{}
@@ -117,7 +117,7 @@ func (comp *Client) GetDetailedDepartmentUsers(departmentID int, fetchChild int)
 }
 
 // userid与openid互换
-// https://open.work.weixin.qq.com/api/doc/90000/90135/90202
+// https://developer.work.weixin.qq.com/document/path/90202
 func (comp *Client) UserIdToOpenID(userID string) (*response.ResponseUserIDToOpenID, error) {
 
 	result := &response.ResponseUserIDToOpenID{}
@@ -129,8 +129,8 @@ func (comp *Client) UserIdToOpenID(userID string) (*response.ResponseUserIDToOpe
 	return result, err
 }
 
-// userid与openid互换
-// https://open.work.weixin.qq.com/api/doc/90000/90135/90202
+// openid转userid
+// https://developer.work.weixin.qq.com/document/path/90202
 func (comp *Client) OpenIDToUserID(openID string) (*response.ResponseOpenIDToUserID, error) {
 
 	result := &response.ResponseOpenIDToUserID{}
@@ -142,8 +142,8 @@ func (comp *Client) OpenIDToUserID(openID string) (*response.ResponseOpenIDToUse
 	return result, err
 }
 
-// userid与openid互换
-// https://open.work.weixin.qq.com/api/doc/90000/90135/90202
+// 手机号获取userid
+// https://developer.work.weixin.qq.com/document/path/95402
 func (comp *Client) MobileToUserID(mobile string) (*response.ResponseMobileToUserID, error) {
 
 	result := &response.ResponseMobileToUserID{}
@@ -156,7 +156,7 @@ func (comp *Client) MobileToUserID(mobile string) (*response.ResponseMobileToUse
 }
 
 // 二次验证
-// https://open.work.weixin.qq.com/api/doc/90000/90135/90203
+// https://developer.work.weixin.qq.com/document/path/90203
 func (comp *Client) Accept(userID string) (*response2.ResponseWork, error) {
 
 	result := &response2.ResponseWork{}
@@ -180,7 +180,7 @@ func (comp *Client) Invite(params *power.HashMap) (*response.ResponseMobileToUse
 }
 
 // 获取加入企业二维码
-// https://open.work.weixin.qq.com/api/doc/90000/90135/91714
+// https://developer.work.weixin.qq.com/document/path/91714
 func (comp *Client) GetJoinQrCode(sizeType int) (*response.ResponseJoinCode, error) {
 
 	if sizeType < 1 || sizeType > 4 {