fuwencai 2 سال پیش
والد
کامیت
055e2eaa08
7فایلهای تغییر یافته به همراه109 افزوده شده و 189 حذف شده
  1. 1 0
      api/internal/types/types.go
  2. 4 4
      api/message.api
  3. 0 71
      api/test/message_test.go
  4. 0 10
      api/test/tets.http
  5. 1 1
      rpc/message.proto
  6. 81 81
      rpc/message/message.pb.go
  7. 22 22
      rpc/messageclient/message.go

+ 1 - 0
api/internal/types/types.go

@@ -140,6 +140,7 @@ type MultipleSaveMsgResp struct {
 
 type GetBuoyMsgReq struct {
 	UserId string `header:"userIds"`
+	AppId  string `header:"appId"`
 	Size   int64  `json:"size"`
 }
 

+ 4 - 4
api/message.api

@@ -137,7 +137,7 @@ type MultipleSaveMsgResp {
 
 type GetBuoyMsgReq {
 	UserId string `header:"userIds"`
-	AppId string `header:"appId"`
+	AppId  string `header:"appId"`
 	Size   int64  `json:"size"`
 }
 
@@ -178,12 +178,12 @@ service message-api {
 	// 发送消息
 	@handler SendMsgHandler
 	post /messageCenter/SendMsg (SendMsgReq) returns (SendMsgResp)
-
+	
 	// 发送消息
 	@handler MultipleSaveMsgHandler
 	post /messageCenter/MultipleSaveMsg (MultipleSaveMsgReq) returns (MultipleSaveMsgResp)
-
+	
 	// 查询浮标信息
 	@handler GetBuoyMsgHandler
 	post /messageCenter/GetBuoyMsg (GetBuoyMsgReq) returns (GetBuoyMsgResp)
-}
+}

+ 0 - 71
api/test/message_test.go

@@ -1,71 +0,0 @@
-package test
-
-import (
-	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
-	"bytes"
-	"context"
-	"encoding/json"
-	"github.com/tal-tech/go-zero/core/discov"
-	"github.com/tal-tech/go-zero/zrpc"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"testing"
-	"time"
-)
-
-func  Test_ChangeReadStatus(t *testing.T)  {
-	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
-	std := messageclient.NewMessage(zrpc.MustNewClient(zrpc.RpcClientConf{Etcd: discov.EtcdConf{Hosts: []string{"127.0.0.1:2379"}, Key: "message.rpc"}}))
-	//std := stdlibclient.NewStdlib(zrpc.MustNewClient(zrpc.RpcClientConf{Etcd: discov.EtcdConf{Hosts: []string{"127.0.0.1:2379"}, Key: "jydocs.stdlib.rpc"}}))
-	req := &messageclient.ChangeReadStatusRequest{Id: "1",ReadStatus: 1,Appid: "10000"}
-	res, err := std.ChangeReadStatus(ctx, req)
-	log.Println("err ", err,res)
-	//if res.State == true {
-	//	log.Println("req true")
-	//} else {
-	//	log.Println("req false", res)
-	//}
-}
-
-func Test_MultipleSaveMessage(t *testing.T) {
-	msg :=map[string]interface{}{
-		"sendUserId":    "qmx",
-		"sendName":      "剑鱼后台",
-		"title":         "消息标题",
-		"content":       "消息内容",
-		"msgType":       1,
-		"link":          "http://baidu.com",
-		"appid":         "10000",
-	}
-	userIds := "5c00eee91c298a03ab5bd82b,606433f6ad7bab226a81787c"
-	userNames := ","
-	log.Println("调用批量保存消息接口")
-	idsJson, _ := json.Marshal(map[string]interface{}{"msgInfo": msg,"userIds":userIds,"userNames":userNames})
-	reqData := bytes.NewBuffer([]byte(idsJson))
-	url := "http://127.0.0.1:8888/messageCenter/MultipleSaveMsg"
-	method := "POST"
-	client := &http.Client{}
-	req, err := http.NewRequest(method, url, reqData)
-	if err != nil {
-		log.Println(err)
-	}
-	req.Header.Add("Content-Type", "application/json")
-	res, err := client.Do(req)
-	defer res.Body.Close()
-	log.Println(res, err)
-	if err != nil {
-		log.Println("调用批量保存消息接口出错:", err)
-	}
-	body, err := ioutil.ReadAll(res.Body)
-	//log.Println("body", string(body))
-	var dat map[string]interface{}
-	err = json.Unmarshal(body, &dat)
-	log.Println("结果:", dat)
-	if err != nil {
-		log.Println("结果:", err)
-	}
-
-	//errCount = errCount + qutil.IntAll(dat["errCount"])
-	return
-}

+ 0 - 10
api/test/tets.http

@@ -1,10 +0,0 @@
-POST http://192.168.3.206:8787/messageCenter/messageFind
-Content-Type: application/x-www-form-urlencoded
-
-userId=6103bb722abfa5f4d81bb1d1&appId=10000&receiveUserId=qmx&msgType=-1&isRead=-1&offset=1&pageSize=10
-
-###
-POST http://192.168.3.206:8787/messageCenter/messageFind
-Content-Type: application/x-www-form-urlencoded
-
-userId=629d5b09b8bd0060485a4650&appId=10000&receiveUserId=qmx&msgType=-1&isRead=-1&offset=1&pageSize=10

+ 1 - 1
rpc/message.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package message;
-option go_package = "message/";
+//option go_package = "message/";
 
 message SendMsgRequest {
     string receiveUserId = 1; //接收方用户ID

+ 81 - 81
rpc/message/message.pb.go

@@ -1615,7 +1615,8 @@ func (m *MultipleSaveMsgResp) GetErrCount() int64 {
 
 type FindUserBuoyMsgReq struct {
 	UserId               string   `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`
-	PageSize             int64    `protobuf:"varint,2,opt,name=pageSize,proto3" json:"pageSize,omitempty"`
+	Appid                string   `protobuf:"bytes,2,opt,name=appid,proto3" json:"appid,omitempty"`
+	PageSize             int64    `protobuf:"varint,3,opt,name=pageSize,proto3" json:"pageSize,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1653,6 +1654,13 @@ func (m *FindUserBuoyMsgReq) GetUserId() string {
 	return ""
 }
 
+func (m *FindUserBuoyMsgReq) GetAppid() string {
+	if m != nil {
+		return m.Appid
+	}
+	return ""
+}
+
 func (m *FindUserBuoyMsgReq) GetPageSize() int64 {
 	if m != nil {
 		return m.PageSize
@@ -1664,7 +1672,6 @@ type FindUserBuoyMsgRes struct {
 	Code                 int64           `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"`
 	Message              string          `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"`
 	Data                 []*BuoyMessages `protobuf:"bytes,3,rep,name=data,proto3" json:"data,omitempty"`
-	Count                int64           `protobuf:"varint,4,opt,name=count,proto3" json:"count,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -1716,13 +1723,6 @@ func (m *FindUserBuoyMsgRes) GetData() []*BuoyMessages {
 	return nil
 }
 
-func (m *FindUserBuoyMsgRes) GetCount() int64 {
-	if m != nil {
-		return m.Count
-	}
-	return 0
-}
-
 type BuoyMessages struct {
 	Id                   string   `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
 	BuoyDetail           string   `protobuf:"bytes,2,opt,name=buoy_detail,json=buoyDetail,proto3" json:"buoy_detail,omitempty"`
@@ -1804,78 +1804,78 @@ func init() {
 func init() { proto.RegisterFile("message.proto", fileDescriptor_33c57e4bae7b9afd) }
 
 var fileDescriptor_33c57e4bae7b9afd = []byte{
-	// 1127 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xdf, 0x6e, 0xe3, 0x44,
-	0x17, 0x57, 0xec, 0x34, 0x49, 0x4f, 0xb6, 0xd9, 0xcd, 0xb4, 0xcd, 0xfa, 0xf3, 0x57, 0xba, 0x91,
-	0xa1, 0x52, 0xb9, 0xd9, 0x8b, 0xe5, 0x06, 0x56, 0xa0, 0x95, 0x36, 0x85, 0x6e, 0xa0, 0x41, 0x5a,
-	0x87, 0x8a, 0x1b, 0x50, 0xd7, 0x1b, 0x4f, 0x53, 0x8b, 0xc4, 0x36, 0x99, 0xc9, 0xa2, 0xc2, 0x25,
-	0xaf, 0xc0, 0x03, 0xf0, 0x18, 0x3c, 0x01, 0x8f, 0xc3, 0x23, 0x20, 0x34, 0x7f, 0x3c, 0x1e, 0xdb,
-	0xe3, 0x96, 0x54, 0xcb, 0x0d, 0xdc, 0xf9, 0xcc, 0x9c, 0x39, 0x33, 0xe7, 0xcc, 0x39, 0xe7, 0xf7,
-	0x1b, 0xc3, 0xce, 0x12, 0x13, 0x12, 0xcc, 0xf1, 0xe3, 0x74, 0x95, 0xd0, 0x04, 0xb5, 0xa5, 0xe8,
-	0xfd, 0x6a, 0x41, 0x6f, 0x8a, 0xe3, 0x70, 0x42, 0xe6, 0x3e, 0xfe, 0x7e, 0x8d, 0x09, 0x45, 0xef,
-	0xc1, 0xce, 0x0a, 0xcf, 0x70, 0xf4, 0x06, 0x9f, 0x13, 0xbc, 0x1a, 0x87, 0x4e, 0x63, 0xd8, 0x38,
-	0xde, 0xf6, 0x8b, 0x83, 0x68, 0x08, 0x5d, 0x39, 0xf0, 0x65, 0xb0, 0xc4, 0x8e, 0xc5, 0x75, 0xf4,
-	0x21, 0x74, 0x08, 0x40, 0x70, 0x1c, 0x4a, 0x23, 0x36, 0x57, 0xd0, 0x46, 0x90, 0x0b, 0x1d, 0x26,
-	0xf1, 0xe5, 0x4d, 0x3e, 0xab, 0x64, 0xb4, 0x07, 0x5b, 0x34, 0xa2, 0x0b, 0xec, 0x6c, 0xf1, 0x09,
-	0x21, 0x20, 0x07, 0xda, 0xb3, 0x24, 0xa6, 0x38, 0xa6, 0x4e, 0x8b, 0x8f, 0x67, 0x22, 0x9b, 0x59,
-	0x92, 0xf9, 0x57, 0xd7, 0x29, 0x76, 0xda, 0xc3, 0xc6, 0xb1, 0xed, 0x67, 0x22, 0x42, 0xd0, 0x5c,
-	0x44, 0xf1, 0x77, 0x4e, 0x87, 0x2f, 0xe0, 0xdf, 0x68, 0x00, 0xad, 0x59, 0x44, 0xf1, 0x38, 0x74,
-	0xb6, 0xb9, 0xb2, 0x94, 0xd8, 0xae, 0x41, 0x9a, 0x46, 0xa1, 0x03, 0x62, 0x57, 0x2e, 0x78, 0x17,
-	0xf0, 0x70, 0x74, 0x15, 0xc4, 0x73, 0xec, 0xe3, 0x20, 0x9c, 0xd2, 0x80, 0xae, 0x49, 0x16, 0xaa,
-	0x1e, 0x58, 0x51, 0x16, 0x1f, 0x2b, 0x0a, 0x99, 0xcb, 0x2b, 0xa5, 0xc4, 0x63, 0x62, 0xfb, 0xda,
-	0x48, 0xbe, 0x81, 0xad, 0x6f, 0xf0, 0x14, 0x3a, 0x3e, 0x26, 0xa3, 0x64, 0x5d, 0x74, 0xa4, 0x51,
-	0x74, 0x64, 0x0f, 0xb6, 0x66, 0x4c, 0x45, 0x9a, 0x15, 0x82, 0xf7, 0x1c, 0xdc, 0x13, 0xbc, 0xc0,
-	0x14, 0x4f, 0xa3, 0x78, 0xbe, 0xc0, 0x13, 0x71, 0xad, 0x75, 0xe7, 0x33, 0xef, 0x7f, 0x02, 0x07,
-	0xc2, 0xc6, 0x64, 0xbd, 0xa0, 0x51, 0x7a, 0x47, 0x2b, 0x9f, 0xc2, 0xfe, 0x29, 0xa6, 0xe7, 0x31,
-	0x73, 0x97, 0xfb, 0x92, 0x2d, 0x1f, 0x40, 0x6b, 0xad, 0x27, 0x92, 0x94, 0x72, 0x33, 0x96, 0x6e,
-	0xe6, 0x43, 0x1e, 0x8c, 0x34, 0x89, 0x09, 0xbf, 0xbb, 0x59, 0x12, 0x66, 0x91, 0xe0, 0xdf, 0x3c,
-	0x40, 0xe2, 0x78, 0x72, 0x9d, 0x4a, 0xe5, 0x6f, 0x60, 0x50, 0x3e, 0xc0, 0x5d, 0xec, 0xe4, 0x81,
-	0xb6, 0xf5, 0x40, 0xff, 0xde, 0x80, 0xde, 0x67, 0x91, 0x48, 0x5e, 0x51, 0x2c, 0xb5, 0x8e, 0x55,
-	0x0a, 0xc8, 0x32, 0x15, 0x90, 0x31, 0x8a, 0xcc, 0x66, 0x72, 0x79, 0x39, 0xc5, 0x94, 0x97, 0x84,
-	0xed, 0x4b, 0x89, 0x15, 0x4b, 0x1a, 0xcc, 0xf1, 0x34, 0xfa, 0x51, 0xd4, 0x84, 0xed, 0x2b, 0x59,
-	0xcf, 0x99, 0x56, 0x25, 0xf9, 0x59, 0x34, 0x64, 0x4d, 0xf0, 0x6f, 0xef, 0x4f, 0x0b, 0x3a, 0xf2,
-	0x82, 0xc9, 0x7f, 0xb8, 0xd6, 0x07, 0xd0, 0x8a, 0x08, 0xab, 0x68, 0x5e, 0xec, 0xb6, 0x2f, 0x25,
-	0xe6, 0xc9, 0x6c, 0x85, 0x03, 0x8a, 0x69, 0xb4, 0xc4, 0x4e, 0x57, 0x78, 0x92, 0x8f, 0xe4, 0xd7,
-	0x76, 0x4f, 0xbf, 0x36, 0x51, 0x22, 0x3b, 0xaa, 0x44, 0x5c, 0xe8, 0x2c, 0xc9, 0xfc, 0x2c, 0x99,
-	0x8f, 0x43, 0xa7, 0x27, 0xae, 0x2b, 0x93, 0xbd, 0x9f, 0x4a, 0x89, 0x44, 0x36, 0xcc, 0xcf, 0x23,
-	0x68, 0x86, 0x01, 0x0d, 0x1c, 0x7b, 0x68, 0x1f, 0x77, 0x9f, 0xf4, 0x1f, 0x67, 0x9d, 0x3d, 0xbb,
-	0x54, 0x9f, 0x4f, 0xe7, 0x69, 0xdc, 0xd4, 0xd3, 0xf8, 0x15, 0x2f, 0x92, 0xd1, 0x22, 0x20, 0xa4,
-	0x58, 0xaa, 0xb5, 0xd9, 0xac, 0x85, 0xdb, 0xaa, 0x74, 0x24, 0x43, 0x1f, 0xf0, 0xe0, 0x81, 0x3c,
-	0xc9, 0x09, 0xa6, 0x41, 0xb4, 0x60, 0xb6, 0x4b, 0x1d, 0xc4, 0xbb, 0x82, 0x7e, 0x49, 0x87, 0xa4,
-	0x77, 0x8e, 0x42, 0xe3, 0x86, 0x28, 0x78, 0x04, 0xfa, 0xa7, 0x98, 0x9e, 0x05, 0x84, 0xe6, 0x4d,
-	0xed, 0x6d, 0xb9, 0xaa, 0xe5, 0x50, 0x53, 0xcf, 0x21, 0xe6, 0x5e, 0x79, 0x53, 0xf2, 0xcf, 0xb8,
-	0xf7, 0x4a, 0xef, 0x79, 0xec, 0x52, 0x6f, 0xbd, 0x4e, 0x63, 0xd7, 0x65, 0x07, 0x89, 0x31, 0x66,
-	0x2c, 0x80, 0xef, 0xd8, 0xf1, 0x33, 0xd1, 0xfb, 0xa5, 0x51, 0xb3, 0xc5, 0xdb, 0x4a, 0xdb, 0x0c,
-	0xfa, 0x64, 0xda, 0x1e, 0x41, 0x33, 0x8a, 0x2f, 0x13, 0xa7, 0x59, 0x9b, 0xdd, 0x6c, 0xda, 0xfb,
-	0x04, 0x76, 0x4e, 0x31, 0x9d, 0x88, 0xeb, 0xd9, 0xd8, 0x5f, 0xef, 0x65, 0x71, 0xf9, 0xa6, 0xbe,
-	0x20, 0xcd, 0x17, 0x5b, 0x5e, 0xc5, 0x02, 0xf6, 0xce, 0xd3, 0x30, 0xa0, 0x39, 0x7a, 0x06, 0x21,
-	0x3b, 0x58, 0x3d, 0xa2, 0x17, 0x9b, 0x6f, 0x64, 0xc2, 0x09, 0x85, 0xb6, 0x63, 0x3d, 0xf5, 0xc6,
-	0xa1, 0xf7, 0x2d, 0xec, 0x1b, 0x76, 0xdb, 0xb8, 0x8a, 0x06, 0xd0, 0x22, 0x82, 0xac, 0x08, 0xb0,
-	0x93, 0x92, 0xf7, 0x14, 0x9a, 0x2c, 0x7e, 0xb5, 0x51, 0x75, 0xa1, 0xc3, 0xbe, 0x34, 0x38, 0x50,
-	0xb2, 0xf7, 0x87, 0x05, 0x68, 0x29, 0x99, 0xc4, 0x34, 0x78, 0x83, 0x25, 0x5a, 0x3a, 0xd0, 0x16,
-	0x8b, 0x89, 0xb4, 0x95, 0x89, 0xe8, 0x00, 0xb6, 0xb3, 0xc5, 0x44, 0x5a, 0xcb, 0x07, 0xfe, 0x2d,
-	0x34, 0xb2, 0x00, 0x09, 0xdd, 0x22, 0x24, 0x70, 0x1f, 0xae, 0x92, 0x1f, 0x9e, 0xaf, 0x93, 0x6b,
-	0x8e, 0x2b, 0xb6, 0xaf, 0x64, 0x06, 0xbe, 0xec, 0x7b, 0x24, 0x4f, 0x2c, 0x30, 0x46, 0x1f, 0xf2,
-	0x2e, 0x60, 0xb7, 0x12, 0xef, 0x8d, 0x33, 0xc1, 0x85, 0x0e, 0x5e, 0xad, 0x46, 0x1a, 0xf1, 0x51,
-	0xb2, 0xf7, 0x02, 0x50, 0x86, 0x58, 0xec, 0x48, 0xb7, 0xd0, 0x1f, 0x9d, 0xaa, 0x58, 0x45, 0xaa,
-	0xe2, 0xfd, 0xdc, 0x30, 0x98, 0xda, 0xb4, 0xfa, 0xde, 0x2f, 0x74, 0x92, 0x7d, 0xd5, 0x22, 0xb8,
-	0xc1, 0xbf, 0x03, 0x82, 0xcf, 0xe0, 0x9e, 0xae, 0x5b, 0x21, 0xb8, 0x8f, 0xa0, 0xfb, 0x7a, 0x9d,
-	0x5c, 0x5f, 0x84, 0x1c, 0x9c, 0xe4, 0xf6, 0xc0, 0x86, 0x04, 0x5c, 0x3d, 0xf9, 0xad, 0x03, 0x6d,
-	0xb9, 0x1a, 0x9d, 0xc1, 0xfd, 0x52, 0xf4, 0xd1, 0xff, 0xd5, 0x91, 0xaa, 0x75, 0xe0, 0x1e, 0xd4,
-	0x4f, 0x92, 0x14, 0x9d, 0xc2, 0x83, 0xf2, 0x63, 0x03, 0x0d, 0xd5, 0x8a, 0x9a, 0x77, 0x88, 0x5b,
-	0xe8, 0xa6, 0x82, 0xf3, 0x7e, 0x04, 0xdd, 0x29, 0x56, 0x2c, 0x03, 0x3d, 0x54, 0x1a, 0xc5, 0xd7,
-	0x9e, 0x69, 0xe9, 0x04, 0x76, 0x0d, 0x6f, 0x0a, 0xf4, 0xae, 0xd2, 0xac, 0x7f, 0x71, 0x98, 0xcc,
-	0xbd, 0x84, 0x7d, 0xe3, 0xf3, 0x02, 0x1d, 0x95, 0x0c, 0x9a, 0x9f, 0x1f, 0x66, 0x93, 0xbd, 0x22,
-	0xd5, 0x47, 0x87, 0x4a, 0xc9, 0xf8, 0x08, 0x71, 0x1f, 0xd5, 0xce, 0x4b, 0x93, 0xcf, 0xa0, 0xab,
-	0xb1, 0x32, 0x2d, 0x5e, 0x45, 0xd2, 0xef, 0xd6, 0x4c, 0x10, 0xf4, 0x35, 0xec, 0x1a, 0x98, 0x15,
-	0x2a, 0x6c, 0x6c, 0xe0, 0x5d, 0xb7, 0x9f, 0xec, 0x05, 0x77, 0x56, 0x63, 0x13, 0xc8, 0xd5, 0x97,
-	0x14, 0xb9, 0x8d, 0x5b, 0x3f, 0x47, 0xd0, 0xe7, 0xd0, 0x67, 0x87, 0x2e, 0x50, 0x2f, 0xf4, 0xbf,
-	0x32, 0xc4, 0x2a, 0xda, 0xa6, 0xd9, 0xaa, 0xb2, 0x35, 0xe1, 0x6e, 0x99, 0x16, 0x20, 0x93, 0x37,
-	0x3a, 0x2f, 0x71, 0x6f, 0x51, 0x20, 0xe8, 0x63, 0x80, 0x1c, 0x9a, 0xd1, 0x40, 0x57, 0xcf, 0xe1,
-	0xde, 0x35, 0x8f, 0x13, 0xe4, 0x43, 0xbf, 0x82, 0x8b, 0xe8, 0x1d, 0xa5, 0x6c, 0x42, 0x68, 0xf7,
-	0xf0, 0xa6, 0x69, 0x92, 0xa2, 0x2f, 0xe0, 0x7e, 0xa9, 0x67, 0x69, 0x15, 0x5e, 0x6d, 0x8c, 0xee,
-	0x0d, 0x93, 0xe4, 0x75, 0x8b, 0xff, 0x80, 0xf9, 0xe0, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x60,
-	0x66, 0x8d, 0x21, 0x91, 0x11, 0x00, 0x00,
+	// 1123 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xef, 0x6e, 0xe3, 0x44,
+	0x10, 0x57, 0xe2, 0x34, 0x49, 0x27, 0xd7, 0xdc, 0x65, 0xdb, 0xe6, 0x8c, 0x29, 0xbd, 0xc8, 0x50,
+	0xa9, 0x7c, 0xb9, 0x0f, 0xc7, 0x17, 0x38, 0x81, 0x4e, 0xba, 0x14, 0x4a, 0xa0, 0x41, 0x3a, 0x87,
+	0x8a, 0x2f, 0x40, 0xcf, 0x17, 0x4f, 0x53, 0x8b, 0xc4, 0x36, 0xd9, 0xcd, 0xa1, 0xc2, 0x6b, 0xf0,
+	0x00, 0x3c, 0x06, 0x4f, 0xc0, 0xe3, 0xf0, 0x08, 0x08, 0xed, 0x1f, 0xdb, 0x6b, 0x67, 0xdd, 0x2a,
+	0xd5, 0xf1, 0x85, 0xfb, 0xe6, 0x99, 0x9d, 0x9d, 0xd9, 0x99, 0x9d, 0x3f, 0xbf, 0x35, 0xec, 0x2c,
+	0x90, 0x52, 0x7f, 0x86, 0x8f, 0x93, 0x65, 0xcc, 0x62, 0xd2, 0x52, 0xa4, 0xfb, 0x47, 0x1d, 0xba,
+	0x13, 0x8c, 0x82, 0x31, 0x9d, 0x79, 0xf8, 0xf3, 0x0a, 0x29, 0x23, 0x1f, 0xc0, 0xce, 0x12, 0xa7,
+	0x18, 0xbe, 0xc6, 0x73, 0x8a, 0xcb, 0x51, 0x60, 0xd7, 0x06, 0xb5, 0xe3, 0x6d, 0xaf, 0xc8, 0x24,
+	0x03, 0xe8, 0x28, 0xc6, 0x37, 0xfe, 0x02, 0xed, 0xba, 0x90, 0xd1, 0x59, 0xe4, 0x10, 0x80, 0x62,
+	0x14, 0x28, 0x25, 0x96, 0x10, 0xd0, 0x38, 0xc4, 0x81, 0x36, 0xa7, 0xc4, 0xf6, 0x86, 0x58, 0xcd,
+	0x68, 0xb2, 0x07, 0x5b, 0x2c, 0x64, 0x73, 0xb4, 0xb7, 0xc4, 0x82, 0x24, 0x88, 0x0d, 0xad, 0x69,
+	0x1c, 0x31, 0x8c, 0x98, 0xdd, 0x14, 0xfc, 0x94, 0xe4, 0x2b, 0x0b, 0x3a, 0xfb, 0xf6, 0x3a, 0x41,
+	0xbb, 0x35, 0xa8, 0x1d, 0x5b, 0x5e, 0x4a, 0x12, 0x02, 0x8d, 0x79, 0x18, 0xfd, 0x64, 0xb7, 0xc5,
+	0x06, 0xf1, 0x4d, 0xfa, 0xd0, 0x9c, 0x86, 0x0c, 0x47, 0x81, 0xbd, 0x2d, 0x84, 0x15, 0xc5, 0xad,
+	0xfa, 0x49, 0x12, 0x06, 0x36, 0x48, 0xab, 0x82, 0x70, 0x2f, 0xe0, 0xe1, 0xf0, 0xca, 0x8f, 0x66,
+	0xe8, 0xa1, 0x1f, 0x4c, 0x98, 0xcf, 0x56, 0x34, 0x0d, 0x55, 0x17, 0xea, 0x61, 0x1a, 0x9f, 0x7a,
+	0x18, 0x70, 0x97, 0x97, 0x99, 0x90, 0x88, 0x89, 0xe5, 0x69, 0x9c, 0xdc, 0x80, 0xa5, 0x1b, 0x78,
+	0x0a, 0x6d, 0x0f, 0xe9, 0x30, 0x5e, 0x15, 0x1d, 0xa9, 0x15, 0x1d, 0xd9, 0x83, 0xad, 0x29, 0x17,
+	0x51, 0x6a, 0x25, 0xe1, 0x3e, 0x07, 0xe7, 0x04, 0xe7, 0xc8, 0x70, 0x12, 0x46, 0xb3, 0x39, 0x8e,
+	0xe5, 0xb5, 0x56, 0x9d, 0xcf, 0x6c, 0xff, 0x04, 0x0e, 0xa4, 0x8e, 0xf1, 0x6a, 0xce, 0xc2, 0xe4,
+	0x8e, 0x5a, 0x3e, 0x87, 0xfd, 0x53, 0x64, 0xe7, 0x11, 0x77, 0x57, 0xf8, 0x92, 0x6e, 0xef, 0x43,
+	0x73, 0xa5, 0x27, 0x92, 0xa2, 0x72, 0x35, 0x75, 0x5d, 0xcd, 0xc7, 0x22, 0x18, 0x49, 0x1c, 0x51,
+	0x71, 0x77, 0xd3, 0x38, 0x48, 0x23, 0x21, 0xbe, 0x45, 0x80, 0xe4, 0xf1, 0xd4, 0xbe, 0x2c, 0x95,
+	0xbf, 0x87, 0x7e, 0xf9, 0x00, 0x77, 0xd1, 0x93, 0x07, 0xda, 0xd2, 0x03, 0xfd, 0x57, 0x0d, 0xba,
+	0x5f, 0x84, 0x32, 0x79, 0x65, 0xb1, 0x54, 0x3a, 0xb6, 0x56, 0x40, 0x75, 0x53, 0x01, 0x19, 0xa3,
+	0xc8, 0x75, 0xc6, 0x97, 0x97, 0x13, 0x64, 0xa2, 0x24, 0x2c, 0x4f, 0x51, 0xbc, 0x58, 0x12, 0x7f,
+	0x86, 0x93, 0xf0, 0x57, 0x59, 0x13, 0x96, 0x97, 0xd1, 0x7a, 0xce, 0x34, 0xd7, 0x92, 0x9f, 0x47,
+	0x43, 0xd5, 0x84, 0xf8, 0x76, 0xff, 0xa9, 0x43, 0x5b, 0x5d, 0x30, 0x7d, 0x8b, 0x6b, 0xbd, 0x0f,
+	0xcd, 0x90, 0xf2, 0x8a, 0x16, 0xc5, 0x6e, 0x79, 0x8a, 0xe2, 0x9e, 0x4c, 0x97, 0xe8, 0x33, 0x64,
+	0xe1, 0x02, 0xed, 0x8e, 0xf4, 0x24, 0xe7, 0xe4, 0xd7, 0x76, 0x4f, 0xbf, 0x36, 0x59, 0x22, 0x3b,
+	0x59, 0x89, 0x38, 0xd0, 0x5e, 0xd0, 0xd9, 0x59, 0x3c, 0x1b, 0x05, 0x76, 0x57, 0x5e, 0x57, 0x4a,
+	0xbb, 0xbf, 0x95, 0x12, 0x89, 0x6e, 0x98, 0x9f, 0x47, 0xd0, 0x08, 0x7c, 0xe6, 0xdb, 0xd6, 0xc0,
+	0x3a, 0xee, 0x3c, 0xe9, 0x3d, 0x4e, 0x3b, 0x7b, 0x7a, 0xa9, 0x9e, 0x58, 0xce, 0xd3, 0xb8, 0xa1,
+	0xa7, 0xf1, 0x4b, 0x51, 0x24, 0xc3, 0xb9, 0x4f, 0x69, 0xb1, 0x54, 0x2b, 0xb3, 0x59, 0x0b, 0x77,
+	0x7d, 0xad, 0x23, 0x19, 0xfa, 0x80, 0x0b, 0x0f, 0xd4, 0x49, 0x4e, 0x90, 0xf9, 0xe1, 0x9c, 0xeb,
+	0x2e, 0x75, 0x10, 0xf7, 0x0a, 0x7a, 0x25, 0x19, 0x9a, 0xdc, 0x39, 0x0a, 0xb5, 0x1b, 0xa2, 0xe0,
+	0x52, 0xe8, 0x9d, 0x22, 0x3b, 0xf3, 0x29, 0xcb, 0x9b, 0xda, 0x9b, 0x72, 0x55, 0xcb, 0xa1, 0x86,
+	0x9e, 0x43, 0xdc, 0xbd, 0xb2, 0x51, 0xfa, 0xdf, 0xb8, 0xf7, 0x52, 0xef, 0x79, 0xfc, 0x52, 0x6f,
+	0xbd, 0x4e, 0x63, 0xd7, 0xe5, 0x07, 0x89, 0x10, 0x39, 0x0a, 0x10, 0x16, 0xdb, 0x5e, 0x4a, 0xba,
+	0xbf, 0xd7, 0x2a, 0x4c, 0xbc, 0xa9, 0xb4, 0x4d, 0x47, 0x9f, 0x4a, 0xdb, 0x23, 0x68, 0x84, 0xd1,
+	0x65, 0x6c, 0x37, 0x2a, 0xb3, 0x9b, 0x2f, 0xbb, 0x9f, 0xc1, 0xce, 0x29, 0xb2, 0xb1, 0xbc, 0x9e,
+	0x8d, 0xfd, 0x75, 0x5f, 0x14, 0xb7, 0x6f, 0xea, 0x0b, 0xd1, 0x7c, 0xb1, 0xd4, 0x55, 0xcc, 0x61,
+	0xef, 0x3c, 0x09, 0x7c, 0x96, 0x4f, 0x4f, 0x3f, 0xe0, 0x07, 0xab, 0x9e, 0xe8, 0xc5, 0xe6, 0x1b,
+	0x9a, 0xe6, 0x44, 0x36, 0x6d, 0x47, 0x7a, 0xea, 0x8d, 0x02, 0xf7, 0x07, 0xd8, 0x37, 0x58, 0xdb,
+	0xb8, 0x8a, 0xfa, 0xd0, 0xa4, 0x12, 0xac, 0xc8, 0x61, 0xa7, 0x28, 0xf7, 0x29, 0x34, 0x78, 0xfc,
+	0x2a, 0xa3, 0xea, 0x40, 0x9b, 0x7f, 0x69, 0xe3, 0x20, 0xa3, 0xdd, 0xbf, 0xeb, 0x40, 0x16, 0x0a,
+	0x49, 0x4c, 0xfc, 0xd7, 0xa8, 0xa6, 0xa5, 0x0d, 0x2d, 0xb9, 0x99, 0x2a, 0x5d, 0x29, 0x49, 0x0e,
+	0x60, 0x3b, 0xdd, 0x4c, 0x95, 0xb6, 0x9c, 0xf1, 0x7f, 0x81, 0x91, 0x85, 0x91, 0xd0, 0x29, 0x8e,
+	0x04, 0xe1, 0xc3, 0x55, 0xfc, 0xcb, 0xf3, 0x55, 0x7c, 0x2d, 0xe6, 0x8a, 0xe5, 0x65, 0x34, 0x1f,
+	0xbe, 0xfc, 0x7b, 0xa8, 0x4e, 0x2c, 0x67, 0x8c, 0xce, 0x72, 0x2f, 0x60, 0x77, 0x2d, 0xde, 0x1b,
+	0x67, 0x82, 0x03, 0x6d, 0x5c, 0x2e, 0x87, 0x1a, 0xf0, 0xc9, 0x68, 0xf7, 0x47, 0x20, 0xe9, 0xc4,
+	0xe2, 0x47, 0xba, 0x05, 0xfe, 0x98, 0x3b, 0x8c, 0x0e, 0x60, 0xac, 0x22, 0x80, 0x71, 0x17, 0x06,
+	0xfd, 0x9b, 0x96, 0xe4, 0x87, 0x85, 0xf6, 0xb2, 0x9f, 0xf5, 0x0d, 0xa1, 0xb0, 0xd8, 0x34, 0x9f,
+	0xc1, 0x3d, 0x9d, 0xbb, 0x86, 0x6f, 0x1f, 0x41, 0xe7, 0xd5, 0x2a, 0xbe, 0xbe, 0x08, 0xc4, 0x6c,
+	0x52, 0x86, 0x80, 0xb3, 0xe4, 0xb4, 0x7a, 0xf2, 0x67, 0x1b, 0x5a, 0x6a, 0x37, 0x39, 0x83, 0xfb,
+	0xa5, 0xe0, 0x93, 0x77, 0x33, 0xe3, 0xeb, 0x65, 0xe0, 0x1c, 0x54, 0x2f, 0xd2, 0x84, 0x9c, 0xc2,
+	0x83, 0xf2, 0x5b, 0x83, 0x0c, 0xb2, 0x1d, 0x15, 0xcf, 0x10, 0xa7, 0xd0, 0x4c, 0x25, 0xe4, 0xfd,
+	0x04, 0x3a, 0x13, 0xcc, 0x40, 0x06, 0x79, 0x98, 0x49, 0x14, 0x1f, 0x7b, 0xa6, 0xad, 0x63, 0xd8,
+	0x35, 0x3c, 0x29, 0xc8, 0xfb, 0x99, 0x64, 0xf5, 0x83, 0xc3, 0xa4, 0xee, 0x05, 0xec, 0x1b, 0x5f,
+	0x17, 0xe4, 0xa8, 0xa4, 0xd0, 0xfc, 0xfa, 0x30, 0xab, 0xec, 0x16, 0x91, 0x3e, 0x39, 0xcc, 0x84,
+	0x8c, 0x6f, 0x10, 0xe7, 0x51, 0xe5, 0xba, 0x52, 0xf9, 0x0c, 0x3a, 0x1a, 0x28, 0xd3, 0xe2, 0x55,
+	0xc4, 0xfc, 0x4e, 0xc5, 0x02, 0x25, 0xdf, 0xc1, 0xae, 0x01, 0x58, 0x91, 0x82, 0x61, 0x03, 0xec,
+	0xba, 0xfd, 0x64, 0x5f, 0x0a, 0x67, 0x35, 0x30, 0x41, 0x1c, 0x7d, 0x4b, 0x11, 0xda, 0x38, 0xd5,
+	0x6b, 0x94, 0x7c, 0x05, 0x3d, 0x7e, 0xe8, 0x02, 0xf2, 0x22, 0xef, 0x94, 0x27, 0x6c, 0x86, 0xda,
+	0x34, 0x5d, 0xeb, 0x60, 0x4d, 0xba, 0x5b, 0x46, 0x05, 0xc4, 0xe4, 0x8d, 0x0e, 0x4b, 0x9c, 0x5b,
+	0x04, 0x28, 0xf9, 0x14, 0x20, 0x9f, 0xcc, 0xa4, 0xaf, 0x8b, 0xe7, 0xd3, 0xde, 0x31, 0xf3, 0x29,
+	0xf1, 0xa0, 0xb7, 0x36, 0x16, 0xc9, 0x7b, 0x99, 0xb0, 0x69, 0x40, 0x3b, 0x87, 0x37, 0x2d, 0xd3,
+	0x84, 0x7c, 0x0d, 0xf7, 0x4b, 0xdd, 0x49, 0xab, 0xf0, 0xf5, 0xbe, 0xe8, 0xdc, 0xb0, 0x48, 0x5f,
+	0x35, 0xc5, 0xff, 0x97, 0x8f, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x98, 0xf5, 0x70, 0x90,
+	0x11, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.

+ 22 - 22
rpc/messageclient/message.go

@@ -14,34 +14,34 @@ import (
 )
 
 type (
-	MultipleSaveMsgResp          = message.MultipleSaveMsgResp
-	FindUserBuoyMsgReq           = message.FindUserBuoyMsgReq
-	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
-	MessageDetailResp            = message.MessageDetailResp
-	GetUnreadClassCountRes       = message.GetUnreadClassCountRes
-	UpdateMessageReadResp        = message.UpdateMessageReadResp
-	BuoyMessages                 = message.BuoyMessages
-	DeleteMultipleMessageRequest = message.DeleteMultipleMessageRequest
-	MessageDetailReq             = message.MessageDetailReq
-	GetLastMessageReq            = message.GetLastMessageReq
-	GetLastMessageRes            = message.GetLastMessageRes
-	GetUnreadCountResponse       = message.GetUnreadCountResponse
-	Response                     = message.Response
-	GetClassUnreadCountReq       = message.GetClassUnreadCountReq
-	FindUserBuoyMsgRes           = message.FindUserBuoyMsgRes
-	DeleteSingleMessageRequest   = message.DeleteSingleMessageRequest
 	GetUnreadClassCountReq       = message.GetUnreadClassCountReq
-	GetMsgTypeRes                = message.GetMsgTypeRes
-	GetUnreadCountRequest        = message.GetUnreadCountRequest
-	FindUserMsgReq               = message.FindUserMsgReq
+	GetMsgTypeReq                = message.GetMsgTypeReq
 	Messages                     = message.Messages
 	FindUserMsgRes               = message.FindUserMsgRes
+	DeleteSingleMessageRequest   = message.DeleteSingleMessageRequest
+	GetUnreadCountRequest        = message.GetUnreadCountRequest
+	UpdateMessageReadReq         = message.UpdateMessageReadReq
+	FindUserBuoyMsgReq           = message.FindUserBuoyMsgReq
+	MessageDetailReq             = message.MessageDetailReq
+	GetMsgTypeRes                = message.GetMsgTypeRes
 	User                         = message.User
-	MultipleSaveMsgReq           = message.MultipleSaveMsgReq
 	SendMsgRequest               = message.SendMsgRequest
-	GetMsgTypeReq                = message.GetMsgTypeReq
-	UpdateMessageReadReq         = message.UpdateMessageReadReq
+	GetLastMessageReq            = message.GetLastMessageReq
+	UpdateMessageReadResp        = message.UpdateMessageReadResp
+	GetUnreadClassCountRes       = message.GetUnreadClassCountRes
+	ChangeReadStatusRequest      = message.ChangeReadStatusRequest
 	ResCount                     = message.ResCount
+	DeleteMultipleMessageRequest = message.DeleteMultipleMessageRequest
+	FindUserMsgReq               = message.FindUserMsgReq
+	GetClassUnreadCountReq       = message.GetClassUnreadCountReq
+	MultipleSaveMsgReq           = message.MultipleSaveMsgReq
+	Response                     = message.Response
+	GetUnreadCountResponse       = message.GetUnreadCountResponse
+	MessageDetailResp            = message.MessageDetailResp
+	GetLastMessageRes            = message.GetLastMessageRes
+	MultipleSaveMsgResp          = message.MultipleSaveMsgResp
+	FindUserBuoyMsgRes           = message.FindUserBuoyMsgRes
+	BuoyMessages                 = message.BuoyMessages
 
 	Message interface {
 		// 批量保存消息