From c21634012070d835e2a0fd0d486e3c15a596edb5 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 15 Apr 2022 19:48:17 +0800 Subject: [PATCH 01/59] organization --- cmd/open_im_api/main.go | 17 + internal/api/organization/organization.go | 400 ++++++++++++++++++ internal/rpc/organization/organization.go | 70 +++ pkg/base_info/organization_api_struct.go | 101 +++++ pkg/common/db/model_struct.go | 15 +- .../im_mysql_model/organization_model.go | 155 +++++++ pkg/common/token_verify/jwt_token.go | 8 + pkg/proto/organization/organization.proto | 8 +- 8 files changed, 763 insertions(+), 11 deletions(-) create mode 100644 internal/api/organization/organization.go create mode 100644 pkg/base_info/organization_api_struct.go create mode 100644 pkg/common/db/mysql_model/im_mysql_model/organization_model.go diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 6bbb43dbc..f9f8103f4 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -8,6 +8,7 @@ import ( "Open_IM/internal/api/group" "Open_IM/internal/api/manage" "Open_IM/internal/api/office" + "Open_IM/internal/api/organization" apiThird "Open_IM/internal/api/third" "Open_IM/internal/api/user" "Open_IM/pkg/common/config" @@ -136,6 +137,22 @@ func main() { officeGroup.POST("/send_msg_to_tag", office.SendMsg2Tag) officeGroup.POST("/get_send_tag_log", office.GetTagSendLogs) } + + organizationGroup := r.Group("/organization") + { + organizationGroup.POST("/create_department", organization.CreateDepartment) + organizationGroup.POST("/update_department", organization.UpdateDepartment) + organizationGroup.POST("/get_department", organization.GetDepartment) + organizationGroup.POST("/delete_department", organization.DeleteDepartment) + organizationGroup.POST("/create_organization_user", organization.CreateOrganizationUser) + organizationGroup.POST("/update_organization_user", organization.UpdateOrganizationUser) + organizationGroup.POST("/create_department_member", organization.CreateDepartmentMember) + organizationGroup.POST("/get_user_in_department", organization.GetUserInDepartment) + organizationGroup.POST("/update_user_In_department", organization.UpdateUserInDepartment) + organizationGroup.POST("/delete_organization_user", organization.DeleteOrganizationUser) + organizationGroup.POST("/get_department_member", organization.GetDepartmentMember) + } + go apiThird.MinioInit() ginPort := flag.Int("port", 10000, "get ginServerPort from cmd,default 10000 as port") flag.Parse() diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go new file mode 100644 index 000000000..13e1b1c30 --- /dev/null +++ b/internal/api/organization/organization.go @@ -0,0 +1,400 @@ +package organization + +import ( + jsonData "Open_IM/internal/utils" + api "Open_IM/pkg/base_info" + "Open_IM/pkg/common/config" + "Open_IM/pkg/common/log" + "Open_IM/pkg/common/token_verify" + "Open_IM/pkg/grpc-etcdv3/getcdv3" + rpc "Open_IM/pkg/proto/organization" + "Open_IM/pkg/utils" + "context" + "github.com/gin-gonic/gin" + "net/http" + "strings" +) + +func CreateDepartment(c *gin.Context) { + params := api.CreateDepartmentReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &rpc.CreateDepartmentReq{} + utils.CopyStructFields(req, ¶ms) + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.CreateDepartment(context.Background(), req) + if err != nil { + errMsg := "rpc CreateDepartment failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.CreateDepartmentResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, Department: RpcResp.DepartmentInfo} + apiResp.Data = jsonData.JsonDataOne(RpcResp.DepartmentInfo) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} + +func UpdateDepartment(c *gin.Context) { + params := api.UpdateDepartmentReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &rpc.UpdateDepartmentReq{} + utils.CopyStructFields(req, ¶ms) + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.UpdateDepartment(context.Background(), req) + if err != nil { + errMsg := "rpc UpdateDepartment failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.UpdateDepartmentResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} + +func GetDepartment(c *gin.Context) { + params := api.GetDepartmentReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &rpc.GetDepartmentReq{} + utils.CopyStructFields(req, ¶ms) + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.GetDepartment(context.Background(), req) + if err != nil { + errMsg := "rpc GetDepartment failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.GetDepartmentResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, DepartmentList: RpcResp.DepartmentList} + apiResp.Data = jsonData.JsonDataList(RpcResp.DepartmentList) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} + +func DeleteDepartment(c *gin.Context) { + params := api.DeleteDepartmentReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &rpc.DeleteDepartmentReq{} + utils.CopyStructFields(req, ¶ms) + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.DeleteDepartment(context.Background(), req) + if err != nil { + errMsg := "rpc DeleteDepartment failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.DeleteDepartmentResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} + +func CreateOrganizationUser(c *gin.Context) { + params := api.CreateOrganizationUserReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + + req := &rpc.CreateOrganizationUserReq{} + utils.CopyStructFields(req, ¶ms) + + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.CreateOrganizationUser(context.Background(), req) + if err != nil { + errMsg := "rpc CreateOrganizationUser failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.CreateOrganizationUserResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} + +func UpdateOrganizationUser(c *gin.Context) { + params := api.UpdateOrganizationUserReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + + req := &rpc.UpdateOrganizationUserReq{} + utils.CopyStructFields(req, ¶ms) + + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.UpdateOrganizationUser(context.Background(), req) + if err != nil { + errMsg := "rpc UpdateOrganizationUser failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.UpdateOrganizationUserResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} + +func CreateDepartmentMember(c *gin.Context) { + params := api.CreateDepartmentMemberReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + + req := &rpc.CreateDepartmentMemberReq{} + utils.CopyStructFields(req, ¶ms) + + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.CreateDepartmentMember(context.Background(), req) + if err != nil { + errMsg := "rpc CreateDepartmentMember failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.CreateDepartmentMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} + +func GetUserInDepartment(c *gin.Context) { + params := api.GetUserInDepartmentReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + + req := &rpc.GetUserInDepartmentReq{} + utils.CopyStructFields(req, ¶ms) + + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.GetUserInDepartment(context.Background(), req) + if err != nil { + errMsg := "rpc GetUserInDepartment failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.GetUserInDepartmentResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, UserInDepartment: RpcResp.UserInDepartment} + apiResp.Data = jsonData.JsonDataOne(RpcResp.UserInDepartment) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} + +func UpdateUserInDepartment(c *gin.Context) { + params := api.UpdateUserInDepartmentReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + + req := &rpc.UpdateUserInDepartmentReq{} + utils.CopyStructFields(req, ¶ms) + + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.UpdateUserInDepartment(context.Background(), req) + if err != nil { + errMsg := "rpc UpdateUserInDepartment failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.UpdateUserInDepartmentResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} + +func DeleteOrganizationUser(c *gin.Context) { + params := api.DeleteOrganizationUserReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + + req := &rpc.DeleteOrganizationUserReq{} + utils.CopyStructFields(req, ¶ms) + + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.DeleteOrganizationUser(context.Background(), req) + if err != nil { + errMsg := "rpc DeleteOrganizationUser failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.DeleteOrganizationUserResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} + +func GetDepartmentMember(c *gin.Context) { + params := api.GetDepartmentMemberReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + + req := &rpc.GetDepartmentMemberReq{} + utils.CopyStructFields(req, ¶ms) + + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.GetDepartmentMember(context.Background(), req) + if err != nil { + errMsg := "rpc GetDepartmentMember failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.GetDepartmentMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, UserInDepartmentList: RpcResp.UserInDepartmentList} + apiResp.Data = jsonData.JsonDataList(RpcResp.UserInDepartmentList) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index 0eddd72e6..c858758f9 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -3,10 +3,15 @@ package organization import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" + "Open_IM/pkg/common/db" + imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model" "Open_IM/pkg/common/log" + "Open_IM/pkg/common/token_verify" "Open_IM/pkg/grpc-etcdv3/getcdv3" rpc "Open_IM/pkg/proto/organization" + open_im_sdk "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" + "time" "context" "google.golang.org/grpc" @@ -64,5 +69,70 @@ func (s *organizationServer) Run() { } func (s *organizationServer) CreateDepartment(ctx context.Context, req *rpc.CreateDepartmentReq) (*rpc.CreateDepartmentResp, error) { + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc args ", req.String()) + if !token_verify.IsMangerUserID(req.OpUserID) { + errMsg := "is not app manger " + req.OpUserID + " " + req.OperationID + log.Error(req.OperationID, errMsg) + return &rpc.CreateDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } + + department := db.Department{} + utils.CopyStructFields(&department, req.DepartmentInfo) + if department.DepartmentID == "" { + department.DepartmentID = utils.Md5(strconv.FormatInt(time.Now().UnixNano(), 10)) + } + if imdb.CreateDepartment(&department) != nil { + + } + + err, createdDepartment := imdb.GetDepartment(department.DepartmentID) + if err != nil { + + } + resp := &rpc.CreateDepartmentResp{DepartmentInfo: &open_im_sdk.Department{}} + utils.CopyStructFields(resp.DepartmentInfo, createdDepartment) + + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", resp) + return resp, nil + +} + +func (s *organizationServer) UpdateDepartment(ctx context.Context, req *rpc.UpdateDepartmentReq) (*rpc.UpdateDepartmentResp, error) { + return nil, nil +} + +func (s *organizationServer) GetDepartment(ctx context.Context, req *rpc.GetDepartmentReq) (*rpc.GetDepartmentResp, error) { + return nil, nil +} + +func (s *organizationServer) DeleteDepartment(ctx context.Context, req *rpc.DeleteDepartmentReq) (*rpc.DeleteDepartmentResp, error) { + return nil, nil +} + +func (s *organizationServer) CreateOrganizationUser(ctx context.Context, req *rpc.CreateOrganizationUserReq) (*rpc.CreateOrganizationUserResp, error) { + return nil, nil +} + +func (s *organizationServer) UpdateOrganizationUser(ctx context.Context, req *rpc.UpdateOrganizationUserReq) (*rpc.UpdateOrganizationUserResp, error) { + return nil, nil +} + +func (s *organizationServer) CreateDepartmentMember(ctx context.Context, req *rpc.CreateDepartmentMemberReq) (*rpc.CreateDepartmentMemberResp, error) { + return nil, nil +} + +func (s *organizationServer) GetUserInDepartment(ctx context.Context, req *rpc.GetUserInDepartmentReq) (*rpc.GetUserInDepartmentResp, error) { + return nil, nil +} + +func (s *organizationServer) UpdateUserInDepartment(ctx context.Context, req *rpc.UpdateUserInDepartmentReq) (*rpc.UpdateUserInDepartmentResp, error) { + return nil, nil +} + +func (s *organizationServer) DeleteOrganizationUser(ctx context.Context, req *rpc.DeleteOrganizationUserReq) (*rpc.DeleteOrganizationUserResp, error) { + return nil, nil +} + +func (s *organizationServer) GetDepartmentMember(ctx context.Context, req *rpc.GetDepartmentMemberReq) (*rpc.GetDepartmentMemberResp, error) { return nil, nil } diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go new file mode 100644 index 000000000..e84425250 --- /dev/null +++ b/pkg/base_info/organization_api_struct.go @@ -0,0 +1,101 @@ +package base_info + +import open_im_sdk "Open_IM/pkg/proto/sdk_ws" + +type CreateDepartmentReq struct { + *open_im_sdk.Department + OperationID string `json:"operationID" binding:"required"` +} +type CreateDepartmentResp struct { + CommResp + Department *open_im_sdk.Department `json:"-"` + Data map[string]interface{} `json:"data"` +} + +type UpdateDepartmentReq struct { + *open_im_sdk.Department + DepartmentID string `json:"departmentID" binding:"required"` + OperationID string `json:"operationID" binding:"required"` +} +type UpdateDepartmentResp struct { + CommResp +} + +type GetDepartmentReq struct { + OperationID string `json:"operationID" binding:"required"` + DepartmentID string +} +type GetDepartmentResp struct { + CommResp + DepartmentList []*open_im_sdk.Department `json:"-"` + Data []map[string]interface{} `json:"data"` +} + +type DeleteDepartmentReq struct { + OperationID string `json:"operationID" binding:"required"` + DepartmentID string +} +type DeleteDepartmentResp struct { + CommResp +} + +type CreateOrganizationUserReq struct { + OperationID string `json:"operationID" binding:"required"` + OrganizationUser *open_im_sdk.OrganizationUser +} +type CreateOrganizationUserResp struct { + CommResp +} + +type UpdateOrganizationUserReq struct { + OperationID string `json:"operationID" binding:"required"` + OrganizationUser *open_im_sdk.OrganizationUser +} +type UpdateOrganizationUserResp struct { + CommResp +} + +type CreateDepartmentMemberReq struct { + OperationID string `json:"operationID" binding:"required"` + UserInDepartment *open_im_sdk.UserInDepartment +} + +type CreateDepartmentMemberResp struct { + CommResp +} + +type GetUserInDepartmentReq struct { + UserID string + OperationID string `json:"operationID" binding:"required"` +} +type GetUserInDepartmentResp struct { + CommResp + UserInDepartment *open_im_sdk.UserInDepartment `json:"-"` + Data map[string]interface{} `json:"data"` +} + +type UpdateUserInDepartmentReq struct { + OperationID string `json:"operationID" binding:"required"` + UserInDepartment *open_im_sdk.UserInDepartment +} +type UpdateUserInDepartmentResp struct { + CommResp +} + +type DeleteOrganizationUserReq struct { + UserID string + OperationID string `json:"operationID" binding:"required"` +} +type DeleteOrganizationUserResp struct { + CommResp +} + +type GetDepartmentMemberReq struct { + DepartmentID string + OperationID string `json:"operationID" binding:"required"` +} +type GetDepartmentMemberResp struct { + CommResp + UserInDepartmentList []*open_im_sdk.UserInDepartment `json:"-"` + Data []map[string]interface{} `json:"data"` +} diff --git a/pkg/common/db/model_struct.go b/pkg/common/db/model_struct.go index 8f3d97ad0..64780cb55 100644 --- a/pkg/common/db/model_struct.go +++ b/pkg/common/db/model_struct.go @@ -257,13 +257,14 @@ func (OrganizationUser) TableName() string { } type DepartmentMember struct { - UserID string `gorm:"column:user_id;primary_key;size:64"` - DepartmentID string `gorm:"column:department_id;primary_key;size:64"` - Order int32 `gorm:"column:order" json:"order"` - Position string `gorm:"column:position;size:256" json:"position"` - Leader int32 `gorm:"column:leader" json:"leader"` - Status int32 `gorm:"column:status" json:"status"` - Ex string `gorm:"column:ex;type:varchar(1024)" json:"ex"` + UserID string `gorm:"column:user_id;primary_key;size:64"` + DepartmentID string `gorm:"column:department_id;primary_key;size:64"` + Order int32 `gorm:"column:order" json:"order"` + Position string `gorm:"column:position;size:256" json:"position"` + Leader int32 `gorm:"column:leader" json:"leader"` + Status int32 `gorm:"column:status" json:"status"` + CreateTime time.Time `gorm:"column:create_time"` + Ex string `gorm:"column:ex;type:varchar(1024)" json:"ex"` } func (DepartmentMember) TableName() string { diff --git a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go new file mode 100644 index 000000000..bdb595e3f --- /dev/null +++ b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go @@ -0,0 +1,155 @@ +package im_mysql_model + +import ( + "Open_IM/pkg/common/db" + "errors" + "time" +) + +func CreateDepartment(department *db.Department) error { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err + } + department.CreateTime = time.Now() + return dbConn.Table("departments").Create(department).Error +} + +func GetDepartment(departmentID string) (error, *db.Department) { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err, nil + } + var department db.Department + err = dbConn.Table("departments").Where("department_id=?", departmentID).Find(&department).Error + return err, &department +} + +func UpdateDepartment(department *db.Department, args map[string]interface{}) error { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err + } + if err = dbConn.Table("departments").Where("department_id=?", department.DepartmentID).Updates(department).Error; err != nil { + return err + } + if args != nil { + return dbConn.Table("departments").Where("department_id=?", department.DepartmentID).Updates(args).Error + } + return nil +} + +func GetSubDepartmentList(departmentID string) (error, []db.Department) { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err, nil + } + var departmentList []db.Department + err = dbConn.Table("departments").Where("parent_id=?", departmentID).Find(&departmentList).Error + return err, departmentList +} + +func DeleteDepartment(departmentID string) error { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err + } + if err = dbConn.Table("departments").Where("department_id=?", departmentID).Delete(db.Department{}).Error; err != nil { + return err + } + if err = dbConn.Table("department_members").Where("department_id=?", departmentID).Delete(db.DepartmentMember{}).Error; err != nil { + return err + } + return nil +} + +func CreateOrganizationUser(organizationUser *db.OrganizationUser) error { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err + } + organizationUser.CreateTime = time.Now() + return dbConn.Table("organization_users").Create(organizationUser).Error +} + +func UpdateOrganizationUser(organizationUser *db.OrganizationUser, args map[string]interface{}) error { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err + } + if err = dbConn.Table("organization_users").Where("user_id=?", organizationUser.UserID).Updates(organizationUser).Error; err != nil { + return err + } + if args != nil { + return dbConn.Table("organization_users").Where("user_id=?", organizationUser.UserID).Updates(args).Error + } + return nil +} + +func CreateDepartmentMember(departmentMember *db.DepartmentMember) error { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err + } + departmentMember.CreateTime = time.Now() + return dbConn.Table("department_members").Create(departmentMember).Error +} + +func GetUserInDepartment(userID string) (error, []db.DepartmentMember) { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err, nil + } + var departmentMemberList []db.DepartmentMember + err = dbConn.Table("department_members").Where("user_id=?", userID).Find(&departmentMemberList).Error + return err, departmentMemberList +} + +func UpdateUserInDepartment(userInDepartmentList []db.DepartmentMember) error { + if len(userInDepartmentList) == 0 { + return errors.New("args failed") + } + if err := DeleteUserInAllDepartment(userInDepartmentList[0].UserID); err != nil { + return err + } + for _, v := range userInDepartmentList { + if err := CreateDepartmentMember(&v); err != nil { + return err + } + } + return nil +} + +func DeleteUserInAllDepartment(userID string) error { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err + } + return dbConn.Table("department_members").Where("user_id=?", userID).Delete(db.DepartmentMember{}).Error +} + +func DeleteOrganizationUser(OrganizationUserID string) error { + if err := DeleteUserInAllDepartment(OrganizationUserID); err != nil { + return err + } + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err + } + return dbConn.Table("organization_users").Where("user_id=?", OrganizationUserID).Delete(db.OrganizationUser{}).Error +} + +func GetDepartmentMemberUserIDList(departmentID string) (error, []string) { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err, nil + } + var departmentMemberList []db.DepartmentMember + err = dbConn.Table("department_members").Where("department_id=?", departmentID).Find(&departmentMemberList).Error + + var userIDList []string = make([]string, 0) + for _, v := range departmentMemberList { + userIDList = append(userIDList, v.UserID) + } + return err, userIDList +} diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 69b112bf7..0687fa564 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -138,6 +138,14 @@ func GetUserIDFromToken(token string, operationID string) (bool, string) { return true, claims.UID } +func ParseTokenGetUserID(token string, operationID string) (error, string) { + claims, err := ParseToken(token, operationID) + if err != nil { + return utils.Wrap(err, ""), "" + } + return nil, claims.UID +} + func ParseToken(tokensString, operationID string) (claims *Claims, err error) { claims, err = GetClaimFromToken(tokensString) if err != nil { diff --git a/pkg/proto/organization/organization.proto b/pkg/proto/organization/organization.proto index 498d625aa..67d2b7a8e 100644 --- a/pkg/proto/organization/organization.proto +++ b/pkg/proto/organization/organization.proto @@ -114,12 +114,12 @@ message UpdateUserInDepartmentResp{ } -message DeleteOrganizationReq{ +message DeleteOrganizationUserReq{ string userID = 1; string operationID = 2; string opUserID = 3; } -message DeleteOrganizationResp{ +message DeleteOrganizationUserResp{ int32 errCode = 1; string errMsg = 2; } @@ -139,7 +139,7 @@ message GetDepartmentMemberResp{ service organization{ - rpc createDepartment(CreateDepartmentReq) returns(CreateDepartmentResp); + rpc CreateDepartment(CreateDepartmentReq) returns(CreateDepartmentResp); rpc UpdateDepartment(UpdateDepartmentReq) returns(UpdateDepartmentResp); rpc GetDepartment(GetDepartmentReq) returns(GetDepartmentResp); rpc DeleteDepartment(DeleteDepartmentReq) returns(DeleteDepartmentResp); @@ -148,7 +148,7 @@ service organization{ rpc CreateDepartmentMember(CreateDepartmentMemberReq) returns(CreateDepartmentMemberResp); rpc GetUserInDepartment(GetUserInDepartmentReq) returns(GetUserInDepartmentResp); rpc UpdateUserInDepartment(UpdateUserInDepartmentReq) returns(UpdateUserInDepartmentResp); - rpc DeleteOrganization(DeleteOrganizationReq) returns(DeleteOrganizationResp); + rpc DeleteOrganizationUser(DeleteOrganizationUserReq) returns(DeleteOrganizationUserResp); rpc GetDepartmentMember(GetDepartmentMemberReq) returns(GetDepartmentMemberResp); } From cc405b83e2661042ee123249acd712dd885b680a Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:10:10 +0800 Subject: [PATCH 02/59] organization --- cmd/Open-IM-SDK-Core | 2 +- cmd/open_im_api/main.go | 3 +- cmd/rpc/open_im_organization/Makefile | 25 + cmd/rpc/open_im_organization/main.go | 15 + internal/api/organization/organization.go | 40 +- internal/msg_gateway/gate/rpc_server.go | 2 +- internal/rpc/group/group.go | 18 +- internal/rpc/msg/group_notification.go | 2 +- internal/rpc/organization/organization.go | 252 ++++++++- internal/rpc/user/user.go | 12 +- pkg/base_info/organization_api_struct.go | 9 + pkg/common/db/model_struct.go | 14 +- .../im_mysql_model/organization_model.go | 52 +- pkg/common/token_verify/jwt_token.go | 2 +- pkg/common/utils/utils.go | 2 +- pkg/proto/organization/organization.proto | 25 +- pkg/proto/sdk_ws/ws.pb.go | 522 +++++++++--------- pkg/proto/sdk_ws/ws.proto | 2 +- script/path_info.cfg | 4 +- 19 files changed, 670 insertions(+), 333 deletions(-) create mode 100644 cmd/rpc/open_im_organization/Makefile create mode 100644 cmd/rpc/open_im_organization/main.go diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index a4b710de8..3ecd23203 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit a4b710de8df31fe570fd90895887edef30f3a64c +Subproject commit 3ecd23203cd6bd746b1fcb0c70755bd2cbf5361c diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 1a6a51808..57d534b0c 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -152,7 +152,7 @@ func main() { { organizationGroup.POST("/create_department", organization.CreateDepartment) organizationGroup.POST("/update_department", organization.UpdateDepartment) - organizationGroup.POST("/get_department", organization.GetDepartment) + organizationGroup.POST("/get_department", organization.GetSubDepartment) organizationGroup.POST("/delete_department", organization.DeleteDepartment) organizationGroup.POST("/create_organization_user", organization.CreateOrganizationUser) organizationGroup.POST("/update_organization_user", organization.UpdateOrganizationUser) @@ -161,6 +161,7 @@ func main() { organizationGroup.POST("/update_user_In_department", organization.UpdateUserInDepartment) organizationGroup.POST("/delete_organization_user", organization.DeleteOrganizationUser) organizationGroup.POST("/get_department_member", organization.GetDepartmentMember) + organizationGroup.POST("/delete_user_in_department", organization.DeleteUserInDepartment) } go apiThird.MinioInit() diff --git a/cmd/rpc/open_im_organization/Makefile b/cmd/rpc/open_im_organization/Makefile new file mode 100644 index 000000000..77d658db9 --- /dev/null +++ b/cmd/rpc/open_im_organization/Makefile @@ -0,0 +1,25 @@ +.PHONY: all build run gotool install clean help + +BINARY_NAME=open_im_organization +BIN_DIR=../../../bin/ + +all: gotool build + +build: + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" + +run: + @go run ./ + +gotool: + go fmt ./ + go vet ./ + +install: + make build + mv ${BINARY_NAME} ${BIN_DIR} + +clean: + @if [ -f ${BINARY_NAME} ] ; then rm ${BINARY_NAME} ; fi + + diff --git a/cmd/rpc/open_im_organization/main.go b/cmd/rpc/open_im_organization/main.go new file mode 100644 index 000000000..cb603ca37 --- /dev/null +++ b/cmd/rpc/open_im_organization/main.go @@ -0,0 +1,15 @@ +package main + +import ( + "Open_IM/internal/rpc/group" + "flag" + "fmt" +) + +func main() { + rpcPort := flag.Int("port", 10100, "get RpcOrganizationPort from cmd,default 10100 as port") + flag.Parse() + fmt.Println("start organization rpc server, port: ", *rpcPort) + rpcServer := group.NewGroupServer(*rpcPort) + rpcServer.Run() +} diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 13e1b1c30..338670c45 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -84,14 +84,14 @@ func UpdateDepartment(c *gin.Context) { c.JSON(http.StatusOK, apiResp) } -func GetDepartment(c *gin.Context) { +func GetSubDepartment(c *gin.Context) { params := api.GetDepartmentReq{} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) return } - req := &rpc.GetDepartmentReq{} + req := &rpc.GetSubDepartmentReq{} utils.CopyStructFields(req, ¶ms) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID @@ -105,7 +105,7 @@ func GetDepartment(c *gin.Context) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) client := rpc.NewOrganizationClient(etcdConn) - RpcResp, err := client.GetDepartment(context.Background(), req) + RpcResp, err := client.GetSubDepartment(context.Background(), req) if err != nil { errMsg := "rpc GetDepartment failed " + err.Error() + req.String() log.NewError(req.OperationID, errMsg) @@ -398,3 +398,37 @@ func GetDepartmentMember(c *gin.Context) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) c.JSON(http.StatusOK, apiResp) } + +func DeleteUserInDepartment(c *gin.Context) { + params := api.DeleteUserInDepartmentReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &rpc.DeleteUserInDepartmentReq{} + utils.CopyStructFields(req, ¶ms) + + err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) + req.OpUserID = opUserID + if err != nil { + errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + log.NewError(req.OperationID, errMsg, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewOrganizationClient(etcdConn) + RpcResp, err := client.DeleteUserInDepartment(context.Background(), req) + if err != nil { + errMsg := "rpc DeleteUserInDepartment failed " + err.Error() + req.String() + log.NewError(req.OperationID, errMsg) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) + return + } + + apiResp := api.GetDepartmentMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) + c.JSON(http.StatusOK, apiResp) +} diff --git a/internal/msg_gateway/gate/rpc_server.go b/internal/msg_gateway/gate/rpc_server.go index 4c96b9241..a088303cb 100644 --- a/internal/msg_gateway/gate/rpc_server.go +++ b/internal/msg_gateway/gate/rpc_server.go @@ -101,7 +101,7 @@ func (r *RPCServer) OnlinePushMsg(_ context.Context, in *pbRelay.OnlinePushMsgRe } func (r *RPCServer) GetUsersOnlineStatus(_ context.Context, req *pbRelay.GetUsersOnlineStatusReq) (*pbRelay.GetUsersOnlineStatusResp, error) { log.NewInfo(req.OperationID, "rpc GetUsersOnlineStatus arrived server", req.String()) - if !token_verify.IsMangerUserID(req.OpUserID) { + if !token_verify.IsManagerUserID(req.OpUserID) { log.NewError(req.OperationID, "no permission GetUsersOnlineStatus ", req.OpUserID) return &pbRelay.GetUsersOnlineStatusResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil } diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index b4520e92a..e22ab18bf 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -202,7 +202,7 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.InviteUserToGroupReq) (*pbGroup.InviteUserToGroupResp, error) { log.NewInfo(req.OperationID, "InviteUserToGroup args ", req.String()) - if !imdb.IsExistGroupMember(req.GroupID, req.OpUserID) && !token_verify.IsMangerUserID(req.OpUserID) { + if !imdb.IsExistGroupMember(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { log.NewError(req.OperationID, "no permission InviteUserToGroup ", req.GroupID, req.OpUserID) return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil } @@ -331,7 +331,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou //op is app manager if flag != 1 { - if token_verify.IsMangerUserID(req.OpUserID) { + if token_verify.IsManagerUserID(req.OpUserID) { flag = 1 log.NewDebug(req.OperationID, "is app manager ", req.OpUserID) } @@ -467,8 +467,8 @@ func (s *groupServer) GroupApplicationResponse(_ context.Context, req *pbGroup.G groupRequest.UserID = req.FromUserID groupRequest.HandleUserID = req.OpUserID groupRequest.HandledTime = time.Now() - if !token_verify.IsMangerUserID(req.OpUserID) && !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) { - log.NewError(req.OperationID, "IsMangerUserID IsGroupOwnerAdmin false ", req.GroupID, req.OpUserID) + if !token_verify.IsManagerUserID(req.OpUserID) && !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) { + log.NewError(req.OperationID, "IsManagerUserID IsGroupOwnerAdmin false ", req.GroupID, req.OpUserID) return &pbGroup.GroupApplicationResponseResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } err := imdb.UpdateGroupRequest(groupRequest) @@ -948,7 +948,7 @@ func (s *groupServer) GetUserReqApplicationList(_ context.Context, req *pbGroup. func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGroupReq) (*pbGroup.DismissGroupResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc args ", req.String()) - if !token_verify.IsMangerUserID(req.OpUserID) && !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) { + if !token_verify.IsManagerUserID(req.OpUserID) && !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) { log.NewError(req.OperationID, "verify failed ", req.OpUserID, req.GroupID) return &pbGroup.DismissGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } @@ -977,7 +977,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGroupMemberReq) (*pbGroup.MuteGroupMemberResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc args ", req.String()) - if !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsMangerUserID(req.OpUserID) { + if !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { log.Error(req.OperationID, "verify failed ", req.GroupID, req.UserID) return &pbGroup.MuteGroupMemberResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } @@ -996,7 +996,7 @@ func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGrou func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.CancelMuteGroupMemberReq) (*pbGroup.CancelMuteGroupMemberResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc args ", req.String()) - if !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsMangerUserID(req.OpUserID) { + if !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { log.Error(req.OperationID, "verify failed ", req.OpUserID, req.GroupID) return &pbGroup.CancelMuteGroupMemberResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } @@ -1014,7 +1014,7 @@ func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.Ca func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq) (*pbGroup.MuteGroupResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc args ", req.String()) - if !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsMangerUserID(req.OpUserID) { + if !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { log.Error(req.OperationID, "verify failed ", req.GroupID, req.GroupID) return &pbGroup.MuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } @@ -1030,7 +1030,7 @@ func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq) func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMuteGroupReq) (*pbGroup.CancelMuteGroupResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc args ", req.String()) - if !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsMangerUserID(req.OpUserID) { + if !imdb.IsGroupOwnerAdmin(req.GroupID, req.OpUserID) && !token_verify.IsManagerUserID(req.OpUserID) { log.Error(req.OperationID, "verify failed ", req.OpUserID, req.GroupID) return &pbGroup.CancelMuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } diff --git a/internal/rpc/msg/group_notification.go b/internal/rpc/msg/group_notification.go index d6def3ff2..56052573b 100644 --- a/internal/rpc/msg/group_notification.go +++ b/internal/rpc/msg/group_notification.go @@ -22,7 +22,7 @@ import ( //} creator->group func setOpUserInfo(opUserID, groupID string, groupMemberInfo *open_im_sdk.GroupMemberFullInfo) error { - if token_verify.IsMangerUserID(opUserID) { + if token_verify.IsManagerUserID(opUserID) { u, err := imdb.GetUserByUserID(opUserID) if err != nil { return utils.Wrap(err, "GetUserByUserID failed") diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index c858758f9..ec22e9841 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -69,9 +69,9 @@ func (s *organizationServer) Run() { } func (s *organizationServer) CreateDepartment(ctx context.Context, req *rpc.CreateDepartmentReq) (*rpc.CreateDepartmentResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc args ", req.String()) - if !token_verify.IsMangerUserID(req.OpUserID) { - errMsg := "is not app manger " + req.OpUserID + " " + req.OperationID + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + if !token_verify.IsManagerUserID(req.OpUserID) { + errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) return &rpc.CreateDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil } @@ -81,58 +81,268 @@ func (s *organizationServer) CreateDepartment(ctx context.Context, req *rpc.Crea if department.DepartmentID == "" { department.DepartmentID = utils.Md5(strconv.FormatInt(time.Now().UnixNano(), 10)) } - if imdb.CreateDepartment(&department) != nil { - + log.Debug(req.OperationID, "dst ", department, "src ", req.DepartmentInfo) + if err := imdb.CreateDepartment(&department); err != nil { + errMsg := req.OperationID + " " + "CreateDepartment failed " + err.Error() + log.Error(req.OperationID, errMsg) + return &rpc.CreateDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil } - err, createdDepartment := imdb.GetDepartment(department.DepartmentID) if err != nil { - + errMsg := req.OperationID + " " + "GetDepartment failed " + err.Error() + department.DepartmentID + log.Error(req.OperationID, errMsg) + return &rpc.CreateDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil } + log.Debug(req.OperationID, "GetDepartment ", department.DepartmentID, *createdDepartment) resp := &rpc.CreateDepartmentResp{DepartmentInfo: &open_im_sdk.Department{}} utils.CopyStructFields(resp.DepartmentInfo, createdDepartment) - - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", resp) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp) return resp, nil - } func (s *organizationServer) UpdateDepartment(ctx context.Context, req *rpc.UpdateDepartmentReq) (*rpc.UpdateDepartmentResp, error) { - return nil, nil + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + if !token_verify.IsManagerUserID(req.OpUserID) { + errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + log.Error(req.OperationID, errMsg) + return &rpc.UpdateDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } + + department := db.Department{} + utils.CopyStructFields(&department, req.DepartmentInfo) + + log.Debug(req.OperationID, "dst ", department, "src ", req.DepartmentInfo) + if err := imdb.UpdateDepartment(&department, nil); err != nil { + errMsg := req.OperationID + " " + "UpdateDepartment failed " + err.Error() + log.Error(req.OperationID, errMsg) + return &rpc.UpdateDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + + resp := &rpc.UpdateDepartmentResp{} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp) + return resp, nil } -func (s *organizationServer) GetDepartment(ctx context.Context, req *rpc.GetDepartmentReq) (*rpc.GetDepartmentResp, error) { - return nil, nil +func (s *organizationServer) GetSubDepartment(ctx context.Context, req *rpc.GetSubDepartmentReq) (*rpc.GetSubDepartmentResp, error) { + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + err, departmentList := imdb.GetSubDepartmentList(req.DepartmentID) + if err != nil { + errMsg := req.OperationID + " " + "GetDepartment failed " + err.Error() + log.Error(req.OperationID, errMsg) + return &rpc.GetSubDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + log.Debug(req.OperationID, "GetSubDepartmentList ", req.DepartmentID, departmentList) + resp := &rpc.GetSubDepartmentResp{} + for _, v := range departmentList { + v1 := open_im_sdk.Department{} + utils.CopyStructFields(&v1, v) + log.Debug(req.OperationID, "src ", v, "dst ", v1) + resp.DepartmentList = append(resp.DepartmentList, &v1) + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp) + return resp, nil } func (s *organizationServer) DeleteDepartment(ctx context.Context, req *rpc.DeleteDepartmentReq) (*rpc.DeleteDepartmentResp, error) { - return nil, nil + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + if !token_verify.IsManagerUserID(req.OpUserID) { + errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + log.Error(req.OperationID, errMsg) + return &rpc.DeleteDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } + err := imdb.DeleteDepartment(req.DepartmentID) + if err != nil { + errMsg := req.OperationID + " " + "DeleteDepartment failed " + err.Error() + log.Error(req.OperationID, errMsg, req.DepartmentID) + return &rpc.DeleteDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + log.Debug(req.OperationID, "DeleteDepartment ", req.DepartmentID) + resp := &rpc.DeleteDepartmentResp{} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", resp) + return resp, nil } func (s *organizationServer) CreateOrganizationUser(ctx context.Context, req *rpc.CreateOrganizationUserReq) (*rpc.CreateOrganizationUserResp, error) { - return nil, nil + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + if !token_verify.IsManagerUserID(req.OpUserID) { + errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + log.Error(req.OperationID, errMsg) + return &rpc.CreateOrganizationUserResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } + organizationUser := db.OrganizationUser{} + utils.CopyStructFields(&organizationUser, req.OrganizationUser) + log.Debug(req.OperationID, "src ", *req.OrganizationUser, "dst ", organizationUser) + err := imdb.CreateOrganizationUser(&organizationUser) + if err != nil { + errMsg := req.OperationID + " " + "CreateOrganizationUser failed " + err.Error() + log.Error(req.OperationID, errMsg, organizationUser) + return &rpc.CreateOrganizationUserResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + log.Debug(req.OperationID, "CreateOrganizationUser ", organizationUser) + resp := &rpc.CreateOrganizationUserResp{} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp) + return resp, nil } func (s *organizationServer) UpdateOrganizationUser(ctx context.Context, req *rpc.UpdateOrganizationUserReq) (*rpc.UpdateOrganizationUserResp, error) { - return nil, nil + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + if !token_verify.IsManagerUserID(req.OpUserID) { + errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + log.Error(req.OperationID, errMsg) + return &rpc.UpdateOrganizationUserResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } + organizationUser := db.OrganizationUser{} + utils.CopyStructFields(&organizationUser, req.OrganizationUser) + log.Debug(req.OperationID, "src ", *req.OrganizationUser, "dst ", organizationUser) + err := imdb.UpdateOrganizationUser(&organizationUser, nil) + if err != nil { + errMsg := req.OperationID + " " + "CreateOrganizationUser failed " + err.Error() + log.Error(req.OperationID, errMsg, organizationUser) + return &rpc.UpdateOrganizationUserResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + log.Debug(req.OperationID, "UpdateOrganizationUser ", organizationUser) + resp := &rpc.UpdateOrganizationUserResp{} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", resp) + return resp, nil } func (s *organizationServer) CreateDepartmentMember(ctx context.Context, req *rpc.CreateDepartmentMemberReq) (*rpc.CreateDepartmentMemberResp, error) { - return nil, nil + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + if !token_verify.IsManagerUserID(req.OpUserID) { + errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + log.Error(req.OperationID, errMsg) + return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } + departmentMember := db.DepartmentMember{} + utils.CopyStructFields(&departmentMember, req.UserInDepartment) + log.Debug(req.OperationID, "src ", *req.UserInDepartment, "dst ", departmentMember) + err := imdb.CreateDepartmentMember(&departmentMember) + if err != nil { + errMsg := req.OperationID + " " + "CreateDepartmentMember failed " + err.Error() + log.Error(req.OperationID, errMsg, departmentMember) + return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + log.Debug(req.OperationID, "UpdateOrganizationUser ", departmentMember) + resp := &rpc.CreateDepartmentMemberResp{} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp) + return resp, nil +} + +func (s *organizationServer) GetUserInDepartmentByUserID(userID string) (*open_im_sdk.UserInDepartment, error) { + err, organizationUser := imdb.GetOrganizationUser(userID) + if err != nil { + return nil, utils.Wrap(err, "GetOrganizationUser failed") + } + err, departmentMemberList := imdb.GetUserInDepartment(userID) + if err != nil { + return nil, utils.Wrap(err, "GetUserInDepartment failed") + } + resp := &open_im_sdk.UserInDepartment{OrganizationUser: &open_im_sdk.OrganizationUser{}} + utils.CopyStructFields(resp.OrganizationUser, organizationUser) + for _, v := range departmentMemberList { + v1 := open_im_sdk.DepartmentMember{} + utils.CopyStructFields(&v1, v) + resp.DepartmentMemberList = append(resp.DepartmentMemberList, &v1) + } + return resp, nil } func (s *organizationServer) GetUserInDepartment(ctx context.Context, req *rpc.GetUserInDepartmentReq) (*rpc.GetUserInDepartmentResp, error) { - return nil, nil + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + r, err := s.GetUserInDepartmentByUserID(req.UserID) + if err != nil { + errMsg := req.OperationID + " " + "GetUserInDepartmentByUserID failed " + err.Error() + log.Error(req.OperationID, errMsg, req.UserID) + return &rpc.GetUserInDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + log.Debug(req.OperationID, "GetUserInDepartmentByUserID success ", req.UserID, r) + resp := rpc.GetUserInDepartmentResp{UserInDepartment: &open_im_sdk.UserInDepartment{OrganizationUser: &open_im_sdk.OrganizationUser{}}} + resp.UserInDepartment.DepartmentMemberList = r.DepartmentMemberList + resp.UserInDepartment.OrganizationUser = r.OrganizationUser + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", resp) + return &resp, nil } func (s *organizationServer) UpdateUserInDepartment(ctx context.Context, req *rpc.UpdateUserInDepartmentReq) (*rpc.UpdateUserInDepartmentResp, error) { - return nil, nil + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + if !token_verify.IsManagerUserID(req.OpUserID) { + errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + log.Error(req.OperationID, errMsg) + return &rpc.UpdateUserInDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } + departmentMember := &db.DepartmentMember{} + utils.CopyStructFields(departmentMember, req.DepartmentMember) + log.Debug(req.OperationID, "dst ", departmentMember, "src ", req.DepartmentMember) + err := imdb.UpdateUserInDepartment(departmentMember, nil) + if err != nil { + errMsg := req.OperationID + " " + "UpdateUserInDepartment failed " + err.Error() + log.Error(req.OperationID, errMsg, *departmentMember) + return &rpc.UpdateUserInDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + resp := &rpc.UpdateUserInDepartmentResp{} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp) + return resp, nil +} + +func (s *organizationServer) DeleteUserInDepartment(ctx context.Context, req *rpc.DeleteUserInDepartmentReq) (*rpc.DeleteUserInDepartmentResp, error) { + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + if !token_verify.IsManagerUserID(req.OpUserID) { + errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + log.Error(req.OperationID, errMsg) + return &rpc.DeleteUserInDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } + + err := imdb.DeleteUserInDepartment(req.DepartmentID, req.UserID) + if err != nil { + errMsg := req.OperationID + " " + "DeleteUserInDepartment failed " + err.Error() + log.Error(req.OperationID, errMsg, req.DepartmentID, req.UserID) + return &rpc.DeleteUserInDepartmentResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + log.Debug(req.OperationID, "DeleteUserInDepartment success ", req.DepartmentID, req.UserID) + resp := &rpc.DeleteUserInDepartmentResp{} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp) + return resp, nil } func (s *organizationServer) DeleteOrganizationUser(ctx context.Context, req *rpc.DeleteOrganizationUserReq) (*rpc.DeleteOrganizationUserResp, error) { - return nil, nil + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + if !token_verify.IsManagerUserID(req.OpUserID) { + errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + log.Error(req.OperationID, errMsg) + return &rpc.DeleteOrganizationUserResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } + err := imdb.DeleteOrganizationUser(req.UserID) + if err != nil { + errMsg := req.OperationID + " " + "DeleteOrganizationUser failed " + err.Error() + log.Error(req.OperationID, errMsg, req.UserID) + return &rpc.DeleteOrganizationUserResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + log.Debug(req.OperationID, "DeleteOrganizationUser success ", req.UserID) + resp := &rpc.DeleteOrganizationUserResp{} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp) + return resp, nil } func (s *organizationServer) GetDepartmentMember(ctx context.Context, req *rpc.GetDepartmentMemberReq) (*rpc.GetDepartmentMemberResp, error) { - return nil, nil + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) + err, departmentMemberUserIDList := imdb.GetDepartmentMemberUserIDList(req.DepartmentID) + if err != nil { + errMsg := req.OperationID + " " + "GetDepartmentMemberUserIDList failed " + err.Error() + log.Error(req.OperationID, errMsg, req.DepartmentID) + return &rpc.GetDepartmentMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + } + + resp := rpc.GetDepartmentMemberResp{} + for _, v := range departmentMemberUserIDList { + r, err := s.GetUserInDepartmentByUserID(v) + if err != nil { + log.Error(req.OperationID, "GetUserInDepartmentByUserID failed ", err.Error()) + continue + } + log.Debug(req.OperationID, "GetUserInDepartmentByUserID success ", *r) + resp.UserInDepartmentList = append(resp.UserInDepartmentList, r) + } + + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", resp) + return &resp, nil } diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 8e57ba2bf..1234b2be9 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -278,8 +278,8 @@ func (s *userServer) SetRecvMsgOpt(ctx context.Context, req *pbUser.SetRecvMsgOp func (s *userServer) DeleteUsers(_ context.Context, req *pbUser.DeleteUsersReq) (*pbUser.DeleteUsersResp, error) { log.NewInfo(req.OperationID, "DeleteUsers args ", req.String()) - if !token_verify.IsMangerUserID(req.OpUserID) { - log.NewError(req.OperationID, "IsMangerUserID false ", req.OpUserID) + if !token_verify.IsManagerUserID(req.OpUserID) { + log.NewError(req.OperationID, "IsManagerUserID false ", req.OpUserID) return &pbUser.DeleteUsersResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, FailedUserIDList: req.DeleteUserIDList}, nil } var common pbUser.CommonResp @@ -299,8 +299,8 @@ func (s *userServer) DeleteUsers(_ context.Context, req *pbUser.DeleteUsersReq) func (s *userServer) GetAllUserID(_ context.Context, req *pbUser.GetAllUserIDReq) (*pbUser.GetAllUserIDResp, error) { log.NewInfo(req.OperationID, "GetAllUserID args ", req.String()) - if !token_verify.IsMangerUserID(req.OpUserID) { - log.NewError(req.OperationID, "IsMangerUserID false ", req.OpUserID) + if !token_verify.IsManagerUserID(req.OpUserID) { + log.NewError(req.OperationID, "IsManagerUserID false ", req.OpUserID) return &pbUser.GetAllUserIDResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } uidList, err := imdb.SelectAllUserID() @@ -315,8 +315,8 @@ func (s *userServer) GetAllUserID(_ context.Context, req *pbUser.GetAllUserIDReq func (s *userServer) AccountCheck(_ context.Context, req *pbUser.AccountCheckReq) (*pbUser.AccountCheckResp, error) { log.NewInfo(req.OperationID, "AccountCheck args ", req.String()) - if !token_verify.IsMangerUserID(req.OpUserID) { - log.NewError(req.OperationID, "IsMangerUserID false ", req.OpUserID) + if !token_verify.IsManagerUserID(req.OpUserID) { + log.NewError(req.OperationID, "IsManagerUserID false ", req.OpUserID) return &pbUser.AccountCheckResp{CommonResp: &pbUser.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil } uidList, err := imdb.SelectSomeUserID(req.CheckUserIDList) diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index e84425250..0289b2f81 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -99,3 +99,12 @@ type GetDepartmentMemberResp struct { UserInDepartmentList []*open_im_sdk.UserInDepartment `json:"-"` Data []map[string]interface{} `json:"data"` } + +type DeleteUserInDepartmentReq struct { + DepartmentID string `json:"departmentID" binding:"required"` + UserID string `json:"userID" binding:"required"` + OperationID string `json:"operationID" binding:"required"` +} +type DeleteUserInDepartmentResp struct { + CommResp +} diff --git a/pkg/common/db/model_struct.go b/pkg/common/db/model_struct.go index 64780cb55..9591050e0 100644 --- a/pkg/common/db/model_struct.go +++ b/pkg/common/db/model_struct.go @@ -227,9 +227,9 @@ type Department struct { DepartmentID string `gorm:"column:department_id;primary_key;size:64" json:"departmentID"` FaceURL string `gorm:"column:face_url;size:255" json:"faceURL"` Name string `gorm:"column:name;size:256" json:"name" binding:"required"` - ParentID string `gorm:"column:parent_id;size:64" json:"parentID" binding:"required"` - Order int32 `gorm:"column:order" json:"order" ` - DepartmentType int32 `gorm:"column:department_type" json:"departmentType"` + ParentID string `gorm:"column:parent_id;size:64" json:"parentID" binding:"required"` // "0" or Real parent id + Order int32 `gorm:"column:order" json:"order" ` // 1, 2, ... + DepartmentType int32 `gorm:"column:department_type" json:"departmentType"` //1, 2... CreateTime time.Time `gorm:"column:create_time" json:"createTime"` Ex string `gorm:"column:ex;type:varchar(1024)" json:"ex"` } @@ -243,7 +243,7 @@ type OrganizationUser struct { Nickname string `gorm:"column:nickname;size:256"` EnglishName string `gorm:"column:english_name;size:256"` FaceURL string `gorm:"column:face_url;size:256"` - Gender int32 `gorm:"column:gender"` + Gender int32 `gorm:"column:gender"` //1 ,2 Mobile string `gorm:"column:mobile;size:32"` Telephone string `gorm:"column:telephone;size:32"` Birth time.Time `gorm:"column:birth"` @@ -259,10 +259,10 @@ func (OrganizationUser) TableName() string { type DepartmentMember struct { UserID string `gorm:"column:user_id;primary_key;size:64"` DepartmentID string `gorm:"column:department_id;primary_key;size:64"` - Order int32 `gorm:"column:order" json:"order"` + Order int32 `gorm:"column:order" json:"order"` //1,2 Position string `gorm:"column:position;size:256" json:"position"` - Leader int32 `gorm:"column:leader" json:"leader"` - Status int32 `gorm:"column:status" json:"status"` + Leader int32 `gorm:"column:leader" json:"leader"` //-1, 1 + Status int32 `gorm:"column:status" json:"status"` //-1, 1 CreateTime time.Time `gorm:"column:create_time"` Ex string `gorm:"column:ex;type:varchar(1024)" json:"ex"` } diff --git a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go index bdb595e3f..bf44972ab 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go @@ -2,7 +2,6 @@ package im_mysql_model import ( "Open_IM/pkg/common/db" - "errors" "time" ) @@ -72,6 +71,16 @@ func CreateOrganizationUser(organizationUser *db.OrganizationUser) error { return dbConn.Table("organization_users").Create(organizationUser).Error } +func GetOrganizationUser(userID string) (error, *db.OrganizationUser) { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err, nil + } + organizationUser := db.OrganizationUser{} + err = dbConn.Table("organization_users").Where("user_id=?", userID).Take(&organizationUser).Error + return err, &organizationUser +} + func UpdateOrganizationUser(organizationUser *db.OrganizationUser, args map[string]interface{}) error { dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { @@ -101,25 +110,34 @@ func GetUserInDepartment(userID string) (error, []db.DepartmentMember) { return err, nil } var departmentMemberList []db.DepartmentMember - err = dbConn.Table("department_members").Where("user_id=?", userID).Find(&departmentMemberList).Error + err = dbConn.Table("department_members").Where("user_id=?", userID).Take(&departmentMemberList).Error return err, departmentMemberList } -func UpdateUserInDepartment(userInDepartmentList []db.DepartmentMember) error { - if len(userInDepartmentList) == 0 { - return errors.New("args failed") - } - if err := DeleteUserInAllDepartment(userInDepartmentList[0].UserID); err != nil { +func UpdateUserInDepartment(departmentMember *db.DepartmentMember, args map[string]interface{}) error { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { return err } - for _, v := range userInDepartmentList { - if err := CreateDepartmentMember(&v); err != nil { - return err - } + if err = dbConn.Table("department_members").Where("department_id=? ADN user_id=?", departmentMember.DepartmentID, departmentMember.UserID). + Updates(departmentMember).Error; err != nil { + return err + } + if args != nil { + return dbConn.Table("department_members").Where("department_id=? ADN user_id=?", departmentMember.DepartmentID, departmentMember.UserID). + Updates(args).Error } return nil } +func DeleteUserInDepartment(departmentID, userID string) error { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err + } + return dbConn.Table("department_members").Where("department_id=? ADN user_id=?", departmentID, userID).Delete(db.DepartmentMember{}).Error +} + func DeleteUserInAllDepartment(userID string) error { dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { @@ -140,13 +158,21 @@ func DeleteOrganizationUser(OrganizationUserID string) error { } func GetDepartmentMemberUserIDList(departmentID string) (error, []string) { + //dbConn, err := db.DB.MysqlDB.DefaultGormDB() + //if err != nil { + // return err + //} + //return dbConn.Table("department_members").Where("user_id=?", userID).Delete(db.DepartmentMember{}).Error + dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { return err, nil } var departmentMemberList []db.DepartmentMember - err = dbConn.Table("department_members").Where("department_id=?", departmentID).Find(&departmentMemberList).Error - + err = dbConn.Table("department_members").Where("department_id=?", departmentID).Take(&departmentMemberList).Error + if err != nil { + return err, nil + } var userIDList []string = make([]string, 0) for _, v := range departmentMemberList { userIDList = append(userIDList, v.UserID) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index f362ef42c..1f9cdd66f 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -111,7 +111,7 @@ func IsAppManagerAccess(token string, OpUserID string) bool { return false } -func IsMangerUserID(OpUserID string) bool { +func IsManagerUserID(OpUserID string) bool { if utils.IsContain(OpUserID, config.Config.Manager.AppManagerUid) { return true } else { diff --git a/pkg/common/utils/utils.go b/pkg/common/utils/utils.go index 5c317e4c9..003f659a9 100644 --- a/pkg/common/utils/utils.go +++ b/pkg/common/utils/utils.go @@ -107,7 +107,7 @@ func GroupMemberOpenIMCopyDB(dst *db.GroupMember, src *open_im_sdk.GroupMemberFu func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src *db.GroupMember) error { utils.CopyStructFields(dst, src) - if token_verify.IsMangerUserID(src.UserID) { + if token_verify.IsManagerUserID(src.UserID) { u, err := imdb.GetUserByUserID(src.UserID) if err != nil { return utils.Wrap(err, "") diff --git a/pkg/proto/organization/organization.proto b/pkg/proto/organization/organization.proto index 67d2b7a8e..343ac43ea 100644 --- a/pkg/proto/organization/organization.proto +++ b/pkg/proto/organization/organization.proto @@ -28,13 +28,13 @@ message UpdateDepartmentResp{ } -message GetDepartmentReq{ +message GetSubDepartmentReq{ string departmentID = 1; string operationID = 2; string opUserID = 3; } -message GetDepartmentResp{ +message GetSubDepartmentResp{ int32 errCode = 1; string errMsg = 2; repeated server_api_params.Department departmentList = 3; @@ -104,7 +104,7 @@ message GetUserInDepartmentResp{ message UpdateUserInDepartmentReq{ - server_api_params.UserInDepartment userInDepartment = 1; + server_api_params.DepartmentMember departmentMember = 1; string operationID = 2; string opUserID = 3; } @@ -114,6 +114,17 @@ message UpdateUserInDepartmentResp{ } +message DeleteUserInDepartmentReq{ + string userID = 1; + string operationID = 2; + string opUserID = 3; + string departmentID = 4; +} +message DeleteUserInDepartmentResp{ + int32 errCode = 1; + string errMsg = 2; +} + message DeleteOrganizationUserReq{ string userID = 1; string operationID = 2; @@ -141,14 +152,18 @@ message GetDepartmentMemberResp{ service organization{ rpc CreateDepartment(CreateDepartmentReq) returns(CreateDepartmentResp); rpc UpdateDepartment(UpdateDepartmentReq) returns(UpdateDepartmentResp); - rpc GetDepartment(GetDepartmentReq) returns(GetDepartmentResp); + rpc GetSubDepartment(GetSubDepartmentReq) returns(GetSubDepartmentResp); rpc DeleteDepartment(DeleteDepartmentReq) returns(DeleteDepartmentResp); + rpc CreateOrganizationUser(CreateOrganizationUserReq) returns(CreateOrganizationUserResp); rpc UpdateOrganizationUser(UpdateOrganizationUserReq) returns(UpdateOrganizationUserResp); + rpc DeleteOrganizationUser(DeleteOrganizationUserReq) returns(DeleteOrganizationUserResp); + + rpc CreateDepartmentMember(CreateDepartmentMemberReq) returns(CreateDepartmentMemberResp); rpc GetUserInDepartment(GetUserInDepartmentReq) returns(GetUserInDepartmentResp); + rpc DeleteUserInDepartment(DeleteUserInDepartmentReq) returns(DeleteUserInDepartmentResp); rpc UpdateUserInDepartment(UpdateUserInDepartmentReq) returns(UpdateUserInDepartmentResp); - rpc DeleteOrganizationUser(DeleteOrganizationUserReq) returns(DeleteOrganizationUserResp); rpc GetDepartmentMember(GetDepartmentMemberReq) returns(GetDepartmentMemberResp); } diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index 6e29ab2d8..27901e90f 100644 --- a/pkg/proto/sdk_ws/ws.pb.go +++ b/pkg/proto/sdk_ws/ws.pb.go @@ -40,7 +40,7 @@ func (m *GroupInfo) Reset() { *m = GroupInfo{} } func (m *GroupInfo) String() string { return proto.CompactTextString(m) } func (*GroupInfo) ProtoMessage() {} func (*GroupInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{0} + return fileDescriptor_ws_822d08ca95807876, []int{0} } func (m *GroupInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfo.Unmarshal(m, b) @@ -165,7 +165,7 @@ func (m *GroupMemberFullInfo) Reset() { *m = GroupMemberFullInfo{} } func (m *GroupMemberFullInfo) String() string { return proto.CompactTextString(m) } func (*GroupMemberFullInfo) ProtoMessage() {} func (*GroupMemberFullInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{1} + return fileDescriptor_ws_822d08ca95807876, []int{1} } func (m *GroupMemberFullInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberFullInfo.Unmarshal(m, b) @@ -277,7 +277,7 @@ func (m *PublicUserInfo) Reset() { *m = PublicUserInfo{} } func (m *PublicUserInfo) String() string { return proto.CompactTextString(m) } func (*PublicUserInfo) ProtoMessage() {} func (*PublicUserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{2} + return fileDescriptor_ws_822d08ca95807876, []int{2} } func (m *PublicUserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PublicUserInfo.Unmarshal(m, b) @@ -352,7 +352,7 @@ func (m *UserInfo) Reset() { *m = UserInfo{} } func (m *UserInfo) String() string { return proto.CompactTextString(m) } func (*UserInfo) ProtoMessage() {} func (*UserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{3} + return fileDescriptor_ws_822d08ca95807876, []int{3} } func (m *UserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfo.Unmarshal(m, b) @@ -459,7 +459,7 @@ func (m *FriendInfo) Reset() { *m = FriendInfo{} } func (m *FriendInfo) String() string { return proto.CompactTextString(m) } func (*FriendInfo) ProtoMessage() {} func (*FriendInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{4} + return fileDescriptor_ws_822d08ca95807876, []int{4} } func (m *FriendInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfo.Unmarshal(m, b) @@ -544,7 +544,7 @@ func (m *BlackInfo) Reset() { *m = BlackInfo{} } func (m *BlackInfo) String() string { return proto.CompactTextString(m) } func (*BlackInfo) ProtoMessage() {} func (*BlackInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{5} + return fileDescriptor_ws_822d08ca95807876, []int{5} } func (m *BlackInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackInfo.Unmarshal(m, b) @@ -625,7 +625,7 @@ func (m *GroupRequest) Reset() { *m = GroupRequest{} } func (m *GroupRequest) String() string { return proto.CompactTextString(m) } func (*GroupRequest) ProtoMessage() {} func (*GroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{6} + return fileDescriptor_ws_822d08ca95807876, []int{6} } func (m *GroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupRequest.Unmarshal(m, b) @@ -733,7 +733,7 @@ func (m *FriendRequest) Reset() { *m = FriendRequest{} } func (m *FriendRequest) String() string { return proto.CompactTextString(m) } func (*FriendRequest) ProtoMessage() {} func (*FriendRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{7} + return fileDescriptor_ws_822d08ca95807876, []int{7} } func (m *FriendRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendRequest.Unmarshal(m, b) @@ -878,7 +878,7 @@ func (m *Department) Reset() { *m = Department{} } func (m *Department) String() string { return proto.CompactTextString(m) } func (*Department) ProtoMessage() {} func (*Department) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{8} + return fileDescriptor_ws_822d08ca95807876, []int{8} } func (m *Department) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Department.Unmarshal(m, b) @@ -989,7 +989,7 @@ func (m *OrganizationUser) Reset() { *m = OrganizationUser{} } func (m *OrganizationUser) String() string { return proto.CompactTextString(m) } func (*OrganizationUser) ProtoMessage() {} func (*OrganizationUser) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{9} + return fileDescriptor_ws_822d08ca95807876, []int{9} } func (m *OrganizationUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OrganizationUser.Unmarshal(m, b) @@ -1103,7 +1103,7 @@ func (m *DepartmentMember) Reset() { *m = DepartmentMember{} } func (m *DepartmentMember) String() string { return proto.CompactTextString(m) } func (*DepartmentMember) ProtoMessage() {} func (*DepartmentMember) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{10} + return fileDescriptor_ws_822d08ca95807876, []int{10} } func (m *DepartmentMember) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DepartmentMember.Unmarshal(m, b) @@ -1173,7 +1173,7 @@ func (m *DepartmentMember) GetEx() string { } type UserInDepartment struct { - DepartmentUser *OrganizationUser `protobuf:"bytes,1,opt,name=departmentUser" json:"departmentUser,omitempty"` + OrganizationUser *OrganizationUser `protobuf:"bytes,1,opt,name=organizationUser" json:"organizationUser,omitempty"` DepartmentMemberList []*DepartmentMember `protobuf:"bytes,2,rep,name=departmentMemberList" json:"departmentMemberList,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -1184,7 +1184,7 @@ func (m *UserInDepartment) Reset() { *m = UserInDepartment{} } func (m *UserInDepartment) String() string { return proto.CompactTextString(m) } func (*UserInDepartment) ProtoMessage() {} func (*UserInDepartment) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{11} + return fileDescriptor_ws_822d08ca95807876, []int{11} } func (m *UserInDepartment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInDepartment.Unmarshal(m, b) @@ -1204,9 +1204,9 @@ func (m *UserInDepartment) XXX_DiscardUnknown() { var xxx_messageInfo_UserInDepartment proto.InternalMessageInfo -func (m *UserInDepartment) GetDepartmentUser() *OrganizationUser { +func (m *UserInDepartment) GetOrganizationUser() *OrganizationUser { if m != nil { - return m.DepartmentUser + return m.OrganizationUser } return nil } @@ -1231,7 +1231,7 @@ func (m *PullMessageBySeqListResp) Reset() { *m = PullMessageBySeqListRe func (m *PullMessageBySeqListResp) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListResp) ProtoMessage() {} func (*PullMessageBySeqListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{12} + return fileDescriptor_ws_822d08ca95807876, []int{12} } func (m *PullMessageBySeqListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListResp.Unmarshal(m, b) @@ -1285,7 +1285,7 @@ func (m *PullMessageBySeqListReq) Reset() { *m = PullMessageBySeqListReq func (m *PullMessageBySeqListReq) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListReq) ProtoMessage() {} func (*PullMessageBySeqListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{13} + return fileDescriptor_ws_822d08ca95807876, []int{13} } func (m *PullMessageBySeqListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListReq.Unmarshal(m, b) @@ -1336,7 +1336,7 @@ func (m *GetMaxAndMinSeqReq) Reset() { *m = GetMaxAndMinSeqReq{} } func (m *GetMaxAndMinSeqReq) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqReq) ProtoMessage() {} func (*GetMaxAndMinSeqReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{14} + return fileDescriptor_ws_822d08ca95807876, []int{14} } func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b) @@ -1368,7 +1368,7 @@ func (m *GetMaxAndMinSeqResp) Reset() { *m = GetMaxAndMinSeqResp{} } func (m *GetMaxAndMinSeqResp) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqResp) ProtoMessage() {} func (*GetMaxAndMinSeqResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{15} + return fileDescriptor_ws_822d08ca95807876, []int{15} } func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b) @@ -1415,7 +1415,7 @@ func (m *UserSendMsgResp) Reset() { *m = UserSendMsgResp{} } func (m *UserSendMsgResp) String() string { return proto.CompactTextString(m) } func (*UserSendMsgResp) ProtoMessage() {} func (*UserSendMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{16} + return fileDescriptor_ws_822d08ca95807876, []int{16} } func (m *UserSendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserSendMsgResp.Unmarshal(m, b) @@ -1484,7 +1484,7 @@ func (m *MsgData) Reset() { *m = MsgData{} } func (m *MsgData) String() string { return proto.CompactTextString(m) } func (*MsgData) ProtoMessage() {} func (*MsgData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{17} + return fileDescriptor_ws_822d08ca95807876, []int{17} } func (m *MsgData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgData.Unmarshal(m, b) @@ -1645,7 +1645,7 @@ func (m *OfflinePushInfo) Reset() { *m = OfflinePushInfo{} } func (m *OfflinePushInfo) String() string { return proto.CompactTextString(m) } func (*OfflinePushInfo) ProtoMessage() {} func (*OfflinePushInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{18} + return fileDescriptor_ws_822d08ca95807876, []int{18} } func (m *OfflinePushInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OfflinePushInfo.Unmarshal(m, b) @@ -1713,7 +1713,7 @@ func (m *TipsComm) Reset() { *m = TipsComm{} } func (m *TipsComm) String() string { return proto.CompactTextString(m) } func (*TipsComm) ProtoMessage() {} func (*TipsComm) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{19} + return fileDescriptor_ws_822d08ca95807876, []int{19} } func (m *TipsComm) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TipsComm.Unmarshal(m, b) @@ -1770,7 +1770,7 @@ func (m *GroupCreatedTips) Reset() { *m = GroupCreatedTips{} } func (m *GroupCreatedTips) String() string { return proto.CompactTextString(m) } func (*GroupCreatedTips) ProtoMessage() {} func (*GroupCreatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{20} + return fileDescriptor_ws_822d08ca95807876, []int{20} } func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b) @@ -1839,7 +1839,7 @@ func (m *GroupInfoSetTips) Reset() { *m = GroupInfoSetTips{} } func (m *GroupInfoSetTips) String() string { return proto.CompactTextString(m) } func (*GroupInfoSetTips) ProtoMessage() {} func (*GroupInfoSetTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{21} + return fileDescriptor_ws_822d08ca95807876, []int{21} } func (m *GroupInfoSetTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfoSetTips.Unmarshal(m, b) @@ -1894,7 +1894,7 @@ func (m *JoinGroupApplicationTips) Reset() { *m = JoinGroupApplicationTi func (m *JoinGroupApplicationTips) String() string { return proto.CompactTextString(m) } func (*JoinGroupApplicationTips) ProtoMessage() {} func (*JoinGroupApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{22} + return fileDescriptor_ws_822d08ca95807876, []int{22} } func (m *JoinGroupApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupApplicationTips.Unmarshal(m, b) @@ -1950,7 +1950,7 @@ func (m *MemberQuitTips) Reset() { *m = MemberQuitTips{} } func (m *MemberQuitTips) String() string { return proto.CompactTextString(m) } func (*MemberQuitTips) ProtoMessage() {} func (*MemberQuitTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{23} + return fileDescriptor_ws_822d08ca95807876, []int{23} } func (m *MemberQuitTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberQuitTips.Unmarshal(m, b) @@ -2005,7 +2005,7 @@ func (m *GroupApplicationAcceptedTips) Reset() { *m = GroupApplicationAc func (m *GroupApplicationAcceptedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationAcceptedTips) ProtoMessage() {} func (*GroupApplicationAcceptedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{24} + return fileDescriptor_ws_822d08ca95807876, []int{24} } func (m *GroupApplicationAcceptedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationAcceptedTips.Unmarshal(m, b) @@ -2060,7 +2060,7 @@ func (m *GroupApplicationRejectedTips) Reset() { *m = GroupApplicationRe func (m *GroupApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationRejectedTips) ProtoMessage() {} func (*GroupApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{25} + return fileDescriptor_ws_822d08ca95807876, []int{25} } func (m *GroupApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationRejectedTips.Unmarshal(m, b) @@ -2116,7 +2116,7 @@ func (m *GroupOwnerTransferredTips) Reset() { *m = GroupOwnerTransferred func (m *GroupOwnerTransferredTips) String() string { return proto.CompactTextString(m) } func (*GroupOwnerTransferredTips) ProtoMessage() {} func (*GroupOwnerTransferredTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{26} + return fileDescriptor_ws_822d08ca95807876, []int{26} } func (m *GroupOwnerTransferredTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupOwnerTransferredTips.Unmarshal(m, b) @@ -2179,7 +2179,7 @@ func (m *MemberKickedTips) Reset() { *m = MemberKickedTips{} } func (m *MemberKickedTips) String() string { return proto.CompactTextString(m) } func (*MemberKickedTips) ProtoMessage() {} func (*MemberKickedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{27} + return fileDescriptor_ws_822d08ca95807876, []int{27} } func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b) @@ -2242,7 +2242,7 @@ func (m *MemberInvitedTips) Reset() { *m = MemberInvitedTips{} } func (m *MemberInvitedTips) String() string { return proto.CompactTextString(m) } func (*MemberInvitedTips) ProtoMessage() {} func (*MemberInvitedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{28} + return fileDescriptor_ws_822d08ca95807876, []int{28} } func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b) @@ -2304,7 +2304,7 @@ func (m *MemberEnterTips) Reset() { *m = MemberEnterTips{} } func (m *MemberEnterTips) String() string { return proto.CompactTextString(m) } func (*MemberEnterTips) ProtoMessage() {} func (*MemberEnterTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{29} + return fileDescriptor_ws_822d08ca95807876, []int{29} } func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b) @@ -2358,7 +2358,7 @@ func (m *GroupDismissedTips) Reset() { *m = GroupDismissedTips{} } func (m *GroupDismissedTips) String() string { return proto.CompactTextString(m) } func (*GroupDismissedTips) ProtoMessage() {} func (*GroupDismissedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{30} + return fileDescriptor_ws_822d08ca95807876, []int{30} } func (m *GroupDismissedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupDismissedTips.Unmarshal(m, b) @@ -2414,7 +2414,7 @@ func (m *GroupMemberMutedTips) Reset() { *m = GroupMemberMutedTips{} } func (m *GroupMemberMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberMutedTips) ProtoMessage() {} func (*GroupMemberMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{31} + return fileDescriptor_ws_822d08ca95807876, []int{31} } func (m *GroupMemberMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberMutedTips.Unmarshal(m, b) @@ -2483,7 +2483,7 @@ func (m *GroupMemberCancelMutedTips) Reset() { *m = GroupMemberCancelMut func (m *GroupMemberCancelMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberCancelMutedTips) ProtoMessage() {} func (*GroupMemberCancelMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{32} + return fileDescriptor_ws_822d08ca95807876, []int{32} } func (m *GroupMemberCancelMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberCancelMutedTips.Unmarshal(m, b) @@ -2544,7 +2544,7 @@ func (m *GroupMutedTips) Reset() { *m = GroupMutedTips{} } func (m *GroupMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMutedTips) ProtoMessage() {} func (*GroupMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{33} + return fileDescriptor_ws_822d08ca95807876, []int{33} } func (m *GroupMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMutedTips.Unmarshal(m, b) @@ -2598,7 +2598,7 @@ func (m *GroupCancelMutedTips) Reset() { *m = GroupCancelMutedTips{} } func (m *GroupCancelMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupCancelMutedTips) ProtoMessage() {} func (*GroupCancelMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{34} + return fileDescriptor_ws_822d08ca95807876, []int{34} } func (m *GroupCancelMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCancelMutedTips.Unmarshal(m, b) @@ -2652,7 +2652,7 @@ func (m *FriendApplication) Reset() { *m = FriendApplication{} } func (m *FriendApplication) String() string { return proto.CompactTextString(m) } func (*FriendApplication) ProtoMessage() {} func (*FriendApplication) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{35} + return fileDescriptor_ws_822d08ca95807876, []int{35} } func (m *FriendApplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplication.Unmarshal(m, b) @@ -2705,7 +2705,7 @@ func (m *FromToUserID) Reset() { *m = FromToUserID{} } func (m *FromToUserID) String() string { return proto.CompactTextString(m) } func (*FromToUserID) ProtoMessage() {} func (*FromToUserID) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{36} + return fileDescriptor_ws_822d08ca95807876, []int{36} } func (m *FromToUserID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FromToUserID.Unmarshal(m, b) @@ -2751,7 +2751,7 @@ func (m *FriendApplicationTips) Reset() { *m = FriendApplicationTips{} } func (m *FriendApplicationTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationTips) ProtoMessage() {} func (*FriendApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{37} + return fileDescriptor_ws_822d08ca95807876, []int{37} } func (m *FriendApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationTips.Unmarshal(m, b) @@ -2791,7 +2791,7 @@ func (m *FriendApplicationApprovedTips) Reset() { *m = FriendApplication func (m *FriendApplicationApprovedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationApprovedTips) ProtoMessage() {} func (*FriendApplicationApprovedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{38} + return fileDescriptor_ws_822d08ca95807876, []int{38} } func (m *FriendApplicationApprovedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationApprovedTips.Unmarshal(m, b) @@ -2838,7 +2838,7 @@ func (m *FriendApplicationRejectedTips) Reset() { *m = FriendApplication func (m *FriendApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationRejectedTips) ProtoMessage() {} func (*FriendApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{39} + return fileDescriptor_ws_822d08ca95807876, []int{39} } func (m *FriendApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationRejectedTips.Unmarshal(m, b) @@ -2886,7 +2886,7 @@ func (m *FriendAddedTips) Reset() { *m = FriendAddedTips{} } func (m *FriendAddedTips) String() string { return proto.CompactTextString(m) } func (*FriendAddedTips) ProtoMessage() {} func (*FriendAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{40} + return fileDescriptor_ws_822d08ca95807876, []int{40} } func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b) @@ -2939,7 +2939,7 @@ func (m *FriendDeletedTips) Reset() { *m = FriendDeletedTips{} } func (m *FriendDeletedTips) String() string { return proto.CompactTextString(m) } func (*FriendDeletedTips) ProtoMessage() {} func (*FriendDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{41} + return fileDescriptor_ws_822d08ca95807876, []int{41} } func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b) @@ -2977,7 +2977,7 @@ func (m *BlackAddedTips) Reset() { *m = BlackAddedTips{} } func (m *BlackAddedTips) String() string { return proto.CompactTextString(m) } func (*BlackAddedTips) ProtoMessage() {} func (*BlackAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{42} + return fileDescriptor_ws_822d08ca95807876, []int{42} } func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b) @@ -3015,7 +3015,7 @@ func (m *BlackDeletedTips) Reset() { *m = BlackDeletedTips{} } func (m *BlackDeletedTips) String() string { return proto.CompactTextString(m) } func (*BlackDeletedTips) ProtoMessage() {} func (*BlackDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{43} + return fileDescriptor_ws_822d08ca95807876, []int{43} } func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b) @@ -3053,7 +3053,7 @@ func (m *FriendInfoChangedTips) Reset() { *m = FriendInfoChangedTips{} } func (m *FriendInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*FriendInfoChangedTips) ProtoMessage() {} func (*FriendInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{44} + return fileDescriptor_ws_822d08ca95807876, []int{44} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -3092,7 +3092,7 @@ func (m *UserInfoUpdatedTips) Reset() { *m = UserInfoUpdatedTips{} } func (m *UserInfoUpdatedTips) String() string { return proto.CompactTextString(m) } func (*UserInfoUpdatedTips) ProtoMessage() {} func (*UserInfoUpdatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{45} + return fileDescriptor_ws_822d08ca95807876, []int{45} } func (m *UserInfoUpdatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfoUpdatedTips.Unmarshal(m, b) @@ -3131,7 +3131,7 @@ func (m *ConversationUpdateTips) Reset() { *m = ConversationUpdateTips{} func (m *ConversationUpdateTips) String() string { return proto.CompactTextString(m) } func (*ConversationUpdateTips) ProtoMessage() {} func (*ConversationUpdateTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{46} + return fileDescriptor_ws_822d08ca95807876, []int{46} } func (m *ConversationUpdateTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConversationUpdateTips.Unmarshal(m, b) @@ -3171,7 +3171,7 @@ func (m *ConversationSetPrivateTips) Reset() { *m = ConversationSetPriva func (m *ConversationSetPrivateTips) String() string { return proto.CompactTextString(m) } func (*ConversationSetPrivateTips) ProtoMessage() {} func (*ConversationSetPrivateTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{47} + return fileDescriptor_ws_822d08ca95807876, []int{47} } func (m *ConversationSetPrivateTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConversationSetPrivateTips.Unmarshal(m, b) @@ -3225,7 +3225,7 @@ func (m *RequestPagination) Reset() { *m = RequestPagination{} } func (m *RequestPagination) String() string { return proto.CompactTextString(m) } func (*RequestPagination) ProtoMessage() {} func (*RequestPagination) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{48} + return fileDescriptor_ws_822d08ca95807876, []int{48} } func (m *RequestPagination) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RequestPagination.Unmarshal(m, b) @@ -3271,7 +3271,7 @@ func (m *ResponsePagination) Reset() { *m = ResponsePagination{} } func (m *ResponsePagination) String() string { return proto.CompactTextString(m) } func (*ResponsePagination) ProtoMessage() {} func (*ResponsePagination) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{49} + return fileDescriptor_ws_822d08ca95807876, []int{49} } func (m *ResponsePagination) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResponsePagination.Unmarshal(m, b) @@ -3324,7 +3324,7 @@ func (m *SignalReq) Reset() { *m = SignalReq{} } func (m *SignalReq) String() string { return proto.CompactTextString(m) } func (*SignalReq) ProtoMessage() {} func (*SignalReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{50} + return fileDescriptor_ws_822d08ca95807876, []int{50} } func (m *SignalReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalReq.Unmarshal(m, b) @@ -3591,7 +3591,7 @@ func (m *SignalResp) Reset() { *m = SignalResp{} } func (m *SignalResp) String() string { return proto.CompactTextString(m) } func (*SignalResp) ProtoMessage() {} func (*SignalResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{51} + return fileDescriptor_ws_822d08ca95807876, []int{51} } func (m *SignalResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalResp.Unmarshal(m, b) @@ -3859,7 +3859,7 @@ func (m *InvitationInfo) Reset() { *m = InvitationInfo{} } func (m *InvitationInfo) String() string { return proto.CompactTextString(m) } func (*InvitationInfo) ProtoMessage() {} func (*InvitationInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{52} + return fileDescriptor_ws_822d08ca95807876, []int{52} } func (m *InvitationInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InvitationInfo.Unmarshal(m, b) @@ -3955,7 +3955,7 @@ func (m *ParticipantMetaData) Reset() { *m = ParticipantMetaData{} } func (m *ParticipantMetaData) String() string { return proto.CompactTextString(m) } func (*ParticipantMetaData) ProtoMessage() {} func (*ParticipantMetaData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{53} + return fileDescriptor_ws_822d08ca95807876, []int{53} } func (m *ParticipantMetaData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ParticipantMetaData.Unmarshal(m, b) @@ -4010,7 +4010,7 @@ func (m *SignalInviteReq) Reset() { *m = SignalInviteReq{} } func (m *SignalInviteReq) String() string { return proto.CompactTextString(m) } func (*SignalInviteReq) ProtoMessage() {} func (*SignalInviteReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{54} + return fileDescriptor_ws_822d08ca95807876, []int{54} } func (m *SignalInviteReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteReq.Unmarshal(m, b) @@ -4071,7 +4071,7 @@ func (m *SignalInviteReply) Reset() { *m = SignalInviteReply{} } func (m *SignalInviteReply) String() string { return proto.CompactTextString(m) } func (*SignalInviteReply) ProtoMessage() {} func (*SignalInviteReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{55} + return fileDescriptor_ws_822d08ca95807876, []int{55} } func (m *SignalInviteReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteReply.Unmarshal(m, b) @@ -4126,7 +4126,7 @@ func (m *SignalInviteInGroupReq) Reset() { *m = SignalInviteInGroupReq{} func (m *SignalInviteInGroupReq) String() string { return proto.CompactTextString(m) } func (*SignalInviteInGroupReq) ProtoMessage() {} func (*SignalInviteInGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{56} + return fileDescriptor_ws_822d08ca95807876, []int{56} } func (m *SignalInviteInGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteInGroupReq.Unmarshal(m, b) @@ -4187,7 +4187,7 @@ func (m *SignalInviteInGroupReply) Reset() { *m = SignalInviteInGroupRep func (m *SignalInviteInGroupReply) String() string { return proto.CompactTextString(m) } func (*SignalInviteInGroupReply) ProtoMessage() {} func (*SignalInviteInGroupReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{57} + return fileDescriptor_ws_822d08ca95807876, []int{57} } func (m *SignalInviteInGroupReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteInGroupReply.Unmarshal(m, b) @@ -4242,7 +4242,7 @@ func (m *SignalCancelReq) Reset() { *m = SignalCancelReq{} } func (m *SignalCancelReq) String() string { return proto.CompactTextString(m) } func (*SignalCancelReq) ProtoMessage() {} func (*SignalCancelReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{58} + return fileDescriptor_ws_822d08ca95807876, []int{58} } func (m *SignalCancelReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalCancelReq.Unmarshal(m, b) @@ -4300,7 +4300,7 @@ func (m *SignalCancelReply) Reset() { *m = SignalCancelReply{} } func (m *SignalCancelReply) String() string { return proto.CompactTextString(m) } func (*SignalCancelReply) ProtoMessage() {} func (*SignalCancelReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{59} + return fileDescriptor_ws_822d08ca95807876, []int{59} } func (m *SignalCancelReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalCancelReply.Unmarshal(m, b) @@ -4335,7 +4335,7 @@ func (m *SignalAcceptReq) Reset() { *m = SignalAcceptReq{} } func (m *SignalAcceptReq) String() string { return proto.CompactTextString(m) } func (*SignalAcceptReq) ProtoMessage() {} func (*SignalAcceptReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{60} + return fileDescriptor_ws_822d08ca95807876, []int{60} } func (m *SignalAcceptReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalAcceptReq.Unmarshal(m, b) @@ -4403,7 +4403,7 @@ func (m *SignalAcceptReply) Reset() { *m = SignalAcceptReply{} } func (m *SignalAcceptReply) String() string { return proto.CompactTextString(m) } func (*SignalAcceptReply) ProtoMessage() {} func (*SignalAcceptReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{61} + return fileDescriptor_ws_822d08ca95807876, []int{61} } func (m *SignalAcceptReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalAcceptReply.Unmarshal(m, b) @@ -4457,7 +4457,7 @@ func (m *SignalHungUpReq) Reset() { *m = SignalHungUpReq{} } func (m *SignalHungUpReq) String() string { return proto.CompactTextString(m) } func (*SignalHungUpReq) ProtoMessage() {} func (*SignalHungUpReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{62} + return fileDescriptor_ws_822d08ca95807876, []int{62} } func (m *SignalHungUpReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalHungUpReq.Unmarshal(m, b) @@ -4508,7 +4508,7 @@ func (m *SignalHungUpReply) Reset() { *m = SignalHungUpReply{} } func (m *SignalHungUpReply) String() string { return proto.CompactTextString(m) } func (*SignalHungUpReply) ProtoMessage() {} func (*SignalHungUpReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{63} + return fileDescriptor_ws_822d08ca95807876, []int{63} } func (m *SignalHungUpReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalHungUpReply.Unmarshal(m, b) @@ -4543,7 +4543,7 @@ func (m *SignalRejectReq) Reset() { *m = SignalRejectReq{} } func (m *SignalRejectReq) String() string { return proto.CompactTextString(m) } func (*SignalRejectReq) ProtoMessage() {} func (*SignalRejectReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{64} + return fileDescriptor_ws_822d08ca95807876, []int{64} } func (m *SignalRejectReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalRejectReq.Unmarshal(m, b) @@ -4608,7 +4608,7 @@ func (m *SignalRejectReply) Reset() { *m = SignalRejectReply{} } func (m *SignalRejectReply) String() string { return proto.CompactTextString(m) } func (*SignalRejectReply) ProtoMessage() {} func (*SignalRejectReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{65} + return fileDescriptor_ws_822d08ca95807876, []int{65} } func (m *SignalRejectReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalRejectReply.Unmarshal(m, b) @@ -4642,7 +4642,7 @@ func (m *DelMsgListReq) Reset() { *m = DelMsgListReq{} } func (m *DelMsgListReq) String() string { return proto.CompactTextString(m) } func (*DelMsgListReq) ProtoMessage() {} func (*DelMsgListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{66} + return fileDescriptor_ws_822d08ca95807876, []int{66} } func (m *DelMsgListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelMsgListReq.Unmarshal(m, b) @@ -4702,7 +4702,7 @@ func (m *DelMsgListResp) Reset() { *m = DelMsgListResp{} } func (m *DelMsgListResp) String() string { return proto.CompactTextString(m) } func (*DelMsgListResp) ProtoMessage() {} func (*DelMsgListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_966fa482a95c53be, []int{67} + return fileDescriptor_ws_822d08ca95807876, []int{67} } func (m *DelMsgListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelMsgListResp.Unmarshal(m, b) @@ -4808,195 +4808,195 @@ func init() { proto.RegisterType((*DelMsgListResp)(nil), "server_api_params.DelMsgListResp") } -func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_966fa482a95c53be) } +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_822d08ca95807876) } -var fileDescriptor_ws_966fa482a95c53be = []byte{ - // 2988 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcb, 0x6f, 0x24, 0x49, - 0xd1, 0xff, 0xaa, 0xda, 0xdd, 0x76, 0x47, 0xbb, 0xfd, 0xa8, 0x99, 0xcf, 0x34, 0x66, 0x76, 0x30, - 0x85, 0xb5, 0x2c, 0x0b, 0xcc, 0xa2, 0x45, 0x48, 0xb0, 0x0b, 0x83, 0xfc, 0x9a, 0xc7, 0xae, 0xdb, - 0xf6, 0x56, 0xcf, 0xb0, 0x08, 0x90, 0x56, 0xe5, 0xae, 0x74, 0xbb, 0xd6, 0xd5, 0x55, 0xd5, 0xf5, - 0xf0, 0x8c, 0x11, 0x12, 0x12, 0x48, 0x88, 0x1b, 0x27, 0x38, 0x70, 0x41, 0xe2, 0x82, 0x40, 0xab, - 0xd5, 0x0a, 0x81, 0xc4, 0x01, 0x21, 0x0e, 0xfc, 0x03, 0x1c, 0x11, 0x37, 0xce, 0x5c, 0x39, 0x20, - 0x21, 0x81, 0x32, 0x22, 0xab, 0x2a, 0xb3, 0xaa, 0xdb, 0xee, 0xb5, 0xac, 0x9d, 0x59, 0x0d, 0x37, - 0x47, 0x74, 0x46, 0x64, 0xe4, 0x2f, 0x22, 0x23, 0x22, 0x33, 0xcb, 0xb0, 0x18, 0x3b, 0x27, 0x6f, - 0x3d, 0x8a, 0x5f, 0x7a, 0x14, 0xdf, 0x0a, 0xa3, 0x20, 0x09, 0x8c, 0xe5, 0x98, 0x45, 0xa7, 0x2c, - 0x7a, 0xcb, 0x0e, 0xdd, 0xb7, 0x42, 0x3b, 0xb2, 0x87, 0xb1, 0xf9, 0x4f, 0x1d, 0x9a, 0x77, 0xa3, - 0x20, 0x0d, 0xef, 0xfb, 0x47, 0x81, 0xd1, 0x81, 0xd9, 0x01, 0x12, 0xdb, 0x1d, 0x6d, 0x4d, 0x7b, - 0xa1, 0x69, 0x65, 0xa4, 0x71, 0x03, 0x9a, 0xf8, 0xe7, 0x9e, 0x3d, 0x64, 0x1d, 0x1d, 0x7f, 0x2b, - 0x18, 0x86, 0x09, 0xf3, 0x7e, 0x90, 0xb8, 0x47, 0x6e, 0xdf, 0x4e, 0xdc, 0xc0, 0xef, 0xd4, 0x70, - 0x80, 0xc2, 0xe3, 0x63, 0x5c, 0x3f, 0x89, 0x02, 0x27, 0xed, 0xe3, 0x98, 0x19, 0x1a, 0x23, 0xf3, - 0xf8, 0xfc, 0x47, 0x76, 0x9f, 0x3d, 0xb4, 0x76, 0x3b, 0x75, 0x9a, 0x5f, 0x90, 0xc6, 0x1a, 0xb4, - 0x82, 0x47, 0x3e, 0x8b, 0x1e, 0xc6, 0x2c, 0xba, 0xbf, 0xdd, 0x69, 0xe0, 0xaf, 0x32, 0xcb, 0xb8, - 0x09, 0xd0, 0x8f, 0x98, 0x9d, 0xb0, 0x07, 0xee, 0x90, 0x75, 0x66, 0xd7, 0xb4, 0x17, 0xda, 0x96, - 0xc4, 0xe1, 0x1a, 0x86, 0x6c, 0x78, 0xc8, 0xa2, 0xad, 0x20, 0xf5, 0x93, 0xce, 0x1c, 0x0e, 0x90, - 0x59, 0xc6, 0x02, 0xe8, 0xec, 0x71, 0xa7, 0x89, 0xaa, 0x75, 0xf6, 0xd8, 0x58, 0x81, 0x46, 0x9c, - 0xd8, 0x49, 0x1a, 0x77, 0x60, 0x4d, 0x7b, 0xa1, 0x6e, 0x09, 0xca, 0x58, 0x87, 0x36, 0xea, 0x0d, - 0x32, 0x6b, 0x5a, 0x28, 0xa2, 0x32, 0x73, 0xc4, 0x1e, 0x9c, 0x85, 0xac, 0x33, 0x8f, 0x0a, 0x0a, - 0x86, 0xf9, 0x57, 0x1d, 0xae, 0x21, 0xee, 0x5d, 0x34, 0xe0, 0x4e, 0xea, 0x79, 0x17, 0x78, 0x60, - 0x05, 0x1a, 0x29, 0x4d, 0x47, 0xf0, 0x0b, 0x8a, 0xcf, 0x13, 0x05, 0x1e, 0xdb, 0x65, 0xa7, 0xcc, - 0x43, 0xe0, 0xeb, 0x56, 0xc1, 0x30, 0x56, 0x61, 0xee, 0xed, 0xc0, 0xf5, 0x11, 0x93, 0x19, 0xfc, - 0x31, 0xa7, 0xf9, 0x6f, 0xbe, 0xdb, 0x3f, 0xf1, 0xb9, 0x4b, 0x09, 0xee, 0x9c, 0x96, 0x3d, 0xd1, - 0x50, 0x3d, 0xf1, 0x3c, 0x2c, 0xd8, 0x61, 0xd8, 0xb5, 0xfd, 0x01, 0x8b, 0x68, 0xd2, 0x59, 0xd4, - 0x5b, 0xe2, 0x72, 0x7f, 0xf0, 0x99, 0x7a, 0x41, 0x1a, 0xf5, 0x19, 0xc2, 0x5d, 0xb7, 0x24, 0x0e, - 0xd7, 0x13, 0x84, 0x2c, 0x92, 0x60, 0x24, 0xe4, 0x4b, 0x5c, 0xe1, 0x15, 0xc8, 0xbd, 0xc2, 0xfd, - 0x98, 0x26, 0x6c, 0xc7, 0x77, 0x70, 0x51, 0x2d, 0xe1, 0xc7, 0x82, 0x65, 0xfe, 0x50, 0x83, 0x85, - 0x83, 0xf4, 0xd0, 0x73, 0xfb, 0xa8, 0x82, 0xc3, 0x5a, 0x80, 0xa7, 0x29, 0xe0, 0xc9, 0x10, 0xe8, - 0x93, 0x21, 0xa8, 0xa9, 0x10, 0xac, 0x40, 0x63, 0xc0, 0x7c, 0x87, 0x45, 0x02, 0x52, 0x41, 0x09, - 0x53, 0xeb, 0x99, 0xa9, 0xe6, 0x4f, 0x75, 0x98, 0xfb, 0x80, 0x4d, 0x58, 0x83, 0x56, 0x78, 0x1c, - 0xf8, 0x6c, 0x2f, 0xe5, 0x61, 0x25, 0x6c, 0x91, 0x59, 0xc6, 0x75, 0xa8, 0x1f, 0xba, 0x51, 0x72, - 0x8c, 0x7e, 0x6d, 0x5b, 0x44, 0x70, 0x2e, 0x1b, 0xda, 0x2e, 0x39, 0xb3, 0x69, 0x11, 0x21, 0x16, - 0x34, 0x97, 0x63, 0xaf, 0xee, 0xb1, 0x66, 0x65, 0x8f, 0x55, 0x63, 0x03, 0xc6, 0xc5, 0x86, 0xf9, - 0x2f, 0x0d, 0xe0, 0x4e, 0xe4, 0x32, 0xdf, 0x41, 0x68, 0x4a, 0x9b, 0x5b, 0xab, 0x6e, 0xee, 0x15, - 0x68, 0x44, 0x6c, 0x68, 0x47, 0x27, 0x59, 0xf0, 0x13, 0x55, 0x32, 0xa8, 0x56, 0x31, 0xe8, 0x55, - 0x80, 0x23, 0x9c, 0x87, 0xeb, 0x41, 0xa8, 0x5a, 0x2f, 0x7f, 0xec, 0x56, 0x25, 0x0d, 0xde, 0xca, - 0xbc, 0x64, 0x49, 0xc3, 0xf9, 0xce, 0xb2, 0x1d, 0x47, 0x04, 0x70, 0x9d, 0x76, 0x56, 0xce, 0x18, - 0x13, 0xbf, 0x8d, 0x73, 0xe2, 0x77, 0x36, 0x0f, 0x8a, 0x7f, 0x68, 0xd0, 0xdc, 0xf4, 0xec, 0xfe, - 0xc9, 0x94, 0x4b, 0x57, 0x97, 0xa8, 0x57, 0x96, 0x78, 0x17, 0xda, 0x87, 0x5c, 0x5d, 0xb6, 0x04, - 0x44, 0xa1, 0xf5, 0xf2, 0x27, 0xc6, 0xac, 0x52, 0xdd, 0x14, 0x96, 0x2a, 0xa7, 0x2e, 0x77, 0xe6, - 0xe2, 0xe5, 0xd6, 0xcf, 0x59, 0x6e, 0x23, 0x5f, 0xee, 0x5f, 0x74, 0x98, 0xc7, 0x44, 0x67, 0xb1, - 0x51, 0xca, 0xe2, 0xc4, 0xf8, 0x2a, 0xcc, 0xa5, 0x99, 0xa9, 0xda, 0xb4, 0xa6, 0xe6, 0x22, 0xc6, - 0x2b, 0x22, 0xad, 0xa2, 0xbc, 0x8e, 0xf2, 0x37, 0xc6, 0xc8, 0xe7, 0x35, 0xcd, 0x2a, 0x86, 0xf3, - 0x12, 0x74, 0x6c, 0xfb, 0x8e, 0xc7, 0x2c, 0x16, 0xa7, 0x5e, 0x22, 0xb2, 0xa5, 0xc2, 0xa3, 0x48, - 0x1b, 0x75, 0xe3, 0x81, 0x28, 0x50, 0x82, 0xe2, 0xe8, 0xd0, 0x38, 0xfe, 0x13, 0x2d, 0xbd, 0x60, - 0xf0, 0x8d, 0x1a, 0xb1, 0x11, 0x7a, 0x88, 0xb6, 0x55, 0x46, 0x16, 0x73, 0x0a, 0xd4, 0x28, 0x10, - 0x14, 0x1e, 0x77, 0x31, 0xd1, 0xa8, 0x80, 0x2a, 0x93, 0xc4, 0x29, 0x17, 0x26, 0xf3, 0x6f, 0x35, - 0x68, 0xd3, 0xf6, 0xc9, 0x40, 0xbd, 0xc9, 0xe3, 0x3c, 0x18, 0x2a, 0x51, 0x24, 0x71, 0xb8, 0x15, - 0x9c, 0xda, 0x53, 0x13, 0x8d, 0xc2, 0xe3, 0xa1, 0xc8, 0xe9, 0x3b, 0x4a, 0xc2, 0x91, 0x59, 0xd9, - 0x2c, 0x77, 0xe5, 0xc4, 0x23, 0x71, 0x78, 0x2a, 0x4b, 0x02, 0x25, 0x3a, 0x72, 0x9a, 0xcb, 0x26, - 0x41, 0x3e, 0x3f, 0xc5, 0x87, 0xc4, 0xe1, 0xf8, 0x26, 0x41, 0x36, 0x37, 0x81, 0x54, 0x30, 0x48, - 0xb3, 0x98, 0x97, 0x4a, 0x49, 0x4e, 0x57, 0xbc, 0xda, 0x3c, 0xd7, 0xab, 0xa0, 0x78, 0x55, 0xdd, - 0x5c, 0xad, 0xca, 0xe6, 0x5a, 0x87, 0x36, 0xe9, 0xc9, 0x82, 0x7e, 0x9e, 0x4a, 0xbd, 0xc2, 0x54, - 0x63, 0xa3, 0x5d, 0x8e, 0x0d, 0xd5, 0xbb, 0x0b, 0x13, 0xbc, 0xbb, 0x98, 0x7b, 0xf7, 0x37, 0x3a, - 0xc0, 0x36, 0x0b, 0xed, 0x28, 0x19, 0x32, 0x3f, 0xe1, 0xcb, 0x73, 0x72, 0x2a, 0x77, 0xae, 0xc2, - 0x93, 0xeb, 0x84, 0xae, 0xd6, 0x09, 0x03, 0x66, 0x10, 0x70, 0xf2, 0x26, 0xfe, 0xcd, 0xc1, 0x0c, - 0xed, 0x88, 0xb4, 0x51, 0x90, 0xe7, 0x34, 0xaf, 0x03, 0x41, 0xe4, 0x88, 0xca, 0x51, 0xb7, 0x88, - 0xe0, 0x9b, 0xbf, 0x98, 0x0f, 0x1b, 0x9a, 0x06, 0xe5, 0x75, 0x95, 0x7b, 0x61, 0x0f, 0xf6, 0x22, - 0x2c, 0xc5, 0xe9, 0x61, 0xb1, 0xb8, 0xbd, 0x74, 0x28, 0xc2, 0xbd, 0xc2, 0xe7, 0xa0, 0x52, 0x73, - 0xc6, 0x07, 0x51, 0xa9, 0x29, 0x18, 0xe5, 0xae, 0xc0, 0x7c, 0x47, 0x87, 0xa5, 0xfd, 0x68, 0x60, - 0xfb, 0xee, 0x77, 0xb0, 0xdd, 0xc4, 0x04, 0x7e, 0x99, 0x92, 0xbb, 0x06, 0x2d, 0xe6, 0x0f, 0x3c, - 0x37, 0x3e, 0xde, 0x2b, 0x70, 0x93, 0x59, 0x32, 0xd8, 0x33, 0x93, 0x8a, 0x72, 0x5d, 0x29, 0xca, - 0x2b, 0xd0, 0x18, 0x06, 0x87, 0xae, 0x97, 0xc5, 0xbd, 0xa0, 0x30, 0xe6, 0x99, 0xc7, 0xb0, 0x3a, - 0xe7, 0x31, 0x9f, 0x31, 0x8a, 0x42, 0x3d, 0x37, 0xb6, 0x50, 0x37, 0xe5, 0x42, 0xad, 0x02, 0x0f, - 0x15, 0xe0, 0x09, 0xae, 0x56, 0x0e, 0xd7, 0x9f, 0x34, 0x58, 0x2a, 0xe0, 0xa6, 0x1e, 0x74, 0x22, - 0x5c, 0x26, 0xcc, 0x6f, 0xcb, 0x11, 0x28, 0x92, 0x87, 0xcc, 0xe3, 0x66, 0xed, 0x63, 0xdc, 0x50, - 0x4e, 0x25, 0x82, 0x03, 0x7d, 0x10, 0xc4, 0xae, 0xd4, 0xef, 0xe7, 0x34, 0x9f, 0x6d, 0x97, 0xd9, - 0x12, 0x58, 0x44, 0x71, 0x7e, 0x8f, 0xba, 0x6e, 0x8a, 0x31, 0x41, 0xf1, 0x25, 0xec, 0xe4, 0x75, - 0x74, 0xe7, 0xb1, 0xf9, 0x7b, 0x0d, 0x96, 0xa8, 0x3e, 0x48, 0x9b, 0xe5, 0x75, 0x39, 0x50, 0xb1, - 0xe6, 0x53, 0x89, 0xf9, 0xe4, 0x98, 0x12, 0x51, 0x0e, 0x17, 0xab, 0x24, 0x6a, 0xbc, 0x09, 0xd7, - 0x9d, 0x12, 0x46, 0xbb, 0x6e, 0x9c, 0x74, 0xf4, 0xb5, 0xda, 0x04, 0x95, 0x65, 0x48, 0xad, 0xb1, - 0x0a, 0xcc, 0xef, 0x42, 0xe7, 0x20, 0xf5, 0xbc, 0x2e, 0x8b, 0x63, 0x7b, 0xc0, 0x36, 0xcf, 0x7a, - 0x6c, 0xc4, 0xf9, 0x16, 0x8b, 0x43, 0x1e, 0x5d, 0x2c, 0x8a, 0xb6, 0x02, 0x87, 0xa1, 0xe9, 0x75, - 0x2b, 0x23, 0x39, 0x30, 0x2c, 0x8a, 0x78, 0x8a, 0x11, 0x3d, 0x10, 0x51, 0xc6, 0x2d, 0x98, 0xf1, - 0xb8, 0x59, 0x35, 0x34, 0x6b, 0x75, 0x8c, 0x59, 0xdd, 0x78, 0xb0, 0x6d, 0x27, 0xb6, 0x85, 0xe3, - 0xcc, 0x21, 0x7c, 0x64, 0xfc, 0xec, 0xa3, 0x89, 0x11, 0xc0, 0xbb, 0x14, 0x2c, 0xf3, 0x6e, 0xe0, - 0xe7, 0x01, 0x20, 0xb3, 0xb8, 0xd9, 0x31, 0xe9, 0x41, 0x3b, 0xda, 0x56, 0x46, 0x9a, 0xd7, 0xc1, - 0xb8, 0xcb, 0x92, 0xae, 0xfd, 0x78, 0xc3, 0x77, 0xba, 0xae, 0xdf, 0x63, 0x23, 0x8b, 0x8d, 0xcc, - 0x1d, 0xb8, 0x56, 0xe1, 0xc6, 0x21, 0xee, 0x14, 0xfb, 0x71, 0x8f, 0x8d, 0xd0, 0x80, 0xb6, 0x25, - 0x28, 0xe4, 0xe3, 0x28, 0xd1, 0x00, 0x09, 0xca, 0x1c, 0xc1, 0x22, 0x77, 0x55, 0x8f, 0xf9, 0x4e, - 0x37, 0x1e, 0xa0, 0x8a, 0x35, 0x68, 0x11, 0x02, 0xdd, 0x78, 0x50, 0x74, 0x54, 0x12, 0x8b, 0x8f, - 0xe8, 0x7b, 0x2e, 0x77, 0x09, 0x8e, 0x10, 0xab, 0x91, 0x58, 0x3c, 0x6e, 0x63, 0x26, 0x0e, 0x18, - 0x3c, 0xa0, 0x6b, 0x56, 0x4e, 0x9b, 0x7f, 0xa8, 0xc3, 0xac, 0x00, 0x14, 0x4f, 0x88, 0xbc, 0x89, - 0xcd, 0xf1, 0x22, 0x8a, 0xca, 0x4d, 0xff, 0xb4, 0x38, 0xab, 0x11, 0x25, 0x9f, 0xee, 0x6a, 0xea, - 0xe9, 0xae, 0x64, 0xd3, 0x4c, 0xd5, 0xa6, 0xd2, 0xba, 0xea, 0xd5, 0x75, 0xf1, 0xec, 0x8a, 0x09, - 0xe7, 0xc0, 0xb3, 0x93, 0xa3, 0x20, 0x1a, 0x8a, 0x9e, 0xb4, 0x6e, 0x55, 0xf8, 0x3c, 0xa3, 0x13, - 0x2f, 0x2f, 0xc9, 0xb4, 0xb3, 0x4a, 0x5c, 0x5e, 0x00, 0x89, 0x93, 0x95, 0x66, 0x3a, 0x0c, 0xa8, - 0x4c, 0xb2, 0x2d, 0x8e, 0xdd, 0xc0, 0xc7, 0xe2, 0x40, 0x15, 0x58, 0x66, 0xf1, 0x95, 0x0f, 0xe3, - 0xc1, 0x9d, 0x28, 0x18, 0x8a, 0x23, 0x41, 0x46, 0xe2, 0xca, 0x03, 0x3f, 0xc9, 0x0a, 0x4b, 0x8b, - 0x64, 0x25, 0x16, 0x97, 0x15, 0x24, 0x96, 0xdf, 0x79, 0x2b, 0x23, 0x8d, 0x25, 0xa8, 0xc5, 0x6c, - 0x24, 0x6a, 0x2a, 0xff, 0x53, 0xf1, 0xdc, 0xa2, 0xea, 0xb9, 0x52, 0x92, 0x5c, 0xc2, 0x5f, 0xe5, - 0x24, 0x59, 0x9c, 0xf7, 0x97, 0x95, 0xf3, 0xfe, 0x06, 0xcc, 0x06, 0x21, 0x8f, 0xf3, 0xb8, 0x63, - 0xe0, 0x1e, 0xfb, 0xd4, 0xe4, 0x3d, 0x76, 0x6b, 0x9f, 0x46, 0xee, 0xf8, 0x49, 0x74, 0x66, 0x65, - 0x72, 0xc6, 0x2e, 0x2c, 0x06, 0x47, 0x47, 0x9e, 0xeb, 0xb3, 0x83, 0x34, 0x3e, 0xc6, 0xde, 0xf5, - 0x1a, 0x26, 0x26, 0x73, 0x5c, 0x62, 0x52, 0x47, 0x5a, 0x65, 0xd1, 0xd5, 0x57, 0x60, 0x5e, 0x9e, - 0x86, 0xc3, 0x70, 0xc2, 0xce, 0x44, 0x0c, 0xf2, 0x3f, 0x79, 0x3a, 0x3e, 0xb5, 0xbd, 0x94, 0xca, - 0xdb, 0x9c, 0x45, 0xc4, 0x2b, 0xfa, 0x97, 0x34, 0xf3, 0x27, 0x1a, 0x2c, 0x96, 0x26, 0xe0, 0xa3, - 0x13, 0x37, 0xf1, 0x98, 0xd0, 0x40, 0x04, 0x6f, 0x1d, 0x1c, 0x16, 0xf7, 0x45, 0x08, 0xe3, 0xdf, - 0xa2, 0x8e, 0xd4, 0xf2, 0x03, 0xa1, 0x09, 0xf3, 0xee, 0x7e, 0x8f, 0x2b, 0xea, 0x05, 0xa9, 0xef, - 0xe4, 0x97, 0x3a, 0x12, 0x8f, 0x87, 0x90, 0xbb, 0xdf, 0xdb, 0xb4, 0x9d, 0x01, 0xa3, 0xab, 0x97, - 0x3a, 0xda, 0xa4, 0x32, 0x4d, 0x07, 0xe6, 0x1e, 0xb8, 0x61, 0xbc, 0x15, 0x0c, 0x87, 0xdc, 0x11, - 0x0e, 0x4b, 0x78, 0x91, 0xd3, 0xd0, 0xdf, 0x82, 0xe2, 0xa1, 0xe2, 0xb0, 0x23, 0x3b, 0xf5, 0x12, - 0x3e, 0x34, 0xdb, 0xb8, 0x12, 0x0b, 0x2f, 0x1d, 0xe2, 0xc0, 0xdf, 0x26, 0x69, 0xb2, 0x53, 0xe2, - 0x98, 0x7f, 0xd6, 0x61, 0x09, 0x8f, 0x06, 0x5b, 0xe8, 0x76, 0x07, 0x85, 0x5e, 0x86, 0x3a, 0x6e, - 0x43, 0x51, 0x2b, 0xce, 0x3f, 0x4e, 0xd0, 0x50, 0xe3, 0x36, 0x34, 0x82, 0x10, 0x0b, 0x0c, 0x9d, - 0x41, 0x9e, 0x9f, 0x24, 0xa4, 0xde, 0xef, 0x58, 0x42, 0xca, 0xb8, 0x03, 0x30, 0x2c, 0x2a, 0x0a, - 0xa5, 0xee, 0x69, 0x75, 0x48, 0x92, 0x1c, 0xdc, 0x3c, 0x0d, 0xe7, 0x97, 0x3c, 0x35, 0x4b, 0x65, - 0x1a, 0x7b, 0xb0, 0x80, 0x66, 0xef, 0x67, 0xe7, 0x4a, 0xf4, 0xc1, 0xf4, 0x33, 0x96, 0xa4, 0xcd, - 0x5f, 0x68, 0x02, 0x46, 0xfe, 0x6b, 0x8f, 0x11, 0xf6, 0x05, 0x24, 0xda, 0xa5, 0x20, 0x59, 0x85, - 0xb9, 0x61, 0x2a, 0x1d, 0x73, 0x6b, 0x56, 0x4e, 0x17, 0x2e, 0xaa, 0x4d, 0xed, 0x22, 0xf3, 0x97, - 0x1a, 0x74, 0x5e, 0x0b, 0x5c, 0x1f, 0x7f, 0xd8, 0x08, 0x43, 0x4f, 0xdc, 0x44, 0x5e, 0xda, 0xe7, - 0x5f, 0x83, 0xa6, 0x4d, 0x6a, 0xfc, 0x44, 0xb8, 0x7d, 0x8a, 0xa3, 0x6b, 0x21, 0x23, 0x9d, 0x42, - 0x6a, 0xf2, 0x29, 0xc4, 0x7c, 0x57, 0x83, 0x05, 0x02, 0xe5, 0x8d, 0xd4, 0x4d, 0x2e, 0x6d, 0xdf, - 0x26, 0xcc, 0x8d, 0x52, 0x37, 0xb9, 0x44, 0x54, 0xe6, 0x72, 0xd5, 0x78, 0xaa, 0x8d, 0x89, 0x27, - 0xf3, 0x3d, 0x0d, 0x6e, 0x94, 0x61, 0xdd, 0xe8, 0xf7, 0x59, 0xf8, 0x24, 0xb7, 0x94, 0x72, 0x0a, - 0x9b, 0x29, 0x9d, 0xc2, 0xc6, 0x9a, 0x6c, 0xb1, 0xb7, 0x59, 0xff, 0xe9, 0x35, 0xf9, 0x07, 0x3a, - 0x7c, 0xf4, 0x6e, 0xbe, 0xf1, 0x1e, 0x44, 0xb6, 0x1f, 0x1f, 0xb1, 0x28, 0x7a, 0x82, 0xf6, 0xee, - 0x42, 0xdb, 0x67, 0x8f, 0x0a, 0x9b, 0xc4, 0x76, 0x9c, 0x56, 0x8d, 0x2a, 0x3c, 0x5d, 0xee, 0x32, - 0xff, 0xad, 0xc1, 0x12, 0xe9, 0x79, 0xdd, 0xed, 0x9f, 0x3c, 0xc1, 0xc5, 0xef, 0xc1, 0xc2, 0x09, - 0x5a, 0xc0, 0xa9, 0x4b, 0xa4, 0xed, 0x92, 0xf4, 0x94, 0xcb, 0xff, 0x8f, 0x06, 0xcb, 0xa4, 0xe8, - 0xbe, 0x7f, 0xea, 0x3e, 0xc9, 0x60, 0x3d, 0x80, 0x45, 0x97, 0x4c, 0xb8, 0x24, 0x00, 0x65, 0xf1, - 0x29, 0x11, 0xf8, 0x9d, 0x06, 0x8b, 0xa4, 0x69, 0xc7, 0x4f, 0x58, 0x74, 0xe9, 0xf5, 0xdf, 0xe3, - 0x27, 0xfb, 0x24, 0xb2, 0xfd, 0xcb, 0x64, 0x48, 0x59, 0x74, 0xca, 0x24, 0xf9, 0xae, 0x06, 0x06, - 0xaa, 0xda, 0x76, 0xe3, 0xa1, 0x1b, 0xc7, 0x4f, 0xd0, 0x75, 0xd3, 0x19, 0xfc, 0x33, 0x1d, 0xae, - 0x4b, 0x5a, 0xba, 0x69, 0xf2, 0xb4, 0x9b, 0x6c, 0x6c, 0x43, 0x93, 0xf7, 0x08, 0xf2, 0xf5, 0xfe, - 0xb4, 0x13, 0x15, 0x82, 0xbc, 0x8b, 0x45, 0xa2, 0xc7, 0xfa, 0x81, 0xef, 0xc4, 0xd8, 0x1c, 0xb5, - 0x2d, 0x85, 0xc7, 0xd3, 0xd0, 0xaa, 0xa4, 0x66, 0xcb, 0xf6, 0xfb, 0xcc, 0x7b, 0x66, 0x20, 0x32, - 0x7f, 0xad, 0xc1, 0x02, 0x0d, 0x79, 0xfa, 0x97, 0xcc, 0x6b, 0x3d, 0x05, 0xf2, 0x87, 0xc6, 0x4b, - 0xe6, 0x09, 0x2c, 0xd3, 0x8d, 0xbe, 0xd4, 0x9e, 0xf0, 0x83, 0xaf, 0xed, 0xd0, 0x59, 0x56, 0x43, - 0xa1, 0x8c, 0x54, 0xdf, 0x6a, 0xc4, 0x73, 0x7c, 0xf1, 0x56, 0x73, 0x13, 0xc0, 0x76, 0x9c, 0x37, - 0x83, 0xc8, 0x71, 0xfd, 0xac, 0xd7, 0x94, 0x38, 0xe6, 0x6b, 0x30, 0xcf, 0x8f, 0xde, 0x0f, 0xa4, - 0xbb, 0xf9, 0x73, 0x5f, 0x0f, 0xe4, 0x7b, 0x7d, 0x5d, 0xbd, 0xd7, 0x37, 0xbf, 0x0d, 0xff, 0x5f, - 0x31, 0x1c, 0xb1, 0xde, 0xa2, 0x27, 0x87, 0x6c, 0x12, 0x01, 0xf9, 0xc7, 0xc7, 0xa0, 0x27, 0xdb, - 0x62, 0x29, 0x42, 0xe6, 0xf7, 0x35, 0x78, 0xae, 0xa2, 0x7e, 0x23, 0x0c, 0xa3, 0xe0, 0x54, 0xb8, - 0xf4, 0x2a, 0xa6, 0x51, 0xfb, 0x30, 0xbd, 0xdc, 0x87, 0x8d, 0x35, 0x42, 0xe9, 0x1d, 0x3f, 0x00, - 0x23, 0x7e, 0xa5, 0xc1, 0xa2, 0x30, 0xc2, 0x71, 0xc4, 0xb4, 0x5f, 0x84, 0x06, 0x3d, 0x57, 0x8a, - 0x09, 0x9f, 0x1b, 0x3b, 0x61, 0xf6, 0xcc, 0x6a, 0x89, 0xc1, 0xd5, 0x88, 0xd4, 0xc7, 0xe5, 0x8d, - 0x2f, 0xe7, 0x71, 0x3f, 0xf5, 0x83, 0xa2, 0x10, 0x30, 0xbf, 0x91, 0x05, 0xf3, 0x36, 0xf3, 0xd8, - 0x55, 0x62, 0x64, 0x3e, 0x84, 0x05, 0x7c, 0x3b, 0x2d, 0x30, 0xb8, 0x12, 0xb5, 0x6f, 0xc2, 0x12, - 0xaa, 0xbd, 0x72, 0x7b, 0xf3, 0xdd, 0xc1, 0xf1, 0xd9, 0x3a, 0xb6, 0xfd, 0xc1, 0x55, 0x6a, 0xff, - 0x1c, 0x5c, 0xcb, 0xb0, 0x7f, 0x18, 0x3a, 0xf9, 0x7d, 0xc6, 0x84, 0x5b, 0x5c, 0xf3, 0xf3, 0xb0, - 0xb2, 0x15, 0xf8, 0xa7, 0x2c, 0x8a, 0xe9, 0xce, 0x1b, 0x45, 0x32, 0x09, 0x65, 0xf3, 0x0b, 0xca, - 0x7c, 0x1b, 0x56, 0x65, 0x89, 0x1e, 0x4b, 0x0e, 0x22, 0xf7, 0x54, 0x92, 0x12, 0xb7, 0x9c, 0x9a, - 0x72, 0xcb, 0x59, 0xdc, 0x8a, 0xea, 0xca, 0xad, 0xe8, 0x0d, 0x68, 0xba, 0xb1, 0x50, 0x80, 0x41, - 0x35, 0x67, 0x15, 0x0c, 0xb3, 0x07, 0xcb, 0xe2, 0x35, 0xf3, 0xc0, 0x1e, 0xb8, 0x3e, 0x65, 0xc0, - 0x9b, 0x00, 0xa1, 0x3d, 0xc8, 0xbe, 0x66, 0xa0, 0x0b, 0x71, 0x89, 0xc3, 0x7f, 0x8f, 0x8f, 0x83, - 0x47, 0xe2, 0x77, 0x9d, 0x7e, 0x2f, 0x38, 0xe6, 0xd7, 0xc1, 0xb0, 0x58, 0x1c, 0x06, 0x7e, 0xcc, - 0x24, 0xad, 0x6b, 0xd0, 0xda, 0x4a, 0xa3, 0x88, 0xf9, 0x7c, 0xaa, 0xec, 0x69, 0x5f, 0x66, 0x71, - 0xbd, 0xbd, 0x42, 0x2f, 0x5d, 0xa2, 0x4a, 0x1c, 0xf3, 0xe7, 0x35, 0x68, 0xf6, 0xdc, 0x81, 0x6f, - 0x7b, 0x16, 0x1b, 0x19, 0x5f, 0x81, 0x06, 0xb5, 0xb6, 0xc2, 0x8d, 0xe3, 0x2e, 0xf5, 0x68, 0x34, - 0xf5, 0xf0, 0x16, 0x1b, 0xdd, 0xfb, 0x3f, 0x4b, 0xc8, 0x18, 0x6f, 0x40, 0x9b, 0xfe, 0xba, 0x4f, - 0x57, 0x15, 0xa2, 0xce, 0x7c, 0xfa, 0x02, 0x25, 0x62, 0x34, 0xe9, 0x52, 0x35, 0x70, 0x83, 0xfa, - 0x58, 0xfa, 0xc4, 0xde, 0x9d, 0x6c, 0x10, 0x55, 0x48, 0x61, 0x10, 0xc9, 0x70, 0x69, 0x1b, 0x0f, - 0xf3, 0xa2, 0x5d, 0x98, 0x2c, 0x4d, 0x67, 0x7e, 0x21, 0x4d, 0x32, 0x5c, 0xfa, 0x38, 0xf5, 0x07, - 0x0f, 0x43, 0x71, 0xc7, 0x34, 0x59, 0xfa, 0x1e, 0x0e, 0x13, 0xd2, 0x24, 0xc3, 0xa5, 0x23, 0xcc, - 0xac, 0x08, 0xfa, 0x79, 0xd2, 0x94, 0x80, 0x85, 0x34, 0xc9, 0x6c, 0x36, 0x61, 0x36, 0xb4, 0xcf, - 0xbc, 0xc0, 0x76, 0xcc, 0x77, 0x6a, 0x00, 0xd9, 0xc0, 0x18, 0xab, 0xb8, 0xe2, 0xa2, 0xf5, 0x0b, - 0x5d, 0x14, 0x7a, 0x67, 0x92, 0x93, 0x7a, 0xe3, 0x9d, 0xf4, 0x99, 0x69, 0x9d, 0x44, 0xda, 0x4a, - 0x6e, 0xba, 0x5d, 0x72, 0xd3, 0xfa, 0x85, 0x6e, 0x12, 0x46, 0x09, 0x47, 0xdd, 0x2e, 0x39, 0x6a, - 0xfd, 0x42, 0x47, 0x09, 0x79, 0xe1, 0xaa, 0xdb, 0x25, 0x57, 0xad, 0x5f, 0xe8, 0x2a, 0x21, 0x2f, - 0x9c, 0x75, 0xbb, 0xe4, 0xac, 0xf5, 0x0b, 0x9d, 0x25, 0xe4, 0xab, 0xee, 0x7a, 0x4f, 0x87, 0x05, - 0x84, 0x8c, 0x1e, 0x94, 0xfc, 0xa3, 0x00, 0xef, 0x8d, 0x11, 0x2e, 0xf5, 0xe3, 0x18, 0x95, 0x69, - 0x7c, 0x16, 0x96, 0x89, 0x21, 0x3e, 0xa6, 0xc8, 0x5f, 0xe8, 0x9a, 0x56, 0xf5, 0x07, 0x7c, 0x02, - 0x48, 0xe3, 0x24, 0x18, 0x6e, 0xdb, 0x89, 0x9d, 0x75, 0x46, 0x05, 0x47, 0x7e, 0xa0, 0x99, 0xa9, - 0x7c, 0x7e, 0x17, 0x05, 0xc1, 0x30, 0x7f, 0x79, 0x11, 0x14, 0x97, 0x48, 0xdc, 0x21, 0x0b, 0xd2, - 0x44, 0xa4, 0x89, 0x8c, 0xa4, 0x07, 0x6c, 0xc7, 0xb5, 0xf1, 0x59, 0x43, 0xbc, 0xee, 0xe6, 0x0c, - 0xcc, 0x6c, 0xc5, 0x33, 0x8d, 0xf8, 0x3c, 0xae, 0xe0, 0x5c, 0xfc, 0xa4, 0x62, 0xfe, 0x5d, 0x83, - 0x6b, 0x07, 0x76, 0x94, 0xb8, 0x7d, 0x37, 0xb4, 0xfd, 0xa4, 0xcb, 0x12, 0x1b, 0xd7, 0xa0, 0x7c, - 0x21, 0xa3, 0xbd, 0xbf, 0x2f, 0x64, 0x0e, 0x60, 0x71, 0x50, 0xf4, 0xb2, 0xd2, 0x37, 0x36, 0x53, - 0x9f, 0xf1, 0x4b, 0xe2, 0xca, 0xe7, 0x3e, 0xb5, 0xf7, 0xfd, 0xb9, 0x8f, 0xf9, 0x23, 0x1d, 0x16, - 0x4b, 0xa9, 0x93, 0xb7, 0xa3, 0xd4, 0x68, 0xe4, 0x31, 0x91, 0xd3, 0xc6, 0x06, 0x80, 0x9b, 0x87, - 0xd1, 0x39, 0x97, 0xb4, 0x6a, 0xac, 0x59, 0x92, 0xd0, 0xb8, 0xb7, 0x9a, 0xda, 0xa5, 0xdf, 0x6a, - 0x8c, 0x7b, 0xd0, 0x0a, 0x0b, 0x27, 0x9d, 0x73, 0x00, 0x1b, 0xe3, 0x4a, 0x4b, 0x16, 0x35, 0xbf, - 0x05, 0xcb, 0x95, 0x0c, 0x85, 0x4f, 0x37, 0xc1, 0x09, 0xf3, 0xf3, 0xa7, 0x1b, 0x4e, 0x48, 0xc1, - 0xaa, 0x97, 0x83, 0xd5, 0x73, 0x4f, 0xe5, 0xef, 0x09, 0x05, 0x69, 0xfe, 0x58, 0x87, 0x95, 0xf1, - 0xd5, 0xe5, 0x59, 0x85, 0xfb, 0x10, 0x3a, 0x93, 0x32, 0xf9, 0x95, 0xa1, 0x5e, 0x44, 0x77, 0x5e, - 0x87, 0x9f, 0x55, 0xb8, 0xaf, 0x65, 0xd1, 0x2d, 0x95, 0x3a, 0xf3, 0xb7, 0x39, 0x3e, 0x79, 0xa7, - 0xf1, 0x8c, 0xe2, 0x63, 0xbc, 0x08, 0x4b, 0xb4, 0x4c, 0xe9, 0x71, 0x9f, 0x1a, 0xd7, 0x0a, 0xbf, - 0xc8, 0x14, 0x52, 0xd9, 0xbf, 0xb2, 0x98, 0xfd, 0xa3, 0x96, 0xf9, 0x24, 0xef, 0xdf, 0x3e, 0x54, - 0x3e, 0x29, 0x22, 0x4d, 0x6a, 0x6a, 0xa4, 0x48, 0xcb, 0xfb, 0xca, 0xff, 0x45, 0xda, 0xc5, 0x91, - 0x96, 0x63, 0x29, 0x35, 0x78, 0xe6, 0xf7, 0xa0, 0xbd, 0xcd, 0xbc, 0x6e, 0x3c, 0xc8, 0x3e, 0x2b, - 0x3a, 0x0f, 0xc8, 0x49, 0xff, 0xd6, 0x30, 0xf1, 0x83, 0xa2, 0xf2, 0xc7, 0x48, 0x33, 0x95, 0x8f, - 0x91, 0xcc, 0x4d, 0x58, 0x90, 0x0d, 0xb8, 0xcc, 0x57, 0x55, 0x9b, 0x37, 0xbe, 0xb9, 0x7a, 0xeb, - 0x25, 0xfa, 0x07, 0x9a, 0x57, 0x2b, 0x20, 0x1e, 0x36, 0xf0, 0x1f, 0x6a, 0xbe, 0xf0, 0xdf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x3b, 0x39, 0xf9, 0x52, 0x63, 0x33, 0x00, 0x00, +var fileDescriptor_ws_822d08ca95807876 = []byte{ + // 2985 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcd, 0x6f, 0x24, 0x47, + 0x15, 0xa7, 0x7b, 0x3c, 0x63, 0xcf, 0x1b, 0x8f, 0x3f, 0x7a, 0x17, 0x33, 0x98, 0xcd, 0x62, 0x1a, + 0x2b, 0x84, 0x00, 0x1b, 0x14, 0x84, 0x04, 0x09, 0x2c, 0xf2, 0xd7, 0x7e, 0x04, 0x8f, 0xed, 0xf4, + 0xec, 0x12, 0x04, 0x48, 0x51, 0x7b, 0xba, 0x3c, 0xee, 0xb8, 0xa7, 0xab, 0xa7, 0x3f, 0xbc, 0x6b, + 0x84, 0x84, 0x04, 0x12, 0xe2, 0xc6, 0x09, 0x0e, 0x5c, 0x90, 0xb8, 0x20, 0x50, 0x14, 0x45, 0x08, + 0x6e, 0x11, 0xe2, 0xc0, 0x3f, 0xc0, 0x11, 0x71, 0xe3, 0xcc, 0x95, 0x03, 0x12, 0x12, 0xa8, 0xea, + 0x55, 0x57, 0x57, 0x75, 0xcf, 0xd8, 0x13, 0xcb, 0xca, 0x6e, 0xb4, 0xdc, 0xfc, 0xde, 0xd4, 0x7b, + 0xf5, 0xea, 0xf7, 0x5e, 0xbd, 0xf7, 0xaa, 0xaa, 0x0d, 0x8b, 0x89, 0x77, 0xf2, 0xe6, 0xa3, 0xe4, + 0xa5, 0x47, 0xc9, 0xad, 0x28, 0xa6, 0x29, 0xb5, 0x96, 0x13, 0x12, 0x9f, 0x92, 0xf8, 0x4d, 0x37, + 0xf2, 0xdf, 0x8c, 0xdc, 0xd8, 0x1d, 0x26, 0xf6, 0xbf, 0x4c, 0x68, 0xde, 0x8d, 0x69, 0x16, 0xdd, + 0x0f, 0x8f, 0xa8, 0xd5, 0x81, 0xd9, 0x01, 0x27, 0xb6, 0x3b, 0xc6, 0x9a, 0xf1, 0x42, 0xd3, 0xc9, + 0x49, 0xeb, 0x06, 0x34, 0xf9, 0x9f, 0x7b, 0xee, 0x90, 0x74, 0x4c, 0xfe, 0x5b, 0xc1, 0xb0, 0x6c, + 0x98, 0x0f, 0x69, 0xea, 0x1f, 0xf9, 0x7d, 0x37, 0xf5, 0x69, 0xd8, 0xa9, 0xf1, 0x01, 0x1a, 0x8f, + 0x8d, 0xf1, 0xc3, 0x34, 0xa6, 0x5e, 0xd6, 0xe7, 0x63, 0x66, 0x70, 0x8c, 0xca, 0x63, 0xf3, 0x1f, + 0xb9, 0x7d, 0xf2, 0xd0, 0xd9, 0xed, 0xd4, 0x71, 0x7e, 0x41, 0x5a, 0x6b, 0xd0, 0xa2, 0x8f, 0x42, + 0x12, 0x3f, 0x4c, 0x48, 0x7c, 0x7f, 0xbb, 0xd3, 0xe0, 0xbf, 0xaa, 0x2c, 0xeb, 0x26, 0x40, 0x3f, + 0x26, 0x6e, 0x4a, 0x1e, 0xf8, 0x43, 0xd2, 0x99, 0x5d, 0x33, 0x5e, 0x68, 0x3b, 0x0a, 0x87, 0x69, + 0x18, 0x92, 0xe1, 0x21, 0x89, 0xb7, 0x68, 0x16, 0xa6, 0x9d, 0x39, 0x3e, 0x40, 0x65, 0x59, 0x0b, + 0x60, 0x92, 0xc7, 0x9d, 0x26, 0x57, 0x6d, 0x92, 0xc7, 0xd6, 0x0a, 0x34, 0x92, 0xd4, 0x4d, 0xb3, + 0xa4, 0x03, 0x6b, 0xc6, 0x0b, 0x75, 0x47, 0x50, 0xd6, 0x3a, 0xb4, 0xb9, 0x5e, 0x9a, 0x5b, 0xd3, + 0xe2, 0x22, 0x3a, 0x53, 0x22, 0xf6, 0xe0, 0x2c, 0x22, 0x9d, 0x79, 0xae, 0xa0, 0x60, 0xd8, 0x7f, + 0x33, 0xe1, 0x1a, 0xc7, 0xbd, 0xcb, 0x0d, 0xb8, 0x93, 0x05, 0xc1, 0x05, 0x1e, 0x58, 0x81, 0x46, + 0x86, 0xd3, 0x21, 0xfc, 0x82, 0x62, 0xf3, 0xc4, 0x34, 0x20, 0xbb, 0xe4, 0x94, 0x04, 0x1c, 0xf8, + 0xba, 0x53, 0x30, 0xac, 0x55, 0x98, 0x7b, 0x8b, 0xfa, 0x21, 0xc7, 0x64, 0x86, 0xff, 0x28, 0x69, + 0xf6, 0x5b, 0xe8, 0xf7, 0x4f, 0x42, 0xe6, 0x52, 0x84, 0x5b, 0xd2, 0xaa, 0x27, 0x1a, 0xba, 0x27, + 0x9e, 0x87, 0x05, 0x37, 0x8a, 0xba, 0x6e, 0x38, 0x20, 0x31, 0x4e, 0x3a, 0xcb, 0xf5, 0x96, 0xb8, + 0xcc, 0x1f, 0x6c, 0xa6, 0x1e, 0xcd, 0xe2, 0x3e, 0xe1, 0x70, 0xd7, 0x1d, 0x85, 0xc3, 0xf4, 0xd0, + 0x88, 0xc4, 0x0a, 0x8c, 0x88, 0x7c, 0x89, 0x2b, 0xbc, 0x02, 0xd2, 0x2b, 0xcc, 0x8f, 0x59, 0x4a, + 0x76, 0x42, 0x8f, 0x2f, 0xaa, 0x25, 0xfc, 0x58, 0xb0, 0xec, 0x9f, 0x18, 0xb0, 0x70, 0x90, 0x1d, + 0x06, 0x7e, 0x9f, 0xab, 0x60, 0xb0, 0x16, 0xe0, 0x19, 0x1a, 0x78, 0x2a, 0x04, 0xe6, 0x64, 0x08, + 0x6a, 0x3a, 0x04, 0x2b, 0xd0, 0x18, 0x90, 0xd0, 0x23, 0xb1, 0x80, 0x54, 0x50, 0xc2, 0xd4, 0x7a, + 0x6e, 0xaa, 0xfd, 0x0b, 0x13, 0xe6, 0x3e, 0x60, 0x13, 0xd6, 0xa0, 0x15, 0x1d, 0xd3, 0x90, 0xec, + 0x65, 0x2c, 0xac, 0x84, 0x2d, 0x2a, 0xcb, 0xba, 0x0e, 0xf5, 0x43, 0x3f, 0x4e, 0x8f, 0xb9, 0x5f, + 0xdb, 0x0e, 0x12, 0x8c, 0x4b, 0x86, 0xae, 0x8f, 0xce, 0x6c, 0x3a, 0x48, 0x88, 0x05, 0xcd, 0x49, + 0xec, 0xf5, 0x3d, 0xd6, 0xac, 0xec, 0xb1, 0x6a, 0x6c, 0xc0, 0xb8, 0xd8, 0xb0, 0xff, 0x6d, 0x00, + 0xdc, 0x89, 0x7d, 0x12, 0x7a, 0x1c, 0x9a, 0xd2, 0xe6, 0x36, 0xaa, 0x9b, 0x7b, 0x05, 0x1a, 0x31, + 0x19, 0xba, 0xf1, 0x49, 0x1e, 0xfc, 0x48, 0x95, 0x0c, 0xaa, 0x55, 0x0c, 0x7a, 0x15, 0xe0, 0x88, + 0xcf, 0xc3, 0xf4, 0x70, 0xa8, 0x5a, 0x2f, 0x7f, 0xe2, 0x56, 0x25, 0x0d, 0xde, 0xca, 0xbd, 0xe4, + 0x28, 0xc3, 0xd9, 0xce, 0x72, 0x3d, 0x4f, 0x04, 0x70, 0x1d, 0x77, 0x96, 0x64, 0x8c, 0x89, 0xdf, + 0xc6, 0x39, 0xf1, 0x3b, 0x2b, 0x83, 0xe2, 0x9f, 0x06, 0x34, 0x37, 0x03, 0xb7, 0x7f, 0x32, 0xe5, + 0xd2, 0xf5, 0x25, 0x9a, 0x95, 0x25, 0xde, 0x85, 0xf6, 0x21, 0x53, 0x97, 0x2f, 0x81, 0xa3, 0xd0, + 0x7a, 0xf9, 0x53, 0x63, 0x56, 0xa9, 0x6f, 0x0a, 0x47, 0x97, 0xd3, 0x97, 0x3b, 0x73, 0xf1, 0x72, + 0xeb, 0xe7, 0x2c, 0xb7, 0x21, 0x97, 0xfb, 0x57, 0x13, 0xe6, 0x79, 0xa2, 0x73, 0xc8, 0x28, 0x23, + 0x49, 0x6a, 0x7d, 0x1d, 0xe6, 0xb2, 0xdc, 0x54, 0x63, 0x5a, 0x53, 0xa5, 0x88, 0xf5, 0x8a, 0x48, + 0xab, 0x5c, 0xde, 0xe4, 0xf2, 0x37, 0xc6, 0xc8, 0xcb, 0x9a, 0xe6, 0x14, 0xc3, 0x59, 0x09, 0x3a, + 0x76, 0x43, 0x2f, 0x20, 0x0e, 0x49, 0xb2, 0x20, 0x15, 0xd9, 0x52, 0xe3, 0x61, 0xa4, 0x8d, 0xba, + 0xc9, 0x40, 0x14, 0x28, 0x41, 0x31, 0x74, 0x70, 0x1c, 0xfb, 0x09, 0x97, 0x5e, 0x30, 0xd8, 0x46, + 0x8d, 0xc9, 0x88, 0x7b, 0x08, 0xb7, 0x55, 0x4e, 0x16, 0x73, 0x0a, 0xd4, 0x30, 0x10, 0x34, 0x1e, + 0x73, 0x31, 0xd2, 0x5c, 0x01, 0x56, 0x26, 0x85, 0x53, 0x2e, 0x4c, 0xf6, 0xdf, 0x6b, 0xd0, 0xc6, + 0xed, 0x93, 0x83, 0x7a, 0x93, 0xc5, 0x39, 0x1d, 0x6a, 0x51, 0xa4, 0x70, 0x98, 0x15, 0x8c, 0xda, + 0xd3, 0x13, 0x8d, 0xc6, 0x63, 0xa1, 0xc8, 0xe8, 0x3b, 0x5a, 0xc2, 0x51, 0x59, 0xf9, 0x2c, 0x77, + 0xd5, 0xc4, 0xa3, 0x70, 0x58, 0x2a, 0x4b, 0xa9, 0x16, 0x1d, 0x92, 0x66, 0xb2, 0x29, 0x95, 0xf3, + 0x63, 0x7c, 0x28, 0x1c, 0x86, 0x6f, 0x4a, 0xf3, 0xb9, 0x11, 0xa4, 0x82, 0x81, 0x9a, 0xc5, 0xbc, + 0x58, 0x4a, 0x24, 0x5d, 0xf1, 0x6a, 0xf3, 0x5c, 0xaf, 0x82, 0xe6, 0x55, 0x7d, 0x73, 0xb5, 0x2a, + 0x9b, 0x6b, 0x1d, 0xda, 0xa8, 0x27, 0x0f, 0xfa, 0x79, 0x2c, 0xf5, 0x1a, 0x53, 0x8f, 0x8d, 0x76, + 0x39, 0x36, 0x74, 0xef, 0x2e, 0x4c, 0xf0, 0xee, 0xa2, 0xf4, 0xee, 0xef, 0x4d, 0x80, 0x6d, 0x12, + 0xb9, 0x71, 0x3a, 0x24, 0x61, 0xca, 0x96, 0xe7, 0x49, 0x4a, 0x3a, 0x57, 0xe3, 0xa9, 0x75, 0xc2, + 0xd4, 0xeb, 0x84, 0x05, 0x33, 0x1c, 0x70, 0xf4, 0x26, 0xff, 0x9b, 0x81, 0x19, 0xb9, 0x31, 0x6a, + 0xc3, 0x20, 0x97, 0x34, 0xab, 0x03, 0x34, 0xf6, 0x44, 0xe5, 0xa8, 0x3b, 0x48, 0xb0, 0xcd, 0x5f, + 0xcc, 0xc7, 0x1b, 0x9a, 0x06, 0xe6, 0x75, 0x9d, 0x7b, 0x61, 0x0f, 0xf6, 0x22, 0x2c, 0x25, 0xd9, + 0x61, 0xb1, 0xb8, 0xbd, 0x6c, 0x28, 0xc2, 0xbd, 0xc2, 0x67, 0xa0, 0x62, 0x73, 0xc6, 0x06, 0x61, + 0xa9, 0x29, 0x18, 0xe5, 0xae, 0xc0, 0x7e, 0xdb, 0x84, 0xa5, 0xfd, 0x78, 0xe0, 0x86, 0xfe, 0xf7, + 0x79, 0xbb, 0xc9, 0x13, 0xf8, 0x65, 0x4a, 0xee, 0x1a, 0xb4, 0x48, 0x38, 0x08, 0xfc, 0xe4, 0x78, + 0xaf, 0xc0, 0x4d, 0x65, 0xa9, 0x60, 0xcf, 0x4c, 0x2a, 0xca, 0x75, 0xad, 0x28, 0xaf, 0x40, 0x63, + 0x48, 0x0f, 0xfd, 0x20, 0x8f, 0x7b, 0x41, 0xf1, 0x98, 0x27, 0x01, 0xe1, 0xd5, 0x59, 0xc6, 0x7c, + 0xce, 0x28, 0x0a, 0xf5, 0xdc, 0xd8, 0x42, 0xdd, 0x54, 0x0b, 0xb5, 0x0e, 0x3c, 0x54, 0x80, 0x47, + 0xb8, 0x5a, 0x12, 0xae, 0x3f, 0x1b, 0xb0, 0x54, 0xc0, 0x8d, 0x3d, 0xe8, 0x44, 0xb8, 0x6c, 0x98, + 0xdf, 0x56, 0x23, 0x50, 0x24, 0x0f, 0x95, 0xc7, 0xcc, 0xda, 0xe7, 0x71, 0x83, 0x39, 0x15, 0x09, + 0x06, 0xf4, 0x01, 0x4d, 0x7c, 0xa5, 0xdf, 0x97, 0x34, 0x9b, 0x6d, 0x97, 0xb8, 0x0a, 0x58, 0x48, + 0x31, 0x7e, 0x0f, 0xbb, 0x6e, 0x8c, 0x31, 0x41, 0xb1, 0x25, 0xec, 0xc8, 0x3a, 0xba, 0xf3, 0xd8, + 0x7e, 0xcf, 0x80, 0x25, 0xac, 0x0f, 0xca, 0x66, 0xd9, 0x87, 0x25, 0x5a, 0x8a, 0x02, 0x51, 0x64, + 0x3e, 0x3d, 0xa6, 0x48, 0x94, 0x03, 0xc6, 0xa9, 0x08, 0x5b, 0x6f, 0xc0, 0x75, 0xaf, 0x84, 0xd3, + 0xae, 0x9f, 0xa4, 0x1d, 0x73, 0xad, 0x36, 0x41, 0x69, 0x19, 0x56, 0x67, 0xac, 0x02, 0xfb, 0x07, + 0xd0, 0x39, 0xc8, 0x82, 0xa0, 0x4b, 0x92, 0xc4, 0x1d, 0x90, 0xcd, 0xb3, 0x1e, 0x19, 0x31, 0xbe, + 0x43, 0x92, 0x88, 0x45, 0x18, 0x89, 0xe3, 0x2d, 0xea, 0x11, 0x6e, 0x7c, 0xdd, 0xc9, 0x49, 0x06, + 0x0e, 0x89, 0x63, 0x96, 0x66, 0x44, 0x1f, 0x84, 0x94, 0x75, 0x0b, 0x66, 0x02, 0x66, 0x56, 0x8d, + 0x9b, 0xb5, 0x3a, 0xc6, 0xac, 0x6e, 0x32, 0xd8, 0x76, 0x53, 0xd7, 0xe1, 0xe3, 0xec, 0x21, 0x7c, + 0x6c, 0xfc, 0xec, 0xa3, 0x89, 0x51, 0xc0, 0x3a, 0x15, 0x5e, 0xea, 0x7d, 0x1a, 0xca, 0x20, 0x50, + 0x59, 0xcc, 0xec, 0x04, 0xf5, 0x70, 0x3b, 0xda, 0x4e, 0x4e, 0xda, 0xd7, 0xc1, 0xba, 0x4b, 0xd2, + 0xae, 0xfb, 0x78, 0x23, 0xf4, 0xba, 0x7e, 0xd8, 0x23, 0x23, 0x87, 0x8c, 0xec, 0x1d, 0xb8, 0x56, + 0xe1, 0x26, 0x11, 0xdf, 0x2d, 0xee, 0xe3, 0x1e, 0x19, 0x71, 0x03, 0xda, 0x8e, 0xa0, 0x38, 0x9f, + 0x8f, 0x12, 0x4d, 0x90, 0xa0, 0xec, 0x11, 0x2c, 0x32, 0x57, 0xf5, 0x48, 0xe8, 0x75, 0x93, 0x01, + 0x57, 0xb1, 0x06, 0x2d, 0x44, 0xa0, 0x9b, 0x0c, 0x8a, 0xae, 0x4a, 0x61, 0xb1, 0x11, 0xfd, 0xc0, + 0x67, 0x2e, 0xe1, 0x23, 0xc4, 0x6a, 0x14, 0x16, 0x8b, 0xdd, 0x84, 0x88, 0x43, 0x06, 0x0b, 0xea, + 0x9a, 0x23, 0x69, 0xfb, 0xbd, 0x3a, 0xcc, 0x0a, 0x40, 0xf9, 0x29, 0x91, 0x35, 0xb2, 0x12, 0x2f, + 0xa4, 0xb0, 0xe4, 0xf4, 0x4f, 0x8b, 0xf3, 0x1a, 0x52, 0xea, 0x09, 0xaf, 0xa6, 0x9f, 0xf0, 0x4a, + 0x36, 0xcd, 0x54, 0x6d, 0x2a, 0xad, 0xab, 0x5e, 0x5d, 0x17, 0xcb, 0xb0, 0x3c, 0xe9, 0x1c, 0x04, + 0x6e, 0x7a, 0x44, 0xe3, 0xa1, 0xe8, 0x4b, 0xeb, 0x4e, 0x85, 0xcf, 0xb2, 0x3a, 0xf2, 0x64, 0x59, + 0xc6, 0xdd, 0x55, 0xe2, 0xb2, 0x22, 0x88, 0x9c, 0xbc, 0x3c, 0xe3, 0x81, 0x40, 0x67, 0xa2, 0x6d, + 0x49, 0xe2, 0xd3, 0x90, 0x17, 0x08, 0xac, 0xc2, 0x2a, 0x8b, 0xad, 0x7c, 0x98, 0x0c, 0xee, 0xc4, + 0x74, 0x28, 0x8e, 0x05, 0x39, 0xc9, 0x57, 0x4e, 0xc3, 0x34, 0x2f, 0x2e, 0x2d, 0x94, 0x55, 0x58, + 0x4c, 0x56, 0x90, 0xbc, 0x04, 0xcf, 0x3b, 0x39, 0x69, 0x2d, 0x41, 0x2d, 0x21, 0x23, 0x51, 0x57, + 0xd9, 0x9f, 0x9a, 0xe7, 0x16, 0x75, 0xcf, 0x95, 0x12, 0xe5, 0x12, 0xff, 0x55, 0x4d, 0x94, 0xc5, + 0x99, 0x7f, 0x59, 0x3b, 0xf3, 0x6f, 0xc0, 0x2c, 0x8d, 0x58, 0x9c, 0x27, 0x1d, 0x8b, 0xef, 0xb1, + 0xcf, 0x4c, 0xde, 0x63, 0xb7, 0xf6, 0x71, 0xe4, 0x4e, 0x98, 0xc6, 0x67, 0x4e, 0x2e, 0x67, 0xed, + 0xc2, 0x22, 0x3d, 0x3a, 0x0a, 0xfc, 0x90, 0x1c, 0x64, 0xc9, 0x31, 0xef, 0x5f, 0xaf, 0xf1, 0xd4, + 0x64, 0x8f, 0x4b, 0x4d, 0xfa, 0x48, 0xa7, 0x2c, 0xba, 0xfa, 0x0a, 0xcc, 0xab, 0xd3, 0x30, 0x18, + 0x4e, 0xc8, 0x99, 0x88, 0x41, 0xf6, 0x27, 0x4b, 0xc9, 0xa7, 0x6e, 0x90, 0x61, 0x89, 0x9b, 0x73, + 0x90, 0x78, 0xc5, 0xfc, 0x8a, 0x61, 0xff, 0xdc, 0x80, 0xc5, 0xd2, 0x04, 0x6c, 0x74, 0xea, 0xa7, + 0x01, 0x11, 0x1a, 0x90, 0x60, 0xed, 0x83, 0x47, 0x92, 0xbe, 0x08, 0x61, 0xfe, 0xb7, 0xa8, 0x25, + 0x35, 0x79, 0x28, 0xb4, 0x61, 0xde, 0xdf, 0xef, 0x31, 0x45, 0x3d, 0x9a, 0x85, 0x9e, 0xbc, 0xd8, + 0x51, 0x78, 0x2c, 0x84, 0xfc, 0xfd, 0xde, 0xa6, 0xeb, 0x0d, 0x08, 0x5e, 0xbf, 0xd4, 0xb9, 0x4d, + 0x3a, 0xd3, 0xf6, 0x60, 0xee, 0x81, 0x1f, 0x25, 0x5b, 0x74, 0x38, 0x64, 0x8e, 0xf0, 0x48, 0xca, + 0x0a, 0x9d, 0xc1, 0xfd, 0x2d, 0x28, 0x16, 0x2a, 0x1e, 0x39, 0x72, 0xb3, 0x20, 0x65, 0x43, 0xf3, + 0x8d, 0xab, 0xb0, 0xf8, 0xc5, 0x43, 0x42, 0xc3, 0x6d, 0x94, 0x46, 0x3b, 0x15, 0x8e, 0xfd, 0x17, + 0x13, 0x96, 0xf8, 0xf1, 0x60, 0x8b, 0xbb, 0xdd, 0xe3, 0x42, 0x2f, 0x43, 0x9d, 0x6f, 0x43, 0x51, + 0x2d, 0xce, 0x3f, 0x52, 0xe0, 0x50, 0xeb, 0x36, 0x34, 0x68, 0xc4, 0x4b, 0x0c, 0x9e, 0x43, 0x9e, + 0x9f, 0x24, 0xa4, 0xdf, 0xf1, 0x38, 0x42, 0xca, 0xba, 0x03, 0x30, 0x2c, 0x2a, 0x0a, 0xa6, 0xee, + 0x69, 0x75, 0x28, 0x92, 0x0c, 0x5c, 0x99, 0x86, 0xe5, 0x45, 0x4f, 0xcd, 0xd1, 0x99, 0xd6, 0x1e, + 0x2c, 0x70, 0xb3, 0xf7, 0xf3, 0xb3, 0x25, 0xf7, 0xc1, 0xf4, 0x33, 0x96, 0xa4, 0xed, 0x5f, 0x1b, + 0x02, 0x46, 0xf6, 0x6b, 0x8f, 0x20, 0xf6, 0x05, 0x24, 0xc6, 0xa5, 0x20, 0x59, 0x85, 0xb9, 0x61, + 0xa6, 0x1c, 0x75, 0x6b, 0x8e, 0xa4, 0x0b, 0x17, 0xd5, 0xa6, 0x76, 0x91, 0xfd, 0x1b, 0x03, 0x3a, + 0xaf, 0x51, 0x3f, 0xe4, 0x3f, 0x6c, 0x44, 0x51, 0x20, 0x6e, 0x23, 0x2f, 0xed, 0xf3, 0x6f, 0x40, + 0xd3, 0x45, 0x35, 0x61, 0x2a, 0xdc, 0x3e, 0xc5, 0xf1, 0xb5, 0x90, 0x51, 0x4e, 0x22, 0x35, 0xf5, + 0x24, 0x62, 0xbf, 0x63, 0xc0, 0x02, 0x82, 0xf2, 0x7a, 0xe6, 0xa7, 0x97, 0xb6, 0x6f, 0x13, 0xe6, + 0x46, 0x99, 0x9f, 0x5e, 0x22, 0x2a, 0xa5, 0x5c, 0x35, 0x9e, 0x6a, 0x63, 0xe2, 0xc9, 0x7e, 0xd7, + 0x80, 0x1b, 0x65, 0x58, 0x37, 0xfa, 0x7d, 0x12, 0x3d, 0xc9, 0x2d, 0xa5, 0x9d, 0xc4, 0x66, 0x4a, + 0x27, 0xb1, 0xb1, 0x26, 0x3b, 0xe4, 0x2d, 0xd2, 0x7f, 0x7a, 0x4d, 0xfe, 0xb1, 0x09, 0x1f, 0xbf, + 0x2b, 0x37, 0xde, 0x83, 0xd8, 0x0d, 0x93, 0x23, 0x12, 0xc7, 0x4f, 0xd0, 0xde, 0x5d, 0x68, 0x87, + 0xe4, 0x51, 0x61, 0x93, 0xd8, 0x8e, 0xd3, 0xaa, 0xd1, 0x85, 0xa7, 0xcb, 0x5d, 0xf6, 0x7f, 0x0c, + 0x58, 0x42, 0x3d, 0xdf, 0xf4, 0xfb, 0x27, 0x4f, 0x70, 0xf1, 0x7b, 0xb0, 0x70, 0xc2, 0x2d, 0x60, + 0xd4, 0x25, 0xd2, 0x76, 0x49, 0x7a, 0xca, 0xe5, 0xff, 0xd7, 0x80, 0x65, 0x54, 0x74, 0x3f, 0x3c, + 0xf5, 0x9f, 0x64, 0xb0, 0x1e, 0xc0, 0xa2, 0x8f, 0x26, 0x5c, 0x12, 0x80, 0xb2, 0xf8, 0x94, 0x08, + 0xfc, 0xd1, 0x80, 0x45, 0xd4, 0xb4, 0x13, 0xa6, 0x24, 0xbe, 0xf4, 0xfa, 0xef, 0xb1, 0xd3, 0x7d, + 0x1a, 0xbb, 0xe1, 0x65, 0x32, 0xa4, 0x2a, 0x3a, 0x65, 0x92, 0x7c, 0xc7, 0x00, 0x8b, 0xab, 0xda, + 0xf6, 0x93, 0xa1, 0x9f, 0x24, 0x4f, 0xd0, 0x75, 0xd3, 0x19, 0xfc, 0x4b, 0x13, 0xae, 0x2b, 0x5a, + 0xba, 0x59, 0xfa, 0xb4, 0x9b, 0x6c, 0x6d, 0x43, 0x93, 0xf5, 0x08, 0xea, 0x15, 0xff, 0xb4, 0x13, + 0x15, 0x82, 0xac, 0x8b, 0xe5, 0x44, 0x8f, 0xf4, 0x69, 0xe8, 0x25, 0xbc, 0x39, 0x6a, 0x3b, 0x1a, + 0x8f, 0xa5, 0xa1, 0x55, 0x45, 0xcd, 0x96, 0x1b, 0xf6, 0x49, 0xf0, 0xcc, 0x40, 0x64, 0xff, 0xce, + 0x80, 0x05, 0x1c, 0xf2, 0xf4, 0x2f, 0x99, 0xd5, 0x7a, 0x0c, 0xe4, 0x0f, 0x8d, 0x97, 0xec, 0x13, + 0x58, 0xc6, 0x5b, 0x7d, 0xa5, 0x3d, 0x61, 0x07, 0x5f, 0xd7, 0xc3, 0xb3, 0xac, 0xc1, 0x85, 0x72, + 0x52, 0x7f, 0xaf, 0x11, 0x4f, 0xf2, 0xc5, 0x7b, 0xcd, 0x4d, 0x00, 0xd7, 0xf3, 0xde, 0xa0, 0xb1, + 0xe7, 0x87, 0x79, 0xaf, 0xa9, 0x70, 0xec, 0xd7, 0x60, 0x9e, 0x1d, 0xbd, 0x1f, 0x28, 0xf7, 0xf3, + 0xe7, 0xbe, 0x20, 0xa8, 0x77, 0xfb, 0xa6, 0x7e, 0xb7, 0x6f, 0x7f, 0x0f, 0x3e, 0x5a, 0x31, 0x9c, + 0x63, 0xbd, 0x85, 0xcf, 0x0e, 0xf9, 0x24, 0x02, 0xf2, 0x4f, 0x8e, 0x41, 0x4f, 0xb5, 0xc5, 0xd1, + 0x84, 0xec, 0x1f, 0x19, 0xf0, 0x5c, 0x45, 0xfd, 0x46, 0x14, 0xc5, 0xf4, 0x54, 0xb8, 0xf4, 0x2a, + 0xa6, 0xd1, 0xfb, 0x30, 0xb3, 0xdc, 0x87, 0x8d, 0x35, 0x42, 0xeb, 0x1d, 0x3f, 0x00, 0x23, 0x7e, + 0x6b, 0xc0, 0xa2, 0x30, 0xc2, 0xf3, 0xc4, 0xb4, 0x5f, 0x86, 0x06, 0x3e, 0x59, 0x8a, 0x09, 0x9f, + 0x1b, 0x3b, 0x61, 0xfe, 0xd4, 0xea, 0x88, 0xc1, 0xd5, 0x88, 0x34, 0xc7, 0xe5, 0x8d, 0xaf, 0xca, + 0xb8, 0x9f, 0xfa, 0x51, 0x51, 0x08, 0xd8, 0xdf, 0xce, 0x83, 0x79, 0x9b, 0x04, 0xe4, 0x2a, 0x31, + 0xb2, 0x1f, 0xc2, 0x02, 0x7f, 0x3f, 0x2d, 0x30, 0xb8, 0x12, 0xb5, 0x6f, 0xc0, 0x12, 0x57, 0x7b, + 0xe5, 0xf6, 0xca, 0xdd, 0xc1, 0xf0, 0xd9, 0x3a, 0x76, 0xc3, 0xc1, 0x55, 0x6a, 0xff, 0x02, 0x5c, + 0xcb, 0xb1, 0x7f, 0x18, 0x79, 0xf2, 0x3e, 0x63, 0xc2, 0x2d, 0xae, 0xfd, 0x45, 0x58, 0xd9, 0xa2, + 0xe1, 0x29, 0x89, 0x13, 0xbc, 0xe3, 0xe6, 0x22, 0xb9, 0x84, 0xb6, 0xf9, 0x05, 0x65, 0xbf, 0x05, + 0xab, 0xaa, 0x44, 0x8f, 0xa4, 0x07, 0xb1, 0x7f, 0xaa, 0x48, 0x89, 0x5b, 0x4e, 0x43, 0xbb, 0xe5, + 0x2c, 0x6e, 0x45, 0x4d, 0xed, 0x56, 0xf4, 0x06, 0x34, 0xfd, 0x44, 0x28, 0xe0, 0x41, 0x35, 0xe7, + 0x14, 0x0c, 0xbb, 0x07, 0xcb, 0xe2, 0x45, 0xf3, 0xc0, 0x1d, 0xf8, 0x21, 0x66, 0xc0, 0x9b, 0x00, + 0x91, 0x3b, 0xc8, 0xbf, 0x68, 0xc0, 0x0b, 0x71, 0x85, 0xc3, 0x7e, 0x4f, 0x8e, 0xe9, 0x23, 0xf1, + 0xbb, 0x89, 0xbf, 0x17, 0x1c, 0xfb, 0x5b, 0x60, 0x39, 0x24, 0x89, 0x68, 0x98, 0x10, 0x45, 0xeb, + 0x1a, 0xb4, 0xb6, 0xb2, 0x38, 0x26, 0x21, 0x9b, 0x2a, 0x7f, 0xde, 0x57, 0x59, 0x4c, 0x6f, 0xaf, + 0xd0, 0x8b, 0x97, 0xa8, 0x0a, 0xc7, 0xfe, 0x55, 0x0d, 0x9a, 0x3d, 0x7f, 0x10, 0xba, 0x81, 0x43, + 0x46, 0xd6, 0xd7, 0xa0, 0x81, 0xad, 0xad, 0x70, 0xe3, 0xb8, 0x4b, 0x3d, 0x1c, 0x8d, 0x3d, 0xbc, + 0x43, 0x46, 0xf7, 0x3e, 0xe2, 0x08, 0x19, 0xeb, 0x75, 0x68, 0xe3, 0x5f, 0xf7, 0xf1, 0xaa, 0x42, + 0xd4, 0x99, 0xcf, 0x5e, 0xa0, 0x44, 0x8c, 0x46, 0x5d, 0xba, 0x06, 0x66, 0x50, 0x9f, 0x97, 0x3e, + 0xb1, 0x77, 0x27, 0x1b, 0x84, 0x15, 0x52, 0x18, 0x84, 0x32, 0x4c, 0xda, 0xe5, 0x87, 0x79, 0xd1, + 0x2e, 0x4c, 0x96, 0xc6, 0x33, 0xbf, 0x90, 0x46, 0x19, 0x26, 0x7d, 0x9c, 0x85, 0x83, 0x87, 0x91, + 0xb8, 0x63, 0x9a, 0x2c, 0x7d, 0x8f, 0x0f, 0x13, 0xd2, 0x28, 0xc3, 0xa4, 0x63, 0x9e, 0x59, 0x39, + 0xe8, 0xe7, 0x49, 0x63, 0x02, 0x16, 0xd2, 0x28, 0xb3, 0xd9, 0x84, 0xd9, 0xc8, 0x3d, 0x0b, 0xa8, + 0xeb, 0xd9, 0x6f, 0xd7, 0x00, 0xf2, 0x81, 0x09, 0xaf, 0xe2, 0x9a, 0x8b, 0xd6, 0x2f, 0x74, 0x51, + 0x14, 0x9c, 0x29, 0x4e, 0xea, 0x8d, 0x77, 0xd2, 0xe7, 0xa6, 0x75, 0x12, 0x6a, 0x2b, 0xb9, 0xe9, + 0x76, 0xc9, 0x4d, 0xeb, 0x17, 0xba, 0x49, 0x18, 0x25, 0x1c, 0x75, 0xbb, 0xe4, 0xa8, 0xf5, 0x0b, + 0x1d, 0x25, 0xe4, 0x85, 0xab, 0x6e, 0x97, 0x5c, 0xb5, 0x7e, 0xa1, 0xab, 0x84, 0xbc, 0x70, 0xd6, + 0xed, 0x92, 0xb3, 0xd6, 0x2f, 0x74, 0x96, 0x90, 0xaf, 0xba, 0xeb, 0x5d, 0x13, 0x16, 0x38, 0x64, + 0xf8, 0xa0, 0x14, 0x1e, 0x51, 0x7e, 0x6f, 0xcc, 0xe1, 0xd2, 0x3f, 0x90, 0xd1, 0x99, 0xd6, 0xe7, + 0x61, 0x19, 0x19, 0xe2, 0x83, 0x0a, 0xf9, 0x42, 0xd7, 0x74, 0xaa, 0x3f, 0xf0, 0x27, 0x80, 0x2c, + 0x49, 0xe9, 0x70, 0xdb, 0x4d, 0xdd, 0xbc, 0x33, 0x2a, 0x38, 0xea, 0x03, 0xcd, 0x4c, 0xe5, 0x13, + 0xbc, 0x98, 0xd2, 0xa1, 0x7c, 0x79, 0x11, 0x14, 0x93, 0x48, 0xfd, 0x21, 0xa1, 0x59, 0x2a, 0xd2, + 0x44, 0x4e, 0xe2, 0x23, 0xb6, 0xe7, 0xbb, 0xfc, 0x59, 0x43, 0xbc, 0xf0, 0x4a, 0x06, 0xcf, 0x6c, + 0xc5, 0x33, 0x8d, 0xf8, 0x44, 0xae, 0xe0, 0x5c, 0xfc, 0xa4, 0x62, 0xff, 0xc3, 0x80, 0x6b, 0x07, + 0x6e, 0x9c, 0xfa, 0x7d, 0x3f, 0x72, 0xc3, 0xb4, 0x4b, 0x52, 0x97, 0xaf, 0x41, 0xfb, 0x4a, 0xc6, + 0x78, 0x7f, 0x5f, 0xc9, 0x1c, 0xc0, 0xe2, 0xa0, 0xe8, 0x65, 0x95, 0xef, 0x6c, 0xa6, 0x3e, 0xe3, + 0x97, 0xc4, 0xb5, 0x4f, 0x7e, 0x6a, 0xef, 0xfb, 0x93, 0x1f, 0xfb, 0xa7, 0x26, 0x2c, 0x96, 0x52, + 0x27, 0x6b, 0x47, 0xb1, 0xd1, 0x90, 0x31, 0x21, 0x69, 0x6b, 0x03, 0xc0, 0x97, 0x61, 0x74, 0xce, + 0x25, 0xad, 0x1e, 0x6b, 0x8e, 0x22, 0x34, 0xee, 0xad, 0xa6, 0x76, 0xe9, 0xb7, 0x1a, 0xeb, 0x1e, + 0xb4, 0xa2, 0xc2, 0x49, 0xe7, 0x1c, 0xc0, 0xc6, 0xb8, 0xd2, 0x51, 0x45, 0xed, 0xef, 0xc2, 0x72, + 0x25, 0x43, 0xf1, 0xa7, 0x1b, 0x7a, 0x42, 0x42, 0xf9, 0x74, 0xc3, 0x08, 0x25, 0x58, 0xcd, 0x72, + 0xb0, 0x06, 0xfe, 0xa9, 0xfa, 0x4d, 0xa1, 0x20, 0xed, 0x9f, 0x99, 0xb0, 0x32, 0xbe, 0xba, 0x3c, + 0xab, 0x70, 0x1f, 0x42, 0x67, 0x52, 0x26, 0xbf, 0x32, 0xd4, 0x8b, 0xe8, 0x96, 0x75, 0xf8, 0x59, + 0x85, 0xfb, 0x5a, 0x1e, 0xdd, 0x4a, 0xa9, 0xb3, 0xff, 0x20, 0xf1, 0x91, 0x9d, 0xc6, 0x33, 0x8a, + 0x8f, 0xf5, 0x22, 0x2c, 0xe1, 0x32, 0x95, 0xc7, 0x7d, 0x6c, 0x5c, 0x2b, 0xfc, 0x22, 0x53, 0x28, + 0x65, 0xff, 0xca, 0x62, 0xf6, 0x4f, 0x46, 0xee, 0x13, 0xd9, 0xbf, 0x7d, 0xa8, 0x7c, 0x52, 0x44, + 0x9a, 0xd2, 0xd4, 0x28, 0x91, 0x26, 0xfb, 0xca, 0xff, 0x47, 0xda, 0xc5, 0x91, 0x26, 0xb1, 0x54, + 0x1a, 0x3c, 0xfb, 0x87, 0xd0, 0xde, 0x26, 0x41, 0x37, 0x19, 0xe4, 0x9f, 0x15, 0x9d, 0x07, 0xe4, + 0xa4, 0x7f, 0x6d, 0x98, 0xf8, 0x41, 0x51, 0xf9, 0x63, 0xa4, 0x99, 0xca, 0xc7, 0x48, 0xf6, 0x26, + 0x2c, 0xa8, 0x06, 0x5c, 0xe6, 0xab, 0xaa, 0xcd, 0x1b, 0xdf, 0x59, 0xbd, 0xf5, 0x12, 0xfe, 0x13, + 0xcd, 0xab, 0x15, 0x10, 0x0f, 0x1b, 0xfc, 0x9f, 0x6a, 0xbe, 0xf4, 0xbf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x6c, 0xa8, 0x04, 0xcf, 0x67, 0x33, 0x00, 0x00, } diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index 9f8c51917..ad4de4737 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -149,7 +149,7 @@ message DepartmentMember { message UserInDepartment { - OrganizationUser departmentUser = 1; + OrganizationUser organizationUser = 1; repeated DepartmentMember departmentMemberList = 2; } diff --git a/script/path_info.cfg b/script/path_info.cfg index 84e81adfd..a2281f35c 100644 --- a/script/path_info.cfg +++ b/script/path_info.cfg @@ -48,7 +48,8 @@ service_source_root=( ../cmd/rpc/open_im_admin_cms/ ../cmd/rpc/open_im_message_cms/ ../cmd/rpc/open_im_statistics/ - ../cmd/rpc/open_im_office/ + ../cmd/rpc/open_im_office/ + ../cmd/rpc/organization/ ${msg_gateway_source_root} ${msg_transfer_source_root} ${msg_source_root} @@ -70,6 +71,7 @@ service_names=( open_im_message_cms open_im_statistics open_im_office + open_im_organization ${msg_gateway_name} ${msg_transfer_name} ${msg_name} From cad147faf80ba980017d4066eb344ec5a533da12 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:14:47 +0800 Subject: [PATCH 03/59] organization --- cmd/rpc/open_im_organization/main.go | 2 +- config/config.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/rpc/open_im_organization/main.go b/cmd/rpc/open_im_organization/main.go index cb603ca37..8fa33964d 100644 --- a/cmd/rpc/open_im_organization/main.go +++ b/cmd/rpc/open_im_organization/main.go @@ -7,7 +7,7 @@ import ( ) func main() { - rpcPort := flag.Int("port", 10100, "get RpcOrganizationPort from cmd,default 10100 as port") + rpcPort := flag.Int("port", 11200, "get RpcOrganizationPort from cmd,default 11200 as port") flag.Parse() fmt.Println("start organization rpc server, port: ", *rpcPort) rpcServer := group.NewGroupServer(*rpcPort) diff --git a/config/config.yaml b/config/config.yaml index b2393c2a5..520cd8486 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -122,6 +122,7 @@ rpcport: #rpc服务端口 默认即可 openImMessageCmsPort: [ 10900 ] openImAdminCmsPort: [ 11000 ] openImOfficePort: [ 11100 ] + openImOrganizationPort: [ 11200 ] c2c: callbackBeforeSendMsg: switch: false From 0d5132f7105c1a120868dd485741037ce32e05db Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:17:21 +0800 Subject: [PATCH 04/59] organization --- pkg/proto/organization/organization.pb.go | 1780 +++++++++++++++++++++ script/start_rpc_service.sh | 3 +- 2 files changed, 1782 insertions(+), 1 deletion(-) create mode 100644 pkg/proto/organization/organization.pb.go diff --git a/pkg/proto/organization/organization.pb.go b/pkg/proto/organization/organization.pb.go new file mode 100644 index 000000000..844dfd947 --- /dev/null +++ b/pkg/proto/organization/organization.pb.go @@ -0,0 +1,1780 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: organization/organization.proto + +package organization // import "./organization" + +import proto "github.com/golang/protobuf/proto" +import fmt "fmt" +import math "math" +import sdk_ws "Open_IM/pkg/proto/sdk_ws" + +import ( + context "golang.org/x/net/context" + grpc "google.golang.org/grpc" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package + +type CreateDepartmentReq struct { + DepartmentInfo *sdk_ws.Department `protobuf:"bytes,1,opt,name=departmentInfo" json:"departmentInfo,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CreateDepartmentReq) Reset() { *m = CreateDepartmentReq{} } +func (m *CreateDepartmentReq) String() string { return proto.CompactTextString(m) } +func (*CreateDepartmentReq) ProtoMessage() {} +func (*CreateDepartmentReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{0} +} +func (m *CreateDepartmentReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateDepartmentReq.Unmarshal(m, b) +} +func (m *CreateDepartmentReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateDepartmentReq.Marshal(b, m, deterministic) +} +func (dst *CreateDepartmentReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateDepartmentReq.Merge(dst, src) +} +func (m *CreateDepartmentReq) XXX_Size() int { + return xxx_messageInfo_CreateDepartmentReq.Size(m) +} +func (m *CreateDepartmentReq) XXX_DiscardUnknown() { + xxx_messageInfo_CreateDepartmentReq.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateDepartmentReq proto.InternalMessageInfo + +func (m *CreateDepartmentReq) GetDepartmentInfo() *sdk_ws.Department { + if m != nil { + return m.DepartmentInfo + } + return nil +} + +func (m *CreateDepartmentReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *CreateDepartmentReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type CreateDepartmentResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + DepartmentInfo *sdk_ws.Department `protobuf:"bytes,3,opt,name=departmentInfo" json:"departmentInfo,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CreateDepartmentResp) Reset() { *m = CreateDepartmentResp{} } +func (m *CreateDepartmentResp) String() string { return proto.CompactTextString(m) } +func (*CreateDepartmentResp) ProtoMessage() {} +func (*CreateDepartmentResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{1} +} +func (m *CreateDepartmentResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateDepartmentResp.Unmarshal(m, b) +} +func (m *CreateDepartmentResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateDepartmentResp.Marshal(b, m, deterministic) +} +func (dst *CreateDepartmentResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateDepartmentResp.Merge(dst, src) +} +func (m *CreateDepartmentResp) XXX_Size() int { + return xxx_messageInfo_CreateDepartmentResp.Size(m) +} +func (m *CreateDepartmentResp) XXX_DiscardUnknown() { + xxx_messageInfo_CreateDepartmentResp.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateDepartmentResp proto.InternalMessageInfo + +func (m *CreateDepartmentResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *CreateDepartmentResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +func (m *CreateDepartmentResp) GetDepartmentInfo() *sdk_ws.Department { + if m != nil { + return m.DepartmentInfo + } + return nil +} + +type UpdateDepartmentReq struct { + DepartmentInfo *sdk_ws.Department `protobuf:"bytes,1,opt,name=departmentInfo" json:"departmentInfo,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *UpdateDepartmentReq) Reset() { *m = UpdateDepartmentReq{} } +func (m *UpdateDepartmentReq) String() string { return proto.CompactTextString(m) } +func (*UpdateDepartmentReq) ProtoMessage() {} +func (*UpdateDepartmentReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{2} +} +func (m *UpdateDepartmentReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UpdateDepartmentReq.Unmarshal(m, b) +} +func (m *UpdateDepartmentReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UpdateDepartmentReq.Marshal(b, m, deterministic) +} +func (dst *UpdateDepartmentReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateDepartmentReq.Merge(dst, src) +} +func (m *UpdateDepartmentReq) XXX_Size() int { + return xxx_messageInfo_UpdateDepartmentReq.Size(m) +} +func (m *UpdateDepartmentReq) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateDepartmentReq.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateDepartmentReq proto.InternalMessageInfo + +func (m *UpdateDepartmentReq) GetDepartmentInfo() *sdk_ws.Department { + if m != nil { + return m.DepartmentInfo + } + return nil +} + +func (m *UpdateDepartmentReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *UpdateDepartmentReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type UpdateDepartmentResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *UpdateDepartmentResp) Reset() { *m = UpdateDepartmentResp{} } +func (m *UpdateDepartmentResp) String() string { return proto.CompactTextString(m) } +func (*UpdateDepartmentResp) ProtoMessage() {} +func (*UpdateDepartmentResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{3} +} +func (m *UpdateDepartmentResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UpdateDepartmentResp.Unmarshal(m, b) +} +func (m *UpdateDepartmentResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UpdateDepartmentResp.Marshal(b, m, deterministic) +} +func (dst *UpdateDepartmentResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateDepartmentResp.Merge(dst, src) +} +func (m *UpdateDepartmentResp) XXX_Size() int { + return xxx_messageInfo_UpdateDepartmentResp.Size(m) +} +func (m *UpdateDepartmentResp) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateDepartmentResp.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateDepartmentResp proto.InternalMessageInfo + +func (m *UpdateDepartmentResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *UpdateDepartmentResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +type GetSubDepartmentReq struct { + DepartmentID string `protobuf:"bytes,1,opt,name=departmentID" json:"departmentID,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetSubDepartmentReq) Reset() { *m = GetSubDepartmentReq{} } +func (m *GetSubDepartmentReq) String() string { return proto.CompactTextString(m) } +func (*GetSubDepartmentReq) ProtoMessage() {} +func (*GetSubDepartmentReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{4} +} +func (m *GetSubDepartmentReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetSubDepartmentReq.Unmarshal(m, b) +} +func (m *GetSubDepartmentReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetSubDepartmentReq.Marshal(b, m, deterministic) +} +func (dst *GetSubDepartmentReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetSubDepartmentReq.Merge(dst, src) +} +func (m *GetSubDepartmentReq) XXX_Size() int { + return xxx_messageInfo_GetSubDepartmentReq.Size(m) +} +func (m *GetSubDepartmentReq) XXX_DiscardUnknown() { + xxx_messageInfo_GetSubDepartmentReq.DiscardUnknown(m) +} + +var xxx_messageInfo_GetSubDepartmentReq proto.InternalMessageInfo + +func (m *GetSubDepartmentReq) GetDepartmentID() string { + if m != nil { + return m.DepartmentID + } + return "" +} + +func (m *GetSubDepartmentReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *GetSubDepartmentReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type GetSubDepartmentResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + DepartmentList []*sdk_ws.Department `protobuf:"bytes,3,rep,name=departmentList" json:"departmentList,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetSubDepartmentResp) Reset() { *m = GetSubDepartmentResp{} } +func (m *GetSubDepartmentResp) String() string { return proto.CompactTextString(m) } +func (*GetSubDepartmentResp) ProtoMessage() {} +func (*GetSubDepartmentResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{5} +} +func (m *GetSubDepartmentResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetSubDepartmentResp.Unmarshal(m, b) +} +func (m *GetSubDepartmentResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetSubDepartmentResp.Marshal(b, m, deterministic) +} +func (dst *GetSubDepartmentResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetSubDepartmentResp.Merge(dst, src) +} +func (m *GetSubDepartmentResp) XXX_Size() int { + return xxx_messageInfo_GetSubDepartmentResp.Size(m) +} +func (m *GetSubDepartmentResp) XXX_DiscardUnknown() { + xxx_messageInfo_GetSubDepartmentResp.DiscardUnknown(m) +} + +var xxx_messageInfo_GetSubDepartmentResp proto.InternalMessageInfo + +func (m *GetSubDepartmentResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *GetSubDepartmentResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +func (m *GetSubDepartmentResp) GetDepartmentList() []*sdk_ws.Department { + if m != nil { + return m.DepartmentList + } + return nil +} + +type DeleteDepartmentReq struct { + DepartmentID string `protobuf:"bytes,1,opt,name=departmentID" json:"departmentID,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteDepartmentReq) Reset() { *m = DeleteDepartmentReq{} } +func (m *DeleteDepartmentReq) String() string { return proto.CompactTextString(m) } +func (*DeleteDepartmentReq) ProtoMessage() {} +func (*DeleteDepartmentReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{6} +} +func (m *DeleteDepartmentReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteDepartmentReq.Unmarshal(m, b) +} +func (m *DeleteDepartmentReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteDepartmentReq.Marshal(b, m, deterministic) +} +func (dst *DeleteDepartmentReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteDepartmentReq.Merge(dst, src) +} +func (m *DeleteDepartmentReq) XXX_Size() int { + return xxx_messageInfo_DeleteDepartmentReq.Size(m) +} +func (m *DeleteDepartmentReq) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteDepartmentReq.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteDepartmentReq proto.InternalMessageInfo + +func (m *DeleteDepartmentReq) GetDepartmentID() string { + if m != nil { + return m.DepartmentID + } + return "" +} + +func (m *DeleteDepartmentReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *DeleteDepartmentReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type DeleteDepartmentResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteDepartmentResp) Reset() { *m = DeleteDepartmentResp{} } +func (m *DeleteDepartmentResp) String() string { return proto.CompactTextString(m) } +func (*DeleteDepartmentResp) ProtoMessage() {} +func (*DeleteDepartmentResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{7} +} +func (m *DeleteDepartmentResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteDepartmentResp.Unmarshal(m, b) +} +func (m *DeleteDepartmentResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteDepartmentResp.Marshal(b, m, deterministic) +} +func (dst *DeleteDepartmentResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteDepartmentResp.Merge(dst, src) +} +func (m *DeleteDepartmentResp) XXX_Size() int { + return xxx_messageInfo_DeleteDepartmentResp.Size(m) +} +func (m *DeleteDepartmentResp) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteDepartmentResp.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteDepartmentResp proto.InternalMessageInfo + +func (m *DeleteDepartmentResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *DeleteDepartmentResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +type CreateOrganizationUserReq struct { + OrganizationUser *sdk_ws.OrganizationUser `protobuf:"bytes,1,opt,name=organizationUser" json:"organizationUser,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CreateOrganizationUserReq) Reset() { *m = CreateOrganizationUserReq{} } +func (m *CreateOrganizationUserReq) String() string { return proto.CompactTextString(m) } +func (*CreateOrganizationUserReq) ProtoMessage() {} +func (*CreateOrganizationUserReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{8} +} +func (m *CreateOrganizationUserReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateOrganizationUserReq.Unmarshal(m, b) +} +func (m *CreateOrganizationUserReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateOrganizationUserReq.Marshal(b, m, deterministic) +} +func (dst *CreateOrganizationUserReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateOrganizationUserReq.Merge(dst, src) +} +func (m *CreateOrganizationUserReq) XXX_Size() int { + return xxx_messageInfo_CreateOrganizationUserReq.Size(m) +} +func (m *CreateOrganizationUserReq) XXX_DiscardUnknown() { + xxx_messageInfo_CreateOrganizationUserReq.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateOrganizationUserReq proto.InternalMessageInfo + +func (m *CreateOrganizationUserReq) GetOrganizationUser() *sdk_ws.OrganizationUser { + if m != nil { + return m.OrganizationUser + } + return nil +} + +func (m *CreateOrganizationUserReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *CreateOrganizationUserReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type CreateOrganizationUserResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CreateOrganizationUserResp) Reset() { *m = CreateOrganizationUserResp{} } +func (m *CreateOrganizationUserResp) String() string { return proto.CompactTextString(m) } +func (*CreateOrganizationUserResp) ProtoMessage() {} +func (*CreateOrganizationUserResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{9} +} +func (m *CreateOrganizationUserResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateOrganizationUserResp.Unmarshal(m, b) +} +func (m *CreateOrganizationUserResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateOrganizationUserResp.Marshal(b, m, deterministic) +} +func (dst *CreateOrganizationUserResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateOrganizationUserResp.Merge(dst, src) +} +func (m *CreateOrganizationUserResp) XXX_Size() int { + return xxx_messageInfo_CreateOrganizationUserResp.Size(m) +} +func (m *CreateOrganizationUserResp) XXX_DiscardUnknown() { + xxx_messageInfo_CreateOrganizationUserResp.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateOrganizationUserResp proto.InternalMessageInfo + +func (m *CreateOrganizationUserResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *CreateOrganizationUserResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +type UpdateOrganizationUserReq struct { + OrganizationUser *sdk_ws.OrganizationUser `protobuf:"bytes,1,opt,name=organizationUser" json:"organizationUser,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *UpdateOrganizationUserReq) Reset() { *m = UpdateOrganizationUserReq{} } +func (m *UpdateOrganizationUserReq) String() string { return proto.CompactTextString(m) } +func (*UpdateOrganizationUserReq) ProtoMessage() {} +func (*UpdateOrganizationUserReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{10} +} +func (m *UpdateOrganizationUserReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UpdateOrganizationUserReq.Unmarshal(m, b) +} +func (m *UpdateOrganizationUserReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UpdateOrganizationUserReq.Marshal(b, m, deterministic) +} +func (dst *UpdateOrganizationUserReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateOrganizationUserReq.Merge(dst, src) +} +func (m *UpdateOrganizationUserReq) XXX_Size() int { + return xxx_messageInfo_UpdateOrganizationUserReq.Size(m) +} +func (m *UpdateOrganizationUserReq) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateOrganizationUserReq.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateOrganizationUserReq proto.InternalMessageInfo + +func (m *UpdateOrganizationUserReq) GetOrganizationUser() *sdk_ws.OrganizationUser { + if m != nil { + return m.OrganizationUser + } + return nil +} + +func (m *UpdateOrganizationUserReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *UpdateOrganizationUserReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type UpdateOrganizationUserResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *UpdateOrganizationUserResp) Reset() { *m = UpdateOrganizationUserResp{} } +func (m *UpdateOrganizationUserResp) String() string { return proto.CompactTextString(m) } +func (*UpdateOrganizationUserResp) ProtoMessage() {} +func (*UpdateOrganizationUserResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{11} +} +func (m *UpdateOrganizationUserResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UpdateOrganizationUserResp.Unmarshal(m, b) +} +func (m *UpdateOrganizationUserResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UpdateOrganizationUserResp.Marshal(b, m, deterministic) +} +func (dst *UpdateOrganizationUserResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateOrganizationUserResp.Merge(dst, src) +} +func (m *UpdateOrganizationUserResp) XXX_Size() int { + return xxx_messageInfo_UpdateOrganizationUserResp.Size(m) +} +func (m *UpdateOrganizationUserResp) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateOrganizationUserResp.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateOrganizationUserResp proto.InternalMessageInfo + +func (m *UpdateOrganizationUserResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *UpdateOrganizationUserResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +type CreateDepartmentMemberReq struct { + UserInDepartment *sdk_ws.UserInDepartment `protobuf:"bytes,1,opt,name=userInDepartment" json:"userInDepartment,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CreateDepartmentMemberReq) Reset() { *m = CreateDepartmentMemberReq{} } +func (m *CreateDepartmentMemberReq) String() string { return proto.CompactTextString(m) } +func (*CreateDepartmentMemberReq) ProtoMessage() {} +func (*CreateDepartmentMemberReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{12} +} +func (m *CreateDepartmentMemberReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateDepartmentMemberReq.Unmarshal(m, b) +} +func (m *CreateDepartmentMemberReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateDepartmentMemberReq.Marshal(b, m, deterministic) +} +func (dst *CreateDepartmentMemberReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateDepartmentMemberReq.Merge(dst, src) +} +func (m *CreateDepartmentMemberReq) XXX_Size() int { + return xxx_messageInfo_CreateDepartmentMemberReq.Size(m) +} +func (m *CreateDepartmentMemberReq) XXX_DiscardUnknown() { + xxx_messageInfo_CreateDepartmentMemberReq.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateDepartmentMemberReq proto.InternalMessageInfo + +func (m *CreateDepartmentMemberReq) GetUserInDepartment() *sdk_ws.UserInDepartment { + if m != nil { + return m.UserInDepartment + } + return nil +} + +func (m *CreateDepartmentMemberReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *CreateDepartmentMemberReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type CreateDepartmentMemberResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *CreateDepartmentMemberResp) Reset() { *m = CreateDepartmentMemberResp{} } +func (m *CreateDepartmentMemberResp) String() string { return proto.CompactTextString(m) } +func (*CreateDepartmentMemberResp) ProtoMessage() {} +func (*CreateDepartmentMemberResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{13} +} +func (m *CreateDepartmentMemberResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_CreateDepartmentMemberResp.Unmarshal(m, b) +} +func (m *CreateDepartmentMemberResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_CreateDepartmentMemberResp.Marshal(b, m, deterministic) +} +func (dst *CreateDepartmentMemberResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateDepartmentMemberResp.Merge(dst, src) +} +func (m *CreateDepartmentMemberResp) XXX_Size() int { + return xxx_messageInfo_CreateDepartmentMemberResp.Size(m) +} +func (m *CreateDepartmentMemberResp) XXX_DiscardUnknown() { + xxx_messageInfo_CreateDepartmentMemberResp.DiscardUnknown(m) +} + +var xxx_messageInfo_CreateDepartmentMemberResp proto.InternalMessageInfo + +func (m *CreateDepartmentMemberResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *CreateDepartmentMemberResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +type GetUserInDepartmentReq struct { + UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUserInDepartmentReq) Reset() { *m = GetUserInDepartmentReq{} } +func (m *GetUserInDepartmentReq) String() string { return proto.CompactTextString(m) } +func (*GetUserInDepartmentReq) ProtoMessage() {} +func (*GetUserInDepartmentReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{14} +} +func (m *GetUserInDepartmentReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUserInDepartmentReq.Unmarshal(m, b) +} +func (m *GetUserInDepartmentReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUserInDepartmentReq.Marshal(b, m, deterministic) +} +func (dst *GetUserInDepartmentReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUserInDepartmentReq.Merge(dst, src) +} +func (m *GetUserInDepartmentReq) XXX_Size() int { + return xxx_messageInfo_GetUserInDepartmentReq.Size(m) +} +func (m *GetUserInDepartmentReq) XXX_DiscardUnknown() { + xxx_messageInfo_GetUserInDepartmentReq.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUserInDepartmentReq proto.InternalMessageInfo + +func (m *GetUserInDepartmentReq) GetUserID() string { + if m != nil { + return m.UserID + } + return "" +} + +func (m *GetUserInDepartmentReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *GetUserInDepartmentReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type GetUserInDepartmentResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + UserInDepartment *sdk_ws.UserInDepartment `protobuf:"bytes,3,opt,name=userInDepartment" json:"userInDepartment,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetUserInDepartmentResp) Reset() { *m = GetUserInDepartmentResp{} } +func (m *GetUserInDepartmentResp) String() string { return proto.CompactTextString(m) } +func (*GetUserInDepartmentResp) ProtoMessage() {} +func (*GetUserInDepartmentResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{15} +} +func (m *GetUserInDepartmentResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetUserInDepartmentResp.Unmarshal(m, b) +} +func (m *GetUserInDepartmentResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetUserInDepartmentResp.Marshal(b, m, deterministic) +} +func (dst *GetUserInDepartmentResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetUserInDepartmentResp.Merge(dst, src) +} +func (m *GetUserInDepartmentResp) XXX_Size() int { + return xxx_messageInfo_GetUserInDepartmentResp.Size(m) +} +func (m *GetUserInDepartmentResp) XXX_DiscardUnknown() { + xxx_messageInfo_GetUserInDepartmentResp.DiscardUnknown(m) +} + +var xxx_messageInfo_GetUserInDepartmentResp proto.InternalMessageInfo + +func (m *GetUserInDepartmentResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *GetUserInDepartmentResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +func (m *GetUserInDepartmentResp) GetUserInDepartment() *sdk_ws.UserInDepartment { + if m != nil { + return m.UserInDepartment + } + return nil +} + +type UpdateUserInDepartmentReq struct { + DepartmentMember *sdk_ws.DepartmentMember `protobuf:"bytes,1,opt,name=departmentMember" json:"departmentMember,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *UpdateUserInDepartmentReq) Reset() { *m = UpdateUserInDepartmentReq{} } +func (m *UpdateUserInDepartmentReq) String() string { return proto.CompactTextString(m) } +func (*UpdateUserInDepartmentReq) ProtoMessage() {} +func (*UpdateUserInDepartmentReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{16} +} +func (m *UpdateUserInDepartmentReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UpdateUserInDepartmentReq.Unmarshal(m, b) +} +func (m *UpdateUserInDepartmentReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UpdateUserInDepartmentReq.Marshal(b, m, deterministic) +} +func (dst *UpdateUserInDepartmentReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateUserInDepartmentReq.Merge(dst, src) +} +func (m *UpdateUserInDepartmentReq) XXX_Size() int { + return xxx_messageInfo_UpdateUserInDepartmentReq.Size(m) +} +func (m *UpdateUserInDepartmentReq) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateUserInDepartmentReq.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateUserInDepartmentReq proto.InternalMessageInfo + +func (m *UpdateUserInDepartmentReq) GetDepartmentMember() *sdk_ws.DepartmentMember { + if m != nil { + return m.DepartmentMember + } + return nil +} + +func (m *UpdateUserInDepartmentReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *UpdateUserInDepartmentReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type UpdateUserInDepartmentResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *UpdateUserInDepartmentResp) Reset() { *m = UpdateUserInDepartmentResp{} } +func (m *UpdateUserInDepartmentResp) String() string { return proto.CompactTextString(m) } +func (*UpdateUserInDepartmentResp) ProtoMessage() {} +func (*UpdateUserInDepartmentResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{17} +} +func (m *UpdateUserInDepartmentResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UpdateUserInDepartmentResp.Unmarshal(m, b) +} +func (m *UpdateUserInDepartmentResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UpdateUserInDepartmentResp.Marshal(b, m, deterministic) +} +func (dst *UpdateUserInDepartmentResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateUserInDepartmentResp.Merge(dst, src) +} +func (m *UpdateUserInDepartmentResp) XXX_Size() int { + return xxx_messageInfo_UpdateUserInDepartmentResp.Size(m) +} +func (m *UpdateUserInDepartmentResp) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateUserInDepartmentResp.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateUserInDepartmentResp proto.InternalMessageInfo + +func (m *UpdateUserInDepartmentResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *UpdateUserInDepartmentResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +type DeleteUserInDepartmentReq struct { + UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + DepartmentID string `protobuf:"bytes,4,opt,name=departmentID" json:"departmentID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteUserInDepartmentReq) Reset() { *m = DeleteUserInDepartmentReq{} } +func (m *DeleteUserInDepartmentReq) String() string { return proto.CompactTextString(m) } +func (*DeleteUserInDepartmentReq) ProtoMessage() {} +func (*DeleteUserInDepartmentReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{18} +} +func (m *DeleteUserInDepartmentReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteUserInDepartmentReq.Unmarshal(m, b) +} +func (m *DeleteUserInDepartmentReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteUserInDepartmentReq.Marshal(b, m, deterministic) +} +func (dst *DeleteUserInDepartmentReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteUserInDepartmentReq.Merge(dst, src) +} +func (m *DeleteUserInDepartmentReq) XXX_Size() int { + return xxx_messageInfo_DeleteUserInDepartmentReq.Size(m) +} +func (m *DeleteUserInDepartmentReq) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteUserInDepartmentReq.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteUserInDepartmentReq proto.InternalMessageInfo + +func (m *DeleteUserInDepartmentReq) GetUserID() string { + if m != nil { + return m.UserID + } + return "" +} + +func (m *DeleteUserInDepartmentReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *DeleteUserInDepartmentReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +func (m *DeleteUserInDepartmentReq) GetDepartmentID() string { + if m != nil { + return m.DepartmentID + } + return "" +} + +type DeleteUserInDepartmentResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteUserInDepartmentResp) Reset() { *m = DeleteUserInDepartmentResp{} } +func (m *DeleteUserInDepartmentResp) String() string { return proto.CompactTextString(m) } +func (*DeleteUserInDepartmentResp) ProtoMessage() {} +func (*DeleteUserInDepartmentResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{19} +} +func (m *DeleteUserInDepartmentResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteUserInDepartmentResp.Unmarshal(m, b) +} +func (m *DeleteUserInDepartmentResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteUserInDepartmentResp.Marshal(b, m, deterministic) +} +func (dst *DeleteUserInDepartmentResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteUserInDepartmentResp.Merge(dst, src) +} +func (m *DeleteUserInDepartmentResp) XXX_Size() int { + return xxx_messageInfo_DeleteUserInDepartmentResp.Size(m) +} +func (m *DeleteUserInDepartmentResp) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteUserInDepartmentResp.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteUserInDepartmentResp proto.InternalMessageInfo + +func (m *DeleteUserInDepartmentResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *DeleteUserInDepartmentResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +type DeleteOrganizationUserReq struct { + UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteOrganizationUserReq) Reset() { *m = DeleteOrganizationUserReq{} } +func (m *DeleteOrganizationUserReq) String() string { return proto.CompactTextString(m) } +func (*DeleteOrganizationUserReq) ProtoMessage() {} +func (*DeleteOrganizationUserReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{20} +} +func (m *DeleteOrganizationUserReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteOrganizationUserReq.Unmarshal(m, b) +} +func (m *DeleteOrganizationUserReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteOrganizationUserReq.Marshal(b, m, deterministic) +} +func (dst *DeleteOrganizationUserReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteOrganizationUserReq.Merge(dst, src) +} +func (m *DeleteOrganizationUserReq) XXX_Size() int { + return xxx_messageInfo_DeleteOrganizationUserReq.Size(m) +} +func (m *DeleteOrganizationUserReq) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteOrganizationUserReq.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteOrganizationUserReq proto.InternalMessageInfo + +func (m *DeleteOrganizationUserReq) GetUserID() string { + if m != nil { + return m.UserID + } + return "" +} + +func (m *DeleteOrganizationUserReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *DeleteOrganizationUserReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type DeleteOrganizationUserResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *DeleteOrganizationUserResp) Reset() { *m = DeleteOrganizationUserResp{} } +func (m *DeleteOrganizationUserResp) String() string { return proto.CompactTextString(m) } +func (*DeleteOrganizationUserResp) ProtoMessage() {} +func (*DeleteOrganizationUserResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{21} +} +func (m *DeleteOrganizationUserResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_DeleteOrganizationUserResp.Unmarshal(m, b) +} +func (m *DeleteOrganizationUserResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_DeleteOrganizationUserResp.Marshal(b, m, deterministic) +} +func (dst *DeleteOrganizationUserResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_DeleteOrganizationUserResp.Merge(dst, src) +} +func (m *DeleteOrganizationUserResp) XXX_Size() int { + return xxx_messageInfo_DeleteOrganizationUserResp.Size(m) +} +func (m *DeleteOrganizationUserResp) XXX_DiscardUnknown() { + xxx_messageInfo_DeleteOrganizationUserResp.DiscardUnknown(m) +} + +var xxx_messageInfo_DeleteOrganizationUserResp proto.InternalMessageInfo + +func (m *DeleteOrganizationUserResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *DeleteOrganizationUserResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +type GetDepartmentMemberReq struct { + DepartmentID string `protobuf:"bytes,1,opt,name=departmentID" json:"departmentID,omitempty"` + OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetDepartmentMemberReq) Reset() { *m = GetDepartmentMemberReq{} } +func (m *GetDepartmentMemberReq) String() string { return proto.CompactTextString(m) } +func (*GetDepartmentMemberReq) ProtoMessage() {} +func (*GetDepartmentMemberReq) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{22} +} +func (m *GetDepartmentMemberReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetDepartmentMemberReq.Unmarshal(m, b) +} +func (m *GetDepartmentMemberReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetDepartmentMemberReq.Marshal(b, m, deterministic) +} +func (dst *GetDepartmentMemberReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetDepartmentMemberReq.Merge(dst, src) +} +func (m *GetDepartmentMemberReq) XXX_Size() int { + return xxx_messageInfo_GetDepartmentMemberReq.Size(m) +} +func (m *GetDepartmentMemberReq) XXX_DiscardUnknown() { + xxx_messageInfo_GetDepartmentMemberReq.DiscardUnknown(m) +} + +var xxx_messageInfo_GetDepartmentMemberReq proto.InternalMessageInfo + +func (m *GetDepartmentMemberReq) GetDepartmentID() string { + if m != nil { + return m.DepartmentID + } + return "" +} + +func (m *GetDepartmentMemberReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *GetDepartmentMemberReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +type GetDepartmentMemberResp struct { + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + UserInDepartmentList []*sdk_ws.UserInDepartment `protobuf:"bytes,3,rep,name=userInDepartmentList" json:"userInDepartmentList,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GetDepartmentMemberResp) Reset() { *m = GetDepartmentMemberResp{} } +func (m *GetDepartmentMemberResp) String() string { return proto.CompactTextString(m) } +func (*GetDepartmentMemberResp) ProtoMessage() {} +func (*GetDepartmentMemberResp) Descriptor() ([]byte, []int) { + return fileDescriptor_organization_a03f9a4144ed1081, []int{23} +} +func (m *GetDepartmentMemberResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GetDepartmentMemberResp.Unmarshal(m, b) +} +func (m *GetDepartmentMemberResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GetDepartmentMemberResp.Marshal(b, m, deterministic) +} +func (dst *GetDepartmentMemberResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetDepartmentMemberResp.Merge(dst, src) +} +func (m *GetDepartmentMemberResp) XXX_Size() int { + return xxx_messageInfo_GetDepartmentMemberResp.Size(m) +} +func (m *GetDepartmentMemberResp) XXX_DiscardUnknown() { + xxx_messageInfo_GetDepartmentMemberResp.DiscardUnknown(m) +} + +var xxx_messageInfo_GetDepartmentMemberResp proto.InternalMessageInfo + +func (m *GetDepartmentMemberResp) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *GetDepartmentMemberResp) GetErrMsg() string { + if m != nil { + return m.ErrMsg + } + return "" +} + +func (m *GetDepartmentMemberResp) GetUserInDepartmentList() []*sdk_ws.UserInDepartment { + if m != nil { + return m.UserInDepartmentList + } + return nil +} + +func init() { + proto.RegisterType((*CreateDepartmentReq)(nil), "organization.CreateDepartmentReq") + proto.RegisterType((*CreateDepartmentResp)(nil), "organization.CreateDepartmentResp") + proto.RegisterType((*UpdateDepartmentReq)(nil), "organization.UpdateDepartmentReq") + proto.RegisterType((*UpdateDepartmentResp)(nil), "organization.UpdateDepartmentResp") + proto.RegisterType((*GetSubDepartmentReq)(nil), "organization.GetSubDepartmentReq") + proto.RegisterType((*GetSubDepartmentResp)(nil), "organization.GetSubDepartmentResp") + proto.RegisterType((*DeleteDepartmentReq)(nil), "organization.DeleteDepartmentReq") + proto.RegisterType((*DeleteDepartmentResp)(nil), "organization.DeleteDepartmentResp") + proto.RegisterType((*CreateOrganizationUserReq)(nil), "organization.CreateOrganizationUserReq") + proto.RegisterType((*CreateOrganizationUserResp)(nil), "organization.CreateOrganizationUserResp") + proto.RegisterType((*UpdateOrganizationUserReq)(nil), "organization.UpdateOrganizationUserReq") + proto.RegisterType((*UpdateOrganizationUserResp)(nil), "organization.UpdateOrganizationUserResp") + proto.RegisterType((*CreateDepartmentMemberReq)(nil), "organization.CreateDepartmentMemberReq") + proto.RegisterType((*CreateDepartmentMemberResp)(nil), "organization.CreateDepartmentMemberResp") + proto.RegisterType((*GetUserInDepartmentReq)(nil), "organization.GetUserInDepartmentReq") + proto.RegisterType((*GetUserInDepartmentResp)(nil), "organization.GetUserInDepartmentResp") + proto.RegisterType((*UpdateUserInDepartmentReq)(nil), "organization.UpdateUserInDepartmentReq") + proto.RegisterType((*UpdateUserInDepartmentResp)(nil), "organization.UpdateUserInDepartmentResp") + proto.RegisterType((*DeleteUserInDepartmentReq)(nil), "organization.DeleteUserInDepartmentReq") + proto.RegisterType((*DeleteUserInDepartmentResp)(nil), "organization.DeleteUserInDepartmentResp") + proto.RegisterType((*DeleteOrganizationUserReq)(nil), "organization.DeleteOrganizationUserReq") + proto.RegisterType((*DeleteOrganizationUserResp)(nil), "organization.DeleteOrganizationUserResp") + proto.RegisterType((*GetDepartmentMemberReq)(nil), "organization.GetDepartmentMemberReq") + proto.RegisterType((*GetDepartmentMemberResp)(nil), "organization.GetDepartmentMemberResp") +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// Client API for Organization service + +type OrganizationClient interface { + CreateDepartment(ctx context.Context, in *CreateDepartmentReq, opts ...grpc.CallOption) (*CreateDepartmentResp, error) + UpdateDepartment(ctx context.Context, in *UpdateDepartmentReq, opts ...grpc.CallOption) (*UpdateDepartmentResp, error) + GetSubDepartment(ctx context.Context, in *GetSubDepartmentReq, opts ...grpc.CallOption) (*GetSubDepartmentResp, error) + DeleteDepartment(ctx context.Context, in *DeleteDepartmentReq, opts ...grpc.CallOption) (*DeleteDepartmentResp, error) + CreateOrganizationUser(ctx context.Context, in *CreateOrganizationUserReq, opts ...grpc.CallOption) (*CreateOrganizationUserResp, error) + UpdateOrganizationUser(ctx context.Context, in *UpdateOrganizationUserReq, opts ...grpc.CallOption) (*UpdateOrganizationUserResp, error) + DeleteOrganizationUser(ctx context.Context, in *DeleteOrganizationUserReq, opts ...grpc.CallOption) (*DeleteOrganizationUserResp, error) + CreateDepartmentMember(ctx context.Context, in *CreateDepartmentMemberReq, opts ...grpc.CallOption) (*CreateDepartmentMemberResp, error) + GetUserInDepartment(ctx context.Context, in *GetUserInDepartmentReq, opts ...grpc.CallOption) (*GetUserInDepartmentResp, error) + DeleteUserInDepartment(ctx context.Context, in *DeleteUserInDepartmentReq, opts ...grpc.CallOption) (*DeleteUserInDepartmentResp, error) + UpdateUserInDepartment(ctx context.Context, in *UpdateUserInDepartmentReq, opts ...grpc.CallOption) (*UpdateUserInDepartmentResp, error) + GetDepartmentMember(ctx context.Context, in *GetDepartmentMemberReq, opts ...grpc.CallOption) (*GetDepartmentMemberResp, error) +} + +type organizationClient struct { + cc *grpc.ClientConn +} + +func NewOrganizationClient(cc *grpc.ClientConn) OrganizationClient { + return &organizationClient{cc} +} + +func (c *organizationClient) CreateDepartment(ctx context.Context, in *CreateDepartmentReq, opts ...grpc.CallOption) (*CreateDepartmentResp, error) { + out := new(CreateDepartmentResp) + err := grpc.Invoke(ctx, "/organization.organization/CreateDepartment", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) UpdateDepartment(ctx context.Context, in *UpdateDepartmentReq, opts ...grpc.CallOption) (*UpdateDepartmentResp, error) { + out := new(UpdateDepartmentResp) + err := grpc.Invoke(ctx, "/organization.organization/UpdateDepartment", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) GetSubDepartment(ctx context.Context, in *GetSubDepartmentReq, opts ...grpc.CallOption) (*GetSubDepartmentResp, error) { + out := new(GetSubDepartmentResp) + err := grpc.Invoke(ctx, "/organization.organization/GetSubDepartment", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) DeleteDepartment(ctx context.Context, in *DeleteDepartmentReq, opts ...grpc.CallOption) (*DeleteDepartmentResp, error) { + out := new(DeleteDepartmentResp) + err := grpc.Invoke(ctx, "/organization.organization/DeleteDepartment", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) CreateOrganizationUser(ctx context.Context, in *CreateOrganizationUserReq, opts ...grpc.CallOption) (*CreateOrganizationUserResp, error) { + out := new(CreateOrganizationUserResp) + err := grpc.Invoke(ctx, "/organization.organization/CreateOrganizationUser", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) UpdateOrganizationUser(ctx context.Context, in *UpdateOrganizationUserReq, opts ...grpc.CallOption) (*UpdateOrganizationUserResp, error) { + out := new(UpdateOrganizationUserResp) + err := grpc.Invoke(ctx, "/organization.organization/UpdateOrganizationUser", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) DeleteOrganizationUser(ctx context.Context, in *DeleteOrganizationUserReq, opts ...grpc.CallOption) (*DeleteOrganizationUserResp, error) { + out := new(DeleteOrganizationUserResp) + err := grpc.Invoke(ctx, "/organization.organization/DeleteOrganizationUser", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) CreateDepartmentMember(ctx context.Context, in *CreateDepartmentMemberReq, opts ...grpc.CallOption) (*CreateDepartmentMemberResp, error) { + out := new(CreateDepartmentMemberResp) + err := grpc.Invoke(ctx, "/organization.organization/CreateDepartmentMember", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) GetUserInDepartment(ctx context.Context, in *GetUserInDepartmentReq, opts ...grpc.CallOption) (*GetUserInDepartmentResp, error) { + out := new(GetUserInDepartmentResp) + err := grpc.Invoke(ctx, "/organization.organization/GetUserInDepartment", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) DeleteUserInDepartment(ctx context.Context, in *DeleteUserInDepartmentReq, opts ...grpc.CallOption) (*DeleteUserInDepartmentResp, error) { + out := new(DeleteUserInDepartmentResp) + err := grpc.Invoke(ctx, "/organization.organization/DeleteUserInDepartment", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) UpdateUserInDepartment(ctx context.Context, in *UpdateUserInDepartmentReq, opts ...grpc.CallOption) (*UpdateUserInDepartmentResp, error) { + out := new(UpdateUserInDepartmentResp) + err := grpc.Invoke(ctx, "/organization.organization/UpdateUserInDepartment", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *organizationClient) GetDepartmentMember(ctx context.Context, in *GetDepartmentMemberReq, opts ...grpc.CallOption) (*GetDepartmentMemberResp, error) { + out := new(GetDepartmentMemberResp) + err := grpc.Invoke(ctx, "/organization.organization/GetDepartmentMember", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +// Server API for Organization service + +type OrganizationServer interface { + CreateDepartment(context.Context, *CreateDepartmentReq) (*CreateDepartmentResp, error) + UpdateDepartment(context.Context, *UpdateDepartmentReq) (*UpdateDepartmentResp, error) + GetSubDepartment(context.Context, *GetSubDepartmentReq) (*GetSubDepartmentResp, error) + DeleteDepartment(context.Context, *DeleteDepartmentReq) (*DeleteDepartmentResp, error) + CreateOrganizationUser(context.Context, *CreateOrganizationUserReq) (*CreateOrganizationUserResp, error) + UpdateOrganizationUser(context.Context, *UpdateOrganizationUserReq) (*UpdateOrganizationUserResp, error) + DeleteOrganizationUser(context.Context, *DeleteOrganizationUserReq) (*DeleteOrganizationUserResp, error) + CreateDepartmentMember(context.Context, *CreateDepartmentMemberReq) (*CreateDepartmentMemberResp, error) + GetUserInDepartment(context.Context, *GetUserInDepartmentReq) (*GetUserInDepartmentResp, error) + DeleteUserInDepartment(context.Context, *DeleteUserInDepartmentReq) (*DeleteUserInDepartmentResp, error) + UpdateUserInDepartment(context.Context, *UpdateUserInDepartmentReq) (*UpdateUserInDepartmentResp, error) + GetDepartmentMember(context.Context, *GetDepartmentMemberReq) (*GetDepartmentMemberResp, error) +} + +func RegisterOrganizationServer(s *grpc.Server, srv OrganizationServer) { + s.RegisterService(&_Organization_serviceDesc, srv) +} + +func _Organization_CreateDepartment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateDepartmentReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).CreateDepartment(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/CreateDepartment", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).CreateDepartment(ctx, req.(*CreateDepartmentReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_UpdateDepartment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateDepartmentReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).UpdateDepartment(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/UpdateDepartment", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).UpdateDepartment(ctx, req.(*UpdateDepartmentReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_GetSubDepartment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetSubDepartmentReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).GetSubDepartment(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/GetSubDepartment", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).GetSubDepartment(ctx, req.(*GetSubDepartmentReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_DeleteDepartment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteDepartmentReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).DeleteDepartment(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/DeleteDepartment", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).DeleteDepartment(ctx, req.(*DeleteDepartmentReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_CreateOrganizationUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateOrganizationUserReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).CreateOrganizationUser(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/CreateOrganizationUser", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).CreateOrganizationUser(ctx, req.(*CreateOrganizationUserReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_UpdateOrganizationUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateOrganizationUserReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).UpdateOrganizationUser(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/UpdateOrganizationUser", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).UpdateOrganizationUser(ctx, req.(*UpdateOrganizationUserReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_DeleteOrganizationUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteOrganizationUserReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).DeleteOrganizationUser(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/DeleteOrganizationUser", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).DeleteOrganizationUser(ctx, req.(*DeleteOrganizationUserReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_CreateDepartmentMember_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(CreateDepartmentMemberReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).CreateDepartmentMember(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/CreateDepartmentMember", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).CreateDepartmentMember(ctx, req.(*CreateDepartmentMemberReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_GetUserInDepartment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetUserInDepartmentReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).GetUserInDepartment(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/GetUserInDepartment", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).GetUserInDepartment(ctx, req.(*GetUserInDepartmentReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_DeleteUserInDepartment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DeleteUserInDepartmentReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).DeleteUserInDepartment(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/DeleteUserInDepartment", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).DeleteUserInDepartment(ctx, req.(*DeleteUserInDepartmentReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_UpdateUserInDepartment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateUserInDepartmentReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).UpdateUserInDepartment(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/UpdateUserInDepartment", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).UpdateUserInDepartment(ctx, req.(*UpdateUserInDepartmentReq)) + } + return interceptor(ctx, in, info, handler) +} + +func _Organization_GetDepartmentMember_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetDepartmentMemberReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(OrganizationServer).GetDepartmentMember(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/organization.organization/GetDepartmentMember", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(OrganizationServer).GetDepartmentMember(ctx, req.(*GetDepartmentMemberReq)) + } + return interceptor(ctx, in, info, handler) +} + +var _Organization_serviceDesc = grpc.ServiceDesc{ + ServiceName: "organization.organization", + HandlerType: (*OrganizationServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "CreateDepartment", + Handler: _Organization_CreateDepartment_Handler, + }, + { + MethodName: "UpdateDepartment", + Handler: _Organization_UpdateDepartment_Handler, + }, + { + MethodName: "GetSubDepartment", + Handler: _Organization_GetSubDepartment_Handler, + }, + { + MethodName: "DeleteDepartment", + Handler: _Organization_DeleteDepartment_Handler, + }, + { + MethodName: "CreateOrganizationUser", + Handler: _Organization_CreateOrganizationUser_Handler, + }, + { + MethodName: "UpdateOrganizationUser", + Handler: _Organization_UpdateOrganizationUser_Handler, + }, + { + MethodName: "DeleteOrganizationUser", + Handler: _Organization_DeleteOrganizationUser_Handler, + }, + { + MethodName: "CreateDepartmentMember", + Handler: _Organization_CreateDepartmentMember_Handler, + }, + { + MethodName: "GetUserInDepartment", + Handler: _Organization_GetUserInDepartment_Handler, + }, + { + MethodName: "DeleteUserInDepartment", + Handler: _Organization_DeleteUserInDepartment_Handler, + }, + { + MethodName: "UpdateUserInDepartment", + Handler: _Organization_UpdateUserInDepartment_Handler, + }, + { + MethodName: "GetDepartmentMember", + Handler: _Organization_GetDepartmentMember_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "organization/organization.proto", +} + +func init() { + proto.RegisterFile("organization/organization.proto", fileDescriptor_organization_a03f9a4144ed1081) +} + +var fileDescriptor_organization_a03f9a4144ed1081 = []byte{ + // 713 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4f, 0x6f, 0x12, 0x41, + 0x14, 0xcf, 0x8a, 0x56, 0xfb, 0xda, 0x18, 0x32, 0x25, 0x48, 0xd7, 0x34, 0xd2, 0xd5, 0x46, 0x4e, + 0x90, 0xd4, 0xa3, 0x37, 0x8b, 0x69, 0x49, 0xac, 0x24, 0x18, 0x62, 0xf0, 0x42, 0x96, 0x30, 0x12, + 0x82, 0xec, 0x0e, 0x33, 0x8b, 0x24, 0xfd, 0x12, 0x9e, 0xbc, 0x18, 0x8f, 0x9e, 0xfc, 0x34, 0x7e, + 0x24, 0xb3, 0xbb, 0x94, 0x0e, 0x6f, 0xde, 0x52, 0x5c, 0x16, 0xa3, 0xc7, 0x19, 0x66, 0xde, 0xef, + 0xbd, 0xdf, 0xfb, 0x33, 0x3f, 0x16, 0x9e, 0xf8, 0x72, 0xe0, 0x7a, 0xc3, 0x2b, 0x37, 0x18, 0xfa, + 0x5e, 0x4d, 0x5f, 0x54, 0x85, 0xf4, 0x03, 0x9f, 0xed, 0xeb, 0x7b, 0xf6, 0x71, 0x53, 0x70, 0xaf, + 0xdb, 0xb8, 0xac, 0x89, 0xd1, 0xa0, 0x16, 0x1d, 0xa8, 0xa9, 0xfe, 0xa8, 0x3b, 0x53, 0xb5, 0x99, + 0x8a, 0x2f, 0x38, 0xdf, 0x2c, 0x38, 0x38, 0x93, 0xdc, 0x0d, 0x78, 0x9d, 0x0b, 0x57, 0x06, 0x63, + 0xee, 0x05, 0x2d, 0x3e, 0x61, 0xaf, 0xe1, 0x61, 0x7f, 0xb1, 0xd1, 0xf0, 0x3e, 0xfa, 0x25, 0xab, + 0x6c, 0x55, 0xf6, 0x4e, 0x8f, 0xaa, 0x8a, 0xcb, 0xcf, 0x5c, 0x76, 0x5d, 0x31, 0xec, 0x0a, 0x57, + 0xba, 0x63, 0x55, 0xd5, 0x6e, 0xa2, 0x4b, 0xac, 0x0c, 0x7b, 0xbe, 0xe0, 0x32, 0x72, 0xa7, 0x51, + 0x2f, 0xdd, 0x29, 0x5b, 0x95, 0xdd, 0x96, 0xbe, 0xc5, 0x6c, 0x78, 0xe0, 0x8b, 0xb6, 0xe2, 0xb2, + 0x51, 0x2f, 0xe5, 0xa2, 0x9f, 0x17, 0x6b, 0xe7, 0x8b, 0x05, 0x05, 0xd3, 0x39, 0x25, 0x58, 0x09, + 0xee, 0x73, 0x29, 0xcf, 0xfc, 0x3e, 0x8f, 0xdc, 0xba, 0xd7, 0xba, 0x5e, 0xb2, 0x22, 0xec, 0x70, + 0x29, 0x2f, 0xd5, 0x60, 0x8e, 0x35, 0x5f, 0x11, 0xf1, 0xe4, 0x52, 0xc4, 0x13, 0xd1, 0xd5, 0x16, + 0xfd, 0x7f, 0x93, 0xae, 0x0b, 0x28, 0x98, 0xbe, 0xa5, 0x61, 0xcb, 0x99, 0xc1, 0xc1, 0x39, 0x0f, + 0xde, 0x4d, 0x7b, 0xcb, 0x51, 0x3a, 0xb0, 0xaf, 0x39, 0x5c, 0x8f, 0xac, 0xed, 0xb6, 0x96, 0xf6, + 0x32, 0xc8, 0xb8, 0x89, 0xbc, 0x79, 0xc6, 0xdf, 0x0c, 0x55, 0x50, 0xca, 0x95, 0x73, 0x7f, 0x94, + 0x92, 0xf0, 0x52, 0x48, 0x45, 0x9d, 0x7f, 0xe2, 0x38, 0xe1, 0xdb, 0xa7, 0xe2, 0x02, 0x0a, 0x26, + 0x70, 0xaa, 0x6c, 0xfe, 0xb4, 0xe0, 0x30, 0x6e, 0xa3, 0xa6, 0x36, 0x1d, 0x42, 0x98, 0x30, 0x92, + 0x26, 0xe4, 0x7d, 0xb4, 0x3d, 0x2f, 0xde, 0xa7, 0x04, 0x53, 0x86, 0x05, 0xe3, 0xf2, 0x86, 0x61, + 0xbf, 0x05, 0x3b, 0xc9, 0xd7, 0xd4, 0xc1, 0xc7, 0x5d, 0xf1, 0x7f, 0x04, 0x9f, 0xe4, 0xeb, 0x86, + 0x99, 0xbf, 0x29, 0xa2, 0x4b, 0x3e, 0xee, 0x2d, 0x82, 0x9f, 0x86, 0xb8, 0xde, 0xcd, 0x8f, 0x2b, + 0x82, 0x6f, 0xa3, 0xa3, 0x2d, 0xe3, 0x72, 0x56, 0x99, 0x37, 0x7d, 0x4d, 0x15, 0xbc, 0x07, 0xc5, + 0x73, 0x1e, 0x18, 0x6e, 0xf3, 0x49, 0x78, 0x63, 0x1a, 0xfb, 0x10, 0xb7, 0xed, 0x7c, 0xb5, 0xa1, + 0xff, 0xdf, 0x2d, 0x78, 0x44, 0x02, 0xa6, 0x1a, 0x5f, 0x54, 0x72, 0x72, 0x1b, 0x24, 0x47, 0x6b, + 0x04, 0x8a, 0x92, 0x26, 0xe4, 0xfb, 0x88, 0xf6, 0x15, 0xb5, 0x60, 0x64, 0xc8, 0xb8, 0x9c, 0x55, + 0x23, 0x64, 0xc3, 0xa6, 0xf3, 0xd5, 0x82, 0xc3, 0x78, 0x9a, 0xfe, 0xb5, 0x7a, 0x30, 0x9e, 0x88, + 0xbb, 0xe6, 0x13, 0x11, 0xc6, 0x99, 0xe4, 0x56, 0xaa, 0x38, 0x27, 0xd7, 0x61, 0x52, 0xc3, 0x6e, + 0x3b, 0x65, 0xbf, 0x08, 0x21, 0xa3, 0x99, 0x75, 0x15, 0xb5, 0x2d, 0x35, 0xaf, 0xb6, 0xff, 0xe6, + 0xfe, 0x88, 0x5b, 0x38, 0x9b, 0x01, 0xc4, 0xde, 0x43, 0x01, 0x77, 0xa1, 0xa6, 0x43, 0xd6, 0x6a, + 0x63, 0xd2, 0xc0, 0xe9, 0xaf, 0x5d, 0x58, 0x12, 0xfa, 0xac, 0x03, 0x79, 0x3c, 0x3a, 0xd9, 0x71, + 0x75, 0xe9, 0xff, 0x01, 0x21, 0xf2, 0x6d, 0xe7, 0xb6, 0x23, 0x4a, 0x84, 0xa6, 0xb1, 0xa8, 0xc4, + 0xa6, 0x09, 0x41, 0x8c, 0x4d, 0x93, 0xba, 0xb4, 0x03, 0x79, 0xac, 0xf5, 0xb0, 0x69, 0x42, 0x85, + 0x62, 0xd3, 0xa4, 0x5c, 0xec, 0x40, 0x1e, 0x8b, 0x27, 0x6c, 0x9a, 0x50, 0x75, 0xd8, 0x34, 0xa9, + 0xbf, 0x46, 0x50, 0xa4, 0x05, 0x0a, 0x7b, 0x4e, 0xd1, 0x49, 0x34, 0xa2, 0x5d, 0x59, 0xef, 0x60, + 0x0c, 0x46, 0x0b, 0x02, 0x0c, 0x96, 0x28, 0x71, 0x30, 0xd8, 0x0a, 0x7d, 0x31, 0x82, 0x22, 0xdd, + 0xc9, 0x18, 0x2c, 0x71, 0xc4, 0x60, 0xb0, 0x15, 0x83, 0x61, 0x41, 0x23, 0x6e, 0x36, 0x9a, 0x46, + 0x62, 0x1e, 0xd0, 0x34, 0x92, 0xbd, 0xdb, 0x8b, 0xfe, 0xcf, 0xe0, 0xee, 0x62, 0xcf, 0x8c, 0x4a, + 0x22, 0x5e, 0x07, 0xfb, 0x64, 0x8d, 0x53, 0x3a, 0x7b, 0x06, 0x0c, 0xc9, 0x1e, 0x85, 0x54, 0x59, + 0xef, 0xa0, 0x5e, 0x17, 0xb7, 0x81, 0x25, 0xbe, 0xf8, 0x74, 0x5d, 0x90, 0x60, 0x31, 0x7b, 0x46, + 0x9e, 0x4c, 0xf6, 0xa8, 0x24, 0x9d, 0xac, 0x71, 0x4a, 0x89, 0x57, 0x47, 0x1f, 0x1e, 0x57, 0x97, + 0x3e, 0x68, 0xbc, 0xd4, 0x17, 0xbd, 0x9d, 0xe8, 0x6b, 0xc5, 0x8b, 0xdf, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x33, 0x0d, 0x37, 0x72, 0x01, 0x11, 0x00, 0x00, +} diff --git a/script/start_rpc_service.sh b/script/start_rpc_service.sh index e15307f45..eb261fb48 100644 --- a/script/start_rpc_service.sh +++ b/script/start_rpc_service.sh @@ -19,6 +19,7 @@ service_filename=( open_im_statistics ${msg_name} open_im_office + open_im_organization ) #service config port name @@ -64,4 +65,4 @@ for ((i = 0; i < ${#service_filename[*]}; i++)); do pid="netstat -ntlp|grep $j |awk '{printf \$7}'|cut -d/ -f1" echo -e "${GREEN_PREFIX}${service_filename[$i]} start success,port number:$j pid:$(eval $pid)$COLOR_SUFFIX" done -done \ No newline at end of file +done From 0bb3cb4aab0d3ae4bcc1d69478bcb9d0c45ea4a1 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:19:24 +0800 Subject: [PATCH 05/59] organization --- script/path_info.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/path_info.cfg b/script/path_info.cfg index a2281f35c..b50fc18fb 100644 --- a/script/path_info.cfg +++ b/script/path_info.cfg @@ -49,7 +49,7 @@ service_source_root=( ../cmd/rpc/open_im_message_cms/ ../cmd/rpc/open_im_statistics/ ../cmd/rpc/open_im_office/ - ../cmd/rpc/organization/ + ../cmd/rpc/open_im_organization/ ${msg_gateway_source_root} ${msg_transfer_source_root} ${msg_source_root} From bf081dce32cfbb233d46118de0ae0c65486e4cd5 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:22:01 +0800 Subject: [PATCH 06/59] organization --- script/start_rpc_service.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/script/start_rpc_service.sh b/script/start_rpc_service.sh index eb261fb48..20e7991b4 100644 --- a/script/start_rpc_service.sh +++ b/script/start_rpc_service.sh @@ -37,6 +37,7 @@ service_port_name=( openImStatisticsPort openImOfflineMessagePort openImOfficePort + openImOrganizationPort ) for ((i = 0; i < ${#service_filename[*]}; i++)); do From bef4f0c4e25c1cdc97f65f4a3beb22c8cd1a79fd Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:25:01 +0800 Subject: [PATCH 07/59] organization --- script/check_all.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/script/check_all.sh b/script/check_all.sh index 1d55dff65..c434c65d2 100644 --- a/script/check_all.sh +++ b/script/check_all.sh @@ -20,6 +20,7 @@ service_port_name=( openImMessageCmsPort openImStatisticsPort openImOfficePort + openImOrganizationPort ) switch=$(cat $config_path | grep demoswitch |awk -F '[:]' '{print $NF}') for i in ${service_port_name[*]}; do From cde38e012fe2223b32577434e47bc3a50a2b9d80 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:27:18 +0800 Subject: [PATCH 08/59] organization --- pkg/common/db/mysql.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index 982ad378f..925058841 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -106,20 +106,20 @@ func initMysqlDB() { fmt.Println("CreateTable Conversation") db.CreateTable(&Conversation{}) } - /* - if db.HasTable(&Department{}) { - fmt.Println("CreateTable Department") - db.CreateTable(&Department{}) - } - if db.HasTable(&OrganizationUser{}) { - fmt.Println("CreateTable OrganizationUser") - db.CreateTable(&OrganizationUser{}) - } - if db.HasTable(&DepartmentMember{}) { - fmt.Println("CreateTable DepartmentMember") - db.CreateTable(&DepartmentMember{}) - } - */ + + if db.HasTable(&Department{}) { + fmt.Println("CreateTable Department") + db.CreateTable(&Department{}) + } + if db.HasTable(&OrganizationUser{}) { + fmt.Println("CreateTable OrganizationUser") + db.CreateTable(&OrganizationUser{}) + } + if db.HasTable(&DepartmentMember{}) { + fmt.Println("CreateTable DepartmentMember") + db.CreateTable(&DepartmentMember{}) + } + return } From edf7df368e6abf72c3a3ad18c8a602ce4e228bf7 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:30:02 +0800 Subject: [PATCH 09/59] organization --- pkg/common/db/mysql.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index 925058841..cfef4dfee 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -107,15 +107,15 @@ func initMysqlDB() { db.CreateTable(&Conversation{}) } - if db.HasTable(&Department{}) { + if !db.HasTable(&Department{}) { fmt.Println("CreateTable Department") db.CreateTable(&Department{}) } - if db.HasTable(&OrganizationUser{}) { + if !db.HasTable(&OrganizationUser{}) { fmt.Println("CreateTable OrganizationUser") db.CreateTable(&OrganizationUser{}) } - if db.HasTable(&DepartmentMember{}) { + if !db.HasTable(&DepartmentMember{}) { fmt.Println("CreateTable DepartmentMember") db.CreateTable(&DepartmentMember{}) } From 3c1e6d0e5cecc5ff4f31a5b7a970ae414aa38c6b Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:42:50 +0800 Subject: [PATCH 10/59] organization --- pkg/common/token_verify/jwt_token.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 1f9cdd66f..057d55641 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -150,17 +150,17 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { claims, err = GetClaimFromToken(tokensString) if err != nil { log.NewError(operationID, "token validate err", err.Error(), tokensString) - return nil, err + return nil, utils.Wrap(err, "") } m, err := commonDB.DB.GetTokenMapByUidPid(claims.UID, claims.Platform) if err != nil { log.NewError(operationID, "get token from redis err", err.Error(), tokensString) - return nil, &constant.ErrTokenInvalid + return nil, utils.Wrap(&constant.ErrTokenInvalid, "") } if m == nil { log.NewError(operationID, "get token from redis err", "m is nil", tokensString) - return nil, &constant.ErrTokenInvalid + return nil, utils.Wrap(&constant.ErrTokenInvalid, "") } if v, ok := m[tokensString]; ok { switch v { @@ -168,18 +168,18 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { log.NewDebug(operationID, "this is normal return", claims) return claims, nil case constant.InValidToken: - return nil, &constant.ErrTokenInvalid + return nil, utils.Wrap(&constant.ErrTokenInvalid, "") case constant.KickedToken: log.Error(operationID, "this token has been kicked by other same terminal ", constant.ErrTokenKicked) - return nil, &constant.ErrTokenKicked + return nil, utils.Wrap(&constant.ErrTokenKicked, "") case constant.ExpiredToken: - return nil, &constant.ErrTokenExpired + return nil, utils.Wrap(&constant.ErrTokenExpired, "") default: - return nil, &constant.ErrTokenUnknown + return nil, utils.Wrap(&constant.ErrTokenUnknown, "") } } log.NewError(operationID, "redis token map not find", constant.ErrTokenUnknown) - return nil, &constant.ErrTokenUnknown + return nil, utils.Wrap(&constant.ErrTokenUnknown, "") } //func MakeTheTokenInvalid(currentClaims *Claims, platformClass string) (bool, error) { From 42af55a7403c5ee824844df062b0b86625138f5f Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:45:41 +0800 Subject: [PATCH 11/59] organization --- pkg/common/token_verify/jwt_token.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 057d55641..bfff43116 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -156,11 +156,11 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { m, err := commonDB.DB.GetTokenMapByUidPid(claims.UID, claims.Platform) if err != nil { log.NewError(operationID, "get token from redis err", err.Error(), tokensString) - return nil, utils.Wrap(&constant.ErrTokenInvalid, "") + return nil, utils.Wrap(&constant.ErrTokenInvalid, "get token from redis err") } if m == nil { log.NewError(operationID, "get token from redis err", "m is nil", tokensString) - return nil, utils.Wrap(&constant.ErrTokenInvalid, "") + return nil, utils.Wrap(&constant.ErrTokenInvalid, "get token from redis err") } if v, ok := m[tokensString]; ok { switch v { @@ -171,7 +171,7 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { return nil, utils.Wrap(&constant.ErrTokenInvalid, "") case constant.KickedToken: log.Error(operationID, "this token has been kicked by other same terminal ", constant.ErrTokenKicked) - return nil, utils.Wrap(&constant.ErrTokenKicked, "") + return nil, utils.Wrap(&constant.ErrTokenKicked, "this token has been kicked by other same terminal ") case constant.ExpiredToken: return nil, utils.Wrap(&constant.ErrTokenExpired, "") default: @@ -179,7 +179,7 @@ func ParseToken(tokensString, operationID string) (claims *Claims, err error) { } } log.NewError(operationID, "redis token map not find", constant.ErrTokenUnknown) - return nil, utils.Wrap(&constant.ErrTokenUnknown, "") + return nil, utils.Wrap(&constant.ErrTokenUnknown, "redis token map not find") } //func MakeTheTokenInvalid(currentClaims *Claims, platformClass string) (bool, error) { From 300b72b9b89373c58d8cc3d07da7954c095665c4 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:47:00 +0800 Subject: [PATCH 12/59] organization --- internal/api/organization/organization.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 338670c45..0a9dab470 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -27,7 +27,7 @@ func CreateDepartment(c *gin.Context) { err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID if err != nil { - errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token") + errMsg := "ParseTokenGetUserID failed " + err.Error() + " " + c.Request.Header.Get("token") log.NewError(req.OperationID, errMsg, errMsg) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return From af5ee452063e1c12a1ff47832b369bb33d063f3a Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:56:28 +0800 Subject: [PATCH 13/59] organization --- config/config.yaml | 1 + internal/rpc/organization/organization.go | 2 +- pkg/common/config/config.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index 520cd8486..d61292bdc 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -145,6 +145,7 @@ rpcregistername: #rpc注册服务名，默认即可 OpenImMessageCMSName: MessageCMS openImAdminCMSName: AdminCMS openImOfficeName: Office + openImOrganizationName: Organization log: storageLocation: ../logs/ diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index ec22e9841..e27bb9ed3 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -31,7 +31,7 @@ func NewGroupServer(port int) *organizationServer { log.NewPrivateLog(constant.LogFileName) return &organizationServer{ rpcPort: port, - rpcRegisterName: config.Config.RpcRegisterName.OpenImGroupName, + rpcRegisterName: config.Config.RpcRegisterName.OpenImOrganizationName, etcdSchema: config.Config.Etcd.EtcdSchema, etcdAddr: config.Config.Etcd.EtcdAddr, } diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 4cc5fed27..9e1bd54b6 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -117,6 +117,7 @@ type config struct { OpenImMessageCMSName string `yaml:"openImMessageCMSName"` OpenImAdminCMSName string `yaml:"openImAdminCMSName"` OpenImOfficeName string `yaml:"openImOfficeName"` + OpenImOrganizationName string `yaml:"openImOrganizationName"` } Etcd struct { EtcdSchema string `yaml:"etcdSchema"` From 32679585416d2cbf0df1bf4ec6af79e32db93555 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 20:59:38 +0800 Subject: [PATCH 14/59] organization --- internal/api/organization/organization.go | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 0a9dab470..4a54a90b5 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -34,7 +34,7 @@ func CreateDepartment(c *gin.Context) { } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.CreateDepartment(context.Background(), req) if err != nil { @@ -69,7 +69,7 @@ func UpdateDepartment(c *gin.Context) { } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.UpdateDepartment(context.Background(), req) if err != nil { @@ -103,7 +103,7 @@ func GetSubDepartment(c *gin.Context) { } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.GetSubDepartment(context.Background(), req) if err != nil { @@ -137,7 +137,7 @@ func DeleteDepartment(c *gin.Context) { return } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.DeleteDepartment(context.Background(), req) if err != nil { @@ -172,7 +172,7 @@ func CreateOrganizationUser(c *gin.Context) { return } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.CreateOrganizationUser(context.Background(), req) if err != nil { @@ -207,7 +207,7 @@ func UpdateOrganizationUser(c *gin.Context) { return } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.UpdateOrganizationUser(context.Background(), req) if err != nil { @@ -242,7 +242,7 @@ func CreateDepartmentMember(c *gin.Context) { return } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.CreateDepartmentMember(context.Background(), req) if err != nil { @@ -277,7 +277,7 @@ func GetUserInDepartment(c *gin.Context) { return } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.GetUserInDepartment(context.Background(), req) if err != nil { @@ -313,7 +313,7 @@ func UpdateUserInDepartment(c *gin.Context) { return } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.UpdateUserInDepartment(context.Background(), req) if err != nil { @@ -348,7 +348,7 @@ func DeleteOrganizationUser(c *gin.Context) { return } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.DeleteOrganizationUser(context.Background(), req) if err != nil { @@ -383,7 +383,7 @@ func GetDepartmentMember(c *gin.Context) { return } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.GetDepartmentMember(context.Background(), req) if err != nil { @@ -418,7 +418,7 @@ func DeleteUserInDepartment(c *gin.Context) { return } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) - etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.DeleteUserInDepartment(context.Background(), req) if err != nil { From 9abfe233bc52b4995e6cc7746122b3bd4630b991 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:10:46 +0800 Subject: [PATCH 15/59] organization --- cmd/rpc/open_im_organization/main.go | 4 ++-- internal/rpc/organization/organization.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/rpc/open_im_organization/main.go b/cmd/rpc/open_im_organization/main.go index 8fa33964d..906ac510f 100644 --- a/cmd/rpc/open_im_organization/main.go +++ b/cmd/rpc/open_im_organization/main.go @@ -1,7 +1,7 @@ package main import ( - "Open_IM/internal/rpc/group" + "Open_IM/internal/rpc/organization" "flag" "fmt" ) @@ -10,6 +10,6 @@ func main() { rpcPort := flag.Int("port", 11200, "get RpcOrganizationPort from cmd,default 11200 as port") flag.Parse() fmt.Println("start organization rpc server, port: ", *rpcPort) - rpcServer := group.NewGroupServer(*rpcPort) + rpcServer := organization.NewServer(*rpcPort) rpcServer.Run() } diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index e27bb9ed3..dc80ce188 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -27,7 +27,7 @@ type organizationServer struct { etcdAddr []string } -func NewGroupServer(port int) *organizationServer { +func NewServer(port int) *organizationServer { log.NewPrivateLog(constant.LogFileName) return &organizationServer{ rpcPort: port, From 9e18bcaeb8a7072ed07723f1af13cb05803d92c5 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:14:28 +0800 Subject: [PATCH 16/59] organization --- pkg/base_info/organization_api_struct.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index 0289b2f81..380678336 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -3,7 +3,7 @@ package base_info import open_im_sdk "Open_IM/pkg/proto/sdk_ws" type CreateDepartmentReq struct { - *open_im_sdk.Department + open_im_sdk.Department OperationID string `json:"operationID" binding:"required"` } type CreateDepartmentResp struct { @@ -13,7 +13,7 @@ type CreateDepartmentResp struct { } type UpdateDepartmentReq struct { - *open_im_sdk.Department + open_im_sdk.Department DepartmentID string `json:"departmentID" binding:"required"` OperationID string `json:"operationID" binding:"required"` } From 4a7f406edbbc68ff6388db73f363ed37b08c659a Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:17:32 +0800 Subject: [PATCH 17/59] organization --- internal/api/organization/organization.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 4a54a90b5..ee8ee6489 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -33,7 +33,7 @@ func CreateDepartment(c *gin.Context) { return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.CreateDepartment(context.Background(), req) From b4ab2c69ae80773db4c8a305499062a87d299518 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:20:17 +0800 Subject: [PATCH 18/59] organization --- internal/api/organization/organization.go | 1 + pkg/base_info/organization_api_struct.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index ee8ee6489..4778dc866 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -24,6 +24,7 @@ func CreateDepartment(c *gin.Context) { } req := &rpc.CreateDepartmentReq{} utils.CopyStructFields(req, ¶ms) + utils.CopyStructFields(req.DepartmentInfo, ¶ms) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID if err != nil { diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index 380678336..a52a84f65 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -3,7 +3,7 @@ package base_info import open_im_sdk "Open_IM/pkg/proto/sdk_ws" type CreateDepartmentReq struct { - open_im_sdk.Department + *open_im_sdk.Department OperationID string `json:"operationID" binding:"required"` } type CreateDepartmentResp struct { From 3d690b7c72b698a3000fbb47ff8f55dfe4b7b83a Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:23:38 +0800 Subject: [PATCH 19/59] organization --- pkg/base_info/organization_api_struct.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index a52a84f65..380678336 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -3,7 +3,7 @@ package base_info import open_im_sdk "Open_IM/pkg/proto/sdk_ws" type CreateDepartmentReq struct { - *open_im_sdk.Department + open_im_sdk.Department OperationID string `json:"operationID" binding:"required"` } type CreateDepartmentResp struct { From bbcb3e94036b792c0231405db964da8f845bdd84 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:26:16 +0800 Subject: [PATCH 20/59] organization --- internal/api/organization/organization.go | 2 +- pkg/base_info/organization_api_struct.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 4778dc866..d64e21d37 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -24,7 +24,7 @@ func CreateDepartment(c *gin.Context) { } req := &rpc.CreateDepartmentReq{} utils.CopyStructFields(req, ¶ms) - utils.CopyStructFields(req.DepartmentInfo, ¶ms) + utils.CopyStructFields(req.DepartmentInfo, ¶ms.Department) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID if err != nil { diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index 380678336..a52a84f65 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -3,7 +3,7 @@ package base_info import open_im_sdk "Open_IM/pkg/proto/sdk_ws" type CreateDepartmentReq struct { - open_im_sdk.Department + *open_im_sdk.Department OperationID string `json:"operationID" binding:"required"` } type CreateDepartmentResp struct { From f4dcae722c156ef271be4c03059d494cfdadb67c Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:28:37 +0800 Subject: [PATCH 21/59] organization --- internal/api/organization/organization.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index d64e21d37..eed92ba41 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -24,7 +24,7 @@ func CreateDepartment(c *gin.Context) { } req := &rpc.CreateDepartmentReq{} utils.CopyStructFields(req, ¶ms) - utils.CopyStructFields(req.DepartmentInfo, ¶ms.Department) + utils.CopyStructFields(req.DepartmentInfo, params.Department) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID if err != nil { From a42b72e9ce4c827f646db4af7aaf8a2d43a57a7b Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:31:28 +0800 Subject: [PATCH 22/59] organization --- internal/api/organization/organization.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index eed92ba41..8a651af47 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -8,6 +8,7 @@ import ( "Open_IM/pkg/common/token_verify" "Open_IM/pkg/grpc-etcdv3/getcdv3" rpc "Open_IM/pkg/proto/organization" + open_im_sdk "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "context" "github.com/gin-gonic/gin" @@ -22,7 +23,7 @@ func CreateDepartment(c *gin.Context) { c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) return } - req := &rpc.CreateDepartmentReq{} + req := &rpc.CreateDepartmentReq{DepartmentInfo: &open_im_sdk.Department{}} utils.CopyStructFields(req, ¶ms) utils.CopyStructFields(req.DepartmentInfo, params.Department) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) From 6184eaa30e83dea5d06a8bdd11c0ed6450b8f93e Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:32:53 +0800 Subject: [PATCH 23/59] organization --- internal/api/organization/organization.go | 1 - pkg/base_info/organization_api_struct.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 8a651af47..413928a64 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -25,7 +25,6 @@ func CreateDepartment(c *gin.Context) { } req := &rpc.CreateDepartmentReq{DepartmentInfo: &open_im_sdk.Department{}} utils.CopyStructFields(req, ¶ms) - utils.CopyStructFields(req.DepartmentInfo, params.Department) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID if err != nil { diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index a52a84f65..0289b2f81 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -13,7 +13,7 @@ type CreateDepartmentResp struct { } type UpdateDepartmentReq struct { - open_im_sdk.Department + *open_im_sdk.Department DepartmentID string `json:"departmentID" binding:"required"` OperationID string `json:"operationID" binding:"required"` } From f076a927c9a7d9c5344b0b9310b8586902e63bcb Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:34:29 +0800 Subject: [PATCH 24/59] organization --- internal/api/organization/organization.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 413928a64..f24161d32 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -25,6 +25,7 @@ func CreateDepartment(c *gin.Context) { } req := &rpc.CreateDepartmentReq{DepartmentInfo: &open_im_sdk.Department{}} utils.CopyStructFields(req, ¶ms) + utils.CopyStructFields(req, params.Department) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID if err != nil { From 02b5ff38a40573c89c79b13f341d6941593e23dd Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sat, 16 Apr 2022 21:41:38 +0800 Subject: [PATCH 25/59] organization --- internal/api/organization/organization.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index f24161d32..3ff448e1e 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -25,7 +25,7 @@ func CreateDepartment(c *gin.Context) { } req := &rpc.CreateDepartmentReq{DepartmentInfo: &open_im_sdk.Department{}} utils.CopyStructFields(req, ¶ms) - utils.CopyStructFields(req, params.Department) + utils.CopyStructFields(req.DepartmentInfo, ¶ms) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID if err != nil { From 1902c3792400b51dd84aa1c74ea0a250e59d0875 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 11:51:36 +0800 Subject: [PATCH 26/59] organization --- internal/api/organization/organization.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 3ff448e1e..53542ea97 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -59,8 +59,9 @@ func UpdateDepartment(c *gin.Context) { c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) return } - req := &rpc.UpdateDepartmentReq{} + req := &rpc.UpdateDepartmentReq{DepartmentInfo: &open_im_sdk.Department{}} utils.CopyStructFields(req, ¶ms) + utils.CopyStructFields(req.DepartmentInfo, ¶ms) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID if err != nil { @@ -70,7 +71,7 @@ func UpdateDepartment(c *gin.Context) { return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.UpdateDepartment(context.Background(), req) From 6d55f354048b22d7292a885b5bab8975322b9a1f Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 11:59:31 +0800 Subject: [PATCH 27/59] organization --- cmd/open_im_api/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 57d534b0c..4ffca2a56 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -152,7 +152,7 @@ func main() { { organizationGroup.POST("/create_department", organization.CreateDepartment) organizationGroup.POST("/update_department", organization.UpdateDepartment) - organizationGroup.POST("/get_department", organization.GetSubDepartment) + organizationGroup.POST("/get_sub_department", organization.GetSubDepartment) organizationGroup.POST("/delete_department", organization.DeleteDepartment) organizationGroup.POST("/create_organization_user", organization.CreateOrganizationUser) organizationGroup.POST("/update_organization_user", organization.UpdateOrganizationUser) From 9def85f9ba8b49dca285d65936c9757e14d2fc3a Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 12:32:28 +0800 Subject: [PATCH 28/59] organization --- internal/api/organization/organization.go | 4 ++-- pkg/base_info/organization_api_struct.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 53542ea97..7a951e763 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -88,7 +88,7 @@ func UpdateDepartment(c *gin.Context) { } func GetSubDepartment(c *gin.Context) { - params := api.GetDepartmentReq{} + params := api.GetSubDepartmentReq{} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) @@ -116,7 +116,7 @@ func GetSubDepartment(c *gin.Context) { return } - apiResp := api.GetDepartmentResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, DepartmentList: RpcResp.DepartmentList} + apiResp := api.GetSubDepartmentResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, DepartmentList: RpcResp.DepartmentList} apiResp.Data = jsonData.JsonDataList(RpcResp.DepartmentList) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) c.JSON(http.StatusOK, apiResp) diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index 0289b2f81..93fcfa069 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -21,11 +21,11 @@ type UpdateDepartmentResp struct { CommResp } -type GetDepartmentReq struct { +type GetSubDepartmentReq struct { OperationID string `json:"operationID" binding:"required"` DepartmentID string } -type GetDepartmentResp struct { +type GetSubDepartmentResp struct { CommResp DepartmentList []*open_im_sdk.Department `json:"-"` Data []map[string]interface{} `json:"data"` From 6787563efe24b642294e3be175ac4936f147b4f8 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 12:37:00 +0800 Subject: [PATCH 29/59] organization --- pkg/base_info/organization_api_struct.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index 93fcfa069..27d6210e6 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -23,7 +23,7 @@ type UpdateDepartmentResp struct { type GetSubDepartmentReq struct { OperationID string `json:"operationID" binding:"required"` - DepartmentID string + DepartmentID string `json:"departmentID" binding:"required"` } type GetSubDepartmentResp struct { CommResp From 80ba371296d5350195bb333e83f6533b2e007cf5 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 12:41:42 +0800 Subject: [PATCH 30/59] organization --- pkg/base_info/organization_api_struct.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index 27d6210e6..f00c2124c 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -33,7 +33,7 @@ type GetSubDepartmentResp struct { type DeleteDepartmentReq struct { OperationID string `json:"operationID" binding:"required"` - DepartmentID string + DepartmentID string `json:"departmentID" binding:"required"` } type DeleteDepartmentResp struct { CommResp From 7c64239b36088d69c7f4d6be3c8631068ac492bb Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 14:39:48 +0800 Subject: [PATCH 31/59] organization --- cmd/open_im_api/main.go | 2 ++ internal/api/organization/organization.go | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 4ffca2a56..a2f8522ef 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -154,9 +154,11 @@ func main() { organizationGroup.POST("/update_department", organization.UpdateDepartment) organizationGroup.POST("/get_sub_department", organization.GetSubDepartment) organizationGroup.POST("/delete_department", organization.DeleteDepartment) + organizationGroup.POST("/create_organization_user", organization.CreateOrganizationUser) organizationGroup.POST("/update_organization_user", organization.UpdateOrganizationUser) organizationGroup.POST("/create_department_member", organization.CreateDepartmentMember) + organizationGroup.POST("/get_user_in_department", organization.GetUserInDepartment) organizationGroup.POST("/update_user_In_department", organization.UpdateUserInDepartment) organizationGroup.POST("/delete_organization_user", organization.DeleteOrganizationUser) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 7a951e763..7ae90b480 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -163,8 +163,9 @@ func CreateOrganizationUser(c *gin.Context) { return } - req := &rpc.CreateOrganizationUserReq{} + req := &rpc.CreateOrganizationUserReq{OrganizationUser: &open_im_sdk.OrganizationUser{}} utils.CopyStructFields(req, ¶ms) + utils.CopyStructFields(req.OrganizationUser, ¶ms) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID From 9436c836e64273f3ea4935f8cf71474f6e4a93b1 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 14:42:07 +0800 Subject: [PATCH 32/59] organization --- internal/api/organization/organization.go | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 7ae90b480..1bc0f30e9 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -105,7 +105,7 @@ func GetSubDepartment(c *gin.Context) { return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.GetSubDepartment(context.Background(), req) @@ -139,7 +139,7 @@ func DeleteDepartment(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.DeleteDepartment(context.Background(), req) @@ -175,7 +175,7 @@ func CreateOrganizationUser(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.CreateOrganizationUser(context.Background(), req) @@ -199,9 +199,9 @@ func UpdateOrganizationUser(c *gin.Context) { return } - req := &rpc.UpdateOrganizationUserReq{} + req := &rpc.UpdateOrganizationUserReq{OrganizationUser: &open_im_sdk.OrganizationUser{}} utils.CopyStructFields(req, ¶ms) - + utils.CopyStructFields(req.OrganizationUser, ¶ms) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID if err != nil { @@ -210,7 +210,7 @@ func UpdateOrganizationUser(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.UpdateOrganizationUser(context.Background(), req) @@ -245,7 +245,7 @@ func CreateDepartmentMember(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.CreateDepartmentMember(context.Background(), req) @@ -280,7 +280,7 @@ func GetUserInDepartment(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.GetUserInDepartment(context.Background(), req) @@ -316,7 +316,7 @@ func UpdateUserInDepartment(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.UpdateUserInDepartment(context.Background(), req) @@ -351,7 +351,7 @@ func DeleteOrganizationUser(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.DeleteOrganizationUser(context.Background(), req) @@ -386,7 +386,7 @@ func GetDepartmentMember(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.GetDepartmentMember(context.Background(), req) @@ -421,7 +421,7 @@ func DeleteUserInDepartment(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) return } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String()) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api args ", req.String(), "params", params) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOrganizationName) client := rpc.NewOrganizationClient(etcdConn) RpcResp, err := client.DeleteUserInDepartment(context.Background(), req) From eae7a48991cc78401046ddba0f20e2b04477ed1c Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 14:44:44 +0800 Subject: [PATCH 33/59] organization --- internal/api/organization/organization.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 1bc0f30e9..383ae732b 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -156,7 +156,7 @@ func DeleteDepartment(c *gin.Context) { } func CreateOrganizationUser(c *gin.Context) { - params := api.CreateOrganizationUserReq{} + params := api.CreateOrganizationUserReq{OrganizationUser: &open_im_sdk.OrganizationUser{}} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) @@ -192,7 +192,7 @@ func CreateOrganizationUser(c *gin.Context) { } func UpdateOrganizationUser(c *gin.Context) { - params := api.UpdateOrganizationUserReq{} + params := api.UpdateOrganizationUserReq{OrganizationUser: &open_im_sdk.OrganizationUser{}} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) @@ -227,7 +227,7 @@ func UpdateOrganizationUser(c *gin.Context) { } func CreateDepartmentMember(c *gin.Context) { - params := api.CreateDepartmentMemberReq{} + params := api.CreateDepartmentMemberReq{UserInDepartment: &open_im_sdk.UserInDepartment{}} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) From eb630b23ae53a1736cdc0f1973de19e9273ecf5d Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 14:45:45 +0800 Subject: [PATCH 34/59] organization --- internal/api/organization/organization.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 383ae732b..e4984490f 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -234,8 +234,9 @@ func CreateDepartmentMember(c *gin.Context) { return } - req := &rpc.CreateDepartmentMemberReq{} + req := &rpc.CreateDepartmentMemberReq{UserInDepartment: &open_im_sdk.UserInDepartment{}} utils.CopyStructFields(req, ¶ms) + utils.CopyStructFields(req.UserInDepartment, ¶ms) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID From b6e06dfdc237822f75478ee921b5e23b10e1c88d Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 14:47:52 +0800 Subject: [PATCH 35/59] organization --- internal/api/organization/organization.go | 4 ++-- pkg/base_info/organization_api_struct.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index e4984490f..250e9eef0 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -299,14 +299,14 @@ func GetUserInDepartment(c *gin.Context) { } func UpdateUserInDepartment(c *gin.Context) { - params := api.UpdateUserInDepartmentReq{} + params := api.UpdateUserInDepartmentReq{DepartmentMember: &open_im_sdk.DepartmentMember{}} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) return } - req := &rpc.UpdateUserInDepartmentReq{} + req := &rpc.UpdateUserInDepartmentReq{DepartmentMember: &open_im_sdk.DepartmentMember{}} utils.CopyStructFields(req, ¶ms) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index f00c2124c..c8c6babe8 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -75,8 +75,8 @@ type GetUserInDepartmentResp struct { } type UpdateUserInDepartmentReq struct { - OperationID string `json:"operationID" binding:"required"` - UserInDepartment *open_im_sdk.UserInDepartment + OperationID string `json:"operationID" binding:"required"` + *open_im_sdk.DepartmentMember } type UpdateUserInDepartmentResp struct { CommResp From ecc47dcfbbb5cbcd1974c1995228c0b440a72668 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 14:54:51 +0800 Subject: [PATCH 36/59] organization --- internal/rpc/organization/organization.go | 1 + pkg/common/db/mysql_model/im_mysql_model/organization_model.go | 1 + 2 files changed, 2 insertions(+) diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index dc80ce188..894fa643d 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -171,6 +171,7 @@ func (s *organizationServer) CreateOrganizationUser(ctx context.Context, req *rp } organizationUser := db.OrganizationUser{} utils.CopyStructFields(&organizationUser, req.OrganizationUser) + organizationUser.Birth = utils.UnixSecondToTime(int64(req.OrganizationUser.Birth)) log.Debug(req.OperationID, "src ", *req.OrganizationUser, "dst ", organizationUser) err := imdb.CreateOrganizationUser(&organizationUser) if err != nil { diff --git a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go index bf44972ab..0b7f1621e 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go @@ -68,6 +68,7 @@ func CreateOrganizationUser(organizationUser *db.OrganizationUser) error { return err } organizationUser.CreateTime = time.Now() + return dbConn.Table("organization_users").Create(organizationUser).Error } From fd01e5c2633b1e9c258088c7c8b26ee09ea52afa Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 15:01:26 +0800 Subject: [PATCH 37/59] organization --- internal/api/organization/organization.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 250e9eef0..13402d044 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -156,7 +156,7 @@ func DeleteDepartment(c *gin.Context) { } func CreateOrganizationUser(c *gin.Context) { - params := api.CreateOrganizationUserReq{OrganizationUser: &open_im_sdk.OrganizationUser{}} + params := api.CreateOrganizationUserReq{} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) From 06e44cc649ccd7a2f82f73d28d34e73bcd6803ef Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 15:03:50 +0800 Subject: [PATCH 38/59] organization --- pkg/base_info/organization_api_struct.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index c8c6babe8..7243d310b 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -40,8 +40,8 @@ type DeleteDepartmentResp struct { } type CreateOrganizationUserReq struct { - OperationID string `json:"operationID" binding:"required"` - OrganizationUser *open_im_sdk.OrganizationUser + OperationID string `json:"operationID" binding:"required"` + *open_im_sdk.OrganizationUser } type CreateOrganizationUserResp struct { CommResp From 803d0c2ae2bcbf8fe6df6cb02e0fe3872c7a11d7 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 15:09:18 +0800 Subject: [PATCH 39/59] organization --- internal/api/organization/organization.go | 2 +- pkg/base_info/organization_api_struct.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 13402d044..714b26a7e 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -192,7 +192,7 @@ func CreateOrganizationUser(c *gin.Context) { } func UpdateOrganizationUser(c *gin.Context) { - params := api.UpdateOrganizationUserReq{OrganizationUser: &open_im_sdk.OrganizationUser{}} + params := api.UpdateOrganizationUserReq{} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index 7243d310b..ac80f82df 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -48,16 +48,16 @@ type CreateOrganizationUserResp struct { } type UpdateOrganizationUserReq struct { - OperationID string `json:"operationID" binding:"required"` - OrganizationUser *open_im_sdk.OrganizationUser + OperationID string `json:"operationID" binding:"required"` + *open_im_sdk.OrganizationUser } type UpdateOrganizationUserResp struct { CommResp } type CreateDepartmentMemberReq struct { - OperationID string `json:"operationID" binding:"required"` - UserInDepartment *open_im_sdk.UserInDepartment + OperationID string `json:"operationID" binding:"required"` + *open_im_sdk.UserInDepartment } type CreateDepartmentMemberResp struct { @@ -65,7 +65,7 @@ type CreateDepartmentMemberResp struct { } type GetUserInDepartmentReq struct { - UserID string + UserID string `json:"userID" binding:"required"` OperationID string `json:"operationID" binding:"required"` } type GetUserInDepartmentResp struct { @@ -83,7 +83,7 @@ type UpdateUserInDepartmentResp struct { } type DeleteOrganizationUserReq struct { - UserID string + UserID string `json:"userID" binding:"required"` OperationID string `json:"operationID" binding:"required"` } type DeleteOrganizationUserResp struct { @@ -91,7 +91,7 @@ type DeleteOrganizationUserResp struct { } type GetDepartmentMemberReq struct { - DepartmentID string + DepartmentID string `json:"departmentID" binding:"required"` OperationID string `json:"operationID" binding:"required"` } type GetDepartmentMemberResp struct { From a981d1082ad675b81cebb2e3b5ac32ff7546c4cc Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 15:11:27 +0800 Subject: [PATCH 40/59] organization --- internal/rpc/organization/organization.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index 894fa643d..9a7c362c4 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -194,6 +194,10 @@ func (s *organizationServer) UpdateOrganizationUser(ctx context.Context, req *rp } organizationUser := db.OrganizationUser{} utils.CopyStructFields(&organizationUser, req.OrganizationUser) + if req.OrganizationUser.Birth != 0 { + organizationUser.Birth = utils.UnixSecondToTime(int64(req.OrganizationUser.Birth)) + } + log.Debug(req.OperationID, "src ", *req.OrganizationUser, "dst ", organizationUser) err := imdb.UpdateOrganizationUser(&organizationUser, nil) if err != nil { From 0dac9044a52fb5b7a62f024a95cccf6bc844a0db Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Sun, 17 Apr 2022 15:18:21 +0800 Subject: [PATCH 41/59] organization --- internal/rpc/organization/organization.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index 9a7c362c4..98994269a 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -196,6 +196,7 @@ func (s *organizationServer) UpdateOrganizationUser(ctx context.Context, req *rp utils.CopyStructFields(&organizationUser, req.OrganizationUser) if req.OrganizationUser.Birth != 0 { organizationUser.Birth = utils.UnixSecondToTime(int64(req.OrganizationUser.Birth)) + log.Debug(req.OperationID, "time: ", organizationUser.Birth, req.OrganizationUser.Birth) } log.Debug(req.OperationID, "src ", *req.OrganizationUser, "dst ", organizationUser) From 3bbf84861e6137b580cb72f495d77c7a7f7ae1f7 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 10:53:23 +0800 Subject: [PATCH 42/59] organization --- cmd/open_im_api/main.go | 5 +++-- internal/rpc/group/group.go | 33 +++++++++++++++++++++++++++++++-- pkg/common/constant/error.go | 4 +++- 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index a2f8522ef..b391bd4f2 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -157,11 +157,12 @@ func main() { organizationGroup.POST("/create_organization_user", organization.CreateOrganizationUser) organizationGroup.POST("/update_organization_user", organization.UpdateOrganizationUser) - organizationGroup.POST("/create_department_member", organization.CreateDepartmentMember) + organizationGroup.POST("/delete_organization_user", organization.DeleteOrganizationUser) + organizationGroup.POST("/create_department_member", organization.CreateDepartmentMember) organizationGroup.POST("/get_user_in_department", organization.GetUserInDepartment) organizationGroup.POST("/update_user_In_department", organization.UpdateUserInDepartment) - organizationGroup.POST("/delete_organization_user", organization.DeleteOrganizationUser) + organizationGroup.POST("/get_department_member", organization.GetDepartmentMember) organizationGroup.POST("/delete_user_in_department", organization.DeleteUserInDepartment) } diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index e22ab18bf..fec32ec32 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -207,10 +207,14 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil } - _, err := imdb.GetGroupInfoByGroupID(req.GroupID) + groupInfo, err := imdb.GetGroupInfoByGroupID(req.GroupID) if err != nil { log.NewError(req.OperationID, "GetGroupInfoByGroupID failed ", req.GroupID, err) - return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, nil + } + if groupInfo.Status == constant.GroupStatusDismissed { + errMsg := " group status is dismissed " + return &pbGroup.InviteUserToGroupResp{ErrCode: constant.ErrStatus.ErrCode, ErrMsg: errMsg}, nil } // //from User: invite: applicant @@ -518,6 +522,16 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil } + groupInfo, err := imdb.GetGroupInfoByGroupID(req.GroupID) + if err != nil { + log.NewError(req.OperationID, "GetGroupInfoByGroupID failed ", req.GroupID, err) + return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil + } + if groupInfo.Status == constant.GroupStatusDismissed { + errMsg := " group status is dismissed " + return &pbGroup.JoinGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrStatus.ErrCode, ErrMsg: errMsg}}, nil + } + var groupRequest db.GroupRequest groupRequest.UserID = req.OpUserID groupRequest.ReqMsg = req.ReqMessage @@ -595,6 +609,11 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf return &pbGroup.SetGroupInfoResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, http.WrapError(constant.ErrDB) } + if group.Status == constant.GroupStatusDismissed { + errMsg := " group status is dismissed " + return &pbGroup.SetGroupInfoResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrStatus.ErrCode, ErrMsg: errMsg}}, nil + } + ////bitwise operators: 0001:groupName; 0010:Notification 0100:Introduction; 1000:FaceUrl; 10000:owner var changedType int32 if group.GroupName != req.GroupInfo.GroupName && req.GroupInfo.GroupName != "" { @@ -627,6 +646,16 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf func (s *groupServer) TransferGroupOwner(_ context.Context, req *pbGroup.TransferGroupOwnerReq) (*pbGroup.TransferGroupOwnerResp, error) { log.NewInfo(req.OperationID, "TransferGroupOwner ", req.String()) + groupInfo, err := imdb.GetGroupInfoByGroupID(req.GroupID) + if err != nil { + log.NewError(req.OperationID, "GetGroupInfoByGroupID failed ", req.GroupID, err) + return &pbGroup.TransferGroupOwnerResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil + } + if groupInfo.Status == constant.GroupStatusDismissed { + errMsg := " group status is dismissed " + return &pbGroup.TransferGroupOwnerResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrStatus.ErrCode, ErrMsg: errMsg}}, nil + } + if req.OldOwnerUserID == req.NewOwnerUserID { log.NewError(req.OperationID, "same owner ", req.OldOwnerUserID, req.NewOwnerUserID) return &pbGroup.TransferGroupOwnerResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrArgs.ErrCode, ErrMsg: constant.ErrArgs.ErrMsg}}, nil diff --git a/pkg/common/constant/error.go b/pkg/common/constant/error.go index 00a11fd49..c8aca5fe6 100644 --- a/pkg/common/constant/error.go +++ b/pkg/common/constant/error.go @@ -51,7 +51,8 @@ var ( ErrAccess = ErrInfo{ErrCode: 801, ErrMsg: AccessMsg.Error()} ErrDB = ErrInfo{ErrCode: 802, ErrMsg: DBMsg.Error()} - ErrArgs = ErrInfo{ErrCode: 8003, ErrMsg: ArgsMsg.Error()} + ErrArgs = ErrInfo{ErrCode: 803, ErrMsg: ArgsMsg.Error()} + ErrStatus = ErrInfo{ErrCode: 804, ErrMsg: StatusMsg.Error()} ErrCallback = ErrInfo{ErrCode: 809, ErrMsg: CallBackMsg.Error()} ) @@ -64,6 +65,7 @@ var ( TokenUnknownMsg = errors.New("couldn't handle this token") TokenUserKickedMsg = errors.New("user has been kicked") AccessMsg = errors.New("no permission") + StatusMsg = errors.New("status is abnormal") DBMsg = errors.New("db failed") ArgsMsg = errors.New("args failed") CallBackMsg = errors.New("callback failed") From 248de7f1f2f07ccaad6f145baeda54dd47deb6e4 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 11:52:17 +0800 Subject: [PATCH 43/59] set groupmember nickname --- cmd/open_im_api/main.go | 2 + config/config.yaml | 14 + internal/api/group/group.go | 34 ++ internal/rpc/group/group.go | 33 ++ internal/rpc/msg/group_notification.go | 21 + pkg/base_info/group_api_struct.go | 11 + pkg/common/config/config.go | 5 + pkg/common/constant/constant.go | 1 + pkg/proto/group/group.pb.go | 539 ++++++++++++++--------- pkg/proto/group/group.proto | 16 + pkg/proto/sdk_ws/ws.pb.go | 576 ++++++++++++++----------- pkg/proto/sdk_ws/ws.proto | 6 + 12 files changed, 806 insertions(+), 452 deletions(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index b391bd4f2..122f4d055 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -84,6 +84,8 @@ func main() { groupRouterGroup.POST("/cancel_mute_group_member", group.CancelMuteGroupMember) //MuteGroup groupRouterGroup.POST("/mute_group", group.MuteGroup) groupRouterGroup.POST("/cancel_mute_group", group.CancelMuteGroup) + + groupRouterGroup.POST("/set_group_member_nickname", group.SetGroupMemberNickname) } //certificate authRouterGroup := r.Group("/auth") diff --git a/config/config.yaml b/config/config.yaml index d61292bdc..05c56bc6a 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -432,6 +432,20 @@ notification: ext: "groupMemberCancelMuted ext" defaultTips: tips: "group Member Cancel Muted" + + groupMemberInfoSet: + conversation: + reliabilityLevel: 2 + unreadCount: true + offlinePush: + switch: false + title: "groupMemberInfoSet title" + desc: "groupMemberInfoSet desc" + ext: "groupMemberInfoSet ext" + defaultTips: + tips: "group member info set" + + #############################friend################################# friendApplicationAdded: diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 35365cc10..2f3b58007 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -696,3 +696,37 @@ func CancelMuteGroup(c *gin.Context) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api return ", resp) c.JSON(http.StatusOK, resp) } + +//SetGroupMemberNickname + +func SetGroupMemberNickname(c *gin.Context) { + params := api.SetGroupMemberNicknameReq{} + if err := c.BindJSON(¶ms); err != nil { + log.NewError("0", "BindJSON failed ", err.Error()) + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &rpc.SetGroupMemberNicknameReq{} + utils.CopyStructFields(req, ¶ms) + var ok bool + ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID) + if !ok { + log.NewError(req.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token")) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"}) + return + } + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api args ", req.String()) + + etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImGroupName) + client := rpc.NewGroupClient(etcdConn) + reply, err := client.SetGroupMemberNickname(context.Background(), req) + if err != nil { + log.NewError(req.OperationID, utils.GetSelfFuncName(), " failed ", req.String()) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) + return + } + + resp := api.SetGroupMemberNicknameResp{CommResp: api.CommResp{ErrCode: reply.CommonResp.ErrCode, ErrMsg: reply.CommonResp.ErrMsg}} + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " api return ", resp) + c.JSON(http.StatusOK, resp) +} diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index fec32ec32..db8d73162 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -1073,3 +1073,36 @@ func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMu log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}) return &pbGroup.CancelMuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil } + +func (s *groupServer) SetGroupMemberNickname(ctx context.Context, req *pbGroup.SetGroupMemberNicknameReq) (*pbGroup.SetGroupMemberNicknameResp, error) { + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc args ", req.String()) + if req.OpUserID != req.UserID && !token_verify.IsManagerUserID(req.OpUserID) { + errMsg := req.OperationID + " verify failed " + req.OpUserID + req.GroupID + log.Error(req.OperationID, errMsg) + return &pbGroup.SetGroupMemberNicknameResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}}, nil + } + + groupMemberInfo := db.GroupMember{} + groupMemberInfo.UserID = req.UserID + groupMemberInfo.GroupID = req.GroupID + if req.Nickname == "" { + userNickname, err := imdb.GetUserNameByUserID(groupMemberInfo.UserID) + if err != nil { + errMsg := req.OperationID + " GetUserNameByUserID failed " + err.Error() + log.Error(req.OperationID, errMsg) + return &pbGroup.SetGroupMemberNicknameResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil + } + groupMemberInfo.Nickname = userNickname + } else { + groupMemberInfo.Nickname = req.Nickname + } + err := imdb.UpdateGroupMemberInfo(groupMemberInfo) + if err != nil { + errMsg := req.OperationID + " UpdateGroupMemberInfo failed " + err.Error() + log.Error(req.OperationID, errMsg) + return &pbGroup.SetGroupMemberNicknameResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil + } + chat.GroupMemberInfoSetNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID) + log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "rpc return ", pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}) + return &pbGroup.SetGroupMemberNicknameResp{CommonResp: &pbGroup.CommonResp{ErrCode: 0, ErrMsg: ""}}, nil +} diff --git a/internal/rpc/msg/group_notification.go b/internal/rpc/msg/group_notification.go index 56052573b..5ba2400dd 100644 --- a/internal/rpc/msg/group_notification.go +++ b/internal/rpc/msg/group_notification.go @@ -168,6 +168,9 @@ func groupNotification(contentType int32, m proto.Message, sendID, groupID, recv tips.DefaultTips = toNickname + "" + cn.GroupMemberMuted.DefaultTips.Tips case constant.GroupMemberCancelMutedNotification: tips.DefaultTips = toNickname + "" + cn.GroupMemberCancelMuted.DefaultTips.Tips + case constant.GroupMemberInfoSetNotification: + tips.DefaultTips = toNickname + "" + cn.GroupMemberInfoSet.DefaultTips.Tips + default: log.Error(operationID, "contentType failed ", contentType) return @@ -282,6 +285,24 @@ func GroupMemberMutedNotification(operationID, opUserID, groupID, groupMemberUse groupNotification(constant.GroupMemberMutedNotification, &tips, opUserID, groupID, "", operationID) } +func GroupMemberInfoSetNotification(operationID, opUserID, groupID, groupMemberUserID string) { + tips := open_im_sdk.GroupMemberInfoSetTips{Group: &open_im_sdk.GroupInfo{}, + OpUser: &open_im_sdk.GroupMemberFullInfo{}, ChangedUser: &open_im_sdk.GroupMemberFullInfo{}} + if err := setGroupInfo(groupID, tips.Group); err != nil { + log.Error(operationID, "setGroupInfo failed ", err.Error(), groupID) + return + } + if err := setOpUserInfo(opUserID, groupID, tips.OpUser); err != nil { + log.Error(operationID, "setOpUserInfo failed ", err.Error(), opUserID, groupID) + return + } + if err := setGroupMemberInfo(groupID, groupMemberUserID, tips.ChangedUser); err != nil { + log.Error(operationID, "setGroupMemberInfo failed ", err.Error(), groupID, groupMemberUserID) + return + } + groupNotification(constant.GroupMemberInfoSetNotification, &tips, opUserID, groupID, "", operationID) +} + func GroupMemberCancelMutedNotification(operationID, opUserID, groupID, groupMemberUserID string) { tips := open_im_sdk.GroupMemberCancelMutedTips{Group: &open_im_sdk.GroupInfo{}, OpUser: &open_im_sdk.GroupMemberFullInfo{}, MutedUser: &open_im_sdk.GroupMemberFullInfo{}} diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index 47b6a6c67..94a152818 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -220,3 +220,14 @@ type CancelMuteGroupReq struct { type CancelMuteGroupResp struct { CommResp } + +type SetGroupMemberNicknameReq struct { + OperationID string `json:"operationID" binding:"required"` + GroupID string `json:"groupID" binding:"required"` + UserID string `json:"userID" binding:"required"` + Nickname string `json:"nickname"` +} + +type SetGroupMemberNicknameResp struct { + CommResp +} diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 9e1bd54b6..664ceadb8 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -304,6 +304,11 @@ type config struct { OfflinePush POfflinePush `yaml:"offlinePush"` DefaultTips PDefaultTips `yaml:"defaultTips"` } `yaml:"groupMemberCancelMuted"` + GroupMemberInfoSet struct { + Conversation PConversation `yaml:"conversation"` + OfflinePush POfflinePush `yaml:"offlinePush"` + DefaultTips PDefaultTips `yaml:"defaultTips"` + } `yaml:"groupMemberInfoSet"` ////////////////////////user/////////////////////// UserInfoUpdated struct { diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index fdee4f2b7..291049a14 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -81,6 +81,7 @@ const ( GroupMemberCancelMutedNotification = 1513 GroupMutedNotification = 1514 GroupCancelMutedNotification = 1515 + GroupMemberInfoSetNotification = 1516 SignalingNotificationBegin = 1600 SignalingNotification = 1601 diff --git a/pkg/proto/group/group.pb.go b/pkg/proto/group/group.pb.go index 2f8176fad..db8bb328b 100644 --- a/pkg/proto/group/group.pb.go +++ b/pkg/proto/group/group.pb.go @@ -36,7 +36,7 @@ func (m *CommonResp) Reset() { *m = CommonResp{} } func (m *CommonResp) String() string { return proto.CompactTextString(m) } func (*CommonResp) ProtoMessage() {} func (*CommonResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{0} + return fileDescriptor_group_95c16320d90511af, []int{0} } func (m *CommonResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommonResp.Unmarshal(m, b) @@ -82,7 +82,7 @@ func (m *GroupAddMemberInfo) Reset() { *m = GroupAddMemberInfo{} } func (m *GroupAddMemberInfo) String() string { return proto.CompactTextString(m) } func (*GroupAddMemberInfo) ProtoMessage() {} func (*GroupAddMemberInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{1} + return fileDescriptor_group_95c16320d90511af, []int{1} } func (m *GroupAddMemberInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupAddMemberInfo.Unmarshal(m, b) @@ -131,7 +131,7 @@ func (m *CreateGroupReq) Reset() { *m = CreateGroupReq{} } func (m *CreateGroupReq) String() string { return proto.CompactTextString(m) } func (*CreateGroupReq) ProtoMessage() {} func (*CreateGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{2} + return fileDescriptor_group_95c16320d90511af, []int{2} } func (m *CreateGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupReq.Unmarshal(m, b) @@ -199,7 +199,7 @@ func (m *CreateGroupResp) Reset() { *m = CreateGroupResp{} } func (m *CreateGroupResp) String() string { return proto.CompactTextString(m) } func (*CreateGroupResp) ProtoMessage() {} func (*CreateGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{3} + return fileDescriptor_group_95c16320d90511af, []int{3} } func (m *CreateGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateGroupResp.Unmarshal(m, b) @@ -253,7 +253,7 @@ func (m *GetGroupsInfoReq) Reset() { *m = GetGroupsInfoReq{} } func (m *GetGroupsInfoReq) String() string { return proto.CompactTextString(m) } func (*GetGroupsInfoReq) ProtoMessage() {} func (*GetGroupsInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{4} + return fileDescriptor_group_95c16320d90511af, []int{4} } func (m *GetGroupsInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoReq.Unmarshal(m, b) @@ -307,7 +307,7 @@ func (m *GetGroupsInfoResp) Reset() { *m = GetGroupsInfoResp{} } func (m *GetGroupsInfoResp) String() string { return proto.CompactTextString(m) } func (*GetGroupsInfoResp) ProtoMessage() {} func (*GetGroupsInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{5} + return fileDescriptor_group_95c16320d90511af, []int{5} } func (m *GetGroupsInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsInfoResp.Unmarshal(m, b) @@ -361,7 +361,7 @@ func (m *SetGroupInfoReq) Reset() { *m = SetGroupInfoReq{} } func (m *SetGroupInfoReq) String() string { return proto.CompactTextString(m) } func (*SetGroupInfoReq) ProtoMessage() {} func (*SetGroupInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{6} + return fileDescriptor_group_95c16320d90511af, []int{6} } func (m *SetGroupInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoReq.Unmarshal(m, b) @@ -413,7 +413,7 @@ func (m *SetGroupInfoResp) Reset() { *m = SetGroupInfoResp{} } func (m *SetGroupInfoResp) String() string { return proto.CompactTextString(m) } func (*SetGroupInfoResp) ProtoMessage() {} func (*SetGroupInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{7} + return fileDescriptor_group_95c16320d90511af, []int{7} } func (m *SetGroupInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetGroupInfoResp.Unmarshal(m, b) @@ -453,7 +453,7 @@ func (m *GetGroupApplicationListReq) Reset() { *m = GetGroupApplicationL func (m *GetGroupApplicationListReq) String() string { return proto.CompactTextString(m) } func (*GetGroupApplicationListReq) ProtoMessage() {} func (*GetGroupApplicationListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{8} + return fileDescriptor_group_95c16320d90511af, []int{8} } func (m *GetGroupApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListReq.Unmarshal(m, b) @@ -507,7 +507,7 @@ func (m *GetGroupApplicationListResp) Reset() { *m = GetGroupApplication func (m *GetGroupApplicationListResp) String() string { return proto.CompactTextString(m) } func (*GetGroupApplicationListResp) ProtoMessage() {} func (*GetGroupApplicationListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{9} + return fileDescriptor_group_95c16320d90511af, []int{9} } func (m *GetGroupApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupApplicationListResp.Unmarshal(m, b) @@ -561,7 +561,7 @@ func (m *GetUserReqApplicationListReq) Reset() { *m = GetUserReqApplicat func (m *GetUserReqApplicationListReq) String() string { return proto.CompactTextString(m) } func (*GetUserReqApplicationListReq) ProtoMessage() {} func (*GetUserReqApplicationListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{10} + return fileDescriptor_group_95c16320d90511af, []int{10} } func (m *GetUserReqApplicationListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserReqApplicationListReq.Unmarshal(m, b) @@ -614,7 +614,7 @@ func (m *GetUserReqApplicationListResp) Reset() { *m = GetUserReqApplica func (m *GetUserReqApplicationListResp) String() string { return proto.CompactTextString(m) } func (*GetUserReqApplicationListResp) ProtoMessage() {} func (*GetUserReqApplicationListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{11} + return fileDescriptor_group_95c16320d90511af, []int{11} } func (m *GetUserReqApplicationListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserReqApplicationListResp.Unmarshal(m, b) @@ -663,7 +663,7 @@ func (m *TransferGroupOwnerReq) Reset() { *m = TransferGroupOwnerReq{} } func (m *TransferGroupOwnerReq) String() string { return proto.CompactTextString(m) } func (*TransferGroupOwnerReq) ProtoMessage() {} func (*TransferGroupOwnerReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{12} + return fileDescriptor_group_95c16320d90511af, []int{12} } func (m *TransferGroupOwnerReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerReq.Unmarshal(m, b) @@ -729,7 +729,7 @@ func (m *TransferGroupOwnerResp) Reset() { *m = TransferGroupOwnerResp{} func (m *TransferGroupOwnerResp) String() string { return proto.CompactTextString(m) } func (*TransferGroupOwnerResp) ProtoMessage() {} func (*TransferGroupOwnerResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{13} + return fileDescriptor_group_95c16320d90511af, []int{13} } func (m *TransferGroupOwnerResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransferGroupOwnerResp.Unmarshal(m, b) @@ -770,7 +770,7 @@ func (m *JoinGroupReq) Reset() { *m = JoinGroupReq{} } func (m *JoinGroupReq) String() string { return proto.CompactTextString(m) } func (*JoinGroupReq) ProtoMessage() {} func (*JoinGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{14} + return fileDescriptor_group_95c16320d90511af, []int{14} } func (m *JoinGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupReq.Unmarshal(m, b) @@ -829,7 +829,7 @@ func (m *JoinGroupResp) Reset() { *m = JoinGroupResp{} } func (m *JoinGroupResp) String() string { return proto.CompactTextString(m) } func (*JoinGroupResp) ProtoMessage() {} func (*JoinGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{15} + return fileDescriptor_group_95c16320d90511af, []int{15} } func (m *JoinGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupResp.Unmarshal(m, b) @@ -872,7 +872,7 @@ func (m *GroupApplicationResponseReq) Reset() { *m = GroupApplicationRes func (m *GroupApplicationResponseReq) String() string { return proto.CompactTextString(m) } func (*GroupApplicationResponseReq) ProtoMessage() {} func (*GroupApplicationResponseReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{16} + return fileDescriptor_group_95c16320d90511af, []int{16} } func (m *GroupApplicationResponseReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseReq.Unmarshal(m, b) @@ -945,7 +945,7 @@ func (m *GroupApplicationResponseResp) Reset() { *m = GroupApplicationRe func (m *GroupApplicationResponseResp) String() string { return proto.CompactTextString(m) } func (*GroupApplicationResponseResp) ProtoMessage() {} func (*GroupApplicationResponseResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{17} + return fileDescriptor_group_95c16320d90511af, []int{17} } func (m *GroupApplicationResponseResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationResponseResp.Unmarshal(m, b) @@ -985,7 +985,7 @@ func (m *QuitGroupReq) Reset() { *m = QuitGroupReq{} } func (m *QuitGroupReq) String() string { return proto.CompactTextString(m) } func (*QuitGroupReq) ProtoMessage() {} func (*QuitGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{18} + return fileDescriptor_group_95c16320d90511af, []int{18} } func (m *QuitGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupReq.Unmarshal(m, b) @@ -1037,7 +1037,7 @@ func (m *QuitGroupResp) Reset() { *m = QuitGroupResp{} } func (m *QuitGroupResp) String() string { return proto.CompactTextString(m) } func (*QuitGroupResp) ProtoMessage() {} func (*QuitGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{19} + return fileDescriptor_group_95c16320d90511af, []int{19} } func (m *QuitGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuitGroupResp.Unmarshal(m, b) @@ -1079,7 +1079,7 @@ func (m *GetGroupMemberListReq) Reset() { *m = GetGroupMemberListReq{} } func (m *GetGroupMemberListReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberListReq) ProtoMessage() {} func (*GetGroupMemberListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{20} + return fileDescriptor_group_95c16320d90511af, []int{20} } func (m *GetGroupMemberListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListReq.Unmarshal(m, b) @@ -1148,7 +1148,7 @@ func (m *GetGroupMemberListResp) Reset() { *m = GetGroupMemberListResp{} func (m *GetGroupMemberListResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberListResp) ProtoMessage() {} func (*GetGroupMemberListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{21} + return fileDescriptor_group_95c16320d90511af, []int{21} } func (m *GetGroupMemberListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberListResp.Unmarshal(m, b) @@ -1210,7 +1210,7 @@ func (m *GetGroupMembersInfoReq) Reset() { *m = GetGroupMembersInfoReq{} func (m *GetGroupMembersInfoReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersInfoReq) ProtoMessage() {} func (*GetGroupMembersInfoReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{22} + return fileDescriptor_group_95c16320d90511af, []int{22} } func (m *GetGroupMembersInfoReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoReq.Unmarshal(m, b) @@ -1271,7 +1271,7 @@ func (m *GetGroupMembersInfoResp) Reset() { *m = GetGroupMembersInfoResp func (m *GetGroupMembersInfoResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersInfoResp) ProtoMessage() {} func (*GetGroupMembersInfoResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{23} + return fileDescriptor_group_95c16320d90511af, []int{23} } func (m *GetGroupMembersInfoResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersInfoResp.Unmarshal(m, b) @@ -1327,7 +1327,7 @@ func (m *KickGroupMemberReq) Reset() { *m = KickGroupMemberReq{} } func (m *KickGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*KickGroupMemberReq) ProtoMessage() {} func (*KickGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{24} + return fileDescriptor_group_95c16320d90511af, []int{24} } func (m *KickGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberReq.Unmarshal(m, b) @@ -1394,7 +1394,7 @@ func (m *Id2Result) Reset() { *m = Id2Result{} } func (m *Id2Result) String() string { return proto.CompactTextString(m) } func (*Id2Result) ProtoMessage() {} func (*Id2Result) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{25} + return fileDescriptor_group_95c16320d90511af, []int{25} } func (m *Id2Result) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Id2Result.Unmarshal(m, b) @@ -1441,7 +1441,7 @@ func (m *KickGroupMemberResp) Reset() { *m = KickGroupMemberResp{} } func (m *KickGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*KickGroupMemberResp) ProtoMessage() {} func (*KickGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{26} + return fileDescriptor_group_95c16320d90511af, []int{26} } func (m *KickGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KickGroupMemberResp.Unmarshal(m, b) @@ -1495,7 +1495,7 @@ func (m *GetJoinedGroupListReq) Reset() { *m = GetJoinedGroupListReq{} } func (m *GetJoinedGroupListReq) String() string { return proto.CompactTextString(m) } func (*GetJoinedGroupListReq) ProtoMessage() {} func (*GetJoinedGroupListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{27} + return fileDescriptor_group_95c16320d90511af, []int{27} } func (m *GetJoinedGroupListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListReq.Unmarshal(m, b) @@ -1549,7 +1549,7 @@ func (m *GetJoinedGroupListResp) Reset() { *m = GetJoinedGroupListResp{} func (m *GetJoinedGroupListResp) String() string { return proto.CompactTextString(m) } func (*GetJoinedGroupListResp) ProtoMessage() {} func (*GetJoinedGroupListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{28} + return fileDescriptor_group_95c16320d90511af, []int{28} } func (m *GetJoinedGroupListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetJoinedGroupListResp.Unmarshal(m, b) @@ -1605,7 +1605,7 @@ func (m *InviteUserToGroupReq) Reset() { *m = InviteUserToGroupReq{} } func (m *InviteUserToGroupReq) String() string { return proto.CompactTextString(m) } func (*InviteUserToGroupReq) ProtoMessage() {} func (*InviteUserToGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{29} + return fileDescriptor_group_95c16320d90511af, []int{29} } func (m *InviteUserToGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupReq.Unmarshal(m, b) @@ -1673,7 +1673,7 @@ func (m *InviteUserToGroupResp) Reset() { *m = InviteUserToGroupResp{} } func (m *InviteUserToGroupResp) String() string { return proto.CompactTextString(m) } func (*InviteUserToGroupResp) ProtoMessage() {} func (*InviteUserToGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{30} + return fileDescriptor_group_95c16320d90511af, []int{30} } func (m *InviteUserToGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InviteUserToGroupResp.Unmarshal(m, b) @@ -1727,7 +1727,7 @@ func (m *GetGroupAllMemberReq) Reset() { *m = GetGroupAllMemberReq{} } func (m *GetGroupAllMemberReq) String() string { return proto.CompactTextString(m) } func (*GetGroupAllMemberReq) ProtoMessage() {} func (*GetGroupAllMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{31} + return fileDescriptor_group_95c16320d90511af, []int{31} } func (m *GetGroupAllMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberReq.Unmarshal(m, b) @@ -1781,7 +1781,7 @@ func (m *GetGroupAllMemberResp) Reset() { *m = GetGroupAllMemberResp{} } func (m *GetGroupAllMemberResp) String() string { return proto.CompactTextString(m) } func (*GetGroupAllMemberResp) ProtoMessage() {} func (*GetGroupAllMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{32} + return fileDescriptor_group_95c16320d90511af, []int{32} } func (m *GetGroupAllMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupAllMemberResp.Unmarshal(m, b) @@ -1835,7 +1835,7 @@ func (m *CMSGroup) Reset() { *m = CMSGroup{} } func (m *CMSGroup) String() string { return proto.CompactTextString(m) } func (*CMSGroup) ProtoMessage() {} func (*CMSGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{33} + return fileDescriptor_group_95c16320d90511af, []int{33} } func (m *CMSGroup) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CMSGroup.Unmarshal(m, b) @@ -1889,7 +1889,7 @@ func (m *GetGroupReq) Reset() { *m = GetGroupReq{} } func (m *GetGroupReq) String() string { return proto.CompactTextString(m) } func (*GetGroupReq) ProtoMessage() {} func (*GetGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{34} + return fileDescriptor_group_95c16320d90511af, []int{34} } func (m *GetGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupReq.Unmarshal(m, b) @@ -1943,7 +1943,7 @@ func (m *GetGroupResp) Reset() { *m = GetGroupResp{} } func (m *GetGroupResp) String() string { return proto.CompactTextString(m) } func (*GetGroupResp) ProtoMessage() {} func (*GetGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{35} + return fileDescriptor_group_95c16320d90511af, []int{35} } func (m *GetGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupResp.Unmarshal(m, b) @@ -1996,7 +1996,7 @@ func (m *GetGroupsReq) Reset() { *m = GetGroupsReq{} } func (m *GetGroupsReq) String() string { return proto.CompactTextString(m) } func (*GetGroupsReq) ProtoMessage() {} func (*GetGroupsReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{36} + return fileDescriptor_group_95c16320d90511af, []int{36} } func (m *GetGroupsReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsReq.Unmarshal(m, b) @@ -2043,7 +2043,7 @@ func (m *GetGroupsResp) Reset() { *m = GetGroupsResp{} } func (m *GetGroupsResp) String() string { return proto.CompactTextString(m) } func (*GetGroupsResp) ProtoMessage() {} func (*GetGroupsResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{37} + return fileDescriptor_group_95c16320d90511af, []int{37} } func (m *GetGroupsResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupsResp.Unmarshal(m, b) @@ -2096,7 +2096,7 @@ func (m *GetGroupMemberReq) Reset() { *m = GetGroupMemberReq{} } func (m *GetGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMemberReq) ProtoMessage() {} func (*GetGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{38} + return fileDescriptor_group_95c16320d90511af, []int{38} } func (m *GetGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMemberReq.Unmarshal(m, b) @@ -2143,7 +2143,7 @@ func (m *OperateGroupStatusReq) Reset() { *m = OperateGroupStatusReq{} } func (m *OperateGroupStatusReq) String() string { return proto.CompactTextString(m) } func (*OperateGroupStatusReq) ProtoMessage() {} func (*OperateGroupStatusReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{39} + return fileDescriptor_group_95c16320d90511af, []int{39} } func (m *OperateGroupStatusReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateGroupStatusReq.Unmarshal(m, b) @@ -2194,7 +2194,7 @@ func (m *OperateGroupStatusResp) Reset() { *m = OperateGroupStatusResp{} func (m *OperateGroupStatusResp) String() string { return proto.CompactTextString(m) } func (*OperateGroupStatusResp) ProtoMessage() {} func (*OperateGroupStatusResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{40} + return fileDescriptor_group_95c16320d90511af, []int{40} } func (m *OperateGroupStatusResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateGroupStatusResp.Unmarshal(m, b) @@ -2228,7 +2228,7 @@ func (m *OperateUserRoleReq) Reset() { *m = OperateUserRoleReq{} } func (m *OperateUserRoleReq) String() string { return proto.CompactTextString(m) } func (*OperateUserRoleReq) ProtoMessage() {} func (*OperateUserRoleReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{41} + return fileDescriptor_group_95c16320d90511af, []int{41} } func (m *OperateUserRoleReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateUserRoleReq.Unmarshal(m, b) @@ -2286,7 +2286,7 @@ func (m *OperateUserRoleResp) Reset() { *m = OperateUserRoleResp{} } func (m *OperateUserRoleResp) String() string { return proto.CompactTextString(m) } func (*OperateUserRoleResp) ProtoMessage() {} func (*OperateUserRoleResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{42} + return fileDescriptor_group_95c16320d90511af, []int{42} } func (m *OperateUserRoleResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OperateUserRoleResp.Unmarshal(m, b) @@ -2318,7 +2318,7 @@ func (m *DeleteGroupReq) Reset() { *m = DeleteGroupReq{} } func (m *DeleteGroupReq) String() string { return proto.CompactTextString(m) } func (*DeleteGroupReq) ProtoMessage() {} func (*DeleteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{43} + return fileDescriptor_group_95c16320d90511af, []int{43} } func (m *DeleteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteGroupReq.Unmarshal(m, b) @@ -2362,7 +2362,7 @@ func (m *DeleteGroupResp) Reset() { *m = DeleteGroupResp{} } func (m *DeleteGroupResp) String() string { return proto.CompactTextString(m) } func (*DeleteGroupResp) ProtoMessage() {} func (*DeleteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{44} + return fileDescriptor_group_95c16320d90511af, []int{44} } func (m *DeleteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteGroupResp.Unmarshal(m, b) @@ -2394,7 +2394,7 @@ func (m *GetGroupByIdReq) Reset() { *m = GetGroupByIdReq{} } func (m *GetGroupByIdReq) String() string { return proto.CompactTextString(m) } func (*GetGroupByIdReq) ProtoMessage() {} func (*GetGroupByIdReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{45} + return fileDescriptor_group_95c16320d90511af, []int{45} } func (m *GetGroupByIdReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupByIdReq.Unmarshal(m, b) @@ -2439,7 +2439,7 @@ func (m *GetGroupByIdResp) Reset() { *m = GetGroupByIdResp{} } func (m *GetGroupByIdResp) String() string { return proto.CompactTextString(m) } func (*GetGroupByIdResp) ProtoMessage() {} func (*GetGroupByIdResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{46} + return fileDescriptor_group_95c16320d90511af, []int{46} } func (m *GetGroupByIdResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupByIdResp.Unmarshal(m, b) @@ -2480,7 +2480,7 @@ func (m *GetGroupMembersCMSReq) Reset() { *m = GetGroupMembersCMSReq{} } func (m *GetGroupMembersCMSReq) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersCMSReq) ProtoMessage() {} func (*GetGroupMembersCMSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{47} + return fileDescriptor_group_95c16320d90511af, []int{47} } func (m *GetGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersCMSReq.Unmarshal(m, b) @@ -2541,7 +2541,7 @@ func (m *GetGroupMembersCMSResp) Reset() { *m = GetGroupMembersCMSResp{} func (m *GetGroupMembersCMSResp) String() string { return proto.CompactTextString(m) } func (*GetGroupMembersCMSResp) ProtoMessage() {} func (*GetGroupMembersCMSResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{48} + return fileDescriptor_group_95c16320d90511af, []int{48} } func (m *GetGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetGroupMembersCMSResp.Unmarshal(m, b) @@ -2596,7 +2596,7 @@ func (m *RemoveGroupMembersCMSReq) Reset() { *m = RemoveGroupMembersCMSR func (m *RemoveGroupMembersCMSReq) String() string { return proto.CompactTextString(m) } func (*RemoveGroupMembersCMSReq) ProtoMessage() {} func (*RemoveGroupMembersCMSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{49} + return fileDescriptor_group_95c16320d90511af, []int{49} } func (m *RemoveGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveGroupMembersCMSReq.Unmarshal(m, b) @@ -2656,7 +2656,7 @@ func (m *RemoveGroupMembersCMSResp) Reset() { *m = RemoveGroupMembersCMS func (m *RemoveGroupMembersCMSResp) String() string { return proto.CompactTextString(m) } func (*RemoveGroupMembersCMSResp) ProtoMessage() {} func (*RemoveGroupMembersCMSResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{50} + return fileDescriptor_group_95c16320d90511af, []int{50} } func (m *RemoveGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RemoveGroupMembersCMSResp.Unmarshal(m, b) @@ -2704,7 +2704,7 @@ func (m *AddGroupMembersCMSReq) Reset() { *m = AddGroupMembersCMSReq{} } func (m *AddGroupMembersCMSReq) String() string { return proto.CompactTextString(m) } func (*AddGroupMembersCMSReq) ProtoMessage() {} func (*AddGroupMembersCMSReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{51} + return fileDescriptor_group_95c16320d90511af, []int{51} } func (m *AddGroupMembersCMSReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddGroupMembersCMSReq.Unmarshal(m, b) @@ -2764,7 +2764,7 @@ func (m *AddGroupMembersCMSResp) Reset() { *m = AddGroupMembersCMSResp{} func (m *AddGroupMembersCMSResp) String() string { return proto.CompactTextString(m) } func (*AddGroupMembersCMSResp) ProtoMessage() {} func (*AddGroupMembersCMSResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{52} + return fileDescriptor_group_95c16320d90511af, []int{52} } func (m *AddGroupMembersCMSResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AddGroupMembersCMSResp.Unmarshal(m, b) @@ -2811,7 +2811,7 @@ func (m *DismissGroupReq) Reset() { *m = DismissGroupReq{} } func (m *DismissGroupReq) String() string { return proto.CompactTextString(m) } func (*DismissGroupReq) ProtoMessage() {} func (*DismissGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{53} + return fileDescriptor_group_95c16320d90511af, []int{53} } func (m *DismissGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DismissGroupReq.Unmarshal(m, b) @@ -2863,7 +2863,7 @@ func (m *DismissGroupResp) Reset() { *m = DismissGroupResp{} } func (m *DismissGroupResp) String() string { return proto.CompactTextString(m) } func (*DismissGroupResp) ProtoMessage() {} func (*DismissGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{54} + return fileDescriptor_group_95c16320d90511af, []int{54} } func (m *DismissGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DismissGroupResp.Unmarshal(m, b) @@ -2905,7 +2905,7 @@ func (m *MuteGroupMemberReq) Reset() { *m = MuteGroupMemberReq{} } func (m *MuteGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*MuteGroupMemberReq) ProtoMessage() {} func (*MuteGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{55} + return fileDescriptor_group_95c16320d90511af, []int{55} } func (m *MuteGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupMemberReq.Unmarshal(m, b) @@ -2971,7 +2971,7 @@ func (m *MuteGroupMemberResp) Reset() { *m = MuteGroupMemberResp{} } func (m *MuteGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*MuteGroupMemberResp) ProtoMessage() {} func (*MuteGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{56} + return fileDescriptor_group_95c16320d90511af, []int{56} } func (m *MuteGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupMemberResp.Unmarshal(m, b) @@ -3012,7 +3012,7 @@ func (m *CancelMuteGroupMemberReq) Reset() { *m = CancelMuteGroupMemberR func (m *CancelMuteGroupMemberReq) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupMemberReq) ProtoMessage() {} func (*CancelMuteGroupMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{57} + return fileDescriptor_group_95c16320d90511af, []int{57} } func (m *CancelMuteGroupMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupMemberReq.Unmarshal(m, b) @@ -3071,7 +3071,7 @@ func (m *CancelMuteGroupMemberResp) Reset() { *m = CancelMuteGroupMember func (m *CancelMuteGroupMemberResp) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupMemberResp) ProtoMessage() {} func (*CancelMuteGroupMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{58} + return fileDescriptor_group_95c16320d90511af, []int{58} } func (m *CancelMuteGroupMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupMemberResp.Unmarshal(m, b) @@ -3111,7 +3111,7 @@ func (m *MuteGroupReq) Reset() { *m = MuteGroupReq{} } func (m *MuteGroupReq) String() string { return proto.CompactTextString(m) } func (*MuteGroupReq) ProtoMessage() {} func (*MuteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{59} + return fileDescriptor_group_95c16320d90511af, []int{59} } func (m *MuteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupReq.Unmarshal(m, b) @@ -3163,7 +3163,7 @@ func (m *MuteGroupResp) Reset() { *m = MuteGroupResp{} } func (m *MuteGroupResp) String() string { return proto.CompactTextString(m) } func (*MuteGroupResp) ProtoMessage() {} func (*MuteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{60} + return fileDescriptor_group_95c16320d90511af, []int{60} } func (m *MuteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MuteGroupResp.Unmarshal(m, b) @@ -3203,7 +3203,7 @@ func (m *CancelMuteGroupReq) Reset() { *m = CancelMuteGroupReq{} } func (m *CancelMuteGroupReq) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupReq) ProtoMessage() {} func (*CancelMuteGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{61} + return fileDescriptor_group_95c16320d90511af, []int{61} } func (m *CancelMuteGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupReq.Unmarshal(m, b) @@ -3255,7 +3255,7 @@ func (m *CancelMuteGroupResp) Reset() { *m = CancelMuteGroupResp{} } func (m *CancelMuteGroupResp) String() string { return proto.CompactTextString(m) } func (*CancelMuteGroupResp) ProtoMessage() {} func (*CancelMuteGroupResp) Descriptor() ([]byte, []int) { - return fileDescriptor_group_3c77315b028a1402, []int{62} + return fileDescriptor_group_95c16320d90511af, []int{62} } func (m *CancelMuteGroupResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CancelMuteGroupResp.Unmarshal(m, b) @@ -3282,6 +3282,114 @@ func (m *CancelMuteGroupResp) GetCommonResp() *CommonResp { return nil } +type SetGroupMemberNicknameReq struct { + GroupID string `protobuf:"bytes,1,opt,name=groupID" json:"groupID,omitempty"` + Nickname string `protobuf:"bytes,2,opt,name=nickname" json:"nickname,omitempty"` + OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` + OperationID string `protobuf:"bytes,4,opt,name=operationID" json:"operationID,omitempty"` + UserID string `protobuf:"bytes,5,opt,name=userID" json:"userID,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetGroupMemberNicknameReq) Reset() { *m = SetGroupMemberNicknameReq{} } +func (m *SetGroupMemberNicknameReq) String() string { return proto.CompactTextString(m) } +func (*SetGroupMemberNicknameReq) ProtoMessage() {} +func (*SetGroupMemberNicknameReq) Descriptor() ([]byte, []int) { + return fileDescriptor_group_95c16320d90511af, []int{63} +} +func (m *SetGroupMemberNicknameReq) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetGroupMemberNicknameReq.Unmarshal(m, b) +} +func (m *SetGroupMemberNicknameReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetGroupMemberNicknameReq.Marshal(b, m, deterministic) +} +func (dst *SetGroupMemberNicknameReq) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetGroupMemberNicknameReq.Merge(dst, src) +} +func (m *SetGroupMemberNicknameReq) XXX_Size() int { + return xxx_messageInfo_SetGroupMemberNicknameReq.Size(m) +} +func (m *SetGroupMemberNicknameReq) XXX_DiscardUnknown() { + xxx_messageInfo_SetGroupMemberNicknameReq.DiscardUnknown(m) +} + +var xxx_messageInfo_SetGroupMemberNicknameReq proto.InternalMessageInfo + +func (m *SetGroupMemberNicknameReq) GetGroupID() string { + if m != nil { + return m.GroupID + } + return "" +} + +func (m *SetGroupMemberNicknameReq) GetNickname() string { + if m != nil { + return m.Nickname + } + return "" +} + +func (m *SetGroupMemberNicknameReq) GetOpUserID() string { + if m != nil { + return m.OpUserID + } + return "" +} + +func (m *SetGroupMemberNicknameReq) GetOperationID() string { + if m != nil { + return m.OperationID + } + return "" +} + +func (m *SetGroupMemberNicknameReq) GetUserID() string { + if m != nil { + return m.UserID + } + return "" +} + +type SetGroupMemberNicknameResp struct { + CommonResp *CommonResp `protobuf:"bytes,1,opt,name=CommonResp" json:"CommonResp,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *SetGroupMemberNicknameResp) Reset() { *m = SetGroupMemberNicknameResp{} } +func (m *SetGroupMemberNicknameResp) String() string { return proto.CompactTextString(m) } +func (*SetGroupMemberNicknameResp) ProtoMessage() {} +func (*SetGroupMemberNicknameResp) Descriptor() ([]byte, []int) { + return fileDescriptor_group_95c16320d90511af, []int{64} +} +func (m *SetGroupMemberNicknameResp) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_SetGroupMemberNicknameResp.Unmarshal(m, b) +} +func (m *SetGroupMemberNicknameResp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_SetGroupMemberNicknameResp.Marshal(b, m, deterministic) +} +func (dst *SetGroupMemberNicknameResp) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetGroupMemberNicknameResp.Merge(dst, src) +} +func (m *SetGroupMemberNicknameResp) XXX_Size() int { + return xxx_messageInfo_SetGroupMemberNicknameResp.Size(m) +} +func (m *SetGroupMemberNicknameResp) XXX_DiscardUnknown() { + xxx_messageInfo_SetGroupMemberNicknameResp.DiscardUnknown(m) +} + +var xxx_messageInfo_SetGroupMemberNicknameResp proto.InternalMessageInfo + +func (m *SetGroupMemberNicknameResp) GetCommonResp() *CommonResp { + if m != nil { + return m.CommonResp + } + return nil +} + func init() { proto.RegisterType((*CommonResp)(nil), "group.CommonResp") proto.RegisterType((*GroupAddMemberInfo)(nil), "group.GroupAddMemberInfo") @@ -3346,6 +3454,8 @@ func init() { proto.RegisterType((*MuteGroupResp)(nil), "group.MuteGroupResp") proto.RegisterType((*CancelMuteGroupReq)(nil), "group.CancelMuteGroupReq") proto.RegisterType((*CancelMuteGroupResp)(nil), "group.CancelMuteGroupResp") + proto.RegisterType((*SetGroupMemberNicknameReq)(nil), "group.SetGroupMemberNicknameReq") + proto.RegisterType((*SetGroupMemberNicknameResp)(nil), "group.SetGroupMemberNicknameResp") } // Reference imports to suppress errors if they are not otherwise used. @@ -3388,6 +3498,7 @@ type GroupClient interface { CancelMuteGroupMember(ctx context.Context, in *CancelMuteGroupMemberReq, opts ...grpc.CallOption) (*CancelMuteGroupMemberResp, error) MuteGroup(ctx context.Context, in *MuteGroupReq, opts ...grpc.CallOption) (*MuteGroupResp, error) CancelMuteGroup(ctx context.Context, in *CancelMuteGroupReq, opts ...grpc.CallOption) (*CancelMuteGroupResp, error) + SetGroupMemberNickname(ctx context.Context, in *SetGroupMemberNicknameReq, opts ...grpc.CallOption) (*SetGroupMemberNicknameResp, error) } type groupClient struct { @@ -3659,6 +3770,15 @@ func (c *groupClient) CancelMuteGroup(ctx context.Context, in *CancelMuteGroupRe return out, nil } +func (c *groupClient) SetGroupMemberNickname(ctx context.Context, in *SetGroupMemberNicknameReq, opts ...grpc.CallOption) (*SetGroupMemberNicknameResp, error) { + out := new(SetGroupMemberNicknameResp) + err := grpc.Invoke(ctx, "/group.group/SetGroupMemberNickname", in, out, c.cc, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // Server API for Group service type GroupServer interface { @@ -3691,6 +3811,7 @@ type GroupServer interface { CancelMuteGroupMember(context.Context, *CancelMuteGroupMemberReq) (*CancelMuteGroupMemberResp, error) MuteGroup(context.Context, *MuteGroupReq) (*MuteGroupResp, error) CancelMuteGroup(context.Context, *CancelMuteGroupReq) (*CancelMuteGroupResp, error) + SetGroupMemberNickname(context.Context, *SetGroupMemberNicknameReq) (*SetGroupMemberNicknameResp, error) } func RegisterGroupServer(s *grpc.Server, srv GroupServer) { @@ -4219,6 +4340,24 @@ func _Group_CancelMuteGroup_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } +func _Group_SetGroupMemberNickname_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(SetGroupMemberNicknameReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(GroupServer).SetGroupMemberNickname(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/group.group/SetGroupMemberNickname", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(GroupServer).SetGroupMemberNickname(ctx, req.(*SetGroupMemberNicknameReq)) + } + return interceptor(ctx, in, info, handler) +} + var _Group_serviceDesc = grpc.ServiceDesc{ ServiceName: "group.group", HandlerType: (*GroupServer)(nil), @@ -4339,143 +4478,151 @@ var _Group_serviceDesc = grpc.ServiceDesc{ MethodName: "CancelMuteGroup", Handler: _Group_CancelMuteGroup_Handler, }, + { + MethodName: "SetGroupMemberNickname", + Handler: _Group_SetGroupMemberNickname_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "group/group.proto", } -func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_3c77315b028a1402) } +func init() { proto.RegisterFile("group/group.proto", fileDescriptor_group_95c16320d90511af) } -var fileDescriptor_group_3c77315b028a1402 = []byte{ - // 2068 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x5a, 0x4f, 0x6f, 0xdb, 0xc8, - 0x15, 0x07, 0xed, 0xc8, 0xb6, 0x9e, 0xad, 0xc8, 0x1e, 0x47, 0xb6, 0xc2, 0xf5, 0x66, 0xbd, 0xb3, - 0xe9, 0x22, 0xe8, 0x1f, 0x1b, 0xcd, 0x02, 0x39, 0x74, 0x8b, 0xa6, 0xf1, 0x9f, 0xc4, 0x4a, 0x22, - 0xbb, 0xa1, 0xd3, 0x4b, 0x2e, 0xa9, 0x56, 0x1c, 0x0b, 0xaa, 0x25, 0x92, 0xe6, 0x50, 0x4e, 0xdb, - 0xcb, 0xa2, 0x97, 0x05, 0xb6, 0xed, 0xa1, 0x45, 0x81, 0x3d, 0x15, 0x68, 0x73, 0xeb, 0xa1, 0x87, - 0x1e, 0xda, 0x73, 0xd1, 0x8f, 0xd1, 0x4f, 0xd1, 0xaf, 0x50, 0x70, 0x66, 0x38, 0x1c, 0x0e, 0x87, - 0xb4, 0x42, 0x25, 0xcd, 0x45, 0xc0, 0xbc, 0x79, 0xc3, 0xf7, 0x7b, 0x6f, 0xe6, 0xbd, 0x79, 0xef, - 0x8d, 0x60, 0x6d, 0x10, 0xfa, 0x93, 0x60, 0x97, 0xfd, 0xee, 0x04, 0xa1, 0x1f, 0xf9, 0xa8, 0xc6, - 0x06, 0xf6, 0xc7, 0x27, 0x01, 0xf1, 0x5e, 0x76, 0xba, 0xbb, 0xc1, 0xf9, 0x60, 0x97, 0xcd, 0xec, - 0x52, 0xf7, 0xfc, 0xe5, 0x2b, 0xba, 0xfb, 0x8a, 0x72, 0x4e, 0xfc, 0x23, 0x80, 0x7d, 0x7f, 0x3c, - 0xf6, 0x3d, 0x87, 0xd0, 0x00, 0xb5, 0x61, 0xf1, 0x30, 0x0c, 0xf7, 0x7d, 0x97, 0xb4, 0xad, 0x6d, - 0xeb, 0x4e, 0xcd, 0x49, 0x86, 0x68, 0x03, 0x16, 0x0e, 0xc3, 0xb0, 0x4b, 0x07, 0xed, 0xb9, 0x6d, - 0xeb, 0x4e, 0xdd, 0x11, 0x23, 0xfc, 0x18, 0xd0, 0xa3, 0x58, 0xd6, 0x03, 0xd7, 0xed, 0x92, 0xf1, - 0x17, 0x24, 0xec, 0x78, 0x67, 0x7e, 0xcc, 0xfd, 0x53, 0x4a, 0xc2, 0xce, 0x01, 0xfb, 0x4c, 0xdd, - 0x11, 0x23, 0xb4, 0x05, 0x75, 0xc7, 0x1f, 0x91, 0xa7, 0xe4, 0x92, 0x8c, 0xd8, 0x87, 0x6a, 0x4e, - 0x4a, 0xc0, 0xff, 0xb5, 0xe0, 0xfa, 0x7e, 0x48, 0x7a, 0x11, 0x61, 0x9f, 0x74, 0xc8, 0x05, 0x7a, - 0x00, 0xd7, 0x3b, 0xde, 0x30, 0xe2, 0x9f, 0x7e, 0x3a, 0xa4, 0x51, 0xdb, 0xda, 0x9e, 0xbf, 0xb3, - 0x7c, 0xf7, 0xe6, 0x0e, 0x57, 0x37, 0x2f, 0xdb, 0xd1, 0x16, 0xa0, 0x1f, 0x40, 0x9d, 0x71, 0xc5, - 0x93, 0x4c, 0xe6, 0xf2, 0xdd, 0xad, 0x1d, 0x4a, 0xc2, 0x4b, 0x12, 0xbe, 0xec, 0x05, 0xc3, 0x97, - 0x41, 0x2f, 0xec, 0x8d, 0xe9, 0x8e, 0xe4, 0x71, 0x52, 0x76, 0xb4, 0x0d, 0xcb, 0x27, 0x01, 0x09, - 0x7b, 0xd1, 0xd0, 0xf7, 0x3a, 0x07, 0xed, 0x79, 0xa6, 0x8c, 0x4a, 0x42, 0x36, 0x2c, 0x9d, 0x04, - 0x42, 0xd7, 0x6b, 0x6c, 0x5a, 0x8e, 0xd9, 0xea, 0x57, 0x1e, 0x09, 0xc5, 0x74, 0x4d, 0xac, 0x4e, - 0x49, 0xf8, 0x4b, 0x68, 0x66, 0x14, 0xae, 0xb2, 0x05, 0x59, 0x05, 0xe7, 0xdf, 0x48, 0x41, 0x1c, - 0xc2, 0xea, 0x23, 0x12, 0xb1, 0x31, 0x65, 0x73, 0xe4, 0x22, 0x86, 0xcd, 0x19, 0x0e, 0xa4, 0xc1, - 0xeb, 0x8e, 0x4a, 0xd2, 0xcd, 0x32, 0x57, 0x6e, 0x96, 0xf9, 0xac, 0x59, 0xf0, 0xd7, 0x16, 0xac, - 0x69, 0x42, 0x2b, 0xe9, 0xbd, 0x07, 0x0d, 0xa9, 0x08, 0x43, 0x3a, 0xcf, 0x8e, 0x46, 0xb9, 0xee, - 0xd9, 0x25, 0xf8, 0xb7, 0x16, 0x34, 0x4f, 0x05, 0x96, 0x44, 0xff, 0x8c, 0x3d, 0xad, 0x37, 0x3b, - 0x30, 0xaa, 0xde, 0x73, 0x86, 0xe3, 0x50, 0x7a, 0x98, 0xf0, 0x21, 0xac, 0x66, 0xc1, 0xd0, 0x00, - 0x7d, 0x5f, 0x75, 0x50, 0x01, 0x67, 0x4d, 0x9c, 0xfe, 0x74, 0xc2, 0x51, 0x98, 0xf0, 0xaf, 0xc0, - 0x4e, 0xec, 0xfb, 0x20, 0x08, 0x46, 0xc3, 0x3e, 0xfb, 0x7e, 0xac, 0x6f, 0xac, 0x9e, 0x0a, 0xd1, - 0x2a, 0x87, 0x68, 0xd8, 0xd8, 0x5b, 0x00, 0x0f, 0x43, 0x7f, 0x9c, 0xd9, 0x5a, 0x85, 0x82, 0xff, - 0x64, 0xc1, 0x07, 0x85, 0xc2, 0x2b, 0x6d, 0xf3, 0x13, 0x58, 0x4d, 0xc2, 0xc1, 0x84, 0xd0, 0x48, - 0xd9, 0xe9, 0x8f, 0x8a, 0x76, 0x45, 0xb0, 0x3a, 0xb9, 0x85, 0x38, 0x82, 0xad, 0x47, 0x24, 0x8a, - 0xb1, 0x3a, 0xe4, 0xc2, 0x60, 0x9c, 0xa2, 0xc0, 0x35, 0xdb, 0xbe, 0xfe, 0xd9, 0x82, 0x0f, 0x4b, - 0xc4, 0x56, 0xda, 0x65, 0xa3, 0x5d, 0xe6, 0xaa, 0xda, 0xe5, 0x5f, 0x16, 0xb4, 0x9e, 0x87, 0x3d, - 0x8f, 0x9e, 0x91, 0x90, 0x4d, 0xb2, 0x28, 0x15, 0x5b, 0xa4, 0x0d, 0x8b, 0xc2, 0xf5, 0x85, 0x49, - 0x92, 0x21, 0xfa, 0x14, 0xae, 0x9f, 0x8c, 0x5c, 0x35, 0xc2, 0x71, 0xcb, 0x68, 0xd4, 0x98, 0xef, - 0x98, 0xbc, 0x52, 0xf9, 0xb8, 0x89, 0x34, 0xaa, 0x6e, 0xc7, 0x6b, 0xe5, 0x51, 0xa5, 0xa6, 0x45, - 0x95, 0x27, 0xb0, 0x61, 0x52, 0xa0, 0x9a, 0x07, 0x7d, 0x65, 0xc1, 0xca, 0x63, 0x7f, 0xe8, 0xc9, - 0x7b, 0xa8, 0xd8, 0x0a, 0xb7, 0x00, 0x1c, 0x72, 0xd1, 0x25, 0x94, 0xf6, 0x06, 0x44, 0x58, 0x40, - 0xa1, 0x94, 0x45, 0xc2, 0xab, 0x35, 0xc6, 0x7b, 0xd0, 0x50, 0x70, 0x54, 0x53, 0xe6, 0x3f, 0xb1, - 0x4b, 0x6a, 0xfe, 0x18, 0x4f, 0xf8, 0x1e, 0x25, 0x22, 0xde, 0xab, 0x28, 0xac, 0x72, 0xbb, 0xeb, - 0xa7, 0x5f, 0xb1, 0xcc, 0x7c, 0xce, 0x32, 0x4a, 0xa8, 0xb8, 0xa6, 0x87, 0x8a, 0x78, 0xfe, 0xa8, - 0xe7, 0xb9, 0x23, 0xe2, 0xc6, 0x4e, 0xcf, 0xf7, 0x53, 0xa1, 0x20, 0x0c, 0x2b, 0x7c, 0xe4, 0x10, - 0x3a, 0x19, 0x45, 0xed, 0x05, 0x16, 0x2f, 0x32, 0x34, 0xfc, 0x0c, 0xb6, 0x8a, 0x55, 0xab, 0x66, - 0xae, 0x33, 0x58, 0x79, 0x36, 0x19, 0x46, 0x53, 0x6c, 0xfd, 0x6c, 0xd7, 0xe0, 0x1e, 0x34, 0x14, - 0x39, 0xd5, 0xb0, 0xbe, 0xb6, 0xa0, 0x95, 0x44, 0xdb, 0x34, 0xe5, 0x29, 0x47, 0x3d, 0x53, 0x28, - 0x8b, 0x03, 0xe4, 0xc3, 0xe1, 0x28, 0x22, 0x21, 0xdb, 0xd0, 0x9a, 0x23, 0x46, 0xb1, 0xbc, 0x63, - 0xf2, 0x8b, 0xe8, 0x94, 0x5c, 0xb0, 0x9d, 0xac, 0x39, 0xc9, 0x10, 0xff, 0xcd, 0x82, 0x0d, 0x13, - 0xc6, 0x4a, 0x97, 0xc1, 0x43, 0x80, 0x71, 0x9a, 0x0b, 0xf2, 0x6b, 0xe0, 0xd3, 0xa2, 0x70, 0xc7, - 0xa5, 0x3d, 0x9c, 0x8c, 0x46, 0xec, 0x36, 0x55, 0x56, 0xc6, 0x92, 0x3d, 0x01, 0x97, 0xeb, 0x91, - 0x0c, 0xf1, 0xef, 0x73, 0x70, 0x65, 0x62, 0x54, 0x1a, 0x04, 0x14, 0x58, 0x73, 0x2c, 0x63, 0x52, - 0xc5, 0xcd, 0x16, 0x04, 0xfe, 0x68, 0xc1, 0xa6, 0x11, 0xd2, 0xfb, 0x34, 0x21, 0xfe, 0xbb, 0x05, - 0xe8, 0xc9, 0xb0, 0x7f, 0xae, 0xf0, 0x95, 0x1b, 0xe9, 0xdb, 0xb0, 0x1a, 0xf3, 0x13, 0x97, 0x2b, - 0xae, 0x98, 0x2a, 0x47, 0x8f, 0xc1, 0x3b, 0xa4, 0x47, 0x7d, 0x4f, 0x98, 0x4b, 0x8c, 0x74, 0x63, - 0xd5, 0xca, 0x5d, 0x6e, 0x41, 0x73, 0xb9, 0xcf, 0xa1, 0xde, 0x71, 0xef, 0xf2, 0xd0, 0x51, 0x78, - 0xd5, 0x33, 0xd1, 0x2c, 0xe0, 0xf0, 0x02, 0x45, 0x8c, 0xf0, 0x97, 0xb0, 0x9e, 0x53, 0xb7, 0xd2, - 0x06, 0xdc, 0x83, 0x86, 0x44, 0xa1, 0xec, 0xc1, 0xaa, 0x70, 0x75, 0x39, 0xe7, 0x64, 0xd9, 0xf0, - 0x84, 0xf9, 0x7a, 0x7c, 0x1d, 0x10, 0x97, 0xa1, 0x48, 0x7c, 0x3d, 0x1b, 0x68, 0xad, 0x5c, 0xa0, - 0xdd, 0x86, 0x65, 0x3f, 0x1f, 0xa7, 0xfc, 0x29, 0xe3, 0xd4, 0x57, 0xdc, 0x21, 0x72, 0x72, 0x67, - 0xaa, 0x55, 0xa6, 0xce, 0xd7, 0x53, 0x76, 0xfc, 0x0f, 0x0b, 0x6e, 0x74, 0xbc, 0xcb, 0x61, 0x44, - 0x62, 0x64, 0xcf, 0x7d, 0x19, 0xa1, 0xaf, 0x8e, 0xc3, 0xc5, 0x97, 0x54, 0x7a, 0xd0, 0xae, 0x65, - 0x0e, 0xda, 0x77, 0x61, 0x8d, 0xcb, 0x52, 0x4f, 0x6b, 0x8d, 0x9d, 0xd6, 0xfc, 0x44, 0xe9, 0xa1, - 0xfb, 0xb5, 0x05, 0x2d, 0x03, 0xec, 0xff, 0xeb, 0xd1, 0xf1, 0xe0, 0x86, 0x4c, 0xca, 0x47, 0xa3, - 0x69, 0x9c, 0x75, 0xb6, 0x84, 0xf7, 0x0f, 0xca, 0xbd, 0xa4, 0x08, 0x7c, 0xaf, 0xf1, 0xea, 0x1b, - 0x0b, 0x96, 0xf6, 0xbb, 0xa7, 0x8c, 0x6d, 0xa6, 0x1a, 0xef, 0x0e, 0x34, 0xb9, 0xac, 0x1e, 0x8d, - 0x48, 0x78, 0xdc, 0x1b, 0x27, 0x69, 0x9f, 0x4e, 0x46, 0xb7, 0x45, 0x85, 0xca, 0x49, 0x1d, 0x57, - 0x98, 0x2a, 0x4b, 0x8c, 0xc3, 0xfb, 0x72, 0x62, 0xac, 0x78, 0x53, 0xb6, 0x04, 0x36, 0xf6, 0x65, - 0xbe, 0x2d, 0x29, 0x01, 0x1d, 0x00, 0xfc, 0xa4, 0x37, 0x18, 0x7a, 0xcc, 0xd4, 0xa2, 0x9f, 0x71, - 0xdb, 0x00, 0x5d, 0x64, 0xf7, 0x29, 0xaf, 0xa3, 0xac, 0x9b, 0x62, 0x0b, 0x5f, 0x5b, 0xb0, 0x92, - 0xa2, 0xa2, 0x01, 0xfa, 0x1e, 0xd4, 0x13, 0xf3, 0x51, 0xd1, 0x85, 0x69, 0x26, 0xd9, 0x89, 0xa0, - 0x3b, 0x29, 0xc7, 0x5b, 0xc2, 0x29, 0x6d, 0x31, 0x19, 0x53, 0x86, 0xb2, 0xe6, 0xa4, 0x04, 0x7c, - 0x99, 0x42, 0xa4, 0xb1, 0xe5, 0xb2, 0x32, 0xad, 0xb7, 0x63, 0x9b, 0x7c, 0x38, 0xc1, 0x7f, 0xb1, - 0xa0, 0xa1, 0x08, 0x7e, 0x5f, 0xc6, 0xb1, 0x61, 0x29, 0xb1, 0x85, 0xb0, 0x8d, 0x1c, 0xe3, 0x93, - 0xb4, 0xc7, 0x62, 0x70, 0x77, 0x37, 0xeb, 0xee, 0xee, 0x14, 0x3a, 0x9f, 0x43, 0x8b, 0x0f, 0x79, - 0xaf, 0xea, 0x34, 0xea, 0x45, 0x13, 0x5a, 0xfe, 0xd1, 0x0d, 0x58, 0xe0, 0x6c, 0xc9, 0x4d, 0xca, - 0x47, 0x53, 0x1c, 0xbe, 0x36, 0x6c, 0x98, 0x84, 0xf1, 0xca, 0x0c, 0x89, 0x29, 0x56, 0x4e, 0xfb, - 0x23, 0x72, 0x25, 0x08, 0x16, 0xb6, 0xdc, 0x24, 0xac, 0xf0, 0x51, 0xb6, 0x15, 0x39, 0xaf, 0xb5, - 0x22, 0xa7, 0x48, 0xca, 0x5a, 0xb0, 0x9e, 0xc3, 0x41, 0x03, 0xfc, 0x14, 0xae, 0x1f, 0x90, 0x11, - 0x51, 0x5a, 0x98, 0xb3, 0x18, 0x7d, 0x0d, 0x9a, 0x99, 0xaf, 0xd1, 0x00, 0x77, 0xa1, 0x99, 0x6c, - 0xec, 0xde, 0x2f, 0x3b, 0xee, 0xac, 0x12, 0xee, 0xa7, 0x0d, 0x40, 0xfe, 0x39, 0x1a, 0xa0, 0xef, - 0xa4, 0x81, 0x52, 0x38, 0x51, 0xee, 0x2c, 0x4b, 0x06, 0xfc, 0xcf, 0x5c, 0x09, 0x42, 0xf7, 0xbb, - 0xa7, 0xe5, 0xb0, 0x6c, 0x58, 0x8a, 0x8d, 0xa6, 0x84, 0x4e, 0x39, 0xd6, 0x5c, 0x63, 0xfe, 0xed, - 0xf8, 0xb0, 0x61, 0xff, 0xfe, 0x9d, 0xcf, 0xf3, 0x19, 0x6e, 0x1a, 0xa0, 0x1f, 0xc3, 0x22, 0xbf, - 0x37, 0x12, 0x57, 0x9e, 0xf6, 0xba, 0x49, 0x96, 0xa1, 0x43, 0x83, 0x7f, 0x7f, 0xcb, 0xa8, 0x04, - 0xaf, 0x55, 0x0b, 0xb4, 0xb8, 0x05, 0xc0, 0x25, 0x28, 0xe1, 0x4f, 0xa1, 0xe0, 0xdf, 0x59, 0xd0, - 0x76, 0xc8, 0xd8, 0xbf, 0x24, 0x6f, 0x64, 0xfe, 0x36, 0x2c, 0x72, 0x27, 0xa0, 0x22, 0xff, 0x4e, - 0x86, 0x6f, 0xd4, 0xef, 0x76, 0xb5, 0x7e, 0xb7, 0x8b, 0xbb, 0x70, 0xb3, 0x00, 0x0d, 0xbf, 0xf8, - 0xe9, 0xa4, 0xdf, 0x27, 0x94, 0x8a, 0x8e, 0x72, 0x32, 0x8c, 0x3d, 0xf4, 0xac, 0x37, 0x1c, 0x11, - 0x57, 0xa0, 0x11, 0x23, 0xfc, 0xb5, 0x05, 0xad, 0x07, 0xae, 0xfb, 0x2e, 0x54, 0x73, 0xf3, 0xaa, - 0xb9, 0xa5, 0xaa, 0x3d, 0x86, 0x0d, 0x13, 0x94, 0x4a, 0x7a, 0x0d, 0xa1, 0x79, 0x30, 0xa4, 0xe3, - 0x21, 0xa5, 0x32, 0x46, 0xd8, 0xb0, 0xe4, 0x6b, 0x3d, 0x59, 0x3f, 0x98, 0x3a, 0x7b, 0x6f, 0xc3, - 0xe2, 0x20, 0x9b, 0xdd, 0x8a, 0x21, 0x3e, 0x84, 0xd5, 0xac, 0x28, 0xde, 0x66, 0xe8, 0x4f, 0xd3, - 0x66, 0x48, 0x99, 0xf0, 0x5f, 0x2d, 0x40, 0xdd, 0x49, 0x44, 0xb4, 0xeb, 0xe4, 0x1d, 0xa1, 0x8e, - 0x0d, 0x37, 0x51, 0x9b, 0x46, 0x62, 0x84, 0x30, 0xac, 0x8c, 0x27, 0x11, 0x71, 0x4f, 0x49, 0xdf, - 0xf7, 0x5c, 0xca, 0xaa, 0xbf, 0x86, 0x93, 0xa1, 0xe1, 0x23, 0x58, 0xcf, 0x21, 0xad, 0xa6, 0xf4, - 0x6f, 0x2c, 0x68, 0xef, 0xf7, 0xbc, 0x3e, 0x19, 0xbd, 0x7f, 0xd5, 0xf1, 0x31, 0xdc, 0x2c, 0xc0, - 0x52, 0x4d, 0xb9, 0x33, 0x58, 0x91, 0x5f, 0x7a, 0x97, 0x07, 0x70, 0x0f, 0x1a, 0x8a, 0x9c, 0x6a, - 0x58, 0x47, 0x80, 0x34, 0xdd, 0xdf, 0x25, 0xe2, 0x23, 0x58, 0xcf, 0x49, 0xab, 0x84, 0xfb, 0xee, - 0x37, 0x6b, 0xc0, 0xdf, 0x61, 0xd1, 0x0f, 0x61, 0xb9, 0x9f, 0x3e, 0xf3, 0xa1, 0x56, 0xb2, 0x2e, - 0xf3, 0xd6, 0x69, 0x6f, 0x98, 0xc8, 0x34, 0x40, 0xf7, 0xa0, 0xfe, 0xf3, 0xa4, 0x07, 0x8c, 0xd6, - 0x05, 0x93, 0xda, 0x9d, 0xb6, 0x6f, 0xe4, 0x89, 0x7c, 0xdd, 0x45, 0xd2, 0x60, 0x94, 0xeb, 0xd4, - 0xd6, 0xa6, 0x5c, 0x97, 0xed, 0x43, 0xee, 0x41, 0x63, 0xa0, 0x3e, 0xcf, 0xa1, 0xcd, 0xe4, 0xb1, - 0x55, 0x7b, 0x29, 0xb4, 0xdb, 0xe6, 0x09, 0x1a, 0xa0, 0xfb, 0xb0, 0x42, 0x95, 0x97, 0x2c, 0x94, - 0xe8, 0xa6, 0xbd, 0xb5, 0xd9, 0x9b, 0x46, 0x3a, 0x0d, 0xd0, 0xcf, 0x60, 0x73, 0x60, 0x7e, 0x46, - 0x42, 0x1f, 0x6b, 0x52, 0xf3, 0xcf, 0x38, 0x36, 0xbe, 0x8a, 0x85, 0x06, 0xe8, 0x0c, 0x6e, 0x0e, - 0x8a, 0xde, 0x64, 0xd0, 0x27, 0xe9, 0x07, 0x0a, 0x1f, 0x8b, 0xec, 0xdb, 0x57, 0x33, 0xd1, 0x00, - 0x3d, 0x03, 0x14, 0xe5, 0x1e, 0x26, 0xd0, 0x96, 0x58, 0x6b, 0x7c, 0x74, 0xb1, 0x3f, 0x2c, 0x99, - 0xa5, 0x01, 0xea, 0x43, 0x7b, 0x50, 0xd0, 0xf5, 0x46, 0x38, 0xf3, 0x32, 0x6e, 0xec, 0xf8, 0xdb, - 0x9f, 0x5c, 0xc9, 0xc3, 0x71, 0x0f, 0x72, 0x6d, 0x5b, 0x89, 0xdb, 0xd8, 0x75, 0x96, 0xb8, 0x0b, - 0xfa, 0xbd, 0xcf, 0x61, 0x7d, 0x90, 0xef, 0x63, 0x22, 0xf3, 0x2a, 0x79, 0xca, 0x6e, 0x95, 0x4d, - 0xd3, 0x00, 0x1d, 0x41, 0xf3, 0x3c, 0xdb, 0x98, 0x43, 0xc9, 0xdf, 0x03, 0xf2, 0xfd, 0x49, 0xdb, - 0x2e, 0x9a, 0x92, 0x2a, 0x6b, 0x9d, 0x2e, 0x55, 0xe5, 0x7c, 0xf3, 0x4d, 0x55, 0xd9, 0xd4, 0x22, - 0x3b, 0x86, 0xb5, 0xa1, 0xde, 0xfc, 0x41, 0x1f, 0x24, 0xfd, 0x1a, 0x43, 0x37, 0xcb, 0xde, 0x2a, - 0x9e, 0xe4, 0xdf, 0x1b, 0xe8, 0x8d, 0x15, 0xf9, 0x3d, 0x53, 0x8f, 0xc7, 0xde, 0x2a, 0x9e, 0xe4, - 0x8e, 0xaa, 0xe6, 0xff, 0xd2, 0x51, 0xb5, 0x1a, 0xc3, 0xde, 0x34, 0xd2, 0x69, 0x80, 0x3e, 0x83, - 0xa5, 0x84, 0x86, 0x90, 0xc6, 0x14, 0x2f, 0x5c, 0xcf, 0xd1, 0x78, 0x68, 0x92, 0x31, 0x03, 0xe9, - 0x1c, 0x54, 0x0d, 0x4d, 0xd9, 0x32, 0xfb, 0x99, 0x2c, 0xfe, 0x94, 0xba, 0x50, 0x6e, 0x90, 0xb1, - 0x3e, 0x95, 0x1b, 0x64, 0x2e, 0x28, 0xe3, 0xd3, 0xa3, 0xd5, 0x71, 0xf2, 0xf4, 0xe4, 0xeb, 0x4c, - 0x79, 0x7a, 0x0c, 0xa5, 0x5f, 0x1c, 0xe5, 0x95, 0x62, 0x4d, 0x46, 0xf9, 0x6c, 0x39, 0x28, 0xa3, - 0xbc, 0x56, 0xd7, 0xc5, 0xaa, 0xe5, 0xcb, 0x91, 0x02, 0x77, 0x13, 0x79, 0x70, 0x81, 0xbb, 0xc9, - 0xd4, 0xf4, 0x05, 0xb4, 0x8c, 0xf9, 0x38, 0xfa, 0x48, 0xac, 0x2b, 0xaa, 0x1d, 0xec, 0xed, 0x72, - 0x06, 0x0e, 0x37, 0x9f, 0x10, 0x4b, 0xb8, 0xc6, 0xb4, 0x5d, 0xc2, 0x2d, 0xc8, 0xa4, 0xef, 0xc3, - 0x8a, 0x9a, 0xac, 0xca, 0xa3, 0xa8, 0x25, 0xcb, 0xf2, 0x28, 0xe6, 0x32, 0xdb, 0x23, 0x68, 0x6a, - 0xe9, 0x91, 0xdc, 0xca, 0x7c, 0x0a, 0x27, 0xb7, 0xd2, 0x94, 0x51, 0xbd, 0x80, 0x96, 0x31, 0xdd, - 0x92, 0x96, 0x2b, 0x4a, 0x0c, 0xa5, 0xe5, 0x8a, 0xb3, 0xb5, 0x7b, 0x50, 0x97, 0x64, 0x79, 0xf6, - 0xd5, 0xd4, 0x46, 0x9e, 0xfd, 0x6c, 0x06, 0x72, 0x04, 0x4d, 0xed, 0xa3, 0x52, 0xbb, 0x7c, 0x7a, - 0x24, 0xb5, 0x33, 0xe4, 0x32, 0x7b, 0xcd, 0x17, 0x8d, 0x1d, 0xfe, 0x77, 0xb1, 0xcf, 0xd9, 0xef, - 0x17, 0x0b, 0xec, 0xbf, 0x60, 0x9f, 0xfd, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x2b, 0x24, 0xa7, - 0x4a, 0x26, 0x00, 0x00, +var fileDescriptor_group_95c16320d90511af = []byte{ + // 2138 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x1a, 0x4d, 0x6f, 0x1c, 0x49, + 0x55, 0xed, 0xf1, 0xd8, 0x9e, 0x67, 0x4f, 0xc6, 0x2e, 0xef, 0xd8, 0xe3, 0x5e, 0x6f, 0xd6, 0xa9, + 0x0d, 0xab, 0x88, 0x0f, 0x5b, 0x64, 0xa5, 0x1c, 0x58, 0x44, 0x88, 0x3f, 0x12, 0x4f, 0x92, 0xb1, + 0x49, 0x3b, 0x5c, 0x22, 0xa1, 0x30, 0x3b, 0x5d, 0x1e, 0x0d, 0x9e, 0xe9, 0x6e, 0x77, 0xf5, 0x38, + 0xc0, 0x65, 0xc5, 0x65, 0xa5, 0x05, 0x0e, 0x20, 0x24, 0x4e, 0x48, 0xb0, 0x27, 0x38, 0x70, 0xe0, + 0x00, 0x67, 0xc4, 0xcf, 0xe0, 0x57, 0x70, 0xe2, 0x8e, 0xba, 0xaa, 0xba, 0xba, 0xba, 0xab, 0xba, + 0x3d, 0x99, 0x49, 0xc8, 0x65, 0xa4, 0xf7, 0xea, 0x55, 0xbf, 0x8f, 0x7a, 0xef, 0xd5, 0x7b, 0xaf, + 0x06, 0xd6, 0xfa, 0xa1, 0x3f, 0x0e, 0xf6, 0xd8, 0xef, 0x6e, 0x10, 0xfa, 0x91, 0x8f, 0xaa, 0x0c, + 0xb0, 0x6f, 0x9d, 0x06, 0xc4, 0x7b, 0xd9, 0xee, 0xec, 0x05, 0x17, 0xfd, 0x3d, 0xb6, 0xb2, 0x47, + 0xdd, 0x8b, 0x97, 0xaf, 0xe8, 0xde, 0x2b, 0xca, 0x29, 0xf1, 0xf7, 0x00, 0x0e, 0xfc, 0xd1, 0xc8, + 0xf7, 0x1c, 0x42, 0x03, 0xd4, 0x82, 0xc5, 0xa3, 0x30, 0x3c, 0xf0, 0x5d, 0xd2, 0xb2, 0x76, 0xac, + 0x3b, 0x55, 0x27, 0x01, 0xd1, 0x06, 0x2c, 0x1c, 0x85, 0x61, 0x87, 0xf6, 0x5b, 0x73, 0x3b, 0xd6, + 0x9d, 0x9a, 0x23, 0x20, 0xfc, 0x18, 0xd0, 0xa3, 0x98, 0xd7, 0x03, 0xd7, 0xed, 0x90, 0xd1, 0x67, + 0x24, 0x6c, 0x7b, 0xe7, 0x7e, 0x4c, 0xfd, 0x43, 0x4a, 0xc2, 0xf6, 0x21, 0xfb, 0x4c, 0xcd, 0x11, + 0x10, 0xda, 0x86, 0x9a, 0xe3, 0x0f, 0xc9, 0x53, 0x72, 0x45, 0x86, 0xec, 0x43, 0x55, 0x27, 0x45, + 0xe0, 0xff, 0x58, 0x70, 0xe3, 0x20, 0x24, 0xdd, 0x88, 0xb0, 0x4f, 0x3a, 0xe4, 0x12, 0x3d, 0x80, + 0x1b, 0x6d, 0x6f, 0x10, 0xf1, 0x4f, 0x3f, 0x1d, 0xd0, 0xa8, 0x65, 0xed, 0x54, 0xee, 0x2c, 0xdf, + 0xdd, 0xda, 0xe5, 0xea, 0xea, 0xbc, 0x9d, 0xdc, 0x06, 0xf4, 0x1d, 0xa8, 0x31, 0xaa, 0x78, 0x91, + 0xf1, 0x5c, 0xbe, 0xbb, 0xbd, 0x4b, 0x49, 0x78, 0x45, 0xc2, 0x97, 0xdd, 0x60, 0xf0, 0x32, 0xe8, + 0x86, 0xdd, 0x11, 0xdd, 0x95, 0x34, 0x4e, 0x4a, 0x8e, 0x76, 0x60, 0xf9, 0x34, 0x20, 0x61, 0x37, + 0x1a, 0xf8, 0x5e, 0xfb, 0xb0, 0x55, 0x61, 0xca, 0xa8, 0x28, 0x64, 0xc3, 0xd2, 0x69, 0x20, 0x74, + 0x9d, 0x67, 0xcb, 0x12, 0x66, 0xbb, 0x5f, 0x79, 0x24, 0x14, 0xcb, 0x55, 0xb1, 0x3b, 0x45, 0xe1, + 0xcf, 0xa1, 0x91, 0x51, 0x78, 0x9a, 0x23, 0xc8, 0x2a, 0x58, 0x79, 0x2d, 0x05, 0x71, 0x08, 0xab, + 0x8f, 0x48, 0xc4, 0x60, 0xca, 0xd6, 0xc8, 0x65, 0x2c, 0x36, 0x27, 0x38, 0x94, 0x06, 0xaf, 0x39, + 0x2a, 0x2a, 0x6f, 0x96, 0xb9, 0x72, 0xb3, 0x54, 0xb2, 0x66, 0xc1, 0x5f, 0x5a, 0xb0, 0x96, 0x63, + 0x3a, 0x95, 0xde, 0xfb, 0x50, 0x97, 0x8a, 0x30, 0x49, 0x2b, 0xcc, 0x35, 0xca, 0x75, 0xcf, 0x6e, + 0xc1, 0xbf, 0xb2, 0xa0, 0x71, 0x26, 0x64, 0x49, 0xf4, 0xcf, 0xd8, 0xd3, 0x7a, 0x3d, 0x87, 0x51, + 0xf5, 0x9e, 0x33, 0xb8, 0x43, 0xa9, 0x33, 0xe1, 0x23, 0x58, 0xcd, 0x0a, 0x43, 0x03, 0xf4, 0x6d, + 0x35, 0x40, 0x85, 0x38, 0x6b, 0xc2, 0xfb, 0xd3, 0x05, 0x47, 0x21, 0xc2, 0x3f, 0x07, 0x3b, 0xb1, + 0xef, 0x83, 0x20, 0x18, 0x0e, 0x7a, 0xec, 0xfb, 0xb1, 0xbe, 0xb1, 0x7a, 0xaa, 0x88, 0x56, 0xb9, + 0x88, 0x86, 0x83, 0xbd, 0x09, 0xf0, 0x30, 0xf4, 0x47, 0x99, 0xa3, 0x55, 0x30, 0xf8, 0x0f, 0x16, + 0xbc, 0x5f, 0xc8, 0x7c, 0xaa, 0x63, 0x7e, 0x02, 0xab, 0x49, 0x3a, 0x18, 0x13, 0x1a, 0x29, 0x27, + 0xfd, 0x61, 0xd1, 0xa9, 0x08, 0x52, 0x47, 0xdb, 0x88, 0x23, 0xd8, 0x7e, 0x44, 0xa2, 0x58, 0x56, + 0x87, 0x5c, 0x1a, 0x8c, 0x53, 0x94, 0xb8, 0x66, 0x3b, 0xd7, 0x3f, 0x5a, 0xf0, 0x41, 0x09, 0xdb, + 0xa9, 0x4e, 0xd9, 0x68, 0x97, 0xb9, 0x69, 0xed, 0xf2, 0x4f, 0x0b, 0x9a, 0xcf, 0xc3, 0xae, 0x47, + 0xcf, 0x49, 0xc8, 0x16, 0x59, 0x96, 0x8a, 0x2d, 0xd2, 0x82, 0x45, 0x11, 0xfa, 0xc2, 0x24, 0x09, + 0x88, 0x3e, 0x86, 0x1b, 0xa7, 0x43, 0x57, 0xcd, 0x70, 0xdc, 0x32, 0x39, 0x6c, 0x4c, 0x77, 0x42, + 0x5e, 0xa9, 0x74, 0xdc, 0x44, 0x39, 0x6c, 0xde, 0x8e, 0xf3, 0xe5, 0x59, 0xa5, 0x9a, 0xcb, 0x2a, + 0x4f, 0x60, 0xc3, 0xa4, 0xc0, 0x74, 0x11, 0xf4, 0x85, 0x05, 0x2b, 0x8f, 0xfd, 0x81, 0x27, 0xef, + 0xa1, 0x62, 0x2b, 0xdc, 0x04, 0x70, 0xc8, 0x65, 0x87, 0x50, 0xda, 0xed, 0x13, 0x61, 0x01, 0x05, + 0x53, 0x96, 0x09, 0xaf, 0xd7, 0x18, 0xef, 0x43, 0x5d, 0x91, 0x63, 0x3a, 0x65, 0xfe, 0x1d, 0x87, + 0x64, 0x2e, 0x1e, 0xe3, 0x05, 0xdf, 0xa3, 0x44, 0xe4, 0x7b, 0x55, 0x0a, 0xab, 0xdc, 0xee, 0x79, + 0xef, 0x57, 0x2c, 0x53, 0xd1, 0x2c, 0xa3, 0xa4, 0x8a, 0xf9, 0x7c, 0xaa, 0x88, 0xd7, 0x8f, 0xbb, + 0x9e, 0x3b, 0x24, 0x6e, 0x1c, 0xf4, 0xfc, 0x3c, 0x15, 0x0c, 0xc2, 0xb0, 0xc2, 0x21, 0x87, 0xd0, + 0xf1, 0x30, 0x6a, 0x2d, 0xb0, 0x7c, 0x91, 0xc1, 0xe1, 0x67, 0xb0, 0x5d, 0xac, 0xda, 0x74, 0xe6, + 0x3a, 0x87, 0x95, 0x67, 0xe3, 0x41, 0x34, 0xc1, 0xd1, 0xcf, 0x76, 0x0d, 0xee, 0x43, 0x5d, 0xe1, + 0x33, 0x9d, 0xac, 0x5f, 0x59, 0xd0, 0x4c, 0xb2, 0x6d, 0x5a, 0xf2, 0x94, 0x4b, 0x3d, 0x53, 0x2a, + 0x8b, 0x13, 0xe4, 0xc3, 0xc1, 0x30, 0x22, 0x21, 0x3b, 0xd0, 0xaa, 0x23, 0xa0, 0x98, 0xdf, 0x09, + 0xf9, 0x69, 0x74, 0x46, 0x2e, 0xd9, 0x49, 0x56, 0x9d, 0x04, 0xc4, 0x7f, 0xb5, 0x60, 0xc3, 0x24, + 0xe3, 0x54, 0x97, 0xc1, 0x43, 0x80, 0x51, 0x5a, 0x0b, 0xf2, 0x6b, 0xe0, 0xe3, 0xa2, 0x74, 0xc7, + 0xb9, 0x3d, 0x1c, 0x0f, 0x87, 0xec, 0x36, 0x55, 0x76, 0xc6, 0x9c, 0x3d, 0x21, 0x2e, 0xd7, 0x23, + 0x01, 0xf1, 0x6f, 0x34, 0x71, 0x65, 0x61, 0x54, 0x9a, 0x04, 0x14, 0xb1, 0xe6, 0x58, 0xc5, 0xa4, + 0xb2, 0x9b, 0x2d, 0x09, 0xfc, 0xce, 0x82, 0x4d, 0xa3, 0x48, 0xef, 0xd2, 0x84, 0xf8, 0x6f, 0x16, + 0xa0, 0x27, 0x83, 0xde, 0x85, 0x42, 0x57, 0x6e, 0xa4, 0xaf, 0xc3, 0x6a, 0x4c, 0x4f, 0x5c, 0xae, + 0xb8, 0x62, 0x2a, 0x0d, 0x1f, 0x0b, 0xef, 0x90, 0x2e, 0xf5, 0x3d, 0x61, 0x2e, 0x01, 0xe5, 0x8d, + 0x55, 0x2d, 0x0f, 0xb9, 0x85, 0x5c, 0xc8, 0x7d, 0x0a, 0xb5, 0xb6, 0x7b, 0x97, 0xa7, 0x8e, 0xc2, + 0xab, 0x9e, 0xb1, 0x66, 0x09, 0x87, 0x37, 0x28, 0x02, 0xc2, 0x9f, 0xc3, 0xba, 0xa6, 0xee, 0x54, + 0x07, 0x70, 0x0f, 0xea, 0x52, 0x0a, 0xe5, 0x0c, 0x56, 0x45, 0xa8, 0xcb, 0x35, 0x27, 0x4b, 0x86, + 0xc7, 0x2c, 0xd6, 0xe3, 0xeb, 0x80, 0xb8, 0x4c, 0x8a, 0x24, 0xd6, 0xb3, 0x89, 0xd6, 0xd2, 0x12, + 0xed, 0x0e, 0x2c, 0xfb, 0x7a, 0x9e, 0xf2, 0x27, 0xcc, 0x53, 0x5f, 0xf0, 0x80, 0xd0, 0xf8, 0xce, + 0xd4, 0xab, 0x4c, 0x5c, 0xaf, 0xa7, 0xe4, 0xf8, 0xef, 0x16, 0xbc, 0xd7, 0xf6, 0xae, 0x06, 0x11, + 0x89, 0x25, 0x7b, 0xee, 0xcb, 0x0c, 0x7d, 0x7d, 0x1e, 0x2e, 0xbe, 0xa4, 0x52, 0x47, 0x9b, 0xcf, + 0x38, 0xda, 0x37, 0x61, 0x8d, 0xf3, 0x52, 0xbd, 0xb5, 0xca, 0xbc, 0x55, 0x5f, 0x28, 0x75, 0xba, + 0x5f, 0x58, 0xd0, 0x34, 0x88, 0xfd, 0x7f, 0x75, 0x1d, 0x0f, 0xde, 0x93, 0x45, 0xf9, 0x70, 0x38, + 0x49, 0xb0, 0xce, 0x56, 0xf0, 0xfe, 0x56, 0xb9, 0x97, 0x14, 0x86, 0xef, 0x34, 0x5f, 0xfd, 0xde, + 0x82, 0xa5, 0x83, 0xce, 0x19, 0x23, 0x9b, 0xa9, 0xc7, 0xbb, 0x03, 0x0d, 0xce, 0xab, 0x4b, 0x23, + 0x12, 0x9e, 0x74, 0x47, 0x49, 0xd9, 0x97, 0x47, 0xa3, 0xdb, 0xa2, 0x43, 0xe5, 0xa8, 0xb6, 0x2b, + 0x4c, 0x95, 0x45, 0xc6, 0xe9, 0x7d, 0x39, 0x31, 0x56, 0x7c, 0x28, 0xdb, 0x42, 0x36, 0xf6, 0x65, + 0x7e, 0x2c, 0x29, 0x02, 0x1d, 0x02, 0xfc, 0xa0, 0xdb, 0x1f, 0x78, 0xcc, 0xd4, 0x62, 0x9e, 0x71, + 0xdb, 0x20, 0xba, 0xa8, 0xee, 0x53, 0x5a, 0x47, 0xd9, 0x37, 0xc1, 0x11, 0x7e, 0x65, 0xc1, 0x4a, + 0x2a, 0x15, 0x0d, 0xd0, 0xb7, 0xa0, 0x96, 0x98, 0x8f, 0x8a, 0x29, 0x4c, 0x23, 0xa9, 0x4e, 0x04, + 0xde, 0x49, 0x29, 0xde, 0x90, 0x9c, 0xd2, 0x16, 0xe3, 0x11, 0x65, 0x52, 0x56, 0x9d, 0x14, 0x81, + 0xaf, 0x52, 0x11, 0x69, 0x6c, 0xb9, 0x2c, 0x4f, 0xeb, 0xcd, 0xd8, 0x46, 0x4f, 0x27, 0xf8, 0x4f, + 0x16, 0xd4, 0x15, 0xc6, 0xef, 0xca, 0x38, 0x36, 0x2c, 0x25, 0xb6, 0x10, 0xb6, 0x91, 0x30, 0x3e, + 0x4d, 0x67, 0x2c, 0x86, 0x70, 0x77, 0xb3, 0xe1, 0xee, 0x4e, 0xa0, 0xf3, 0x05, 0x34, 0x39, 0xc8, + 0x67, 0x55, 0x67, 0x51, 0x37, 0x1a, 0xd3, 0xf2, 0x8f, 0x6e, 0xc0, 0x02, 0x27, 0x4b, 0x6e, 0x52, + 0x0e, 0x4d, 0xe0, 0x7c, 0x2d, 0xd8, 0x30, 0x31, 0xe3, 0x9d, 0x19, 0x12, 0x4b, 0xac, 0x9d, 0xf6, + 0x87, 0xe4, 0x5a, 0x21, 0x58, 0xda, 0x72, 0x93, 0xb4, 0xc2, 0xa1, 0xec, 0x28, 0xb2, 0x92, 0x1b, + 0x45, 0x4e, 0x50, 0x94, 0x35, 0x61, 0x5d, 0x93, 0x83, 0x06, 0xf8, 0x29, 0xdc, 0x38, 0x24, 0x43, + 0xa2, 0x8c, 0x30, 0x67, 0x31, 0xfa, 0x1a, 0x34, 0x32, 0x5f, 0xa3, 0x01, 0xee, 0x40, 0x23, 0x39, + 0xd8, 0xfd, 0x9f, 0xb5, 0xdd, 0x59, 0x39, 0xdc, 0x4f, 0x07, 0x80, 0xfc, 0x73, 0x34, 0x40, 0xdf, + 0x48, 0x13, 0xa5, 0x08, 0x22, 0xcd, 0x97, 0x25, 0x01, 0xfe, 0x87, 0xd6, 0x82, 0xd0, 0x83, 0xce, + 0x59, 0xb9, 0x58, 0x36, 0x2c, 0xc5, 0x46, 0x53, 0x52, 0xa7, 0x84, 0x73, 0xa1, 0x51, 0x79, 0x33, + 0x31, 0x6c, 0x38, 0xbf, 0x7f, 0xe9, 0x75, 0x3e, 0x93, 0x9b, 0x06, 0xe8, 0xfb, 0xb0, 0xc8, 0xef, + 0x8d, 0x24, 0x94, 0x27, 0xbd, 0x6e, 0x92, 0x6d, 0xe8, 0xc8, 0x10, 0xdf, 0x5f, 0x33, 0x2a, 0xc1, + 0x7b, 0xd5, 0x02, 0x2d, 0x6e, 0x02, 0x70, 0x0e, 0x4a, 0xfa, 0x53, 0x30, 0xf8, 0xd7, 0x16, 0xb4, + 0x1c, 0x32, 0xf2, 0xaf, 0xc8, 0x6b, 0x99, 0xbf, 0x05, 0x8b, 0x3c, 0x08, 0xa8, 0xa8, 0xbf, 0x13, + 0xf0, 0xb5, 0xe6, 0xdd, 0x6e, 0x6e, 0xde, 0xed, 0xe2, 0x0e, 0x6c, 0x15, 0x48, 0xc3, 0x2f, 0x7e, + 0x3a, 0xee, 0xf5, 0x08, 0xa5, 0x62, 0xa2, 0x9c, 0x80, 0x71, 0x84, 0x9e, 0x77, 0x07, 0x43, 0xe2, + 0x0a, 0x69, 0x04, 0x84, 0xbf, 0xb4, 0xa0, 0xf9, 0xc0, 0x75, 0xdf, 0x86, 0x6a, 0xae, 0xae, 0x9a, + 0x5b, 0xaa, 0xda, 0x63, 0xd8, 0x30, 0x89, 0x32, 0x95, 0x5e, 0x03, 0x68, 0x1c, 0x0e, 0xe8, 0x68, + 0x40, 0xa9, 0xcc, 0x11, 0x36, 0x2c, 0xf9, 0xb9, 0x99, 0xac, 0x1f, 0x4c, 0x5c, 0xbd, 0xb7, 0x60, + 0xb1, 0x9f, 0xad, 0x6e, 0x05, 0x88, 0x8f, 0x60, 0x35, 0xcb, 0x8a, 0x8f, 0x19, 0x7a, 0x93, 0x8c, + 0x19, 0x52, 0x22, 0xfc, 0x17, 0x0b, 0x50, 0x67, 0x1c, 0x91, 0xdc, 0x75, 0xf2, 0x96, 0xa4, 0x8e, + 0x0d, 0x37, 0x56, 0x87, 0x46, 0x02, 0x42, 0x18, 0x56, 0x46, 0xe3, 0x88, 0xb8, 0x67, 0xa4, 0xe7, + 0x7b, 0x2e, 0x65, 0xdd, 0x5f, 0xdd, 0xc9, 0xe0, 0xf0, 0x31, 0xac, 0x6b, 0x92, 0x4e, 0xa7, 0xf4, + 0x2f, 0x2d, 0x68, 0x1d, 0x74, 0xbd, 0x1e, 0x19, 0xbe, 0x7b, 0xd5, 0xf1, 0x09, 0x6c, 0x15, 0xc8, + 0x32, 0x9d, 0x72, 0xe7, 0xb0, 0x22, 0xbf, 0xf4, 0x36, 0x1d, 0x70, 0x1f, 0xea, 0x0a, 0x9f, 0xe9, + 0x64, 0x1d, 0x02, 0xca, 0xe9, 0xfe, 0x36, 0x25, 0x3e, 0x86, 0x75, 0x8d, 0xdb, 0x74, 0x72, 0xff, + 0xd9, 0x82, 0xad, 0xb3, 0xcc, 0x0d, 0x73, 0x32, 0xe8, 0x5d, 0x78, 0xdd, 0x51, 0x52, 0xb1, 0xf4, + 0xb3, 0xad, 0x57, 0x3f, 0x6d, 0xbd, 0x3c, 0x41, 0x98, 0xdc, 0x8e, 0x09, 0x9c, 0xd1, 0xba, 0x52, + 0xae, 0xf5, 0xbc, 0xae, 0x75, 0xea, 0x5d, 0xd5, 0x8c, 0x77, 0x9d, 0x82, 0x5d, 0x24, 0xe8, 0x54, + 0x73, 0xc9, 0xbb, 0xff, 0x5d, 0x03, 0xfe, 0x04, 0x8d, 0xbe, 0x0b, 0xcb, 0xbd, 0xf4, 0x85, 0x13, + 0x35, 0x93, 0x7d, 0x99, 0x67, 0x5e, 0x7b, 0xc3, 0x84, 0xa6, 0x01, 0xba, 0x07, 0xb5, 0x9f, 0x24, + 0xe3, 0x6f, 0xb4, 0x2e, 0x88, 0xd4, 0xc1, 0xbc, 0xfd, 0x9e, 0x8e, 0xe4, 0xfb, 0x2e, 0x93, 0xd9, + 0xaa, 0xdc, 0xa7, 0x4e, 0x75, 0xe5, 0xbe, 0xec, 0x08, 0x76, 0x1f, 0xea, 0x7d, 0xf5, 0x65, 0x12, + 0x6d, 0x26, 0xef, 0xcc, 0xb9, 0x47, 0x52, 0xbb, 0x65, 0x5e, 0xa0, 0x01, 0xba, 0x0f, 0x2b, 0x54, + 0x79, 0xc4, 0x43, 0x89, 0x6e, 0xb9, 0x67, 0x46, 0x7b, 0xd3, 0x88, 0xa7, 0x01, 0xfa, 0x31, 0x6c, + 0xf6, 0xcd, 0x2f, 0x68, 0xe8, 0x56, 0x8e, 0xab, 0xfe, 0x82, 0x65, 0xe3, 0xeb, 0x48, 0x68, 0x80, + 0xce, 0x61, 0xab, 0x5f, 0xf4, 0x1c, 0x85, 0x3e, 0x4a, 0x3f, 0x50, 0xf8, 0x4e, 0x66, 0xdf, 0xbe, + 0x9e, 0x88, 0x06, 0xe8, 0x19, 0xa0, 0x48, 0x7b, 0x93, 0x41, 0xdb, 0x62, 0xaf, 0xf1, 0xbd, 0xc9, + 0xfe, 0xa0, 0x64, 0x95, 0x06, 0xa8, 0x07, 0xad, 0x7e, 0xc1, 0xc0, 0x1f, 0xe1, 0xcc, 0x9f, 0x02, + 0x8c, 0x8f, 0x1d, 0xf6, 0x47, 0xd7, 0xd2, 0x70, 0xb9, 0xfb, 0xda, 0xc4, 0x5a, 0xca, 0x6d, 0x1c, + 0xb8, 0x4b, 0xb9, 0x0b, 0x46, 0xdd, 0xcf, 0x61, 0xbd, 0xaf, 0x8f, 0x70, 0x91, 0x79, 0x97, 0xf4, + 0xb2, 0x9b, 0x65, 0xcb, 0x34, 0x40, 0xc7, 0xd0, 0xb8, 0xc8, 0xce, 0x24, 0x51, 0xf2, 0xcf, 0x08, + 0x7d, 0x34, 0x6b, 0xdb, 0x45, 0x4b, 0x52, 0xe5, 0xdc, 0x90, 0x4f, 0x55, 0x59, 0x9f, 0x3b, 0xaa, + 0x2a, 0x9b, 0xa6, 0x83, 0x27, 0xb0, 0x36, 0xc8, 0xcf, 0xbd, 0xd0, 0xfb, 0xc9, 0xa8, 0xca, 0x30, + 0xc8, 0xb3, 0xb7, 0x8b, 0x17, 0xf9, 0xf7, 0xfa, 0xf9, 0x99, 0x92, 0xfc, 0x9e, 0x69, 0xbc, 0x65, + 0x6f, 0x17, 0x2f, 0xf2, 0x40, 0x55, 0x5b, 0x1f, 0x19, 0xa8, 0xb9, 0xf6, 0xca, 0xde, 0x34, 0xe2, + 0x69, 0x80, 0x3e, 0x81, 0xa5, 0x04, 0x87, 0x50, 0x8e, 0x28, 0xde, 0xb8, 0xae, 0xe1, 0x78, 0x6a, + 0x92, 0x39, 0x03, 0xe5, 0x29, 0xa8, 0x9a, 0x9a, 0xb2, 0x13, 0x86, 0x67, 0xb2, 0xef, 0x55, 0x5a, + 0x62, 0x79, 0x40, 0xc6, 0xd6, 0x5c, 0x1e, 0x90, 0xb9, 0x97, 0x8e, 0xbd, 0x27, 0xd7, 0xc2, 0x4a, + 0xef, 0xd1, 0x5b, 0x6c, 0xe9, 0x3d, 0x86, 0xae, 0x37, 0xce, 0xf2, 0x4a, 0x9f, 0x2a, 0xb3, 0x7c, + 0xb6, 0x13, 0x96, 0x59, 0x3e, 0xd7, 0xd2, 0xc6, 0xaa, 0xe9, 0x9d, 0x58, 0x41, 0xb8, 0x89, 0x16, + 0xa0, 0x20, 0xdc, 0x64, 0x55, 0xfe, 0x02, 0x9a, 0xc6, 0x56, 0x04, 0x7d, 0x28, 0xf6, 0x15, 0xb5, + 0x4d, 0xf6, 0x4e, 0x39, 0x01, 0x17, 0x57, 0xef, 0x05, 0xa4, 0xb8, 0xc6, 0x8e, 0x45, 0x8a, 0x5b, + 0xd0, 0x44, 0xdc, 0x87, 0x15, 0xb5, 0x4e, 0x97, 0xae, 0x98, 0xeb, 0x13, 0xa4, 0x2b, 0x6a, 0x45, + 0xfd, 0x31, 0x34, 0x72, 0x95, 0xa1, 0x3c, 0x4a, 0xbd, 0x7a, 0x95, 0x47, 0x69, 0x2a, 0x26, 0x5f, + 0x40, 0xd3, 0x58, 0x69, 0x4a, 0xcb, 0x15, 0xd5, 0xc4, 0xd2, 0x72, 0xc5, 0x85, 0xea, 0x3d, 0xa8, + 0x49, 0xb4, 0xf4, 0x7d, 0xb5, 0xaa, 0x93, 0xbe, 0x9f, 0x2d, 0xbe, 0x8e, 0xa1, 0x91, 0xfb, 0xa8, + 0xd4, 0x4e, 0xaf, 0x0c, 0xa5, 0x76, 0xa6, 0x32, 0xee, 0x47, 0xb0, 0x61, 0xae, 0x74, 0xd0, 0x4e, + 0xee, 0x3a, 0xd6, 0x2a, 0x36, 0xfb, 0xd6, 0x35, 0x14, 0x34, 0xd8, 0x6f, 0xbc, 0xa8, 0xef, 0xf2, + 0x3f, 0xe2, 0x7d, 0xca, 0x7e, 0x3f, 0x5b, 0x60, 0xff, 0xb2, 0xfb, 0xe4, 0x7f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x14, 0x45, 0xba, 0x3b, 0xa4, 0x27, 0x00, 0x00, } diff --git a/pkg/proto/group/group.proto b/pkg/proto/group/group.proto index 201bf6ef5..f0db47bad 100644 --- a/pkg/proto/group/group.proto +++ b/pkg/proto/group/group.proto @@ -380,6 +380,19 @@ message CancelMuteGroupResp{ +message SetGroupMemberNicknameReq{ + string groupID = 1; + string nickname = 2; + string opUserID = 3; + string operationID = 4; + string userID = 5; +} +message SetGroupMemberNicknameResp{ + CommonResp CommonResp = 1; +} + + + service group{ rpc createGroup(CreateGroupReq) returns(CreateGroupResp); @@ -413,6 +426,9 @@ service group{ rpc CancelMuteGroupMember(CancelMuteGroupMemberReq) returns(CancelMuteGroupMemberResp); rpc MuteGroup(MuteGroupReq) returns(MuteGroupResp); rpc CancelMuteGroup(CancelMuteGroupReq) returns(CancelMuteGroupResp); + + rpc SetGroupMemberNickname(SetGroupMemberNicknameReq) returns (SetGroupMemberNicknameResp); + } diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index 27901e90f..b587caa32 100644 --- a/pkg/proto/sdk_ws/ws.pb.go +++ b/pkg/proto/sdk_ws/ws.pb.go @@ -40,7 +40,7 @@ func (m *GroupInfo) Reset() { *m = GroupInfo{} } func (m *GroupInfo) String() string { return proto.CompactTextString(m) } func (*GroupInfo) ProtoMessage() {} func (*GroupInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{0} + return fileDescriptor_ws_4f11937c2cee8c46, []int{0} } func (m *GroupInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfo.Unmarshal(m, b) @@ -165,7 +165,7 @@ func (m *GroupMemberFullInfo) Reset() { *m = GroupMemberFullInfo{} } func (m *GroupMemberFullInfo) String() string { return proto.CompactTextString(m) } func (*GroupMemberFullInfo) ProtoMessage() {} func (*GroupMemberFullInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{1} + return fileDescriptor_ws_4f11937c2cee8c46, []int{1} } func (m *GroupMemberFullInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberFullInfo.Unmarshal(m, b) @@ -277,7 +277,7 @@ func (m *PublicUserInfo) Reset() { *m = PublicUserInfo{} } func (m *PublicUserInfo) String() string { return proto.CompactTextString(m) } func (*PublicUserInfo) ProtoMessage() {} func (*PublicUserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{2} + return fileDescriptor_ws_4f11937c2cee8c46, []int{2} } func (m *PublicUserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PublicUserInfo.Unmarshal(m, b) @@ -352,7 +352,7 @@ func (m *UserInfo) Reset() { *m = UserInfo{} } func (m *UserInfo) String() string { return proto.CompactTextString(m) } func (*UserInfo) ProtoMessage() {} func (*UserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{3} + return fileDescriptor_ws_4f11937c2cee8c46, []int{3} } func (m *UserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfo.Unmarshal(m, b) @@ -459,7 +459,7 @@ func (m *FriendInfo) Reset() { *m = FriendInfo{} } func (m *FriendInfo) String() string { return proto.CompactTextString(m) } func (*FriendInfo) ProtoMessage() {} func (*FriendInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{4} + return fileDescriptor_ws_4f11937c2cee8c46, []int{4} } func (m *FriendInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfo.Unmarshal(m, b) @@ -544,7 +544,7 @@ func (m *BlackInfo) Reset() { *m = BlackInfo{} } func (m *BlackInfo) String() string { return proto.CompactTextString(m) } func (*BlackInfo) ProtoMessage() {} func (*BlackInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{5} + return fileDescriptor_ws_4f11937c2cee8c46, []int{5} } func (m *BlackInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackInfo.Unmarshal(m, b) @@ -625,7 +625,7 @@ func (m *GroupRequest) Reset() { *m = GroupRequest{} } func (m *GroupRequest) String() string { return proto.CompactTextString(m) } func (*GroupRequest) ProtoMessage() {} func (*GroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{6} + return fileDescriptor_ws_4f11937c2cee8c46, []int{6} } func (m *GroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupRequest.Unmarshal(m, b) @@ -733,7 +733,7 @@ func (m *FriendRequest) Reset() { *m = FriendRequest{} } func (m *FriendRequest) String() string { return proto.CompactTextString(m) } func (*FriendRequest) ProtoMessage() {} func (*FriendRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{7} + return fileDescriptor_ws_4f11937c2cee8c46, []int{7} } func (m *FriendRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendRequest.Unmarshal(m, b) @@ -878,7 +878,7 @@ func (m *Department) Reset() { *m = Department{} } func (m *Department) String() string { return proto.CompactTextString(m) } func (*Department) ProtoMessage() {} func (*Department) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{8} + return fileDescriptor_ws_4f11937c2cee8c46, []int{8} } func (m *Department) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Department.Unmarshal(m, b) @@ -989,7 +989,7 @@ func (m *OrganizationUser) Reset() { *m = OrganizationUser{} } func (m *OrganizationUser) String() string { return proto.CompactTextString(m) } func (*OrganizationUser) ProtoMessage() {} func (*OrganizationUser) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{9} + return fileDescriptor_ws_4f11937c2cee8c46, []int{9} } func (m *OrganizationUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OrganizationUser.Unmarshal(m, b) @@ -1103,7 +1103,7 @@ func (m *DepartmentMember) Reset() { *m = DepartmentMember{} } func (m *DepartmentMember) String() string { return proto.CompactTextString(m) } func (*DepartmentMember) ProtoMessage() {} func (*DepartmentMember) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{10} + return fileDescriptor_ws_4f11937c2cee8c46, []int{10} } func (m *DepartmentMember) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DepartmentMember.Unmarshal(m, b) @@ -1184,7 +1184,7 @@ func (m *UserInDepartment) Reset() { *m = UserInDepartment{} } func (m *UserInDepartment) String() string { return proto.CompactTextString(m) } func (*UserInDepartment) ProtoMessage() {} func (*UserInDepartment) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{11} + return fileDescriptor_ws_4f11937c2cee8c46, []int{11} } func (m *UserInDepartment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInDepartment.Unmarshal(m, b) @@ -1231,7 +1231,7 @@ func (m *PullMessageBySeqListResp) Reset() { *m = PullMessageBySeqListRe func (m *PullMessageBySeqListResp) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListResp) ProtoMessage() {} func (*PullMessageBySeqListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{12} + return fileDescriptor_ws_4f11937c2cee8c46, []int{12} } func (m *PullMessageBySeqListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListResp.Unmarshal(m, b) @@ -1285,7 +1285,7 @@ func (m *PullMessageBySeqListReq) Reset() { *m = PullMessageBySeqListReq func (m *PullMessageBySeqListReq) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListReq) ProtoMessage() {} func (*PullMessageBySeqListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{13} + return fileDescriptor_ws_4f11937c2cee8c46, []int{13} } func (m *PullMessageBySeqListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListReq.Unmarshal(m, b) @@ -1336,7 +1336,7 @@ func (m *GetMaxAndMinSeqReq) Reset() { *m = GetMaxAndMinSeqReq{} } func (m *GetMaxAndMinSeqReq) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqReq) ProtoMessage() {} func (*GetMaxAndMinSeqReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{14} + return fileDescriptor_ws_4f11937c2cee8c46, []int{14} } func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b) @@ -1368,7 +1368,7 @@ func (m *GetMaxAndMinSeqResp) Reset() { *m = GetMaxAndMinSeqResp{} } func (m *GetMaxAndMinSeqResp) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqResp) ProtoMessage() {} func (*GetMaxAndMinSeqResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{15} + return fileDescriptor_ws_4f11937c2cee8c46, []int{15} } func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b) @@ -1415,7 +1415,7 @@ func (m *UserSendMsgResp) Reset() { *m = UserSendMsgResp{} } func (m *UserSendMsgResp) String() string { return proto.CompactTextString(m) } func (*UserSendMsgResp) ProtoMessage() {} func (*UserSendMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{16} + return fileDescriptor_ws_4f11937c2cee8c46, []int{16} } func (m *UserSendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserSendMsgResp.Unmarshal(m, b) @@ -1484,7 +1484,7 @@ func (m *MsgData) Reset() { *m = MsgData{} } func (m *MsgData) String() string { return proto.CompactTextString(m) } func (*MsgData) ProtoMessage() {} func (*MsgData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{17} + return fileDescriptor_ws_4f11937c2cee8c46, []int{17} } func (m *MsgData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgData.Unmarshal(m, b) @@ -1645,7 +1645,7 @@ func (m *OfflinePushInfo) Reset() { *m = OfflinePushInfo{} } func (m *OfflinePushInfo) String() string { return proto.CompactTextString(m) } func (*OfflinePushInfo) ProtoMessage() {} func (*OfflinePushInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{18} + return fileDescriptor_ws_4f11937c2cee8c46, []int{18} } func (m *OfflinePushInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OfflinePushInfo.Unmarshal(m, b) @@ -1713,7 +1713,7 @@ func (m *TipsComm) Reset() { *m = TipsComm{} } func (m *TipsComm) String() string { return proto.CompactTextString(m) } func (*TipsComm) ProtoMessage() {} func (*TipsComm) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{19} + return fileDescriptor_ws_4f11937c2cee8c46, []int{19} } func (m *TipsComm) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TipsComm.Unmarshal(m, b) @@ -1770,7 +1770,7 @@ func (m *GroupCreatedTips) Reset() { *m = GroupCreatedTips{} } func (m *GroupCreatedTips) String() string { return proto.CompactTextString(m) } func (*GroupCreatedTips) ProtoMessage() {} func (*GroupCreatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{20} + return fileDescriptor_ws_4f11937c2cee8c46, []int{20} } func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b) @@ -1839,7 +1839,7 @@ func (m *GroupInfoSetTips) Reset() { *m = GroupInfoSetTips{} } func (m *GroupInfoSetTips) String() string { return proto.CompactTextString(m) } func (*GroupInfoSetTips) ProtoMessage() {} func (*GroupInfoSetTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{21} + return fileDescriptor_ws_4f11937c2cee8c46, []int{21} } func (m *GroupInfoSetTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfoSetTips.Unmarshal(m, b) @@ -1894,7 +1894,7 @@ func (m *JoinGroupApplicationTips) Reset() { *m = JoinGroupApplicationTi func (m *JoinGroupApplicationTips) String() string { return proto.CompactTextString(m) } func (*JoinGroupApplicationTips) ProtoMessage() {} func (*JoinGroupApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{22} + return fileDescriptor_ws_4f11937c2cee8c46, []int{22} } func (m *JoinGroupApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupApplicationTips.Unmarshal(m, b) @@ -1950,7 +1950,7 @@ func (m *MemberQuitTips) Reset() { *m = MemberQuitTips{} } func (m *MemberQuitTips) String() string { return proto.CompactTextString(m) } func (*MemberQuitTips) ProtoMessage() {} func (*MemberQuitTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{23} + return fileDescriptor_ws_4f11937c2cee8c46, []int{23} } func (m *MemberQuitTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberQuitTips.Unmarshal(m, b) @@ -2005,7 +2005,7 @@ func (m *GroupApplicationAcceptedTips) Reset() { *m = GroupApplicationAc func (m *GroupApplicationAcceptedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationAcceptedTips) ProtoMessage() {} func (*GroupApplicationAcceptedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{24} + return fileDescriptor_ws_4f11937c2cee8c46, []int{24} } func (m *GroupApplicationAcceptedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationAcceptedTips.Unmarshal(m, b) @@ -2060,7 +2060,7 @@ func (m *GroupApplicationRejectedTips) Reset() { *m = GroupApplicationRe func (m *GroupApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationRejectedTips) ProtoMessage() {} func (*GroupApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{25} + return fileDescriptor_ws_4f11937c2cee8c46, []int{25} } func (m *GroupApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationRejectedTips.Unmarshal(m, b) @@ -2116,7 +2116,7 @@ func (m *GroupOwnerTransferredTips) Reset() { *m = GroupOwnerTransferred func (m *GroupOwnerTransferredTips) String() string { return proto.CompactTextString(m) } func (*GroupOwnerTransferredTips) ProtoMessage() {} func (*GroupOwnerTransferredTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{26} + return fileDescriptor_ws_4f11937c2cee8c46, []int{26} } func (m *GroupOwnerTransferredTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupOwnerTransferredTips.Unmarshal(m, b) @@ -2179,7 +2179,7 @@ func (m *MemberKickedTips) Reset() { *m = MemberKickedTips{} } func (m *MemberKickedTips) String() string { return proto.CompactTextString(m) } func (*MemberKickedTips) ProtoMessage() {} func (*MemberKickedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{27} + return fileDescriptor_ws_4f11937c2cee8c46, []int{27} } func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b) @@ -2242,7 +2242,7 @@ func (m *MemberInvitedTips) Reset() { *m = MemberInvitedTips{} } func (m *MemberInvitedTips) String() string { return proto.CompactTextString(m) } func (*MemberInvitedTips) ProtoMessage() {} func (*MemberInvitedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{28} + return fileDescriptor_ws_4f11937c2cee8c46, []int{28} } func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b) @@ -2304,7 +2304,7 @@ func (m *MemberEnterTips) Reset() { *m = MemberEnterTips{} } func (m *MemberEnterTips) String() string { return proto.CompactTextString(m) } func (*MemberEnterTips) ProtoMessage() {} func (*MemberEnterTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{29} + return fileDescriptor_ws_4f11937c2cee8c46, []int{29} } func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b) @@ -2358,7 +2358,7 @@ func (m *GroupDismissedTips) Reset() { *m = GroupDismissedTips{} } func (m *GroupDismissedTips) String() string { return proto.CompactTextString(m) } func (*GroupDismissedTips) ProtoMessage() {} func (*GroupDismissedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{30} + return fileDescriptor_ws_4f11937c2cee8c46, []int{30} } func (m *GroupDismissedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupDismissedTips.Unmarshal(m, b) @@ -2414,7 +2414,7 @@ func (m *GroupMemberMutedTips) Reset() { *m = GroupMemberMutedTips{} } func (m *GroupMemberMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberMutedTips) ProtoMessage() {} func (*GroupMemberMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{31} + return fileDescriptor_ws_4f11937c2cee8c46, []int{31} } func (m *GroupMemberMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberMutedTips.Unmarshal(m, b) @@ -2483,7 +2483,7 @@ func (m *GroupMemberCancelMutedTips) Reset() { *m = GroupMemberCancelMut func (m *GroupMemberCancelMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberCancelMutedTips) ProtoMessage() {} func (*GroupMemberCancelMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{32} + return fileDescriptor_ws_4f11937c2cee8c46, []int{32} } func (m *GroupMemberCancelMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberCancelMutedTips.Unmarshal(m, b) @@ -2544,7 +2544,7 @@ func (m *GroupMutedTips) Reset() { *m = GroupMutedTips{} } func (m *GroupMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMutedTips) ProtoMessage() {} func (*GroupMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{33} + return fileDescriptor_ws_4f11937c2cee8c46, []int{33} } func (m *GroupMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMutedTips.Unmarshal(m, b) @@ -2598,7 +2598,7 @@ func (m *GroupCancelMutedTips) Reset() { *m = GroupCancelMutedTips{} } func (m *GroupCancelMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupCancelMutedTips) ProtoMessage() {} func (*GroupCancelMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{34} + return fileDescriptor_ws_4f11937c2cee8c46, []int{34} } func (m *GroupCancelMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCancelMutedTips.Unmarshal(m, b) @@ -2639,6 +2639,68 @@ func (m *GroupCancelMutedTips) GetOperationTime() int64 { return 0 } +type GroupMemberInfoSetTips struct { + Group *GroupInfo `protobuf:"bytes,1,opt,name=group" json:"group,omitempty"` + OpUser *GroupMemberFullInfo `protobuf:"bytes,2,opt,name=opUser" json:"opUser,omitempty"` + OperationTime int64 `protobuf:"varint,3,opt,name=operationTime" json:"operationTime,omitempty"` + ChangedUser *GroupMemberFullInfo `protobuf:"bytes,4,opt,name=changedUser" json:"changedUser,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *GroupMemberInfoSetTips) Reset() { *m = GroupMemberInfoSetTips{} } +func (m *GroupMemberInfoSetTips) String() string { return proto.CompactTextString(m) } +func (*GroupMemberInfoSetTips) ProtoMessage() {} +func (*GroupMemberInfoSetTips) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_4f11937c2cee8c46, []int{35} +} +func (m *GroupMemberInfoSetTips) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_GroupMemberInfoSetTips.Unmarshal(m, b) +} +func (m *GroupMemberInfoSetTips) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_GroupMemberInfoSetTips.Marshal(b, m, deterministic) +} +func (dst *GroupMemberInfoSetTips) XXX_Merge(src proto.Message) { + xxx_messageInfo_GroupMemberInfoSetTips.Merge(dst, src) +} +func (m *GroupMemberInfoSetTips) XXX_Size() int { + return xxx_messageInfo_GroupMemberInfoSetTips.Size(m) +} +func (m *GroupMemberInfoSetTips) XXX_DiscardUnknown() { + xxx_messageInfo_GroupMemberInfoSetTips.DiscardUnknown(m) +} + +var xxx_messageInfo_GroupMemberInfoSetTips proto.InternalMessageInfo + +func (m *GroupMemberInfoSetTips) GetGroup() *GroupInfo { + if m != nil { + return m.Group + } + return nil +} + +func (m *GroupMemberInfoSetTips) GetOpUser() *GroupMemberFullInfo { + if m != nil { + return m.OpUser + } + return nil +} + +func (m *GroupMemberInfoSetTips) GetOperationTime() int64 { + if m != nil { + return m.OperationTime + } + return 0 +} + +func (m *GroupMemberInfoSetTips) GetChangedUser() *GroupMemberFullInfo { + if m != nil { + return m.ChangedUser + } + return nil +} + type FriendApplication struct { AddTime int64 `protobuf:"varint,1,opt,name=addTime" json:"addTime,omitempty"` AddSource string `protobuf:"bytes,2,opt,name=addSource" json:"addSource,omitempty"` @@ -2652,7 +2714,7 @@ func (m *FriendApplication) Reset() { *m = FriendApplication{} } func (m *FriendApplication) String() string { return proto.CompactTextString(m) } func (*FriendApplication) ProtoMessage() {} func (*FriendApplication) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{35} + return fileDescriptor_ws_4f11937c2cee8c46, []int{36} } func (m *FriendApplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplication.Unmarshal(m, b) @@ -2705,7 +2767,7 @@ func (m *FromToUserID) Reset() { *m = FromToUserID{} } func (m *FromToUserID) String() string { return proto.CompactTextString(m) } func (*FromToUserID) ProtoMessage() {} func (*FromToUserID) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{36} + return fileDescriptor_ws_4f11937c2cee8c46, []int{37} } func (m *FromToUserID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FromToUserID.Unmarshal(m, b) @@ -2751,7 +2813,7 @@ func (m *FriendApplicationTips) Reset() { *m = FriendApplicationTips{} } func (m *FriendApplicationTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationTips) ProtoMessage() {} func (*FriendApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{37} + return fileDescriptor_ws_4f11937c2cee8c46, []int{38} } func (m *FriendApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationTips.Unmarshal(m, b) @@ -2791,7 +2853,7 @@ func (m *FriendApplicationApprovedTips) Reset() { *m = FriendApplication func (m *FriendApplicationApprovedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationApprovedTips) ProtoMessage() {} func (*FriendApplicationApprovedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{38} + return fileDescriptor_ws_4f11937c2cee8c46, []int{39} } func (m *FriendApplicationApprovedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationApprovedTips.Unmarshal(m, b) @@ -2838,7 +2900,7 @@ func (m *FriendApplicationRejectedTips) Reset() { *m = FriendApplication func (m *FriendApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationRejectedTips) ProtoMessage() {} func (*FriendApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{39} + return fileDescriptor_ws_4f11937c2cee8c46, []int{40} } func (m *FriendApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationRejectedTips.Unmarshal(m, b) @@ -2886,7 +2948,7 @@ func (m *FriendAddedTips) Reset() { *m = FriendAddedTips{} } func (m *FriendAddedTips) String() string { return proto.CompactTextString(m) } func (*FriendAddedTips) ProtoMessage() {} func (*FriendAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{40} + return fileDescriptor_ws_4f11937c2cee8c46, []int{41} } func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b) @@ -2939,7 +3001,7 @@ func (m *FriendDeletedTips) Reset() { *m = FriendDeletedTips{} } func (m *FriendDeletedTips) String() string { return proto.CompactTextString(m) } func (*FriendDeletedTips) ProtoMessage() {} func (*FriendDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{41} + return fileDescriptor_ws_4f11937c2cee8c46, []int{42} } func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b) @@ -2977,7 +3039,7 @@ func (m *BlackAddedTips) Reset() { *m = BlackAddedTips{} } func (m *BlackAddedTips) String() string { return proto.CompactTextString(m) } func (*BlackAddedTips) ProtoMessage() {} func (*BlackAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{42} + return fileDescriptor_ws_4f11937c2cee8c46, []int{43} } func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b) @@ -3015,7 +3077,7 @@ func (m *BlackDeletedTips) Reset() { *m = BlackDeletedTips{} } func (m *BlackDeletedTips) String() string { return proto.CompactTextString(m) } func (*BlackDeletedTips) ProtoMessage() {} func (*BlackDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{43} + return fileDescriptor_ws_4f11937c2cee8c46, []int{44} } func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b) @@ -3053,7 +3115,7 @@ func (m *FriendInfoChangedTips) Reset() { *m = FriendInfoChangedTips{} } func (m *FriendInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*FriendInfoChangedTips) ProtoMessage() {} func (*FriendInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{44} + return fileDescriptor_ws_4f11937c2cee8c46, []int{45} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -3092,7 +3154,7 @@ func (m *UserInfoUpdatedTips) Reset() { *m = UserInfoUpdatedTips{} } func (m *UserInfoUpdatedTips) String() string { return proto.CompactTextString(m) } func (*UserInfoUpdatedTips) ProtoMessage() {} func (*UserInfoUpdatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{45} + return fileDescriptor_ws_4f11937c2cee8c46, []int{46} } func (m *UserInfoUpdatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfoUpdatedTips.Unmarshal(m, b) @@ -3131,7 +3193,7 @@ func (m *ConversationUpdateTips) Reset() { *m = ConversationUpdateTips{} func (m *ConversationUpdateTips) String() string { return proto.CompactTextString(m) } func (*ConversationUpdateTips) ProtoMessage() {} func (*ConversationUpdateTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{46} + return fileDescriptor_ws_4f11937c2cee8c46, []int{47} } func (m *ConversationUpdateTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConversationUpdateTips.Unmarshal(m, b) @@ -3171,7 +3233,7 @@ func (m *ConversationSetPrivateTips) Reset() { *m = ConversationSetPriva func (m *ConversationSetPrivateTips) String() string { return proto.CompactTextString(m) } func (*ConversationSetPrivateTips) ProtoMessage() {} func (*ConversationSetPrivateTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{47} + return fileDescriptor_ws_4f11937c2cee8c46, []int{48} } func (m *ConversationSetPrivateTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConversationSetPrivateTips.Unmarshal(m, b) @@ -3225,7 +3287,7 @@ func (m *RequestPagination) Reset() { *m = RequestPagination{} } func (m *RequestPagination) String() string { return proto.CompactTextString(m) } func (*RequestPagination) ProtoMessage() {} func (*RequestPagination) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{48} + return fileDescriptor_ws_4f11937c2cee8c46, []int{49} } func (m *RequestPagination) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RequestPagination.Unmarshal(m, b) @@ -3271,7 +3333,7 @@ func (m *ResponsePagination) Reset() { *m = ResponsePagination{} } func (m *ResponsePagination) String() string { return proto.CompactTextString(m) } func (*ResponsePagination) ProtoMessage() {} func (*ResponsePagination) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{49} + return fileDescriptor_ws_4f11937c2cee8c46, []int{50} } func (m *ResponsePagination) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResponsePagination.Unmarshal(m, b) @@ -3324,7 +3386,7 @@ func (m *SignalReq) Reset() { *m = SignalReq{} } func (m *SignalReq) String() string { return proto.CompactTextString(m) } func (*SignalReq) ProtoMessage() {} func (*SignalReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{50} + return fileDescriptor_ws_4f11937c2cee8c46, []int{51} } func (m *SignalReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalReq.Unmarshal(m, b) @@ -3591,7 +3653,7 @@ func (m *SignalResp) Reset() { *m = SignalResp{} } func (m *SignalResp) String() string { return proto.CompactTextString(m) } func (*SignalResp) ProtoMessage() {} func (*SignalResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{51} + return fileDescriptor_ws_4f11937c2cee8c46, []int{52} } func (m *SignalResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalResp.Unmarshal(m, b) @@ -3859,7 +3921,7 @@ func (m *InvitationInfo) Reset() { *m = InvitationInfo{} } func (m *InvitationInfo) String() string { return proto.CompactTextString(m) } func (*InvitationInfo) ProtoMessage() {} func (*InvitationInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{52} + return fileDescriptor_ws_4f11937c2cee8c46, []int{53} } func (m *InvitationInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InvitationInfo.Unmarshal(m, b) @@ -3955,7 +4017,7 @@ func (m *ParticipantMetaData) Reset() { *m = ParticipantMetaData{} } func (m *ParticipantMetaData) String() string { return proto.CompactTextString(m) } func (*ParticipantMetaData) ProtoMessage() {} func (*ParticipantMetaData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{53} + return fileDescriptor_ws_4f11937c2cee8c46, []int{54} } func (m *ParticipantMetaData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ParticipantMetaData.Unmarshal(m, b) @@ -4010,7 +4072,7 @@ func (m *SignalInviteReq) Reset() { *m = SignalInviteReq{} } func (m *SignalInviteReq) String() string { return proto.CompactTextString(m) } func (*SignalInviteReq) ProtoMessage() {} func (*SignalInviteReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{54} + return fileDescriptor_ws_4f11937c2cee8c46, []int{55} } func (m *SignalInviteReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteReq.Unmarshal(m, b) @@ -4071,7 +4133,7 @@ func (m *SignalInviteReply) Reset() { *m = SignalInviteReply{} } func (m *SignalInviteReply) String() string { return proto.CompactTextString(m) } func (*SignalInviteReply) ProtoMessage() {} func (*SignalInviteReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{55} + return fileDescriptor_ws_4f11937c2cee8c46, []int{56} } func (m *SignalInviteReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteReply.Unmarshal(m, b) @@ -4126,7 +4188,7 @@ func (m *SignalInviteInGroupReq) Reset() { *m = SignalInviteInGroupReq{} func (m *SignalInviteInGroupReq) String() string { return proto.CompactTextString(m) } func (*SignalInviteInGroupReq) ProtoMessage() {} func (*SignalInviteInGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{56} + return fileDescriptor_ws_4f11937c2cee8c46, []int{57} } func (m *SignalInviteInGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteInGroupReq.Unmarshal(m, b) @@ -4187,7 +4249,7 @@ func (m *SignalInviteInGroupReply) Reset() { *m = SignalInviteInGroupRep func (m *SignalInviteInGroupReply) String() string { return proto.CompactTextString(m) } func (*SignalInviteInGroupReply) ProtoMessage() {} func (*SignalInviteInGroupReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{57} + return fileDescriptor_ws_4f11937c2cee8c46, []int{58} } func (m *SignalInviteInGroupReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteInGroupReply.Unmarshal(m, b) @@ -4242,7 +4304,7 @@ func (m *SignalCancelReq) Reset() { *m = SignalCancelReq{} } func (m *SignalCancelReq) String() string { return proto.CompactTextString(m) } func (*SignalCancelReq) ProtoMessage() {} func (*SignalCancelReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{58} + return fileDescriptor_ws_4f11937c2cee8c46, []int{59} } func (m *SignalCancelReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalCancelReq.Unmarshal(m, b) @@ -4300,7 +4362,7 @@ func (m *SignalCancelReply) Reset() { *m = SignalCancelReply{} } func (m *SignalCancelReply) String() string { return proto.CompactTextString(m) } func (*SignalCancelReply) ProtoMessage() {} func (*SignalCancelReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{59} + return fileDescriptor_ws_4f11937c2cee8c46, []int{60} } func (m *SignalCancelReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalCancelReply.Unmarshal(m, b) @@ -4335,7 +4397,7 @@ func (m *SignalAcceptReq) Reset() { *m = SignalAcceptReq{} } func (m *SignalAcceptReq) String() string { return proto.CompactTextString(m) } func (*SignalAcceptReq) ProtoMessage() {} func (*SignalAcceptReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{60} + return fileDescriptor_ws_4f11937c2cee8c46, []int{61} } func (m *SignalAcceptReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalAcceptReq.Unmarshal(m, b) @@ -4403,7 +4465,7 @@ func (m *SignalAcceptReply) Reset() { *m = SignalAcceptReply{} } func (m *SignalAcceptReply) String() string { return proto.CompactTextString(m) } func (*SignalAcceptReply) ProtoMessage() {} func (*SignalAcceptReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{61} + return fileDescriptor_ws_4f11937c2cee8c46, []int{62} } func (m *SignalAcceptReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalAcceptReply.Unmarshal(m, b) @@ -4457,7 +4519,7 @@ func (m *SignalHungUpReq) Reset() { *m = SignalHungUpReq{} } func (m *SignalHungUpReq) String() string { return proto.CompactTextString(m) } func (*SignalHungUpReq) ProtoMessage() {} func (*SignalHungUpReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{62} + return fileDescriptor_ws_4f11937c2cee8c46, []int{63} } func (m *SignalHungUpReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalHungUpReq.Unmarshal(m, b) @@ -4508,7 +4570,7 @@ func (m *SignalHungUpReply) Reset() { *m = SignalHungUpReply{} } func (m *SignalHungUpReply) String() string { return proto.CompactTextString(m) } func (*SignalHungUpReply) ProtoMessage() {} func (*SignalHungUpReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{63} + return fileDescriptor_ws_4f11937c2cee8c46, []int{64} } func (m *SignalHungUpReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalHungUpReply.Unmarshal(m, b) @@ -4543,7 +4605,7 @@ func (m *SignalRejectReq) Reset() { *m = SignalRejectReq{} } func (m *SignalRejectReq) String() string { return proto.CompactTextString(m) } func (*SignalRejectReq) ProtoMessage() {} func (*SignalRejectReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{64} + return fileDescriptor_ws_4f11937c2cee8c46, []int{65} } func (m *SignalRejectReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalRejectReq.Unmarshal(m, b) @@ -4608,7 +4670,7 @@ func (m *SignalRejectReply) Reset() { *m = SignalRejectReply{} } func (m *SignalRejectReply) String() string { return proto.CompactTextString(m) } func (*SignalRejectReply) ProtoMessage() {} func (*SignalRejectReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{65} + return fileDescriptor_ws_4f11937c2cee8c46, []int{66} } func (m *SignalRejectReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalRejectReply.Unmarshal(m, b) @@ -4642,7 +4704,7 @@ func (m *DelMsgListReq) Reset() { *m = DelMsgListReq{} } func (m *DelMsgListReq) String() string { return proto.CompactTextString(m) } func (*DelMsgListReq) ProtoMessage() {} func (*DelMsgListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{66} + return fileDescriptor_ws_4f11937c2cee8c46, []int{67} } func (m *DelMsgListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelMsgListReq.Unmarshal(m, b) @@ -4702,7 +4764,7 @@ func (m *DelMsgListResp) Reset() { *m = DelMsgListResp{} } func (m *DelMsgListResp) String() string { return proto.CompactTextString(m) } func (*DelMsgListResp) ProtoMessage() {} func (*DelMsgListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_822d08ca95807876, []int{67} + return fileDescriptor_ws_4f11937c2cee8c46, []int{68} } func (m *DelMsgListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelMsgListResp.Unmarshal(m, b) @@ -4773,6 +4835,7 @@ func init() { proto.RegisterType((*GroupMemberCancelMutedTips)(nil), "server_api_params.GroupMemberCancelMutedTips") proto.RegisterType((*GroupMutedTips)(nil), "server_api_params.GroupMutedTips") proto.RegisterType((*GroupCancelMutedTips)(nil), "server_api_params.GroupCancelMutedTips") + proto.RegisterType((*GroupMemberInfoSetTips)(nil), "server_api_params.GroupMemberInfoSetTips") proto.RegisterType((*FriendApplication)(nil), "server_api_params.FriendApplication") proto.RegisterType((*FromToUserID)(nil), "server_api_params.FromToUserID") proto.RegisterType((*FriendApplicationTips)(nil), "server_api_params.FriendApplicationTips") @@ -4808,195 +4871,196 @@ func init() { proto.RegisterType((*DelMsgListResp)(nil), "server_api_params.DelMsgListResp") } -func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_822d08ca95807876) } +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_4f11937c2cee8c46) } -var fileDescriptor_ws_822d08ca95807876 = []byte{ - // 2985 bytes of a gzipped FileDescriptorProto +var fileDescriptor_ws_4f11937c2cee8c46 = []byte{ + // 3005 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcd, 0x6f, 0x24, 0x47, 0x15, 0xa7, 0x7b, 0x3c, 0x63, 0xcf, 0x1b, 0x8f, 0x3f, 0x7a, 0x17, 0x33, 0x98, 0xcd, 0x62, 0x1a, - 0x2b, 0x84, 0x00, 0x1b, 0x14, 0x84, 0x04, 0x09, 0x2c, 0xf2, 0xd7, 0x7e, 0x04, 0x8f, 0xed, 0xf4, - 0xec, 0x12, 0x04, 0x48, 0x51, 0x7b, 0xba, 0x3c, 0xee, 0xb8, 0xa7, 0xab, 0xa7, 0x3f, 0xbc, 0x6b, - 0x84, 0x84, 0x04, 0x12, 0xe2, 0xc6, 0x09, 0x0e, 0x5c, 0x90, 0xb8, 0x20, 0x50, 0x14, 0x45, 0x08, - 0x6e, 0x11, 0xe2, 0xc0, 0x3f, 0xc0, 0x11, 0x71, 0xe3, 0xcc, 0x95, 0x03, 0x12, 0x12, 0xa8, 0xea, - 0x55, 0x57, 0x57, 0x75, 0xcf, 0xd8, 0x13, 0xcb, 0xca, 0x6e, 0xb4, 0xdc, 0xfc, 0xde, 0xd4, 0x7b, - 0xf5, 0xea, 0xf7, 0x5e, 0xbd, 0xf7, 0xaa, 0xaa, 0x0d, 0x8b, 0x89, 0x77, 0xf2, 0xe6, 0xa3, 0xe4, - 0xa5, 0x47, 0xc9, 0xad, 0x28, 0xa6, 0x29, 0xb5, 0x96, 0x13, 0x12, 0x9f, 0x92, 0xf8, 0x4d, 0x37, - 0xf2, 0xdf, 0x8c, 0xdc, 0xd8, 0x1d, 0x26, 0xf6, 0xbf, 0x4c, 0x68, 0xde, 0x8d, 0x69, 0x16, 0xdd, - 0x0f, 0x8f, 0xa8, 0xd5, 0x81, 0xd9, 0x01, 0x27, 0xb6, 0x3b, 0xc6, 0x9a, 0xf1, 0x42, 0xd3, 0xc9, - 0x49, 0xeb, 0x06, 0x34, 0xf9, 0x9f, 0x7b, 0xee, 0x90, 0x74, 0x4c, 0xfe, 0x5b, 0xc1, 0xb0, 0x6c, - 0x98, 0x0f, 0x69, 0xea, 0x1f, 0xf9, 0x7d, 0x37, 0xf5, 0x69, 0xd8, 0xa9, 0xf1, 0x01, 0x1a, 0x8f, - 0x8d, 0xf1, 0xc3, 0x34, 0xa6, 0x5e, 0xd6, 0xe7, 0x63, 0x66, 0x70, 0x8c, 0xca, 0x63, 0xf3, 0x1f, - 0xb9, 0x7d, 0xf2, 0xd0, 0xd9, 0xed, 0xd4, 0x71, 0x7e, 0x41, 0x5a, 0x6b, 0xd0, 0xa2, 0x8f, 0x42, - 0x12, 0x3f, 0x4c, 0x48, 0x7c, 0x7f, 0xbb, 0xd3, 0xe0, 0xbf, 0xaa, 0x2c, 0xeb, 0x26, 0x40, 0x3f, - 0x26, 0x6e, 0x4a, 0x1e, 0xf8, 0x43, 0xd2, 0x99, 0x5d, 0x33, 0x5e, 0x68, 0x3b, 0x0a, 0x87, 0x69, - 0x18, 0x92, 0xe1, 0x21, 0x89, 0xb7, 0x68, 0x16, 0xa6, 0x9d, 0x39, 0x3e, 0x40, 0x65, 0x59, 0x0b, - 0x60, 0x92, 0xc7, 0x9d, 0x26, 0x57, 0x6d, 0x92, 0xc7, 0xd6, 0x0a, 0x34, 0x92, 0xd4, 0x4d, 0xb3, - 0xa4, 0x03, 0x6b, 0xc6, 0x0b, 0x75, 0x47, 0x50, 0xd6, 0x3a, 0xb4, 0xb9, 0x5e, 0x9a, 0x5b, 0xd3, - 0xe2, 0x22, 0x3a, 0x53, 0x22, 0xf6, 0xe0, 0x2c, 0x22, 0x9d, 0x79, 0xae, 0xa0, 0x60, 0xd8, 0x7f, - 0x33, 0xe1, 0x1a, 0xc7, 0xbd, 0xcb, 0x0d, 0xb8, 0x93, 0x05, 0xc1, 0x05, 0x1e, 0x58, 0x81, 0x46, - 0x86, 0xd3, 0x21, 0xfc, 0x82, 0x62, 0xf3, 0xc4, 0x34, 0x20, 0xbb, 0xe4, 0x94, 0x04, 0x1c, 0xf8, - 0xba, 0x53, 0x30, 0xac, 0x55, 0x98, 0x7b, 0x8b, 0xfa, 0x21, 0xc7, 0x64, 0x86, 0xff, 0x28, 0x69, - 0xf6, 0x5b, 0xe8, 0xf7, 0x4f, 0x42, 0xe6, 0x52, 0x84, 0x5b, 0xd2, 0xaa, 0x27, 0x1a, 0xba, 0x27, - 0x9e, 0x87, 0x05, 0x37, 0x8a, 0xba, 0x6e, 0x38, 0x20, 0x31, 0x4e, 0x3a, 0xcb, 0xf5, 0x96, 0xb8, - 0xcc, 0x1f, 0x6c, 0xa6, 0x1e, 0xcd, 0xe2, 0x3e, 0xe1, 0x70, 0xd7, 0x1d, 0x85, 0xc3, 0xf4, 0xd0, - 0x88, 0xc4, 0x0a, 0x8c, 0x88, 0x7c, 0x89, 0x2b, 0xbc, 0x02, 0xd2, 0x2b, 0xcc, 0x8f, 0x59, 0x4a, - 0x76, 0x42, 0x8f, 0x2f, 0xaa, 0x25, 0xfc, 0x58, 0xb0, 0xec, 0x9f, 0x18, 0xb0, 0x70, 0x90, 0x1d, - 0x06, 0x7e, 0x9f, 0xab, 0x60, 0xb0, 0x16, 0xe0, 0x19, 0x1a, 0x78, 0x2a, 0x04, 0xe6, 0x64, 0x08, - 0x6a, 0x3a, 0x04, 0x2b, 0xd0, 0x18, 0x90, 0xd0, 0x23, 0xb1, 0x80, 0x54, 0x50, 0xc2, 0xd4, 0x7a, - 0x6e, 0xaa, 0xfd, 0x0b, 0x13, 0xe6, 0x3e, 0x60, 0x13, 0xd6, 0xa0, 0x15, 0x1d, 0xd3, 0x90, 0xec, - 0x65, 0x2c, 0xac, 0x84, 0x2d, 0x2a, 0xcb, 0xba, 0x0e, 0xf5, 0x43, 0x3f, 0x4e, 0x8f, 0xb9, 0x5f, - 0xdb, 0x0e, 0x12, 0x8c, 0x4b, 0x86, 0xae, 0x8f, 0xce, 0x6c, 0x3a, 0x48, 0x88, 0x05, 0xcd, 0x49, - 0xec, 0xf5, 0x3d, 0xd6, 0xac, 0xec, 0xb1, 0x6a, 0x6c, 0xc0, 0xb8, 0xd8, 0xb0, 0xff, 0x6d, 0x00, - 0xdc, 0x89, 0x7d, 0x12, 0x7a, 0x1c, 0x9a, 0xd2, 0xe6, 0x36, 0xaa, 0x9b, 0x7b, 0x05, 0x1a, 0x31, - 0x19, 0xba, 0xf1, 0x49, 0x1e, 0xfc, 0x48, 0x95, 0x0c, 0xaa, 0x55, 0x0c, 0x7a, 0x15, 0xe0, 0x88, - 0xcf, 0xc3, 0xf4, 0x70, 0xa8, 0x5a, 0x2f, 0x7f, 0xe2, 0x56, 0x25, 0x0d, 0xde, 0xca, 0xbd, 0xe4, - 0x28, 0xc3, 0xd9, 0xce, 0x72, 0x3d, 0x4f, 0x04, 0x70, 0x1d, 0x77, 0x96, 0x64, 0x8c, 0x89, 0xdf, - 0xc6, 0x39, 0xf1, 0x3b, 0x2b, 0x83, 0xe2, 0x9f, 0x06, 0x34, 0x37, 0x03, 0xb7, 0x7f, 0x32, 0xe5, - 0xd2, 0xf5, 0x25, 0x9a, 0x95, 0x25, 0xde, 0x85, 0xf6, 0x21, 0x53, 0x97, 0x2f, 0x81, 0xa3, 0xd0, - 0x7a, 0xf9, 0x53, 0x63, 0x56, 0xa9, 0x6f, 0x0a, 0x47, 0x97, 0xd3, 0x97, 0x3b, 0x73, 0xf1, 0x72, - 0xeb, 0xe7, 0x2c, 0xb7, 0x21, 0x97, 0xfb, 0x57, 0x13, 0xe6, 0x79, 0xa2, 0x73, 0xc8, 0x28, 0x23, - 0x49, 0x6a, 0x7d, 0x1d, 0xe6, 0xb2, 0xdc, 0x54, 0x63, 0x5a, 0x53, 0xa5, 0x88, 0xf5, 0x8a, 0x48, - 0xab, 0x5c, 0xde, 0xe4, 0xf2, 0x37, 0xc6, 0xc8, 0xcb, 0x9a, 0xe6, 0x14, 0xc3, 0x59, 0x09, 0x3a, - 0x76, 0x43, 0x2f, 0x20, 0x0e, 0x49, 0xb2, 0x20, 0x15, 0xd9, 0x52, 0xe3, 0x61, 0xa4, 0x8d, 0xba, - 0xc9, 0x40, 0x14, 0x28, 0x41, 0x31, 0x74, 0x70, 0x1c, 0xfb, 0x09, 0x97, 0x5e, 0x30, 0xd8, 0x46, - 0x8d, 0xc9, 0x88, 0x7b, 0x08, 0xb7, 0x55, 0x4e, 0x16, 0x73, 0x0a, 0xd4, 0x30, 0x10, 0x34, 0x1e, - 0x73, 0x31, 0xd2, 0x5c, 0x01, 0x56, 0x26, 0x85, 0x53, 0x2e, 0x4c, 0xf6, 0xdf, 0x6b, 0xd0, 0xc6, - 0xed, 0x93, 0x83, 0x7a, 0x93, 0xc5, 0x39, 0x1d, 0x6a, 0x51, 0xa4, 0x70, 0x98, 0x15, 0x8c, 0xda, - 0xd3, 0x13, 0x8d, 0xc6, 0x63, 0xa1, 0xc8, 0xe8, 0x3b, 0x5a, 0xc2, 0x51, 0x59, 0xf9, 0x2c, 0x77, - 0xd5, 0xc4, 0xa3, 0x70, 0x58, 0x2a, 0x4b, 0xa9, 0x16, 0x1d, 0x92, 0x66, 0xb2, 0x29, 0x95, 0xf3, - 0x63, 0x7c, 0x28, 0x1c, 0x86, 0x6f, 0x4a, 0xf3, 0xb9, 0x11, 0xa4, 0x82, 0x81, 0x9a, 0xc5, 0xbc, - 0x58, 0x4a, 0x24, 0x5d, 0xf1, 0x6a, 0xf3, 0x5c, 0xaf, 0x82, 0xe6, 0x55, 0x7d, 0x73, 0xb5, 0x2a, - 0x9b, 0x6b, 0x1d, 0xda, 0xa8, 0x27, 0x0f, 0xfa, 0x79, 0x2c, 0xf5, 0x1a, 0x53, 0x8f, 0x8d, 0x76, - 0x39, 0x36, 0x74, 0xef, 0x2e, 0x4c, 0xf0, 0xee, 0xa2, 0xf4, 0xee, 0xef, 0x4d, 0x80, 0x6d, 0x12, - 0xb9, 0x71, 0x3a, 0x24, 0x61, 0xca, 0x96, 0xe7, 0x49, 0x4a, 0x3a, 0x57, 0xe3, 0xa9, 0x75, 0xc2, - 0xd4, 0xeb, 0x84, 0x05, 0x33, 0x1c, 0x70, 0xf4, 0x26, 0xff, 0x9b, 0x81, 0x19, 0xb9, 0x31, 0x6a, - 0xc3, 0x20, 0x97, 0x34, 0xab, 0x03, 0x34, 0xf6, 0x44, 0xe5, 0xa8, 0x3b, 0x48, 0xb0, 0xcd, 0x5f, - 0xcc, 0xc7, 0x1b, 0x9a, 0x06, 0xe6, 0x75, 0x9d, 0x7b, 0x61, 0x0f, 0xf6, 0x22, 0x2c, 0x25, 0xd9, - 0x61, 0xb1, 0xb8, 0xbd, 0x6c, 0x28, 0xc2, 0xbd, 0xc2, 0x67, 0xa0, 0x62, 0x73, 0xc6, 0x06, 0x61, - 0xa9, 0x29, 0x18, 0xe5, 0xae, 0xc0, 0x7e, 0xdb, 0x84, 0xa5, 0xfd, 0x78, 0xe0, 0x86, 0xfe, 0xf7, - 0x79, 0xbb, 0xc9, 0x13, 0xf8, 0x65, 0x4a, 0xee, 0x1a, 0xb4, 0x48, 0x38, 0x08, 0xfc, 0xe4, 0x78, - 0xaf, 0xc0, 0x4d, 0x65, 0xa9, 0x60, 0xcf, 0x4c, 0x2a, 0xca, 0x75, 0xad, 0x28, 0xaf, 0x40, 0x63, - 0x48, 0x0f, 0xfd, 0x20, 0x8f, 0x7b, 0x41, 0xf1, 0x98, 0x27, 0x01, 0xe1, 0xd5, 0x59, 0xc6, 0x7c, - 0xce, 0x28, 0x0a, 0xf5, 0xdc, 0xd8, 0x42, 0xdd, 0x54, 0x0b, 0xb5, 0x0e, 0x3c, 0x54, 0x80, 0x47, - 0xb8, 0x5a, 0x12, 0xae, 0x3f, 0x1b, 0xb0, 0x54, 0xc0, 0x8d, 0x3d, 0xe8, 0x44, 0xb8, 0x6c, 0x98, - 0xdf, 0x56, 0x23, 0x50, 0x24, 0x0f, 0x95, 0xc7, 0xcc, 0xda, 0xe7, 0x71, 0x83, 0x39, 0x15, 0x09, - 0x06, 0xf4, 0x01, 0x4d, 0x7c, 0xa5, 0xdf, 0x97, 0x34, 0x9b, 0x6d, 0x97, 0xb8, 0x0a, 0x58, 0x48, - 0x31, 0x7e, 0x0f, 0xbb, 0x6e, 0x8c, 0x31, 0x41, 0xb1, 0x25, 0xec, 0xc8, 0x3a, 0xba, 0xf3, 0xd8, - 0x7e, 0xcf, 0x80, 0x25, 0xac, 0x0f, 0xca, 0x66, 0xd9, 0x87, 0x25, 0x5a, 0x8a, 0x02, 0x51, 0x64, - 0x3e, 0x3d, 0xa6, 0x48, 0x94, 0x03, 0xc6, 0xa9, 0x08, 0x5b, 0x6f, 0xc0, 0x75, 0xaf, 0x84, 0xd3, - 0xae, 0x9f, 0xa4, 0x1d, 0x73, 0xad, 0x36, 0x41, 0x69, 0x19, 0x56, 0x67, 0xac, 0x02, 0xfb, 0x07, - 0xd0, 0x39, 0xc8, 0x82, 0xa0, 0x4b, 0x92, 0xc4, 0x1d, 0x90, 0xcd, 0xb3, 0x1e, 0x19, 0x31, 0xbe, - 0x43, 0x92, 0x88, 0x45, 0x18, 0x89, 0xe3, 0x2d, 0xea, 0x11, 0x6e, 0x7c, 0xdd, 0xc9, 0x49, 0x06, - 0x0e, 0x89, 0x63, 0x96, 0x66, 0x44, 0x1f, 0x84, 0x94, 0x75, 0x0b, 0x66, 0x02, 0x66, 0x56, 0x8d, - 0x9b, 0xb5, 0x3a, 0xc6, 0xac, 0x6e, 0x32, 0xd8, 0x76, 0x53, 0xd7, 0xe1, 0xe3, 0xec, 0x21, 0x7c, - 0x6c, 0xfc, 0xec, 0xa3, 0x89, 0x51, 0xc0, 0x3a, 0x15, 0x5e, 0xea, 0x7d, 0x1a, 0xca, 0x20, 0x50, - 0x59, 0xcc, 0xec, 0x04, 0xf5, 0x70, 0x3b, 0xda, 0x4e, 0x4e, 0xda, 0xd7, 0xc1, 0xba, 0x4b, 0xd2, - 0xae, 0xfb, 0x78, 0x23, 0xf4, 0xba, 0x7e, 0xd8, 0x23, 0x23, 0x87, 0x8c, 0xec, 0x1d, 0xb8, 0x56, - 0xe1, 0x26, 0x11, 0xdf, 0x2d, 0xee, 0xe3, 0x1e, 0x19, 0x71, 0x03, 0xda, 0x8e, 0xa0, 0x38, 0x9f, - 0x8f, 0x12, 0x4d, 0x90, 0xa0, 0xec, 0x11, 0x2c, 0x32, 0x57, 0xf5, 0x48, 0xe8, 0x75, 0x93, 0x01, - 0x57, 0xb1, 0x06, 0x2d, 0x44, 0xa0, 0x9b, 0x0c, 0x8a, 0xae, 0x4a, 0x61, 0xb1, 0x11, 0xfd, 0xc0, - 0x67, 0x2e, 0xe1, 0x23, 0xc4, 0x6a, 0x14, 0x16, 0x8b, 0xdd, 0x84, 0x88, 0x43, 0x06, 0x0b, 0xea, - 0x9a, 0x23, 0x69, 0xfb, 0xbd, 0x3a, 0xcc, 0x0a, 0x40, 0xf9, 0x29, 0x91, 0x35, 0xb2, 0x12, 0x2f, - 0xa4, 0xb0, 0xe4, 0xf4, 0x4f, 0x8b, 0xf3, 0x1a, 0x52, 0xea, 0x09, 0xaf, 0xa6, 0x9f, 0xf0, 0x4a, - 0x36, 0xcd, 0x54, 0x6d, 0x2a, 0xad, 0xab, 0x5e, 0x5d, 0x17, 0xcb, 0xb0, 0x3c, 0xe9, 0x1c, 0x04, - 0x6e, 0x7a, 0x44, 0xe3, 0xa1, 0xe8, 0x4b, 0xeb, 0x4e, 0x85, 0xcf, 0xb2, 0x3a, 0xf2, 0x64, 0x59, - 0xc6, 0xdd, 0x55, 0xe2, 0xb2, 0x22, 0x88, 0x9c, 0xbc, 0x3c, 0xe3, 0x81, 0x40, 0x67, 0xa2, 0x6d, - 0x49, 0xe2, 0xd3, 0x90, 0x17, 0x08, 0xac, 0xc2, 0x2a, 0x8b, 0xad, 0x7c, 0x98, 0x0c, 0xee, 0xc4, - 0x74, 0x28, 0x8e, 0x05, 0x39, 0xc9, 0x57, 0x4e, 0xc3, 0x34, 0x2f, 0x2e, 0x2d, 0x94, 0x55, 0x58, - 0x4c, 0x56, 0x90, 0xbc, 0x04, 0xcf, 0x3b, 0x39, 0x69, 0x2d, 0x41, 0x2d, 0x21, 0x23, 0x51, 0x57, - 0xd9, 0x9f, 0x9a, 0xe7, 0x16, 0x75, 0xcf, 0x95, 0x12, 0xe5, 0x12, 0xff, 0x55, 0x4d, 0x94, 0xc5, - 0x99, 0x7f, 0x59, 0x3b, 0xf3, 0x6f, 0xc0, 0x2c, 0x8d, 0x58, 0x9c, 0x27, 0x1d, 0x8b, 0xef, 0xb1, - 0xcf, 0x4c, 0xde, 0x63, 0xb7, 0xf6, 0x71, 0xe4, 0x4e, 0x98, 0xc6, 0x67, 0x4e, 0x2e, 0x67, 0xed, - 0xc2, 0x22, 0x3d, 0x3a, 0x0a, 0xfc, 0x90, 0x1c, 0x64, 0xc9, 0x31, 0xef, 0x5f, 0xaf, 0xf1, 0xd4, - 0x64, 0x8f, 0x4b, 0x4d, 0xfa, 0x48, 0xa7, 0x2c, 0xba, 0xfa, 0x0a, 0xcc, 0xab, 0xd3, 0x30, 0x18, - 0x4e, 0xc8, 0x99, 0x88, 0x41, 0xf6, 0x27, 0x4b, 0xc9, 0xa7, 0x6e, 0x90, 0x61, 0x89, 0x9b, 0x73, - 0x90, 0x78, 0xc5, 0xfc, 0x8a, 0x61, 0xff, 0xdc, 0x80, 0xc5, 0xd2, 0x04, 0x6c, 0x74, 0xea, 0xa7, - 0x01, 0x11, 0x1a, 0x90, 0x60, 0xed, 0x83, 0x47, 0x92, 0xbe, 0x08, 0x61, 0xfe, 0xb7, 0xa8, 0x25, - 0x35, 0x79, 0x28, 0xb4, 0x61, 0xde, 0xdf, 0xef, 0x31, 0x45, 0x3d, 0x9a, 0x85, 0x9e, 0xbc, 0xd8, - 0x51, 0x78, 0x2c, 0x84, 0xfc, 0xfd, 0xde, 0xa6, 0xeb, 0x0d, 0x08, 0x5e, 0xbf, 0xd4, 0xb9, 0x4d, - 0x3a, 0xd3, 0xf6, 0x60, 0xee, 0x81, 0x1f, 0x25, 0x5b, 0x74, 0x38, 0x64, 0x8e, 0xf0, 0x48, 0xca, - 0x0a, 0x9d, 0xc1, 0xfd, 0x2d, 0x28, 0x16, 0x2a, 0x1e, 0x39, 0x72, 0xb3, 0x20, 0x65, 0x43, 0xf3, - 0x8d, 0xab, 0xb0, 0xf8, 0xc5, 0x43, 0x42, 0xc3, 0x6d, 0x94, 0x46, 0x3b, 0x15, 0x8e, 0xfd, 0x17, - 0x13, 0x96, 0xf8, 0xf1, 0x60, 0x8b, 0xbb, 0xdd, 0xe3, 0x42, 0x2f, 0x43, 0x9d, 0x6f, 0x43, 0x51, - 0x2d, 0xce, 0x3f, 0x52, 0xe0, 0x50, 0xeb, 0x36, 0x34, 0x68, 0xc4, 0x4b, 0x0c, 0x9e, 0x43, 0x9e, - 0x9f, 0x24, 0xa4, 0xdf, 0xf1, 0x38, 0x42, 0xca, 0xba, 0x03, 0x30, 0x2c, 0x2a, 0x0a, 0xa6, 0xee, - 0x69, 0x75, 0x28, 0x92, 0x0c, 0x5c, 0x99, 0x86, 0xe5, 0x45, 0x4f, 0xcd, 0xd1, 0x99, 0xd6, 0x1e, - 0x2c, 0x70, 0xb3, 0xf7, 0xf3, 0xb3, 0x25, 0xf7, 0xc1, 0xf4, 0x33, 0x96, 0xa4, 0xed, 0x5f, 0x1b, - 0x02, 0x46, 0xf6, 0x6b, 0x8f, 0x20, 0xf6, 0x05, 0x24, 0xc6, 0xa5, 0x20, 0x59, 0x85, 0xb9, 0x61, - 0xa6, 0x1c, 0x75, 0x6b, 0x8e, 0xa4, 0x0b, 0x17, 0xd5, 0xa6, 0x76, 0x91, 0xfd, 0x1b, 0x03, 0x3a, - 0xaf, 0x51, 0x3f, 0xe4, 0x3f, 0x6c, 0x44, 0x51, 0x20, 0x6e, 0x23, 0x2f, 0xed, 0xf3, 0x6f, 0x40, - 0xd3, 0x45, 0x35, 0x61, 0x2a, 0xdc, 0x3e, 0xc5, 0xf1, 0xb5, 0x90, 0x51, 0x4e, 0x22, 0x35, 0xf5, - 0x24, 0x62, 0xbf, 0x63, 0xc0, 0x02, 0x82, 0xf2, 0x7a, 0xe6, 0xa7, 0x97, 0xb6, 0x6f, 0x13, 0xe6, - 0x46, 0x99, 0x9f, 0x5e, 0x22, 0x2a, 0xa5, 0x5c, 0x35, 0x9e, 0x6a, 0x63, 0xe2, 0xc9, 0x7e, 0xd7, - 0x80, 0x1b, 0x65, 0x58, 0x37, 0xfa, 0x7d, 0x12, 0x3d, 0xc9, 0x2d, 0xa5, 0x9d, 0xc4, 0x66, 0x4a, - 0x27, 0xb1, 0xb1, 0x26, 0x3b, 0xe4, 0x2d, 0xd2, 0x7f, 0x7a, 0x4d, 0xfe, 0xb1, 0x09, 0x1f, 0xbf, - 0x2b, 0x37, 0xde, 0x83, 0xd8, 0x0d, 0x93, 0x23, 0x12, 0xc7, 0x4f, 0xd0, 0xde, 0x5d, 0x68, 0x87, - 0xe4, 0x51, 0x61, 0x93, 0xd8, 0x8e, 0xd3, 0xaa, 0xd1, 0x85, 0xa7, 0xcb, 0x5d, 0xf6, 0x7f, 0x0c, - 0x58, 0x42, 0x3d, 0xdf, 0xf4, 0xfb, 0x27, 0x4f, 0x70, 0xf1, 0x7b, 0xb0, 0x70, 0xc2, 0x2d, 0x60, - 0xd4, 0x25, 0xd2, 0x76, 0x49, 0x7a, 0xca, 0xe5, 0xff, 0xd7, 0x80, 0x65, 0x54, 0x74, 0x3f, 0x3c, - 0xf5, 0x9f, 0x64, 0xb0, 0x1e, 0xc0, 0xa2, 0x8f, 0x26, 0x5c, 0x12, 0x80, 0xb2, 0xf8, 0x94, 0x08, - 0xfc, 0xd1, 0x80, 0x45, 0xd4, 0xb4, 0x13, 0xa6, 0x24, 0xbe, 0xf4, 0xfa, 0xef, 0xb1, 0xd3, 0x7d, - 0x1a, 0xbb, 0xe1, 0x65, 0x32, 0xa4, 0x2a, 0x3a, 0x65, 0x92, 0x7c, 0xc7, 0x00, 0x8b, 0xab, 0xda, - 0xf6, 0x93, 0xa1, 0x9f, 0x24, 0x4f, 0xd0, 0x75, 0xd3, 0x19, 0xfc, 0x4b, 0x13, 0xae, 0x2b, 0x5a, - 0xba, 0x59, 0xfa, 0xb4, 0x9b, 0x6c, 0x6d, 0x43, 0x93, 0xf5, 0x08, 0xea, 0x15, 0xff, 0xb4, 0x13, - 0x15, 0x82, 0xac, 0x8b, 0xe5, 0x44, 0x8f, 0xf4, 0x69, 0xe8, 0x25, 0xbc, 0x39, 0x6a, 0x3b, 0x1a, - 0x8f, 0xa5, 0xa1, 0x55, 0x45, 0xcd, 0x96, 0x1b, 0xf6, 0x49, 0xf0, 0xcc, 0x40, 0x64, 0xff, 0xce, - 0x80, 0x05, 0x1c, 0xf2, 0xf4, 0x2f, 0x99, 0xd5, 0x7a, 0x0c, 0xe4, 0x0f, 0x8d, 0x97, 0xec, 0x13, - 0x58, 0xc6, 0x5b, 0x7d, 0xa5, 0x3d, 0x61, 0x07, 0x5f, 0xd7, 0xc3, 0xb3, 0xac, 0xc1, 0x85, 0x72, - 0x52, 0x7f, 0xaf, 0x11, 0x4f, 0xf2, 0xc5, 0x7b, 0xcd, 0x4d, 0x00, 0xd7, 0xf3, 0xde, 0xa0, 0xb1, - 0xe7, 0x87, 0x79, 0xaf, 0xa9, 0x70, 0xec, 0xd7, 0x60, 0x9e, 0x1d, 0xbd, 0x1f, 0x28, 0xf7, 0xf3, - 0xe7, 0xbe, 0x20, 0xa8, 0x77, 0xfb, 0xa6, 0x7e, 0xb7, 0x6f, 0x7f, 0x0f, 0x3e, 0x5a, 0x31, 0x9c, - 0x63, 0xbd, 0x85, 0xcf, 0x0e, 0xf9, 0x24, 0x02, 0xf2, 0x4f, 0x8e, 0x41, 0x4f, 0xb5, 0xc5, 0xd1, - 0x84, 0xec, 0x1f, 0x19, 0xf0, 0x5c, 0x45, 0xfd, 0x46, 0x14, 0xc5, 0xf4, 0x54, 0xb8, 0xf4, 0x2a, - 0xa6, 0xd1, 0xfb, 0x30, 0xb3, 0xdc, 0x87, 0x8d, 0x35, 0x42, 0xeb, 0x1d, 0x3f, 0x00, 0x23, 0x7e, - 0x6b, 0xc0, 0xa2, 0x30, 0xc2, 0xf3, 0xc4, 0xb4, 0x5f, 0x86, 0x06, 0x3e, 0x59, 0x8a, 0x09, 0x9f, - 0x1b, 0x3b, 0x61, 0xfe, 0xd4, 0xea, 0x88, 0xc1, 0xd5, 0x88, 0x34, 0xc7, 0xe5, 0x8d, 0xaf, 0xca, - 0xb8, 0x9f, 0xfa, 0x51, 0x51, 0x08, 0xd8, 0xdf, 0xce, 0x83, 0x79, 0x9b, 0x04, 0xe4, 0x2a, 0x31, - 0xb2, 0x1f, 0xc2, 0x02, 0x7f, 0x3f, 0x2d, 0x30, 0xb8, 0x12, 0xb5, 0x6f, 0xc0, 0x12, 0x57, 0x7b, - 0xe5, 0xf6, 0xca, 0xdd, 0xc1, 0xf0, 0xd9, 0x3a, 0x76, 0xc3, 0xc1, 0x55, 0x6a, 0xff, 0x02, 0x5c, - 0xcb, 0xb1, 0x7f, 0x18, 0x79, 0xf2, 0x3e, 0x63, 0xc2, 0x2d, 0xae, 0xfd, 0x45, 0x58, 0xd9, 0xa2, - 0xe1, 0x29, 0x89, 0x13, 0xbc, 0xe3, 0xe6, 0x22, 0xb9, 0x84, 0xb6, 0xf9, 0x05, 0x65, 0xbf, 0x05, - 0xab, 0xaa, 0x44, 0x8f, 0xa4, 0x07, 0xb1, 0x7f, 0xaa, 0x48, 0x89, 0x5b, 0x4e, 0x43, 0xbb, 0xe5, - 0x2c, 0x6e, 0x45, 0x4d, 0xed, 0x56, 0xf4, 0x06, 0x34, 0xfd, 0x44, 0x28, 0xe0, 0x41, 0x35, 0xe7, - 0x14, 0x0c, 0xbb, 0x07, 0xcb, 0xe2, 0x45, 0xf3, 0xc0, 0x1d, 0xf8, 0x21, 0x66, 0xc0, 0x9b, 0x00, - 0x91, 0x3b, 0xc8, 0xbf, 0x68, 0xc0, 0x0b, 0x71, 0x85, 0xc3, 0x7e, 0x4f, 0x8e, 0xe9, 0x23, 0xf1, - 0xbb, 0x89, 0xbf, 0x17, 0x1c, 0xfb, 0x5b, 0x60, 0x39, 0x24, 0x89, 0x68, 0x98, 0x10, 0x45, 0xeb, - 0x1a, 0xb4, 0xb6, 0xb2, 0x38, 0x26, 0x21, 0x9b, 0x2a, 0x7f, 0xde, 0x57, 0x59, 0x4c, 0x6f, 0xaf, - 0xd0, 0x8b, 0x97, 0xa8, 0x0a, 0xc7, 0xfe, 0x55, 0x0d, 0x9a, 0x3d, 0x7f, 0x10, 0xba, 0x81, 0x43, - 0x46, 0xd6, 0xd7, 0xa0, 0x81, 0xad, 0xad, 0x70, 0xe3, 0xb8, 0x4b, 0x3d, 0x1c, 0x8d, 0x3d, 0xbc, - 0x43, 0x46, 0xf7, 0x3e, 0xe2, 0x08, 0x19, 0xeb, 0x75, 0x68, 0xe3, 0x5f, 0xf7, 0xf1, 0xaa, 0x42, - 0xd4, 0x99, 0xcf, 0x5e, 0xa0, 0x44, 0x8c, 0x46, 0x5d, 0xba, 0x06, 0x66, 0x50, 0x9f, 0x97, 0x3e, - 0xb1, 0x77, 0x27, 0x1b, 0x84, 0x15, 0x52, 0x18, 0x84, 0x32, 0x4c, 0xda, 0xe5, 0x87, 0x79, 0xd1, - 0x2e, 0x4c, 0x96, 0xc6, 0x33, 0xbf, 0x90, 0x46, 0x19, 0x26, 0x7d, 0x9c, 0x85, 0x83, 0x87, 0x91, - 0xb8, 0x63, 0x9a, 0x2c, 0x7d, 0x8f, 0x0f, 0x13, 0xd2, 0x28, 0xc3, 0xa4, 0x63, 0x9e, 0x59, 0x39, - 0xe8, 0xe7, 0x49, 0x63, 0x02, 0x16, 0xd2, 0x28, 0xb3, 0xd9, 0x84, 0xd9, 0xc8, 0x3d, 0x0b, 0xa8, - 0xeb, 0xd9, 0x6f, 0xd7, 0x00, 0xf2, 0x81, 0x09, 0xaf, 0xe2, 0x9a, 0x8b, 0xd6, 0x2f, 0x74, 0x51, - 0x14, 0x9c, 0x29, 0x4e, 0xea, 0x8d, 0x77, 0xd2, 0xe7, 0xa6, 0x75, 0x12, 0x6a, 0x2b, 0xb9, 0xe9, - 0x76, 0xc9, 0x4d, 0xeb, 0x17, 0xba, 0x49, 0x18, 0x25, 0x1c, 0x75, 0xbb, 0xe4, 0xa8, 0xf5, 0x0b, - 0x1d, 0x25, 0xe4, 0x85, 0xab, 0x6e, 0x97, 0x5c, 0xb5, 0x7e, 0xa1, 0xab, 0x84, 0xbc, 0x70, 0xd6, - 0xed, 0x92, 0xb3, 0xd6, 0x2f, 0x74, 0x96, 0x90, 0xaf, 0xba, 0xeb, 0x5d, 0x13, 0x16, 0x38, 0x64, - 0xf8, 0xa0, 0x14, 0x1e, 0x51, 0x7e, 0x6f, 0xcc, 0xe1, 0xd2, 0x3f, 0x90, 0xd1, 0x99, 0xd6, 0xe7, - 0x61, 0x19, 0x19, 0xe2, 0x83, 0x0a, 0xf9, 0x42, 0xd7, 0x74, 0xaa, 0x3f, 0xf0, 0x27, 0x80, 0x2c, - 0x49, 0xe9, 0x70, 0xdb, 0x4d, 0xdd, 0xbc, 0x33, 0x2a, 0x38, 0xea, 0x03, 0xcd, 0x4c, 0xe5, 0x13, - 0xbc, 0x98, 0xd2, 0xa1, 0x7c, 0x79, 0x11, 0x14, 0x93, 0x48, 0xfd, 0x21, 0xa1, 0x59, 0x2a, 0xd2, - 0x44, 0x4e, 0xe2, 0x23, 0xb6, 0xe7, 0xbb, 0xfc, 0x59, 0x43, 0xbc, 0xf0, 0x4a, 0x06, 0xcf, 0x6c, - 0xc5, 0x33, 0x8d, 0xf8, 0x44, 0xae, 0xe0, 0x5c, 0xfc, 0xa4, 0x62, 0xff, 0xc3, 0x80, 0x6b, 0x07, - 0x6e, 0x9c, 0xfa, 0x7d, 0x3f, 0x72, 0xc3, 0xb4, 0x4b, 0x52, 0x97, 0xaf, 0x41, 0xfb, 0x4a, 0xc6, - 0x78, 0x7f, 0x5f, 0xc9, 0x1c, 0xc0, 0xe2, 0xa0, 0xe8, 0x65, 0x95, 0xef, 0x6c, 0xa6, 0x3e, 0xe3, - 0x97, 0xc4, 0xb5, 0x4f, 0x7e, 0x6a, 0xef, 0xfb, 0x93, 0x1f, 0xfb, 0xa7, 0x26, 0x2c, 0x96, 0x52, - 0x27, 0x6b, 0x47, 0xb1, 0xd1, 0x90, 0x31, 0x21, 0x69, 0x6b, 0x03, 0xc0, 0x97, 0x61, 0x74, 0xce, - 0x25, 0xad, 0x1e, 0x6b, 0x8e, 0x22, 0x34, 0xee, 0xad, 0xa6, 0x76, 0xe9, 0xb7, 0x1a, 0xeb, 0x1e, - 0xb4, 0xa2, 0xc2, 0x49, 0xe7, 0x1c, 0xc0, 0xc6, 0xb8, 0xd2, 0x51, 0x45, 0xed, 0xef, 0xc2, 0x72, - 0x25, 0x43, 0xf1, 0xa7, 0x1b, 0x7a, 0x42, 0x42, 0xf9, 0x74, 0xc3, 0x08, 0x25, 0x58, 0xcd, 0x72, - 0xb0, 0x06, 0xfe, 0xa9, 0xfa, 0x4d, 0xa1, 0x20, 0xed, 0x9f, 0x99, 0xb0, 0x32, 0xbe, 0xba, 0x3c, - 0xab, 0x70, 0x1f, 0x42, 0x67, 0x52, 0x26, 0xbf, 0x32, 0xd4, 0x8b, 0xe8, 0x96, 0x75, 0xf8, 0x59, - 0x85, 0xfb, 0x5a, 0x1e, 0xdd, 0x4a, 0xa9, 0xb3, 0xff, 0x20, 0xf1, 0x91, 0x9d, 0xc6, 0x33, 0x8a, - 0x8f, 0xf5, 0x22, 0x2c, 0xe1, 0x32, 0x95, 0xc7, 0x7d, 0x6c, 0x5c, 0x2b, 0xfc, 0x22, 0x53, 0x28, - 0x65, 0xff, 0xca, 0x62, 0xf6, 0x4f, 0x46, 0xee, 0x13, 0xd9, 0xbf, 0x7d, 0xa8, 0x7c, 0x52, 0x44, - 0x9a, 0xd2, 0xd4, 0x28, 0x91, 0x26, 0xfb, 0xca, 0xff, 0x47, 0xda, 0xc5, 0x91, 0x26, 0xb1, 0x54, - 0x1a, 0x3c, 0xfb, 0x87, 0xd0, 0xde, 0x26, 0x41, 0x37, 0x19, 0xe4, 0x9f, 0x15, 0x9d, 0x07, 0xe4, - 0xa4, 0x7f, 0x6d, 0x98, 0xf8, 0x41, 0x51, 0xf9, 0x63, 0xa4, 0x99, 0xca, 0xc7, 0x48, 0xf6, 0x26, - 0x2c, 0xa8, 0x06, 0x5c, 0xe6, 0xab, 0xaa, 0xcd, 0x1b, 0xdf, 0x59, 0xbd, 0xf5, 0x12, 0xfe, 0x13, - 0xcd, 0xab, 0x15, 0x10, 0x0f, 0x1b, 0xfc, 0x9f, 0x6a, 0xbe, 0xf4, 0xbf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x6c, 0xa8, 0x04, 0xcf, 0x67, 0x33, 0x00, 0x00, + 0x2b, 0x84, 0x00, 0x1b, 0x14, 0x84, 0x04, 0x09, 0x2c, 0x5a, 0xdb, 0xfb, 0x15, 0xd6, 0x1f, 0xe9, + 0xd9, 0x25, 0x08, 0x90, 0xa2, 0xf6, 0x74, 0x79, 0xdc, 0x71, 0x77, 0x57, 0x4f, 0x7f, 0x78, 0x77, + 0x11, 0x12, 0x12, 0x48, 0x88, 0x1b, 0x27, 0x38, 0x70, 0x41, 0xe2, 0x82, 0x40, 0x51, 0x14, 0x21, + 0xb8, 0x45, 0x88, 0x03, 0xff, 0x00, 0x47, 0xc4, 0x8d, 0x33, 0x57, 0x0e, 0x48, 0x48, 0xa0, 0xaa, + 0x57, 0x5d, 0x5d, 0xd5, 0x3d, 0x63, 0x4f, 0x46, 0x56, 0x76, 0xa3, 0xe5, 0x36, 0xef, 0x75, 0xbd, + 0x57, 0xaf, 0x7e, 0xef, 0x55, 0xbd, 0x57, 0x1f, 0x03, 0xcb, 0xa9, 0x77, 0xf2, 0xe6, 0xc3, 0xf4, + 0xa5, 0x87, 0xe9, 0xb5, 0x38, 0xa1, 0x19, 0xb5, 0x56, 0x53, 0x92, 0x9c, 0x92, 0xe4, 0x4d, 0x37, + 0xf6, 0xdf, 0x8c, 0xdd, 0xc4, 0x0d, 0x53, 0xfb, 0x5f, 0x26, 0xb4, 0x6f, 0x27, 0x34, 0x8f, 0xef, + 0x46, 0x47, 0xd4, 0xea, 0xc1, 0xfc, 0x90, 0x13, 0x3b, 0x3d, 0x63, 0xc3, 0x78, 0xa1, 0xed, 0x14, + 0xa4, 0x75, 0x05, 0xda, 0xfc, 0xe7, 0x9e, 0x1b, 0x92, 0x9e, 0xc9, 0xbf, 0x95, 0x0c, 0xcb, 0x86, + 0xc5, 0x88, 0x66, 0xfe, 0x91, 0x3f, 0x70, 0x33, 0x9f, 0x46, 0xbd, 0x06, 0x6f, 0xa0, 0xf1, 0x58, + 0x1b, 0x3f, 0xca, 0x12, 0xea, 0xe5, 0x03, 0xde, 0x66, 0x0e, 0xdb, 0xa8, 0x3c, 0xd6, 0xff, 0x91, + 0x3b, 0x20, 0x0f, 0x9c, 0x7b, 0xbd, 0x26, 0xf6, 0x2f, 0x48, 0x6b, 0x03, 0x3a, 0xf4, 0x61, 0x44, + 0x92, 0x07, 0x29, 0x49, 0xee, 0xee, 0xf4, 0x5a, 0xfc, 0xab, 0xca, 0xb2, 0xae, 0x02, 0x0c, 0x12, + 0xe2, 0x66, 0xe4, 0xbe, 0x1f, 0x92, 0xde, 0xfc, 0x86, 0xf1, 0x42, 0xd7, 0x51, 0x38, 0x4c, 0x43, + 0x48, 0xc2, 0x43, 0x92, 0x6c, 0xd3, 0x3c, 0xca, 0x7a, 0x0b, 0xbc, 0x81, 0xca, 0xb2, 0x96, 0xc0, + 0x24, 0x8f, 0x7a, 0x6d, 0xae, 0xda, 0x24, 0x8f, 0xac, 0x35, 0x68, 0xa5, 0x99, 0x9b, 0xe5, 0x69, + 0x0f, 0x36, 0x8c, 0x17, 0x9a, 0x8e, 0xa0, 0xac, 0x4d, 0xe8, 0x72, 0xbd, 0xb4, 0xb0, 0xa6, 0xc3, + 0x45, 0x74, 0xa6, 0x44, 0xec, 0xfe, 0xe3, 0x98, 0xf4, 0x16, 0xb9, 0x82, 0x92, 0x61, 0xff, 0xcd, + 0x84, 0x4b, 0x1c, 0xf7, 0x5d, 0x6e, 0xc0, 0xad, 0x3c, 0x08, 0xce, 0xf1, 0xc0, 0x1a, 0xb4, 0x72, + 0xec, 0x0e, 0xe1, 0x17, 0x14, 0xeb, 0x27, 0xa1, 0x01, 0xb9, 0x47, 0x4e, 0x49, 0xc0, 0x81, 0x6f, + 0x3a, 0x25, 0xc3, 0x5a, 0x87, 0x85, 0xb7, 0xa8, 0x1f, 0x71, 0x4c, 0xe6, 0xf8, 0x47, 0x49, 0xb3, + 0x6f, 0x91, 0x3f, 0x38, 0x89, 0x98, 0x4b, 0x11, 0x6e, 0x49, 0xab, 0x9e, 0x68, 0xe9, 0x9e, 0x78, + 0x1e, 0x96, 0xdc, 0x38, 0xde, 0x75, 0xa3, 0x21, 0x49, 0xb0, 0xd3, 0x79, 0xae, 0xb7, 0xc2, 0x65, + 0xfe, 0x60, 0x3d, 0xf5, 0x69, 0x9e, 0x0c, 0x08, 0x87, 0xbb, 0xe9, 0x28, 0x1c, 0xa6, 0x87, 0xc6, + 0x24, 0x51, 0x60, 0x44, 0xe4, 0x2b, 0x5c, 0xe1, 0x15, 0x90, 0x5e, 0x61, 0x7e, 0xcc, 0x33, 0x72, + 0x33, 0xf2, 0xf8, 0xa0, 0x3a, 0xc2, 0x8f, 0x25, 0xcb, 0xfe, 0x89, 0x01, 0x4b, 0x07, 0xf9, 0x61, + 0xe0, 0x0f, 0xb8, 0x0a, 0x06, 0x6b, 0x09, 0x9e, 0xa1, 0x81, 0xa7, 0x42, 0x60, 0x4e, 0x86, 0xa0, + 0xa1, 0x43, 0xb0, 0x06, 0xad, 0x21, 0x89, 0x3c, 0x92, 0x08, 0x48, 0x05, 0x25, 0x4c, 0x6d, 0x16, + 0xa6, 0xda, 0xbf, 0x30, 0x61, 0xe1, 0x03, 0x36, 0x61, 0x03, 0x3a, 0xf1, 0x31, 0x8d, 0xc8, 0x5e, + 0xce, 0xc2, 0x4a, 0xd8, 0xa2, 0xb2, 0xac, 0xcb, 0xd0, 0x3c, 0xf4, 0x93, 0xec, 0x98, 0xfb, 0xb5, + 0xeb, 0x20, 0xc1, 0xb8, 0x24, 0x74, 0x7d, 0x74, 0x66, 0xdb, 0x41, 0x42, 0x0c, 0x68, 0x41, 0x62, + 0xaf, 0xcf, 0xb1, 0x76, 0x6d, 0x8e, 0xd5, 0x63, 0x03, 0xc6, 0xc5, 0x86, 0xfd, 0x6f, 0x03, 0xe0, + 0x56, 0xe2, 0x93, 0xc8, 0xe3, 0xd0, 0x54, 0x26, 0xb7, 0x51, 0x9f, 0xdc, 0x6b, 0xd0, 0x4a, 0x48, + 0xe8, 0x26, 0x27, 0x45, 0xf0, 0x23, 0x55, 0x31, 0xa8, 0x51, 0x33, 0xe8, 0x55, 0x80, 0x23, 0xde, + 0x0f, 0xd3, 0xc3, 0xa1, 0xea, 0xbc, 0xfc, 0x89, 0x6b, 0xb5, 0x65, 0xf0, 0x5a, 0xe1, 0x25, 0x47, + 0x69, 0xce, 0x66, 0x96, 0xeb, 0x79, 0x22, 0x80, 0x9b, 0x38, 0xb3, 0x24, 0x63, 0x4c, 0xfc, 0xb6, + 0xce, 0x88, 0xdf, 0x79, 0x19, 0x14, 0xff, 0x34, 0xa0, 0xbd, 0x15, 0xb8, 0x83, 0x93, 0x29, 0x87, + 0xae, 0x0f, 0xd1, 0xac, 0x0d, 0xf1, 0x36, 0x74, 0x0f, 0x99, 0xba, 0x62, 0x08, 0x1c, 0x85, 0xce, + 0xcb, 0x9f, 0x1a, 0x33, 0x4a, 0x7d, 0x52, 0x38, 0xba, 0x9c, 0x3e, 0xdc, 0xb9, 0xf3, 0x87, 0xdb, + 0x3c, 0x63, 0xb8, 0x2d, 0x39, 0xdc, 0xbf, 0x9a, 0xb0, 0xc8, 0x17, 0x3a, 0x87, 0x8c, 0x72, 0x92, + 0x66, 0xd6, 0xd7, 0x61, 0x21, 0x2f, 0x4c, 0x35, 0xa6, 0x35, 0x55, 0x8a, 0x58, 0xaf, 0x88, 0x65, + 0x95, 0xcb, 0x9b, 0x5c, 0xfe, 0xca, 0x18, 0x79, 0x99, 0xd3, 0x9c, 0xb2, 0x39, 0x4b, 0x41, 0xc7, + 0x6e, 0xe4, 0x05, 0xc4, 0x21, 0x69, 0x1e, 0x64, 0x62, 0xb5, 0xd4, 0x78, 0x18, 0x69, 0xa3, 0xdd, + 0x74, 0x28, 0x12, 0x94, 0xa0, 0x18, 0x3a, 0xd8, 0x8e, 0x7d, 0xc2, 0xa1, 0x97, 0x0c, 0x36, 0x51, + 0x13, 0x32, 0xe2, 0x1e, 0xc2, 0x69, 0x55, 0x90, 0x65, 0x9f, 0x02, 0x35, 0x0c, 0x04, 0x8d, 0xc7, + 0x5c, 0x8c, 0x34, 0x57, 0x80, 0x99, 0x49, 0xe1, 0x54, 0x13, 0x93, 0xfd, 0xf7, 0x06, 0x74, 0x71, + 0xfa, 0x14, 0xa0, 0x5e, 0x65, 0x71, 0x4e, 0x43, 0x2d, 0x8a, 0x14, 0x0e, 0xb3, 0x82, 0x51, 0x7b, + 0xfa, 0x42, 0xa3, 0xf1, 0x58, 0x28, 0x32, 0xfa, 0x96, 0xb6, 0xe0, 0xa8, 0xac, 0xa2, 0x97, 0xdb, + 0xea, 0xc2, 0xa3, 0x70, 0xd8, 0x52, 0x96, 0x51, 0x2d, 0x3a, 0x24, 0xcd, 0x64, 0x33, 0x2a, 0xfb, + 0xc7, 0xf8, 0x50, 0x38, 0x0c, 0xdf, 0x8c, 0x16, 0x7d, 0x23, 0x48, 0x25, 0x03, 0x35, 0x8b, 0x7e, + 0x31, 0x95, 0x48, 0xba, 0xe6, 0xd5, 0xf6, 0x99, 0x5e, 0x05, 0xcd, 0xab, 0xfa, 0xe4, 0xea, 0xd4, + 0x26, 0xd7, 0x26, 0x74, 0x51, 0x4f, 0x11, 0xf4, 0x8b, 0x98, 0xea, 0x35, 0xa6, 0x1e, 0x1b, 0xdd, + 0x6a, 0x6c, 0xe8, 0xde, 0x5d, 0x9a, 0xe0, 0xdd, 0x65, 0xe9, 0xdd, 0xdf, 0x9b, 0x00, 0x3b, 0x24, + 0x76, 0x93, 0x2c, 0x24, 0x51, 0xc6, 0x86, 0xe7, 0x49, 0x4a, 0x3a, 0x57, 0xe3, 0xa9, 0x79, 0xc2, + 0xd4, 0xf3, 0x84, 0x05, 0x73, 0x1c, 0x70, 0xf4, 0x26, 0xff, 0xcd, 0xc0, 0x8c, 0xdd, 0x04, 0xb5, + 0x61, 0x90, 0x4b, 0x9a, 0xe5, 0x01, 0x9a, 0x78, 0x22, 0x73, 0x34, 0x1d, 0x24, 0xd8, 0xe4, 0x2f, + 0xfb, 0xe3, 0x05, 0x4d, 0x0b, 0xd7, 0x75, 0x9d, 0x7b, 0x6e, 0x0d, 0xf6, 0x22, 0xac, 0xa4, 0xf9, + 0x61, 0x39, 0xb8, 0xbd, 0x3c, 0x14, 0xe1, 0x5e, 0xe3, 0x33, 0x50, 0xb1, 0x38, 0x63, 0x8d, 0x30, + 0xd5, 0x94, 0x8c, 0x6a, 0x55, 0x60, 0xbf, 0x6d, 0xc2, 0xca, 0x7e, 0x32, 0x74, 0x23, 0xff, 0xfb, + 0xbc, 0xdc, 0xe4, 0x0b, 0xf8, 0x2c, 0x29, 0x77, 0x03, 0x3a, 0x24, 0x1a, 0x06, 0x7e, 0x7a, 0xbc, + 0x57, 0xe2, 0xa6, 0xb2, 0x54, 0xb0, 0xe7, 0x26, 0x25, 0xe5, 0xa6, 0x96, 0x94, 0xd7, 0xa0, 0x15, + 0xd2, 0x43, 0x3f, 0x28, 0xe2, 0x5e, 0x50, 0x3c, 0xe6, 0x49, 0x40, 0x78, 0x76, 0x96, 0x31, 0x5f, + 0x30, 0xca, 0x44, 0xbd, 0x30, 0x36, 0x51, 0xb7, 0xd5, 0x44, 0xad, 0x03, 0x0f, 0x35, 0xe0, 0x11, + 0xae, 0x8e, 0x84, 0xeb, 0xcf, 0x06, 0xac, 0x94, 0x70, 0x63, 0x0d, 0x3a, 0x11, 0x2e, 0x1b, 0x16, + 0x77, 0xd4, 0x08, 0x14, 0x8b, 0x87, 0xca, 0x63, 0x66, 0xed, 0xf3, 0xb8, 0xc1, 0x35, 0x15, 0x09, + 0x06, 0xf4, 0x01, 0x4d, 0x7d, 0xa5, 0xde, 0x97, 0x34, 0xeb, 0xed, 0x1e, 0x71, 0x15, 0xb0, 0x90, + 0x62, 0xfc, 0x3e, 0x56, 0xdd, 0x18, 0x63, 0x82, 0x62, 0x43, 0xb8, 0x29, 0xf3, 0xe8, 0xcd, 0x47, + 0xf6, 0x7b, 0x06, 0xac, 0x60, 0x7e, 0x50, 0x26, 0xcb, 0x3e, 0xac, 0xd0, 0x4a, 0x14, 0x88, 0x24, + 0xf3, 0xe9, 0x31, 0x49, 0xa2, 0x1a, 0x30, 0x4e, 0x4d, 0xd8, 0x7a, 0x03, 0x2e, 0x7b, 0x15, 0x9c, + 0xee, 0xf9, 0x69, 0xd6, 0x33, 0x37, 0x1a, 0x13, 0x94, 0x56, 0x61, 0x75, 0xc6, 0x2a, 0xb0, 0x7f, + 0x00, 0xbd, 0x83, 0x3c, 0x08, 0x76, 0x49, 0x9a, 0xba, 0x43, 0xb2, 0xf5, 0xb8, 0x4f, 0x46, 0x8c, + 0xef, 0x90, 0x34, 0x66, 0x11, 0x46, 0x92, 0x64, 0x9b, 0x7a, 0x84, 0x1b, 0xdf, 0x74, 0x0a, 0x92, + 0x81, 0x43, 0x92, 0x84, 0x2d, 0x33, 0xa2, 0x0e, 0x42, 0xca, 0xba, 0x06, 0x73, 0x01, 0x33, 0xab, + 0xc1, 0xcd, 0x5a, 0x1f, 0x63, 0xd6, 0x6e, 0x3a, 0xdc, 0x71, 0x33, 0xd7, 0xe1, 0xed, 0xec, 0x10, + 0x3e, 0x36, 0xbe, 0xf7, 0xd1, 0xc4, 0x28, 0x60, 0x95, 0x0a, 0x4f, 0xf5, 0x3e, 0x8d, 0x64, 0x10, + 0xa8, 0x2c, 0x66, 0x76, 0x8a, 0x7a, 0xb8, 0x1d, 0x5d, 0xa7, 0x20, 0xed, 0xcb, 0x60, 0xdd, 0x26, + 0xd9, 0xae, 0xfb, 0xe8, 0x46, 0xe4, 0xed, 0xfa, 0x51, 0x9f, 0x8c, 0x1c, 0x32, 0xb2, 0x6f, 0xc2, + 0xa5, 0x1a, 0x37, 0x8d, 0xf9, 0x6c, 0x71, 0x1f, 0xf5, 0xc9, 0x88, 0x1b, 0xd0, 0x75, 0x04, 0xc5, + 0xf9, 0xbc, 0x95, 0x28, 0x82, 0x04, 0x65, 0x8f, 0x60, 0x99, 0xb9, 0xaa, 0x4f, 0x22, 0x6f, 0x37, + 0x1d, 0x72, 0x15, 0x1b, 0xd0, 0x41, 0x04, 0x76, 0xd3, 0x61, 0x59, 0x55, 0x29, 0x2c, 0xd6, 0x62, + 0x10, 0xf8, 0xcc, 0x25, 0xbc, 0x85, 0x18, 0x8d, 0xc2, 0x62, 0xb1, 0x9b, 0x12, 0xb1, 0xc9, 0x60, + 0x41, 0xdd, 0x70, 0x24, 0x6d, 0xbf, 0xd7, 0x84, 0x79, 0x01, 0x28, 0xdf, 0x25, 0xb2, 0x42, 0x56, + 0xe2, 0x85, 0x14, 0xa6, 0x9c, 0xc1, 0x69, 0xb9, 0x5f, 0x43, 0x4a, 0xdd, 0xe1, 0x35, 0xf4, 0x1d, + 0x5e, 0xc5, 0xa6, 0xb9, 0xba, 0x4d, 0x95, 0x71, 0x35, 0xeb, 0xe3, 0x62, 0x2b, 0x2c, 0x5f, 0x74, + 0x0e, 0x02, 0x37, 0x3b, 0xa2, 0x49, 0x28, 0xea, 0xd2, 0xa6, 0x53, 0xe3, 0xb3, 0x55, 0x1d, 0x79, + 0x32, 0x2d, 0xe3, 0xec, 0xaa, 0x70, 0x59, 0x12, 0x44, 0x4e, 0x91, 0x9e, 0x71, 0x43, 0xa0, 0x33, + 0xd1, 0xb6, 0x34, 0xf5, 0x69, 0xc4, 0x13, 0x04, 0x66, 0x61, 0x95, 0xc5, 0x46, 0x1e, 0xa6, 0xc3, + 0x5b, 0x09, 0x0d, 0xc5, 0xb6, 0xa0, 0x20, 0xf9, 0xc8, 0x69, 0x94, 0x15, 0xc9, 0xa5, 0x83, 0xb2, + 0x0a, 0x8b, 0xc9, 0x0a, 0x92, 0xa7, 0xe0, 0x45, 0xa7, 0x20, 0xad, 0x15, 0x68, 0xa4, 0x64, 0x24, + 0xf2, 0x2a, 0xfb, 0xa9, 0x79, 0x6e, 0x59, 0xf7, 0x5c, 0x65, 0xa1, 0x5c, 0xe1, 0x5f, 0xd5, 0x85, + 0xb2, 0xdc, 0xf3, 0xaf, 0x6a, 0x7b, 0xfe, 0x1b, 0x30, 0x4f, 0x63, 0x16, 0xe7, 0x69, 0xcf, 0xe2, + 0x73, 0xec, 0x33, 0x93, 0xe7, 0xd8, 0xb5, 0x7d, 0x6c, 0x79, 0x33, 0xca, 0x92, 0xc7, 0x4e, 0x21, + 0x67, 0xdd, 0x83, 0x65, 0x7a, 0x74, 0x14, 0xf8, 0x11, 0x39, 0xc8, 0xd3, 0x63, 0x5e, 0xbf, 0x5e, + 0xe2, 0x4b, 0x93, 0x3d, 0x6e, 0x69, 0xd2, 0x5b, 0x3a, 0x55, 0xd1, 0xf5, 0x57, 0x60, 0x51, 0xed, + 0x86, 0xc1, 0x70, 0x42, 0x1e, 0x8b, 0x18, 0x64, 0x3f, 0xd9, 0x92, 0x7c, 0xea, 0x06, 0x39, 0xa6, + 0xb8, 0x05, 0x07, 0x89, 0x57, 0xcc, 0xaf, 0x18, 0xf6, 0xcf, 0x0d, 0x58, 0xae, 0x74, 0xc0, 0x5a, + 0x67, 0x7e, 0x16, 0x10, 0xa1, 0x01, 0x09, 0x56, 0x3e, 0x78, 0x24, 0x1d, 0x88, 0x10, 0xe6, 0xbf, + 0x45, 0x2e, 0x69, 0xc8, 0x4d, 0xa1, 0x0d, 0x8b, 0xfe, 0x7e, 0x9f, 0x29, 0xea, 0xd3, 0x3c, 0xf2, + 0xe4, 0xc1, 0x8e, 0xc2, 0x63, 0x21, 0xe4, 0xef, 0xf7, 0xb7, 0x5c, 0x6f, 0x48, 0xf0, 0xf8, 0xa5, + 0xc9, 0x6d, 0xd2, 0x99, 0xb6, 0x07, 0x0b, 0xf7, 0xfd, 0x38, 0xdd, 0xa6, 0x61, 0xc8, 0x1c, 0xe1, + 0x91, 0x8c, 0x25, 0x3a, 0x83, 0xfb, 0x5b, 0x50, 0x2c, 0x54, 0x3c, 0x72, 0xe4, 0xe6, 0x41, 0xc6, + 0x9a, 0x16, 0x13, 0x57, 0x61, 0xf1, 0x83, 0x87, 0x94, 0x46, 0x3b, 0x28, 0x8d, 0x76, 0x2a, 0x1c, + 0xfb, 0x2f, 0x26, 0xac, 0xf0, 0xed, 0xc1, 0x36, 0x77, 0xbb, 0xc7, 0x85, 0x5e, 0x86, 0x26, 0x9f, + 0x86, 0x22, 0x5b, 0x9c, 0xbd, 0xa5, 0xc0, 0xa6, 0xd6, 0x75, 0x68, 0xd1, 0x98, 0xa7, 0x18, 0xdc, + 0x87, 0x3c, 0x3f, 0x49, 0x48, 0x3f, 0xe3, 0x71, 0x84, 0x94, 0x75, 0x0b, 0x20, 0x2c, 0x33, 0x0a, + 0x2e, 0xdd, 0xd3, 0xea, 0x50, 0x24, 0x19, 0xb8, 0x72, 0x19, 0x96, 0x07, 0x3d, 0x0d, 0x47, 0x67, + 0x5a, 0x7b, 0xb0, 0xc4, 0xcd, 0xde, 0x2f, 0xf6, 0x96, 0xdc, 0x07, 0xd3, 0xf7, 0x58, 0x91, 0xb6, + 0x7f, 0x6d, 0x08, 0x18, 0xd9, 0xd7, 0x3e, 0x41, 0xec, 0x4b, 0x48, 0x8c, 0x99, 0x20, 0x59, 0x87, + 0x85, 0x30, 0x57, 0xb6, 0xba, 0x0d, 0x47, 0xd2, 0xa5, 0x8b, 0x1a, 0x53, 0xbb, 0xc8, 0xfe, 0x8d, + 0x01, 0xbd, 0xd7, 0xa8, 0x1f, 0xf1, 0x0f, 0x37, 0xe2, 0x38, 0x10, 0xa7, 0x91, 0x33, 0xfb, 0xfc, + 0x1b, 0xd0, 0x76, 0x51, 0x4d, 0x94, 0x09, 0xb7, 0x4f, 0xb1, 0x7d, 0x2d, 0x65, 0x94, 0x9d, 0x48, + 0x43, 0xdd, 0x89, 0xd8, 0xef, 0x18, 0xb0, 0x84, 0xa0, 0xbc, 0x9e, 0xfb, 0xd9, 0xcc, 0xf6, 0x6d, + 0xc1, 0xc2, 0x28, 0xf7, 0xb3, 0x19, 0xa2, 0x52, 0xca, 0xd5, 0xe3, 0xa9, 0x31, 0x26, 0x9e, 0xec, + 0x77, 0x0d, 0xb8, 0x52, 0x85, 0xf5, 0xc6, 0x60, 0x40, 0xe2, 0x27, 0x39, 0xa5, 0xb4, 0x9d, 0xd8, + 0x5c, 0x65, 0x27, 0x36, 0xd6, 0x64, 0x87, 0xbc, 0x45, 0x06, 0x4f, 0xaf, 0xc9, 0x3f, 0x36, 0xe1, + 0xe3, 0xb7, 0xe5, 0xc4, 0xbb, 0x9f, 0xb8, 0x51, 0x7a, 0x44, 0x92, 0xe4, 0x09, 0xda, 0x7b, 0x0f, + 0xba, 0x11, 0x79, 0x58, 0xda, 0x24, 0xa6, 0xe3, 0xb4, 0x6a, 0x74, 0xe1, 0xe9, 0xd6, 0x2e, 0xfb, + 0x3f, 0x06, 0xac, 0xa0, 0x9e, 0x6f, 0xfa, 0x83, 0x93, 0x27, 0x38, 0xf8, 0x3d, 0x58, 0x3a, 0xe1, + 0x16, 0x30, 0x6a, 0x86, 0x65, 0xbb, 0x22, 0x3d, 0xe5, 0xf0, 0xff, 0x6b, 0xc0, 0x2a, 0x2a, 0xba, + 0x1b, 0x9d, 0xfa, 0x4f, 0x32, 0x58, 0x0f, 0x60, 0xd9, 0x47, 0x13, 0x66, 0x04, 0xa0, 0x2a, 0x3e, + 0x25, 0x02, 0x7f, 0x34, 0x60, 0x19, 0x35, 0xdd, 0x8c, 0x32, 0x92, 0xcc, 0x3c, 0xfe, 0x3b, 0x6c, + 0x77, 0x9f, 0x25, 0x6e, 0x34, 0xcb, 0x0a, 0xa9, 0x8a, 0x4e, 0xb9, 0x48, 0xbe, 0x63, 0x80, 0xc5, + 0x55, 0xed, 0xf8, 0x69, 0xe8, 0xa7, 0xe9, 0x13, 0x74, 0xdd, 0x74, 0x06, 0xff, 0xd2, 0x84, 0xcb, + 0x8a, 0x96, 0xdd, 0x3c, 0x7b, 0xda, 0x4d, 0xb6, 0x76, 0xa0, 0xcd, 0x6a, 0x04, 0xf5, 0x88, 0x7f, + 0xda, 0x8e, 0x4a, 0x41, 0x56, 0xc5, 0x72, 0xa2, 0x4f, 0x06, 0x34, 0xf2, 0x52, 0x5e, 0x1c, 0x75, + 0x1d, 0x8d, 0xc7, 0x96, 0xa1, 0x75, 0x45, 0xcd, 0xb6, 0x1b, 0x0d, 0x48, 0xf0, 0xcc, 0x40, 0x64, + 0xff, 0xce, 0x80, 0x25, 0x6c, 0xf2, 0xf4, 0x0f, 0x99, 0xe5, 0x7a, 0x0c, 0xe4, 0x0f, 0x8d, 0x97, + 0x58, 0x78, 0xad, 0x29, 0x5a, 0xd4, 0xba, 0xfa, 0xe9, 0x0d, 0xad, 0x3b, 0xd0, 0x19, 0x1c, 0xbb, + 0xd1, 0x70, 0xa6, 0xe0, 0x52, 0x45, 0xed, 0x13, 0x58, 0xc5, 0x4b, 0x0d, 0xa5, 0x3a, 0x63, 0xfb, + 0x7e, 0xd7, 0xc3, 0xad, 0xbc, 0xc1, 0xbb, 0x2f, 0x48, 0xfd, 0xba, 0x4a, 0xbc, 0x48, 0x28, 0xaf, + 0xab, 0xae, 0x02, 0xb8, 0x9e, 0xf7, 0x06, 0x4d, 0x3c, 0x3f, 0x2a, 0x4a, 0x6d, 0x85, 0x63, 0xbf, + 0x06, 0x8b, 0xb7, 0x12, 0x1a, 0xde, 0x57, 0xae, 0x27, 0xce, 0xbc, 0x40, 0x51, 0xaf, 0x36, 0x4c, + 0xfd, 0x6a, 0xc3, 0xfe, 0x1e, 0x7c, 0xb4, 0x66, 0x38, 0xf7, 0xda, 0x36, 0xde, 0xba, 0x14, 0x9d, + 0x08, 0xe7, 0x7d, 0x72, 0x0c, 0x38, 0xaa, 0x2d, 0x8e, 0x26, 0x64, 0xff, 0xc8, 0x80, 0xe7, 0x6a, + 0xea, 0x6f, 0xc4, 0x71, 0x42, 0x4f, 0x45, 0x44, 0x5f, 0x44, 0x37, 0x7a, 0x19, 0x6a, 0x56, 0xcb, + 0xd0, 0xb1, 0x46, 0x68, 0xa5, 0xf3, 0x07, 0x60, 0xc4, 0x6f, 0x0d, 0x58, 0x16, 0x46, 0x78, 0x9e, + 0xe8, 0xf6, 0xcb, 0xd0, 0xc2, 0x1b, 0x5b, 0xd1, 0xe1, 0x73, 0x63, 0x3b, 0x2c, 0x6e, 0x9a, 0x1d, + 0xd1, 0xb8, 0x1e, 0xdb, 0xe6, 0xb8, 0xd8, 0xfe, 0xaa, 0x9c, 0x41, 0x53, 0xdf, 0xa9, 0x0a, 0x01, + 0xfb, 0xdb, 0x45, 0x30, 0xef, 0x90, 0x80, 0x5c, 0x24, 0x46, 0xf6, 0x03, 0x58, 0xe2, 0xd7, 0xc7, + 0x25, 0x06, 0x17, 0xa2, 0xf6, 0x0d, 0x58, 0xe1, 0x6a, 0x2f, 0xdc, 0x5e, 0x39, 0x3b, 0x18, 0x3e, + 0xdb, 0x38, 0xdf, 0x2f, 0x4e, 0xfb, 0x17, 0xe0, 0x52, 0x81, 0xfd, 0x83, 0xd8, 0x93, 0xc7, 0x39, + 0x13, 0x0e, 0xb1, 0xed, 0x2f, 0xc2, 0xda, 0x36, 0x8d, 0x4e, 0x49, 0x92, 0xe2, 0x11, 0x3f, 0x17, + 0x29, 0x24, 0xb4, 0xc9, 0x2f, 0x28, 0xfb, 0x2d, 0x58, 0x57, 0x25, 0xfa, 0x24, 0x3b, 0x48, 0xfc, + 0x53, 0x45, 0x4a, 0x1c, 0xf2, 0x1a, 0xda, 0x21, 0x6f, 0x79, 0x28, 0x6c, 0x6a, 0x87, 0xc2, 0x57, + 0xa0, 0xed, 0xa7, 0x42, 0x01, 0x0f, 0xaa, 0x05, 0xa7, 0x64, 0xd8, 0x7d, 0x58, 0x15, 0x17, 0xba, + 0x07, 0xee, 0xd0, 0x8f, 0x70, 0x05, 0xbc, 0x0a, 0x10, 0xbb, 0xc3, 0xe2, 0x41, 0x07, 0xde, 0x07, + 0x28, 0x1c, 0xf6, 0x3d, 0x3d, 0xa6, 0x0f, 0xc5, 0x77, 0x13, 0xbf, 0x97, 0x1c, 0xfb, 0x5b, 0x60, + 0x39, 0x24, 0x8d, 0x69, 0x94, 0x12, 0x45, 0xeb, 0x06, 0x74, 0xb6, 0xf3, 0x24, 0x21, 0x11, 0xeb, + 0xaa, 0x78, 0xdd, 0xa0, 0xb2, 0x98, 0xde, 0x7e, 0xa9, 0x17, 0xcf, 0x90, 0x15, 0x8e, 0xfd, 0xab, + 0x06, 0xb4, 0xfb, 0xfe, 0x30, 0x72, 0x03, 0x87, 0x8c, 0xac, 0xaf, 0x41, 0x0b, 0x2b, 0x7b, 0xe1, + 0xc6, 0x71, 0x67, 0x9a, 0xd8, 0x1a, 0xb7, 0x30, 0x0e, 0x19, 0xdd, 0xf9, 0x88, 0x23, 0x64, 0xac, + 0xd7, 0xa1, 0x8b, 0xbf, 0xee, 0xe2, 0x49, 0x8d, 0xc8, 0x58, 0x9f, 0x3d, 0x47, 0x89, 0x68, 0x8d, + 0xba, 0x74, 0x0d, 0xcc, 0xa0, 0x01, 0xcf, 0xfc, 0x62, 0xee, 0x4e, 0x36, 0x08, 0x0b, 0x04, 0x61, + 0x10, 0xca, 0x30, 0x69, 0x97, 0x9f, 0x65, 0x88, 0x84, 0x36, 0x59, 0x1a, 0x8f, 0x3c, 0x84, 0x34, + 0xca, 0x30, 0xe9, 0xe3, 0x3c, 0x1a, 0x3e, 0x88, 0xc5, 0x11, 0xdb, 0x64, 0xe9, 0x3b, 0xbc, 0x99, + 0x90, 0x46, 0x19, 0x26, 0x9d, 0xf0, 0x95, 0x95, 0x83, 0x7e, 0x96, 0x34, 0x2e, 0xc0, 0x42, 0x1a, + 0x65, 0xb6, 0xda, 0x30, 0x1f, 0xbb, 0x8f, 0x03, 0xea, 0x7a, 0xf6, 0xdb, 0x0d, 0x80, 0xa2, 0x61, + 0xca, 0xeb, 0x01, 0xcd, 0x45, 0x9b, 0xe7, 0xba, 0x28, 0x0e, 0x1e, 0x2b, 0x4e, 0xea, 0x8f, 0x77, + 0xd2, 0xe7, 0xa6, 0x75, 0x12, 0x6a, 0xab, 0xb8, 0xe9, 0x7a, 0xc5, 0x4d, 0x9b, 0xe7, 0xba, 0x49, + 0x18, 0x25, 0x1c, 0x75, 0xbd, 0xe2, 0xa8, 0xcd, 0x73, 0x1d, 0x25, 0xe4, 0x85, 0xab, 0xae, 0x57, + 0x5c, 0xb5, 0x79, 0xae, 0xab, 0x84, 0xbc, 0x70, 0xd6, 0xf5, 0x8a, 0xb3, 0x36, 0xcf, 0x75, 0x96, + 0x90, 0xaf, 0xbb, 0xeb, 0x5d, 0x13, 0x96, 0x38, 0x64, 0x78, 0x9f, 0x16, 0x1d, 0x51, 0x7e, 0x6c, + 0xce, 0xe1, 0xd2, 0xdf, 0x07, 0xe9, 0x4c, 0xeb, 0xf3, 0xb0, 0x8a, 0x0c, 0xf1, 0x9e, 0x44, 0x5e, + 0x50, 0xb6, 0x9d, 0xfa, 0x07, 0x7e, 0x03, 0x92, 0xa7, 0x19, 0x0d, 0x77, 0xdc, 0xcc, 0x2d, 0x2a, + 0xa3, 0x92, 0xa3, 0xde, 0x4f, 0xcd, 0xd5, 0x5e, 0x20, 0x26, 0x94, 0x86, 0xf2, 0xe2, 0x49, 0x50, + 0x4c, 0x22, 0xf3, 0x43, 0x42, 0xf3, 0x4c, 0x2c, 0x13, 0x05, 0x89, 0x77, 0xf8, 0x9e, 0xef, 0xf2, + 0x5b, 0x1d, 0x71, 0xc1, 0x2d, 0x19, 0x7c, 0x65, 0x2b, 0x6f, 0xa9, 0xc4, 0x0b, 0xc1, 0x92, 0x73, + 0xfe, 0x8d, 0x92, 0xfd, 0x0f, 0x03, 0x2e, 0x1d, 0xb8, 0x49, 0xe6, 0x0f, 0xfc, 0xd8, 0x8d, 0xb2, + 0x5d, 0x92, 0xb9, 0x7c, 0x0c, 0xda, 0x23, 0x21, 0xe3, 0xfd, 0x3d, 0x12, 0x3a, 0x80, 0xe5, 0xa1, + 0x5e, 0x84, 0xbf, 0xcf, 0xfa, 0xb9, 0x2a, 0xae, 0xbd, 0x78, 0x6a, 0xbc, 0xef, 0x17, 0x4f, 0xf6, + 0x4f, 0x4d, 0x58, 0xae, 0x2c, 0x9d, 0xac, 0x1c, 0xc5, 0x42, 0x43, 0xc6, 0x84, 0xa4, 0xad, 0x1b, + 0x00, 0xbe, 0x0c, 0xa3, 0x33, 0xce, 0xa8, 0xf5, 0x58, 0x73, 0x14, 0xa1, 0x71, 0x57, 0x55, 0x8d, + 0x99, 0xaf, 0xaa, 0xd8, 0x16, 0x21, 0x2e, 0x9d, 0x74, 0xc6, 0x16, 0x61, 0x8c, 0x2b, 0x1d, 0x55, + 0xd4, 0xfe, 0x2e, 0xac, 0xd6, 0x56, 0x28, 0x7e, 0x73, 0x45, 0x4f, 0x48, 0x24, 0x6f, 0xae, 0x18, + 0xa1, 0x04, 0xab, 0x59, 0x0d, 0xd6, 0xc0, 0x3f, 0x55, 0x9f, 0x54, 0x0a, 0xd2, 0xfe, 0x99, 0x09, + 0x6b, 0xe3, 0xb3, 0xcb, 0xb3, 0x0a, 0xf7, 0x21, 0xf4, 0x26, 0xad, 0xe4, 0x17, 0x86, 0x7a, 0x19, + 0xdd, 0x32, 0x0f, 0x3f, 0xab, 0x70, 0x5f, 0x2a, 0xa2, 0x5b, 0x49, 0x75, 0xf6, 0x1f, 0x24, 0x3e, + 0xb2, 0xd2, 0x78, 0x46, 0xf1, 0xb1, 0x5e, 0x84, 0x15, 0x1c, 0xa6, 0xf2, 0xb6, 0x01, 0x0b, 0xd7, + 0x1a, 0xbf, 0x5c, 0x29, 0x94, 0xb4, 0x7f, 0x61, 0x31, 0xfb, 0x27, 0xa3, 0xf0, 0x89, 0xac, 0xdf, + 0x3e, 0x54, 0x3e, 0x29, 0x23, 0x4d, 0x29, 0x6a, 0x94, 0x48, 0x93, 0x75, 0xe5, 0xff, 0x23, 0xed, + 0xfc, 0x48, 0x93, 0x58, 0x2a, 0x05, 0x9e, 0xfd, 0x43, 0xe8, 0xee, 0x90, 0x60, 0x37, 0x1d, 0x16, + 0xaf, 0xaa, 0xce, 0x02, 0x72, 0xd2, 0x3f, 0x3b, 0x26, 0xbe, 0xa7, 0xaa, 0xbe, 0xc5, 0x9a, 0xab, + 0xbd, 0xc5, 0xb2, 0xb7, 0x60, 0x49, 0x35, 0x60, 0x96, 0x47, 0x65, 0x5b, 0x57, 0xbe, 0xb3, 0x7e, + 0xed, 0x25, 0xfc, 0x0f, 0xd1, 0xab, 0x35, 0x10, 0x0f, 0x5b, 0xfc, 0x3f, 0x45, 0x5f, 0xfa, 0x5f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0xff, 0x7e, 0x96, 0x66, 0x34, 0x00, 0x00, } diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index ad4de4737..60fdae9d7 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -346,6 +346,12 @@ message GroupCancelMutedTips{ int64 operationTime = 3; } +message GroupMemberInfoSetTips{ + GroupInfo group = 1; + GroupMemberFullInfo opUser = 2; + int64 operationTime = 3; + GroupMemberFullInfo changedUser = 4; +} //////////////////////friend///////////////////// //message FriendInfo{ From 453c6f05bdc077b0c3dae4efb5a6242271dedc51 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 11:52:49 +0800 Subject: [PATCH 44/59] set group member nickname --- config/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 05c56bc6a..6208515ac 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -439,8 +439,8 @@ notification: unreadCount: true offlinePush: switch: false - title: "groupMemberInfoSet title" - desc: "groupMemberInfoSet desc" + title: "groupMemberInfoSet title " + desc: "groupMemberInfoSet desc " ext: "groupMemberInfoSet ext" defaultTips: tips: "group member info set" From 24fe8ab4a44b12a8af88331ea5ea52d71e297567 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 11:53:03 +0800 Subject: [PATCH 45/59] set group member nickname --- config/config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 6208515ac..dae8f7a2f 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -436,11 +436,11 @@ notification: groupMemberInfoSet: conversation: reliabilityLevel: 2 - unreadCount: true + unreadCount: false offlinePush: switch: false - title: "groupMemberInfoSet title " - desc: "groupMemberInfoSet desc " + title: "groupMemberInfoSet title" + desc: "groupMemberInfoSet desc" ext: "groupMemberInfoSet ext" defaultTips: tips: "group member info set" From 472c1a9e3ea35765dc201fb775196c3da5204518 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 13:01:16 +0800 Subject: [PATCH 46/59] set group member nickname --- internal/rpc/group/group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index db8d73162..e71647d55 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -661,7 +661,7 @@ func (s *groupServer) TransferGroupOwner(_ context.Context, req *pbGroup.Transfe return &pbGroup.TransferGroupOwnerResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrArgs.ErrCode, ErrMsg: constant.ErrArgs.ErrMsg}}, nil } groupMemberInfo := db.GroupMember{GroupID: req.GroupID, UserID: req.OldOwnerUserID, RoleLevel: constant.GroupOrdinaryUsers} - err := imdb.UpdateGroupMemberInfo(groupMemberInfo) + err = imdb.UpdateGroupMemberInfo(groupMemberInfo) if err != nil { log.NewError(req.OperationID, "UpdateGroupMemberInfo failed ", groupMemberInfo) return &pbGroup.TransferGroupOwnerResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}}, nil From c59dc129a8e5c13b241ea5974dedfcb8c1001598 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 14:27:12 +0800 Subject: [PATCH 47/59] /user/get_users_online_status --- cmd/open_im_api/main.go | 8 ++-- internal/api/manage/management_user.go | 8 +++- internal/api/user/user.go | 62 ++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 122f4d055..bbeb522e3 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -38,9 +38,10 @@ func main() { // user routing group, which handles user registration and login services userRouterGroup := r.Group("/user") { - userRouterGroup.POST("/update_user_info", user.UpdateUserInfo) //1 - userRouterGroup.POST("/get_users_info", user.GetUsersInfo) //1 - userRouterGroup.POST("/get_self_user_info", user.GetSelfUserInfo) //1 + userRouterGroup.POST("/update_user_info", user.UpdateUserInfo) //1 + userRouterGroup.POST("/get_users_info", user.GetUsersInfo) //1 + userRouterGroup.POST("/get_self_user_info", user.GetSelfUserInfo) //1 + userRouterGroup.POST("/get_users_online_status", user.GetUsersOnlineStatus) //1 } //friend routing group friendRouterGroup := r.Group("/friend") @@ -86,6 +87,7 @@ func main() { groupRouterGroup.POST("/cancel_mute_group", group.CancelMuteGroup) groupRouterGroup.POST("/set_group_member_nickname", group.SetGroupMemberNickname) + } //certificate authRouterGroup := r.Group("/auth") diff --git a/internal/api/manage/management_user.go b/internal/api/manage/management_user.go index 5bcc19be0..1ff802cc4 100644 --- a/internal/api/manage/management_user.go +++ b/internal/api/manage/management_user.go @@ -118,6 +118,7 @@ func AccountCheck(c *gin.Context) { log.NewInfo(req.OperationID, "AccountCheck api return", resp) c.JSON(http.StatusOK, resp) } + func GetUsersOnlineStatus(c *gin.Context) { params := api.GetUsersOnlineStatusReq{} if err := c.BindJSON(¶ms); err != nil { @@ -133,6 +134,12 @@ func GetUsersOnlineStatus(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"}) return } + if len(config.Config.Manager.AppManagerUid) == 0 { + log.NewError(req.OperationID, "Manager == 0") + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "Manager == 0"}) + return + } + req.OpUserID = config.Config.Manager.AppManagerUid[0] log.NewInfo(params.OperationID, "GetUsersOnlineStatus args ", req.String()) var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult var respResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult @@ -176,5 +183,4 @@ func GetUsersOnlineStatus(c *gin.Context) { } log.NewInfo(req.OperationID, "GetUsersOnlineStatus api return", resp) c.JSON(http.StatusOK, resp) - } diff --git a/internal/api/user/user.go b/internal/api/user/user.go index 1756a9f8d..b3abbbab4 100644 --- a/internal/api/user/user.go +++ b/internal/api/user/user.go @@ -4,9 +4,11 @@ import ( jsonData "Open_IM/internal/utils" api "Open_IM/pkg/base_info" "Open_IM/pkg/common/config" + "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" "Open_IM/pkg/grpc-etcdv3/getcdv3" + pbRelay "Open_IM/pkg/proto/relay" open_im_sdk "Open_IM/pkg/proto/sdk_ws" rpc "Open_IM/pkg/proto/user" "Open_IM/pkg/utils" @@ -127,3 +129,63 @@ func GetSelfUserInfo(c *gin.Context) { } } + +func GetUsersOnlineStatus(c *gin.Context) { + params := api.GetUsersOnlineStatusReq{} + if err := c.BindJSON(¶ms); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) + return + } + req := &pbRelay.GetUsersOnlineStatusReq{} + utils.CopyStructFields(req, ¶ms) + var ok bool + ok, req.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), req.OperationID) + if !ok { + log.NewError(req.OperationID, "GetUserIDFromToken false ", c.Request.Header.Get("token")) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "GetUserIDFromToken failed"}) + return + } + log.NewInfo(params.OperationID, "GetUsersOnlineStatus args ", req.String()) + var wsResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult + var respResult []*pbRelay.GetUsersOnlineStatusResp_SuccessResult + flag := false + grpcCons := getcdv3.GetConn4Unique(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOnlineMessageRelayName) + for _, v := range grpcCons { + client := pbRelay.NewOnlineMessageRelayServiceClient(v) + reply, err := client.GetUsersOnlineStatus(context.Background(), req) + if err != nil { + log.NewError(params.OperationID, "GetUsersOnlineStatus rpc err", req.String(), err.Error()) + continue + } else { + if reply.ErrCode == 0 { + wsResult = append(wsResult, reply.SuccessResult...) + } + } + } + log.NewInfo(params.OperationID, "call GetUsersOnlineStatus rpc server is success", wsResult) + //Online data merge of each node + for _, v1 := range params.UserIDList { + flag = false + temp := new(pbRelay.GetUsersOnlineStatusResp_SuccessResult) + for _, v2 := range wsResult { + if v2.UserID == v1 { + flag = true + temp.UserID = v1 + temp.Status = constant.OnlineStatus + temp.DetailPlatformStatus = append(temp.DetailPlatformStatus, v2.DetailPlatformStatus...) + } + + } + if !flag { + temp.UserID = v1 + temp.Status = constant.OfflineStatus + } + respResult = append(respResult, temp) + } + resp := api.GetUsersOnlineStatusResp{CommResp: api.CommResp{ErrCode: 0, ErrMsg: ""}, SuccessResult: respResult} + if len(respResult) == 0 { + resp.SuccessResult = []*pbRelay.GetUsersOnlineStatusResp_SuccessResult{} + } + log.NewInfo(req.OperationID, "GetUsersOnlineStatus api return", resp) + c.JSON(http.StatusOK, resp) +} From f6b30ed0c68d1a230aacc9f96e47812cd2b8b00d Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 15:45:44 +0800 Subject: [PATCH 48/59] organization --- internal/api/organization/organization.go | 2 +- internal/rpc/organization/organization.go | 6 +- pkg/base_info/organization_api_struct.go | 2 +- pkg/common/constant/constant.go | 2 + pkg/proto/organization/organization.pb.go | 148 +++---- pkg/proto/organization/organization.proto | 2 +- pkg/proto/sdk_ws/ws.pb.go | 451 +++++++++++----------- pkg/proto/sdk_ws/ws.proto | 12 +- 8 files changed, 314 insertions(+), 311 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 714b26a7e..4bcd140f4 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -227,7 +227,7 @@ func UpdateOrganizationUser(c *gin.Context) { } func CreateDepartmentMember(c *gin.Context) { - params := api.CreateDepartmentMemberReq{UserInDepartment: &open_im_sdk.UserInDepartment{}} + params := api.CreateDepartmentMemberReq{} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index 98994269a..014e2b710 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -219,9 +219,10 @@ func (s *organizationServer) CreateDepartmentMember(ctx context.Context, req *rp log.Error(req.OperationID, errMsg) return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil } + departmentMember := db.DepartmentMember{} - utils.CopyStructFields(&departmentMember, req.UserInDepartment) - log.Debug(req.OperationID, "src ", *req.UserInDepartment, "dst ", departmentMember) + utils.CopyStructFields(&departmentMember, req.DepartmentMember) + log.Debug(req.OperationID, "src ", *req.DepartmentMember, "dst ", departmentMember) err := imdb.CreateDepartmentMember(&departmentMember) if err != nil { errMsg := req.OperationID + " " + "CreateDepartmentMember failed " + err.Error() @@ -229,6 +230,7 @@ func (s *organizationServer) CreateDepartmentMember(ctx context.Context, req *rp return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil } log.Debug(req.OperationID, "UpdateOrganizationUser ", departmentMember) + resp := &rpc.CreateDepartmentMemberResp{} log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", *resp) return resp, nil diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index ac80f82df..87d026f10 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -57,7 +57,7 @@ type UpdateOrganizationUserResp struct { type CreateDepartmentMemberReq struct { OperationID string `json:"operationID" binding:"required"` - *open_im_sdk.UserInDepartment + *open_im_sdk.DepartmentMember } type CreateDepartmentMemberResp struct { diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go index 291049a14..a30d1c222 100644 --- a/pkg/common/constant/constant.go +++ b/pkg/common/constant/constant.go @@ -89,6 +89,8 @@ const ( ConversationPrivateChatNotification = 1701 + OrganizationChangedNotification = 1801 + NotificationEnd = 2000 //status diff --git a/pkg/proto/organization/organization.pb.go b/pkg/proto/organization/organization.pb.go index 844dfd947..7da1cd816 100644 --- a/pkg/proto/organization/organization.pb.go +++ b/pkg/proto/organization/organization.pb.go @@ -37,7 +37,7 @@ func (m *CreateDepartmentReq) Reset() { *m = CreateDepartmentReq{} } func (m *CreateDepartmentReq) String() string { return proto.CompactTextString(m) } func (*CreateDepartmentReq) ProtoMessage() {} func (*CreateDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{0} + return fileDescriptor_organization_4c9882c006c04fab, []int{0} } func (m *CreateDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateDepartmentReq.Unmarshal(m, b) @@ -91,7 +91,7 @@ func (m *CreateDepartmentResp) Reset() { *m = CreateDepartmentResp{} } func (m *CreateDepartmentResp) String() string { return proto.CompactTextString(m) } func (*CreateDepartmentResp) ProtoMessage() {} func (*CreateDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{1} + return fileDescriptor_organization_4c9882c006c04fab, []int{1} } func (m *CreateDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateDepartmentResp.Unmarshal(m, b) @@ -145,7 +145,7 @@ func (m *UpdateDepartmentReq) Reset() { *m = UpdateDepartmentReq{} } func (m *UpdateDepartmentReq) String() string { return proto.CompactTextString(m) } func (*UpdateDepartmentReq) ProtoMessage() {} func (*UpdateDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{2} + return fileDescriptor_organization_4c9882c006c04fab, []int{2} } func (m *UpdateDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateDepartmentReq.Unmarshal(m, b) @@ -198,7 +198,7 @@ func (m *UpdateDepartmentResp) Reset() { *m = UpdateDepartmentResp{} } func (m *UpdateDepartmentResp) String() string { return proto.CompactTextString(m) } func (*UpdateDepartmentResp) ProtoMessage() {} func (*UpdateDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{3} + return fileDescriptor_organization_4c9882c006c04fab, []int{3} } func (m *UpdateDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateDepartmentResp.Unmarshal(m, b) @@ -245,7 +245,7 @@ func (m *GetSubDepartmentReq) Reset() { *m = GetSubDepartmentReq{} } func (m *GetSubDepartmentReq) String() string { return proto.CompactTextString(m) } func (*GetSubDepartmentReq) ProtoMessage() {} func (*GetSubDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{4} + return fileDescriptor_organization_4c9882c006c04fab, []int{4} } func (m *GetSubDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSubDepartmentReq.Unmarshal(m, b) @@ -299,7 +299,7 @@ func (m *GetSubDepartmentResp) Reset() { *m = GetSubDepartmentResp{} } func (m *GetSubDepartmentResp) String() string { return proto.CompactTextString(m) } func (*GetSubDepartmentResp) ProtoMessage() {} func (*GetSubDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{5} + return fileDescriptor_organization_4c9882c006c04fab, []int{5} } func (m *GetSubDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSubDepartmentResp.Unmarshal(m, b) @@ -353,7 +353,7 @@ func (m *DeleteDepartmentReq) Reset() { *m = DeleteDepartmentReq{} } func (m *DeleteDepartmentReq) String() string { return proto.CompactTextString(m) } func (*DeleteDepartmentReq) ProtoMessage() {} func (*DeleteDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{6} + return fileDescriptor_organization_4c9882c006c04fab, []int{6} } func (m *DeleteDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteDepartmentReq.Unmarshal(m, b) @@ -406,7 +406,7 @@ func (m *DeleteDepartmentResp) Reset() { *m = DeleteDepartmentResp{} } func (m *DeleteDepartmentResp) String() string { return proto.CompactTextString(m) } func (*DeleteDepartmentResp) ProtoMessage() {} func (*DeleteDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{7} + return fileDescriptor_organization_4c9882c006c04fab, []int{7} } func (m *DeleteDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteDepartmentResp.Unmarshal(m, b) @@ -453,7 +453,7 @@ func (m *CreateOrganizationUserReq) Reset() { *m = CreateOrganizationUse func (m *CreateOrganizationUserReq) String() string { return proto.CompactTextString(m) } func (*CreateOrganizationUserReq) ProtoMessage() {} func (*CreateOrganizationUserReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{8} + return fileDescriptor_organization_4c9882c006c04fab, []int{8} } func (m *CreateOrganizationUserReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateOrganizationUserReq.Unmarshal(m, b) @@ -506,7 +506,7 @@ func (m *CreateOrganizationUserResp) Reset() { *m = CreateOrganizationUs func (m *CreateOrganizationUserResp) String() string { return proto.CompactTextString(m) } func (*CreateOrganizationUserResp) ProtoMessage() {} func (*CreateOrganizationUserResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{9} + return fileDescriptor_organization_4c9882c006c04fab, []int{9} } func (m *CreateOrganizationUserResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateOrganizationUserResp.Unmarshal(m, b) @@ -553,7 +553,7 @@ func (m *UpdateOrganizationUserReq) Reset() { *m = UpdateOrganizationUse func (m *UpdateOrganizationUserReq) String() string { return proto.CompactTextString(m) } func (*UpdateOrganizationUserReq) ProtoMessage() {} func (*UpdateOrganizationUserReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{10} + return fileDescriptor_organization_4c9882c006c04fab, []int{10} } func (m *UpdateOrganizationUserReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateOrganizationUserReq.Unmarshal(m, b) @@ -606,7 +606,7 @@ func (m *UpdateOrganizationUserResp) Reset() { *m = UpdateOrganizationUs func (m *UpdateOrganizationUserResp) String() string { return proto.CompactTextString(m) } func (*UpdateOrganizationUserResp) ProtoMessage() {} func (*UpdateOrganizationUserResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{11} + return fileDescriptor_organization_4c9882c006c04fab, []int{11} } func (m *UpdateOrganizationUserResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateOrganizationUserResp.Unmarshal(m, b) @@ -641,7 +641,7 @@ func (m *UpdateOrganizationUserResp) GetErrMsg() string { } type CreateDepartmentMemberReq struct { - UserInDepartment *sdk_ws.UserInDepartment `protobuf:"bytes,1,opt,name=userInDepartment" json:"userInDepartment,omitempty"` + DepartmentMember *sdk_ws.DepartmentMember `protobuf:"bytes,1,opt,name=departmentMember" json:"departmentMember,omitempty"` OperationID string `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"` OpUserID string `protobuf:"bytes,3,opt,name=opUserID" json:"opUserID,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -653,7 +653,7 @@ func (m *CreateDepartmentMemberReq) Reset() { *m = CreateDepartmentMembe func (m *CreateDepartmentMemberReq) String() string { return proto.CompactTextString(m) } func (*CreateDepartmentMemberReq) ProtoMessage() {} func (*CreateDepartmentMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{12} + return fileDescriptor_organization_4c9882c006c04fab, []int{12} } func (m *CreateDepartmentMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateDepartmentMemberReq.Unmarshal(m, b) @@ -673,9 +673,9 @@ func (m *CreateDepartmentMemberReq) XXX_DiscardUnknown() { var xxx_messageInfo_CreateDepartmentMemberReq proto.InternalMessageInfo -func (m *CreateDepartmentMemberReq) GetUserInDepartment() *sdk_ws.UserInDepartment { +func (m *CreateDepartmentMemberReq) GetDepartmentMember() *sdk_ws.DepartmentMember { if m != nil { - return m.UserInDepartment + return m.DepartmentMember } return nil } @@ -706,7 +706,7 @@ func (m *CreateDepartmentMemberResp) Reset() { *m = CreateDepartmentMemb func (m *CreateDepartmentMemberResp) String() string { return proto.CompactTextString(m) } func (*CreateDepartmentMemberResp) ProtoMessage() {} func (*CreateDepartmentMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{13} + return fileDescriptor_organization_4c9882c006c04fab, []int{13} } func (m *CreateDepartmentMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateDepartmentMemberResp.Unmarshal(m, b) @@ -753,7 +753,7 @@ func (m *GetUserInDepartmentReq) Reset() { *m = GetUserInDepartmentReq{} func (m *GetUserInDepartmentReq) String() string { return proto.CompactTextString(m) } func (*GetUserInDepartmentReq) ProtoMessage() {} func (*GetUserInDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{14} + return fileDescriptor_organization_4c9882c006c04fab, []int{14} } func (m *GetUserInDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserInDepartmentReq.Unmarshal(m, b) @@ -807,7 +807,7 @@ func (m *GetUserInDepartmentResp) Reset() { *m = GetUserInDepartmentResp func (m *GetUserInDepartmentResp) String() string { return proto.CompactTextString(m) } func (*GetUserInDepartmentResp) ProtoMessage() {} func (*GetUserInDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{15} + return fileDescriptor_organization_4c9882c006c04fab, []int{15} } func (m *GetUserInDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserInDepartmentResp.Unmarshal(m, b) @@ -861,7 +861,7 @@ func (m *UpdateUserInDepartmentReq) Reset() { *m = UpdateUserInDepartmen func (m *UpdateUserInDepartmentReq) String() string { return proto.CompactTextString(m) } func (*UpdateUserInDepartmentReq) ProtoMessage() {} func (*UpdateUserInDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{16} + return fileDescriptor_organization_4c9882c006c04fab, []int{16} } func (m *UpdateUserInDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateUserInDepartmentReq.Unmarshal(m, b) @@ -914,7 +914,7 @@ func (m *UpdateUserInDepartmentResp) Reset() { *m = UpdateUserInDepartme func (m *UpdateUserInDepartmentResp) String() string { return proto.CompactTextString(m) } func (*UpdateUserInDepartmentResp) ProtoMessage() {} func (*UpdateUserInDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{17} + return fileDescriptor_organization_4c9882c006c04fab, []int{17} } func (m *UpdateUserInDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateUserInDepartmentResp.Unmarshal(m, b) @@ -962,7 +962,7 @@ func (m *DeleteUserInDepartmentReq) Reset() { *m = DeleteUserInDepartmen func (m *DeleteUserInDepartmentReq) String() string { return proto.CompactTextString(m) } func (*DeleteUserInDepartmentReq) ProtoMessage() {} func (*DeleteUserInDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{18} + return fileDescriptor_organization_4c9882c006c04fab, []int{18} } func (m *DeleteUserInDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteUserInDepartmentReq.Unmarshal(m, b) @@ -1022,7 +1022,7 @@ func (m *DeleteUserInDepartmentResp) Reset() { *m = DeleteUserInDepartme func (m *DeleteUserInDepartmentResp) String() string { return proto.CompactTextString(m) } func (*DeleteUserInDepartmentResp) ProtoMessage() {} func (*DeleteUserInDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{19} + return fileDescriptor_organization_4c9882c006c04fab, []int{19} } func (m *DeleteUserInDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteUserInDepartmentResp.Unmarshal(m, b) @@ -1069,7 +1069,7 @@ func (m *DeleteOrganizationUserReq) Reset() { *m = DeleteOrganizationUse func (m *DeleteOrganizationUserReq) String() string { return proto.CompactTextString(m) } func (*DeleteOrganizationUserReq) ProtoMessage() {} func (*DeleteOrganizationUserReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{20} + return fileDescriptor_organization_4c9882c006c04fab, []int{20} } func (m *DeleteOrganizationUserReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteOrganizationUserReq.Unmarshal(m, b) @@ -1122,7 +1122,7 @@ func (m *DeleteOrganizationUserResp) Reset() { *m = DeleteOrganizationUs func (m *DeleteOrganizationUserResp) String() string { return proto.CompactTextString(m) } func (*DeleteOrganizationUserResp) ProtoMessage() {} func (*DeleteOrganizationUserResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{21} + return fileDescriptor_organization_4c9882c006c04fab, []int{21} } func (m *DeleteOrganizationUserResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteOrganizationUserResp.Unmarshal(m, b) @@ -1169,7 +1169,7 @@ func (m *GetDepartmentMemberReq) Reset() { *m = GetDepartmentMemberReq{} func (m *GetDepartmentMemberReq) String() string { return proto.CompactTextString(m) } func (*GetDepartmentMemberReq) ProtoMessage() {} func (*GetDepartmentMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{22} + return fileDescriptor_organization_4c9882c006c04fab, []int{22} } func (m *GetDepartmentMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDepartmentMemberReq.Unmarshal(m, b) @@ -1223,7 +1223,7 @@ func (m *GetDepartmentMemberResp) Reset() { *m = GetDepartmentMemberResp func (m *GetDepartmentMemberResp) String() string { return proto.CompactTextString(m) } func (*GetDepartmentMemberResp) ProtoMessage() {} func (*GetDepartmentMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_a03f9a4144ed1081, []int{23} + return fileDescriptor_organization_4c9882c006c04fab, []int{23} } func (m *GetDepartmentMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDepartmentMemberResp.Unmarshal(m, b) @@ -1727,54 +1727,54 @@ var _Organization_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("organization/organization.proto", fileDescriptor_organization_a03f9a4144ed1081) + proto.RegisterFile("organization/organization.proto", fileDescriptor_organization_4c9882c006c04fab) } -var fileDescriptor_organization_a03f9a4144ed1081 = []byte{ - // 713 bytes of a gzipped FileDescriptorProto +var fileDescriptor_organization_4c9882c006c04fab = []byte{ + // 708 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4f, 0x6f, 0x12, 0x41, - 0x14, 0xcf, 0x8a, 0x56, 0xfb, 0xda, 0x18, 0x32, 0x25, 0x48, 0xd7, 0x34, 0xd2, 0xd5, 0x46, 0x4e, - 0x90, 0xd4, 0xa3, 0x37, 0x8b, 0x69, 0x49, 0xac, 0x24, 0x18, 0x62, 0xf0, 0x42, 0x96, 0x30, 0x12, - 0x82, 0xec, 0x0e, 0x33, 0x8b, 0x24, 0xfd, 0x12, 0x9e, 0xbc, 0x18, 0x8f, 0x9e, 0xfc, 0x34, 0x7e, - 0x24, 0xb3, 0xbb, 0x94, 0x0e, 0x6f, 0xde, 0x52, 0x5c, 0x16, 0xa3, 0xc7, 0x19, 0x66, 0xde, 0xef, - 0xbd, 0xdf, 0xfb, 0x33, 0x3f, 0x16, 0x9e, 0xf8, 0x72, 0xe0, 0x7a, 0xc3, 0x2b, 0x37, 0x18, 0xfa, - 0x5e, 0x4d, 0x5f, 0x54, 0x85, 0xf4, 0x03, 0x9f, 0xed, 0xeb, 0x7b, 0xf6, 0x71, 0x53, 0x70, 0xaf, - 0xdb, 0xb8, 0xac, 0x89, 0xd1, 0xa0, 0x16, 0x1d, 0xa8, 0xa9, 0xfe, 0xa8, 0x3b, 0x53, 0xb5, 0x99, - 0x8a, 0x2f, 0x38, 0xdf, 0x2c, 0x38, 0x38, 0x93, 0xdc, 0x0d, 0x78, 0x9d, 0x0b, 0x57, 0x06, 0x63, - 0xee, 0x05, 0x2d, 0x3e, 0x61, 0xaf, 0xe1, 0x61, 0x7f, 0xb1, 0xd1, 0xf0, 0x3e, 0xfa, 0x25, 0xab, - 0x6c, 0x55, 0xf6, 0x4e, 0x8f, 0xaa, 0x8a, 0xcb, 0xcf, 0x5c, 0x76, 0x5d, 0x31, 0xec, 0x0a, 0x57, - 0xba, 0x63, 0x55, 0xd5, 0x6e, 0xa2, 0x4b, 0xac, 0x0c, 0x7b, 0xbe, 0xe0, 0x32, 0x72, 0xa7, 0x51, - 0x2f, 0xdd, 0x29, 0x5b, 0x95, 0xdd, 0x96, 0xbe, 0xc5, 0x6c, 0x78, 0xe0, 0x8b, 0xb6, 0xe2, 0xb2, - 0x51, 0x2f, 0xe5, 0xa2, 0x9f, 0x17, 0x6b, 0xe7, 0x8b, 0x05, 0x05, 0xd3, 0x39, 0x25, 0x58, 0x09, - 0xee, 0x73, 0x29, 0xcf, 0xfc, 0x3e, 0x8f, 0xdc, 0xba, 0xd7, 0xba, 0x5e, 0xb2, 0x22, 0xec, 0x70, - 0x29, 0x2f, 0xd5, 0x60, 0x8e, 0x35, 0x5f, 0x11, 0xf1, 0xe4, 0x52, 0xc4, 0x13, 0xd1, 0xd5, 0x16, - 0xfd, 0x7f, 0x93, 0xae, 0x0b, 0x28, 0x98, 0xbe, 0xa5, 0x61, 0xcb, 0x99, 0xc1, 0xc1, 0x39, 0x0f, - 0xde, 0x4d, 0x7b, 0xcb, 0x51, 0x3a, 0xb0, 0xaf, 0x39, 0x5c, 0x8f, 0xac, 0xed, 0xb6, 0x96, 0xf6, - 0x32, 0xc8, 0xb8, 0x89, 0xbc, 0x79, 0xc6, 0xdf, 0x0c, 0x55, 0x50, 0xca, 0x95, 0x73, 0x7f, 0x94, - 0x92, 0xf0, 0x52, 0x48, 0x45, 0x9d, 0x7f, 0xe2, 0x38, 0xe1, 0xdb, 0xa7, 0xe2, 0x02, 0x0a, 0x26, - 0x70, 0xaa, 0x6c, 0xfe, 0xb4, 0xe0, 0x30, 0x6e, 0xa3, 0xa6, 0x36, 0x1d, 0x42, 0x98, 0x30, 0x92, - 0x26, 0xe4, 0x7d, 0xb4, 0x3d, 0x2f, 0xde, 0xa7, 0x04, 0x53, 0x86, 0x05, 0xe3, 0xf2, 0x86, 0x61, - 0xbf, 0x05, 0x3b, 0xc9, 0xd7, 0xd4, 0xc1, 0xc7, 0x5d, 0xf1, 0x7f, 0x04, 0x9f, 0xe4, 0xeb, 0x86, - 0x99, 0xbf, 0x29, 0xa2, 0x4b, 0x3e, 0xee, 0x2d, 0x82, 0x9f, 0x86, 0xb8, 0xde, 0xcd, 0x8f, 0x2b, - 0x82, 0x6f, 0xa3, 0xa3, 0x2d, 0xe3, 0x72, 0x56, 0x99, 0x37, 0x7d, 0x4d, 0x15, 0xbc, 0x07, 0xc5, - 0x73, 0x1e, 0x18, 0x6e, 0xf3, 0x49, 0x78, 0x63, 0x1a, 0xfb, 0x10, 0xb7, 0xed, 0x7c, 0xb5, 0xa1, - 0xff, 0xdf, 0x2d, 0x78, 0x44, 0x02, 0xa6, 0x1a, 0x5f, 0x54, 0x72, 0x72, 0x1b, 0x24, 0x47, 0x6b, - 0x04, 0x8a, 0x92, 0x26, 0xe4, 0xfb, 0x88, 0xf6, 0x15, 0xb5, 0x60, 0x64, 0xc8, 0xb8, 0x9c, 0x55, - 0x23, 0x64, 0xc3, 0xa6, 0xf3, 0xd5, 0x82, 0xc3, 0x78, 0x9a, 0xfe, 0xb5, 0x7a, 0x30, 0x9e, 0x88, - 0xbb, 0xe6, 0x13, 0x11, 0xc6, 0x99, 0xe4, 0x56, 0xaa, 0x38, 0x27, 0xd7, 0x61, 0x52, 0xc3, 0x6e, - 0x3b, 0x65, 0xbf, 0x08, 0x21, 0xa3, 0x99, 0x75, 0x15, 0xb5, 0x2d, 0x35, 0xaf, 0xb6, 0xff, 0xe6, - 0xfe, 0x88, 0x5b, 0x38, 0x9b, 0x01, 0xc4, 0xde, 0x43, 0x01, 0x77, 0xa1, 0xa6, 0x43, 0xd6, 0x6a, - 0x63, 0xd2, 0xc0, 0xe9, 0xaf, 0x5d, 0x58, 0x12, 0xfa, 0xac, 0x03, 0x79, 0x3c, 0x3a, 0xd9, 0x71, - 0x75, 0xe9, 0xff, 0x01, 0x21, 0xf2, 0x6d, 0xe7, 0xb6, 0x23, 0x4a, 0x84, 0xa6, 0xb1, 0xa8, 0xc4, - 0xa6, 0x09, 0x41, 0x8c, 0x4d, 0x93, 0xba, 0xb4, 0x03, 0x79, 0xac, 0xf5, 0xb0, 0x69, 0x42, 0x85, - 0x62, 0xd3, 0xa4, 0x5c, 0xec, 0x40, 0x1e, 0x8b, 0x27, 0x6c, 0x9a, 0x50, 0x75, 0xd8, 0x34, 0xa9, - 0xbf, 0x46, 0x50, 0xa4, 0x05, 0x0a, 0x7b, 0x4e, 0xd1, 0x49, 0x34, 0xa2, 0x5d, 0x59, 0xef, 0x60, - 0x0c, 0x46, 0x0b, 0x02, 0x0c, 0x96, 0x28, 0x71, 0x30, 0xd8, 0x0a, 0x7d, 0x31, 0x82, 0x22, 0xdd, - 0xc9, 0x18, 0x2c, 0x71, 0xc4, 0x60, 0xb0, 0x15, 0x83, 0x61, 0x41, 0x23, 0x6e, 0x36, 0x9a, 0x46, - 0x62, 0x1e, 0xd0, 0x34, 0x92, 0xbd, 0xdb, 0x8b, 0xfe, 0xcf, 0xe0, 0xee, 0x62, 0xcf, 0x8c, 0x4a, - 0x22, 0x5e, 0x07, 0xfb, 0x64, 0x8d, 0x53, 0x3a, 0x7b, 0x06, 0x0c, 0xc9, 0x1e, 0x85, 0x54, 0x59, - 0xef, 0xa0, 0x5e, 0x17, 0xb7, 0x81, 0x25, 0xbe, 0xf8, 0x74, 0x5d, 0x90, 0x60, 0x31, 0x7b, 0x46, - 0x9e, 0x4c, 0xf6, 0xa8, 0x24, 0x9d, 0xac, 0x71, 0x4a, 0x89, 0x57, 0x47, 0x1f, 0x1e, 0x57, 0x97, - 0x3e, 0x68, 0xbc, 0xd4, 0x17, 0xbd, 0x9d, 0xe8, 0x6b, 0xc5, 0x8b, 0xdf, 0x01, 0x00, 0x00, 0xff, - 0xff, 0x33, 0x0d, 0x37, 0x72, 0x01, 0x11, 0x00, 0x00, + 0x14, 0xcf, 0x8a, 0x56, 0x79, 0x6d, 0x0c, 0x99, 0x12, 0xa4, 0x6b, 0x1a, 0x29, 0xda, 0xc8, 0x09, + 0x92, 0x7a, 0xf4, 0x66, 0x31, 0x2d, 0x89, 0x48, 0x82, 0x69, 0x0c, 0x5e, 0xc8, 0x12, 0x46, 0x42, + 0x90, 0xdd, 0xe9, 0xcc, 0x22, 0x49, 0xbf, 0x84, 0x27, 0x2f, 0xc6, 0xa3, 0x27, 0x3f, 0x8d, 0x1f, + 0xc9, 0xec, 0x2e, 0xc5, 0xd9, 0x37, 0x6f, 0xe9, 0xba, 0x80, 0xa9, 0xc7, 0x19, 0x66, 0xde, 0xef, + 0xbd, 0xdf, 0xfb, 0x33, 0x3f, 0x16, 0x9e, 0x78, 0x72, 0xe4, 0xb8, 0xe3, 0x2b, 0xc7, 0x1f, 0x7b, + 0x6e, 0x43, 0x5f, 0xd4, 0x85, 0xf4, 0x7c, 0x8f, 0xed, 0xe9, 0x7b, 0xf6, 0x51, 0x47, 0x70, 0xb7, + 0xdf, 0x6a, 0x37, 0xc4, 0x64, 0xd4, 0x08, 0x0f, 0x34, 0xd4, 0x70, 0xd2, 0x9f, 0xab, 0xc6, 0x5c, + 0x45, 0x17, 0xaa, 0xdf, 0x2c, 0xd8, 0x3f, 0x95, 0xdc, 0xf1, 0x79, 0x93, 0x0b, 0x47, 0xfa, 0x53, + 0xee, 0xfa, 0x5d, 0x7e, 0xc9, 0x5e, 0xc3, 0xc3, 0xe1, 0x72, 0xa3, 0xe5, 0x7e, 0xf4, 0xca, 0x56, + 0xc5, 0xaa, 0xed, 0x9e, 0x1c, 0xd6, 0x15, 0x97, 0x9f, 0xb9, 0xec, 0x3b, 0x62, 0xdc, 0x17, 0x8e, + 0x74, 0xa6, 0xaa, 0xae, 0xdd, 0x44, 0x97, 0x58, 0x05, 0x76, 0x3d, 0xc1, 0x65, 0xe8, 0x4e, 0xab, + 0x59, 0xbe, 0x53, 0xb1, 0x6a, 0xf9, 0xae, 0xbe, 0xc5, 0x6c, 0x78, 0xe0, 0x89, 0x0b, 0xc5, 0x65, + 0xab, 0x59, 0xce, 0x85, 0x3f, 0x2f, 0xd7, 0xd5, 0x2f, 0x16, 0x14, 0x4d, 0xe7, 0x94, 0x60, 0x65, + 0xb8, 0xcf, 0xa5, 0x3c, 0xf5, 0x86, 0x3c, 0x74, 0xeb, 0x5e, 0xf7, 0x7a, 0xc9, 0x4a, 0xb0, 0xc3, + 0xa5, 0x6c, 0xab, 0xd1, 0x02, 0x6b, 0xb1, 0x22, 0xe2, 0xc9, 0x65, 0x88, 0x27, 0xa4, 0xeb, 0x42, + 0x0c, 0x6f, 0x27, 0x5d, 0xe7, 0x50, 0x34, 0x7d, 0xcb, 0xc2, 0x56, 0x75, 0x0e, 0xfb, 0x67, 0xdc, + 0x7f, 0x37, 0x1b, 0xc4, 0xa3, 0xac, 0xc2, 0x9e, 0xe6, 0x70, 0x33, 0xb4, 0x96, 0xef, 0xc6, 0xf6, + 0x36, 0x90, 0x71, 0x13, 0x79, 0xfd, 0x8c, 0xbf, 0x19, 0x2b, 0xbf, 0x9c, 0xab, 0xe4, 0xfe, 0x2a, + 0x25, 0xc1, 0xa5, 0x80, 0x8a, 0x26, 0xff, 0xc4, 0x71, 0xc2, 0xb7, 0x4f, 0xc5, 0x39, 0x14, 0x4d, + 0xe0, 0x4c, 0xd9, 0xfc, 0x69, 0xc1, 0x41, 0xd4, 0x46, 0x1d, 0x6d, 0x3a, 0x04, 0x30, 0x41, 0x24, + 0x1d, 0x28, 0x78, 0x68, 0x7b, 0x51, 0xbc, 0x4f, 0x09, 0xa6, 0x0c, 0x0b, 0xc6, 0xe5, 0x35, 0xc3, + 0x7e, 0x0b, 0x76, 0x92, 0xaf, 0x99, 0x83, 0x8f, 0xba, 0xe2, 0xff, 0x08, 0x3e, 0xc9, 0xd7, 0x35, + 0x33, 0xff, 0xa7, 0x88, 0xda, 0x7c, 0x3a, 0x58, 0x06, 0x3f, 0x44, 0xdb, 0x2b, 0x82, 0x37, 0x2c, + 0x18, 0x97, 0x37, 0x95, 0x79, 0xd3, 0xd7, 0x4c, 0xc1, 0xbb, 0x50, 0x3a, 0xe3, 0x7e, 0x68, 0xdc, + 0x8d, 0x37, 0x6f, 0x09, 0x76, 0x66, 0x91, 0x0f, 0x51, 0xdb, 0x2e, 0x56, 0x6b, 0xfa, 0xff, 0xdd, + 0x82, 0x47, 0x24, 0x60, 0xa6, 0xf1, 0xd5, 0x81, 0xc2, 0x0c, 0x59, 0x5a, 0x3c, 0x59, 0x54, 0x72, + 0x0c, 0x50, 0xe3, 0xb2, 0xd6, 0x08, 0x14, 0x25, 0xb7, 0xaf, 0x16, 0x92, 0x7c, 0xcd, 0x54, 0x0b, + 0x5f, 0x2d, 0x38, 0x88, 0xa6, 0xe9, 0x3f, 0xab, 0x07, 0xe3, 0x89, 0xb8, 0x6b, 0x3e, 0x11, 0x41, + 0x9c, 0x49, 0x6e, 0x65, 0x8a, 0xf3, 0xf2, 0x3a, 0x4c, 0x6a, 0xd8, 0x6d, 0xa7, 0xec, 0x97, 0x21, + 0x6c, 0x68, 0x66, 0x5d, 0x85, 0x6d, 0x4b, 0xcd, 0xab, 0xed, 0xbf, 0xb9, 0x3f, 0xa2, 0x16, 0xde, + 0xcc, 0x00, 0x62, 0xef, 0xa1, 0x88, 0xbb, 0x50, 0xd3, 0x21, 0xa9, 0xda, 0x98, 0x34, 0x70, 0xf2, + 0x2b, 0x0f, 0x31, 0xa1, 0xcf, 0x7a, 0x50, 0xc0, 0xa3, 0x93, 0x1d, 0xd5, 0x63, 0xff, 0x0f, 0x08, + 0x91, 0x6f, 0x57, 0x6f, 0x3a, 0xa2, 0x44, 0x60, 0x1a, 0x8b, 0x4a, 0x6c, 0x9a, 0x10, 0xc4, 0xd8, + 0x34, 0xa9, 0x4b, 0x7b, 0x50, 0xc0, 0x5a, 0x0f, 0x9b, 0x26, 0x54, 0x28, 0x36, 0x4d, 0xca, 0xc5, + 0x1e, 0x14, 0xb0, 0x78, 0xc2, 0xa6, 0x09, 0x55, 0x87, 0x4d, 0x93, 0xfa, 0x6b, 0x02, 0x25, 0x5a, + 0xa0, 0xb0, 0xe7, 0x14, 0x9d, 0x44, 0x23, 0xda, 0xb5, 0x74, 0x07, 0x23, 0x30, 0x5a, 0x10, 0x60, + 0xb0, 0x44, 0x89, 0x83, 0xc1, 0x56, 0xe8, 0x8b, 0x09, 0x94, 0xe8, 0x4e, 0xc6, 0x60, 0x89, 0x23, + 0x06, 0x83, 0xad, 0x18, 0x0c, 0x4b, 0x1a, 0x71, 0xb3, 0xd1, 0x34, 0x12, 0xf3, 0x80, 0xa6, 0x91, + 0xec, 0xdd, 0x41, 0xf8, 0x7f, 0x06, 0x77, 0x17, 0x7b, 0x66, 0x54, 0x12, 0xf1, 0x3a, 0xd8, 0xc7, + 0x29, 0x4e, 0xe9, 0xec, 0x19, 0x30, 0x24, 0x7b, 0x14, 0x52, 0x2d, 0xdd, 0x41, 0xbd, 0x2e, 0x6e, + 0x02, 0x4b, 0x7c, 0xf1, 0xe9, 0xba, 0x20, 0xc1, 0x22, 0xf6, 0x8c, 0x3c, 0x99, 0xec, 0x51, 0x49, + 0x3a, 0x4e, 0x71, 0x4a, 0x89, 0x57, 0x87, 0x1f, 0x1e, 0xd7, 0x63, 0x1f, 0x34, 0x5e, 0xea, 0x8b, + 0xc1, 0x4e, 0xf8, 0xb5, 0xe2, 0xc5, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x84, 0x53, 0xac, 0x82, + 0x01, 0x11, 0x00, 0x00, } diff --git a/pkg/proto/organization/organization.proto b/pkg/proto/organization/organization.proto index 343ac43ea..3a8f2f8c9 100644 --- a/pkg/proto/organization/organization.proto +++ b/pkg/proto/organization/organization.proto @@ -81,7 +81,7 @@ message UpdateOrganizationUserResp{ message CreateDepartmentMemberReq{ - server_api_params.UserInDepartment userInDepartment = 1; + server_api_params.DepartmentMember departmentMember = 1; string operationID = 2; string opUserID = 3; } diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index b587caa32..3825fb262 100644 --- a/pkg/proto/sdk_ws/ws.pb.go +++ b/pkg/proto/sdk_ws/ws.pb.go @@ -40,7 +40,7 @@ func (m *GroupInfo) Reset() { *m = GroupInfo{} } func (m *GroupInfo) String() string { return proto.CompactTextString(m) } func (*GroupInfo) ProtoMessage() {} func (*GroupInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{0} + return fileDescriptor_ws_f7386a43c650fa79, []int{0} } func (m *GroupInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfo.Unmarshal(m, b) @@ -165,7 +165,7 @@ func (m *GroupMemberFullInfo) Reset() { *m = GroupMemberFullInfo{} } func (m *GroupMemberFullInfo) String() string { return proto.CompactTextString(m) } func (*GroupMemberFullInfo) ProtoMessage() {} func (*GroupMemberFullInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{1} + return fileDescriptor_ws_f7386a43c650fa79, []int{1} } func (m *GroupMemberFullInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberFullInfo.Unmarshal(m, b) @@ -277,7 +277,7 @@ func (m *PublicUserInfo) Reset() { *m = PublicUserInfo{} } func (m *PublicUserInfo) String() string { return proto.CompactTextString(m) } func (*PublicUserInfo) ProtoMessage() {} func (*PublicUserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{2} + return fileDescriptor_ws_f7386a43c650fa79, []int{2} } func (m *PublicUserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PublicUserInfo.Unmarshal(m, b) @@ -352,7 +352,7 @@ func (m *UserInfo) Reset() { *m = UserInfo{} } func (m *UserInfo) String() string { return proto.CompactTextString(m) } func (*UserInfo) ProtoMessage() {} func (*UserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{3} + return fileDescriptor_ws_f7386a43c650fa79, []int{3} } func (m *UserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfo.Unmarshal(m, b) @@ -459,7 +459,7 @@ func (m *FriendInfo) Reset() { *m = FriendInfo{} } func (m *FriendInfo) String() string { return proto.CompactTextString(m) } func (*FriendInfo) ProtoMessage() {} func (*FriendInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{4} + return fileDescriptor_ws_f7386a43c650fa79, []int{4} } func (m *FriendInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfo.Unmarshal(m, b) @@ -544,7 +544,7 @@ func (m *BlackInfo) Reset() { *m = BlackInfo{} } func (m *BlackInfo) String() string { return proto.CompactTextString(m) } func (*BlackInfo) ProtoMessage() {} func (*BlackInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{5} + return fileDescriptor_ws_f7386a43c650fa79, []int{5} } func (m *BlackInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackInfo.Unmarshal(m, b) @@ -625,7 +625,7 @@ func (m *GroupRequest) Reset() { *m = GroupRequest{} } func (m *GroupRequest) String() string { return proto.CompactTextString(m) } func (*GroupRequest) ProtoMessage() {} func (*GroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{6} + return fileDescriptor_ws_f7386a43c650fa79, []int{6} } func (m *GroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupRequest.Unmarshal(m, b) @@ -733,7 +733,7 @@ func (m *FriendRequest) Reset() { *m = FriendRequest{} } func (m *FriendRequest) String() string { return proto.CompactTextString(m) } func (*FriendRequest) ProtoMessage() {} func (*FriendRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{7} + return fileDescriptor_ws_f7386a43c650fa79, []int{7} } func (m *FriendRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendRequest.Unmarshal(m, b) @@ -878,7 +878,7 @@ func (m *Department) Reset() { *m = Department{} } func (m *Department) String() string { return proto.CompactTextString(m) } func (*Department) ProtoMessage() {} func (*Department) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{8} + return fileDescriptor_ws_f7386a43c650fa79, []int{8} } func (m *Department) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Department.Unmarshal(m, b) @@ -989,7 +989,7 @@ func (m *OrganizationUser) Reset() { *m = OrganizationUser{} } func (m *OrganizationUser) String() string { return proto.CompactTextString(m) } func (*OrganizationUser) ProtoMessage() {} func (*OrganizationUser) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{9} + return fileDescriptor_ws_f7386a43c650fa79, []int{9} } func (m *OrganizationUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OrganizationUser.Unmarshal(m, b) @@ -1088,12 +1088,12 @@ func (m *OrganizationUser) GetEx() string { type DepartmentMember struct { UserID string `protobuf:"bytes,1,opt,name=userID" json:"userID,omitempty"` - DepartmentID string `protobuf:"bytes,2,opt,name=DepartmentID" json:"DepartmentID,omitempty"` - Order int32 `protobuf:"varint,3,opt,name=Order" json:"Order,omitempty"` - Position string `protobuf:"bytes,4,opt,name=Position" json:"Position,omitempty"` - Leader int32 `protobuf:"varint,5,opt,name=Leader" json:"Leader,omitempty"` - Status int32 `protobuf:"varint,6,opt,name=Status" json:"Status,omitempty"` - Ex string `protobuf:"bytes,7,opt,name=Ex" json:"Ex,omitempty"` + DepartmentID string `protobuf:"bytes,2,opt,name=departmentID" json:"departmentID,omitempty"` + Order int32 `protobuf:"varint,3,opt,name=order" json:"order,omitempty"` + Position string `protobuf:"bytes,4,opt,name=position" json:"position,omitempty"` + Leader int32 `protobuf:"varint,5,opt,name=leader" json:"leader,omitempty"` + Status int32 `protobuf:"varint,6,opt,name=status" json:"status,omitempty"` + Ex string `protobuf:"bytes,7,opt,name=ex" json:"ex,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1103,7 +1103,7 @@ func (m *DepartmentMember) Reset() { *m = DepartmentMember{} } func (m *DepartmentMember) String() string { return proto.CompactTextString(m) } func (*DepartmentMember) ProtoMessage() {} func (*DepartmentMember) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{10} + return fileDescriptor_ws_f7386a43c650fa79, []int{10} } func (m *DepartmentMember) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DepartmentMember.Unmarshal(m, b) @@ -1184,7 +1184,7 @@ func (m *UserInDepartment) Reset() { *m = UserInDepartment{} } func (m *UserInDepartment) String() string { return proto.CompactTextString(m) } func (*UserInDepartment) ProtoMessage() {} func (*UserInDepartment) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{11} + return fileDescriptor_ws_f7386a43c650fa79, []int{11} } func (m *UserInDepartment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInDepartment.Unmarshal(m, b) @@ -1231,7 +1231,7 @@ func (m *PullMessageBySeqListResp) Reset() { *m = PullMessageBySeqListRe func (m *PullMessageBySeqListResp) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListResp) ProtoMessage() {} func (*PullMessageBySeqListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{12} + return fileDescriptor_ws_f7386a43c650fa79, []int{12} } func (m *PullMessageBySeqListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListResp.Unmarshal(m, b) @@ -1285,7 +1285,7 @@ func (m *PullMessageBySeqListReq) Reset() { *m = PullMessageBySeqListReq func (m *PullMessageBySeqListReq) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListReq) ProtoMessage() {} func (*PullMessageBySeqListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{13} + return fileDescriptor_ws_f7386a43c650fa79, []int{13} } func (m *PullMessageBySeqListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListReq.Unmarshal(m, b) @@ -1336,7 +1336,7 @@ func (m *GetMaxAndMinSeqReq) Reset() { *m = GetMaxAndMinSeqReq{} } func (m *GetMaxAndMinSeqReq) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqReq) ProtoMessage() {} func (*GetMaxAndMinSeqReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{14} + return fileDescriptor_ws_f7386a43c650fa79, []int{14} } func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b) @@ -1368,7 +1368,7 @@ func (m *GetMaxAndMinSeqResp) Reset() { *m = GetMaxAndMinSeqResp{} } func (m *GetMaxAndMinSeqResp) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqResp) ProtoMessage() {} func (*GetMaxAndMinSeqResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{15} + return fileDescriptor_ws_f7386a43c650fa79, []int{15} } func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b) @@ -1415,7 +1415,7 @@ func (m *UserSendMsgResp) Reset() { *m = UserSendMsgResp{} } func (m *UserSendMsgResp) String() string { return proto.CompactTextString(m) } func (*UserSendMsgResp) ProtoMessage() {} func (*UserSendMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{16} + return fileDescriptor_ws_f7386a43c650fa79, []int{16} } func (m *UserSendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserSendMsgResp.Unmarshal(m, b) @@ -1484,7 +1484,7 @@ func (m *MsgData) Reset() { *m = MsgData{} } func (m *MsgData) String() string { return proto.CompactTextString(m) } func (*MsgData) ProtoMessage() {} func (*MsgData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{17} + return fileDescriptor_ws_f7386a43c650fa79, []int{17} } func (m *MsgData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgData.Unmarshal(m, b) @@ -1645,7 +1645,7 @@ func (m *OfflinePushInfo) Reset() { *m = OfflinePushInfo{} } func (m *OfflinePushInfo) String() string { return proto.CompactTextString(m) } func (*OfflinePushInfo) ProtoMessage() {} func (*OfflinePushInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{18} + return fileDescriptor_ws_f7386a43c650fa79, []int{18} } func (m *OfflinePushInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OfflinePushInfo.Unmarshal(m, b) @@ -1713,7 +1713,7 @@ func (m *TipsComm) Reset() { *m = TipsComm{} } func (m *TipsComm) String() string { return proto.CompactTextString(m) } func (*TipsComm) ProtoMessage() {} func (*TipsComm) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{19} + return fileDescriptor_ws_f7386a43c650fa79, []int{19} } func (m *TipsComm) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TipsComm.Unmarshal(m, b) @@ -1770,7 +1770,7 @@ func (m *GroupCreatedTips) Reset() { *m = GroupCreatedTips{} } func (m *GroupCreatedTips) String() string { return proto.CompactTextString(m) } func (*GroupCreatedTips) ProtoMessage() {} func (*GroupCreatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{20} + return fileDescriptor_ws_f7386a43c650fa79, []int{20} } func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b) @@ -1839,7 +1839,7 @@ func (m *GroupInfoSetTips) Reset() { *m = GroupInfoSetTips{} } func (m *GroupInfoSetTips) String() string { return proto.CompactTextString(m) } func (*GroupInfoSetTips) ProtoMessage() {} func (*GroupInfoSetTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{21} + return fileDescriptor_ws_f7386a43c650fa79, []int{21} } func (m *GroupInfoSetTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfoSetTips.Unmarshal(m, b) @@ -1894,7 +1894,7 @@ func (m *JoinGroupApplicationTips) Reset() { *m = JoinGroupApplicationTi func (m *JoinGroupApplicationTips) String() string { return proto.CompactTextString(m) } func (*JoinGroupApplicationTips) ProtoMessage() {} func (*JoinGroupApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{22} + return fileDescriptor_ws_f7386a43c650fa79, []int{22} } func (m *JoinGroupApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupApplicationTips.Unmarshal(m, b) @@ -1950,7 +1950,7 @@ func (m *MemberQuitTips) Reset() { *m = MemberQuitTips{} } func (m *MemberQuitTips) String() string { return proto.CompactTextString(m) } func (*MemberQuitTips) ProtoMessage() {} func (*MemberQuitTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{23} + return fileDescriptor_ws_f7386a43c650fa79, []int{23} } func (m *MemberQuitTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberQuitTips.Unmarshal(m, b) @@ -2005,7 +2005,7 @@ func (m *GroupApplicationAcceptedTips) Reset() { *m = GroupApplicationAc func (m *GroupApplicationAcceptedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationAcceptedTips) ProtoMessage() {} func (*GroupApplicationAcceptedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{24} + return fileDescriptor_ws_f7386a43c650fa79, []int{24} } func (m *GroupApplicationAcceptedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationAcceptedTips.Unmarshal(m, b) @@ -2060,7 +2060,7 @@ func (m *GroupApplicationRejectedTips) Reset() { *m = GroupApplicationRe func (m *GroupApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationRejectedTips) ProtoMessage() {} func (*GroupApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{25} + return fileDescriptor_ws_f7386a43c650fa79, []int{25} } func (m *GroupApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationRejectedTips.Unmarshal(m, b) @@ -2116,7 +2116,7 @@ func (m *GroupOwnerTransferredTips) Reset() { *m = GroupOwnerTransferred func (m *GroupOwnerTransferredTips) String() string { return proto.CompactTextString(m) } func (*GroupOwnerTransferredTips) ProtoMessage() {} func (*GroupOwnerTransferredTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{26} + return fileDescriptor_ws_f7386a43c650fa79, []int{26} } func (m *GroupOwnerTransferredTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupOwnerTransferredTips.Unmarshal(m, b) @@ -2179,7 +2179,7 @@ func (m *MemberKickedTips) Reset() { *m = MemberKickedTips{} } func (m *MemberKickedTips) String() string { return proto.CompactTextString(m) } func (*MemberKickedTips) ProtoMessage() {} func (*MemberKickedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{27} + return fileDescriptor_ws_f7386a43c650fa79, []int{27} } func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b) @@ -2242,7 +2242,7 @@ func (m *MemberInvitedTips) Reset() { *m = MemberInvitedTips{} } func (m *MemberInvitedTips) String() string { return proto.CompactTextString(m) } func (*MemberInvitedTips) ProtoMessage() {} func (*MemberInvitedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{28} + return fileDescriptor_ws_f7386a43c650fa79, []int{28} } func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b) @@ -2304,7 +2304,7 @@ func (m *MemberEnterTips) Reset() { *m = MemberEnterTips{} } func (m *MemberEnterTips) String() string { return proto.CompactTextString(m) } func (*MemberEnterTips) ProtoMessage() {} func (*MemberEnterTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{29} + return fileDescriptor_ws_f7386a43c650fa79, []int{29} } func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b) @@ -2358,7 +2358,7 @@ func (m *GroupDismissedTips) Reset() { *m = GroupDismissedTips{} } func (m *GroupDismissedTips) String() string { return proto.CompactTextString(m) } func (*GroupDismissedTips) ProtoMessage() {} func (*GroupDismissedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{30} + return fileDescriptor_ws_f7386a43c650fa79, []int{30} } func (m *GroupDismissedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupDismissedTips.Unmarshal(m, b) @@ -2414,7 +2414,7 @@ func (m *GroupMemberMutedTips) Reset() { *m = GroupMemberMutedTips{} } func (m *GroupMemberMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberMutedTips) ProtoMessage() {} func (*GroupMemberMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{31} + return fileDescriptor_ws_f7386a43c650fa79, []int{31} } func (m *GroupMemberMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberMutedTips.Unmarshal(m, b) @@ -2483,7 +2483,7 @@ func (m *GroupMemberCancelMutedTips) Reset() { *m = GroupMemberCancelMut func (m *GroupMemberCancelMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberCancelMutedTips) ProtoMessage() {} func (*GroupMemberCancelMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{32} + return fileDescriptor_ws_f7386a43c650fa79, []int{32} } func (m *GroupMemberCancelMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberCancelMutedTips.Unmarshal(m, b) @@ -2544,7 +2544,7 @@ func (m *GroupMutedTips) Reset() { *m = GroupMutedTips{} } func (m *GroupMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMutedTips) ProtoMessage() {} func (*GroupMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{33} + return fileDescriptor_ws_f7386a43c650fa79, []int{33} } func (m *GroupMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMutedTips.Unmarshal(m, b) @@ -2598,7 +2598,7 @@ func (m *GroupCancelMutedTips) Reset() { *m = GroupCancelMutedTips{} } func (m *GroupCancelMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupCancelMutedTips) ProtoMessage() {} func (*GroupCancelMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{34} + return fileDescriptor_ws_f7386a43c650fa79, []int{34} } func (m *GroupCancelMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCancelMutedTips.Unmarshal(m, b) @@ -2653,7 +2653,7 @@ func (m *GroupMemberInfoSetTips) Reset() { *m = GroupMemberInfoSetTips{} func (m *GroupMemberInfoSetTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberInfoSetTips) ProtoMessage() {} func (*GroupMemberInfoSetTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{35} + return fileDescriptor_ws_f7386a43c650fa79, []int{35} } func (m *GroupMemberInfoSetTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberInfoSetTips.Unmarshal(m, b) @@ -2714,7 +2714,7 @@ func (m *FriendApplication) Reset() { *m = FriendApplication{} } func (m *FriendApplication) String() string { return proto.CompactTextString(m) } func (*FriendApplication) ProtoMessage() {} func (*FriendApplication) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{36} + return fileDescriptor_ws_f7386a43c650fa79, []int{36} } func (m *FriendApplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplication.Unmarshal(m, b) @@ -2767,7 +2767,7 @@ func (m *FromToUserID) Reset() { *m = FromToUserID{} } func (m *FromToUserID) String() string { return proto.CompactTextString(m) } func (*FromToUserID) ProtoMessage() {} func (*FromToUserID) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{37} + return fileDescriptor_ws_f7386a43c650fa79, []int{37} } func (m *FromToUserID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FromToUserID.Unmarshal(m, b) @@ -2813,7 +2813,7 @@ func (m *FriendApplicationTips) Reset() { *m = FriendApplicationTips{} } func (m *FriendApplicationTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationTips) ProtoMessage() {} func (*FriendApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{38} + return fileDescriptor_ws_f7386a43c650fa79, []int{38} } func (m *FriendApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationTips.Unmarshal(m, b) @@ -2853,7 +2853,7 @@ func (m *FriendApplicationApprovedTips) Reset() { *m = FriendApplication func (m *FriendApplicationApprovedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationApprovedTips) ProtoMessage() {} func (*FriendApplicationApprovedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{39} + return fileDescriptor_ws_f7386a43c650fa79, []int{39} } func (m *FriendApplicationApprovedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationApprovedTips.Unmarshal(m, b) @@ -2900,7 +2900,7 @@ func (m *FriendApplicationRejectedTips) Reset() { *m = FriendApplication func (m *FriendApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationRejectedTips) ProtoMessage() {} func (*FriendApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{40} + return fileDescriptor_ws_f7386a43c650fa79, []int{40} } func (m *FriendApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationRejectedTips.Unmarshal(m, b) @@ -2948,7 +2948,7 @@ func (m *FriendAddedTips) Reset() { *m = FriendAddedTips{} } func (m *FriendAddedTips) String() string { return proto.CompactTextString(m) } func (*FriendAddedTips) ProtoMessage() {} func (*FriendAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{41} + return fileDescriptor_ws_f7386a43c650fa79, []int{41} } func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b) @@ -3001,7 +3001,7 @@ func (m *FriendDeletedTips) Reset() { *m = FriendDeletedTips{} } func (m *FriendDeletedTips) String() string { return proto.CompactTextString(m) } func (*FriendDeletedTips) ProtoMessage() {} func (*FriendDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{42} + return fileDescriptor_ws_f7386a43c650fa79, []int{42} } func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b) @@ -3039,7 +3039,7 @@ func (m *BlackAddedTips) Reset() { *m = BlackAddedTips{} } func (m *BlackAddedTips) String() string { return proto.CompactTextString(m) } func (*BlackAddedTips) ProtoMessage() {} func (*BlackAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{43} + return fileDescriptor_ws_f7386a43c650fa79, []int{43} } func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b) @@ -3077,7 +3077,7 @@ func (m *BlackDeletedTips) Reset() { *m = BlackDeletedTips{} } func (m *BlackDeletedTips) String() string { return proto.CompactTextString(m) } func (*BlackDeletedTips) ProtoMessage() {} func (*BlackDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{44} + return fileDescriptor_ws_f7386a43c650fa79, []int{44} } func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b) @@ -3115,7 +3115,7 @@ func (m *FriendInfoChangedTips) Reset() { *m = FriendInfoChangedTips{} } func (m *FriendInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*FriendInfoChangedTips) ProtoMessage() {} func (*FriendInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{45} + return fileDescriptor_ws_f7386a43c650fa79, []int{45} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -3154,7 +3154,7 @@ func (m *UserInfoUpdatedTips) Reset() { *m = UserInfoUpdatedTips{} } func (m *UserInfoUpdatedTips) String() string { return proto.CompactTextString(m) } func (*UserInfoUpdatedTips) ProtoMessage() {} func (*UserInfoUpdatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{46} + return fileDescriptor_ws_f7386a43c650fa79, []int{46} } func (m *UserInfoUpdatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfoUpdatedTips.Unmarshal(m, b) @@ -3193,7 +3193,7 @@ func (m *ConversationUpdateTips) Reset() { *m = ConversationUpdateTips{} func (m *ConversationUpdateTips) String() string { return proto.CompactTextString(m) } func (*ConversationUpdateTips) ProtoMessage() {} func (*ConversationUpdateTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{47} + return fileDescriptor_ws_f7386a43c650fa79, []int{47} } func (m *ConversationUpdateTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConversationUpdateTips.Unmarshal(m, b) @@ -3233,7 +3233,7 @@ func (m *ConversationSetPrivateTips) Reset() { *m = ConversationSetPriva func (m *ConversationSetPrivateTips) String() string { return proto.CompactTextString(m) } func (*ConversationSetPrivateTips) ProtoMessage() {} func (*ConversationSetPrivateTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{48} + return fileDescriptor_ws_f7386a43c650fa79, []int{48} } func (m *ConversationSetPrivateTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConversationSetPrivateTips.Unmarshal(m, b) @@ -3287,7 +3287,7 @@ func (m *RequestPagination) Reset() { *m = RequestPagination{} } func (m *RequestPagination) String() string { return proto.CompactTextString(m) } func (*RequestPagination) ProtoMessage() {} func (*RequestPagination) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{49} + return fileDescriptor_ws_f7386a43c650fa79, []int{49} } func (m *RequestPagination) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RequestPagination.Unmarshal(m, b) @@ -3333,7 +3333,7 @@ func (m *ResponsePagination) Reset() { *m = ResponsePagination{} } func (m *ResponsePagination) String() string { return proto.CompactTextString(m) } func (*ResponsePagination) ProtoMessage() {} func (*ResponsePagination) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{50} + return fileDescriptor_ws_f7386a43c650fa79, []int{50} } func (m *ResponsePagination) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResponsePagination.Unmarshal(m, b) @@ -3386,7 +3386,7 @@ func (m *SignalReq) Reset() { *m = SignalReq{} } func (m *SignalReq) String() string { return proto.CompactTextString(m) } func (*SignalReq) ProtoMessage() {} func (*SignalReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{51} + return fileDescriptor_ws_f7386a43c650fa79, []int{51} } func (m *SignalReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalReq.Unmarshal(m, b) @@ -3653,7 +3653,7 @@ func (m *SignalResp) Reset() { *m = SignalResp{} } func (m *SignalResp) String() string { return proto.CompactTextString(m) } func (*SignalResp) ProtoMessage() {} func (*SignalResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{52} + return fileDescriptor_ws_f7386a43c650fa79, []int{52} } func (m *SignalResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalResp.Unmarshal(m, b) @@ -3921,7 +3921,7 @@ func (m *InvitationInfo) Reset() { *m = InvitationInfo{} } func (m *InvitationInfo) String() string { return proto.CompactTextString(m) } func (*InvitationInfo) ProtoMessage() {} func (*InvitationInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{53} + return fileDescriptor_ws_f7386a43c650fa79, []int{53} } func (m *InvitationInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InvitationInfo.Unmarshal(m, b) @@ -4017,7 +4017,7 @@ func (m *ParticipantMetaData) Reset() { *m = ParticipantMetaData{} } func (m *ParticipantMetaData) String() string { return proto.CompactTextString(m) } func (*ParticipantMetaData) ProtoMessage() {} func (*ParticipantMetaData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{54} + return fileDescriptor_ws_f7386a43c650fa79, []int{54} } func (m *ParticipantMetaData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ParticipantMetaData.Unmarshal(m, b) @@ -4072,7 +4072,7 @@ func (m *SignalInviteReq) Reset() { *m = SignalInviteReq{} } func (m *SignalInviteReq) String() string { return proto.CompactTextString(m) } func (*SignalInviteReq) ProtoMessage() {} func (*SignalInviteReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{55} + return fileDescriptor_ws_f7386a43c650fa79, []int{55} } func (m *SignalInviteReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteReq.Unmarshal(m, b) @@ -4133,7 +4133,7 @@ func (m *SignalInviteReply) Reset() { *m = SignalInviteReply{} } func (m *SignalInviteReply) String() string { return proto.CompactTextString(m) } func (*SignalInviteReply) ProtoMessage() {} func (*SignalInviteReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{56} + return fileDescriptor_ws_f7386a43c650fa79, []int{56} } func (m *SignalInviteReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteReply.Unmarshal(m, b) @@ -4188,7 +4188,7 @@ func (m *SignalInviteInGroupReq) Reset() { *m = SignalInviteInGroupReq{} func (m *SignalInviteInGroupReq) String() string { return proto.CompactTextString(m) } func (*SignalInviteInGroupReq) ProtoMessage() {} func (*SignalInviteInGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{57} + return fileDescriptor_ws_f7386a43c650fa79, []int{57} } func (m *SignalInviteInGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteInGroupReq.Unmarshal(m, b) @@ -4249,7 +4249,7 @@ func (m *SignalInviteInGroupReply) Reset() { *m = SignalInviteInGroupRep func (m *SignalInviteInGroupReply) String() string { return proto.CompactTextString(m) } func (*SignalInviteInGroupReply) ProtoMessage() {} func (*SignalInviteInGroupReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{58} + return fileDescriptor_ws_f7386a43c650fa79, []int{58} } func (m *SignalInviteInGroupReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteInGroupReply.Unmarshal(m, b) @@ -4304,7 +4304,7 @@ func (m *SignalCancelReq) Reset() { *m = SignalCancelReq{} } func (m *SignalCancelReq) String() string { return proto.CompactTextString(m) } func (*SignalCancelReq) ProtoMessage() {} func (*SignalCancelReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{59} + return fileDescriptor_ws_f7386a43c650fa79, []int{59} } func (m *SignalCancelReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalCancelReq.Unmarshal(m, b) @@ -4362,7 +4362,7 @@ func (m *SignalCancelReply) Reset() { *m = SignalCancelReply{} } func (m *SignalCancelReply) String() string { return proto.CompactTextString(m) } func (*SignalCancelReply) ProtoMessage() {} func (*SignalCancelReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{60} + return fileDescriptor_ws_f7386a43c650fa79, []int{60} } func (m *SignalCancelReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalCancelReply.Unmarshal(m, b) @@ -4397,7 +4397,7 @@ func (m *SignalAcceptReq) Reset() { *m = SignalAcceptReq{} } func (m *SignalAcceptReq) String() string { return proto.CompactTextString(m) } func (*SignalAcceptReq) ProtoMessage() {} func (*SignalAcceptReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{61} + return fileDescriptor_ws_f7386a43c650fa79, []int{61} } func (m *SignalAcceptReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalAcceptReq.Unmarshal(m, b) @@ -4465,7 +4465,7 @@ func (m *SignalAcceptReply) Reset() { *m = SignalAcceptReply{} } func (m *SignalAcceptReply) String() string { return proto.CompactTextString(m) } func (*SignalAcceptReply) ProtoMessage() {} func (*SignalAcceptReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{62} + return fileDescriptor_ws_f7386a43c650fa79, []int{62} } func (m *SignalAcceptReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalAcceptReply.Unmarshal(m, b) @@ -4519,7 +4519,7 @@ func (m *SignalHungUpReq) Reset() { *m = SignalHungUpReq{} } func (m *SignalHungUpReq) String() string { return proto.CompactTextString(m) } func (*SignalHungUpReq) ProtoMessage() {} func (*SignalHungUpReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{63} + return fileDescriptor_ws_f7386a43c650fa79, []int{63} } func (m *SignalHungUpReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalHungUpReq.Unmarshal(m, b) @@ -4570,7 +4570,7 @@ func (m *SignalHungUpReply) Reset() { *m = SignalHungUpReply{} } func (m *SignalHungUpReply) String() string { return proto.CompactTextString(m) } func (*SignalHungUpReply) ProtoMessage() {} func (*SignalHungUpReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{64} + return fileDescriptor_ws_f7386a43c650fa79, []int{64} } func (m *SignalHungUpReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalHungUpReply.Unmarshal(m, b) @@ -4605,7 +4605,7 @@ func (m *SignalRejectReq) Reset() { *m = SignalRejectReq{} } func (m *SignalRejectReq) String() string { return proto.CompactTextString(m) } func (*SignalRejectReq) ProtoMessage() {} func (*SignalRejectReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{65} + return fileDescriptor_ws_f7386a43c650fa79, []int{65} } func (m *SignalRejectReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalRejectReq.Unmarshal(m, b) @@ -4670,7 +4670,7 @@ func (m *SignalRejectReply) Reset() { *m = SignalRejectReply{} } func (m *SignalRejectReply) String() string { return proto.CompactTextString(m) } func (*SignalRejectReply) ProtoMessage() {} func (*SignalRejectReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{66} + return fileDescriptor_ws_f7386a43c650fa79, []int{66} } func (m *SignalRejectReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalRejectReply.Unmarshal(m, b) @@ -4704,7 +4704,7 @@ func (m *DelMsgListReq) Reset() { *m = DelMsgListReq{} } func (m *DelMsgListReq) String() string { return proto.CompactTextString(m) } func (*DelMsgListReq) ProtoMessage() {} func (*DelMsgListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{67} + return fileDescriptor_ws_f7386a43c650fa79, []int{67} } func (m *DelMsgListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelMsgListReq.Unmarshal(m, b) @@ -4764,7 +4764,7 @@ func (m *DelMsgListResp) Reset() { *m = DelMsgListResp{} } func (m *DelMsgListResp) String() string { return proto.CompactTextString(m) } func (*DelMsgListResp) ProtoMessage() {} func (*DelMsgListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_4f11937c2cee8c46, []int{68} + return fileDescriptor_ws_f7386a43c650fa79, []int{68} } func (m *DelMsgListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelMsgListResp.Unmarshal(m, b) @@ -4871,55 +4871,55 @@ func init() { proto.RegisterType((*DelMsgListResp)(nil), "server_api_params.DelMsgListResp") } -func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_4f11937c2cee8c46) } +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_f7386a43c650fa79) } -var fileDescriptor_ws_4f11937c2cee8c46 = []byte{ - // 3005 bytes of a gzipped FileDescriptorProto +var fileDescriptor_ws_f7386a43c650fa79 = []byte{ + // 2988 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcd, 0x6f, 0x24, 0x47, 0x15, 0xa7, 0x7b, 0x3c, 0x63, 0xcf, 0x1b, 0x8f, 0x3f, 0x7a, 0x17, 0x33, 0x98, 0xcd, 0x62, 0x1a, - 0x2b, 0x84, 0x00, 0x1b, 0x14, 0x84, 0x04, 0x09, 0x2c, 0x5a, 0xdb, 0xfb, 0x15, 0xd6, 0x1f, 0xe9, - 0xd9, 0x25, 0x08, 0x90, 0xa2, 0xf6, 0x74, 0x79, 0xdc, 0x71, 0x77, 0x57, 0x4f, 0x7f, 0x78, 0x77, - 0x11, 0x12, 0x12, 0x48, 0x88, 0x1b, 0x27, 0x38, 0x70, 0x41, 0xe2, 0x82, 0x40, 0x51, 0x14, 0x21, - 0xb8, 0x45, 0x88, 0x03, 0xff, 0x00, 0x47, 0xc4, 0x8d, 0x33, 0x57, 0x0e, 0x48, 0x48, 0xa0, 0xaa, - 0x57, 0x5d, 0x5d, 0xd5, 0x3d, 0x63, 0x4f, 0x46, 0x56, 0x76, 0xa3, 0xe5, 0x36, 0xef, 0x75, 0xbd, - 0x57, 0xaf, 0x7e, 0xef, 0x55, 0xbd, 0x57, 0x1f, 0x03, 0xcb, 0xa9, 0x77, 0xf2, 0xe6, 0xc3, 0xf4, - 0xa5, 0x87, 0xe9, 0xb5, 0x38, 0xa1, 0x19, 0xb5, 0x56, 0x53, 0x92, 0x9c, 0x92, 0xe4, 0x4d, 0x37, - 0xf6, 0xdf, 0x8c, 0xdd, 0xc4, 0x0d, 0x53, 0xfb, 0x5f, 0x26, 0xb4, 0x6f, 0x27, 0x34, 0x8f, 0xef, - 0x46, 0x47, 0xd4, 0xea, 0xc1, 0xfc, 0x90, 0x13, 0x3b, 0x3d, 0x63, 0xc3, 0x78, 0xa1, 0xed, 0x14, - 0xa4, 0x75, 0x05, 0xda, 0xfc, 0xe7, 0x9e, 0x1b, 0x92, 0x9e, 0xc9, 0xbf, 0x95, 0x0c, 0xcb, 0x86, - 0xc5, 0x88, 0x66, 0xfe, 0x91, 0x3f, 0x70, 0x33, 0x9f, 0x46, 0xbd, 0x06, 0x6f, 0xa0, 0xf1, 0x58, - 0x1b, 0x3f, 0xca, 0x12, 0xea, 0xe5, 0x03, 0xde, 0x66, 0x0e, 0xdb, 0xa8, 0x3c, 0xd6, 0xff, 0x91, - 0x3b, 0x20, 0x0f, 0x9c, 0x7b, 0xbd, 0x26, 0xf6, 0x2f, 0x48, 0x6b, 0x03, 0x3a, 0xf4, 0x61, 0x44, - 0x92, 0x07, 0x29, 0x49, 0xee, 0xee, 0xf4, 0x5a, 0xfc, 0xab, 0xca, 0xb2, 0xae, 0x02, 0x0c, 0x12, - 0xe2, 0x66, 0xe4, 0xbe, 0x1f, 0x92, 0xde, 0xfc, 0x86, 0xf1, 0x42, 0xd7, 0x51, 0x38, 0x4c, 0x43, - 0x48, 0xc2, 0x43, 0x92, 0x6c, 0xd3, 0x3c, 0xca, 0x7a, 0x0b, 0xbc, 0x81, 0xca, 0xb2, 0x96, 0xc0, - 0x24, 0x8f, 0x7a, 0x6d, 0xae, 0xda, 0x24, 0x8f, 0xac, 0x35, 0x68, 0xa5, 0x99, 0x9b, 0xe5, 0x69, - 0x0f, 0x36, 0x8c, 0x17, 0x9a, 0x8e, 0xa0, 0xac, 0x4d, 0xe8, 0x72, 0xbd, 0xb4, 0xb0, 0xa6, 0xc3, - 0x45, 0x74, 0xa6, 0x44, 0xec, 0xfe, 0xe3, 0x98, 0xf4, 0x16, 0xb9, 0x82, 0x92, 0x61, 0xff, 0xcd, + 0x2b, 0x84, 0x00, 0x1b, 0x14, 0x84, 0x04, 0x09, 0x2c, 0x5a, 0xdb, 0xfb, 0x15, 0xd6, 0x5e, 0xa7, + 0x67, 0x97, 0x20, 0x40, 0x8a, 0xda, 0xd3, 0xe5, 0x71, 0xc7, 0xdd, 0x5d, 0x3d, 0xfd, 0xe1, 0x5d, + 0x23, 0x24, 0x24, 0x90, 0x10, 0x37, 0x4e, 0x70, 0xe0, 0x82, 0xc4, 0x05, 0x81, 0xa2, 0x28, 0x42, + 0x70, 0x8b, 0x10, 0x07, 0xfe, 0x01, 0x8e, 0x88, 0x1b, 0x67, 0xae, 0x1c, 0x90, 0x90, 0x40, 0x55, + 0xaf, 0xba, 0xba, 0xaa, 0x7b, 0xc6, 0x9e, 0x8c, 0xac, 0xec, 0x46, 0xcb, 0x6d, 0xde, 0xeb, 0x7a, + 0xaf, 0x5e, 0xfd, 0xde, 0xab, 0x7a, 0xaf, 0x3e, 0x06, 0x96, 0x53, 0xef, 0xf8, 0xcd, 0x47, 0xe9, + 0x4b, 0x8f, 0xd2, 0x6b, 0x71, 0x42, 0x33, 0x6a, 0xad, 0xa6, 0x24, 0x39, 0x21, 0xc9, 0x9b, 0x6e, + 0xec, 0xbf, 0x19, 0xbb, 0x89, 0x1b, 0xa6, 0xf6, 0xbf, 0x4c, 0x68, 0xdf, 0x4e, 0x68, 0x1e, 0xdf, + 0x8d, 0x0e, 0xa9, 0xd5, 0x83, 0xf9, 0x21, 0x27, 0x76, 0x7a, 0xc6, 0x86, 0xf1, 0x42, 0xdb, 0x29, + 0x48, 0xeb, 0x0a, 0xb4, 0xf9, 0xcf, 0x3d, 0x37, 0x24, 0x3d, 0x93, 0x7f, 0x2b, 0x19, 0x96, 0x0d, + 0x8b, 0x11, 0xcd, 0xfc, 0x43, 0x7f, 0xe0, 0x66, 0x3e, 0x8d, 0x7a, 0x0d, 0xde, 0x40, 0xe3, 0xb1, + 0x36, 0x7e, 0x94, 0x25, 0xd4, 0xcb, 0x07, 0xbc, 0xcd, 0x1c, 0xb6, 0x51, 0x79, 0xac, 0xff, 0x43, + 0x77, 0x40, 0x1e, 0x3a, 0xf7, 0x7a, 0x4d, 0xec, 0x5f, 0x90, 0xd6, 0x06, 0x74, 0xe8, 0xa3, 0x88, + 0x24, 0x0f, 0x53, 0x92, 0xdc, 0xdd, 0xe9, 0xb5, 0xf8, 0x57, 0x95, 0x65, 0x5d, 0x05, 0x18, 0x24, + 0xc4, 0xcd, 0xc8, 0x03, 0x3f, 0x24, 0xbd, 0xf9, 0x0d, 0xe3, 0x85, 0xae, 0xa3, 0x70, 0x98, 0x86, + 0x90, 0x84, 0x07, 0x24, 0xd9, 0xa6, 0x79, 0x94, 0xf5, 0x16, 0x78, 0x03, 0x95, 0x65, 0x2d, 0x81, + 0x49, 0x1e, 0xf7, 0xda, 0x5c, 0xb5, 0x49, 0x1e, 0x5b, 0x6b, 0xd0, 0x4a, 0x33, 0x37, 0xcb, 0xd3, + 0x1e, 0x6c, 0x18, 0x2f, 0x34, 0x1d, 0x41, 0x59, 0x9b, 0xd0, 0xe5, 0x7a, 0x69, 0x61, 0x4d, 0x87, + 0x8b, 0xe8, 0x4c, 0x89, 0xd8, 0x83, 0xd3, 0x98, 0xf4, 0x16, 0xb9, 0x82, 0x92, 0x61, 0xff, 0xcd, 0x84, 0x4b, 0x1c, 0xf7, 0x5d, 0x6e, 0xc0, 0xad, 0x3c, 0x08, 0xce, 0xf1, 0xc0, 0x1a, 0xb4, 0x72, - 0xec, 0x0e, 0xe1, 0x17, 0x14, 0xeb, 0x27, 0xa1, 0x01, 0xb9, 0x47, 0x4e, 0x49, 0xc0, 0x81, 0x6f, + 0xec, 0x0e, 0xe1, 0x17, 0x14, 0xeb, 0x27, 0xa1, 0x01, 0xb9, 0x47, 0x4e, 0x48, 0xc0, 0x81, 0x6f, 0x3a, 0x25, 0xc3, 0x5a, 0x87, 0x85, 0xb7, 0xa8, 0x1f, 0x71, 0x4c, 0xe6, 0xf8, 0x47, 0x49, 0xb3, - 0x6f, 0x91, 0x3f, 0x38, 0x89, 0x98, 0x4b, 0x11, 0x6e, 0x49, 0xab, 0x9e, 0x68, 0xe9, 0x9e, 0x78, + 0x6f, 0x91, 0x3f, 0x38, 0x8e, 0x98, 0x4b, 0x11, 0x6e, 0x49, 0xab, 0x9e, 0x68, 0xe9, 0x9e, 0x78, 0x1e, 0x96, 0xdc, 0x38, 0xde, 0x75, 0xa3, 0x21, 0x49, 0xb0, 0xd3, 0x79, 0xae, 0xb7, 0xc2, 0x65, 0xfe, 0x60, 0x3d, 0xf5, 0x69, 0x9e, 0x0c, 0x08, 0x87, 0xbb, 0xe9, 0x28, 0x1c, 0xa6, 0x87, 0xc6, 0x24, 0x51, 0x60, 0x44, 0xe4, 0x2b, 0x5c, 0xe1, 0x15, 0x90, 0x5e, 0x61, 0x7e, 0xcc, 0x33, 0x72, - 0x33, 0xf2, 0xf8, 0xa0, 0x3a, 0xc2, 0x8f, 0x25, 0xcb, 0xfe, 0x89, 0x01, 0x4b, 0x07, 0xf9, 0x61, + 0x33, 0xf2, 0xf8, 0xa0, 0x3a, 0xc2, 0x8f, 0x25, 0xcb, 0xfe, 0x89, 0x01, 0x4b, 0xfb, 0xf9, 0x41, 0xe0, 0x0f, 0xb8, 0x0a, 0x06, 0x6b, 0x09, 0x9e, 0xa1, 0x81, 0xa7, 0x42, 0x60, 0x4e, 0x86, 0xa0, 0xa1, 0x43, 0xb0, 0x06, 0xad, 0x21, 0x89, 0x3c, 0x92, 0x08, 0x48, 0x05, 0x25, 0x4c, 0x6d, 0x16, - 0xa6, 0xda, 0xbf, 0x30, 0x61, 0xe1, 0x03, 0x36, 0x61, 0x03, 0x3a, 0xf1, 0x31, 0x8d, 0xc8, 0x5e, - 0xce, 0xc2, 0x4a, 0xd8, 0xa2, 0xb2, 0xac, 0xcb, 0xd0, 0x3c, 0xf4, 0x93, 0xec, 0x98, 0xfb, 0xb5, + 0xa6, 0xda, 0xbf, 0x30, 0x61, 0xe1, 0x03, 0x36, 0x61, 0x03, 0x3a, 0xf1, 0x11, 0x8d, 0xc8, 0x5e, + 0xce, 0xc2, 0x4a, 0xd8, 0xa2, 0xb2, 0xac, 0xcb, 0xd0, 0x3c, 0xf0, 0x93, 0xec, 0x88, 0xfb, 0xb5, 0xeb, 0x20, 0xc1, 0xb8, 0x24, 0x74, 0x7d, 0x74, 0x66, 0xdb, 0x41, 0x42, 0x0c, 0x68, 0x41, 0x62, 0xaf, 0xcf, 0xb1, 0x76, 0x6d, 0x8e, 0xd5, 0x63, 0x03, 0xc6, 0xc5, 0x86, 0xfd, 0x6f, 0x03, 0xe0, 0x56, 0xe2, 0x93, 0xc8, 0xe3, 0xd0, 0x54, 0x26, 0xb7, 0x51, 0x9f, 0xdc, 0x6b, 0xd0, 0x4a, 0x48, - 0xe8, 0x26, 0x27, 0x45, 0xf0, 0x23, 0x55, 0x31, 0xa8, 0x51, 0x33, 0xe8, 0x55, 0x80, 0x23, 0xde, + 0xe8, 0x26, 0xc7, 0x45, 0xf0, 0x23, 0x55, 0x31, 0xa8, 0x51, 0x33, 0xe8, 0x55, 0x80, 0x43, 0xde, 0x0f, 0xd3, 0xc3, 0xa1, 0xea, 0xbc, 0xfc, 0x89, 0x6b, 0xb5, 0x65, 0xf0, 0x5a, 0xe1, 0x25, 0x47, 0x69, 0xce, 0x66, 0x96, 0xeb, 0x79, 0x22, 0x80, 0x9b, 0x38, 0xb3, 0x24, 0x63, 0x4c, 0xfc, 0xb6, - 0xce, 0x88, 0xdf, 0x79, 0x19, 0x14, 0xff, 0x34, 0xa0, 0xbd, 0x15, 0xb8, 0x83, 0x93, 0x29, 0x87, - 0xae, 0x0f, 0xd1, 0xac, 0x0d, 0xf1, 0x36, 0x74, 0x0f, 0x99, 0xba, 0x62, 0x08, 0x1c, 0x85, 0xce, + 0xce, 0x88, 0xdf, 0x79, 0x19, 0x14, 0xff, 0x34, 0xa0, 0xbd, 0x15, 0xb8, 0x83, 0xe3, 0x29, 0x87, + 0xae, 0x0f, 0xd1, 0xac, 0x0d, 0xf1, 0x36, 0x74, 0x0f, 0x98, 0xba, 0x62, 0x08, 0x1c, 0x85, 0xce, 0xcb, 0x9f, 0x1a, 0x33, 0x4a, 0x7d, 0x52, 0x38, 0xba, 0x9c, 0x3e, 0xdc, 0xb9, 0xf3, 0x87, 0xdb, 0x3c, 0x63, 0xb8, 0x2d, 0x39, 0xdc, 0xbf, 0x9a, 0xb0, 0xc8, 0x17, 0x3a, 0x87, 0x8c, 0x72, 0x92, 0x66, 0xd6, 0xd7, 0x61, 0x21, 0x2f, 0x4c, 0x35, 0xa6, 0x35, 0x55, 0x8a, 0x58, 0xaf, 0x88, 0x65, - 0x95, 0xcb, 0x9b, 0x5c, 0xfe, 0xca, 0x18, 0x79, 0x99, 0xd3, 0x9c, 0xb2, 0x39, 0x4b, 0x41, 0xc7, + 0x95, 0xcb, 0x9b, 0x5c, 0xfe, 0xca, 0x18, 0x79, 0x99, 0xd3, 0x9c, 0xb2, 0x39, 0x4b, 0x41, 0x47, 0x6e, 0xe4, 0x05, 0xc4, 0x21, 0x69, 0x1e, 0x64, 0x62, 0xb5, 0xd4, 0x78, 0x18, 0x69, 0xa3, 0xdd, 0x74, 0x28, 0x12, 0x94, 0xa0, 0x18, 0x3a, 0xd8, 0x8e, 0x7d, 0xc2, 0xa1, 0x97, 0x0c, 0x36, 0x51, 0x13, 0x32, 0xe2, 0x1e, 0xc2, 0x69, 0x55, 0x90, 0x65, 0x9f, 0x02, 0x35, 0x0c, 0x04, 0x8d, 0xc7, @@ -4935,132 +4935,131 @@ var fileDescriptor_ws_4f11937c2cee8c46 = []byte{ 0xd4, 0xf3, 0x84, 0x05, 0x73, 0x1c, 0x70, 0xf4, 0x26, 0xff, 0xcd, 0xc0, 0x8c, 0xdd, 0x04, 0xb5, 0x61, 0x90, 0x4b, 0x9a, 0xe5, 0x01, 0x9a, 0x78, 0x22, 0x73, 0x34, 0x1d, 0x24, 0xd8, 0xe4, 0x2f, 0xfb, 0xe3, 0x05, 0x4d, 0x0b, 0xd7, 0x75, 0x9d, 0x7b, 0x6e, 0x0d, 0xf6, 0x22, 0xac, 0xa4, 0xf9, - 0x61, 0x39, 0xb8, 0xbd, 0x3c, 0x14, 0xe1, 0x5e, 0xe3, 0x33, 0x50, 0xb1, 0x38, 0x63, 0x8d, 0x30, - 0xd5, 0x94, 0x8c, 0x6a, 0x55, 0x60, 0xbf, 0x6d, 0xc2, 0xca, 0x7e, 0x32, 0x74, 0x23, 0xff, 0xfb, - 0xbc, 0xdc, 0xe4, 0x0b, 0xf8, 0x2c, 0x29, 0x77, 0x03, 0x3a, 0x24, 0x1a, 0x06, 0x7e, 0x7a, 0xbc, - 0x57, 0xe2, 0xa6, 0xb2, 0x54, 0xb0, 0xe7, 0x26, 0x25, 0xe5, 0xa6, 0x96, 0x94, 0xd7, 0xa0, 0x15, - 0xd2, 0x43, 0x3f, 0x28, 0xe2, 0x5e, 0x50, 0x3c, 0xe6, 0x49, 0x40, 0x78, 0x76, 0x96, 0x31, 0x5f, - 0x30, 0xca, 0x44, 0xbd, 0x30, 0x36, 0x51, 0xb7, 0xd5, 0x44, 0xad, 0x03, 0x0f, 0x35, 0xe0, 0x11, - 0xae, 0x8e, 0x84, 0xeb, 0xcf, 0x06, 0xac, 0x94, 0x70, 0x63, 0x0d, 0x3a, 0x11, 0x2e, 0x1b, 0x16, - 0x77, 0xd4, 0x08, 0x14, 0x8b, 0x87, 0xca, 0x63, 0x66, 0xed, 0xf3, 0xb8, 0xc1, 0x35, 0x15, 0x09, - 0x06, 0xf4, 0x01, 0x4d, 0x7d, 0xa5, 0xde, 0x97, 0x34, 0xeb, 0xed, 0x1e, 0x71, 0x15, 0xb0, 0x90, - 0x62, 0xfc, 0x3e, 0x56, 0xdd, 0x18, 0x63, 0x82, 0x62, 0x43, 0xb8, 0x29, 0xf3, 0xe8, 0xcd, 0x47, - 0xf6, 0x7b, 0x06, 0xac, 0x60, 0x7e, 0x50, 0x26, 0xcb, 0x3e, 0xac, 0xd0, 0x4a, 0x14, 0x88, 0x24, - 0xf3, 0xe9, 0x31, 0x49, 0xa2, 0x1a, 0x30, 0x4e, 0x4d, 0xd8, 0x7a, 0x03, 0x2e, 0x7b, 0x15, 0x9c, - 0xee, 0xf9, 0x69, 0xd6, 0x33, 0x37, 0x1a, 0x13, 0x94, 0x56, 0x61, 0x75, 0xc6, 0x2a, 0xb0, 0x7f, - 0x00, 0xbd, 0x83, 0x3c, 0x08, 0x76, 0x49, 0x9a, 0xba, 0x43, 0xb2, 0xf5, 0xb8, 0x4f, 0x46, 0x8c, + 0x41, 0x39, 0xb8, 0xbd, 0x3c, 0x14, 0xe1, 0x5e, 0xe3, 0x33, 0x50, 0xb1, 0x38, 0x63, 0x8d, 0x30, + 0xd5, 0x94, 0x8c, 0x6a, 0x55, 0x60, 0xbf, 0x6d, 0xc2, 0xca, 0xfd, 0x64, 0xe8, 0x46, 0xfe, 0xf7, + 0x79, 0xb9, 0xc9, 0x17, 0xf0, 0x59, 0x52, 0xee, 0x06, 0x74, 0x48, 0x34, 0x0c, 0xfc, 0xf4, 0x68, + 0xaf, 0xc4, 0x4d, 0x65, 0xa9, 0x60, 0xcf, 0x4d, 0x4a, 0xca, 0x4d, 0x2d, 0x29, 0xaf, 0x41, 0x2b, + 0xa4, 0x07, 0x7e, 0x50, 0xc4, 0xbd, 0xa0, 0x78, 0xcc, 0x93, 0x80, 0xf0, 0xec, 0x2c, 0x63, 0xbe, + 0x60, 0x94, 0x89, 0x7a, 0x61, 0x6c, 0xa2, 0x6e, 0xab, 0x89, 0x5a, 0x07, 0x1e, 0x6a, 0xc0, 0x23, + 0x5c, 0x1d, 0x09, 0xd7, 0x9f, 0x0d, 0x58, 0x29, 0xe1, 0xc6, 0x1a, 0x74, 0x22, 0x5c, 0xd5, 0x08, + 0x34, 0xc7, 0x44, 0xa0, 0x8c, 0x9b, 0x86, 0x1a, 0x37, 0x2c, 0xd2, 0x68, 0xea, 0x2b, 0xf5, 0xbe, + 0xa4, 0x59, 0x6f, 0x01, 0x71, 0x15, 0xb0, 0x90, 0x52, 0xaa, 0xee, 0x96, 0x56, 0x75, 0x57, 0xf3, + 0xe8, 0x7b, 0x06, 0xac, 0x60, 0x7e, 0x50, 0x26, 0xcb, 0x7d, 0x58, 0xa1, 0x95, 0x28, 0x10, 0x49, + 0xe6, 0xd3, 0x63, 0x92, 0x44, 0x35, 0x60, 0x9c, 0x9a, 0xb0, 0xf5, 0x06, 0x5c, 0xf6, 0x2a, 0x38, + 0xdd, 0xf3, 0xd3, 0xac, 0x67, 0x6e, 0x34, 0x26, 0x28, 0xad, 0xc2, 0xea, 0x8c, 0x55, 0x60, 0xff, + 0x00, 0x7a, 0xfb, 0x79, 0x10, 0xec, 0x92, 0x34, 0x75, 0x87, 0x64, 0xeb, 0xb4, 0x4f, 0x46, 0x8c, 0xef, 0x90, 0x34, 0x66, 0x11, 0x46, 0x92, 0x64, 0x9b, 0x7a, 0x84, 0x1b, 0xdf, 0x74, 0x0a, 0x92, 0x81, 0x43, 0x92, 0x84, 0x2d, 0x33, 0xa2, 0x0e, 0x42, 0xca, 0xba, 0x06, 0x73, 0x01, 0x33, 0xab, 0xc1, 0xcd, 0x5a, 0x1f, 0x63, 0xd6, 0x6e, 0x3a, 0xdc, 0x71, 0x33, 0xd7, 0xe1, 0xed, 0xec, 0x10, 0x3e, 0x36, 0xbe, 0xf7, 0xd1, 0xc4, 0x28, 0x60, 0x95, 0x0a, 0x4f, 0xf5, 0x3e, 0x8d, 0x64, 0x10, 0xa8, 0x2c, 0x66, 0x76, 0x8a, 0x7a, 0xb8, 0x1d, 0x5d, 0xa7, 0x20, 0xed, 0xcb, 0x60, 0xdd, 0x26, - 0xd9, 0xae, 0xfb, 0xe8, 0x46, 0xe4, 0xed, 0xfa, 0x51, 0x9f, 0x8c, 0x1c, 0x32, 0xb2, 0x6f, 0xc2, - 0xa5, 0x1a, 0x37, 0x8d, 0xf9, 0x6c, 0x71, 0x1f, 0xf5, 0xc9, 0x88, 0x1b, 0xd0, 0x75, 0x04, 0xc5, + 0xd9, 0xae, 0xfb, 0xf8, 0x46, 0xe4, 0xed, 0xfa, 0x51, 0x9f, 0x8c, 0x1c, 0x32, 0xb2, 0x6f, 0xc2, + 0xa5, 0x1a, 0x37, 0x8d, 0xf9, 0x6c, 0x71, 0x1f, 0xf7, 0xc9, 0x88, 0x1b, 0xd0, 0x75, 0x04, 0xc5, 0xf9, 0xbc, 0x95, 0x28, 0x82, 0x04, 0x65, 0x8f, 0x60, 0x99, 0xb9, 0xaa, 0x4f, 0x22, 0x6f, 0x37, 0x1d, 0x72, 0x15, 0x1b, 0xd0, 0x41, 0x04, 0x76, 0xd3, 0x61, 0x59, 0x55, 0x29, 0x2c, 0xd6, 0x62, 0x10, 0xf8, 0xcc, 0x25, 0xbc, 0x85, 0x18, 0x8d, 0xc2, 0x62, 0xb1, 0x9b, 0x12, 0xb1, 0xc9, 0x60, - 0x41, 0xdd, 0x70, 0x24, 0x6d, 0xbf, 0xd7, 0x84, 0x79, 0x01, 0x28, 0xdf, 0x25, 0xb2, 0x42, 0x56, - 0xe2, 0x85, 0x14, 0xa6, 0x9c, 0xc1, 0x69, 0xb9, 0x5f, 0x43, 0x4a, 0xdd, 0xe1, 0x35, 0xf4, 0x1d, - 0x5e, 0xc5, 0xa6, 0xb9, 0xba, 0x4d, 0x95, 0x71, 0x35, 0xeb, 0xe3, 0x62, 0x2b, 0x2c, 0x5f, 0x74, - 0x0e, 0x02, 0x37, 0x3b, 0xa2, 0x49, 0x28, 0xea, 0xd2, 0xa6, 0x53, 0xe3, 0xb3, 0x55, 0x1d, 0x79, - 0x32, 0x2d, 0xe3, 0xec, 0xaa, 0x70, 0x59, 0x12, 0x44, 0x4e, 0x91, 0x9e, 0x71, 0x43, 0xa0, 0x33, - 0xd1, 0xb6, 0x34, 0xf5, 0x69, 0xc4, 0x13, 0x04, 0x66, 0x61, 0x95, 0xc5, 0x46, 0x1e, 0xa6, 0xc3, - 0x5b, 0x09, 0x0d, 0xc5, 0xb6, 0xa0, 0x20, 0xf9, 0xc8, 0x69, 0x94, 0x15, 0xc9, 0xa5, 0x83, 0xb2, - 0x0a, 0x8b, 0xc9, 0x0a, 0x92, 0xa7, 0xe0, 0x45, 0xa7, 0x20, 0xad, 0x15, 0x68, 0xa4, 0x64, 0x24, - 0xf2, 0x2a, 0xfb, 0xa9, 0x79, 0x6e, 0x59, 0xf7, 0x5c, 0x65, 0xa1, 0x5c, 0xe1, 0x5f, 0xd5, 0x85, - 0xb2, 0xdc, 0xf3, 0xaf, 0x6a, 0x7b, 0xfe, 0x1b, 0x30, 0x4f, 0x63, 0x16, 0xe7, 0x69, 0xcf, 0xe2, - 0x73, 0xec, 0x33, 0x93, 0xe7, 0xd8, 0xb5, 0x7d, 0x6c, 0x79, 0x33, 0xca, 0x92, 0xc7, 0x4e, 0x21, - 0x67, 0xdd, 0x83, 0x65, 0x7a, 0x74, 0x14, 0xf8, 0x11, 0x39, 0xc8, 0xd3, 0x63, 0x5e, 0xbf, 0x5e, - 0xe2, 0x4b, 0x93, 0x3d, 0x6e, 0x69, 0xd2, 0x5b, 0x3a, 0x55, 0xd1, 0xf5, 0x57, 0x60, 0x51, 0xed, - 0x86, 0xc1, 0x70, 0x42, 0x1e, 0x8b, 0x18, 0x64, 0x3f, 0xd9, 0x92, 0x7c, 0xea, 0x06, 0x39, 0xa6, - 0xb8, 0x05, 0x07, 0x89, 0x57, 0xcc, 0xaf, 0x18, 0xf6, 0xcf, 0x0d, 0x58, 0xae, 0x74, 0xc0, 0x5a, - 0x67, 0x7e, 0x16, 0x10, 0xa1, 0x01, 0x09, 0x56, 0x3e, 0x78, 0x24, 0x1d, 0x88, 0x10, 0xe6, 0xbf, - 0x45, 0x2e, 0x69, 0xc8, 0x4d, 0xa1, 0x0d, 0x8b, 0xfe, 0x7e, 0x9f, 0x29, 0xea, 0xd3, 0x3c, 0xf2, - 0xe4, 0xc1, 0x8e, 0xc2, 0x63, 0x21, 0xe4, 0xef, 0xf7, 0xb7, 0x5c, 0x6f, 0x48, 0xf0, 0xf8, 0xa5, - 0xc9, 0x6d, 0xd2, 0x99, 0xb6, 0x07, 0x0b, 0xf7, 0xfd, 0x38, 0xdd, 0xa6, 0x61, 0xc8, 0x1c, 0xe1, - 0x91, 0x8c, 0x25, 0x3a, 0x83, 0xfb, 0x5b, 0x50, 0x2c, 0x54, 0x3c, 0x72, 0xe4, 0xe6, 0x41, 0xc6, - 0x9a, 0x16, 0x13, 0x57, 0x61, 0xf1, 0x83, 0x87, 0x94, 0x46, 0x3b, 0x28, 0x8d, 0x76, 0x2a, 0x1c, - 0xfb, 0x2f, 0x26, 0xac, 0xf0, 0xed, 0xc1, 0x36, 0x77, 0xbb, 0xc7, 0x85, 0x5e, 0x86, 0x26, 0x9f, - 0x86, 0x22, 0x5b, 0x9c, 0xbd, 0xa5, 0xc0, 0xa6, 0xd6, 0x75, 0x68, 0xd1, 0x98, 0xa7, 0x18, 0xdc, - 0x87, 0x3c, 0x3f, 0x49, 0x48, 0x3f, 0xe3, 0x71, 0x84, 0x94, 0x75, 0x0b, 0x20, 0x2c, 0x33, 0x0a, - 0x2e, 0xdd, 0xd3, 0xea, 0x50, 0x24, 0x19, 0xb8, 0x72, 0x19, 0x96, 0x07, 0x3d, 0x0d, 0x47, 0x67, - 0x5a, 0x7b, 0xb0, 0xc4, 0xcd, 0xde, 0x2f, 0xf6, 0x96, 0xdc, 0x07, 0xd3, 0xf7, 0x58, 0x91, 0xb6, - 0x7f, 0x6d, 0x08, 0x18, 0xd9, 0xd7, 0x3e, 0x41, 0xec, 0x4b, 0x48, 0x8c, 0x99, 0x20, 0x59, 0x87, - 0x85, 0x30, 0x57, 0xb6, 0xba, 0x0d, 0x47, 0xd2, 0xa5, 0x8b, 0x1a, 0x53, 0xbb, 0xc8, 0xfe, 0x8d, - 0x01, 0xbd, 0xd7, 0xa8, 0x1f, 0xf1, 0x0f, 0x37, 0xe2, 0x38, 0x10, 0xa7, 0x91, 0x33, 0xfb, 0xfc, - 0x1b, 0xd0, 0x76, 0x51, 0x4d, 0x94, 0x09, 0xb7, 0x4f, 0xb1, 0x7d, 0x2d, 0x65, 0x94, 0x9d, 0x48, - 0x43, 0xdd, 0x89, 0xd8, 0xef, 0x18, 0xb0, 0x84, 0xa0, 0xbc, 0x9e, 0xfb, 0xd9, 0xcc, 0xf6, 0x6d, - 0xc1, 0xc2, 0x28, 0xf7, 0xb3, 0x19, 0xa2, 0x52, 0xca, 0xd5, 0xe3, 0xa9, 0x31, 0x26, 0x9e, 0xec, - 0x77, 0x0d, 0xb8, 0x52, 0x85, 0xf5, 0xc6, 0x60, 0x40, 0xe2, 0x27, 0x39, 0xa5, 0xb4, 0x9d, 0xd8, - 0x5c, 0x65, 0x27, 0x36, 0xd6, 0x64, 0x87, 0xbc, 0x45, 0x06, 0x4f, 0xaf, 0xc9, 0x3f, 0x36, 0xe1, - 0xe3, 0xb7, 0xe5, 0xc4, 0xbb, 0x9f, 0xb8, 0x51, 0x7a, 0x44, 0x92, 0xe4, 0x09, 0xda, 0x7b, 0x0f, - 0xba, 0x11, 0x79, 0x58, 0xda, 0x24, 0xa6, 0xe3, 0xb4, 0x6a, 0x74, 0xe1, 0xe9, 0xd6, 0x2e, 0xfb, - 0x3f, 0x06, 0xac, 0xa0, 0x9e, 0x6f, 0xfa, 0x83, 0x93, 0x27, 0x38, 0xf8, 0x3d, 0x58, 0x3a, 0xe1, - 0x16, 0x30, 0x6a, 0x86, 0x65, 0xbb, 0x22, 0x3d, 0xe5, 0xf0, 0xff, 0x6b, 0xc0, 0x2a, 0x2a, 0xba, - 0x1b, 0x9d, 0xfa, 0x4f, 0x32, 0x58, 0x0f, 0x60, 0xd9, 0x47, 0x13, 0x66, 0x04, 0xa0, 0x2a, 0x3e, - 0x25, 0x02, 0x7f, 0x34, 0x60, 0x19, 0x35, 0xdd, 0x8c, 0x32, 0x92, 0xcc, 0x3c, 0xfe, 0x3b, 0x6c, - 0x77, 0x9f, 0x25, 0x6e, 0x34, 0xcb, 0x0a, 0xa9, 0x8a, 0x4e, 0xb9, 0x48, 0xbe, 0x63, 0x80, 0xc5, - 0x55, 0xed, 0xf8, 0x69, 0xe8, 0xa7, 0xe9, 0x13, 0x74, 0xdd, 0x74, 0x06, 0xff, 0xd2, 0x84, 0xcb, - 0x8a, 0x96, 0xdd, 0x3c, 0x7b, 0xda, 0x4d, 0xb6, 0x76, 0xa0, 0xcd, 0x6a, 0x04, 0xf5, 0x88, 0x7f, - 0xda, 0x8e, 0x4a, 0x41, 0x56, 0xc5, 0x72, 0xa2, 0x4f, 0x06, 0x34, 0xf2, 0x52, 0x5e, 0x1c, 0x75, - 0x1d, 0x8d, 0xc7, 0x96, 0xa1, 0x75, 0x45, 0xcd, 0xb6, 0x1b, 0x0d, 0x48, 0xf0, 0xcc, 0x40, 0x64, - 0xff, 0xce, 0x80, 0x25, 0x6c, 0xf2, 0xf4, 0x0f, 0x99, 0xe5, 0x7a, 0x0c, 0xe4, 0x0f, 0x8d, 0x97, - 0x58, 0x78, 0xad, 0x29, 0x5a, 0xd4, 0xba, 0xfa, 0xe9, 0x0d, 0xad, 0x3b, 0xd0, 0x19, 0x1c, 0xbb, - 0xd1, 0x70, 0xa6, 0xe0, 0x52, 0x45, 0xed, 0x13, 0x58, 0xc5, 0x4b, 0x0d, 0xa5, 0x3a, 0x63, 0xfb, - 0x7e, 0xd7, 0xc3, 0xad, 0xbc, 0xc1, 0xbb, 0x2f, 0x48, 0xfd, 0xba, 0x4a, 0xbc, 0x48, 0x28, 0xaf, - 0xab, 0xae, 0x02, 0xb8, 0x9e, 0xf7, 0x06, 0x4d, 0x3c, 0x3f, 0x2a, 0x4a, 0x6d, 0x85, 0x63, 0xbf, - 0x06, 0x8b, 0xb7, 0x12, 0x1a, 0xde, 0x57, 0xae, 0x27, 0xce, 0xbc, 0x40, 0x51, 0xaf, 0x36, 0x4c, - 0xfd, 0x6a, 0xc3, 0xfe, 0x1e, 0x7c, 0xb4, 0x66, 0x38, 0xf7, 0xda, 0x36, 0xde, 0xba, 0x14, 0x9d, - 0x08, 0xe7, 0x7d, 0x72, 0x0c, 0x38, 0xaa, 0x2d, 0x8e, 0x26, 0x64, 0xff, 0xc8, 0x80, 0xe7, 0x6a, - 0xea, 0x6f, 0xc4, 0x71, 0x42, 0x4f, 0x45, 0x44, 0x5f, 0x44, 0x37, 0x7a, 0x19, 0x6a, 0x56, 0xcb, - 0xd0, 0xb1, 0x46, 0x68, 0xa5, 0xf3, 0x07, 0x60, 0xc4, 0x6f, 0x0d, 0x58, 0x16, 0x46, 0x78, 0x9e, - 0xe8, 0xf6, 0xcb, 0xd0, 0xc2, 0x1b, 0x5b, 0xd1, 0xe1, 0x73, 0x63, 0x3b, 0x2c, 0x6e, 0x9a, 0x1d, - 0xd1, 0xb8, 0x1e, 0xdb, 0xe6, 0xb8, 0xd8, 0xfe, 0xaa, 0x9c, 0x41, 0x53, 0xdf, 0xa9, 0x0a, 0x01, - 0xfb, 0xdb, 0x45, 0x30, 0xef, 0x90, 0x80, 0x5c, 0x24, 0x46, 0xf6, 0x03, 0x58, 0xe2, 0xd7, 0xc7, - 0x25, 0x06, 0x17, 0xa2, 0xf6, 0x0d, 0x58, 0xe1, 0x6a, 0x2f, 0xdc, 0x5e, 0x39, 0x3b, 0x18, 0x3e, - 0xdb, 0x38, 0xdf, 0x2f, 0x4e, 0xfb, 0x17, 0xe0, 0x52, 0x81, 0xfd, 0x83, 0xd8, 0x93, 0xc7, 0x39, - 0x13, 0x0e, 0xb1, 0xed, 0x2f, 0xc2, 0xda, 0x36, 0x8d, 0x4e, 0x49, 0x92, 0xe2, 0x11, 0x3f, 0x17, - 0x29, 0x24, 0xb4, 0xc9, 0x2f, 0x28, 0xfb, 0x2d, 0x58, 0x57, 0x25, 0xfa, 0x24, 0x3b, 0x48, 0xfc, - 0x53, 0x45, 0x4a, 0x1c, 0xf2, 0x1a, 0xda, 0x21, 0x6f, 0x79, 0x28, 0x6c, 0x6a, 0x87, 0xc2, 0x57, - 0xa0, 0xed, 0xa7, 0x42, 0x01, 0x0f, 0xaa, 0x05, 0xa7, 0x64, 0xd8, 0x7d, 0x58, 0x15, 0x17, 0xba, - 0x07, 0xee, 0xd0, 0x8f, 0x70, 0x05, 0xbc, 0x0a, 0x10, 0xbb, 0xc3, 0xe2, 0x41, 0x07, 0xde, 0x07, - 0x28, 0x1c, 0xf6, 0x3d, 0x3d, 0xa6, 0x0f, 0xc5, 0x77, 0x13, 0xbf, 0x97, 0x1c, 0xfb, 0x5b, 0x60, - 0x39, 0x24, 0x8d, 0x69, 0x94, 0x12, 0x45, 0xeb, 0x06, 0x74, 0xb6, 0xf3, 0x24, 0x21, 0x11, 0xeb, - 0xaa, 0x78, 0xdd, 0xa0, 0xb2, 0x98, 0xde, 0x7e, 0xa9, 0x17, 0xcf, 0x90, 0x15, 0x8e, 0xfd, 0xab, - 0x06, 0xb4, 0xfb, 0xfe, 0x30, 0x72, 0x03, 0x87, 0x8c, 0xac, 0xaf, 0x41, 0x0b, 0x2b, 0x7b, 0xe1, - 0xc6, 0x71, 0x67, 0x9a, 0xd8, 0x1a, 0xb7, 0x30, 0x0e, 0x19, 0xdd, 0xf9, 0x88, 0x23, 0x64, 0xac, - 0xd7, 0xa1, 0x8b, 0xbf, 0xee, 0xe2, 0x49, 0x8d, 0xc8, 0x58, 0x9f, 0x3d, 0x47, 0x89, 0x68, 0x8d, - 0xba, 0x74, 0x0d, 0xcc, 0xa0, 0x01, 0xcf, 0xfc, 0x62, 0xee, 0x4e, 0x36, 0x08, 0x0b, 0x04, 0x61, - 0x10, 0xca, 0x30, 0x69, 0x97, 0x9f, 0x65, 0x88, 0x84, 0x36, 0x59, 0x1a, 0x8f, 0x3c, 0x84, 0x34, - 0xca, 0x30, 0xe9, 0xe3, 0x3c, 0x1a, 0x3e, 0x88, 0xc5, 0x11, 0xdb, 0x64, 0xe9, 0x3b, 0xbc, 0x99, - 0x90, 0x46, 0x19, 0x26, 0x9d, 0xf0, 0x95, 0x95, 0x83, 0x7e, 0x96, 0x34, 0x2e, 0xc0, 0x42, 0x1a, - 0x65, 0xb6, 0xda, 0x30, 0x1f, 0xbb, 0x8f, 0x03, 0xea, 0x7a, 0xf6, 0xdb, 0x0d, 0x80, 0xa2, 0x61, - 0xca, 0xeb, 0x01, 0xcd, 0x45, 0x9b, 0xe7, 0xba, 0x28, 0x0e, 0x1e, 0x2b, 0x4e, 0xea, 0x8f, 0x77, - 0xd2, 0xe7, 0xa6, 0x75, 0x12, 0x6a, 0xab, 0xb8, 0xe9, 0x7a, 0xc5, 0x4d, 0x9b, 0xe7, 0xba, 0x49, - 0x18, 0x25, 0x1c, 0x75, 0xbd, 0xe2, 0xa8, 0xcd, 0x73, 0x1d, 0x25, 0xe4, 0x85, 0xab, 0xae, 0x57, - 0x5c, 0xb5, 0x79, 0xae, 0xab, 0x84, 0xbc, 0x70, 0xd6, 0xf5, 0x8a, 0xb3, 0x36, 0xcf, 0x75, 0x96, - 0x90, 0xaf, 0xbb, 0xeb, 0x5d, 0x13, 0x96, 0x38, 0x64, 0x78, 0x9f, 0x16, 0x1d, 0x51, 0x7e, 0x6c, - 0xce, 0xe1, 0xd2, 0xdf, 0x07, 0xe9, 0x4c, 0xeb, 0xf3, 0xb0, 0x8a, 0x0c, 0xf1, 0x9e, 0x44, 0x5e, - 0x50, 0xb6, 0x9d, 0xfa, 0x07, 0x7e, 0x03, 0x92, 0xa7, 0x19, 0x0d, 0x77, 0xdc, 0xcc, 0x2d, 0x2a, - 0xa3, 0x92, 0xa3, 0xde, 0x4f, 0xcd, 0xd5, 0x5e, 0x20, 0x26, 0x94, 0x86, 0xf2, 0xe2, 0x49, 0x50, - 0x4c, 0x22, 0xf3, 0x43, 0x42, 0xf3, 0x4c, 0x2c, 0x13, 0x05, 0x89, 0x77, 0xf8, 0x9e, 0xef, 0xf2, - 0x5b, 0x1d, 0x71, 0xc1, 0x2d, 0x19, 0x7c, 0x65, 0x2b, 0x6f, 0xa9, 0xc4, 0x0b, 0xc1, 0x92, 0x73, - 0xfe, 0x8d, 0x92, 0xfd, 0x0f, 0x03, 0x2e, 0x1d, 0xb8, 0x49, 0xe6, 0x0f, 0xfc, 0xd8, 0x8d, 0xb2, - 0x5d, 0x92, 0xb9, 0x7c, 0x0c, 0xda, 0x23, 0x21, 0xe3, 0xfd, 0x3d, 0x12, 0x3a, 0x80, 0xe5, 0xa1, - 0x5e, 0x84, 0xbf, 0xcf, 0xfa, 0xb9, 0x2a, 0xae, 0xbd, 0x78, 0x6a, 0xbc, 0xef, 0x17, 0x4f, 0xf6, - 0x4f, 0x4d, 0x58, 0xae, 0x2c, 0x9d, 0xac, 0x1c, 0xc5, 0x42, 0x43, 0xc6, 0x84, 0xa4, 0xad, 0x1b, - 0x00, 0xbe, 0x0c, 0xa3, 0x33, 0xce, 0xa8, 0xf5, 0x58, 0x73, 0x14, 0xa1, 0x71, 0x57, 0x55, 0x8d, - 0x99, 0xaf, 0xaa, 0xd8, 0x16, 0x21, 0x2e, 0x9d, 0x74, 0xc6, 0x16, 0x61, 0x8c, 0x2b, 0x1d, 0x55, - 0xd4, 0xfe, 0x2e, 0xac, 0xd6, 0x56, 0x28, 0x7e, 0x73, 0x45, 0x4f, 0x48, 0x24, 0x6f, 0xae, 0x18, - 0xa1, 0x04, 0xab, 0x59, 0x0d, 0xd6, 0xc0, 0x3f, 0x55, 0x9f, 0x54, 0x0a, 0xd2, 0xfe, 0x99, 0x09, - 0x6b, 0xe3, 0xb3, 0xcb, 0xb3, 0x0a, 0xf7, 0x21, 0xf4, 0x26, 0xad, 0xe4, 0x17, 0x86, 0x7a, 0x19, - 0xdd, 0x32, 0x0f, 0x3f, 0xab, 0x70, 0x5f, 0x2a, 0xa2, 0x5b, 0x49, 0x75, 0xf6, 0x1f, 0x24, 0x3e, - 0xb2, 0xd2, 0x78, 0x46, 0xf1, 0xb1, 0x5e, 0x84, 0x15, 0x1c, 0xa6, 0xf2, 0xb6, 0x01, 0x0b, 0xd7, - 0x1a, 0xbf, 0x5c, 0x29, 0x94, 0xb4, 0x7f, 0x61, 0x31, 0xfb, 0x27, 0xa3, 0xf0, 0x89, 0xac, 0xdf, - 0x3e, 0x54, 0x3e, 0x29, 0x23, 0x4d, 0x29, 0x6a, 0x94, 0x48, 0x93, 0x75, 0xe5, 0xff, 0x23, 0xed, - 0xfc, 0x48, 0x93, 0x58, 0x2a, 0x05, 0x9e, 0xfd, 0x43, 0xe8, 0xee, 0x90, 0x60, 0x37, 0x1d, 0x16, - 0xaf, 0xaa, 0xce, 0x02, 0x72, 0xd2, 0x3f, 0x3b, 0x26, 0xbe, 0xa7, 0xaa, 0xbe, 0xc5, 0x9a, 0xab, - 0xbd, 0xc5, 0xb2, 0xb7, 0x60, 0x49, 0x35, 0x60, 0x96, 0x47, 0x65, 0x5b, 0x57, 0xbe, 0xb3, 0x7e, - 0xed, 0x25, 0xfc, 0x0f, 0xd1, 0xab, 0x35, 0x10, 0x0f, 0x5b, 0xfc, 0x3f, 0x45, 0x5f, 0xfa, 0x5f, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0xff, 0x7e, 0x96, 0x66, 0x34, 0x00, 0x00, + 0x41, 0xdd, 0x70, 0x24, 0x6d, 0xbf, 0xd7, 0x84, 0x79, 0x01, 0x28, 0x8f, 0x57, 0x56, 0xc8, 0x4a, + 0xbc, 0x90, 0xc2, 0x94, 0x33, 0x38, 0x29, 0xf7, 0x6b, 0x48, 0xa9, 0x3b, 0xbc, 0x86, 0xbe, 0xc3, + 0xab, 0xd8, 0x34, 0x57, 0xb7, 0xa9, 0x32, 0xae, 0x66, 0x7d, 0x5c, 0x6c, 0x85, 0xe5, 0x8b, 0xce, + 0x7e, 0xe0, 0x66, 0x87, 0x34, 0x09, 0x45, 0x5d, 0xda, 0x74, 0x6a, 0x7c, 0xb6, 0xaa, 0x23, 0x4f, + 0xa6, 0x65, 0x9c, 0x5d, 0x15, 0x2e, 0x4b, 0x82, 0xc8, 0x29, 0xd2, 0x33, 0x6e, 0x08, 0x74, 0x26, + 0xda, 0x96, 0xa6, 0x3e, 0x8d, 0x78, 0x82, 0xc0, 0x2c, 0xac, 0xb2, 0xd8, 0xc8, 0xc3, 0x74, 0x78, + 0x2b, 0xa1, 0xa1, 0xd8, 0x16, 0x14, 0x24, 0x1f, 0x39, 0x8d, 0xb2, 0x22, 0xb9, 0x74, 0x50, 0x56, + 0x61, 0x31, 0x59, 0x41, 0xf2, 0x14, 0xbc, 0xe8, 0x14, 0xa4, 0xb5, 0x02, 0x8d, 0x94, 0x8c, 0x44, + 0x5e, 0x65, 0x3f, 0x35, 0xcf, 0x2d, 0xeb, 0x9e, 0xab, 0x2c, 0x94, 0x2b, 0xfc, 0xab, 0xba, 0x50, + 0x96, 0xab, 0xcf, 0xaa, 0xb6, 0xfa, 0xdc, 0x80, 0x79, 0x1a, 0xb3, 0x38, 0x4f, 0x7b, 0x16, 0x9f, + 0x63, 0x9f, 0x99, 0x3c, 0xc7, 0xae, 0xdd, 0xc7, 0x96, 0x37, 0xa3, 0x2c, 0x39, 0x75, 0x0a, 0x39, + 0xeb, 0x1e, 0x2c, 0xd3, 0xc3, 0xc3, 0xc0, 0x8f, 0xc8, 0x7e, 0x9e, 0x1e, 0xf1, 0xfa, 0xf5, 0x12, + 0x5f, 0x9a, 0xec, 0x71, 0x4b, 0x93, 0xde, 0xd2, 0xa9, 0x8a, 0xae, 0xbf, 0x02, 0x8b, 0x6a, 0x37, + 0x0c, 0x86, 0x63, 0x72, 0x2a, 0x62, 0x90, 0xfd, 0x64, 0x4b, 0xf2, 0x89, 0x1b, 0xe4, 0x98, 0xe2, + 0x16, 0x1c, 0x24, 0x5e, 0x31, 0xbf, 0x62, 0xd8, 0x3f, 0x37, 0x60, 0xb9, 0xd2, 0x01, 0x6b, 0x9d, + 0xf9, 0x59, 0x40, 0x84, 0x06, 0x24, 0x58, 0xf9, 0xe0, 0x91, 0x74, 0x20, 0x42, 0x98, 0xff, 0x16, + 0x0b, 0x71, 0x43, 0x6e, 0x0a, 0x6d, 0x58, 0xf4, 0xef, 0xf7, 0x99, 0xa2, 0x3e, 0xcd, 0x23, 0x4f, + 0x1e, 0xec, 0x28, 0x3c, 0x16, 0x42, 0xfe, 0xfd, 0xfe, 0x96, 0xeb, 0x0d, 0x09, 0x1e, 0xbf, 0x34, + 0xb9, 0x4d, 0x3a, 0xd3, 0xf6, 0x60, 0xe1, 0x81, 0x1f, 0xa7, 0xdb, 0x34, 0x0c, 0x99, 0x23, 0x3c, + 0x92, 0xb1, 0x44, 0x67, 0x70, 0x7f, 0x0b, 0x8a, 0x85, 0x8a, 0x47, 0x0e, 0xdd, 0x3c, 0xc8, 0x58, + 0xd3, 0x62, 0xe2, 0x2a, 0x2c, 0x7e, 0xf0, 0x90, 0xd2, 0x68, 0x07, 0xa5, 0xd1, 0x4e, 0x85, 0x63, + 0xff, 0xc5, 0x84, 0x15, 0xbe, 0x3d, 0xd8, 0xe6, 0x6e, 0xf7, 0xb8, 0xd0, 0xcb, 0xd0, 0xe4, 0xd3, + 0x50, 0x64, 0x8b, 0xb3, 0xb7, 0x14, 0xd8, 0xd4, 0xba, 0x0e, 0x2d, 0x1a, 0xf3, 0x14, 0x83, 0xfb, + 0x90, 0xe7, 0x27, 0x09, 0xe9, 0x67, 0x3c, 0x8e, 0x90, 0xb2, 0x6e, 0x01, 0x84, 0x65, 0x46, 0xc1, + 0xa5, 0x7b, 0x5a, 0x1d, 0x8a, 0x24, 0x03, 0x57, 0x2e, 0xc3, 0xf2, 0xa0, 0xa7, 0xe1, 0xe8, 0x4c, + 0x6b, 0x0f, 0x96, 0xb8, 0xd9, 0xf7, 0x8b, 0xbd, 0x25, 0xf7, 0xc1, 0xf4, 0x3d, 0x56, 0xa4, 0xed, + 0x5f, 0x1b, 0x02, 0x46, 0xf6, 0xb5, 0x4f, 0x10, 0xfb, 0x12, 0x12, 0x63, 0x26, 0x48, 0xd6, 0x61, + 0x21, 0xcc, 0x95, 0xad, 0x6e, 0xc3, 0x91, 0x74, 0xe9, 0xa2, 0xc6, 0xd4, 0x2e, 0xb2, 0x7f, 0x63, + 0x40, 0xef, 0x35, 0xea, 0x47, 0xfc, 0xc3, 0x8d, 0x38, 0x0e, 0xc4, 0x69, 0xe4, 0xcc, 0x3e, 0xff, + 0x06, 0xb4, 0x5d, 0x54, 0x13, 0x65, 0xc2, 0xed, 0x53, 0x6c, 0x5f, 0x4b, 0x19, 0x65, 0x27, 0xd2, + 0x50, 0x77, 0x22, 0xf6, 0x3b, 0x06, 0x2c, 0x21, 0x28, 0xaf, 0xe7, 0x7e, 0x36, 0xb3, 0x7d, 0x5b, + 0xb0, 0x30, 0xca, 0xfd, 0x6c, 0x86, 0xa8, 0x94, 0x72, 0xf5, 0x78, 0x6a, 0x8c, 0x89, 0x27, 0xfb, + 0x5d, 0x03, 0xae, 0x54, 0x61, 0xbd, 0x31, 0x18, 0x90, 0xf8, 0x49, 0x4e, 0x29, 0x6d, 0x27, 0x36, + 0x57, 0xd9, 0x89, 0x8d, 0x35, 0xd9, 0x21, 0x6f, 0x91, 0xc1, 0xd3, 0x6b, 0xf2, 0x8f, 0x4d, 0xf8, + 0xf8, 0x6d, 0x39, 0xf1, 0x1e, 0x24, 0x6e, 0x94, 0x1e, 0x92, 0x24, 0x79, 0x82, 0xf6, 0xde, 0x83, + 0x6e, 0x44, 0x1e, 0x95, 0x36, 0x89, 0xe9, 0x38, 0xad, 0x1a, 0x5d, 0x78, 0xba, 0xb5, 0xcb, 0xfe, + 0x8f, 0x01, 0x2b, 0xa8, 0xe7, 0x9b, 0xfe, 0xe0, 0xf8, 0x09, 0x0e, 0x7e, 0x0f, 0x96, 0x8e, 0xb9, + 0x05, 0x8c, 0x9a, 0x61, 0xd9, 0xae, 0x48, 0x4f, 0x39, 0xfc, 0xff, 0x1a, 0xb0, 0x8a, 0x8a, 0xee, + 0x46, 0x27, 0xfe, 0x93, 0x0c, 0xd6, 0x7d, 0x58, 0xf6, 0xd1, 0x84, 0x19, 0x01, 0xa8, 0x8a, 0x4f, + 0x89, 0xc0, 0x1f, 0x0d, 0x58, 0x46, 0x4d, 0x37, 0xa3, 0x8c, 0x24, 0x33, 0x8f, 0xff, 0x0e, 0xdb, + 0xdd, 0x67, 0x89, 0x1b, 0xcd, 0xb2, 0x42, 0xaa, 0xa2, 0x53, 0x2e, 0x92, 0xef, 0x18, 0x60, 0x71, + 0x55, 0x3b, 0x7e, 0x1a, 0xfa, 0x69, 0xfa, 0x04, 0x5d, 0x37, 0x9d, 0xc1, 0xbf, 0x34, 0xe1, 0xb2, + 0xa2, 0x65, 0x37, 0xcf, 0x9e, 0x76, 0x93, 0xad, 0x1d, 0x68, 0xb3, 0x1a, 0x41, 0x3d, 0xe2, 0x9f, + 0xb6, 0xa3, 0x52, 0x90, 0x55, 0xb1, 0x9c, 0xe8, 0x93, 0x01, 0x8d, 0xbc, 0x94, 0x17, 0x47, 0x5d, + 0x47, 0xe3, 0xb1, 0x65, 0x68, 0x5d, 0x51, 0xb3, 0xed, 0x46, 0x03, 0x12, 0x3c, 0x33, 0x10, 0xd9, + 0xbf, 0x33, 0x60, 0x09, 0x9b, 0x3c, 0xfd, 0x43, 0x66, 0xb9, 0x1e, 0x03, 0xf9, 0x43, 0xe3, 0x25, + 0x16, 0x5e, 0x6b, 0x8a, 0x16, 0xb5, 0xae, 0x7e, 0x7a, 0x43, 0xeb, 0x0e, 0x74, 0x06, 0x47, 0x6e, + 0x34, 0x9c, 0x29, 0xb8, 0x54, 0x51, 0xfb, 0x18, 0x56, 0xf1, 0x52, 0x43, 0xa9, 0xce, 0xd8, 0xbe, + 0xdf, 0xf5, 0x70, 0x2b, 0x6f, 0xf0, 0xee, 0x0b, 0x52, 0xbf, 0xae, 0x12, 0x2f, 0x12, 0xca, 0xeb, + 0xaa, 0xab, 0x00, 0xae, 0xe7, 0xbd, 0x41, 0x13, 0xcf, 0x8f, 0x8a, 0x52, 0x5b, 0xe1, 0xd8, 0xaf, + 0xc1, 0xe2, 0xad, 0x84, 0x86, 0x0f, 0x94, 0xeb, 0x89, 0x33, 0x2f, 0x50, 0xd4, 0xab, 0x0d, 0x53, + 0xbf, 0xda, 0xb0, 0xbf, 0x07, 0x1f, 0xad, 0x19, 0xce, 0xbd, 0xb6, 0x8d, 0xb7, 0x2e, 0x45, 0x27, + 0xc2, 0x79, 0x9f, 0x1c, 0x03, 0x8e, 0x6a, 0x8b, 0xa3, 0x09, 0xd9, 0x3f, 0x32, 0xe0, 0xb9, 0x9a, + 0xfa, 0x1b, 0x71, 0x9c, 0xd0, 0x13, 0x11, 0xd1, 0x17, 0xd1, 0x8d, 0x5e, 0x86, 0x9a, 0xd5, 0x32, + 0x74, 0xac, 0x11, 0x5a, 0xe9, 0xfc, 0x01, 0x18, 0xf1, 0x5b, 0x03, 0x96, 0x85, 0x11, 0x9e, 0x27, + 0xba, 0xfd, 0x32, 0xb4, 0xf0, 0xc6, 0x56, 0x74, 0xf8, 0xdc, 0xd8, 0x0e, 0x8b, 0x9b, 0x66, 0x47, + 0x34, 0xae, 0xc7, 0xb6, 0x39, 0x2e, 0xb6, 0xbf, 0x2a, 0x67, 0xd0, 0xd4, 0x77, 0xaa, 0x42, 0xc0, + 0xfe, 0x76, 0x11, 0xcc, 0x3b, 0x24, 0x20, 0x17, 0x89, 0x91, 0xfd, 0x10, 0x96, 0xf8, 0xf5, 0x71, + 0x89, 0xc1, 0x85, 0xa8, 0x7d, 0x03, 0x56, 0xb8, 0xda, 0x0b, 0xb7, 0x57, 0xce, 0x0e, 0x86, 0xcf, + 0x36, 0xce, 0xf7, 0x8b, 0xd3, 0xfe, 0x05, 0xb8, 0x54, 0x60, 0xff, 0x30, 0xf6, 0xe4, 0x71, 0xce, + 0x84, 0x43, 0x6c, 0xfb, 0x8b, 0xb0, 0xb6, 0x4d, 0xa3, 0x13, 0x92, 0xa4, 0x78, 0xc4, 0xcf, 0x45, + 0x0a, 0x09, 0x6d, 0xf2, 0x0b, 0xca, 0x7e, 0x0b, 0xd6, 0x55, 0x89, 0x3e, 0xc9, 0xf6, 0x13, 0xff, + 0x44, 0x91, 0x12, 0x87, 0xbc, 0x86, 0x76, 0xc8, 0x5b, 0x1e, 0x0a, 0x9b, 0xda, 0xa1, 0xf0, 0x15, + 0x68, 0xfb, 0xa9, 0x50, 0xc0, 0x83, 0x6a, 0xc1, 0x29, 0x19, 0x76, 0x1f, 0x56, 0xc5, 0x85, 0xee, + 0xbe, 0x3b, 0xf4, 0x23, 0x5c, 0x01, 0xaf, 0x02, 0xc4, 0xee, 0xb0, 0x78, 0xd0, 0x81, 0xf7, 0x01, + 0x0a, 0x87, 0x7d, 0x4f, 0x8f, 0xe8, 0x23, 0xf1, 0xdd, 0xc4, 0xef, 0x25, 0xc7, 0xfe, 0x16, 0x58, + 0x0e, 0x49, 0x63, 0x1a, 0xa5, 0x44, 0xd1, 0xba, 0x01, 0x9d, 0xed, 0x3c, 0x49, 0x48, 0xc4, 0xba, + 0x2a, 0x5e, 0x37, 0xa8, 0x2c, 0xa6, 0xb7, 0x5f, 0xea, 0xc5, 0x33, 0x64, 0x85, 0x63, 0xff, 0xaa, + 0x01, 0xed, 0xbe, 0x3f, 0x8c, 0xdc, 0xc0, 0x21, 0x23, 0xeb, 0x6b, 0xd0, 0xc2, 0xca, 0x5e, 0xb8, + 0x71, 0xdc, 0x99, 0x26, 0xb6, 0xc6, 0x2d, 0x8c, 0x43, 0x46, 0x77, 0x3e, 0xe2, 0x08, 0x19, 0xeb, + 0x75, 0xe8, 0xe2, 0xaf, 0xbb, 0x78, 0x52, 0x23, 0x32, 0xd6, 0x67, 0xcf, 0x51, 0x22, 0x5a, 0xa3, + 0x2e, 0x5d, 0x03, 0x33, 0x68, 0xc0, 0x33, 0xbf, 0x98, 0xbb, 0x93, 0x0d, 0xc2, 0x02, 0x41, 0x18, + 0x84, 0x32, 0x4c, 0xda, 0xe5, 0x67, 0x19, 0x22, 0xa1, 0x4d, 0x96, 0xc6, 0x23, 0x0f, 0x21, 0x8d, + 0x32, 0x4c, 0xfa, 0x28, 0x8f, 0x86, 0x0f, 0x63, 0x71, 0xc4, 0x36, 0x59, 0xfa, 0x0e, 0x6f, 0x26, + 0xa4, 0x51, 0x86, 0x49, 0x27, 0x7c, 0x65, 0xe5, 0xa0, 0x9f, 0x25, 0x8d, 0x0b, 0xb0, 0x90, 0x46, + 0x99, 0xad, 0x36, 0xcc, 0xc7, 0xee, 0x69, 0x40, 0x5d, 0xcf, 0x7e, 0xbb, 0x01, 0x50, 0x34, 0x4c, + 0x79, 0x3d, 0xa0, 0xb9, 0x68, 0xf3, 0x5c, 0x17, 0xc5, 0xc1, 0xa9, 0xe2, 0xa4, 0xfe, 0x78, 0x27, + 0x7d, 0x6e, 0x5a, 0x27, 0xa1, 0xb6, 0x8a, 0x9b, 0xae, 0x57, 0xdc, 0xb4, 0x79, 0xae, 0x9b, 0x84, + 0x51, 0xc2, 0x51, 0xd7, 0x2b, 0x8e, 0xda, 0x3c, 0xd7, 0x51, 0x42, 0x5e, 0xb8, 0xea, 0x7a, 0xc5, + 0x55, 0x9b, 0xe7, 0xba, 0x4a, 0xc8, 0x0b, 0x67, 0x5d, 0xaf, 0x38, 0x6b, 0xf3, 0x5c, 0x67, 0x09, + 0xf9, 0xba, 0xbb, 0xde, 0x35, 0x61, 0x89, 0x43, 0x86, 0xf7, 0x69, 0xd1, 0x21, 0xe5, 0xc7, 0xe6, + 0x1c, 0x2e, 0xfd, 0x7d, 0x90, 0xce, 0xb4, 0x3e, 0x0f, 0xab, 0xc8, 0x10, 0xef, 0x49, 0xe4, 0x05, + 0x65, 0xdb, 0xa9, 0x7f, 0xe0, 0x37, 0x20, 0x79, 0x9a, 0xd1, 0x70, 0xc7, 0xcd, 0xdc, 0xa2, 0x32, + 0x2a, 0x39, 0xea, 0xfd, 0xd4, 0x5c, 0xed, 0x05, 0x62, 0x42, 0x69, 0x28, 0x2f, 0x9e, 0x04, 0xc5, + 0x24, 0x32, 0x3f, 0x24, 0x34, 0xcf, 0xc4, 0x32, 0x51, 0x90, 0x78, 0x87, 0xef, 0xf9, 0x2e, 0xbf, + 0xd5, 0x11, 0x17, 0xdc, 0x92, 0xc1, 0x57, 0xb6, 0xf2, 0x96, 0x4a, 0xbc, 0x10, 0x2c, 0x39, 0xe7, + 0xdf, 0x28, 0xd9, 0xff, 0x30, 0xe0, 0xd2, 0xbe, 0x9b, 0x64, 0xfe, 0xc0, 0x8f, 0xdd, 0x28, 0xdb, + 0x25, 0x99, 0xcb, 0xc7, 0xa0, 0x3d, 0x12, 0x32, 0xde, 0xdf, 0x23, 0xa1, 0x7d, 0x58, 0x1e, 0xea, + 0x45, 0xf8, 0xfb, 0xac, 0x9f, 0xab, 0xe2, 0xda, 0x8b, 0xa7, 0xc6, 0xfb, 0x7e, 0xf1, 0x64, 0xff, + 0xd4, 0x84, 0xe5, 0xca, 0xd2, 0xc9, 0xca, 0x51, 0x2c, 0x34, 0x64, 0x4c, 0x48, 0xda, 0xba, 0x01, + 0xe0, 0xcb, 0x30, 0x3a, 0xe3, 0x8c, 0x5a, 0x8f, 0x35, 0x47, 0x11, 0x1a, 0x77, 0x55, 0xd5, 0x98, + 0xf9, 0xaa, 0x8a, 0x6d, 0x11, 0xe2, 0xd2, 0x49, 0x67, 0x6c, 0x11, 0xc6, 0xb8, 0xd2, 0x51, 0x45, + 0xed, 0xef, 0xc2, 0x6a, 0x6d, 0x85, 0xe2, 0x37, 0x57, 0xf4, 0x98, 0x44, 0xf2, 0xe6, 0x8a, 0x11, + 0x4a, 0xb0, 0x9a, 0xd5, 0x60, 0x0d, 0xfc, 0x13, 0xf5, 0x49, 0xa5, 0x20, 0xed, 0x9f, 0x99, 0xb0, + 0x36, 0x3e, 0xbb, 0x3c, 0xab, 0x70, 0x1f, 0x40, 0x6f, 0xd2, 0x4a, 0x7e, 0x61, 0xa8, 0x97, 0xd1, + 0x2d, 0xf3, 0xf0, 0xb3, 0x0a, 0xf7, 0xa5, 0x22, 0xba, 0x95, 0x54, 0x67, 0xff, 0x41, 0xe2, 0x23, + 0x2b, 0x8d, 0x67, 0x14, 0x1f, 0xeb, 0x45, 0x58, 0xc1, 0x61, 0x2a, 0x6f, 0x1b, 0xb0, 0x70, 0xad, + 0xf1, 0xcb, 0x95, 0x42, 0x49, 0xfb, 0x17, 0x16, 0xb3, 0x7f, 0x32, 0x0a, 0x9f, 0xc8, 0xfa, 0xed, + 0x43, 0xe5, 0x93, 0x32, 0xd2, 0x94, 0xa2, 0x46, 0x89, 0x34, 0x59, 0x57, 0xfe, 0x3f, 0xd2, 0xce, + 0x8f, 0x34, 0x89, 0xa5, 0x52, 0xe0, 0xd9, 0x3f, 0x84, 0xee, 0x0e, 0x09, 0x76, 0xd3, 0x61, 0xf1, + 0xaa, 0xea, 0x2c, 0x20, 0x27, 0xfd, 0xb3, 0x63, 0xe2, 0x7b, 0xaa, 0xea, 0x5b, 0xac, 0xb9, 0xda, + 0x5b, 0x2c, 0x7b, 0x0b, 0x96, 0x54, 0x03, 0x66, 0x79, 0x54, 0xb6, 0x75, 0xe5, 0x3b, 0xeb, 0xd7, + 0x5e, 0xc2, 0xff, 0x10, 0xbd, 0x5a, 0x03, 0xf1, 0xa0, 0xc5, 0xff, 0x53, 0xf4, 0xa5, 0xff, 0x05, + 0x00, 0x00, 0xff, 0xff, 0x3c, 0x30, 0x52, 0xe6, 0x66, 0x34, 0x00, 0x00, } diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index 60fdae9d7..b9aa6bf3d 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -138,12 +138,12 @@ message OrganizationUser { message DepartmentMember { string userID = 1; - string DepartmentID = 2; - int32 Order = 3; - string Position = 4; - int32 Leader = 5; - int32 Status = 6; - string Ex = 7; + string departmentID = 2; + int32 order = 3; + string position = 4; + int32 leader = 5; + int32 status = 6; + string ex = 7; } From 1f96b960ab6d427016607c694bee38c29e8f7e81 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 15:51:17 +0800 Subject: [PATCH 49/59] organization --- internal/api/organization/organization.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 4bcd140f4..eeaf49e1e 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -234,9 +234,9 @@ func CreateDepartmentMember(c *gin.Context) { return } - req := &rpc.CreateDepartmentMemberReq{UserInDepartment: &open_im_sdk.UserInDepartment{}} + req := &rpc.CreateDepartmentMemberReq{DepartmentMember: &open_im_sdk.DepartmentMember{}} utils.CopyStructFields(req, ¶ms) - utils.CopyStructFields(req.UserInDepartment, ¶ms) + utils.CopyStructFields(req.DepartmentMember, ¶ms) err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID From 42242daf9bc18bac93bf302e488fd0e603fd8217 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 16:18:10 +0800 Subject: [PATCH 50/59] organization --- cmd/open_im_api/main.go | 2 +- internal/api/organization/organization.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index bbeb522e3..6d8f5d577 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -165,7 +165,7 @@ func main() { organizationGroup.POST("/create_department_member", organization.CreateDepartmentMember) organizationGroup.POST("/get_user_in_department", organization.GetUserInDepartment) - organizationGroup.POST("/update_user_In_department", organization.UpdateUserInDepartment) + organizationGroup.POST("/update_user_in_department", organization.UpdateUserInDepartment) organizationGroup.POST("/get_department_member", organization.GetDepartmentMember) organizationGroup.POST("/delete_user_in_department", organization.DeleteUserInDepartment) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index eeaf49e1e..5b7d1d437 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -299,7 +299,7 @@ func GetUserInDepartment(c *gin.Context) { } func UpdateUserInDepartment(c *gin.Context) { - params := api.UpdateUserInDepartmentReq{DepartmentMember: &open_im_sdk.DepartmentMember{}} + params := api.UpdateUserInDepartmentReq{} if err := c.BindJSON(¶ms); err != nil { log.NewError("0", "BindJSON failed ", err.Error()) c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) From 6873bf384ef2cd9416fd3377521591e875b712fa Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 16:24:12 +0800 Subject: [PATCH 51/59] organization --- internal/api/organization/organization.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 5b7d1d437..986ff01c1 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -307,8 +307,8 @@ func UpdateUserInDepartment(c *gin.Context) { } req := &rpc.UpdateUserInDepartmentReq{DepartmentMember: &open_im_sdk.DepartmentMember{}} + utils.CopyStructFields(req.DepartmentMember, ¶ms) utils.CopyStructFields(req, ¶ms) - err, opUserID := token_verify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID) req.OpUserID = opUserID if err != nil { From c11094a11e52e4655a5748ebb1c5c5300e52ca9a Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 16:27:04 +0800 Subject: [PATCH 52/59] organization --- .../db/mysql_model/im_mysql_model/organization_model.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go index 0b7f1621e..76eb949a0 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go @@ -120,12 +120,12 @@ func UpdateUserInDepartment(departmentMember *db.DepartmentMember, args map[stri if err != nil { return err } - if err = dbConn.Table("department_members").Where("department_id=? ADN user_id=?", departmentMember.DepartmentID, departmentMember.UserID). + if err = dbConn.Table("department_members").Where("department_id=? AND user_id=?", departmentMember.DepartmentID, departmentMember.UserID). Updates(departmentMember).Error; err != nil { return err } if args != nil { - return dbConn.Table("department_members").Where("department_id=? ADN user_id=?", departmentMember.DepartmentID, departmentMember.UserID). + return dbConn.Table("department_members").Where("department_id=? AND user_id=?", departmentMember.DepartmentID, departmentMember.UserID). Updates(args).Error } return nil @@ -136,7 +136,7 @@ func DeleteUserInDepartment(departmentID, userID string) error { if err != nil { return err } - return dbConn.Table("department_members").Where("department_id=? ADN user_id=?", departmentID, userID).Delete(db.DepartmentMember{}).Error + return dbConn.Table("department_members").Where("department_id=? AND user_id=?", departmentID, userID).Delete(db.DepartmentMember{}).Error } func DeleteUserInAllDepartment(userID string) error { From 5f22402761a79decccc8eb44406769d0d55de869 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 16:42:50 +0800 Subject: [PATCH 53/59] organization --- internal/rpc/organization/organization.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index 014e2b710..5c1c3093b 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -236,7 +236,7 @@ func (s *organizationServer) CreateDepartmentMember(ctx context.Context, req *rp return resp, nil } -func (s *organizationServer) GetUserInDepartmentByUserID(userID string) (*open_im_sdk.UserInDepartment, error) { +func (s *organizationServer) GetUserInDepartmentByUserID(userID string, operationID string) (*open_im_sdk.UserInDepartment, error) { err, organizationUser := imdb.GetOrganizationUser(userID) if err != nil { return nil, utils.Wrap(err, "GetOrganizationUser failed") @@ -245,11 +245,13 @@ func (s *organizationServer) GetUserInDepartmentByUserID(userID string) (*open_i if err != nil { return nil, utils.Wrap(err, "GetUserInDepartment failed") } + log.Debug(operationID, "GetUserInDepartment ", departmentMemberList) resp := &open_im_sdk.UserInDepartment{OrganizationUser: &open_im_sdk.OrganizationUser{}} utils.CopyStructFields(resp.OrganizationUser, organizationUser) for _, v := range departmentMemberList { v1 := open_im_sdk.DepartmentMember{} utils.CopyStructFields(&v1, v) + log.Debug(operationID, "DepartmentMember src ", v, "dst ", v1) resp.DepartmentMemberList = append(resp.DepartmentMemberList, &v1) } return resp, nil @@ -257,7 +259,7 @@ func (s *organizationServer) GetUserInDepartmentByUserID(userID string) (*open_i func (s *organizationServer) GetUserInDepartment(ctx context.Context, req *rpc.GetUserInDepartmentReq) (*rpc.GetUserInDepartmentResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) - r, err := s.GetUserInDepartmentByUserID(req.UserID) + r, err := s.GetUserInDepartmentByUserID(req.UserID, req.OperationID) if err != nil { errMsg := req.OperationID + " " + "GetUserInDepartmentByUserID failed " + err.Error() log.Error(req.OperationID, errMsg, req.UserID) @@ -342,7 +344,7 @@ func (s *organizationServer) GetDepartmentMember(ctx context.Context, req *rpc.G resp := rpc.GetDepartmentMemberResp{} for _, v := range departmentMemberUserIDList { - r, err := s.GetUserInDepartmentByUserID(v) + r, err := s.GetUserInDepartmentByUserID(v, req.OperationID) if err != nil { log.Error(req.OperationID, "GetUserInDepartmentByUserID failed ", err.Error()) continue From ad1770ec95da69dbdbaf2b09866f5d1737c23803 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 16:46:03 +0800 Subject: [PATCH 54/59] organization --- pkg/common/db/mysql_model/im_mysql_model/organization_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go index 76eb949a0..8a1006acb 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go @@ -111,7 +111,7 @@ func GetUserInDepartment(userID string) (error, []db.DepartmentMember) { return err, nil } var departmentMemberList []db.DepartmentMember - err = dbConn.Table("department_members").Where("user_id=?", userID).Take(&departmentMemberList).Error + err = dbConn.Table("department_members").Where("user_id=?", userID).Find(&departmentMemberList).Error return err, departmentMemberList } From 114ffd4667f6c5a220892c33ac41f47ca82254a4 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 16:58:41 +0800 Subject: [PATCH 55/59] organization --- internal/rpc/organization/organization.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index 5c1c3093b..a56bdbf40 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -342,6 +342,7 @@ func (s *organizationServer) GetDepartmentMember(ctx context.Context, req *rpc.G return &rpc.GetDepartmentMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil } + log.Debug(req.OperationID, "GetDepartmentMemberUserIDList ", departmentMemberUserIDList) resp := rpc.GetDepartmentMemberResp{} for _, v := range departmentMemberUserIDList { r, err := s.GetUserInDepartmentByUserID(v, req.OperationID) @@ -349,7 +350,7 @@ func (s *organizationServer) GetDepartmentMember(ctx context.Context, req *rpc.G log.Error(req.OperationID, "GetUserInDepartmentByUserID failed ", err.Error()) continue } - log.Debug(req.OperationID, "GetUserInDepartmentByUserID success ", *r) + log.Debug(req.OperationID, "GetUserInDepartmentByUserID success ", *r, "userID ", v) resp.UserInDepartmentList = append(resp.UserInDepartmentList, r) } From b1c66997cac9e4ddc0d5e327109e882822a2df0c Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 17:25:54 +0800 Subject: [PATCH 56/59] organization --- internal/api/organization/organization.go | 4 +- internal/rpc/organization/organization.go | 23 +- pkg/base_info/organization_api_struct.go | 4 +- .../im_mysql_model/organization_model.go | 19 +- pkg/proto/organization/organization.pb.go | 160 ++--- pkg/proto/organization/organization.proto | 2 +- pkg/proto/sdk_ws/ws.pb.go | 567 ++++++++++-------- pkg/proto/sdk_ws/ws.proto | 5 + 8 files changed, 426 insertions(+), 358 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 986ff01c1..240f3a848 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -398,8 +398,8 @@ func GetDepartmentMember(c *gin.Context) { return } - apiResp := api.GetDepartmentMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, UserInDepartmentList: RpcResp.UserInDepartmentList} - apiResp.Data = jsonData.JsonDataList(RpcResp.UserInDepartmentList) + apiResp := api.GetDepartmentMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, UserInDepartmentList: RpcResp.UserDepartmentMemberList} + apiResp.Data = jsonData.JsonDataList(RpcResp.UserDepartmentMemberList) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) c.JSON(http.StatusOK, apiResp) } diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index a56bdbf40..ae09d8915 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -335,23 +335,30 @@ func (s *organizationServer) DeleteOrganizationUser(ctx context.Context, req *rp func (s *organizationServer) GetDepartmentMember(ctx context.Context, req *rpc.GetDepartmentMemberReq) (*rpc.GetDepartmentMemberResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) - err, departmentMemberUserIDList := imdb.GetDepartmentMemberUserIDList(req.DepartmentID) + err, departmentMemberList := imdb.GetDepartmentMemberList(req.DepartmentID) if err != nil { - errMsg := req.OperationID + " " + "GetDepartmentMemberUserIDList failed " + err.Error() + errMsg := req.OperationID + " " + "GetDepartmentMemberList failed " + err.Error() log.Error(req.OperationID, errMsg, req.DepartmentID) return &rpc.GetDepartmentMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil } - log.Debug(req.OperationID, "GetDepartmentMemberUserIDList ", departmentMemberUserIDList) + log.Debug(req.OperationID, "GetDepartmentMemberList ", departmentMemberList) resp := rpc.GetDepartmentMemberResp{} - for _, v := range departmentMemberUserIDList { - r, err := s.GetUserInDepartmentByUserID(v, req.OperationID) + for _, v := range departmentMemberList { + err, organizationUser := imdb.GetOrganizationUser(v.UserID) if err != nil { - log.Error(req.OperationID, "GetUserInDepartmentByUserID failed ", err.Error()) + log.Error(req.OperationID, "GetOrganizationUser failed ", err.Error()) continue } - log.Debug(req.OperationID, "GetUserInDepartmentByUserID success ", *r, "userID ", v) - resp.UserInDepartmentList = append(resp.UserInDepartmentList, r) + respOrganizationUser := &open_im_sdk.OrganizationUser{} + respDepartmentMember := &open_im_sdk.DepartmentMember{} + + utils.CopyStructFields(respOrganizationUser, organizationUser) + utils.CopyStructFields(respDepartmentMember, &v) + userDepartmentMember := open_im_sdk.UserDepartmentMember{OrganizationUser: respOrganizationUser, DepartmentMember: respDepartmentMember} + + log.Debug(req.OperationID, "GetUserInDepartmentByUserID success ", userDepartmentMember) + resp.UserDepartmentMemberList = append(resp.UserDepartmentMemberList, &userDepartmentMember) } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc return ", resp) diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index 87d026f10..31a9c038b 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -96,8 +96,8 @@ type GetDepartmentMemberReq struct { } type GetDepartmentMemberResp struct { CommResp - UserInDepartmentList []*open_im_sdk.UserInDepartment `json:"-"` - Data []map[string]interface{} `json:"data"` + UserInDepartmentList []*open_im_sdk.UserDepartmentMember `json:"-"` + Data []map[string]interface{} `json:"data"` } type DeleteUserInDepartmentReq struct { diff --git a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go index 8a1006acb..180ea0ef3 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/organization_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/organization_model.go @@ -159,12 +159,6 @@ func DeleteOrganizationUser(OrganizationUserID string) error { } func GetDepartmentMemberUserIDList(departmentID string) (error, []string) { - //dbConn, err := db.DB.MysqlDB.DefaultGormDB() - //if err != nil { - // return err - //} - //return dbConn.Table("department_members").Where("user_id=?", userID).Delete(db.DepartmentMember{}).Error - dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { return err, nil @@ -180,3 +174,16 @@ func GetDepartmentMemberUserIDList(departmentID string) (error, []string) { } return err, userIDList } + +func GetDepartmentMemberList(departmentID string) (error, []db.DepartmentMember) { + dbConn, err := db.DB.MysqlDB.DefaultGormDB() + if err != nil { + return err, nil + } + var departmentMemberList []db.DepartmentMember + err = dbConn.Table("department_members").Where("department_id=?", departmentID).Find(&departmentMemberList).Error + if err != nil { + return err, nil + } + return err, departmentMemberList +} diff --git a/pkg/proto/organization/organization.pb.go b/pkg/proto/organization/organization.pb.go index 7da1cd816..b91b96d1f 100644 --- a/pkg/proto/organization/organization.pb.go +++ b/pkg/proto/organization/organization.pb.go @@ -37,7 +37,7 @@ func (m *CreateDepartmentReq) Reset() { *m = CreateDepartmentReq{} } func (m *CreateDepartmentReq) String() string { return proto.CompactTextString(m) } func (*CreateDepartmentReq) ProtoMessage() {} func (*CreateDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{0} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{0} } func (m *CreateDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateDepartmentReq.Unmarshal(m, b) @@ -91,7 +91,7 @@ func (m *CreateDepartmentResp) Reset() { *m = CreateDepartmentResp{} } func (m *CreateDepartmentResp) String() string { return proto.CompactTextString(m) } func (*CreateDepartmentResp) ProtoMessage() {} func (*CreateDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{1} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{1} } func (m *CreateDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateDepartmentResp.Unmarshal(m, b) @@ -145,7 +145,7 @@ func (m *UpdateDepartmentReq) Reset() { *m = UpdateDepartmentReq{} } func (m *UpdateDepartmentReq) String() string { return proto.CompactTextString(m) } func (*UpdateDepartmentReq) ProtoMessage() {} func (*UpdateDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{2} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{2} } func (m *UpdateDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateDepartmentReq.Unmarshal(m, b) @@ -198,7 +198,7 @@ func (m *UpdateDepartmentResp) Reset() { *m = UpdateDepartmentResp{} } func (m *UpdateDepartmentResp) String() string { return proto.CompactTextString(m) } func (*UpdateDepartmentResp) ProtoMessage() {} func (*UpdateDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{3} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{3} } func (m *UpdateDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateDepartmentResp.Unmarshal(m, b) @@ -245,7 +245,7 @@ func (m *GetSubDepartmentReq) Reset() { *m = GetSubDepartmentReq{} } func (m *GetSubDepartmentReq) String() string { return proto.CompactTextString(m) } func (*GetSubDepartmentReq) ProtoMessage() {} func (*GetSubDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{4} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{4} } func (m *GetSubDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSubDepartmentReq.Unmarshal(m, b) @@ -299,7 +299,7 @@ func (m *GetSubDepartmentResp) Reset() { *m = GetSubDepartmentResp{} } func (m *GetSubDepartmentResp) String() string { return proto.CompactTextString(m) } func (*GetSubDepartmentResp) ProtoMessage() {} func (*GetSubDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{5} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{5} } func (m *GetSubDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSubDepartmentResp.Unmarshal(m, b) @@ -353,7 +353,7 @@ func (m *DeleteDepartmentReq) Reset() { *m = DeleteDepartmentReq{} } func (m *DeleteDepartmentReq) String() string { return proto.CompactTextString(m) } func (*DeleteDepartmentReq) ProtoMessage() {} func (*DeleteDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{6} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{6} } func (m *DeleteDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteDepartmentReq.Unmarshal(m, b) @@ -406,7 +406,7 @@ func (m *DeleteDepartmentResp) Reset() { *m = DeleteDepartmentResp{} } func (m *DeleteDepartmentResp) String() string { return proto.CompactTextString(m) } func (*DeleteDepartmentResp) ProtoMessage() {} func (*DeleteDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{7} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{7} } func (m *DeleteDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteDepartmentResp.Unmarshal(m, b) @@ -453,7 +453,7 @@ func (m *CreateOrganizationUserReq) Reset() { *m = CreateOrganizationUse func (m *CreateOrganizationUserReq) String() string { return proto.CompactTextString(m) } func (*CreateOrganizationUserReq) ProtoMessage() {} func (*CreateOrganizationUserReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{8} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{8} } func (m *CreateOrganizationUserReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateOrganizationUserReq.Unmarshal(m, b) @@ -506,7 +506,7 @@ func (m *CreateOrganizationUserResp) Reset() { *m = CreateOrganizationUs func (m *CreateOrganizationUserResp) String() string { return proto.CompactTextString(m) } func (*CreateOrganizationUserResp) ProtoMessage() {} func (*CreateOrganizationUserResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{9} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{9} } func (m *CreateOrganizationUserResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateOrganizationUserResp.Unmarshal(m, b) @@ -553,7 +553,7 @@ func (m *UpdateOrganizationUserReq) Reset() { *m = UpdateOrganizationUse func (m *UpdateOrganizationUserReq) String() string { return proto.CompactTextString(m) } func (*UpdateOrganizationUserReq) ProtoMessage() {} func (*UpdateOrganizationUserReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{10} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{10} } func (m *UpdateOrganizationUserReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateOrganizationUserReq.Unmarshal(m, b) @@ -606,7 +606,7 @@ func (m *UpdateOrganizationUserResp) Reset() { *m = UpdateOrganizationUs func (m *UpdateOrganizationUserResp) String() string { return proto.CompactTextString(m) } func (*UpdateOrganizationUserResp) ProtoMessage() {} func (*UpdateOrganizationUserResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{11} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{11} } func (m *UpdateOrganizationUserResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateOrganizationUserResp.Unmarshal(m, b) @@ -653,7 +653,7 @@ func (m *CreateDepartmentMemberReq) Reset() { *m = CreateDepartmentMembe func (m *CreateDepartmentMemberReq) String() string { return proto.CompactTextString(m) } func (*CreateDepartmentMemberReq) ProtoMessage() {} func (*CreateDepartmentMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{12} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{12} } func (m *CreateDepartmentMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateDepartmentMemberReq.Unmarshal(m, b) @@ -706,7 +706,7 @@ func (m *CreateDepartmentMemberResp) Reset() { *m = CreateDepartmentMemb func (m *CreateDepartmentMemberResp) String() string { return proto.CompactTextString(m) } func (*CreateDepartmentMemberResp) ProtoMessage() {} func (*CreateDepartmentMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{13} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{13} } func (m *CreateDepartmentMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateDepartmentMemberResp.Unmarshal(m, b) @@ -753,7 +753,7 @@ func (m *GetUserInDepartmentReq) Reset() { *m = GetUserInDepartmentReq{} func (m *GetUserInDepartmentReq) String() string { return proto.CompactTextString(m) } func (*GetUserInDepartmentReq) ProtoMessage() {} func (*GetUserInDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{14} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{14} } func (m *GetUserInDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserInDepartmentReq.Unmarshal(m, b) @@ -807,7 +807,7 @@ func (m *GetUserInDepartmentResp) Reset() { *m = GetUserInDepartmentResp func (m *GetUserInDepartmentResp) String() string { return proto.CompactTextString(m) } func (*GetUserInDepartmentResp) ProtoMessage() {} func (*GetUserInDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{15} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{15} } func (m *GetUserInDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetUserInDepartmentResp.Unmarshal(m, b) @@ -861,7 +861,7 @@ func (m *UpdateUserInDepartmentReq) Reset() { *m = UpdateUserInDepartmen func (m *UpdateUserInDepartmentReq) String() string { return proto.CompactTextString(m) } func (*UpdateUserInDepartmentReq) ProtoMessage() {} func (*UpdateUserInDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{16} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{16} } func (m *UpdateUserInDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateUserInDepartmentReq.Unmarshal(m, b) @@ -914,7 +914,7 @@ func (m *UpdateUserInDepartmentResp) Reset() { *m = UpdateUserInDepartme func (m *UpdateUserInDepartmentResp) String() string { return proto.CompactTextString(m) } func (*UpdateUserInDepartmentResp) ProtoMessage() {} func (*UpdateUserInDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{17} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{17} } func (m *UpdateUserInDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateUserInDepartmentResp.Unmarshal(m, b) @@ -962,7 +962,7 @@ func (m *DeleteUserInDepartmentReq) Reset() { *m = DeleteUserInDepartmen func (m *DeleteUserInDepartmentReq) String() string { return proto.CompactTextString(m) } func (*DeleteUserInDepartmentReq) ProtoMessage() {} func (*DeleteUserInDepartmentReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{18} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{18} } func (m *DeleteUserInDepartmentReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteUserInDepartmentReq.Unmarshal(m, b) @@ -1022,7 +1022,7 @@ func (m *DeleteUserInDepartmentResp) Reset() { *m = DeleteUserInDepartme func (m *DeleteUserInDepartmentResp) String() string { return proto.CompactTextString(m) } func (*DeleteUserInDepartmentResp) ProtoMessage() {} func (*DeleteUserInDepartmentResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{19} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{19} } func (m *DeleteUserInDepartmentResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteUserInDepartmentResp.Unmarshal(m, b) @@ -1069,7 +1069,7 @@ func (m *DeleteOrganizationUserReq) Reset() { *m = DeleteOrganizationUse func (m *DeleteOrganizationUserReq) String() string { return proto.CompactTextString(m) } func (*DeleteOrganizationUserReq) ProtoMessage() {} func (*DeleteOrganizationUserReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{20} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{20} } func (m *DeleteOrganizationUserReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteOrganizationUserReq.Unmarshal(m, b) @@ -1122,7 +1122,7 @@ func (m *DeleteOrganizationUserResp) Reset() { *m = DeleteOrganizationUs func (m *DeleteOrganizationUserResp) String() string { return proto.CompactTextString(m) } func (*DeleteOrganizationUserResp) ProtoMessage() {} func (*DeleteOrganizationUserResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{21} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{21} } func (m *DeleteOrganizationUserResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DeleteOrganizationUserResp.Unmarshal(m, b) @@ -1169,7 +1169,7 @@ func (m *GetDepartmentMemberReq) Reset() { *m = GetDepartmentMemberReq{} func (m *GetDepartmentMemberReq) String() string { return proto.CompactTextString(m) } func (*GetDepartmentMemberReq) ProtoMessage() {} func (*GetDepartmentMemberReq) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{22} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{22} } func (m *GetDepartmentMemberReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDepartmentMemberReq.Unmarshal(m, b) @@ -1211,19 +1211,19 @@ func (m *GetDepartmentMemberReq) GetOpUserID() string { } type GetDepartmentMemberResp struct { - ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` - ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` - UserInDepartmentList []*sdk_ws.UserInDepartment `protobuf:"bytes,3,rep,name=userInDepartmentList" json:"userInDepartmentList,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ErrCode int32 `protobuf:"varint,1,opt,name=errCode" json:"errCode,omitempty"` + ErrMsg string `protobuf:"bytes,2,opt,name=errMsg" json:"errMsg,omitempty"` + UserDepartmentMemberList []*sdk_ws.UserDepartmentMember `protobuf:"bytes,3,rep,name=userDepartmentMemberList" json:"userDepartmentMemberList,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetDepartmentMemberResp) Reset() { *m = GetDepartmentMemberResp{} } func (m *GetDepartmentMemberResp) String() string { return proto.CompactTextString(m) } func (*GetDepartmentMemberResp) ProtoMessage() {} func (*GetDepartmentMemberResp) Descriptor() ([]byte, []int) { - return fileDescriptor_organization_4c9882c006c04fab, []int{23} + return fileDescriptor_organization_f9b83a1db54ed9cf, []int{23} } func (m *GetDepartmentMemberResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetDepartmentMemberResp.Unmarshal(m, b) @@ -1257,9 +1257,9 @@ func (m *GetDepartmentMemberResp) GetErrMsg() string { return "" } -func (m *GetDepartmentMemberResp) GetUserInDepartmentList() []*sdk_ws.UserInDepartment { +func (m *GetDepartmentMemberResp) GetUserDepartmentMemberList() []*sdk_ws.UserDepartmentMember { if m != nil { - return m.UserInDepartmentList + return m.UserDepartmentMemberList } return nil } @@ -1727,54 +1727,54 @@ var _Organization_serviceDesc = grpc.ServiceDesc{ } func init() { - proto.RegisterFile("organization/organization.proto", fileDescriptor_organization_4c9882c006c04fab) + proto.RegisterFile("organization/organization.proto", fileDescriptor_organization_f9b83a1db54ed9cf) } -var fileDescriptor_organization_4c9882c006c04fab = []byte{ - // 708 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4f, 0x6f, 0x12, 0x41, - 0x14, 0xcf, 0x8a, 0x56, 0x79, 0x6d, 0x0c, 0x99, 0x12, 0xa4, 0x6b, 0x1a, 0x29, 0xda, 0xc8, 0x09, - 0x92, 0x7a, 0xf4, 0x66, 0x31, 0x2d, 0x89, 0x48, 0x82, 0x69, 0x0c, 0x5e, 0xc8, 0x12, 0x46, 0x42, - 0x90, 0xdd, 0xe9, 0xcc, 0x22, 0x49, 0xbf, 0x84, 0x27, 0x2f, 0xc6, 0xa3, 0x27, 0x3f, 0x8d, 0x1f, - 0xc9, 0xec, 0x2e, 0xc5, 0xd9, 0x37, 0x6f, 0xe9, 0xba, 0x80, 0xa9, 0xc7, 0x19, 0x66, 0xde, 0xef, - 0xbd, 0xdf, 0xfb, 0x33, 0x3f, 0x16, 0x9e, 0x78, 0x72, 0xe4, 0xb8, 0xe3, 0x2b, 0xc7, 0x1f, 0x7b, - 0x6e, 0x43, 0x5f, 0xd4, 0x85, 0xf4, 0x7c, 0x8f, 0xed, 0xe9, 0x7b, 0xf6, 0x51, 0x47, 0x70, 0xb7, - 0xdf, 0x6a, 0x37, 0xc4, 0x64, 0xd4, 0x08, 0x0f, 0x34, 0xd4, 0x70, 0xd2, 0x9f, 0xab, 0xc6, 0x5c, - 0x45, 0x17, 0xaa, 0xdf, 0x2c, 0xd8, 0x3f, 0x95, 0xdc, 0xf1, 0x79, 0x93, 0x0b, 0x47, 0xfa, 0x53, - 0xee, 0xfa, 0x5d, 0x7e, 0xc9, 0x5e, 0xc3, 0xc3, 0xe1, 0x72, 0xa3, 0xe5, 0x7e, 0xf4, 0xca, 0x56, - 0xc5, 0xaa, 0xed, 0x9e, 0x1c, 0xd6, 0x15, 0x97, 0x9f, 0xb9, 0xec, 0x3b, 0x62, 0xdc, 0x17, 0x8e, - 0x74, 0xa6, 0xaa, 0xae, 0xdd, 0x44, 0x97, 0x58, 0x05, 0x76, 0x3d, 0xc1, 0x65, 0xe8, 0x4e, 0xab, - 0x59, 0xbe, 0x53, 0xb1, 0x6a, 0xf9, 0xae, 0xbe, 0xc5, 0x6c, 0x78, 0xe0, 0x89, 0x0b, 0xc5, 0x65, - 0xab, 0x59, 0xce, 0x85, 0x3f, 0x2f, 0xd7, 0xd5, 0x2f, 0x16, 0x14, 0x4d, 0xe7, 0x94, 0x60, 0x65, - 0xb8, 0xcf, 0xa5, 0x3c, 0xf5, 0x86, 0x3c, 0x74, 0xeb, 0x5e, 0xf7, 0x7a, 0xc9, 0x4a, 0xb0, 0xc3, - 0xa5, 0x6c, 0xab, 0xd1, 0x02, 0x6b, 0xb1, 0x22, 0xe2, 0xc9, 0x65, 0x88, 0x27, 0xa4, 0xeb, 0x42, - 0x0c, 0x6f, 0x27, 0x5d, 0xe7, 0x50, 0x34, 0x7d, 0xcb, 0xc2, 0x56, 0x75, 0x0e, 0xfb, 0x67, 0xdc, - 0x7f, 0x37, 0x1b, 0xc4, 0xa3, 0xac, 0xc2, 0x9e, 0xe6, 0x70, 0x33, 0xb4, 0x96, 0xef, 0xc6, 0xf6, - 0x36, 0x90, 0x71, 0x13, 0x79, 0xfd, 0x8c, 0xbf, 0x19, 0x2b, 0xbf, 0x9c, 0xab, 0xe4, 0xfe, 0x2a, - 0x25, 0xc1, 0xa5, 0x80, 0x8a, 0x26, 0xff, 0xc4, 0x71, 0xc2, 0xb7, 0x4f, 0xc5, 0x39, 0x14, 0x4d, - 0xe0, 0x4c, 0xd9, 0xfc, 0x69, 0xc1, 0x41, 0xd4, 0x46, 0x1d, 0x6d, 0x3a, 0x04, 0x30, 0x41, 0x24, - 0x1d, 0x28, 0x78, 0x68, 0x7b, 0x51, 0xbc, 0x4f, 0x09, 0xa6, 0x0c, 0x0b, 0xc6, 0xe5, 0x35, 0xc3, - 0x7e, 0x0b, 0x76, 0x92, 0xaf, 0x99, 0x83, 0x8f, 0xba, 0xe2, 0xff, 0x08, 0x3e, 0xc9, 0xd7, 0x35, - 0x33, 0xff, 0xa7, 0x88, 0xda, 0x7c, 0x3a, 0x58, 0x06, 0x3f, 0x44, 0xdb, 0x2b, 0x82, 0x37, 0x2c, - 0x18, 0x97, 0x37, 0x95, 0x79, 0xd3, 0xd7, 0x4c, 0xc1, 0xbb, 0x50, 0x3a, 0xe3, 0x7e, 0x68, 0xdc, - 0x8d, 0x37, 0x6f, 0x09, 0x76, 0x66, 0x91, 0x0f, 0x51, 0xdb, 0x2e, 0x56, 0x6b, 0xfa, 0xff, 0xdd, - 0x82, 0x47, 0x24, 0x60, 0xa6, 0xf1, 0xd5, 0x81, 0xc2, 0x0c, 0x59, 0x5a, 0x3c, 0x59, 0x54, 0x72, - 0x0c, 0x50, 0xe3, 0xb2, 0xd6, 0x08, 0x14, 0x25, 0xb7, 0xaf, 0x16, 0x92, 0x7c, 0xcd, 0x54, 0x0b, - 0x5f, 0x2d, 0x38, 0x88, 0xa6, 0xe9, 0x3f, 0xab, 0x07, 0xe3, 0x89, 0xb8, 0x6b, 0x3e, 0x11, 0x41, - 0x9c, 0x49, 0x6e, 0x65, 0x8a, 0xf3, 0xf2, 0x3a, 0x4c, 0x6a, 0xd8, 0x6d, 0xa7, 0xec, 0x97, 0x21, - 0x6c, 0x68, 0x66, 0x5d, 0x85, 0x6d, 0x4b, 0xcd, 0xab, 0xed, 0xbf, 0xb9, 0x3f, 0xa2, 0x16, 0xde, - 0xcc, 0x00, 0x62, 0xef, 0xa1, 0x88, 0xbb, 0x50, 0xd3, 0x21, 0xa9, 0xda, 0x98, 0x34, 0x70, 0xf2, - 0x2b, 0x0f, 0x31, 0xa1, 0xcf, 0x7a, 0x50, 0xc0, 0xa3, 0x93, 0x1d, 0xd5, 0x63, 0xff, 0x0f, 0x08, - 0x91, 0x6f, 0x57, 0x6f, 0x3a, 0xa2, 0x44, 0x60, 0x1a, 0x8b, 0x4a, 0x6c, 0x9a, 0x10, 0xc4, 0xd8, - 0x34, 0xa9, 0x4b, 0x7b, 0x50, 0xc0, 0x5a, 0x0f, 0x9b, 0x26, 0x54, 0x28, 0x36, 0x4d, 0xca, 0xc5, - 0x1e, 0x14, 0xb0, 0x78, 0xc2, 0xa6, 0x09, 0x55, 0x87, 0x4d, 0x93, 0xfa, 0x6b, 0x02, 0x25, 0x5a, - 0xa0, 0xb0, 0xe7, 0x14, 0x9d, 0x44, 0x23, 0xda, 0xb5, 0x74, 0x07, 0x23, 0x30, 0x5a, 0x10, 0x60, - 0xb0, 0x44, 0x89, 0x83, 0xc1, 0x56, 0xe8, 0x8b, 0x09, 0x94, 0xe8, 0x4e, 0xc6, 0x60, 0x89, 0x23, - 0x06, 0x83, 0xad, 0x18, 0x0c, 0x4b, 0x1a, 0x71, 0xb3, 0xd1, 0x34, 0x12, 0xf3, 0x80, 0xa6, 0x91, - 0xec, 0xdd, 0x41, 0xf8, 0x7f, 0x06, 0x77, 0x17, 0x7b, 0x66, 0x54, 0x12, 0xf1, 0x3a, 0xd8, 0xc7, - 0x29, 0x4e, 0xe9, 0xec, 0x19, 0x30, 0x24, 0x7b, 0x14, 0x52, 0x2d, 0xdd, 0x41, 0xbd, 0x2e, 0x6e, - 0x02, 0x4b, 0x7c, 0xf1, 0xe9, 0xba, 0x20, 0xc1, 0x22, 0xf6, 0x8c, 0x3c, 0x99, 0xec, 0x51, 0x49, - 0x3a, 0x4e, 0x71, 0x4a, 0x89, 0x57, 0x87, 0x1f, 0x1e, 0xd7, 0x63, 0x1f, 0x34, 0x5e, 0xea, 0x8b, - 0xc1, 0x4e, 0xf8, 0xb5, 0xe2, 0xc5, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x84, 0x53, 0xac, 0x82, - 0x01, 0x11, 0x00, 0x00, +var fileDescriptor_organization_f9b83a1db54ed9cf = []byte{ + // 715 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xdf, 0x6e, 0x12, 0x4f, + 0x14, 0xce, 0xfe, 0xf8, 0x59, 0xe5, 0xb4, 0x31, 0x64, 0x4a, 0x70, 0xbb, 0xa6, 0x91, 0xa2, 0x4d, + 0xb9, 0x82, 0xa4, 0x5e, 0x7a, 0x67, 0x31, 0x2d, 0x89, 0x48, 0x82, 0xe9, 0x05, 0xde, 0x90, 0x45, + 0x46, 0x42, 0x90, 0xdd, 0xe9, 0xcc, 0x22, 0x49, 0x5f, 0xc2, 0x2b, 0x6f, 0x8c, 0x4f, 0xe0, 0x95, + 0x8f, 0xe2, 0x23, 0x99, 0xdd, 0xa5, 0x38, 0x7b, 0xe6, 0x2c, 0xc5, 0x05, 0x4c, 0xbd, 0x9c, 0x61, + 0xe6, 0x7c, 0xe7, 0x7c, 0xe7, 0xcf, 0x7c, 0x2c, 0x3c, 0xf1, 0xe5, 0xd0, 0xf5, 0x46, 0xd7, 0x6e, + 0x30, 0xf2, 0xbd, 0xba, 0xbe, 0xa8, 0x09, 0xe9, 0x07, 0x3e, 0xdb, 0xd3, 0xf7, 0x9c, 0xa3, 0xb6, + 0xe0, 0x5e, 0xaf, 0xd9, 0xaa, 0x8b, 0xf1, 0xb0, 0x1e, 0x1d, 0xa8, 0xab, 0xc1, 0xb8, 0x37, 0x53, + 0xf5, 0x99, 0x8a, 0x2f, 0x54, 0xbe, 0x5a, 0xb0, 0x7f, 0x26, 0xb9, 0x1b, 0xf0, 0x06, 0x17, 0xae, + 0x0c, 0x26, 0xdc, 0x0b, 0x3a, 0xfc, 0x8a, 0xbd, 0x82, 0x87, 0x83, 0xc5, 0x46, 0xd3, 0xfb, 0xe0, + 0xdb, 0x56, 0xd9, 0xaa, 0xee, 0x9e, 0x1e, 0xd6, 0x14, 0x97, 0x9f, 0xb8, 0xec, 0xb9, 0x62, 0xd4, + 0x13, 0xae, 0x74, 0x27, 0xaa, 0xa6, 0xdd, 0x44, 0x97, 0x58, 0x19, 0x76, 0x7d, 0xc1, 0x65, 0xe4, + 0x4e, 0xb3, 0x61, 0xff, 0x57, 0xb6, 0xaa, 0xf9, 0x8e, 0xbe, 0xc5, 0x1c, 0x78, 0xe0, 0x8b, 0x4b, + 0xc5, 0x65, 0xb3, 0x61, 0xe7, 0xa2, 0x9f, 0x17, 0xeb, 0xca, 0x67, 0x0b, 0x8a, 0xa6, 0x73, 0x4a, + 0x30, 0x1b, 0xee, 0x73, 0x29, 0xcf, 0xfc, 0x01, 0x8f, 0xdc, 0xba, 0xd7, 0xb9, 0x59, 0xb2, 0x12, + 0xec, 0x70, 0x29, 0x5b, 0x6a, 0x38, 0xc7, 0x9a, 0xaf, 0x88, 0x78, 0x72, 0x19, 0xe2, 0x89, 0xe8, + 0xba, 0x14, 0x83, 0xbb, 0x49, 0xd7, 0x05, 0x14, 0x4d, 0xdf, 0xb2, 0xb0, 0x55, 0x99, 0xc1, 0xfe, + 0x39, 0x0f, 0xde, 0x4e, 0xfb, 0xc9, 0x28, 0x2b, 0xb0, 0xa7, 0x39, 0xdc, 0x88, 0xac, 0xe5, 0x3b, + 0x89, 0xbd, 0x0d, 0x64, 0xdc, 0x44, 0x5e, 0x3f, 0xe3, 0xaf, 0x47, 0x2a, 0xb0, 0x73, 0xe5, 0xdc, + 0x1f, 0xa5, 0x24, 0xbc, 0x14, 0x52, 0xd1, 0xe0, 0x1f, 0x39, 0x4e, 0xf8, 0xf6, 0xa9, 0xb8, 0x80, + 0xa2, 0x09, 0x9c, 0x29, 0x9b, 0xdf, 0x2d, 0x38, 0x88, 0xdb, 0xa8, 0xad, 0x4d, 0x87, 0x10, 0x26, + 0x8c, 0xa4, 0x0d, 0x05, 0x1f, 0x6d, 0xcf, 0x8b, 0xf7, 0x29, 0xc1, 0x94, 0x61, 0xc1, 0xb8, 0xbc, + 0x66, 0xd8, 0x6f, 0xc0, 0x49, 0xf3, 0x35, 0x73, 0xf0, 0x71, 0x57, 0xfc, 0x1b, 0xc1, 0xa7, 0xf9, + 0xba, 0x66, 0xe6, 0x7f, 0x17, 0x51, 0x8b, 0x4f, 0xfa, 0x8b, 0xe0, 0x07, 0x68, 0x7b, 0x49, 0xf0, + 0x86, 0x05, 0xe3, 0xf2, 0xa6, 0x32, 0x6f, 0xfa, 0x9a, 0x29, 0x78, 0x0f, 0x4a, 0xe7, 0x3c, 0x88, + 0x8c, 0x7b, 0xc9, 0xe6, 0x2d, 0xc1, 0xce, 0x34, 0xf6, 0x21, 0x6e, 0xdb, 0xf9, 0x6a, 0x4d, 0xff, + 0xbf, 0x59, 0xf0, 0x88, 0x04, 0xcc, 0x34, 0xbe, 0xda, 0x50, 0x98, 0x22, 0x4b, 0xf3, 0x27, 0x8b, + 0x4a, 0x8e, 0x01, 0x6a, 0x5c, 0xd6, 0x1a, 0x81, 0xa2, 0xe4, 0xee, 0xd5, 0x42, 0x9a, 0xaf, 0x99, + 0x6a, 0xe1, 0x8b, 0x05, 0x07, 0xf1, 0x34, 0xfd, 0x6b, 0xf5, 0x60, 0x3c, 0x11, 0xff, 0x9b, 0x4f, + 0x44, 0x18, 0x67, 0x9a, 0x5b, 0x99, 0xe2, 0xbc, 0xba, 0x09, 0x93, 0x1a, 0x76, 0xdb, 0x29, 0xfb, + 0x45, 0x08, 0x1b, 0x9a, 0x59, 0xd7, 0x51, 0xdb, 0x52, 0xf3, 0x6a, 0xfb, 0x6f, 0xee, 0x8f, 0xb8, + 0x85, 0x37, 0x33, 0x80, 0xd8, 0x7b, 0xb0, 0x43, 0x86, 0xb1, 0x35, 0x4d, 0x8b, 0x9c, 0xa4, 0xb4, + 0xb2, 0xe1, 0x40, 0xaa, 0xa1, 0xd3, 0x9f, 0x79, 0x48, 0x88, 0x7e, 0xd6, 0x85, 0x02, 0x1e, 0xa3, + 0xec, 0xa8, 0x96, 0xf8, 0xaf, 0x40, 0x08, 0x7e, 0xa7, 0x72, 0xdb, 0x11, 0x25, 0x42, 0xd3, 0x58, + 0x60, 0x62, 0xd3, 0x84, 0x38, 0xc6, 0xa6, 0x49, 0x8d, 0xda, 0x85, 0x02, 0xd6, 0x7d, 0xd8, 0x34, + 0xa1, 0x48, 0xb1, 0x69, 0x52, 0x3a, 0x76, 0xa1, 0x80, 0x85, 0x14, 0x36, 0x4d, 0x28, 0x3c, 0x6c, + 0x9a, 0xd4, 0x62, 0x63, 0x28, 0xd1, 0x62, 0x85, 0x9d, 0x50, 0x74, 0x12, 0x4d, 0xe9, 0x54, 0x57, + 0x3b, 0x18, 0x83, 0xd1, 0xe2, 0x00, 0x83, 0xa5, 0xca, 0x1d, 0x0c, 0xb6, 0x44, 0x6b, 0x8c, 0xa1, + 0x44, 0x77, 0x35, 0x06, 0x4b, 0x1d, 0x37, 0x18, 0x6c, 0xc9, 0x90, 0x58, 0xd0, 0x88, 0x2b, 0x9c, + 0xa6, 0x91, 0x98, 0x0d, 0x34, 0x8d, 0x64, 0x1f, 0xf7, 0xa3, 0xff, 0x36, 0x78, 0xde, 0xb2, 0x67, + 0x46, 0x25, 0x11, 0x2f, 0x85, 0x73, 0xbc, 0xc2, 0x29, 0x9d, 0x3d, 0x03, 0x86, 0x64, 0x8f, 0x42, + 0xaa, 0xae, 0x76, 0x50, 0xaf, 0x8b, 0xdb, 0xc0, 0x52, 0x5f, 0x7f, 0xba, 0x2e, 0x48, 0xb0, 0x98, + 0x3d, 0x23, 0x4f, 0x26, 0x7b, 0x54, 0x92, 0x8e, 0x57, 0x38, 0xa5, 0xc4, 0xcb, 0xc3, 0x77, 0x8f, + 0x6b, 0x89, 0x8f, 0x1b, 0x2f, 0xf4, 0x45, 0x7f, 0x27, 0xfa, 0x72, 0xf1, 0xfc, 0x57, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x63, 0xc0, 0xb1, 0xa3, 0x0d, 0x11, 0x00, 0x00, } diff --git a/pkg/proto/organization/organization.proto b/pkg/proto/organization/organization.proto index 3a8f2f8c9..6e7165723 100644 --- a/pkg/proto/organization/organization.proto +++ b/pkg/proto/organization/organization.proto @@ -145,7 +145,7 @@ message GetDepartmentMemberReq{ message GetDepartmentMemberResp{ int32 errCode = 1; string errMsg = 2; - repeated server_api_params.UserInDepartment userInDepartmentList = 3; + repeated server_api_params.UserDepartmentMember userDepartmentMemberList = 3; } diff --git a/pkg/proto/sdk_ws/ws.pb.go b/pkg/proto/sdk_ws/ws.pb.go index 3825fb262..45874a3a4 100644 --- a/pkg/proto/sdk_ws/ws.pb.go +++ b/pkg/proto/sdk_ws/ws.pb.go @@ -40,7 +40,7 @@ func (m *GroupInfo) Reset() { *m = GroupInfo{} } func (m *GroupInfo) String() string { return proto.CompactTextString(m) } func (*GroupInfo) ProtoMessage() {} func (*GroupInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{0} + return fileDescriptor_ws_879c1413df9d19e3, []int{0} } func (m *GroupInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfo.Unmarshal(m, b) @@ -165,7 +165,7 @@ func (m *GroupMemberFullInfo) Reset() { *m = GroupMemberFullInfo{} } func (m *GroupMemberFullInfo) String() string { return proto.CompactTextString(m) } func (*GroupMemberFullInfo) ProtoMessage() {} func (*GroupMemberFullInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{1} + return fileDescriptor_ws_879c1413df9d19e3, []int{1} } func (m *GroupMemberFullInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberFullInfo.Unmarshal(m, b) @@ -277,7 +277,7 @@ func (m *PublicUserInfo) Reset() { *m = PublicUserInfo{} } func (m *PublicUserInfo) String() string { return proto.CompactTextString(m) } func (*PublicUserInfo) ProtoMessage() {} func (*PublicUserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{2} + return fileDescriptor_ws_879c1413df9d19e3, []int{2} } func (m *PublicUserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PublicUserInfo.Unmarshal(m, b) @@ -352,7 +352,7 @@ func (m *UserInfo) Reset() { *m = UserInfo{} } func (m *UserInfo) String() string { return proto.CompactTextString(m) } func (*UserInfo) ProtoMessage() {} func (*UserInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{3} + return fileDescriptor_ws_879c1413df9d19e3, []int{3} } func (m *UserInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfo.Unmarshal(m, b) @@ -459,7 +459,7 @@ func (m *FriendInfo) Reset() { *m = FriendInfo{} } func (m *FriendInfo) String() string { return proto.CompactTextString(m) } func (*FriendInfo) ProtoMessage() {} func (*FriendInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{4} + return fileDescriptor_ws_879c1413df9d19e3, []int{4} } func (m *FriendInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfo.Unmarshal(m, b) @@ -544,7 +544,7 @@ func (m *BlackInfo) Reset() { *m = BlackInfo{} } func (m *BlackInfo) String() string { return proto.CompactTextString(m) } func (*BlackInfo) ProtoMessage() {} func (*BlackInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{5} + return fileDescriptor_ws_879c1413df9d19e3, []int{5} } func (m *BlackInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackInfo.Unmarshal(m, b) @@ -625,7 +625,7 @@ func (m *GroupRequest) Reset() { *m = GroupRequest{} } func (m *GroupRequest) String() string { return proto.CompactTextString(m) } func (*GroupRequest) ProtoMessage() {} func (*GroupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{6} + return fileDescriptor_ws_879c1413df9d19e3, []int{6} } func (m *GroupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupRequest.Unmarshal(m, b) @@ -733,7 +733,7 @@ func (m *FriendRequest) Reset() { *m = FriendRequest{} } func (m *FriendRequest) String() string { return proto.CompactTextString(m) } func (*FriendRequest) ProtoMessage() {} func (*FriendRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{7} + return fileDescriptor_ws_879c1413df9d19e3, []int{7} } func (m *FriendRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendRequest.Unmarshal(m, b) @@ -878,7 +878,7 @@ func (m *Department) Reset() { *m = Department{} } func (m *Department) String() string { return proto.CompactTextString(m) } func (*Department) ProtoMessage() {} func (*Department) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{8} + return fileDescriptor_ws_879c1413df9d19e3, []int{8} } func (m *Department) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Department.Unmarshal(m, b) @@ -989,7 +989,7 @@ func (m *OrganizationUser) Reset() { *m = OrganizationUser{} } func (m *OrganizationUser) String() string { return proto.CompactTextString(m) } func (*OrganizationUser) ProtoMessage() {} func (*OrganizationUser) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{9} + return fileDescriptor_ws_879c1413df9d19e3, []int{9} } func (m *OrganizationUser) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OrganizationUser.Unmarshal(m, b) @@ -1103,7 +1103,7 @@ func (m *DepartmentMember) Reset() { *m = DepartmentMember{} } func (m *DepartmentMember) String() string { return proto.CompactTextString(m) } func (*DepartmentMember) ProtoMessage() {} func (*DepartmentMember) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{10} + return fileDescriptor_ws_879c1413df9d19e3, []int{10} } func (m *DepartmentMember) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DepartmentMember.Unmarshal(m, b) @@ -1172,6 +1172,52 @@ func (m *DepartmentMember) GetEx() string { return "" } +type UserDepartmentMember struct { + OrganizationUser *OrganizationUser `protobuf:"bytes,1,opt,name=organizationUser" json:"organizationUser,omitempty"` + DepartmentMember *DepartmentMember `protobuf:"bytes,2,opt,name=departmentMember" json:"departmentMember,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *UserDepartmentMember) Reset() { *m = UserDepartmentMember{} } +func (m *UserDepartmentMember) String() string { return proto.CompactTextString(m) } +func (*UserDepartmentMember) ProtoMessage() {} +func (*UserDepartmentMember) Descriptor() ([]byte, []int) { + return fileDescriptor_ws_879c1413df9d19e3, []int{11} +} +func (m *UserDepartmentMember) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_UserDepartmentMember.Unmarshal(m, b) +} +func (m *UserDepartmentMember) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_UserDepartmentMember.Marshal(b, m, deterministic) +} +func (dst *UserDepartmentMember) XXX_Merge(src proto.Message) { + xxx_messageInfo_UserDepartmentMember.Merge(dst, src) +} +func (m *UserDepartmentMember) XXX_Size() int { + return xxx_messageInfo_UserDepartmentMember.Size(m) +} +func (m *UserDepartmentMember) XXX_DiscardUnknown() { + xxx_messageInfo_UserDepartmentMember.DiscardUnknown(m) +} + +var xxx_messageInfo_UserDepartmentMember proto.InternalMessageInfo + +func (m *UserDepartmentMember) GetOrganizationUser() *OrganizationUser { + if m != nil { + return m.OrganizationUser + } + return nil +} + +func (m *UserDepartmentMember) GetDepartmentMember() *DepartmentMember { + if m != nil { + return m.DepartmentMember + } + return nil +} + type UserInDepartment struct { OrganizationUser *OrganizationUser `protobuf:"bytes,1,opt,name=organizationUser" json:"organizationUser,omitempty"` DepartmentMemberList []*DepartmentMember `protobuf:"bytes,2,rep,name=departmentMemberList" json:"departmentMemberList,omitempty"` @@ -1184,7 +1230,7 @@ func (m *UserInDepartment) Reset() { *m = UserInDepartment{} } func (m *UserInDepartment) String() string { return proto.CompactTextString(m) } func (*UserInDepartment) ProtoMessage() {} func (*UserInDepartment) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{11} + return fileDescriptor_ws_879c1413df9d19e3, []int{12} } func (m *UserInDepartment) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInDepartment.Unmarshal(m, b) @@ -1231,7 +1277,7 @@ func (m *PullMessageBySeqListResp) Reset() { *m = PullMessageBySeqListRe func (m *PullMessageBySeqListResp) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListResp) ProtoMessage() {} func (*PullMessageBySeqListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{12} + return fileDescriptor_ws_879c1413df9d19e3, []int{13} } func (m *PullMessageBySeqListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListResp.Unmarshal(m, b) @@ -1285,7 +1331,7 @@ func (m *PullMessageBySeqListReq) Reset() { *m = PullMessageBySeqListReq func (m *PullMessageBySeqListReq) String() string { return proto.CompactTextString(m) } func (*PullMessageBySeqListReq) ProtoMessage() {} func (*PullMessageBySeqListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{13} + return fileDescriptor_ws_879c1413df9d19e3, []int{14} } func (m *PullMessageBySeqListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PullMessageBySeqListReq.Unmarshal(m, b) @@ -1336,7 +1382,7 @@ func (m *GetMaxAndMinSeqReq) Reset() { *m = GetMaxAndMinSeqReq{} } func (m *GetMaxAndMinSeqReq) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqReq) ProtoMessage() {} func (*GetMaxAndMinSeqReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{14} + return fileDescriptor_ws_879c1413df9d19e3, []int{15} } func (m *GetMaxAndMinSeqReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqReq.Unmarshal(m, b) @@ -1368,7 +1414,7 @@ func (m *GetMaxAndMinSeqResp) Reset() { *m = GetMaxAndMinSeqResp{} } func (m *GetMaxAndMinSeqResp) String() string { return proto.CompactTextString(m) } func (*GetMaxAndMinSeqResp) ProtoMessage() {} func (*GetMaxAndMinSeqResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{15} + return fileDescriptor_ws_879c1413df9d19e3, []int{16} } func (m *GetMaxAndMinSeqResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetMaxAndMinSeqResp.Unmarshal(m, b) @@ -1415,7 +1461,7 @@ func (m *UserSendMsgResp) Reset() { *m = UserSendMsgResp{} } func (m *UserSendMsgResp) String() string { return proto.CompactTextString(m) } func (*UserSendMsgResp) ProtoMessage() {} func (*UserSendMsgResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{16} + return fileDescriptor_ws_879c1413df9d19e3, []int{17} } func (m *UserSendMsgResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserSendMsgResp.Unmarshal(m, b) @@ -1484,7 +1530,7 @@ func (m *MsgData) Reset() { *m = MsgData{} } func (m *MsgData) String() string { return proto.CompactTextString(m) } func (*MsgData) ProtoMessage() {} func (*MsgData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{17} + return fileDescriptor_ws_879c1413df9d19e3, []int{18} } func (m *MsgData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MsgData.Unmarshal(m, b) @@ -1645,7 +1691,7 @@ func (m *OfflinePushInfo) Reset() { *m = OfflinePushInfo{} } func (m *OfflinePushInfo) String() string { return proto.CompactTextString(m) } func (*OfflinePushInfo) ProtoMessage() {} func (*OfflinePushInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{18} + return fileDescriptor_ws_879c1413df9d19e3, []int{19} } func (m *OfflinePushInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_OfflinePushInfo.Unmarshal(m, b) @@ -1713,7 +1759,7 @@ func (m *TipsComm) Reset() { *m = TipsComm{} } func (m *TipsComm) String() string { return proto.CompactTextString(m) } func (*TipsComm) ProtoMessage() {} func (*TipsComm) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{19} + return fileDescriptor_ws_879c1413df9d19e3, []int{20} } func (m *TipsComm) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TipsComm.Unmarshal(m, b) @@ -1770,7 +1816,7 @@ func (m *GroupCreatedTips) Reset() { *m = GroupCreatedTips{} } func (m *GroupCreatedTips) String() string { return proto.CompactTextString(m) } func (*GroupCreatedTips) ProtoMessage() {} func (*GroupCreatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{20} + return fileDescriptor_ws_879c1413df9d19e3, []int{21} } func (m *GroupCreatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCreatedTips.Unmarshal(m, b) @@ -1839,7 +1885,7 @@ func (m *GroupInfoSetTips) Reset() { *m = GroupInfoSetTips{} } func (m *GroupInfoSetTips) String() string { return proto.CompactTextString(m) } func (*GroupInfoSetTips) ProtoMessage() {} func (*GroupInfoSetTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{21} + return fileDescriptor_ws_879c1413df9d19e3, []int{22} } func (m *GroupInfoSetTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupInfoSetTips.Unmarshal(m, b) @@ -1894,7 +1940,7 @@ func (m *JoinGroupApplicationTips) Reset() { *m = JoinGroupApplicationTi func (m *JoinGroupApplicationTips) String() string { return proto.CompactTextString(m) } func (*JoinGroupApplicationTips) ProtoMessage() {} func (*JoinGroupApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{22} + return fileDescriptor_ws_879c1413df9d19e3, []int{23} } func (m *JoinGroupApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_JoinGroupApplicationTips.Unmarshal(m, b) @@ -1950,7 +1996,7 @@ func (m *MemberQuitTips) Reset() { *m = MemberQuitTips{} } func (m *MemberQuitTips) String() string { return proto.CompactTextString(m) } func (*MemberQuitTips) ProtoMessage() {} func (*MemberQuitTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{23} + return fileDescriptor_ws_879c1413df9d19e3, []int{24} } func (m *MemberQuitTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberQuitTips.Unmarshal(m, b) @@ -2005,7 +2051,7 @@ func (m *GroupApplicationAcceptedTips) Reset() { *m = GroupApplicationAc func (m *GroupApplicationAcceptedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationAcceptedTips) ProtoMessage() {} func (*GroupApplicationAcceptedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{24} + return fileDescriptor_ws_879c1413df9d19e3, []int{25} } func (m *GroupApplicationAcceptedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationAcceptedTips.Unmarshal(m, b) @@ -2060,7 +2106,7 @@ func (m *GroupApplicationRejectedTips) Reset() { *m = GroupApplicationRe func (m *GroupApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*GroupApplicationRejectedTips) ProtoMessage() {} func (*GroupApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{25} + return fileDescriptor_ws_879c1413df9d19e3, []int{26} } func (m *GroupApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupApplicationRejectedTips.Unmarshal(m, b) @@ -2116,7 +2162,7 @@ func (m *GroupOwnerTransferredTips) Reset() { *m = GroupOwnerTransferred func (m *GroupOwnerTransferredTips) String() string { return proto.CompactTextString(m) } func (*GroupOwnerTransferredTips) ProtoMessage() {} func (*GroupOwnerTransferredTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{26} + return fileDescriptor_ws_879c1413df9d19e3, []int{27} } func (m *GroupOwnerTransferredTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupOwnerTransferredTips.Unmarshal(m, b) @@ -2179,7 +2225,7 @@ func (m *MemberKickedTips) Reset() { *m = MemberKickedTips{} } func (m *MemberKickedTips) String() string { return proto.CompactTextString(m) } func (*MemberKickedTips) ProtoMessage() {} func (*MemberKickedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{27} + return fileDescriptor_ws_879c1413df9d19e3, []int{28} } func (m *MemberKickedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberKickedTips.Unmarshal(m, b) @@ -2242,7 +2288,7 @@ func (m *MemberInvitedTips) Reset() { *m = MemberInvitedTips{} } func (m *MemberInvitedTips) String() string { return proto.CompactTextString(m) } func (*MemberInvitedTips) ProtoMessage() {} func (*MemberInvitedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{28} + return fileDescriptor_ws_879c1413df9d19e3, []int{29} } func (m *MemberInvitedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberInvitedTips.Unmarshal(m, b) @@ -2304,7 +2350,7 @@ func (m *MemberEnterTips) Reset() { *m = MemberEnterTips{} } func (m *MemberEnterTips) String() string { return proto.CompactTextString(m) } func (*MemberEnterTips) ProtoMessage() {} func (*MemberEnterTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{29} + return fileDescriptor_ws_879c1413df9d19e3, []int{30} } func (m *MemberEnterTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MemberEnterTips.Unmarshal(m, b) @@ -2358,7 +2404,7 @@ func (m *GroupDismissedTips) Reset() { *m = GroupDismissedTips{} } func (m *GroupDismissedTips) String() string { return proto.CompactTextString(m) } func (*GroupDismissedTips) ProtoMessage() {} func (*GroupDismissedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{30} + return fileDescriptor_ws_879c1413df9d19e3, []int{31} } func (m *GroupDismissedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupDismissedTips.Unmarshal(m, b) @@ -2414,7 +2460,7 @@ func (m *GroupMemberMutedTips) Reset() { *m = GroupMemberMutedTips{} } func (m *GroupMemberMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberMutedTips) ProtoMessage() {} func (*GroupMemberMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{31} + return fileDescriptor_ws_879c1413df9d19e3, []int{32} } func (m *GroupMemberMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberMutedTips.Unmarshal(m, b) @@ -2483,7 +2529,7 @@ func (m *GroupMemberCancelMutedTips) Reset() { *m = GroupMemberCancelMut func (m *GroupMemberCancelMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberCancelMutedTips) ProtoMessage() {} func (*GroupMemberCancelMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{32} + return fileDescriptor_ws_879c1413df9d19e3, []int{33} } func (m *GroupMemberCancelMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberCancelMutedTips.Unmarshal(m, b) @@ -2544,7 +2590,7 @@ func (m *GroupMutedTips) Reset() { *m = GroupMutedTips{} } func (m *GroupMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupMutedTips) ProtoMessage() {} func (*GroupMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{33} + return fileDescriptor_ws_879c1413df9d19e3, []int{34} } func (m *GroupMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMutedTips.Unmarshal(m, b) @@ -2598,7 +2644,7 @@ func (m *GroupCancelMutedTips) Reset() { *m = GroupCancelMutedTips{} } func (m *GroupCancelMutedTips) String() string { return proto.CompactTextString(m) } func (*GroupCancelMutedTips) ProtoMessage() {} func (*GroupCancelMutedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{34} + return fileDescriptor_ws_879c1413df9d19e3, []int{35} } func (m *GroupCancelMutedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupCancelMutedTips.Unmarshal(m, b) @@ -2653,7 +2699,7 @@ func (m *GroupMemberInfoSetTips) Reset() { *m = GroupMemberInfoSetTips{} func (m *GroupMemberInfoSetTips) String() string { return proto.CompactTextString(m) } func (*GroupMemberInfoSetTips) ProtoMessage() {} func (*GroupMemberInfoSetTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{35} + return fileDescriptor_ws_879c1413df9d19e3, []int{36} } func (m *GroupMemberInfoSetTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GroupMemberInfoSetTips.Unmarshal(m, b) @@ -2714,7 +2760,7 @@ func (m *FriendApplication) Reset() { *m = FriendApplication{} } func (m *FriendApplication) String() string { return proto.CompactTextString(m) } func (*FriendApplication) ProtoMessage() {} func (*FriendApplication) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{36} + return fileDescriptor_ws_879c1413df9d19e3, []int{37} } func (m *FriendApplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplication.Unmarshal(m, b) @@ -2767,7 +2813,7 @@ func (m *FromToUserID) Reset() { *m = FromToUserID{} } func (m *FromToUserID) String() string { return proto.CompactTextString(m) } func (*FromToUserID) ProtoMessage() {} func (*FromToUserID) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{37} + return fileDescriptor_ws_879c1413df9d19e3, []int{38} } func (m *FromToUserID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FromToUserID.Unmarshal(m, b) @@ -2813,7 +2859,7 @@ func (m *FriendApplicationTips) Reset() { *m = FriendApplicationTips{} } func (m *FriendApplicationTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationTips) ProtoMessage() {} func (*FriendApplicationTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{38} + return fileDescriptor_ws_879c1413df9d19e3, []int{39} } func (m *FriendApplicationTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationTips.Unmarshal(m, b) @@ -2853,7 +2899,7 @@ func (m *FriendApplicationApprovedTips) Reset() { *m = FriendApplication func (m *FriendApplicationApprovedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationApprovedTips) ProtoMessage() {} func (*FriendApplicationApprovedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{39} + return fileDescriptor_ws_879c1413df9d19e3, []int{40} } func (m *FriendApplicationApprovedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationApprovedTips.Unmarshal(m, b) @@ -2900,7 +2946,7 @@ func (m *FriendApplicationRejectedTips) Reset() { *m = FriendApplication func (m *FriendApplicationRejectedTips) String() string { return proto.CompactTextString(m) } func (*FriendApplicationRejectedTips) ProtoMessage() {} func (*FriendApplicationRejectedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{40} + return fileDescriptor_ws_879c1413df9d19e3, []int{41} } func (m *FriendApplicationRejectedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendApplicationRejectedTips.Unmarshal(m, b) @@ -2948,7 +2994,7 @@ func (m *FriendAddedTips) Reset() { *m = FriendAddedTips{} } func (m *FriendAddedTips) String() string { return proto.CompactTextString(m) } func (*FriendAddedTips) ProtoMessage() {} func (*FriendAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{41} + return fileDescriptor_ws_879c1413df9d19e3, []int{42} } func (m *FriendAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendAddedTips.Unmarshal(m, b) @@ -3001,7 +3047,7 @@ func (m *FriendDeletedTips) Reset() { *m = FriendDeletedTips{} } func (m *FriendDeletedTips) String() string { return proto.CompactTextString(m) } func (*FriendDeletedTips) ProtoMessage() {} func (*FriendDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{42} + return fileDescriptor_ws_879c1413df9d19e3, []int{43} } func (m *FriendDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendDeletedTips.Unmarshal(m, b) @@ -3039,7 +3085,7 @@ func (m *BlackAddedTips) Reset() { *m = BlackAddedTips{} } func (m *BlackAddedTips) String() string { return proto.CompactTextString(m) } func (*BlackAddedTips) ProtoMessage() {} func (*BlackAddedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{43} + return fileDescriptor_ws_879c1413df9d19e3, []int{44} } func (m *BlackAddedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackAddedTips.Unmarshal(m, b) @@ -3077,7 +3123,7 @@ func (m *BlackDeletedTips) Reset() { *m = BlackDeletedTips{} } func (m *BlackDeletedTips) String() string { return proto.CompactTextString(m) } func (*BlackDeletedTips) ProtoMessage() {} func (*BlackDeletedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{44} + return fileDescriptor_ws_879c1413df9d19e3, []int{45} } func (m *BlackDeletedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BlackDeletedTips.Unmarshal(m, b) @@ -3115,7 +3161,7 @@ func (m *FriendInfoChangedTips) Reset() { *m = FriendInfoChangedTips{} } func (m *FriendInfoChangedTips) String() string { return proto.CompactTextString(m) } func (*FriendInfoChangedTips) ProtoMessage() {} func (*FriendInfoChangedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{45} + return fileDescriptor_ws_879c1413df9d19e3, []int{46} } func (m *FriendInfoChangedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FriendInfoChangedTips.Unmarshal(m, b) @@ -3154,7 +3200,7 @@ func (m *UserInfoUpdatedTips) Reset() { *m = UserInfoUpdatedTips{} } func (m *UserInfoUpdatedTips) String() string { return proto.CompactTextString(m) } func (*UserInfoUpdatedTips) ProtoMessage() {} func (*UserInfoUpdatedTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{46} + return fileDescriptor_ws_879c1413df9d19e3, []int{47} } func (m *UserInfoUpdatedTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserInfoUpdatedTips.Unmarshal(m, b) @@ -3193,7 +3239,7 @@ func (m *ConversationUpdateTips) Reset() { *m = ConversationUpdateTips{} func (m *ConversationUpdateTips) String() string { return proto.CompactTextString(m) } func (*ConversationUpdateTips) ProtoMessage() {} func (*ConversationUpdateTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{47} + return fileDescriptor_ws_879c1413df9d19e3, []int{48} } func (m *ConversationUpdateTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConversationUpdateTips.Unmarshal(m, b) @@ -3233,7 +3279,7 @@ func (m *ConversationSetPrivateTips) Reset() { *m = ConversationSetPriva func (m *ConversationSetPrivateTips) String() string { return proto.CompactTextString(m) } func (*ConversationSetPrivateTips) ProtoMessage() {} func (*ConversationSetPrivateTips) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{48} + return fileDescriptor_ws_879c1413df9d19e3, []int{49} } func (m *ConversationSetPrivateTips) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConversationSetPrivateTips.Unmarshal(m, b) @@ -3287,7 +3333,7 @@ func (m *RequestPagination) Reset() { *m = RequestPagination{} } func (m *RequestPagination) String() string { return proto.CompactTextString(m) } func (*RequestPagination) ProtoMessage() {} func (*RequestPagination) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{49} + return fileDescriptor_ws_879c1413df9d19e3, []int{50} } func (m *RequestPagination) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RequestPagination.Unmarshal(m, b) @@ -3333,7 +3379,7 @@ func (m *ResponsePagination) Reset() { *m = ResponsePagination{} } func (m *ResponsePagination) String() string { return proto.CompactTextString(m) } func (*ResponsePagination) ProtoMessage() {} func (*ResponsePagination) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{50} + return fileDescriptor_ws_879c1413df9d19e3, []int{51} } func (m *ResponsePagination) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResponsePagination.Unmarshal(m, b) @@ -3386,7 +3432,7 @@ func (m *SignalReq) Reset() { *m = SignalReq{} } func (m *SignalReq) String() string { return proto.CompactTextString(m) } func (*SignalReq) ProtoMessage() {} func (*SignalReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{51} + return fileDescriptor_ws_879c1413df9d19e3, []int{52} } func (m *SignalReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalReq.Unmarshal(m, b) @@ -3653,7 +3699,7 @@ func (m *SignalResp) Reset() { *m = SignalResp{} } func (m *SignalResp) String() string { return proto.CompactTextString(m) } func (*SignalResp) ProtoMessage() {} func (*SignalResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{52} + return fileDescriptor_ws_879c1413df9d19e3, []int{53} } func (m *SignalResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalResp.Unmarshal(m, b) @@ -3921,7 +3967,7 @@ func (m *InvitationInfo) Reset() { *m = InvitationInfo{} } func (m *InvitationInfo) String() string { return proto.CompactTextString(m) } func (*InvitationInfo) ProtoMessage() {} func (*InvitationInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{53} + return fileDescriptor_ws_879c1413df9d19e3, []int{54} } func (m *InvitationInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InvitationInfo.Unmarshal(m, b) @@ -4017,7 +4063,7 @@ func (m *ParticipantMetaData) Reset() { *m = ParticipantMetaData{} } func (m *ParticipantMetaData) String() string { return proto.CompactTextString(m) } func (*ParticipantMetaData) ProtoMessage() {} func (*ParticipantMetaData) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{54} + return fileDescriptor_ws_879c1413df9d19e3, []int{55} } func (m *ParticipantMetaData) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ParticipantMetaData.Unmarshal(m, b) @@ -4072,7 +4118,7 @@ func (m *SignalInviteReq) Reset() { *m = SignalInviteReq{} } func (m *SignalInviteReq) String() string { return proto.CompactTextString(m) } func (*SignalInviteReq) ProtoMessage() {} func (*SignalInviteReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{55} + return fileDescriptor_ws_879c1413df9d19e3, []int{56} } func (m *SignalInviteReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteReq.Unmarshal(m, b) @@ -4133,7 +4179,7 @@ func (m *SignalInviteReply) Reset() { *m = SignalInviteReply{} } func (m *SignalInviteReply) String() string { return proto.CompactTextString(m) } func (*SignalInviteReply) ProtoMessage() {} func (*SignalInviteReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{56} + return fileDescriptor_ws_879c1413df9d19e3, []int{57} } func (m *SignalInviteReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteReply.Unmarshal(m, b) @@ -4188,7 +4234,7 @@ func (m *SignalInviteInGroupReq) Reset() { *m = SignalInviteInGroupReq{} func (m *SignalInviteInGroupReq) String() string { return proto.CompactTextString(m) } func (*SignalInviteInGroupReq) ProtoMessage() {} func (*SignalInviteInGroupReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{57} + return fileDescriptor_ws_879c1413df9d19e3, []int{58} } func (m *SignalInviteInGroupReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteInGroupReq.Unmarshal(m, b) @@ -4249,7 +4295,7 @@ func (m *SignalInviteInGroupReply) Reset() { *m = SignalInviteInGroupRep func (m *SignalInviteInGroupReply) String() string { return proto.CompactTextString(m) } func (*SignalInviteInGroupReply) ProtoMessage() {} func (*SignalInviteInGroupReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{58} + return fileDescriptor_ws_879c1413df9d19e3, []int{59} } func (m *SignalInviteInGroupReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalInviteInGroupReply.Unmarshal(m, b) @@ -4304,7 +4350,7 @@ func (m *SignalCancelReq) Reset() { *m = SignalCancelReq{} } func (m *SignalCancelReq) String() string { return proto.CompactTextString(m) } func (*SignalCancelReq) ProtoMessage() {} func (*SignalCancelReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{59} + return fileDescriptor_ws_879c1413df9d19e3, []int{60} } func (m *SignalCancelReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalCancelReq.Unmarshal(m, b) @@ -4362,7 +4408,7 @@ func (m *SignalCancelReply) Reset() { *m = SignalCancelReply{} } func (m *SignalCancelReply) String() string { return proto.CompactTextString(m) } func (*SignalCancelReply) ProtoMessage() {} func (*SignalCancelReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{60} + return fileDescriptor_ws_879c1413df9d19e3, []int{61} } func (m *SignalCancelReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalCancelReply.Unmarshal(m, b) @@ -4397,7 +4443,7 @@ func (m *SignalAcceptReq) Reset() { *m = SignalAcceptReq{} } func (m *SignalAcceptReq) String() string { return proto.CompactTextString(m) } func (*SignalAcceptReq) ProtoMessage() {} func (*SignalAcceptReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{61} + return fileDescriptor_ws_879c1413df9d19e3, []int{62} } func (m *SignalAcceptReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalAcceptReq.Unmarshal(m, b) @@ -4465,7 +4511,7 @@ func (m *SignalAcceptReply) Reset() { *m = SignalAcceptReply{} } func (m *SignalAcceptReply) String() string { return proto.CompactTextString(m) } func (*SignalAcceptReply) ProtoMessage() {} func (*SignalAcceptReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{62} + return fileDescriptor_ws_879c1413df9d19e3, []int{63} } func (m *SignalAcceptReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalAcceptReply.Unmarshal(m, b) @@ -4519,7 +4565,7 @@ func (m *SignalHungUpReq) Reset() { *m = SignalHungUpReq{} } func (m *SignalHungUpReq) String() string { return proto.CompactTextString(m) } func (*SignalHungUpReq) ProtoMessage() {} func (*SignalHungUpReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{63} + return fileDescriptor_ws_879c1413df9d19e3, []int{64} } func (m *SignalHungUpReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalHungUpReq.Unmarshal(m, b) @@ -4570,7 +4616,7 @@ func (m *SignalHungUpReply) Reset() { *m = SignalHungUpReply{} } func (m *SignalHungUpReply) String() string { return proto.CompactTextString(m) } func (*SignalHungUpReply) ProtoMessage() {} func (*SignalHungUpReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{64} + return fileDescriptor_ws_879c1413df9d19e3, []int{65} } func (m *SignalHungUpReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalHungUpReply.Unmarshal(m, b) @@ -4605,7 +4651,7 @@ func (m *SignalRejectReq) Reset() { *m = SignalRejectReq{} } func (m *SignalRejectReq) String() string { return proto.CompactTextString(m) } func (*SignalRejectReq) ProtoMessage() {} func (*SignalRejectReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{65} + return fileDescriptor_ws_879c1413df9d19e3, []int{66} } func (m *SignalRejectReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalRejectReq.Unmarshal(m, b) @@ -4670,7 +4716,7 @@ func (m *SignalRejectReply) Reset() { *m = SignalRejectReply{} } func (m *SignalRejectReply) String() string { return proto.CompactTextString(m) } func (*SignalRejectReply) ProtoMessage() {} func (*SignalRejectReply) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{66} + return fileDescriptor_ws_879c1413df9d19e3, []int{67} } func (m *SignalRejectReply) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SignalRejectReply.Unmarshal(m, b) @@ -4704,7 +4750,7 @@ func (m *DelMsgListReq) Reset() { *m = DelMsgListReq{} } func (m *DelMsgListReq) String() string { return proto.CompactTextString(m) } func (*DelMsgListReq) ProtoMessage() {} func (*DelMsgListReq) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{67} + return fileDescriptor_ws_879c1413df9d19e3, []int{68} } func (m *DelMsgListReq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelMsgListReq.Unmarshal(m, b) @@ -4764,7 +4810,7 @@ func (m *DelMsgListResp) Reset() { *m = DelMsgListResp{} } func (m *DelMsgListResp) String() string { return proto.CompactTextString(m) } func (*DelMsgListResp) ProtoMessage() {} func (*DelMsgListResp) Descriptor() ([]byte, []int) { - return fileDescriptor_ws_f7386a43c650fa79, []int{68} + return fileDescriptor_ws_879c1413df9d19e3, []int{69} } func (m *DelMsgListResp) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DelMsgListResp.Unmarshal(m, b) @@ -4810,6 +4856,7 @@ func init() { proto.RegisterType((*Department)(nil), "server_api_params.Department") proto.RegisterType((*OrganizationUser)(nil), "server_api_params.OrganizationUser") proto.RegisterType((*DepartmentMember)(nil), "server_api_params.DepartmentMember") + proto.RegisterType((*UserDepartmentMember)(nil), "server_api_params.UserDepartmentMember") proto.RegisterType((*UserInDepartment)(nil), "server_api_params.UserInDepartment") proto.RegisterType((*PullMessageBySeqListResp)(nil), "server_api_params.PullMessageBySeqListResp") proto.RegisterType((*PullMessageBySeqListReq)(nil), "server_api_params.PullMessageBySeqListReq") @@ -4871,195 +4918,197 @@ func init() { proto.RegisterType((*DelMsgListResp)(nil), "server_api_params.DelMsgListResp") } -func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_f7386a43c650fa79) } +func init() { proto.RegisterFile("sdk_ws/ws.proto", fileDescriptor_ws_879c1413df9d19e3) } -var fileDescriptor_ws_f7386a43c650fa79 = []byte{ - // 2988 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcd, 0x6f, 0x24, 0x47, - 0x15, 0xa7, 0x7b, 0x3c, 0x63, 0xcf, 0x1b, 0x8f, 0x3f, 0x7a, 0x17, 0x33, 0x98, 0xcd, 0x62, 0x1a, - 0x2b, 0x84, 0x00, 0x1b, 0x14, 0x84, 0x04, 0x09, 0x2c, 0x5a, 0xdb, 0xfb, 0x15, 0xd6, 0x5e, 0xa7, - 0x67, 0x97, 0x20, 0x40, 0x8a, 0xda, 0xd3, 0xe5, 0x71, 0xc7, 0xdd, 0x5d, 0x3d, 0xfd, 0xe1, 0x5d, - 0x23, 0x24, 0x24, 0x90, 0x10, 0x37, 0x4e, 0x70, 0xe0, 0x82, 0xc4, 0x05, 0x81, 0xa2, 0x28, 0x42, - 0x70, 0x8b, 0x10, 0x07, 0xfe, 0x01, 0x8e, 0x88, 0x1b, 0x67, 0xae, 0x1c, 0x90, 0x90, 0x40, 0x55, - 0xaf, 0xba, 0xba, 0xaa, 0x7b, 0xc6, 0x9e, 0x8c, 0xac, 0xec, 0x46, 0xcb, 0x6d, 0xde, 0xeb, 0x7a, - 0xaf, 0x5e, 0xfd, 0xde, 0xab, 0x7a, 0xaf, 0x3e, 0x06, 0x96, 0x53, 0xef, 0xf8, 0xcd, 0x47, 0xe9, - 0x4b, 0x8f, 0xd2, 0x6b, 0x71, 0x42, 0x33, 0x6a, 0xad, 0xa6, 0x24, 0x39, 0x21, 0xc9, 0x9b, 0x6e, - 0xec, 0xbf, 0x19, 0xbb, 0x89, 0x1b, 0xa6, 0xf6, 0xbf, 0x4c, 0x68, 0xdf, 0x4e, 0x68, 0x1e, 0xdf, - 0x8d, 0x0e, 0xa9, 0xd5, 0x83, 0xf9, 0x21, 0x27, 0x76, 0x7a, 0xc6, 0x86, 0xf1, 0x42, 0xdb, 0x29, - 0x48, 0xeb, 0x0a, 0xb4, 0xf9, 0xcf, 0x3d, 0x37, 0x24, 0x3d, 0x93, 0x7f, 0x2b, 0x19, 0x96, 0x0d, - 0x8b, 0x11, 0xcd, 0xfc, 0x43, 0x7f, 0xe0, 0x66, 0x3e, 0x8d, 0x7a, 0x0d, 0xde, 0x40, 0xe3, 0xb1, - 0x36, 0x7e, 0x94, 0x25, 0xd4, 0xcb, 0x07, 0xbc, 0xcd, 0x1c, 0xb6, 0x51, 0x79, 0xac, 0xff, 0x43, - 0x77, 0x40, 0x1e, 0x3a, 0xf7, 0x7a, 0x4d, 0xec, 0x5f, 0x90, 0xd6, 0x06, 0x74, 0xe8, 0xa3, 0x88, - 0x24, 0x0f, 0x53, 0x92, 0xdc, 0xdd, 0xe9, 0xb5, 0xf8, 0x57, 0x95, 0x65, 0x5d, 0x05, 0x18, 0x24, - 0xc4, 0xcd, 0xc8, 0x03, 0x3f, 0x24, 0xbd, 0xf9, 0x0d, 0xe3, 0x85, 0xae, 0xa3, 0x70, 0x98, 0x86, - 0x90, 0x84, 0x07, 0x24, 0xd9, 0xa6, 0x79, 0x94, 0xf5, 0x16, 0x78, 0x03, 0x95, 0x65, 0x2d, 0x81, - 0x49, 0x1e, 0xf7, 0xda, 0x5c, 0xb5, 0x49, 0x1e, 0x5b, 0x6b, 0xd0, 0x4a, 0x33, 0x37, 0xcb, 0xd3, - 0x1e, 0x6c, 0x18, 0x2f, 0x34, 0x1d, 0x41, 0x59, 0x9b, 0xd0, 0xe5, 0x7a, 0x69, 0x61, 0x4d, 0x87, - 0x8b, 0xe8, 0x4c, 0x89, 0xd8, 0x83, 0xd3, 0x98, 0xf4, 0x16, 0xb9, 0x82, 0x92, 0x61, 0xff, 0xcd, - 0x84, 0x4b, 0x1c, 0xf7, 0x5d, 0x6e, 0xc0, 0xad, 0x3c, 0x08, 0xce, 0xf1, 0xc0, 0x1a, 0xb4, 0x72, - 0xec, 0x0e, 0xe1, 0x17, 0x14, 0xeb, 0x27, 0xa1, 0x01, 0xb9, 0x47, 0x4e, 0x48, 0xc0, 0x81, 0x6f, - 0x3a, 0x25, 0xc3, 0x5a, 0x87, 0x85, 0xb7, 0xa8, 0x1f, 0x71, 0x4c, 0xe6, 0xf8, 0x47, 0x49, 0xb3, - 0x6f, 0x91, 0x3f, 0x38, 0x8e, 0x98, 0x4b, 0x11, 0x6e, 0x49, 0xab, 0x9e, 0x68, 0xe9, 0x9e, 0x78, - 0x1e, 0x96, 0xdc, 0x38, 0xde, 0x75, 0xa3, 0x21, 0x49, 0xb0, 0xd3, 0x79, 0xae, 0xb7, 0xc2, 0x65, - 0xfe, 0x60, 0x3d, 0xf5, 0x69, 0x9e, 0x0c, 0x08, 0x87, 0xbb, 0xe9, 0x28, 0x1c, 0xa6, 0x87, 0xc6, - 0x24, 0x51, 0x60, 0x44, 0xe4, 0x2b, 0x5c, 0xe1, 0x15, 0x90, 0x5e, 0x61, 0x7e, 0xcc, 0x33, 0x72, - 0x33, 0xf2, 0xf8, 0xa0, 0x3a, 0xc2, 0x8f, 0x25, 0xcb, 0xfe, 0x89, 0x01, 0x4b, 0xfb, 0xf9, 0x41, - 0xe0, 0x0f, 0xb8, 0x0a, 0x06, 0x6b, 0x09, 0x9e, 0xa1, 0x81, 0xa7, 0x42, 0x60, 0x4e, 0x86, 0xa0, - 0xa1, 0x43, 0xb0, 0x06, 0xad, 0x21, 0x89, 0x3c, 0x92, 0x08, 0x48, 0x05, 0x25, 0x4c, 0x6d, 0x16, - 0xa6, 0xda, 0xbf, 0x30, 0x61, 0xe1, 0x03, 0x36, 0x61, 0x03, 0x3a, 0xf1, 0x11, 0x8d, 0xc8, 0x5e, - 0xce, 0xc2, 0x4a, 0xd8, 0xa2, 0xb2, 0xac, 0xcb, 0xd0, 0x3c, 0xf0, 0x93, 0xec, 0x88, 0xfb, 0xb5, - 0xeb, 0x20, 0xc1, 0xb8, 0x24, 0x74, 0x7d, 0x74, 0x66, 0xdb, 0x41, 0x42, 0x0c, 0x68, 0x41, 0x62, - 0xaf, 0xcf, 0xb1, 0x76, 0x6d, 0x8e, 0xd5, 0x63, 0x03, 0xc6, 0xc5, 0x86, 0xfd, 0x6f, 0x03, 0xe0, - 0x56, 0xe2, 0x93, 0xc8, 0xe3, 0xd0, 0x54, 0x26, 0xb7, 0x51, 0x9f, 0xdc, 0x6b, 0xd0, 0x4a, 0x48, - 0xe8, 0x26, 0xc7, 0x45, 0xf0, 0x23, 0x55, 0x31, 0xa8, 0x51, 0x33, 0xe8, 0x55, 0x80, 0x43, 0xde, - 0x0f, 0xd3, 0xc3, 0xa1, 0xea, 0xbc, 0xfc, 0x89, 0x6b, 0xb5, 0x65, 0xf0, 0x5a, 0xe1, 0x25, 0x47, - 0x69, 0xce, 0x66, 0x96, 0xeb, 0x79, 0x22, 0x80, 0x9b, 0x38, 0xb3, 0x24, 0x63, 0x4c, 0xfc, 0xb6, - 0xce, 0x88, 0xdf, 0x79, 0x19, 0x14, 0xff, 0x34, 0xa0, 0xbd, 0x15, 0xb8, 0x83, 0xe3, 0x29, 0x87, - 0xae, 0x0f, 0xd1, 0xac, 0x0d, 0xf1, 0x36, 0x74, 0x0f, 0x98, 0xba, 0x62, 0x08, 0x1c, 0x85, 0xce, - 0xcb, 0x9f, 0x1a, 0x33, 0x4a, 0x7d, 0x52, 0x38, 0xba, 0x9c, 0x3e, 0xdc, 0xb9, 0xf3, 0x87, 0xdb, - 0x3c, 0x63, 0xb8, 0x2d, 0x39, 0xdc, 0xbf, 0x9a, 0xb0, 0xc8, 0x17, 0x3a, 0x87, 0x8c, 0x72, 0x92, - 0x66, 0xd6, 0xd7, 0x61, 0x21, 0x2f, 0x4c, 0x35, 0xa6, 0x35, 0x55, 0x8a, 0x58, 0xaf, 0x88, 0x65, - 0x95, 0xcb, 0x9b, 0x5c, 0xfe, 0xca, 0x18, 0x79, 0x99, 0xd3, 0x9c, 0xb2, 0x39, 0x4b, 0x41, 0x47, - 0x6e, 0xe4, 0x05, 0xc4, 0x21, 0x69, 0x1e, 0x64, 0x62, 0xb5, 0xd4, 0x78, 0x18, 0x69, 0xa3, 0xdd, - 0x74, 0x28, 0x12, 0x94, 0xa0, 0x18, 0x3a, 0xd8, 0x8e, 0x7d, 0xc2, 0xa1, 0x97, 0x0c, 0x36, 0x51, - 0x13, 0x32, 0xe2, 0x1e, 0xc2, 0x69, 0x55, 0x90, 0x65, 0x9f, 0x02, 0x35, 0x0c, 0x04, 0x8d, 0xc7, - 0x5c, 0x8c, 0x34, 0x57, 0x80, 0x99, 0x49, 0xe1, 0x54, 0x13, 0x93, 0xfd, 0xf7, 0x06, 0x74, 0x71, - 0xfa, 0x14, 0xa0, 0x5e, 0x65, 0x71, 0x4e, 0x43, 0x2d, 0x8a, 0x14, 0x0e, 0xb3, 0x82, 0x51, 0x7b, - 0xfa, 0x42, 0xa3, 0xf1, 0x58, 0x28, 0x32, 0xfa, 0x96, 0xb6, 0xe0, 0xa8, 0xac, 0xa2, 0x97, 0xdb, - 0xea, 0xc2, 0xa3, 0x70, 0xd8, 0x52, 0x96, 0x51, 0x2d, 0x3a, 0x24, 0xcd, 0x64, 0x33, 0x2a, 0xfb, - 0xc7, 0xf8, 0x50, 0x38, 0x0c, 0xdf, 0x8c, 0x16, 0x7d, 0x23, 0x48, 0x25, 0x03, 0x35, 0x8b, 0x7e, - 0x31, 0x95, 0x48, 0xba, 0xe6, 0xd5, 0xf6, 0x99, 0x5e, 0x05, 0xcd, 0xab, 0xfa, 0xe4, 0xea, 0xd4, - 0x26, 0xd7, 0x26, 0x74, 0x51, 0x4f, 0x11, 0xf4, 0x8b, 0x98, 0xea, 0x35, 0xa6, 0x1e, 0x1b, 0xdd, - 0x6a, 0x6c, 0xe8, 0xde, 0x5d, 0x9a, 0xe0, 0xdd, 0x65, 0xe9, 0xdd, 0xdf, 0x9b, 0x00, 0x3b, 0x24, - 0x76, 0x93, 0x2c, 0x24, 0x51, 0xc6, 0x86, 0xe7, 0x49, 0x4a, 0x3a, 0x57, 0xe3, 0xa9, 0x79, 0xc2, - 0xd4, 0xf3, 0x84, 0x05, 0x73, 0x1c, 0x70, 0xf4, 0x26, 0xff, 0xcd, 0xc0, 0x8c, 0xdd, 0x04, 0xb5, - 0x61, 0x90, 0x4b, 0x9a, 0xe5, 0x01, 0x9a, 0x78, 0x22, 0x73, 0x34, 0x1d, 0x24, 0xd8, 0xe4, 0x2f, - 0xfb, 0xe3, 0x05, 0x4d, 0x0b, 0xd7, 0x75, 0x9d, 0x7b, 0x6e, 0x0d, 0xf6, 0x22, 0xac, 0xa4, 0xf9, - 0x41, 0x39, 0xb8, 0xbd, 0x3c, 0x14, 0xe1, 0x5e, 0xe3, 0x33, 0x50, 0xb1, 0x38, 0x63, 0x8d, 0x30, - 0xd5, 0x94, 0x8c, 0x6a, 0x55, 0x60, 0xbf, 0x6d, 0xc2, 0xca, 0xfd, 0x64, 0xe8, 0x46, 0xfe, 0xf7, - 0x79, 0xb9, 0xc9, 0x17, 0xf0, 0x59, 0x52, 0xee, 0x06, 0x74, 0x48, 0x34, 0x0c, 0xfc, 0xf4, 0x68, - 0xaf, 0xc4, 0x4d, 0x65, 0xa9, 0x60, 0xcf, 0x4d, 0x4a, 0xca, 0x4d, 0x2d, 0x29, 0xaf, 0x41, 0x2b, - 0xa4, 0x07, 0x7e, 0x50, 0xc4, 0xbd, 0xa0, 0x78, 0xcc, 0x93, 0x80, 0xf0, 0xec, 0x2c, 0x63, 0xbe, - 0x60, 0x94, 0x89, 0x7a, 0x61, 0x6c, 0xa2, 0x6e, 0xab, 0x89, 0x5a, 0x07, 0x1e, 0x6a, 0xc0, 0x23, - 0x5c, 0x1d, 0x09, 0xd7, 0x9f, 0x0d, 0x58, 0x29, 0xe1, 0xc6, 0x1a, 0x74, 0x22, 0x5c, 0xd5, 0x08, - 0x34, 0xc7, 0x44, 0xa0, 0x8c, 0x9b, 0x86, 0x1a, 0x37, 0x2c, 0xd2, 0x68, 0xea, 0x2b, 0xf5, 0xbe, - 0xa4, 0x59, 0x6f, 0x01, 0x71, 0x15, 0xb0, 0x90, 0x52, 0xaa, 0xee, 0x96, 0x56, 0x75, 0x57, 0xf3, - 0xe8, 0x7b, 0x06, 0xac, 0x60, 0x7e, 0x50, 0x26, 0xcb, 0x7d, 0x58, 0xa1, 0x95, 0x28, 0x10, 0x49, - 0xe6, 0xd3, 0x63, 0x92, 0x44, 0x35, 0x60, 0x9c, 0x9a, 0xb0, 0xf5, 0x06, 0x5c, 0xf6, 0x2a, 0x38, - 0xdd, 0xf3, 0xd3, 0xac, 0x67, 0x6e, 0x34, 0x26, 0x28, 0xad, 0xc2, 0xea, 0x8c, 0x55, 0x60, 0xff, - 0x00, 0x7a, 0xfb, 0x79, 0x10, 0xec, 0x92, 0x34, 0x75, 0x87, 0x64, 0xeb, 0xb4, 0x4f, 0x46, 0x8c, - 0xef, 0x90, 0x34, 0x66, 0x11, 0x46, 0x92, 0x64, 0x9b, 0x7a, 0x84, 0x1b, 0xdf, 0x74, 0x0a, 0x92, - 0x81, 0x43, 0x92, 0x84, 0x2d, 0x33, 0xa2, 0x0e, 0x42, 0xca, 0xba, 0x06, 0x73, 0x01, 0x33, 0xab, - 0xc1, 0xcd, 0x5a, 0x1f, 0x63, 0xd6, 0x6e, 0x3a, 0xdc, 0x71, 0x33, 0xd7, 0xe1, 0xed, 0xec, 0x10, - 0x3e, 0x36, 0xbe, 0xf7, 0xd1, 0xc4, 0x28, 0x60, 0x95, 0x0a, 0x4f, 0xf5, 0x3e, 0x8d, 0x64, 0x10, - 0xa8, 0x2c, 0x66, 0x76, 0x8a, 0x7a, 0xb8, 0x1d, 0x5d, 0xa7, 0x20, 0xed, 0xcb, 0x60, 0xdd, 0x26, - 0xd9, 0xae, 0xfb, 0xf8, 0x46, 0xe4, 0xed, 0xfa, 0x51, 0x9f, 0x8c, 0x1c, 0x32, 0xb2, 0x6f, 0xc2, - 0xa5, 0x1a, 0x37, 0x8d, 0xf9, 0x6c, 0x71, 0x1f, 0xf7, 0xc9, 0x88, 0x1b, 0xd0, 0x75, 0x04, 0xc5, - 0xf9, 0xbc, 0x95, 0x28, 0x82, 0x04, 0x65, 0x8f, 0x60, 0x99, 0xb9, 0xaa, 0x4f, 0x22, 0x6f, 0x37, - 0x1d, 0x72, 0x15, 0x1b, 0xd0, 0x41, 0x04, 0x76, 0xd3, 0x61, 0x59, 0x55, 0x29, 0x2c, 0xd6, 0x62, - 0x10, 0xf8, 0xcc, 0x25, 0xbc, 0x85, 0x18, 0x8d, 0xc2, 0x62, 0xb1, 0x9b, 0x12, 0xb1, 0xc9, 0x60, - 0x41, 0xdd, 0x70, 0x24, 0x6d, 0xbf, 0xd7, 0x84, 0x79, 0x01, 0x28, 0x8f, 0x57, 0x56, 0xc8, 0x4a, - 0xbc, 0x90, 0xc2, 0x94, 0x33, 0x38, 0x29, 0xf7, 0x6b, 0x48, 0xa9, 0x3b, 0xbc, 0x86, 0xbe, 0xc3, - 0xab, 0xd8, 0x34, 0x57, 0xb7, 0xa9, 0x32, 0xae, 0x66, 0x7d, 0x5c, 0x6c, 0x85, 0xe5, 0x8b, 0xce, - 0x7e, 0xe0, 0x66, 0x87, 0x34, 0x09, 0x45, 0x5d, 0xda, 0x74, 0x6a, 0x7c, 0xb6, 0xaa, 0x23, 0x4f, - 0xa6, 0x65, 0x9c, 0x5d, 0x15, 0x2e, 0x4b, 0x82, 0xc8, 0x29, 0xd2, 0x33, 0x6e, 0x08, 0x74, 0x26, - 0xda, 0x96, 0xa6, 0x3e, 0x8d, 0x78, 0x82, 0xc0, 0x2c, 0xac, 0xb2, 0xd8, 0xc8, 0xc3, 0x74, 0x78, - 0x2b, 0xa1, 0xa1, 0xd8, 0x16, 0x14, 0x24, 0x1f, 0x39, 0x8d, 0xb2, 0x22, 0xb9, 0x74, 0x50, 0x56, - 0x61, 0x31, 0x59, 0x41, 0xf2, 0x14, 0xbc, 0xe8, 0x14, 0xa4, 0xb5, 0x02, 0x8d, 0x94, 0x8c, 0x44, - 0x5e, 0x65, 0x3f, 0x35, 0xcf, 0x2d, 0xeb, 0x9e, 0xab, 0x2c, 0x94, 0x2b, 0xfc, 0xab, 0xba, 0x50, - 0x96, 0xab, 0xcf, 0xaa, 0xb6, 0xfa, 0xdc, 0x80, 0x79, 0x1a, 0xb3, 0x38, 0x4f, 0x7b, 0x16, 0x9f, - 0x63, 0x9f, 0x99, 0x3c, 0xc7, 0xae, 0xdd, 0xc7, 0x96, 0x37, 0xa3, 0x2c, 0x39, 0x75, 0x0a, 0x39, - 0xeb, 0x1e, 0x2c, 0xd3, 0xc3, 0xc3, 0xc0, 0x8f, 0xc8, 0x7e, 0x9e, 0x1e, 0xf1, 0xfa, 0xf5, 0x12, - 0x5f, 0x9a, 0xec, 0x71, 0x4b, 0x93, 0xde, 0xd2, 0xa9, 0x8a, 0xae, 0xbf, 0x02, 0x8b, 0x6a, 0x37, - 0x0c, 0x86, 0x63, 0x72, 0x2a, 0x62, 0x90, 0xfd, 0x64, 0x4b, 0xf2, 0x89, 0x1b, 0xe4, 0x98, 0xe2, - 0x16, 0x1c, 0x24, 0x5e, 0x31, 0xbf, 0x62, 0xd8, 0x3f, 0x37, 0x60, 0xb9, 0xd2, 0x01, 0x6b, 0x9d, - 0xf9, 0x59, 0x40, 0x84, 0x06, 0x24, 0x58, 0xf9, 0xe0, 0x91, 0x74, 0x20, 0x42, 0x98, 0xff, 0x16, - 0x0b, 0x71, 0x43, 0x6e, 0x0a, 0x6d, 0x58, 0xf4, 0xef, 0xf7, 0x99, 0xa2, 0x3e, 0xcd, 0x23, 0x4f, - 0x1e, 0xec, 0x28, 0x3c, 0x16, 0x42, 0xfe, 0xfd, 0xfe, 0x96, 0xeb, 0x0d, 0x09, 0x1e, 0xbf, 0x34, - 0xb9, 0x4d, 0x3a, 0xd3, 0xf6, 0x60, 0xe1, 0x81, 0x1f, 0xa7, 0xdb, 0x34, 0x0c, 0x99, 0x23, 0x3c, - 0x92, 0xb1, 0x44, 0x67, 0x70, 0x7f, 0x0b, 0x8a, 0x85, 0x8a, 0x47, 0x0e, 0xdd, 0x3c, 0xc8, 0x58, - 0xd3, 0x62, 0xe2, 0x2a, 0x2c, 0x7e, 0xf0, 0x90, 0xd2, 0x68, 0x07, 0xa5, 0xd1, 0x4e, 0x85, 0x63, - 0xff, 0xc5, 0x84, 0x15, 0xbe, 0x3d, 0xd8, 0xe6, 0x6e, 0xf7, 0xb8, 0xd0, 0xcb, 0xd0, 0xe4, 0xd3, - 0x50, 0x64, 0x8b, 0xb3, 0xb7, 0x14, 0xd8, 0xd4, 0xba, 0x0e, 0x2d, 0x1a, 0xf3, 0x14, 0x83, 0xfb, - 0x90, 0xe7, 0x27, 0x09, 0xe9, 0x67, 0x3c, 0x8e, 0x90, 0xb2, 0x6e, 0x01, 0x84, 0x65, 0x46, 0xc1, - 0xa5, 0x7b, 0x5a, 0x1d, 0x8a, 0x24, 0x03, 0x57, 0x2e, 0xc3, 0xf2, 0xa0, 0xa7, 0xe1, 0xe8, 0x4c, - 0x6b, 0x0f, 0x96, 0xb8, 0xd9, 0xf7, 0x8b, 0xbd, 0x25, 0xf7, 0xc1, 0xf4, 0x3d, 0x56, 0xa4, 0xed, - 0x5f, 0x1b, 0x02, 0x46, 0xf6, 0xb5, 0x4f, 0x10, 0xfb, 0x12, 0x12, 0x63, 0x26, 0x48, 0xd6, 0x61, - 0x21, 0xcc, 0x95, 0xad, 0x6e, 0xc3, 0x91, 0x74, 0xe9, 0xa2, 0xc6, 0xd4, 0x2e, 0xb2, 0x7f, 0x63, - 0x40, 0xef, 0x35, 0xea, 0x47, 0xfc, 0xc3, 0x8d, 0x38, 0x0e, 0xc4, 0x69, 0xe4, 0xcc, 0x3e, 0xff, - 0x06, 0xb4, 0x5d, 0x54, 0x13, 0x65, 0xc2, 0xed, 0x53, 0x6c, 0x5f, 0x4b, 0x19, 0x65, 0x27, 0xd2, - 0x50, 0x77, 0x22, 0xf6, 0x3b, 0x06, 0x2c, 0x21, 0x28, 0xaf, 0xe7, 0x7e, 0x36, 0xb3, 0x7d, 0x5b, - 0xb0, 0x30, 0xca, 0xfd, 0x6c, 0x86, 0xa8, 0x94, 0x72, 0xf5, 0x78, 0x6a, 0x8c, 0x89, 0x27, 0xfb, - 0x5d, 0x03, 0xae, 0x54, 0x61, 0xbd, 0x31, 0x18, 0x90, 0xf8, 0x49, 0x4e, 0x29, 0x6d, 0x27, 0x36, - 0x57, 0xd9, 0x89, 0x8d, 0x35, 0xd9, 0x21, 0x6f, 0x91, 0xc1, 0xd3, 0x6b, 0xf2, 0x8f, 0x4d, 0xf8, - 0xf8, 0x6d, 0x39, 0xf1, 0x1e, 0x24, 0x6e, 0x94, 0x1e, 0x92, 0x24, 0x79, 0x82, 0xf6, 0xde, 0x83, - 0x6e, 0x44, 0x1e, 0x95, 0x36, 0x89, 0xe9, 0x38, 0xad, 0x1a, 0x5d, 0x78, 0xba, 0xb5, 0xcb, 0xfe, - 0x8f, 0x01, 0x2b, 0xa8, 0xe7, 0x9b, 0xfe, 0xe0, 0xf8, 0x09, 0x0e, 0x7e, 0x0f, 0x96, 0x8e, 0xb9, - 0x05, 0x8c, 0x9a, 0x61, 0xd9, 0xae, 0x48, 0x4f, 0x39, 0xfc, 0xff, 0x1a, 0xb0, 0x8a, 0x8a, 0xee, - 0x46, 0x27, 0xfe, 0x93, 0x0c, 0xd6, 0x7d, 0x58, 0xf6, 0xd1, 0x84, 0x19, 0x01, 0xa8, 0x8a, 0x4f, - 0x89, 0xc0, 0x1f, 0x0d, 0x58, 0x46, 0x4d, 0x37, 0xa3, 0x8c, 0x24, 0x33, 0x8f, 0xff, 0x0e, 0xdb, - 0xdd, 0x67, 0x89, 0x1b, 0xcd, 0xb2, 0x42, 0xaa, 0xa2, 0x53, 0x2e, 0x92, 0xef, 0x18, 0x60, 0x71, - 0x55, 0x3b, 0x7e, 0x1a, 0xfa, 0x69, 0xfa, 0x04, 0x5d, 0x37, 0x9d, 0xc1, 0xbf, 0x34, 0xe1, 0xb2, - 0xa2, 0x65, 0x37, 0xcf, 0x9e, 0x76, 0x93, 0xad, 0x1d, 0x68, 0xb3, 0x1a, 0x41, 0x3d, 0xe2, 0x9f, - 0xb6, 0xa3, 0x52, 0x90, 0x55, 0xb1, 0x9c, 0xe8, 0x93, 0x01, 0x8d, 0xbc, 0x94, 0x17, 0x47, 0x5d, - 0x47, 0xe3, 0xb1, 0x65, 0x68, 0x5d, 0x51, 0xb3, 0xed, 0x46, 0x03, 0x12, 0x3c, 0x33, 0x10, 0xd9, - 0xbf, 0x33, 0x60, 0x09, 0x9b, 0x3c, 0xfd, 0x43, 0x66, 0xb9, 0x1e, 0x03, 0xf9, 0x43, 0xe3, 0x25, - 0x16, 0x5e, 0x6b, 0x8a, 0x16, 0xb5, 0xae, 0x7e, 0x7a, 0x43, 0xeb, 0x0e, 0x74, 0x06, 0x47, 0x6e, - 0x34, 0x9c, 0x29, 0xb8, 0x54, 0x51, 0xfb, 0x18, 0x56, 0xf1, 0x52, 0x43, 0xa9, 0xce, 0xd8, 0xbe, - 0xdf, 0xf5, 0x70, 0x2b, 0x6f, 0xf0, 0xee, 0x0b, 0x52, 0xbf, 0xae, 0x12, 0x2f, 0x12, 0xca, 0xeb, - 0xaa, 0xab, 0x00, 0xae, 0xe7, 0xbd, 0x41, 0x13, 0xcf, 0x8f, 0x8a, 0x52, 0x5b, 0xe1, 0xd8, 0xaf, - 0xc1, 0xe2, 0xad, 0x84, 0x86, 0x0f, 0x94, 0xeb, 0x89, 0x33, 0x2f, 0x50, 0xd4, 0xab, 0x0d, 0x53, - 0xbf, 0xda, 0xb0, 0xbf, 0x07, 0x1f, 0xad, 0x19, 0xce, 0xbd, 0xb6, 0x8d, 0xb7, 0x2e, 0x45, 0x27, - 0xc2, 0x79, 0x9f, 0x1c, 0x03, 0x8e, 0x6a, 0x8b, 0xa3, 0x09, 0xd9, 0x3f, 0x32, 0xe0, 0xb9, 0x9a, - 0xfa, 0x1b, 0x71, 0x9c, 0xd0, 0x13, 0x11, 0xd1, 0x17, 0xd1, 0x8d, 0x5e, 0x86, 0x9a, 0xd5, 0x32, - 0x74, 0xac, 0x11, 0x5a, 0xe9, 0xfc, 0x01, 0x18, 0xf1, 0x5b, 0x03, 0x96, 0x85, 0x11, 0x9e, 0x27, - 0xba, 0xfd, 0x32, 0xb4, 0xf0, 0xc6, 0x56, 0x74, 0xf8, 0xdc, 0xd8, 0x0e, 0x8b, 0x9b, 0x66, 0x47, - 0x34, 0xae, 0xc7, 0xb6, 0x39, 0x2e, 0xb6, 0xbf, 0x2a, 0x67, 0xd0, 0xd4, 0x77, 0xaa, 0x42, 0xc0, - 0xfe, 0x76, 0x11, 0xcc, 0x3b, 0x24, 0x20, 0x17, 0x89, 0x91, 0xfd, 0x10, 0x96, 0xf8, 0xf5, 0x71, - 0x89, 0xc1, 0x85, 0xa8, 0x7d, 0x03, 0x56, 0xb8, 0xda, 0x0b, 0xb7, 0x57, 0xce, 0x0e, 0x86, 0xcf, - 0x36, 0xce, 0xf7, 0x8b, 0xd3, 0xfe, 0x05, 0xb8, 0x54, 0x60, 0xff, 0x30, 0xf6, 0xe4, 0x71, 0xce, - 0x84, 0x43, 0x6c, 0xfb, 0x8b, 0xb0, 0xb6, 0x4d, 0xa3, 0x13, 0x92, 0xa4, 0x78, 0xc4, 0xcf, 0x45, - 0x0a, 0x09, 0x6d, 0xf2, 0x0b, 0xca, 0x7e, 0x0b, 0xd6, 0x55, 0x89, 0x3e, 0xc9, 0xf6, 0x13, 0xff, - 0x44, 0x91, 0x12, 0x87, 0xbc, 0x86, 0x76, 0xc8, 0x5b, 0x1e, 0x0a, 0x9b, 0xda, 0xa1, 0xf0, 0x15, - 0x68, 0xfb, 0xa9, 0x50, 0xc0, 0x83, 0x6a, 0xc1, 0x29, 0x19, 0x76, 0x1f, 0x56, 0xc5, 0x85, 0xee, - 0xbe, 0x3b, 0xf4, 0x23, 0x5c, 0x01, 0xaf, 0x02, 0xc4, 0xee, 0xb0, 0x78, 0xd0, 0x81, 0xf7, 0x01, - 0x0a, 0x87, 0x7d, 0x4f, 0x8f, 0xe8, 0x23, 0xf1, 0xdd, 0xc4, 0xef, 0x25, 0xc7, 0xfe, 0x16, 0x58, - 0x0e, 0x49, 0x63, 0x1a, 0xa5, 0x44, 0xd1, 0xba, 0x01, 0x9d, 0xed, 0x3c, 0x49, 0x48, 0xc4, 0xba, - 0x2a, 0x5e, 0x37, 0xa8, 0x2c, 0xa6, 0xb7, 0x5f, 0xea, 0xc5, 0x33, 0x64, 0x85, 0x63, 0xff, 0xaa, - 0x01, 0xed, 0xbe, 0x3f, 0x8c, 0xdc, 0xc0, 0x21, 0x23, 0xeb, 0x6b, 0xd0, 0xc2, 0xca, 0x5e, 0xb8, - 0x71, 0xdc, 0x99, 0x26, 0xb6, 0xc6, 0x2d, 0x8c, 0x43, 0x46, 0x77, 0x3e, 0xe2, 0x08, 0x19, 0xeb, - 0x75, 0xe8, 0xe2, 0xaf, 0xbb, 0x78, 0x52, 0x23, 0x32, 0xd6, 0x67, 0xcf, 0x51, 0x22, 0x5a, 0xa3, - 0x2e, 0x5d, 0x03, 0x33, 0x68, 0xc0, 0x33, 0xbf, 0x98, 0xbb, 0x93, 0x0d, 0xc2, 0x02, 0x41, 0x18, - 0x84, 0x32, 0x4c, 0xda, 0xe5, 0x67, 0x19, 0x22, 0xa1, 0x4d, 0x96, 0xc6, 0x23, 0x0f, 0x21, 0x8d, - 0x32, 0x4c, 0xfa, 0x28, 0x8f, 0x86, 0x0f, 0x63, 0x71, 0xc4, 0x36, 0x59, 0xfa, 0x0e, 0x6f, 0x26, - 0xa4, 0x51, 0x86, 0x49, 0x27, 0x7c, 0x65, 0xe5, 0xa0, 0x9f, 0x25, 0x8d, 0x0b, 0xb0, 0x90, 0x46, - 0x99, 0xad, 0x36, 0xcc, 0xc7, 0xee, 0x69, 0x40, 0x5d, 0xcf, 0x7e, 0xbb, 0x01, 0x50, 0x34, 0x4c, - 0x79, 0x3d, 0xa0, 0xb9, 0x68, 0xf3, 0x5c, 0x17, 0xc5, 0xc1, 0xa9, 0xe2, 0xa4, 0xfe, 0x78, 0x27, - 0x7d, 0x6e, 0x5a, 0x27, 0xa1, 0xb6, 0x8a, 0x9b, 0xae, 0x57, 0xdc, 0xb4, 0x79, 0xae, 0x9b, 0x84, - 0x51, 0xc2, 0x51, 0xd7, 0x2b, 0x8e, 0xda, 0x3c, 0xd7, 0x51, 0x42, 0x5e, 0xb8, 0xea, 0x7a, 0xc5, - 0x55, 0x9b, 0xe7, 0xba, 0x4a, 0xc8, 0x0b, 0x67, 0x5d, 0xaf, 0x38, 0x6b, 0xf3, 0x5c, 0x67, 0x09, - 0xf9, 0xba, 0xbb, 0xde, 0x35, 0x61, 0x89, 0x43, 0x86, 0xf7, 0x69, 0xd1, 0x21, 0xe5, 0xc7, 0xe6, - 0x1c, 0x2e, 0xfd, 0x7d, 0x90, 0xce, 0xb4, 0x3e, 0x0f, 0xab, 0xc8, 0x10, 0xef, 0x49, 0xe4, 0x05, - 0x65, 0xdb, 0xa9, 0x7f, 0xe0, 0x37, 0x20, 0x79, 0x9a, 0xd1, 0x70, 0xc7, 0xcd, 0xdc, 0xa2, 0x32, - 0x2a, 0x39, 0xea, 0xfd, 0xd4, 0x5c, 0xed, 0x05, 0x62, 0x42, 0x69, 0x28, 0x2f, 0x9e, 0x04, 0xc5, - 0x24, 0x32, 0x3f, 0x24, 0x34, 0xcf, 0xc4, 0x32, 0x51, 0x90, 0x78, 0x87, 0xef, 0xf9, 0x2e, 0xbf, - 0xd5, 0x11, 0x17, 0xdc, 0x92, 0xc1, 0x57, 0xb6, 0xf2, 0x96, 0x4a, 0xbc, 0x10, 0x2c, 0x39, 0xe7, - 0xdf, 0x28, 0xd9, 0xff, 0x30, 0xe0, 0xd2, 0xbe, 0x9b, 0x64, 0xfe, 0xc0, 0x8f, 0xdd, 0x28, 0xdb, - 0x25, 0x99, 0xcb, 0xc7, 0xa0, 0x3d, 0x12, 0x32, 0xde, 0xdf, 0x23, 0xa1, 0x7d, 0x58, 0x1e, 0xea, - 0x45, 0xf8, 0xfb, 0xac, 0x9f, 0xab, 0xe2, 0xda, 0x8b, 0xa7, 0xc6, 0xfb, 0x7e, 0xf1, 0x64, 0xff, - 0xd4, 0x84, 0xe5, 0xca, 0xd2, 0xc9, 0xca, 0x51, 0x2c, 0x34, 0x64, 0x4c, 0x48, 0xda, 0xba, 0x01, - 0xe0, 0xcb, 0x30, 0x3a, 0xe3, 0x8c, 0x5a, 0x8f, 0x35, 0x47, 0x11, 0x1a, 0x77, 0x55, 0xd5, 0x98, - 0xf9, 0xaa, 0x8a, 0x6d, 0x11, 0xe2, 0xd2, 0x49, 0x67, 0x6c, 0x11, 0xc6, 0xb8, 0xd2, 0x51, 0x45, - 0xed, 0xef, 0xc2, 0x6a, 0x6d, 0x85, 0xe2, 0x37, 0x57, 0xf4, 0x98, 0x44, 0xf2, 0xe6, 0x8a, 0x11, - 0x4a, 0xb0, 0x9a, 0xd5, 0x60, 0x0d, 0xfc, 0x13, 0xf5, 0x49, 0xa5, 0x20, 0xed, 0x9f, 0x99, 0xb0, - 0x36, 0x3e, 0xbb, 0x3c, 0xab, 0x70, 0x1f, 0x40, 0x6f, 0xd2, 0x4a, 0x7e, 0x61, 0xa8, 0x97, 0xd1, - 0x2d, 0xf3, 0xf0, 0xb3, 0x0a, 0xf7, 0xa5, 0x22, 0xba, 0x95, 0x54, 0x67, 0xff, 0x41, 0xe2, 0x23, - 0x2b, 0x8d, 0x67, 0x14, 0x1f, 0xeb, 0x45, 0x58, 0xc1, 0x61, 0x2a, 0x6f, 0x1b, 0xb0, 0x70, 0xad, - 0xf1, 0xcb, 0x95, 0x42, 0x49, 0xfb, 0x17, 0x16, 0xb3, 0x7f, 0x32, 0x0a, 0x9f, 0xc8, 0xfa, 0xed, - 0x43, 0xe5, 0x93, 0x32, 0xd2, 0x94, 0xa2, 0x46, 0x89, 0x34, 0x59, 0x57, 0xfe, 0x3f, 0xd2, 0xce, - 0x8f, 0x34, 0x89, 0xa5, 0x52, 0xe0, 0xd9, 0x3f, 0x84, 0xee, 0x0e, 0x09, 0x76, 0xd3, 0x61, 0xf1, - 0xaa, 0xea, 0x2c, 0x20, 0x27, 0xfd, 0xb3, 0x63, 0xe2, 0x7b, 0xaa, 0xea, 0x5b, 0xac, 0xb9, 0xda, - 0x5b, 0x2c, 0x7b, 0x0b, 0x96, 0x54, 0x03, 0x66, 0x79, 0x54, 0xb6, 0x75, 0xe5, 0x3b, 0xeb, 0xd7, - 0x5e, 0xc2, 0xff, 0x10, 0xbd, 0x5a, 0x03, 0xf1, 0xa0, 0xc5, 0xff, 0x53, 0xf4, 0xa5, 0xff, 0x05, - 0x00, 0x00, 0xff, 0xff, 0x3c, 0x30, 0x52, 0xe6, 0x66, 0x34, 0x00, 0x00, +var fileDescriptor_ws_879c1413df9d19e3 = []byte{ + // 3013 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcb, 0x6f, 0x24, 0x49, + 0xd1, 0xff, 0xaa, 0xda, 0xdd, 0x76, 0x47, 0xbb, 0xfd, 0xa8, 0x99, 0xcf, 0x34, 0x66, 0x76, 0x30, + 0x85, 0xb5, 0x2c, 0x0b, 0xcc, 0xa2, 0x45, 0x48, 0xb0, 0x0b, 0x83, 0xc6, 0xf6, 0xbc, 0x96, 0xb1, + 0xc7, 0x5b, 0x3d, 0xc3, 0x22, 0x40, 0x5a, 0x95, 0xbb, 0xd2, 0xed, 0x5a, 0x57, 0x65, 0x56, 0xd7, + 0xc3, 0x33, 0x46, 0x48, 0x48, 0x20, 0x21, 0x6e, 0x9c, 0xe0, 0xc0, 0x05, 0x89, 0x0b, 0x02, 0xad, + 0x56, 0x2b, 0x04, 0x12, 0x87, 0x15, 0xe2, 0xc0, 0x3f, 0xc0, 0x11, 0x71, 0xe3, 0xcc, 0x95, 0x03, + 0x12, 0x12, 0x28, 0x33, 0xb2, 0xaa, 0x32, 0xab, 0xba, 0xed, 0xde, 0x96, 0xb5, 0x33, 0xab, 0xe1, + 0xd6, 0x11, 0x95, 0x11, 0x19, 0xf9, 0x8b, 0xc8, 0x8c, 0xc8, 0x47, 0xc3, 0x72, 0xe2, 0x1d, 0xbf, + 0xf9, 0x28, 0x79, 0xe9, 0x51, 0x72, 0x2d, 0x8a, 0x59, 0xca, 0xac, 0xd5, 0x84, 0xc4, 0x27, 0x24, + 0x7e, 0xd3, 0x8d, 0xfc, 0x37, 0x23, 0x37, 0x76, 0xc3, 0xc4, 0xfe, 0xa7, 0x09, 0xed, 0xdb, 0x31, + 0xcb, 0xa2, 0xbb, 0xf4, 0x90, 0x59, 0x3d, 0x98, 0x1f, 0x0a, 0x62, 0xa7, 0x67, 0x6c, 0x18, 0x2f, + 0xb4, 0x9d, 0x9c, 0xb4, 0xae, 0x40, 0x5b, 0xfc, 0xdc, 0x73, 0x43, 0xd2, 0x33, 0xc5, 0xb7, 0x92, + 0x61, 0xd9, 0xb0, 0x48, 0x59, 0xea, 0x1f, 0xfa, 0x03, 0x37, 0xf5, 0x19, 0xed, 0x35, 0x44, 0x03, + 0x8d, 0xc7, 0xdb, 0xf8, 0x34, 0x8d, 0x99, 0x97, 0x0d, 0x44, 0x9b, 0x39, 0x6c, 0xa3, 0xf2, 0x78, + 0xff, 0x87, 0xee, 0x80, 0x3c, 0x74, 0xee, 0xf5, 0x9a, 0xd8, 0xbf, 0x24, 0xad, 0x0d, 0xe8, 0xb0, + 0x47, 0x94, 0xc4, 0x0f, 0x13, 0x12, 0xdf, 0xdd, 0xe9, 0xb5, 0xc4, 0x57, 0x95, 0x65, 0x5d, 0x05, + 0x18, 0xc4, 0xc4, 0x4d, 0xc9, 0x03, 0x3f, 0x24, 0xbd, 0xf9, 0x0d, 0xe3, 0x85, 0xae, 0xa3, 0x70, + 0xb8, 0x86, 0x90, 0x84, 0x07, 0x24, 0xde, 0x66, 0x19, 0x4d, 0x7b, 0x0b, 0xa2, 0x81, 0xca, 0xb2, + 0x96, 0xc0, 0x24, 0x8f, 0x7b, 0x6d, 0xa1, 0xda, 0x24, 0x8f, 0xad, 0x35, 0x68, 0x25, 0xa9, 0x9b, + 0x66, 0x49, 0x0f, 0x36, 0x8c, 0x17, 0x9a, 0x8e, 0xa4, 0xac, 0x4d, 0xe8, 0x0a, 0xbd, 0x2c, 0xb7, + 0xa6, 0x23, 0x44, 0x74, 0x66, 0x81, 0xd8, 0x83, 0xd3, 0x88, 0xf4, 0x16, 0x85, 0x82, 0x92, 0x61, + 0xff, 0xd5, 0x84, 0x4b, 0x02, 0xf7, 0x5d, 0x61, 0xc0, 0xad, 0x2c, 0x08, 0xce, 0xf1, 0xc0, 0x1a, + 0xb4, 0x32, 0xec, 0x0e, 0xe1, 0x97, 0x14, 0xef, 0x27, 0x66, 0x01, 0xb9, 0x47, 0x4e, 0x48, 0x20, + 0x80, 0x6f, 0x3a, 0x25, 0xc3, 0x5a, 0x87, 0x85, 0xb7, 0x98, 0x4f, 0x05, 0x26, 0x73, 0xe2, 0x63, + 0x41, 0xf3, 0x6f, 0xd4, 0x1f, 0x1c, 0x53, 0xee, 0x52, 0x84, 0xbb, 0xa0, 0x55, 0x4f, 0xb4, 0x74, + 0x4f, 0x3c, 0x0f, 0x4b, 0x6e, 0x14, 0xed, 0xba, 0x74, 0x48, 0x62, 0xec, 0x74, 0x5e, 0xe8, 0xad, + 0x70, 0xb9, 0x3f, 0x78, 0x4f, 0x7d, 0x96, 0xc5, 0x03, 0x22, 0xe0, 0x6e, 0x3a, 0x0a, 0x87, 0xeb, + 0x61, 0x11, 0x89, 0x15, 0x18, 0x11, 0xf9, 0x0a, 0x57, 0x7a, 0x05, 0x0a, 0xaf, 0x70, 0x3f, 0x66, + 0x29, 0xb9, 0x49, 0x3d, 0x31, 0xa8, 0x8e, 0xf4, 0x63, 0xc9, 0xb2, 0x7f, 0x64, 0xc0, 0xd2, 0x7e, + 0x76, 0x10, 0xf8, 0x03, 0xa1, 0x82, 0xc3, 0x5a, 0x82, 0x67, 0x68, 0xe0, 0xa9, 0x10, 0x98, 0x93, + 0x21, 0x68, 0xe8, 0x10, 0xac, 0x41, 0x6b, 0x48, 0xa8, 0x47, 0x62, 0x09, 0xa9, 0xa4, 0xa4, 0xa9, + 0xcd, 0xdc, 0x54, 0xfb, 0x67, 0x26, 0x2c, 0x7c, 0xc0, 0x26, 0x6c, 0x40, 0x27, 0x3a, 0x62, 0x94, + 0xec, 0x65, 0x3c, 0xac, 0xa4, 0x2d, 0x2a, 0xcb, 0xba, 0x0c, 0xcd, 0x03, 0x3f, 0x4e, 0x8f, 0x84, + 0x5f, 0xbb, 0x0e, 0x12, 0x9c, 0x4b, 0x42, 0xd7, 0x47, 0x67, 0xb6, 0x1d, 0x24, 0xe4, 0x80, 0x16, + 0x0a, 0xec, 0xf5, 0x39, 0xd6, 0xae, 0xcd, 0xb1, 0x7a, 0x6c, 0xc0, 0xb8, 0xd8, 0xb0, 0xff, 0x65, + 0x00, 0xdc, 0x8a, 0x7d, 0x42, 0x3d, 0x01, 0x4d, 0x65, 0x72, 0x1b, 0xf5, 0xc9, 0xbd, 0x06, 0xad, + 0x98, 0x84, 0x6e, 0x7c, 0x9c, 0x07, 0x3f, 0x52, 0x15, 0x83, 0x1a, 0x35, 0x83, 0x5e, 0x05, 0x38, + 0x14, 0xfd, 0x70, 0x3d, 0x02, 0xaa, 0xce, 0xcb, 0x1f, 0xbb, 0x56, 0x5b, 0x06, 0xaf, 0xe5, 0x5e, + 0x72, 0x94, 0xe6, 0x7c, 0x66, 0xb9, 0x9e, 0x27, 0x03, 0xb8, 0x89, 0x33, 0xab, 0x60, 0x8c, 0x89, + 0xdf, 0xd6, 0x19, 0xf1, 0x3b, 0x5f, 0x04, 0xc5, 0x3f, 0x0c, 0x68, 0x6f, 0x05, 0xee, 0xe0, 0x78, + 0xca, 0xa1, 0xeb, 0x43, 0x34, 0x6b, 0x43, 0xbc, 0x0d, 0xdd, 0x03, 0xae, 0x2e, 0x1f, 0x82, 0x40, + 0xa1, 0xf3, 0xf2, 0x27, 0xc6, 0x8c, 0x52, 0x9f, 0x14, 0x8e, 0x2e, 0xa7, 0x0f, 0x77, 0xee, 0xfc, + 0xe1, 0x36, 0xcf, 0x18, 0x6e, 0xab, 0x18, 0xee, 0x5f, 0x4c, 0x58, 0x14, 0x0b, 0x9d, 0x43, 0x46, + 0x19, 0x49, 0x52, 0xeb, 0xab, 0xb0, 0x90, 0xe5, 0xa6, 0x1a, 0xd3, 0x9a, 0x5a, 0x88, 0x58, 0xaf, + 0xc8, 0x65, 0x55, 0xc8, 0x9b, 0x42, 0xfe, 0xca, 0x18, 0xf9, 0x22, 0xa7, 0x39, 0x65, 0x73, 0x9e, + 0x82, 0x8e, 0x5c, 0xea, 0x05, 0xc4, 0x21, 0x49, 0x16, 0xa4, 0x72, 0xb5, 0xd4, 0x78, 0x18, 0x69, + 0xa3, 0xdd, 0x64, 0x28, 0x13, 0x94, 0xa4, 0x38, 0x3a, 0xd8, 0x8e, 0x7f, 0xc2, 0xa1, 0x97, 0x0c, + 0x3e, 0x51, 0x63, 0x32, 0x12, 0x1e, 0xc2, 0x69, 0x95, 0x93, 0x65, 0x9f, 0x12, 0x35, 0x0c, 0x04, + 0x8d, 0xc7, 0x5d, 0x8c, 0xb4, 0x50, 0x80, 0x99, 0x49, 0xe1, 0x54, 0x13, 0x93, 0xfd, 0xb7, 0x06, + 0x74, 0x71, 0xfa, 0xe4, 0xa0, 0x5e, 0xe5, 0x71, 0xce, 0x42, 0x2d, 0x8a, 0x14, 0x0e, 0xb7, 0x82, + 0x53, 0x7b, 0xfa, 0x42, 0xa3, 0xf1, 0x78, 0x28, 0x72, 0xfa, 0x96, 0xb6, 0xe0, 0xa8, 0xac, 0xbc, + 0x97, 0xdb, 0xea, 0xc2, 0xa3, 0x70, 0xf8, 0x52, 0x96, 0x32, 0x2d, 0x3a, 0x0a, 0x9a, 0xcb, 0xa6, + 0xac, 0xe8, 0x1f, 0xe3, 0x43, 0xe1, 0x70, 0x7c, 0x53, 0x96, 0xf7, 0x8d, 0x20, 0x95, 0x0c, 0xd4, + 0x2c, 0xfb, 0xc5, 0x54, 0x52, 0xd0, 0x35, 0xaf, 0xb6, 0xcf, 0xf4, 0x2a, 0x68, 0x5e, 0xd5, 0x27, + 0x57, 0xa7, 0x36, 0xb9, 0x36, 0xa1, 0x8b, 0x7a, 0xf2, 0xa0, 0x5f, 0xc4, 0x54, 0xaf, 0x31, 0xf5, + 0xd8, 0xe8, 0x56, 0x63, 0x43, 0xf7, 0xee, 0xd2, 0x04, 0xef, 0x2e, 0x17, 0xde, 0xfd, 0xad, 0x09, + 0xb0, 0x43, 0x22, 0x37, 0x4e, 0x43, 0x42, 0x53, 0x3e, 0x3c, 0xaf, 0xa0, 0x0a, 0xe7, 0x6a, 0x3c, + 0x35, 0x4f, 0x98, 0x7a, 0x9e, 0xb0, 0x60, 0x4e, 0x00, 0x8e, 0xde, 0x14, 0xbf, 0x39, 0x98, 0x91, + 0x1b, 0xa3, 0x36, 0x0c, 0xf2, 0x82, 0xe6, 0x79, 0x80, 0xc5, 0x9e, 0xcc, 0x1c, 0x4d, 0x07, 0x09, + 0x3e, 0xf9, 0xcb, 0xfe, 0x44, 0x41, 0xd3, 0xc2, 0x75, 0x5d, 0xe7, 0x9e, 0x5b, 0x83, 0xbd, 0x08, + 0x2b, 0x49, 0x76, 0x50, 0x0e, 0x6e, 0x2f, 0x0b, 0x65, 0xb8, 0xd7, 0xf8, 0x1c, 0x54, 0x2c, 0xce, + 0x78, 0x23, 0x4c, 0x35, 0x25, 0xa3, 0x5a, 0x15, 0xd8, 0x6f, 0x9b, 0xb0, 0x72, 0x3f, 0x1e, 0xba, + 0xd4, 0xff, 0xae, 0x28, 0x37, 0xc5, 0x02, 0x3e, 0x4b, 0xca, 0xdd, 0x80, 0x0e, 0xa1, 0xc3, 0xc0, + 0x4f, 0x8e, 0xf6, 0x4a, 0xdc, 0x54, 0x96, 0x0a, 0xf6, 0xdc, 0xa4, 0xa4, 0xdc, 0xd4, 0x92, 0xf2, + 0x1a, 0xb4, 0x42, 0x76, 0xe0, 0x07, 0x79, 0xdc, 0x4b, 0x4a, 0xc4, 0x3c, 0x09, 0x88, 0xc8, 0xce, + 0x45, 0xcc, 0xe7, 0x8c, 0x32, 0x51, 0x2f, 0x8c, 0x4d, 0xd4, 0x6d, 0x35, 0x51, 0xeb, 0xc0, 0x43, + 0x0d, 0x78, 0x84, 0xab, 0x53, 0xc0, 0xf5, 0x27, 0x03, 0x56, 0x4a, 0xb8, 0xb1, 0x06, 0x9d, 0x08, + 0x57, 0x35, 0x02, 0xcd, 0x31, 0x11, 0x58, 0xc4, 0x4d, 0x43, 0x8d, 0x1b, 0x1e, 0x69, 0x2c, 0xf1, + 0x95, 0x7a, 0xbf, 0xa0, 0x79, 0x6f, 0x01, 0x71, 0x15, 0xb0, 0x90, 0x52, 0xaa, 0xee, 0x96, 0x56, + 0x75, 0x57, 0xf3, 0xe8, 0x1f, 0x0c, 0xb8, 0xcc, 0xbd, 0x5c, 0x1b, 0xc6, 0x7d, 0x58, 0x61, 0x95, + 0x48, 0x90, 0x89, 0xe6, 0x93, 0x63, 0x12, 0x45, 0x35, 0x68, 0x9c, 0x9a, 0x30, 0x57, 0xe8, 0x55, + 0x3a, 0x91, 0x99, 0x67, 0x9c, 0xc2, 0xaa, 0x3d, 0x4e, 0x4d, 0xd8, 0x7e, 0xcf, 0x80, 0x15, 0x4c, + 0x6d, 0xca, 0x3c, 0xbf, 0x70, 0xb3, 0xdf, 0x80, 0xcb, 0xd5, 0x9e, 0xef, 0xf9, 0x49, 0xda, 0x33, + 0x37, 0x1a, 0xd3, 0x9a, 0x3e, 0x56, 0x81, 0xfd, 0x3d, 0xe8, 0xed, 0x67, 0x41, 0xb0, 0x4b, 0x92, + 0xc4, 0x1d, 0x92, 0xad, 0xd3, 0x3e, 0x19, 0x71, 0xbe, 0x43, 0x92, 0x88, 0x4f, 0x0e, 0x12, 0xc7, + 0xdb, 0xcc, 0x23, 0xc2, 0xf8, 0xa6, 0x93, 0x93, 0xdc, 0xaf, 0x24, 0x8e, 0xf9, 0x0a, 0x29, 0x4b, + 0x38, 0xa4, 0xac, 0x6b, 0x30, 0x17, 0x70, 0xb3, 0x1a, 0xc2, 0xac, 0xf5, 0x31, 0x66, 0xed, 0x26, + 0xc3, 0x1d, 0x37, 0x75, 0x1d, 0xd1, 0xce, 0x0e, 0xe1, 0x23, 0xe3, 0x7b, 0x1f, 0x4d, 0x0c, 0x60, + 0x5e, 0x64, 0x89, 0x2a, 0xc5, 0x67, 0xb4, 0x88, 0x5f, 0x95, 0xc5, 0xcd, 0x4e, 0x50, 0x8f, 0xb0, + 0xa3, 0xeb, 0xe4, 0xa4, 0x7d, 0x19, 0xac, 0xdb, 0x24, 0xdd, 0x75, 0x1f, 0xdf, 0xa0, 0xde, 0xae, + 0x4f, 0xfb, 0x64, 0xe4, 0x90, 0x91, 0x7d, 0x13, 0x2e, 0xd5, 0xb8, 0x49, 0x24, 0x26, 0xba, 0xfb, + 0xb8, 0x4f, 0x46, 0xc2, 0x80, 0xae, 0x23, 0x29, 0xc1, 0x17, 0xad, 0x64, 0xfd, 0x26, 0x29, 0x7b, + 0x04, 0xcb, 0xdc, 0x55, 0x7d, 0x42, 0xbd, 0xdd, 0x64, 0x28, 0x54, 0x6c, 0x40, 0x07, 0x11, 0xd8, + 0x4d, 0x86, 0x65, 0x41, 0xa8, 0xb0, 0x78, 0x8b, 0x41, 0xe0, 0x73, 0x97, 0x88, 0x16, 0x72, 0x34, + 0x0a, 0x8b, 0x4f, 0xbb, 0x84, 0xc8, 0xfd, 0x11, 0x9f, 0x8f, 0x0d, 0xa7, 0xa0, 0xed, 0xf7, 0x9a, + 0x30, 0x2f, 0x01, 0x15, 0x53, 0x8d, 0xd7, 0xe0, 0x05, 0x5e, 0x48, 0x61, 0xb6, 0x1c, 0x9c, 0x94, + 0x5b, 0x4d, 0xa4, 0xd4, 0xcd, 0x69, 0x43, 0xdf, 0x9c, 0x56, 0x6c, 0x9a, 0xab, 0xdb, 0x54, 0x19, + 0x57, 0xb3, 0x3e, 0x2e, 0x9e, 0x1c, 0xc4, 0x7a, 0xb9, 0x1f, 0xb8, 0xe9, 0x21, 0x8b, 0x43, 0x59, + 0x52, 0x37, 0x9d, 0x1a, 0x9f, 0x27, 0x24, 0xe4, 0x15, 0x15, 0x05, 0x2e, 0x0c, 0x15, 0x2e, 0xcf, + 0xdf, 0xc8, 0xc9, 0x2b, 0x0b, 0xdc, 0xcb, 0xe8, 0x4c, 0xb4, 0x2d, 0x49, 0x7c, 0x46, 0x45, 0x6e, + 0xc3, 0x02, 0x42, 0x65, 0xf1, 0x91, 0x87, 0xc9, 0xf0, 0x56, 0xcc, 0x42, 0xb9, 0xa3, 0xc9, 0x49, + 0x31, 0x72, 0x46, 0xd3, 0x3c, 0x2f, 0x76, 0x50, 0x56, 0x61, 0x71, 0x59, 0x49, 0x8a, 0xea, 0x61, + 0xd1, 0xc9, 0x49, 0x6b, 0x05, 0x1a, 0x09, 0x19, 0xc9, 0x92, 0x80, 0xff, 0xd4, 0x3c, 0xb7, 0xac, + 0x7b, 0xae, 0xb2, 0xc6, 0xaf, 0x88, 0xaf, 0xea, 0x1a, 0x5f, 0x2e, 0x9c, 0xab, 0xda, 0xc2, 0x79, + 0x03, 0xe6, 0x59, 0xc4, 0xe3, 0x3c, 0xe9, 0x59, 0x62, 0x8e, 0x7d, 0x6a, 0xf2, 0x1c, 0xbb, 0x76, + 0x1f, 0x5b, 0xde, 0xa4, 0x69, 0x7c, 0xea, 0xe4, 0x72, 0xd6, 0x3d, 0x58, 0x66, 0x87, 0x87, 0x81, + 0x4f, 0xc9, 0x7e, 0x96, 0x1c, 0x89, 0xd2, 0xfb, 0x92, 0x58, 0x9a, 0xec, 0x71, 0x4b, 0x93, 0xde, + 0xd2, 0xa9, 0x8a, 0xae, 0xbf, 0x02, 0x8b, 0x6a, 0x37, 0x1c, 0x86, 0x63, 0x72, 0x2a, 0x63, 0x90, + 0xff, 0xe4, 0xd9, 0xe4, 0xc4, 0x0d, 0x32, 0xcc, 0xce, 0x0b, 0x0e, 0x12, 0xaf, 0x98, 0x5f, 0x32, + 0xec, 0x9f, 0x1a, 0xb0, 0x5c, 0xe9, 0x80, 0xb7, 0x4e, 0xfd, 0x34, 0x20, 0x52, 0x03, 0x12, 0xbc, + 0xf2, 0xf1, 0x48, 0x32, 0x90, 0x21, 0x2c, 0x7e, 0xcb, 0x1c, 0xd2, 0x28, 0xf6, 0xb3, 0x36, 0x2c, + 0xfa, 0xf7, 0xfb, 0x5c, 0x51, 0x9f, 0x65, 0xd4, 0x2b, 0xce, 0xa4, 0x14, 0x1e, 0x0f, 0x21, 0xff, + 0x7e, 0x7f, 0xcb, 0xf5, 0x86, 0x04, 0x4f, 0x8e, 0x9a, 0xc2, 0x26, 0x9d, 0x69, 0x7b, 0xb0, 0xf0, + 0xc0, 0x8f, 0x92, 0x6d, 0x16, 0x86, 0xdc, 0x11, 0x1e, 0x49, 0x79, 0x8e, 0x36, 0x84, 0xbf, 0x25, + 0xc5, 0x43, 0xc5, 0x23, 0x87, 0x6e, 0x16, 0xa4, 0xbc, 0x69, 0x3e, 0x71, 0x15, 0x96, 0x38, 0x33, + 0x49, 0x18, 0xdd, 0x41, 0x69, 0xb4, 0x53, 0xe1, 0xd8, 0x7f, 0x36, 0x61, 0x45, 0xec, 0x6c, 0xb6, + 0x85, 0xdb, 0x3d, 0x21, 0xf4, 0x32, 0x34, 0xc5, 0x34, 0x94, 0xd9, 0xe2, 0xec, 0xdd, 0x10, 0x36, + 0xb5, 0xae, 0x43, 0x8b, 0x45, 0x22, 0xc5, 0x60, 0x22, 0x7b, 0x7e, 0x92, 0x90, 0x7e, 0x3c, 0xe5, + 0x48, 0x29, 0xeb, 0x16, 0x40, 0x58, 0x66, 0x14, 0x5c, 0xba, 0xa7, 0xd5, 0xa1, 0x48, 0x72, 0x70, + 0x8b, 0x65, 0xb8, 0x38, 0xa3, 0x6a, 0x38, 0x3a, 0xd3, 0xda, 0x83, 0x25, 0x61, 0xf6, 0xfd, 0x7c, + 0x5b, 0x2c, 0x7c, 0x30, 0x7d, 0x8f, 0x15, 0x69, 0xfb, 0x97, 0x86, 0x84, 0x91, 0x7f, 0xed, 0x13, + 0xc4, 0xbe, 0x84, 0xc4, 0x98, 0x09, 0x92, 0x75, 0x58, 0x08, 0x33, 0x65, 0x97, 0xde, 0x70, 0x0a, + 0xba, 0x74, 0x51, 0x63, 0x6a, 0x17, 0xd9, 0xbf, 0x32, 0xa0, 0xf7, 0x1a, 0xf3, 0xa9, 0xf8, 0x70, + 0x23, 0x8a, 0x02, 0x79, 0x90, 0x3a, 0xb3, 0xcf, 0xbf, 0x06, 0x6d, 0x17, 0xd5, 0xd0, 0x54, 0xba, + 0x7d, 0x8a, 0x9d, 0x77, 0x29, 0xa3, 0x6c, 0xa2, 0x1a, 0xea, 0x26, 0xca, 0x7e, 0xc7, 0x80, 0x25, + 0x04, 0xe5, 0xf5, 0xcc, 0x4f, 0x67, 0xb6, 0x6f, 0x0b, 0x16, 0x46, 0x99, 0x9f, 0xce, 0x10, 0x95, + 0x85, 0x5c, 0x3d, 0x9e, 0x1a, 0x63, 0xe2, 0xc9, 0x7e, 0xd7, 0x80, 0x2b, 0x55, 0x58, 0x6f, 0x0c, + 0x06, 0x24, 0x7a, 0x92, 0x53, 0x4a, 0xdb, 0x44, 0xce, 0x55, 0x36, 0x91, 0x63, 0x4d, 0x76, 0xc8, + 0x5b, 0x64, 0xf0, 0xf4, 0x9a, 0xfc, 0x43, 0x13, 0x3e, 0x7a, 0xbb, 0x98, 0x78, 0x0f, 0x62, 0x97, + 0x26, 0x87, 0x24, 0x8e, 0x9f, 0xa0, 0xbd, 0xf7, 0xa0, 0x4b, 0xc9, 0xa3, 0xd2, 0x26, 0x39, 0x1d, + 0xa7, 0x55, 0xa3, 0x0b, 0x4f, 0xb7, 0x76, 0xd9, 0xff, 0x36, 0x60, 0x05, 0xf5, 0x7c, 0xdd, 0x1f, + 0x1c, 0x3f, 0xc1, 0xc1, 0xef, 0xc1, 0xd2, 0xb1, 0xb0, 0x80, 0x53, 0x33, 0x2c, 0xdb, 0x15, 0xe9, + 0x29, 0x87, 0xff, 0x1f, 0x03, 0x56, 0x51, 0xd1, 0x5d, 0x7a, 0xe2, 0x3f, 0xc9, 0x60, 0xdd, 0x87, + 0x65, 0x1f, 0x4d, 0x98, 0x11, 0x80, 0xaa, 0xf8, 0x94, 0x08, 0xfc, 0xde, 0x80, 0x65, 0xd4, 0x74, + 0x93, 0xa6, 0x24, 0x9e, 0x79, 0xfc, 0x77, 0xa0, 0x43, 0x68, 0x1a, 0xbb, 0x74, 0x96, 0x15, 0x52, + 0x15, 0x9d, 0x72, 0x91, 0x7c, 0xc7, 0x00, 0x4b, 0xa8, 0xda, 0xf1, 0x93, 0xd0, 0x4f, 0x92, 0x27, + 0xe8, 0xba, 0xe9, 0x0c, 0xfe, 0xb9, 0x09, 0x97, 0x15, 0x2d, 0xbb, 0x59, 0xfa, 0xb4, 0x9b, 0x6c, + 0xed, 0x40, 0x9b, 0xd7, 0x08, 0xea, 0xed, 0xc4, 0xb4, 0x1d, 0x95, 0x82, 0xbc, 0x8a, 0x15, 0x44, + 0x9f, 0x0c, 0x18, 0xf5, 0x12, 0x51, 0x1c, 0x75, 0x1d, 0x8d, 0xc7, 0x97, 0xa1, 0x75, 0x45, 0xcd, + 0xb6, 0x4b, 0x07, 0x24, 0x78, 0x66, 0x20, 0xb2, 0x7f, 0x63, 0xc0, 0x12, 0x36, 0x79, 0xfa, 0x87, + 0xcc, 0x73, 0x3d, 0x06, 0xf2, 0x87, 0xc6, 0x4b, 0x3c, 0xbc, 0xd6, 0x14, 0x2d, 0x6a, 0x5d, 0xfd, + 0xf4, 0x86, 0xd6, 0x1d, 0xe8, 0x0c, 0x8e, 0x5c, 0x3a, 0x9c, 0x29, 0xb8, 0x54, 0x51, 0xfb, 0x18, + 0x56, 0xf1, 0x3e, 0x46, 0xa9, 0xce, 0xf8, 0xbe, 0xdf, 0xf5, 0x70, 0x2b, 0x6f, 0x88, 0xee, 0x73, + 0x52, 0xbf, 0x69, 0x93, 0x8f, 0x29, 0xca, 0x9b, 0xb6, 0xab, 0x00, 0xae, 0xe7, 0xbd, 0xc1, 0x62, + 0xcf, 0xa7, 0x79, 0xa9, 0xad, 0x70, 0xec, 0xd7, 0x60, 0xf1, 0x56, 0xcc, 0xc2, 0x07, 0xca, 0xcd, + 0xca, 0x99, 0x77, 0x3f, 0xea, 0xad, 0x8c, 0xa9, 0xdf, 0xca, 0xd8, 0xdf, 0x81, 0xff, 0xaf, 0x19, + 0x2e, 0xbc, 0xb6, 0x8d, 0x17, 0x46, 0x79, 0x27, 0xd2, 0x79, 0x1f, 0x1f, 0x03, 0x8e, 0x6a, 0x8b, + 0xa3, 0x09, 0xd9, 0x3f, 0x30, 0xe0, 0xb9, 0x9a, 0xfa, 0x1b, 0x51, 0x14, 0xb3, 0x13, 0x19, 0xd1, + 0x17, 0xd1, 0x8d, 0x5e, 0x86, 0x9a, 0xd5, 0x32, 0x74, 0xac, 0x11, 0x5a, 0xe9, 0xfc, 0x01, 0x18, + 0xf1, 0x6b, 0x03, 0x96, 0xa5, 0x11, 0x9e, 0x27, 0xbb, 0xfd, 0x22, 0xb4, 0xf0, 0xb2, 0x59, 0x76, + 0xf8, 0xdc, 0xd8, 0x0e, 0xf3, 0x4b, 0x72, 0x47, 0x36, 0xae, 0xc7, 0xb6, 0x39, 0x2e, 0xb6, 0xbf, + 0x5c, 0xcc, 0xa0, 0xa9, 0xaf, 0x83, 0xa5, 0x80, 0xfd, 0xcd, 0x3c, 0x98, 0x77, 0x48, 0x40, 0x2e, + 0x12, 0x23, 0xfb, 0x21, 0x2c, 0x89, 0x9b, 0xef, 0x12, 0x83, 0x0b, 0x51, 0xfb, 0x06, 0xac, 0x08, + 0xb5, 0x17, 0x6e, 0x6f, 0x31, 0x3b, 0x38, 0x3e, 0xdb, 0x38, 0xdf, 0x2f, 0x4e, 0xfb, 0xe7, 0xe0, + 0x52, 0x8e, 0xfd, 0xc3, 0xc8, 0x2b, 0x8e, 0x73, 0x26, 0x1c, 0x62, 0xdb, 0x9f, 0x87, 0xb5, 0x6d, + 0x46, 0x4f, 0x48, 0x9c, 0xe0, 0x11, 0xbf, 0x10, 0xc9, 0x25, 0xb4, 0xc9, 0x2f, 0x29, 0xfb, 0x2d, + 0x58, 0x57, 0x25, 0xfa, 0x24, 0xdd, 0x8f, 0xfd, 0x13, 0x45, 0x4a, 0x1e, 0xf2, 0x1a, 0xda, 0x21, + 0x6f, 0x79, 0x28, 0x6c, 0x6a, 0x87, 0xc2, 0x57, 0xa0, 0xed, 0x27, 0x52, 0x81, 0x08, 0xaa, 0x05, + 0xa7, 0x64, 0xd8, 0x7d, 0x58, 0x95, 0x77, 0xd1, 0xfb, 0xee, 0xd0, 0xa7, 0xb8, 0x02, 0x5e, 0x05, + 0x88, 0xdc, 0x61, 0xfe, 0x16, 0x05, 0xef, 0x03, 0x14, 0x0e, 0xff, 0x9e, 0x1c, 0xb1, 0x47, 0xf2, + 0xbb, 0x89, 0xdf, 0x4b, 0x8e, 0xfd, 0x0d, 0xb0, 0x1c, 0x92, 0x44, 0x8c, 0x26, 0x44, 0xd1, 0xba, + 0x01, 0x9d, 0xed, 0x2c, 0x8e, 0x09, 0xe5, 0x5d, 0xe5, 0x0f, 0x33, 0x54, 0x16, 0xd7, 0xdb, 0x2f, + 0xf5, 0xe2, 0x19, 0xb2, 0xc2, 0xb1, 0x7f, 0xd1, 0x80, 0x76, 0xdf, 0x1f, 0x52, 0x37, 0x70, 0xc8, + 0xc8, 0xfa, 0x0a, 0xb4, 0xb0, 0xb2, 0x97, 0x6e, 0x1c, 0x77, 0xa6, 0x89, 0xad, 0x71, 0x0b, 0xe3, + 0x90, 0xd1, 0x9d, 0xff, 0x73, 0xa4, 0x8c, 0xf5, 0x3a, 0x74, 0xf1, 0xd7, 0x5d, 0x3c, 0xa9, 0x91, + 0x19, 0xeb, 0xd3, 0xe7, 0x28, 0x91, 0xad, 0x51, 0x97, 0xae, 0x81, 0x1b, 0x34, 0x10, 0x99, 0x5f, + 0xce, 0xdd, 0xc9, 0x06, 0x61, 0x81, 0x20, 0x0d, 0x42, 0x19, 0x2e, 0xed, 0x8a, 0xb3, 0x0c, 0x99, + 0xd0, 0x26, 0x4b, 0xe3, 0x91, 0x87, 0x94, 0x46, 0x19, 0x2e, 0x7d, 0x94, 0xd1, 0xe1, 0xc3, 0x48, + 0x1e, 0xb1, 0x4d, 0x96, 0xbe, 0x23, 0x9a, 0x49, 0x69, 0x94, 0xe1, 0xd2, 0xb1, 0x58, 0x59, 0x05, + 0xe8, 0x67, 0x49, 0xe3, 0x02, 0x2c, 0xa5, 0x51, 0x66, 0xab, 0x0d, 0xf3, 0x91, 0x7b, 0x1a, 0x30, + 0xd7, 0xb3, 0xdf, 0x6e, 0x00, 0xe4, 0x0d, 0x13, 0x51, 0x0f, 0x68, 0x2e, 0xda, 0x3c, 0xd7, 0x45, + 0x51, 0x70, 0xaa, 0x38, 0xa9, 0x3f, 0xde, 0x49, 0x9f, 0x99, 0xd6, 0x49, 0xa8, 0xad, 0xe2, 0xa6, + 0xeb, 0x15, 0x37, 0x6d, 0x9e, 0xeb, 0x26, 0x69, 0x94, 0x74, 0xd4, 0xf5, 0x8a, 0xa3, 0x36, 0xcf, + 0x75, 0x94, 0x94, 0x97, 0xae, 0xba, 0x5e, 0x71, 0xd5, 0xe6, 0xb9, 0xae, 0x92, 0xf2, 0xd2, 0x59, + 0xd7, 0x2b, 0xce, 0xda, 0x3c, 0xd7, 0x59, 0x52, 0xbe, 0xee, 0xae, 0x77, 0x4d, 0x58, 0x12, 0x90, + 0xe1, 0x7d, 0x1a, 0x3d, 0x64, 0xe2, 0xd8, 0x5c, 0xc0, 0xa5, 0x3f, 0x6d, 0xd2, 0x99, 0xd6, 0x67, + 0x61, 0x15, 0x19, 0xf2, 0x29, 0x4c, 0x71, 0x41, 0xd9, 0x76, 0xea, 0x1f, 0xc4, 0x0d, 0x48, 0x96, + 0xa4, 0x2c, 0xdc, 0x71, 0x53, 0x37, 0xaf, 0x8c, 0x4a, 0x8e, 0x7a, 0x3f, 0x35, 0x57, 0x7b, 0x3c, + 0x19, 0x33, 0x16, 0x16, 0x17, 0x4f, 0x92, 0xe2, 0x12, 0xa9, 0x1f, 0x12, 0x96, 0xa5, 0x72, 0x99, + 0xc8, 0x49, 0x7c, 0x7e, 0xe0, 0xf9, 0xae, 0xb8, 0xd5, 0x91, 0x77, 0xf3, 0x05, 0x43, 0xac, 0x6c, + 0xe5, 0x2d, 0x95, 0x7c, 0xdc, 0x58, 0x72, 0xce, 0xbf, 0x51, 0xb2, 0xff, 0x6e, 0xc0, 0xa5, 0x7d, + 0x37, 0x4e, 0xfd, 0x81, 0x1f, 0xb9, 0x34, 0xdd, 0x25, 0xa9, 0x2b, 0xc6, 0xa0, 0xbd, 0x6f, 0x32, + 0xde, 0xdf, 0xfb, 0xa6, 0x7d, 0x58, 0x1e, 0xea, 0x45, 0xf8, 0xfb, 0xac, 0x9f, 0xab, 0xe2, 0xda, + 0x63, 0xad, 0xc6, 0xfb, 0x7e, 0xac, 0x65, 0xff, 0xd8, 0x84, 0xe5, 0xca, 0xd2, 0xc9, 0xcb, 0x51, + 0x2c, 0x34, 0x8a, 0x98, 0x28, 0x68, 0xeb, 0x06, 0x80, 0x5f, 0x84, 0xd1, 0x19, 0x67, 0xd4, 0x7a, + 0xac, 0x39, 0x8a, 0xd0, 0xb8, 0xab, 0xaa, 0xc6, 0xcc, 0x57, 0x55, 0x7c, 0x8b, 0x10, 0x95, 0x4e, + 0x3a, 0x63, 0x8b, 0x30, 0xc6, 0x95, 0x8e, 0x2a, 0x6a, 0x7f, 0x1b, 0x56, 0x6b, 0x2b, 0x94, 0xb8, + 0xb9, 0x62, 0xc7, 0x84, 0x16, 0x37, 0x57, 0x9c, 0x50, 0x82, 0xd5, 0xac, 0x06, 0x6b, 0xe0, 0x9f, + 0xa8, 0xaf, 0x41, 0x25, 0x69, 0xff, 0xc4, 0x84, 0xb5, 0xf1, 0xd9, 0xe5, 0x59, 0x85, 0xfb, 0x00, + 0x7a, 0x93, 0x56, 0xf2, 0x0b, 0x43, 0xbd, 0x8c, 0xee, 0x22, 0x0f, 0x3f, 0xab, 0x70, 0x5f, 0xca, + 0xa3, 0x5b, 0x49, 0x75, 0xf6, 0xef, 0x0a, 0x7c, 0x8a, 0x4a, 0xe3, 0x19, 0xc5, 0xc7, 0x7a, 0x11, + 0x56, 0x70, 0x98, 0xca, 0xdb, 0x06, 0x2c, 0x5c, 0x6b, 0xfc, 0x72, 0xa5, 0x50, 0xd2, 0xfe, 0x85, + 0xc5, 0xec, 0x1f, 0x8d, 0xdc, 0x27, 0x45, 0xfd, 0xf6, 0xa1, 0xf2, 0x49, 0x19, 0x69, 0x4a, 0x51, + 0xa3, 0x44, 0x5a, 0x51, 0x57, 0xfe, 0x2f, 0xd2, 0xce, 0x8f, 0xb4, 0x02, 0x4b, 0xa5, 0xc0, 0xb3, + 0xbf, 0x0f, 0xdd, 0x1d, 0x12, 0xec, 0x26, 0xc3, 0xfc, 0x55, 0xd5, 0x59, 0x40, 0x4e, 0xfa, 0x53, + 0xca, 0xc4, 0xf7, 0x54, 0xd5, 0xb7, 0x58, 0x73, 0xb5, 0xb7, 0x58, 0xf6, 0x16, 0x2c, 0xa9, 0x06, + 0xcc, 0xf2, 0xa8, 0x6c, 0xeb, 0xca, 0xb7, 0xd6, 0xaf, 0xbd, 0x84, 0x7f, 0x7f, 0x7a, 0xb5, 0x06, + 0xe2, 0x41, 0x4b, 0xfc, 0x1d, 0xea, 0x0b, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xda, 0xf1, 0xea, + 0xa1, 0x21, 0x35, 0x00, 0x00, } diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index b9aa6bf3d..1284d8a89 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -147,6 +147,11 @@ message DepartmentMember { } +message UserDepartmentMember { + OrganizationUser organizationUser = 1; + DepartmentMember departmentMember = 2; +} + message UserInDepartment { OrganizationUser organizationUser = 1; From 5664c34790afdb129f36a8adf862d69bb45c80e7 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 18:02:11 +0800 Subject: [PATCH 57/59] organization --- internal/api/organization/organization.go | 2 +- internal/rpc/organization/organization.go | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 240f3a848..9c6d53ace 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -433,7 +433,7 @@ func DeleteUserInDepartment(c *gin.Context) { return } - apiResp := api.GetDepartmentMemberResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}} + apiResp := api.DeleteUserInDepartmentResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}} log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "api return ", apiResp) c.JSON(http.StatusOK, apiResp) } diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index ae09d8915..b93fdc2b9 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -220,10 +220,17 @@ func (s *organizationServer) CreateDepartmentMember(ctx context.Context, req *rp return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil } + err, _ := imdb.GetOrganizationUser(req.DepartmentMember.UserID) + if err != nil { + errMsg := req.OperationID + "" + req.DepartmentMember.UserID + " is not exist" + log.Error(req.OperationID, errMsg) + return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + } + departmentMember := db.DepartmentMember{} utils.CopyStructFields(&departmentMember, req.DepartmentMember) log.Debug(req.OperationID, "src ", *req.DepartmentMember, "dst ", departmentMember) - err := imdb.CreateDepartmentMember(&departmentMember) + err = imdb.CreateDepartmentMember(&departmentMember) if err != nil { errMsg := req.OperationID + " " + "CreateDepartmentMember failed " + err.Error() log.Error(req.OperationID, errMsg, departmentMember) From 650495306f7303817ca20cccc12f30e111a498a6 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 18:06:47 +0800 Subject: [PATCH 58/59] organization --- internal/rpc/organization/organization.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index b93fdc2b9..28e763f59 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -190,7 +190,7 @@ func (s *organizationServer) UpdateOrganizationUser(ctx context.Context, req *rp if !token_verify.IsManagerUserID(req.OpUserID) { errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) - return &rpc.UpdateOrganizationUserResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &rpc.UpdateOrganizationUserResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } organizationUser := db.OrganizationUser{} utils.CopyStructFields(&organizationUser, req.OrganizationUser) @@ -217,14 +217,14 @@ func (s *organizationServer) CreateDepartmentMember(ctx context.Context, req *rp if !token_verify.IsManagerUserID(req.OpUserID) { errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) - return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } err, _ := imdb.GetOrganizationUser(req.DepartmentMember.UserID) if err != nil { errMsg := req.OperationID + "" + req.DepartmentMember.UserID + " is not exist" log.Error(req.OperationID, errMsg) - return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } departmentMember := db.DepartmentMember{} From 3a8a0a541e3c3397adb306d437b81b472b394110 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Mon, 18 Apr 2022 18:11:07 +0800 Subject: [PATCH 59/59] organization --- internal/rpc/organization/organization.go | 40 +++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index 28e763f59..ef1ca7bb6 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -71,9 +71,9 @@ func (s *organizationServer) Run() { func (s *organizationServer) CreateDepartment(ctx context.Context, req *rpc.CreateDepartmentReq) (*rpc.CreateDepartmentResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) if !token_verify.IsManagerUserID(req.OpUserID) { - errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + errMsg := req.OperationID + " " + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) - return &rpc.CreateDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &rpc.CreateDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } department := db.Department{} @@ -103,9 +103,9 @@ func (s *organizationServer) CreateDepartment(ctx context.Context, req *rpc.Crea func (s *organizationServer) UpdateDepartment(ctx context.Context, req *rpc.UpdateDepartmentReq) (*rpc.UpdateDepartmentResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) if !token_verify.IsManagerUserID(req.OpUserID) { - errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + errMsg := req.OperationID + " " + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) - return &rpc.UpdateDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &rpc.UpdateDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } department := db.Department{} @@ -146,9 +146,9 @@ func (s *organizationServer) GetSubDepartment(ctx context.Context, req *rpc.GetS func (s *organizationServer) DeleteDepartment(ctx context.Context, req *rpc.DeleteDepartmentReq) (*rpc.DeleteDepartmentResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) if !token_verify.IsManagerUserID(req.OpUserID) { - errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + errMsg := req.OperationID + " " + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) - return &rpc.DeleteDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &rpc.DeleteDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } err := imdb.DeleteDepartment(req.DepartmentID) if err != nil { @@ -165,9 +165,9 @@ func (s *organizationServer) DeleteDepartment(ctx context.Context, req *rpc.Dele func (s *organizationServer) CreateOrganizationUser(ctx context.Context, req *rpc.CreateOrganizationUserReq) (*rpc.CreateOrganizationUserResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) if !token_verify.IsManagerUserID(req.OpUserID) { - errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + errMsg := req.OperationID + " " + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) - return &rpc.CreateOrganizationUserResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &rpc.CreateOrganizationUserResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } organizationUser := db.OrganizationUser{} utils.CopyStructFields(&organizationUser, req.OrganizationUser) @@ -188,7 +188,7 @@ func (s *organizationServer) CreateOrganizationUser(ctx context.Context, req *rp func (s *organizationServer) UpdateOrganizationUser(ctx context.Context, req *rpc.UpdateOrganizationUserReq) (*rpc.UpdateOrganizationUserResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) if !token_verify.IsManagerUserID(req.OpUserID) { - errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + errMsg := req.OperationID + " " + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) return &rpc.UpdateOrganizationUserResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } @@ -215,14 +215,14 @@ func (s *organizationServer) UpdateOrganizationUser(ctx context.Context, req *rp func (s *organizationServer) CreateDepartmentMember(ctx context.Context, req *rpc.CreateDepartmentMemberReq) (*rpc.CreateDepartmentMemberResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) if !token_verify.IsManagerUserID(req.OpUserID) { - errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + errMsg := req.OperationID + " " + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } err, _ := imdb.GetOrganizationUser(req.DepartmentMember.UserID) if err != nil { - errMsg := req.OperationID + "" + req.DepartmentMember.UserID + " is not exist" + errMsg := req.OperationID + " " + req.DepartmentMember.UserID + " is not exist" log.Error(req.OperationID, errMsg) return &rpc.CreateDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } @@ -283,9 +283,9 @@ func (s *organizationServer) GetUserInDepartment(ctx context.Context, req *rpc.G func (s *organizationServer) UpdateUserInDepartment(ctx context.Context, req *rpc.UpdateUserInDepartmentReq) (*rpc.UpdateUserInDepartmentResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) if !token_verify.IsManagerUserID(req.OpUserID) { - errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + errMsg := req.OperationID + " " + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) - return &rpc.UpdateUserInDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &rpc.UpdateUserInDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } departmentMember := &db.DepartmentMember{} utils.CopyStructFields(departmentMember, req.DepartmentMember) @@ -304,9 +304,9 @@ func (s *organizationServer) UpdateUserInDepartment(ctx context.Context, req *rp func (s *organizationServer) DeleteUserInDepartment(ctx context.Context, req *rpc.DeleteUserInDepartmentReq) (*rpc.DeleteUserInDepartmentResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) if !token_verify.IsManagerUserID(req.OpUserID) { - errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + errMsg := req.OperationID + " " + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) - return &rpc.DeleteUserInDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &rpc.DeleteUserInDepartmentResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } err := imdb.DeleteUserInDepartment(req.DepartmentID, req.UserID) @@ -324,9 +324,9 @@ func (s *organizationServer) DeleteUserInDepartment(ctx context.Context, req *rp func (s *organizationServer) DeleteOrganizationUser(ctx context.Context, req *rpc.DeleteOrganizationUserReq) (*rpc.DeleteOrganizationUserResp, error) { log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) if !token_verify.IsManagerUserID(req.OpUserID) { - errMsg := req.OperationID + "" + req.OpUserID + " is not app manager" + errMsg := req.OperationID + " " + req.OpUserID + " is not app manager" log.Error(req.OperationID, errMsg) - return &rpc.DeleteOrganizationUserResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: constant.ErrAccess.ErrMsg}, nil + return &rpc.DeleteOrganizationUserResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } err := imdb.DeleteOrganizationUser(req.UserID) if err != nil { @@ -344,9 +344,9 @@ func (s *organizationServer) GetDepartmentMember(ctx context.Context, req *rpc.G log.NewInfo(req.OperationID, utils.GetSelfFuncName(), " rpc args ", req.String()) err, departmentMemberList := imdb.GetDepartmentMemberList(req.DepartmentID) if err != nil { - errMsg := req.OperationID + " " + "GetDepartmentMemberList failed " + err.Error() - log.Error(req.OperationID, errMsg, req.DepartmentID) - return &rpc.GetDepartmentMemberResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: errMsg}, nil + errMsg := req.OperationID + " " + req.OpUserID + " is not app manager" + log.Error(req.OperationID, errMsg) + return &rpc.GetDepartmentMemberResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}, nil } log.Debug(req.OperationID, "GetDepartmentMemberList ", departmentMemberList)