实现发送消息到媒介

internal/web/actions/default/admins/recipients/createPopup.go

@@ -41,11 +41,11 @@ func (this *CreatePopupAction) RunPost(params struct {
 	groupIds := utils.SplitNumbers(params.GroupIds)
 
 	resp, err := this.RPC().MessageRecipientRPC().CreateMessageRecipient(this.AdminContext(), &pb.CreateMessageRecipientRequest{
-		AdminId:     params.AdminId,
-		InstanceId:  params.InstanceId,
-		User:        params.User,
-		GroupIds:    groupIds,
-		Description: params.Description,
+		AdminId:                  params.AdminId,
+		MessageMediaInstanceId:   params.InstanceId,
+		User:                     params.User,
+		MessageRecipientGroupIds: groupIds,
+		Description:              params.Description,
 	})
 	if err != nil {
 		this.ErrorPage(err)

internal/web/actions/default/admins/recipients/index.go

@@ -18,10 +18,10 @@ func (this *IndexAction) RunGet(params struct {
 }) {
 	// TODO 增加系统用户、媒介类型等条件搜索
 	countResp, err := this.RPC().MessageRecipientRPC().CountAllEnabledMessageRecipients(this.AdminContext(), &pb.CountAllEnabledMessageRecipientsRequest{
-		AdminId:   0,
-		MediaType: "",
-		GroupId:   0,
-		Keyword:   "",
+		AdminId:                 0,
+		MediaType:               "",
+		MessageRecipientGroupId: 0,
+		Keyword:                 "",
 	})
 	if err != nil {
 		this.ErrorPage(err)
@@ -32,12 +32,12 @@ func (this *IndexAction) RunGet(params struct {
 	this.Data["page"] = page.AsHTML()
 
 	recipientsResp, err := this.RPC().MessageRecipientRPC().ListEnabledMessageRecipients(this.AdminContext(), &pb.ListEnabledMessageRecipientsRequest{
-		AdminId:   0,
-		MediaType: "",
-		GroupId:   0,
-		Keyword:   "",
-		Offset:    page.Offset,
-		Size:      page.Size,
+		AdminId:                 0,
+		MediaType:               "",
+		MessageRecipientGroupId: 0,
+		Keyword:                 "",
+		Offset:                  page.Offset,
+		Size:                    page.Size,
 	})
 
 	recipientMaps := []maps.Map{}

internal/web/actions/default/admins/recipients/instances/index.go

@@ -43,6 +43,7 @@ func (this *IndexAction) RunGet(params struct {
 		}
 		instanceMaps = append(instanceMaps, maps.Map{
 			"id":   instance.Id,
+			"name": instance.Name,
 			"isOn": instance.IsOn,
 			"media": maps.Map{
 				"name": instance.MessageMedia.Name,

internal/web/actions/default/admins/recipients/update.go

@@ -75,13 +75,13 @@ func (this *UpdateAction) RunPost(params struct {
 	groupIds := utils.SplitNumbers(params.GroupIds)
 
 	_, err := this.RPC().MessageRecipientRPC().UpdateMessageRecipient(this.AdminContext(), &pb.UpdateMessageRecipientRequest{
-		MessageRecipientId: params.RecipientId,
-		AdminId:            params.AdminId,
-		InstanceId:         params.InstanceId,
-		User:               params.User,
-		GroupIds:           groupIds,
-		Description:        params.Description,
-		IsOn:               params.IsOn,
+		MessageRecipientId:       params.RecipientId,
+		AdminId:                  params.AdminId,
+		MessageMediaInstanceId:   params.InstanceId,
+		User:                     params.User,
+		MessageRecipientGroupIds: groupIds,
+		Description:              params.Description,
+		IsOn:                     params.IsOn,
 	})
 	if err != nil {
 		this.ErrorPage(err)