Merge pull request #625 from ArtisanCloud/develop

Develop

Author: Matrix-X

src/kernel/serverGuard.go

@@ -138,6 +138,9 @@ func (serverGuard *ServerGuard) Serve(request *http.Request) (response *http.Res
 	}
 
 	response, err = validatedGuard.Resolve(request)
+	if err != nil {
+		return nil, err
+	}
 
 	logger.Info("Server response created:", "content", response.ContentLength)
 

src/work/externalContact/groupChat/client.go

@@ -80,3 +80,47 @@ func (comp *Client) GetNewExternalUserID(ctx context.Context, chatID string, ext
 
 	return result.Items, err
 }
+
+// 配置客户群进群方式
+// https://developer.work.weixin.qq.com/document/path/92229
+func (comp *Client) AddJoinWay(ctx context.Context, params *request.RequestAddJoinWay) (*response.ResponseAddJoinWay, error) {
+
+	result := &response.ResponseAddJoinWay{}
+
+	_, err := comp.BaseClient.HttpPostJson(ctx, "cgi-bin/externalcontact/groupchat/add_join_way", params, nil, nil, result)
+
+	return result, err
+}
+
+// 获取客户群进群方式配置
+// https://developer.work.weixin.qq.com/document/path/92229
+func (comp *Client) GetJoinWay(ctx context.Context, params *request.RequestGetJoinWay) (*response.ResponseGetJoinWay, error) {
+
+	result := &response.ResponseGetJoinWay{}
+
+	_, err := comp.BaseClient.HttpPostJson(ctx, "cgi-bin/externalcontact/groupchat/get_join_way", params, nil, nil, result)
+
+	return result, err
+}
+
+// 更新客户群进群方式配置
+// https://developer.work.weixin.qq.com/document/path/92229
+func (comp *Client) UpdateJoinWay(ctx context.Context, params *request.RequestUpdateJoinWay) (*response.ResponseUpdateJoinWay, error) {
+
+	result := &response.ResponseUpdateJoinWay{}
+
+	_, err := comp.BaseClient.HttpPostJson(ctx, "cgi-bin/externalcontact/groupchat/update_join_way", params, nil, nil, result)
+
+	return result, err
+}
+
+// 删除客户群进群方式配置
+// https://developer.work.weixin.qq.com/document/path/92229
+func (comp *Client) DelJoinWay(ctx context.Context, params *request.RequestDelJoinWay) (*response.ResponseDelJoinWay, error) {
+
+	result := &response.ResponseDelJoinWay{}
+
+	_, err := comp.BaseClient.HttpPostJson(ctx, "cgi-bin/externalcontact/groupchat/del_join_way", params, nil, nil, result)
+
+	return result, err
+}

src/work/externalContact/groupChat/request/requestAddGroupChat.go

@@ -0,0 +1,11 @@
+package request
+
+type RequestAddJoinWay struct {
+	Scene          int      `json:"scene"`
+	Remark         string   `json:"remark"`
+	AutoCreateRoom int      `json:"auto_create_room"`
+	RoomBaseName   string   `json:"room_base_name"`
+	RoomBaseId     int      `json:"room_base_id"`
+	ChatIdList     []string `json:"chat_id_list"`
+	State          string   `json:"state"`
+}

src/work/externalContact/groupChat/request/requestAddJoinWay.go

@@ -8,3 +8,29 @@ type RequestGroupChatList struct {
 	Cursor       string         `json:"cursor"`
 	Limit        int            `json:"limit"`
 }
+
+type RequestAddGroupChat struct {
+	StatusFilter int            `json:"status_filter"`
+	OwnerFilter  *power.HashMap `json:"owner_filter"`
+	Cursor       string         `json:"cursor"`
+	Limit        int            `json:"limit"`
+}
+
+type RequestGetJoinWay struct {
+	ConfigId string `json:"config_id"`
+}
+
+type RequestUpdateJoinWay struct {
+	ConfigId       string   `json:"config_id"`
+	Scene          int      `json:"scene"`
+	Remark         string   `json:"remark"`
+	AutoCreateRoom int      `json:"auto_create_room"`
+	RoomBaseName   string   `json:"room_base_name"`
+	RoomBaseId     int      `json:"room_base_id"`
+	ChatIdList     []string `json:"chat_id_list"`
+	State          string   `json:"state"`
+}
+
+type RequestDelJoinWay struct {
+	ConfigId string `json:"config_id"`
+}

src/work/externalContact/groupChat/request/requestGroupChatList.go

@@ -14,3 +14,33 @@ type ResponseGroupChatList struct {
 	GroupChatList []*CompactGroupChat `json:"group_chat_list"`
 	NextCursor    string              `json:"next_cursor"`
 }
+
+type ResponseAddJoinWay struct {
+	response.ResponseWork
+	ConfigId string `json:"config_id"`
+}
+
+type JoinWay struct {
+	ConfigId       string   `json:"config_id"`
+	Scene          int      `json:"scene"`
+	Remark         string   `json:"remark"`
+	AutoCreateRoom int      `json:"auto_create_room"`
+	RoomBaseName   string   `json:"room_base_name"`
+	RoomBaseId     int      `json:"room_base_id"`
+	ChatIdList     []string `json:"chat_id_list"`
+	QrCode         string   `json:"qr_code"`
+	State          string   `json:"state"`
+}
+
+type ResponseGetJoinWay struct {
+	response.ResponseWork
+	JoinWay JoinWay `json:"join_way"`
+}
+
+type ResponseUpdateJoinWay struct {
+	response.ResponseWork
+}
+
+type ResponseDelJoinWay struct {
+	response.ResponseWork
+}

src/work/externalContact/groupChat/response/responseGroupChatList.go

@@ -1,11 +1,11 @@
 package request
 
 type RequestExternalContactRemark struct {
-	UserID           string   `json:"userid"`
-	ExternalUserID   string   `json:"external_userid"`
-	Remark           string   `json:"remark"`
-	Description      string   `json:"description"`
-	RemarkCompany    string   `json:"remark_company"`
-	RemarkMobiles    []string `json:"remark_mobiles"`
-	RemarkPicMediaID string   `json:"remark_pic_mediaid"`
+	UserID           string   `json:"userid,omitempty"`
+	ExternalUserID   string   `json:"external_userid,omitempty"`
+	Remark           string   `json:"remark,omitempty"`
+	Description      string   `json:"description,omitempty"`
+	RemarkCompany    string   `json:"remark_company,omitempty"`
+	RemarkMobiles    []string `json:"remark_mobiles,omitempty"`
+	RemarkPicMediaID string   `json:"remark_pic_mediaid,omitempty"`
 }