From 67c082ab7b583bb2174fba5eac279629a41d3c9e Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 Jan 2023 15:28:46 +0800 Subject: [PATCH 1/6] errcode --- {test => cmdutils}/mongo/cmd/main.go | 0 {test => cmdutils}/mongo/mongo_utils.go | 0 internal/api/auth/auth.go | 2 +- internal/api/client_init/init_config.go | 2 +- internal/api/conversation/conversation.go | 2 +- internal/api/friend/friend.go | 2 +- internal/api/friend/friend1.go | 2 +- internal/api/group/group.go | 2 +- internal/api/group/super_group.go | 2 +- internal/api/manage/management_chat.go | 2 +- internal/api/manage/management_user.go | 2 +- internal/api/msg/del_msg.go | 2 +- internal/api/msg/extend_msg.go | 2 +- internal/api/office/tag.go | 2 +- internal/api/office/work_moments.go | 2 +- internal/api/third/ali_oss_credential.go | 2 +- internal/api/third/aws_storage_credential.go | 2 +- internal/api/third/fcm_update_token.go | 2 +- .../api/third/minio_storage_credential.go | 2 +- internal/api/third/rtc.go | 2 +- internal/api/third/set_app_badge.go | 2 +- .../third/tencent_cloud_storage_credential.go | 2 +- internal/api/user/user.go | 2 +- internal/api_to_rpc/api.go | 54 +++++++- internal/cms_api/admin/admin.go | 92 -------------- internal/cms_api/friend/friend.go | 6 +- internal/cms_api/group/group.go | 14 +-- internal/cms_api/message_cms/message.go | 6 +- internal/cms_api/prome.go | 14 --- internal/cms_api/router.go | 17 --- internal/cms_api/statistics/statistics.go | 20 +-- internal/cms_api/user/user.go | 20 +-- internal/cron_task/cron_task.go | 7 +- internal/demo/register/login.go | 2 +- internal/demo/register/set_password.go | 2 +- .../msg_transfer/logic/modify_msg_handler.go | 8 +- internal/push/logic/push_to_client.go | 3 +- internal/rpc/friend/friend.go | 13 +- internal/rpc/group/g.go | 7 +- internal/rpc/group/group.go | 119 +++++++++--------- internal/rpc/msg/extend_msg.notification.go | 6 +- internal/rpc/msg/group_notification.go | 13 +- internal/rpc/msg/send_msg.go | 5 +- internal/rpc/user/user.go | 26 ++-- internal/utils/get_server_ip_test.go | 1 - internal/utils/utils.go | 49 -------- .../auth_api_struct.go | 2 +- .../aws_api_struct.go | 2 +- pkg/{base_info => api_struct}/client_init.go | 2 +- pkg/{base_info => api_struct}/common.go | 2 +- .../conversation_api_struct.go | 2 +- .../cos_api_struct.go | 2 +- .../friend_api_struct.go | 2 +- .../group_api_struct.go | 2 +- .../manage_api_struct.go | 2 +- pkg/{base_info => api_struct}/msg.go | 2 +- .../office_struct.go | 2 +- .../organization_api_struct.go | 2 +- .../oss_api_struct.go | 2 +- pkg/{base_info => api_struct}/pagination.go | 2 +- .../public_struct.go | 2 +- pkg/{base_info => api_struct}/super_group.go | 2 +- .../swagger_example.go | 2 +- .../third_api_struct.go | 2 +- .../user_api_struct.go | 2 +- .../work_moments_struct.go | 2 +- pkg/{cms_api_struct => cms_struct}/admin.go | 8 +- pkg/{cms_api_struct => cms_struct}/common.go | 2 +- pkg/{cms_api_struct => cms_struct}/friend.go | 2 +- pkg/{cms_api_struct => cms_struct}/group.go | 2 +- .../message_cms.go | 2 +- .../statistics.go | 2 +- pkg/{cms_api_struct => cms_struct}/user.go | 2 +- pkg/common/callback/callback.go | 5 - pkg/common/token_verify/jwt_token.go | 7 +- pkg/common/tools/op.go | 13 -- pkg/common/tracelog/ctx.go | 85 +------------ {internal => pkg}/utils/convert.go | 1 - .../utils/cors_middleware_test.go | 3 +- {internal => pkg}/utils/id.go | 0 {internal => pkg}/utils/id_test.go | 0 {internal => pkg}/utils/image_test.go | 7 +- {internal => pkg}/utils/jwt_token_test.go | 0 {internal => pkg}/utils/local_cache.go | 7 +- {internal => pkg}/utils/md5_test.go | 5 +- .../utils/platform_number_id_to_name_test.go | 0 pkg/{tools => utils}/retry/retry.go | 0 pkg/{tools => utils}/retry/stratey.go | 0 pkg/{tools => utils}/splitter/tools.go | 0 pkg/utils/utils.go | 43 +++++++ 90 files changed, 293 insertions(+), 489 deletions(-) rename {test => cmdutils}/mongo/cmd/main.go (100%) rename {test => cmdutils}/mongo/mongo_utils.go (100%) delete mode 100644 internal/cms_api/prome.go delete mode 100644 internal/utils/get_server_ip_test.go delete mode 100644 internal/utils/utils.go rename pkg/{base_info => api_struct}/auth_api_struct.go (99%) rename pkg/{base_info => api_struct}/aws_api_struct.go (96%) rename pkg/{base_info => api_struct}/client_init.go (95%) rename pkg/{base_info => api_struct}/common.go (93%) rename pkg/{base_info => api_struct}/conversation_api_struct.go (99%) rename pkg/{base_info => api_struct}/cos_api_struct.go (95%) rename pkg/{base_info => api_struct}/friend_api_struct.go (99%) rename pkg/{base_info => api_struct}/group_api_struct.go (99%) rename pkg/{base_info => api_struct}/manage_api_struct.go (99%) rename pkg/{base_info => api_struct}/msg.go (99%) rename pkg/{base_info => api_struct}/office_struct.go (99%) rename pkg/{base_info => api_struct}/organization_api_struct.go (99%) rename pkg/{base_info => api_struct}/oss_api_struct.go (96%) rename pkg/{base_info => api_struct}/pagination.go (88%) rename pkg/{base_info => api_struct}/public_struct.go (99%) rename pkg/{base_info => api_struct}/super_group.go (92%) rename pkg/{base_info => api_struct}/swagger_example.go (93%) rename pkg/{base_info => api_struct}/third_api_struct.go (99%) rename pkg/{base_info => api_struct}/user_api_struct.go (98%) rename pkg/{base_info => api_struct}/work_moments_struct.go (99%) rename pkg/{cms_api_struct => cms_struct}/admin.go (93%) rename pkg/{cms_api_struct => cms_struct}/common.go (91%) rename pkg/{cms_api_struct => cms_struct}/friend.go (96%) rename pkg/{cms_api_struct => cms_struct}/group.go (99%) rename pkg/{cms_api_struct => cms_struct}/message_cms.go (98%) rename pkg/{cms_api_struct => cms_struct}/statistics.go (99%) rename pkg/{cms_api_struct => cms_struct}/user.go (98%) delete mode 100644 pkg/common/tools/op.go rename {internal => pkg}/utils/convert.go (99%) rename {internal => pkg}/utils/cors_middleware_test.go (97%) rename {internal => pkg}/utils/id.go (100%) rename {internal => pkg}/utils/id_test.go (100%) rename {internal => pkg}/utils/image_test.go (53%) rename {internal => pkg}/utils/jwt_token_test.go (100%) rename {internal => pkg}/utils/local_cache.go (94%) rename {internal => pkg}/utils/md5_test.go (72%) rename {internal => pkg}/utils/platform_number_id_to_name_test.go (100%) rename pkg/{tools => utils}/retry/retry.go (100%) rename pkg/{tools => utils}/retry/stratey.go (100%) rename pkg/{tools => utils}/splitter/tools.go (100%) diff --git a/test/mongo/cmd/main.go b/cmdutils/mongo/cmd/main.go similarity index 100% rename from test/mongo/cmd/main.go rename to cmdutils/mongo/cmd/main.go diff --git a/test/mongo/mongo_utils.go b/cmdutils/mongo/mongo_utils.go similarity index 100% rename from test/mongo/mongo_utils.go rename to cmdutils/mongo/mongo_utils.go diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index a2b0248f0..132f19e6a 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -1,7 +1,7 @@ package apiAuth import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/client_init/init_config.go b/internal/api/client_init/init_config.go index 2138603c4..927ffc8f9 100644 --- a/internal/api/client_init/init_config.go +++ b/internal/api/client_init/init_config.go @@ -1,7 +1,7 @@ package clientInit import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model" "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" diff --git a/internal/api/conversation/conversation.go b/internal/api/conversation/conversation.go index a063a7eb0..8cdfd0868 100644 --- a/internal/api/conversation/conversation.go +++ b/internal/api/conversation/conversation.go @@ -1,7 +1,7 @@ package conversation import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/log" "Open_IM/pkg/getcdv3" diff --git a/internal/api/friend/friend.go b/internal/api/friend/friend.go index 7c4ca05d6..499fdf52f 100644 --- a/internal/api/friend/friend.go +++ b/internal/api/friend/friend.go @@ -2,7 +2,7 @@ package friend //import ( // jsonData "Open_IM/internal/utils" -// api "Open_IM/pkg/base_info" +// api "Open_IM/pkg/api_struct" // "Open_IM/pkg/common/config" // "Open_IM/pkg/common/log" // "Open_IM/pkg/common/token_verify" diff --git a/internal/api/friend/friend1.go b/internal/api/friend/friend1.go index f4fdf9bb1..a3469245c 100644 --- a/internal/api/friend/friend1.go +++ b/internal/api/friend/friend1.go @@ -2,7 +2,7 @@ package friend import ( common "Open_IM/internal/api_to_rpc" - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" rpc "Open_IM/pkg/proto/friend" "github.com/gin-gonic/gin" diff --git a/internal/api/group/group.go b/internal/api/group/group.go index f217923c7..7e4dc357c 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -2,7 +2,7 @@ package group import ( common "Open_IM/internal/api_to_rpc" - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/group/super_group.go b/internal/api/group/super_group.go index dc38bc94e..ab1dceb2f 100644 --- a/internal/api/group/super_group.go +++ b/internal/api/group/super_group.go @@ -2,7 +2,7 @@ package group import ( jsonData "Open_IM/internal/utils" - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index f89280ea4..ff8cca04f 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -7,7 +7,7 @@ package manage import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db/mysql_model/im_mysql_model" diff --git a/internal/api/manage/management_user.go b/internal/api/manage/management_user.go index e307d1beb..c4772ef67 100644 --- a/internal/api/manage/management_user.go +++ b/internal/api/manage/management_user.go @@ -7,7 +7,7 @@ package manage import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/msg/del_msg.go b/internal/api/msg/del_msg.go index 7bd7bfaef..d5d2b71f6 100644 --- a/internal/api/msg/del_msg.go +++ b/internal/api/msg/del_msg.go @@ -1,7 +1,7 @@ package msg import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/msg/extend_msg.go b/internal/api/msg/extend_msg.go index d217073bb..d74017811 100644 --- a/internal/api/msg/extend_msg.go +++ b/internal/api/msg/extend_msg.go @@ -1,7 +1,7 @@ package msg import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/office/tag.go b/internal/api/office/tag.go index 7c4f5a606..68d787ad8 100644 --- a/internal/api/office/tag.go +++ b/internal/api/office/tag.go @@ -1,7 +1,7 @@ package office import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" diff --git a/internal/api/office/work_moments.go b/internal/api/office/work_moments.go index 8a8c52920..f84755277 100644 --- a/internal/api/office/work_moments.go +++ b/internal/api/office/work_moments.go @@ -1,7 +1,7 @@ package office import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" diff --git a/internal/api/third/ali_oss_credential.go b/internal/api/third/ali_oss_credential.go index 0602143e8..14ce0f9fa 100644 --- a/internal/api/third/ali_oss_credential.go +++ b/internal/api/third/ali_oss_credential.go @@ -1,7 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/third/aws_storage_credential.go b/internal/api/third/aws_storage_credential.go index 4b3b7d08a..e68073d01 100644 --- a/internal/api/third/aws_storage_credential.go +++ b/internal/api/third/aws_storage_credential.go @@ -1,7 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/third/fcm_update_token.go b/internal/api/third/fcm_update_token.go index 000deaabb..22b93a629 100644 --- a/internal/api/third/fcm_update_token.go +++ b/internal/api/third/fcm_update_token.go @@ -1,7 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" diff --git a/internal/api/third/minio_storage_credential.go b/internal/api/third/minio_storage_credential.go index 753d3b182..f500ffb8a 100644 --- a/internal/api/third/minio_storage_credential.go +++ b/internal/api/third/minio_storage_credential.go @@ -1,7 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model" diff --git a/internal/api/third/rtc.go b/internal/api/third/rtc.go index 576e32892..2e7d1044d 100644 --- a/internal/api/third/rtc.go +++ b/internal/api/third/rtc.go @@ -1,7 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" diff --git a/internal/api/third/set_app_badge.go b/internal/api/third/set_app_badge.go index e8269ba73..37dcad72a 100644 --- a/internal/api/third/set_app_badge.go +++ b/internal/api/third/set_app_badge.go @@ -1,7 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" diff --git a/internal/api/third/tencent_cloud_storage_credential.go b/internal/api/third/tencent_cloud_storage_credential.go index 4f641f1aa..4cfbe485f 100644 --- a/internal/api/third/tencent_cloud_storage_credential.go +++ b/internal/api/third/tencent_cloud_storage_credential.go @@ -1,7 +1,7 @@ package apiThird import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api/user/user.go b/internal/api/user/user.go index f289a4f49..31bba9909 100644 --- a/internal/api/user/user.go +++ b/internal/api/user/user.go @@ -2,7 +2,7 @@ package user import ( jsonData "Open_IM/internal/utils" - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" diff --git a/internal/api_to_rpc/api.go b/internal/api_to_rpc/api.go index 43118ca16..b3d65a131 100644 --- a/internal/api_to_rpc/api.go +++ b/internal/api_to_rpc/api.go @@ -1,6 +1,7 @@ package common import ( + "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tracelog" "Open_IM/pkg/getcdv3" @@ -8,7 +9,10 @@ import ( "context" "fmt" "github.com/gin-gonic/gin" + "google.golang.org/grpc/status" + "net/http" "reflect" + "strings" ) func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcClientFunc interface{}, rpcFuncName string) { @@ -16,16 +20,16 @@ func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcCl rpcName = utils2.GetFuncName(1) } logFuncName := fmt.Sprintf("[ApiToRpc: %s]%s", utils2.GetFuncName(1), rpcFuncName) - ctx := tracelog.NewCtx1(c, rpcFuncName) + ctx := tracelog.NewCtx(c, rpcFuncName) defer log.ShowLog(ctx) if err := c.BindJSON(apiReq); err != nil { - tracelog.WriteErrorResponse(ctx, "BindJSON", err) + WriteErrorResponse(ctx, "BindJSON", err) return } tracelog.SetCtxInfo(ctx, logFuncName, nil, "apiReq", apiReq) etcdConn, err := getcdv3.GetConn(ctx, rpcName) if err != nil { - tracelog.WriteErrorResponse(ctx, "GetConn", err) + WriteErrorResponse(ctx, "GetConn", err) return } rpcClient := reflect.ValueOf(rpcClientFunc).Call([]reflect.Value{ @@ -40,7 +44,7 @@ func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcCl }) // respArr => (apiResp, error) if !respArr[1].IsNil() { // rpcClient err != nil err := respArr[1].Interface().(error) - tracelog.WriteErrorResponse(ctx, rpcFuncName, err, "callRpcResp", "error") + WriteErrorResponse(ctx, rpcFuncName, err, "callRpcResp", "error") return } rpcResp := respArr[0].Elem() @@ -48,7 +52,7 @@ func ApiToRpc(c *gin.Context, apiReq, apiResp interface{}, rpcName string, rpcCl if apiResp != nil { CopyAny(rpcResp.Interface(), apiResp) } - tracelog.SetSuccess(ctx, rpcFuncName, apiResp) + SetSuccess(ctx, rpcFuncName, apiResp) } func rpcString(v interface{}) string { @@ -57,3 +61,43 @@ func rpcString(v interface{}) string { } return fmt.Sprintf("%+v", v) } + +type baseResp struct { + ErrCode int32 `json:"errCode"` + ErrMsg string `json:"errMsg"` + ErrDtl string `json:"errDtl"` + Data interface{} `json:"data"` +} + +func WriteErrorResponse(ctx context.Context, funcName string, err error, args ...interface{}) { + tracelog.SetCtxInfo(ctx, funcName, err, args) + e := tracelog.Unwrap(err) + switch t := e.(type) { + case *constant.ErrInfo: + ctx.Value(tracelog.TraceLogKey).(*tracelog.ApiInfo).GinCtx.JSON(http.StatusOK, baseResp{ErrCode: t.ErrCode, ErrMsg: t.ErrMsg, ErrDtl: t.DetailErrMsg}) + //ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, gin.H{"errCode": t.ErrCode, "errMsg": t.ErrMsg, "errDtl": t.DetailErrMsg}) + return + default: + s, ok := status.FromError(e) + if !ok { + ctx.Value(tracelog.TraceLogKey).(*tracelog.ApiInfo).GinCtx.JSON(http.StatusOK, &baseResp{ErrCode: constant.ErrDefaultOther.ErrCode, ErrMsg: err.Error(), ErrDtl: fmt.Sprintf("%+v", err)}) + //ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, gin.H{"errCode": constant.ErrDefaultOther.ErrCode, "errMsg": err.Error(), "errDtl": fmt.Sprintf("%+v", err)}) + return + } + var details []string + if err != e { + details = append(details, fmt.Sprintf("%+v", err)) + } + for _, s := range s.Details() { + details = append(details, fmt.Sprintf("%+v", s)) + } + ctx.Value(tracelog.TraceLogKey).(*tracelog.ApiInfo).GinCtx.JSON(http.StatusOK, &baseResp{ErrCode: int32(s.Code()), ErrMsg: s.Message(), ErrDtl: strings.Join(details, "\n")}) + //ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, gin.H{"errCode": s.Code(), "errMsg": s.Message(), "errDtl": strings.Join(details, "\n")}) + return + } +} + +func SetSuccess(ctx context.Context, funcName string, data interface{}) { + tracelog.SetCtxInfo(ctx, funcName, nil, "data", data) + ctx.Value(tracelog.TraceLogKey).(*tracelog.ApiInfo).GinCtx.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "errDtl": "", "data": data}) +} diff --git a/internal/cms_api/admin/admin.go b/internal/cms_api/admin/admin.go index 754c77b76..8799a7d8e 100644 --- a/internal/cms_api/admin/admin.go +++ b/internal/cms_api/admin/admin.go @@ -126,95 +126,3 @@ func AdminLogin(c *gin.Context) { resp.Token = respPb.Token c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp}) } - -func AddUserRegisterAddFriendIDList(c *gin.Context) { - var ( - req apiStruct.AddUserRegisterAddFriendIDListRequest - // resp apiStruct.AddUserRegisterAddFriendIDListResponse - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error()) - c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) - return - } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req:", req) - etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, req.OperationID) - if etcdConn == nil { - errMsg := req.OperationID + "getcdv3.GetConn == nil" - log.NewError(req.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - client := pbAdmin.NewAdminCMSClient(etcdConn) - respPb, err := client.AddUserRegisterAddFriendIDList(context.Background(), &pbAdmin.AddUserRegisterAddFriendIDListReq{OperationID: req.OperationID, UserIDList: req.UserIDList}) - if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "rpc failed", err.Error()) - c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()}) - return - } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp:", respPb.String()) - c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg}) -} - -func ReduceUserRegisterAddFriendIDList(c *gin.Context) { - var ( - req apiStruct.ReduceUserRegisterAddFriendIDListRequest - // resp apiStruct.ReduceUserRegisterAddFriendIDListResponse - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error()) - c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) - return - } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req) - etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, req.OperationID) - if etcdConn == nil { - errMsg := req.OperationID + "getcdv3.GetConn == nil" - log.NewError(req.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - client := pbAdmin.NewAdminCMSClient(etcdConn) - respPb, err := client.ReduceUserRegisterAddFriendIDList(context.Background(), &pbAdmin.ReduceUserRegisterAddFriendIDListReq{OperationID: req.OperationID, UserIDList: req.UserIDList, Operation: req.Operation}) - if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "rpc failed", err.Error()) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) - return - } - c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg}) -} - -func GetUserRegisterAddFriendIDList(c *gin.Context) { - var ( - req apiStruct.GetUserRegisterAddFriendIDListRequest - resp apiStruct.GetUserRegisterAddFriendIDListResponse - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error()) - c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) - return - } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req) - etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAdminCMSName, req.OperationID) - if etcdConn == nil { - errMsg := req.OperationID + "getcdv3.GetConn == nil" - log.NewError(req.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - client := pbAdmin.NewAdminCMSClient(etcdConn) - respPb, err := client.GetUserRegisterAddFriendIDList(context.Background(), &pbAdmin.GetUserRegisterAddFriendIDListReq{OperationID: req.OperationID, Pagination: &pbCommon.RequestPagination{ - PageNumber: int32(req.PageNumber), - ShowNumber: int32(req.ShowNumber), - }}) - if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "rpc failed", err.Error()) - c.JSON(http.StatusBadRequest, gin.H{"errCode": 500, "errMsg": err.Error()}) - return - } - resp.Users = respPb.UserInfoList - resp.ShowNumber = int(respPb.Pagination.ShowNumber) - resp.CurrentPage = int(respPb.Pagination.CurrentPage) - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp) - c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp}) -} diff --git a/internal/cms_api/friend/friend.go b/internal/cms_api/friend/friend.go index ef5240079..e944dcd9c 100644 --- a/internal/cms_api/friend/friend.go +++ b/internal/cms_api/friend/friend.go @@ -17,8 +17,8 @@ import ( func GetUserFriends(c *gin.Context) { var ( - req cms_api_struct.GetFriendsReq - resp cms_api_struct.GetFriendsResp + req cms_struct.GetFriendsReq + resp cms_struct.GetFriendsResp reqPb pbAdmin.GetUserFriendsReq ) if err := c.BindJSON(&req); err != nil { @@ -49,7 +49,7 @@ func GetUserFriends(c *gin.Context) { return } for _, v := range respPb.FriendInfoList { - friend := &cms_api_struct.FriendInfo{} + friend := &cms_struct.FriendInfo{} utils.CopyStructFields(friend, v) friend.Nickname = v.FriendUser.Nickname friend.UserID = v.FriendUser.UserID diff --git a/internal/cms_api/group/group.go b/internal/cms_api/group/group.go index b18289b65..5f595ef5b 100644 --- a/internal/cms_api/group/group.go +++ b/internal/cms_api/group/group.go @@ -18,8 +18,8 @@ import ( func GetGroups(c *gin.Context) { var ( - req cms_api_struct.GetGroupsRequest - resp cms_api_struct.GetGroupsResponse + req cms_struct.GetGroupsRequest + resp cms_struct.GetGroupsResponse reqPb pbGroup.GetGroupsReq ) if err := c.BindJSON(&req); err != nil { @@ -48,7 +48,7 @@ func GetGroups(c *gin.Context) { return } for _, v := range respPb.CMSGroups { - groupResp := cms_api_struct.GroupResponse{} + groupResp := cms_struct.GroupResponse{} utils.CopyStructFields(&groupResp, v.GroupInfo) groupResp.GroupOwnerName = v.GroupOwnerUserName groupResp.GroupOwnerID = v.GroupOwnerUserID @@ -63,9 +63,9 @@ func GetGroups(c *gin.Context) { func GetGroupMembers(c *gin.Context) { var ( - req cms_api_struct.GetGroupMembersRequest + req cms_struct.GetGroupMembersRequest reqPb pbGroup.GetGroupMembersCMSReq - resp cms_api_struct.GetGroupMembersResponse + resp cms_struct.GetGroupMembersResponse ) if err := c.BindJSON(&req); err != nil { log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error()) @@ -94,13 +94,13 @@ func GetGroupMembers(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) return } - resp.ResponsePagination = cms_api_struct.ResponsePagination{ + resp.ResponsePagination = cms_struct.ResponsePagination{ CurrentPage: int(respPb.Pagination.CurrentPage), ShowNumber: int(respPb.Pagination.ShowNumber), } resp.MemberNums = int(respPb.MemberNums) for _, groupMember := range respPb.Members { - memberResp := cms_api_struct.GroupMemberResponse{} + memberResp := cms_struct.GroupMemberResponse{} utils.CopyStructFields(&memberResp, groupMember) resp.GroupMembers = append(resp.GroupMembers, memberResp) } diff --git a/internal/cms_api/message_cms/message.go b/internal/cms_api/message_cms/message.go index 6b194a2f4..889c391b9 100644 --- a/internal/cms_api/message_cms/message.go +++ b/internal/cms_api/message_cms/message.go @@ -17,8 +17,8 @@ import ( func GetChatLogs(c *gin.Context) { var ( - req cms_api_struct.GetChatLogsReq - resp cms_api_struct.GetChatLogsResp + req cms_struct.GetChatLogsReq + resp cms_struct.GetChatLogsResp reqPb pbAdminCMS.GetChatLogsReq ) if err := c.Bind(&req); err != nil { @@ -47,7 +47,7 @@ func GetChatLogs(c *gin.Context) { return } for _, v := range respPb.ChatLogs { - chatLog := cms_api_struct.ChatLog{} + chatLog := cms_struct.ChatLog{} utils.CopyStructFields(&chatLog, v) resp.ChatLogs = append(resp.ChatLogs, &chatLog) } diff --git a/internal/cms_api/prome.go b/internal/cms_api/prome.go deleted file mode 100644 index dfe96d626..000000000 --- a/internal/cms_api/prome.go +++ /dev/null @@ -1,14 +0,0 @@ -package cms_api - -import ( - "github.com/gin-gonic/gin" - "github.com/prometheus/client_golang/prometheus/promhttp" -) - -func prometheusHandler() gin.HandlerFunc { - h := promhttp.Handler() - - return func(c *gin.Context) { - h.ServeHTTP(c.Writer, c.Request) - } -} diff --git a/internal/cms_api/router.go b/internal/cms_api/router.go index 98aa8fce2..7fbb8db1e 100644 --- a/internal/cms_api/router.go +++ b/internal/cms_api/router.go @@ -8,7 +8,6 @@ import ( "Open_IM/internal/cms_api/middleware" "Open_IM/internal/cms_api/statistics" "Open_IM/internal/cms_api/user" - "Open_IM/internal/demo/register" "Open_IM/pkg/common/config" promePkg "Open_IM/pkg/common/prometheus" @@ -30,22 +29,6 @@ func NewGinRouter() *gin.Engine { adminRouterGroup.POST("/login", admin.AdminLogin) adminRouterGroup.Use(middleware.JWTAuth()) adminRouterGroup.POST("/get_user_token", admin.GetUserToken) - - adminRouterGroup.POST("/add_user_register_add_friend_id", admin.AddUserRegisterAddFriendIDList) - adminRouterGroup.POST("/reduce_user_register_reduce_friend_id", admin.ReduceUserRegisterAddFriendIDList) - adminRouterGroup.POST("/get_user_register_reduce_friend_id_list", admin.GetUserRegisterAddFriendIDList) - - adminRouterGroup.POST("/generate_invitation_code", register.GenerateInvitationCode) - adminRouterGroup.POST("/query_invitation_code", register.QueryInvitationCode) - adminRouterGroup.POST("/get_invitation_codes", register.GetInvitationCodes) - - adminRouterGroup.POST("/query_user_ip_limit_login", register.QueryUserIDLimitLogin) - adminRouterGroup.POST("/add_user_ip_limit_login", register.AddUserIPLimitLogin) - adminRouterGroup.POST("/remove_user_ip_limit_login", register.RemoveUserIPLimitLogin) - - adminRouterGroup.POST("/query_ip_register", register.QueryIPRegister) - adminRouterGroup.POST("/add_ip_limit", register.AddIPLimit) - adminRouterGroup.POST("/remove_ip_Limit", register.RemoveIPLimit) } r2 := router.Group("") r2.Use(middleware.JWTAuth()) diff --git a/internal/cms_api/statistics/statistics.go b/internal/cms_api/statistics/statistics.go index 2f96d7ddd..04f229be0 100644 --- a/internal/cms_api/statistics/statistics.go +++ b/internal/cms_api/statistics/statistics.go @@ -17,8 +17,8 @@ import ( func GetMessagesStatistics(c *gin.Context) { var ( - req cms_api_struct.GetMessageStatisticsRequest - resp cms_api_struct.GetMessageStatisticsResponse + req cms_struct.GetMessageStatisticsRequest + resp cms_struct.GetMessageStatisticsResponse reqPb admin.GetMessageStatisticsReq ) reqPb.StatisticsReq = &admin.StatisticsReq{} @@ -73,8 +73,8 @@ func GetMessagesStatistics(c *gin.Context) { func GetUserStatistics(c *gin.Context) { var ( - req cms_api_struct.GetUserStatisticsRequest - resp cms_api_struct.GetUserStatisticsResponse + req cms_struct.GetUserStatisticsRequest + resp cms_struct.GetUserStatisticsResponse reqPb admin.GetUserStatisticsReq ) reqPb.StatisticsReq = &admin.StatisticsReq{} @@ -138,8 +138,8 @@ func GetUserStatistics(c *gin.Context) { func GetGroupStatistics(c *gin.Context) { var ( - req cms_api_struct.GetGroupStatisticsRequest - resp cms_api_struct.GetGroupStatisticsResponse + req cms_struct.GetGroupStatisticsRequest + resp cms_struct.GetGroupStatisticsResponse reqPb admin.GetGroupStatisticsReq ) reqPb.StatisticsReq = &admin.StatisticsReq{} @@ -197,8 +197,8 @@ func GetGroupStatistics(c *gin.Context) { func GetActiveUser(c *gin.Context) { var ( - req cms_api_struct.GetActiveUserRequest - resp cms_api_struct.GetActiveUserResponse + req cms_struct.GetActiveUserRequest + resp cms_struct.GetActiveUserResponse reqPb admin.GetActiveUserReq ) reqPb.StatisticsReq = &admin.StatisticsReq{} @@ -233,8 +233,8 @@ func GetActiveUser(c *gin.Context) { func GetActiveGroup(c *gin.Context) { var ( - req cms_api_struct.GetActiveGroupRequest - resp cms_api_struct.GetActiveGroupResponse + req cms_struct.GetActiveGroupRequest + resp cms_struct.GetActiveGroupResponse reqPb admin.GetActiveGroupReq ) reqPb.StatisticsReq = &admin.StatisticsReq{} diff --git a/internal/cms_api/user/user.go b/internal/cms_api/user/user.go index e6c374aa2..7f103ba57 100644 --- a/internal/cms_api/user/user.go +++ b/internal/cms_api/user/user.go @@ -18,7 +18,7 @@ import ( func AddUser(c *gin.Context) { var ( - req cms_api_struct.AddUserRequest + req cms_struct.AddUserRequest reqPb pb.AddUserReq ) if err := c.BindJSON(&req); err != nil { @@ -48,7 +48,7 @@ func AddUser(c *gin.Context) { func BlockUser(c *gin.Context) { var ( - req cms_api_struct.BlockUserRequest + req cms_struct.BlockUserRequest reqPb pb.BlockUserReq ) if err := c.BindJSON(&req); err != nil { @@ -78,8 +78,8 @@ func BlockUser(c *gin.Context) { func UnblockUser(c *gin.Context) { var ( - req cms_api_struct.UnblockUserRequest - resp cms_api_struct.UnBlockUserResponse + req cms_struct.UnblockUserRequest + resp cms_struct.UnBlockUserResponse reqPb pb.UnBlockUserReq ) if err := c.BindJSON(&req); err != nil { @@ -110,8 +110,8 @@ func UnblockUser(c *gin.Context) { func GetBlockUsers(c *gin.Context) { var ( - req cms_api_struct.GetBlockUsersRequest - resp cms_api_struct.GetBlockUsersResponse + req cms_struct.GetBlockUsersRequest + resp cms_struct.GetBlockUsersResponse reqPb pb.GetBlockUsersReq respPb *pb.GetBlockUsersResp ) @@ -140,8 +140,8 @@ func GetBlockUsers(c *gin.Context) { return } for _, v := range respPb.BlockUsers { - resp.BlockUsers = append(resp.BlockUsers, cms_api_struct.BlockUser{ - UserResponse: cms_api_struct.UserResponse{ + resp.BlockUsers = append(resp.BlockUsers, cms_struct.BlockUser{ + UserResponse: cms_struct.UserResponse{ UserID: v.UserInfo.UserID, FaceURL: v.UserInfo.FaceURL, Nickname: v.UserInfo.Nickname, @@ -162,8 +162,8 @@ func GetBlockUsers(c *gin.Context) { func GetUserIDByEmailAndPhoneNumber(c *gin.Context) { var ( - req cms_api_struct.GetUserIDByEmailAndPhoneNumberRequest - resp cms_api_struct.GetUserIDByEmailAndPhoneNumberResponse + req cms_struct.GetUserIDByEmailAndPhoneNumberRequest + resp cms_struct.GetUserIDByEmailAndPhoneNumberResponse reqPb pbAdminCms.GetUserIDByEmailAndPhoneNumberReq respPb *pbAdminCms.GetUserIDByEmailAndPhoneNumberResp ) diff --git a/internal/cron_task/cron_task.go b/internal/cron_task/cron_task.go index 0b23e9125..c261fc48b 100644 --- a/internal/cron_task/cron_task.go +++ b/internal/cron_task/cron_task.go @@ -44,13 +44,16 @@ func StartCronTask(userID, workingGroupID string) { } } +type CronTask struct { +} + func getCronTaskOperationID() string { return cronTaskOperationID + utils.OperationIDGenerator() } func ClearAll() { operationID := getCronTaskOperationID() - log.NewInfo(operationID, "====================== start del cron task ======================") + log.NewInfo(operationID, "========================= start del cron task =========================") var err error userIDList, err := im_mysql_model.SelectAllUserID() if err == nil { @@ -67,7 +70,7 @@ func ClearAll() { log.NewError(operationID, utils.GetSelfFuncName(), err.Error()) } - log.NewInfo(operationID, "====================== start del cron finished ======================") + log.NewInfo(operationID, "========================= start del cron finished =========================") } func StartClearMsg(operationID string, userIDList []string) { diff --git a/internal/demo/register/login.go b/internal/demo/register/login.go index e48294055..7d05086eb 100644 --- a/internal/demo/register/login.go +++ b/internal/demo/register/login.go @@ -1,7 +1,7 @@ package register import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db/mysql_model/im_mysql_model" diff --git a/internal/demo/register/set_password.go b/internal/demo/register/set_password.go index ce2ca417e..e2f141080 100644 --- a/internal/demo/register/set_password.go +++ b/internal/demo/register/set_password.go @@ -1,7 +1,7 @@ package register import ( - api "Open_IM/pkg/base_info" + api "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db" diff --git a/internal/msg_transfer/logic/modify_msg_handler.go b/internal/msg_transfer/logic/modify_msg_handler.go index 4cdff43fc..14990225d 100644 --- a/internal/msg_transfer/logic/modify_msg_handler.go +++ b/internal/msg_transfer/logic/modify_msg_handler.go @@ -1,7 +1,7 @@ package logic import ( - "Open_IM/pkg/base_info" + "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db" @@ -61,7 +61,7 @@ func (mmc *ModifyMsgConsumerHandler) ModifyMsg(cMsg *sarama.ConsumerMessage, msg continue } if msgDataToMQ.MsgData.ContentType == constant.ReactionMessageModifier { - notification := &base_info.ReactionMessageModifierNotification{} + notification := &api_struct.ReactionMessageModifierNotification{} if err := json.Unmarshal(msgDataToMQ.MsgData.Content, notification); err != nil { continue } @@ -104,7 +104,7 @@ func (mmc *ModifyMsgConsumerHandler) ModifyMsg(cMsg *sarama.ConsumerMessage, msg } } } else if msgDataToMQ.MsgData.ContentType == constant.ReactionMessageDeleter { - notification := &base_info.ReactionMessageDeleteNotification{} + notification := &api_struct.ReactionMessageDeleteNotification{} if err := json.Unmarshal(msgDataToMQ.MsgData.Content, notification); err != nil { continue } @@ -116,7 +116,7 @@ func (mmc *ModifyMsgConsumerHandler) ModifyMsg(cMsg *sarama.ConsumerMessage, msg } -func UnMarshallSetReactionMsgContent(content []byte) (notification *base_info.ReactionMessageModifierNotification, err error) { +func UnMarshallSetReactionMsgContent(content []byte) (notification *api_struct.ReactionMessageModifierNotification, err error) { return notification, nil } diff --git a/internal/push/logic/push_to_client.go b/internal/push/logic/push_to_client.go index 5ed0bec53..03ab1a202 100644 --- a/internal/push/logic/push_to_client.go +++ b/internal/push/logic/push_to_client.go @@ -8,7 +8,6 @@ package logic import ( "Open_IM/internal/push" - utils2 "Open_IM/internal/utils" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db" @@ -172,7 +171,7 @@ func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) { log.NewDebug(pushMsg.OperationID, utils.GetSelfFuncName(), "callback userIDList Resp", pushToUserIDList) } if len(pushToUserIDList) == 0 { - userIDList, err := utils2.GetGroupMemberUserIDList(context.Background(), pushMsg.MsgData.GroupID, pushMsg.OperationID) + userIDList, err := utils.GetGroupMemberUserIDList(context.Background(), pushMsg.MsgData.GroupID, pushMsg.OperationID) if err != nil { log.Error(pushMsg.OperationID, "GetGroupMemberUserIDList failed ", err.Error(), pushMsg.MsgData.GroupID) return diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index 50c8b43e5..212a04039 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -4,13 +4,10 @@ import ( chat "Open_IM/internal/rpc/msg" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/db/model" - "Open_IM/pkg/common/db/mysql" "Open_IM/pkg/common/log" "Open_IM/pkg/common/middleware" promePkg "Open_IM/pkg/common/prometheus" "Open_IM/pkg/common/token_verify" - "Open_IM/pkg/common/tools" "Open_IM/pkg/common/tracelog" "Open_IM/pkg/getcdv3" pbFriend "Open_IM/pkg/proto/friend" @@ -114,7 +111,7 @@ func (s *friendServer) AddBlacklist(ctx context.Context, req *pbFriend.AddBlackl if err := token_verify.CheckAccessV3(ctx, req.FromUserID); err != nil { return nil, err } - black := relation.Black{OwnerUserID: req.FromUserID, BlockUserID: req.ToUserID, OperatorUserID: tools.OpUserID(ctx)} + black := relation.Black{OwnerUserID: req.FromUserID, BlockUserID: req.ToUserID, OperatorUserID: utils.OpUserID(ctx)} if err := s.blackModel.Create(ctx, []*relation.Black{&black}); err != nil { return nil, err } @@ -222,7 +219,7 @@ func (s *friendServer) AddFriendResponse(ctx context.Context, req *pbFriend.AddF friendRequest.HandleResult = req.HandleResult friendRequest.HandleTime = time.Now() friendRequest.HandleMsg = req.HandleMsg - friendRequest.HandlerUserID = tools.OpUserID(ctx) + friendRequest.HandlerUserID = utils.OpUserID(ctx) err = relation.UpdateFriendApplication(friendRequest) if err != nil { return nil, err @@ -233,10 +230,10 @@ func (s *friendServer) AddFriendResponse(ctx context.Context, req *pbFriend.AddF //Establish friendship after find friend relationship not exists _, err := s.friendModel.Take(ctx, req.FromUserID, req.ToUserID) if errors.Is(err, gorm.ErrRecordNotFound) { - if err := s.friendModel.Create(ctx, []*relation.Friend{{OwnerUserID: req.FromUserID, FriendUserID: req.ToUserID, OperatorUserID: tools.OpUserID(ctx)}}); err != nil { + if err := s.friendModel.Create(ctx, []*relation.Friend{{OwnerUserID: req.FromUserID, FriendUserID: req.ToUserID, OperatorUserID: utils.OpUserID(ctx)}}); err != nil { return nil, err } - chat.FriendAddedNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.FromUserID, req.ToUserID) + chat.FriendAddedNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.FromUserID, req.ToUserID) } else if err != nil { return nil, err } @@ -292,7 +289,7 @@ func (s *friendServer) SetFriendRemark(ctx context.Context, req *pbFriend.SetFri if err := s.friendModel.UpdateRemark(ctx, req.FromUserID, req.ToUserID, req.Remark); err != nil { return nil, err } - chat.FriendRemarkSetNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.FromUserID, req.ToUserID) + chat.FriendRemarkSetNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.FromUserID, req.ToUserID) return resp, nil } diff --git a/internal/rpc/group/g.go b/internal/rpc/group/g.go index 1228a1c15..ef18feedf 100644 --- a/internal/rpc/group/g.go +++ b/internal/rpc/group/g.go @@ -3,7 +3,6 @@ package group import ( "Open_IM/pkg/common/constant" relation "Open_IM/pkg/common/db/mysql" - "Open_IM/pkg/common/tools" pbGroup "Open_IM/pkg/proto/group" sdk_ws "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" @@ -17,7 +16,7 @@ func getDBGroupRequest(ctx context.Context, req *pbGroup.GroupApplicationRespons dbGroupRequest = &relation.GroupRequest{} utils.CopyStructFields(&dbGroupRequest, req) dbGroupRequest.UserID = req.FromUserID - dbGroupRequest.HandleUserID = tools.OpUserID(ctx) + dbGroupRequest.HandleUserID = utils.OpUserID(ctx) dbGroupRequest.HandledTime = time.Now() return dbGroupRequest } @@ -29,7 +28,7 @@ func getDBGroupMember(ctx context.Context, groupID, userID string) (dbGroupMembe member.GroupID = groupID member.UserID = userID member.RoleLevel = constant.GroupOrdinaryUsers - member.OperatorUserID = tools.OpUserID(ctx) + member.OperatorUserID = utils.OpUserID(ctx) member.FaceURL = user.FaceURL member.Nickname = user.Nickname @@ -60,7 +59,7 @@ func genGroupID(ctx context.Context, groupID string) string { if groupID != "" { return groupID } - groupID = utils.Md5(tools.OperationID(ctx) + strconv.FormatInt(time.Now().UnixNano(), 10)) + groupID = utils.Md5(utils.OperationID(ctx) + strconv.FormatInt(time.Now().UnixNano(), 10)) bi := big.NewInt(0) bi.SetString(groupID[0:8], 16) groupID = bi.String() diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 284ba2eb7..2826bf2bd 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -13,7 +13,6 @@ import ( "Open_IM/pkg/common/middleware" promePkg "Open_IM/pkg/common/prometheus" "Open_IM/pkg/common/token_verify" - "Open_IM/pkg/common/tools" "Open_IM/pkg/common/tracelog" cp "Open_IM/internal/utils" @@ -180,12 +179,12 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR return nil, err } } else { - opUserID := tools.OpUserID(ctx) + opUserID := utils.OpUserID(ctx) joinGroup := func(userID string, roleLevel int32) error { user := userMap[userID] groupMember := &relation.GroupMember{GroupID: group.GroupID, RoleLevel: roleLevel, OperatorUserID: opUserID, JoinSource: constant.JoinByInvitation, InviterUserID: opUserID} utils.CopyStructFields(&groupMember, user) - if err := CallbackBeforeMemberJoinGroup(ctx, tools.OperationID(ctx), groupMember, group.Ex); err != nil { + if err := CallbackBeforeMemberJoinGroup(ctx, utils.OperationID(ctx), groupMember, group.Ex); err != nil { return err } groupMembers = append(groupMembers, groupMember) @@ -213,11 +212,11 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR if req.GroupInfo.GroupType == constant.SuperGroup { go func() { for _, userID := range userIDs { - chat.SuperGroupNotification(tools.OperationID(ctx), userID, userID) + chat.SuperGroupNotification(utils.OperationID(ctx), userID, userID) } }() } else { - chat.GroupCreatedNotification(tools.OperationID(ctx), tools.OpUserID(ctx), group.GroupID, userIDs) + chat.GroupCreatedNotification(utils.OperationID(ctx), utils.OpUserID(ctx), group.GroupID, userIDs) } return resp, nil } @@ -301,7 +300,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite } if group.NeedVerification == constant.AllNeedVerification { if !token_verify.IsAppManagerUid(ctx) { - opUserID := tools.OpUserID(ctx) + opUserID := utils.OpUserID(ctx) member, ok := memberMap[opUserID] if ok { return nil, constant.ErrNoPermission.Wrap("not in group") @@ -336,7 +335,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite return nil, err } for _, userID := range req.InvitedUserIDList { - chat.SuperGroupNotification(tools.OperationID(ctx), userID, userID) + chat.SuperGroupNotification(utils.OperationID(ctx), userID, userID) } } else { var groupMembers []*relation.GroupMember @@ -346,10 +345,10 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite utils.CopyStructFields(&member, user) member.GroupID = req.GroupID member.RoleLevel = constant.GroupOrdinaryUsers - member.OperatorUserID = tools.OpUserID(ctx) - member.InviterUserID = tools.OpUserID(ctx) + member.OperatorUserID = utils.OpUserID(ctx) + member.InviterUserID = utils.OpUserID(ctx) member.JoinSource = constant.JoinByInvitation - if err := CallbackBeforeMemberJoinGroup(ctx, tools.OperationID(ctx), &member, group.Ex); err != nil { + if err := CallbackBeforeMemberJoinGroup(ctx, utils.OperationID(ctx), &member, group.Ex); err != nil { return nil, err } groupMembers = append(groupMembers, &member) @@ -357,7 +356,7 @@ func (s *groupServer) InviteUserToGroup(ctx context.Context, req *pbGroup.Invite if err := s.GroupInterface.CreateGroupMember(ctx, groupMembers); err != nil { return nil, err } - chat.MemberInvitedNotification(tools.OperationID(ctx), req.GroupID, tools.OpUserID(ctx), req.Reason, req.InvitedUserIDList) + chat.MemberInvitedNotification(utils.OperationID(ctx), req.GroupID, utils.OpUserID(ctx), req.Reason, req.InvitedUserIDList) } return resp, nil } @@ -436,8 +435,8 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou var okUserIDList []string if groupInfo.GroupType != constant.SuperGroup { opFlag := 0 - if !token_verify.IsManagerUserID(tools.OpUserID(ctx)) { - opInfo, err := rocksCache.GetGroupMemberInfoFromCache(ctx, req.GroupID, tools.OpUserID(ctx)) + if !token_verify.IsManagerUserID(utils.OpUserID(ctx)) { + opInfo, err := rocksCache.GetGroupMemberInfoFromCache(ctx, req.GroupID, utils.OpUserID(ctx)) if err != nil { return nil, err } @@ -484,7 +483,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou err = relation.DeleteGroupMemberByGroupIDAndUserID(req.GroupID, v) tracelog.SetCtxInfo(ctx, "RemoveGroupMember", err, "groupID", req.GroupID, "userID", v) if err != nil { - log.NewError(tools.OperationID(ctx), "RemoveGroupMember failed ", err.Error(), req.GroupID, v) + log.NewError(utils.OperationID(ctx), "RemoveGroupMember failed ", err.Error(), req.GroupID, v) resp.Id2ResultList = append(resp.Id2ResultList, &pbGroup.Id2Result{UserID: v, Result: -1}) } else { resp.Id2ResultList = append(resp.Id2ResultList, &pbGroup.Id2Result{UserID: v, Result: 0}) @@ -494,7 +493,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou var reqPb pbUser.SetConversationReq var c pbConversation.Conversation for _, v := range okUserIDList { - reqPb.OperationID = tools.OperationID(ctx) + reqPb.OperationID = utils.OperationID(ctx) c.OwnerUserID = v c.ConversationID = utils.GetConversationIDBySessionType(req.GroupID, constant.GroupChatType) c.ConversationType = constant.GroupChatType @@ -531,7 +530,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou } go func() { for _, v := range req.KickedUserIDList { - chat.SuperGroupNotification(tools.OperationID(ctx), v, v) + chat.SuperGroupNotification(utils.OperationID(ctx), v, v) } }() @@ -587,7 +586,7 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup. tracelog.SetCtxInfo(ctx, "GetRecvGroupApplicationList", nil, " FromUserID: ", req.FromUserID, "GroupApplicationList: ", reply) for _, v := range reply { node := open_im_sdk.GroupRequest{UserInfo: &open_im_sdk.PublicUserInfo{}, GroupInfo: &open_im_sdk.GroupInfo{}} - err := FillGroupInfoByGroupID(tools.OperationID(ctx), v.GroupID, node.GroupInfo) + err := FillGroupInfoByGroupID(utils.OperationID(ctx), v.GroupID, node.GroupInfo) if err != nil { if !errors.Is(errors.Unwrap(err), constant.ErrDismissedAlready) { errResult = err @@ -595,7 +594,7 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup. continue } tracelog.SetCtxInfo(ctx, "FillGroupInfoByGroupID ", nil, " groupID: ", v.GroupID, " groupInfo: ", node.GroupInfo) - err = FillPublicUserInfoByUserID(tools.OperationID(ctx), v.UserID, node.UserInfo) + err = FillPublicUserInfoByUserID(utils.OperationID(ctx), v.UserID, node.UserInfo) if err != nil { errResult = err continue @@ -640,7 +639,7 @@ func CheckPermission(ctx context.Context, groupID string, userID string) (err er func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup.GroupApplicationResponseReq) (*pbGroup.GroupApplicationResponseResp, error) { resp := &pbGroup.GroupApplicationResponseResp{} - if err := CheckPermission(ctx, req.GroupID, tools.OpUserID(ctx)); err != nil { + if err := CheckPermission(ctx, req.GroupID, utils.OpUserID(ctx)); err != nil { return nil, err } groupRequest := getDBGroupRequest(ctx, req) @@ -656,7 +655,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup if err != nil { return nil, err } - err = CallbackBeforeMemberJoinGroup(ctx, tools.OperationID(ctx), member, groupInfo.Ex) + err = CallbackBeforeMemberJoinGroup(ctx, utils.OperationID(ctx), member, groupInfo.Ex) if err != nil { return nil, err } @@ -664,12 +663,12 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup if err != nil { return nil, err } - etcdCacheConn, err := fault_tolerant.GetDefaultConn(config.Config.RpcRegisterName.OpenImCacheName, tools.OperationID(ctx)) + etcdCacheConn, err := fault_tolerant.GetDefaultConn(config.Config.RpcRegisterName.OpenImCacheName, utils.OperationID(ctx)) if err != nil { return nil, err } cacheClient := pbCache.NewCacheClient(etcdCacheConn) - cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{OperationID: tools.OperationID(ctx), GroupID: req.GroupID}) + cacheResp, err := cacheClient.DelGroupMemberIDListFromCache(context.Background(), &pbCache.DelGroupMemberIDListFromCacheReq{OperationID: utils.OperationID(ctx), GroupID: req.GroupID}) if err != nil { return nil, err } @@ -696,7 +695,7 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) (*pbGroup.JoinGroupResp, error) { resp := &pbGroup.JoinGroupResp{} - if _, err := relation.GetUserByUserID(tools.OpUserID(ctx)); err != nil { + if _, err := relation.GetUserByUserID(utils.OpUserID(ctx)); err != nil { return nil, err } groupInfo, err := rocksCache.GetGroupInfoFromCache(ctx, req.GroupID) @@ -709,17 +708,17 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) if groupInfo.NeedVerification == constant.Directly { if groupInfo.GroupType != constant.SuperGroup { - us, err := relation.GetUserByUserID(tools.OpUserID(ctx)) + us, err := relation.GetUserByUserID(utils.OpUserID(ctx)) if err != nil { return nil, err } //to group member - groupMember := relation.GroupMember{GroupID: req.GroupID, RoleLevel: constant.GroupOrdinaryUsers, OperatorUserID: tools.OpUserID(ctx)} + groupMember := relation.GroupMember{GroupID: req.GroupID, RoleLevel: constant.GroupOrdinaryUsers, OperatorUserID: utils.OpUserID(ctx)} utils.CopyStructFields(&groupMember, us) - if err := CallbackBeforeMemberJoinGroup(ctx, tools.OperationID(ctx), &groupMember, groupInfo.Ex); err != nil { + if err := CallbackBeforeMemberJoinGroup(ctx, utils.OperationID(ctx), &groupMember, groupInfo.Ex); err != nil { return nil, err } - if err := s.DelGroupAndUserCache(ctx, req.GroupID, []string{tools.OpUserID(ctx)}); err != nil { + if err := s.DelGroupAndUserCache(ctx, req.GroupID, []string{utils.OpUserID(ctx)}); err != nil { return nil, err } err = relation.InsertIntoGroupMember(groupMember) @@ -735,8 +734,8 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) } var reqPb pbUser.SetConversationReq var c pbConversation.Conversation - reqPb.OperationID = tools.OperationID(ctx) - c.OwnerUserID = tools.OpUserID(ctx) + reqPb.OperationID = utils.OperationID(ctx) + c.OwnerUserID = utils.OpUserID(ctx) c.ConversationID = utils.GetConversationIDBySessionType(req.GroupID, sessionType) c.ConversationType = int32(sessionType) c.GroupID = req.GroupID @@ -750,7 +749,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) client := pbUser.NewUserClient(etcdConn) respPb, err := client.SetConversation(context.Background(), &reqPb) tracelog.SetCtxInfo(ctx, "SetConversation", err, "req", reqPb, "resp", respPb) - chat.MemberEnterDirectlyNotification(req.GroupID, tools.OpUserID(ctx), tools.OperationID(ctx)) + chat.MemberEnterDirectlyNotification(req.GroupID, utils.OpUserID(ctx), utils.OperationID(ctx)) return resp, nil } else { constant.SetErrorForResp(constant.ErrGroupTypeNotSupport, resp.CommonResp) @@ -758,7 +757,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) } } var groupRequest relation.GroupRequest - groupRequest.UserID = tools.OpUserID(ctx) + groupRequest.UserID = utils.OpUserID(ctx) groupRequest.ReqMsg = req.ReqMessage groupRequest.GroupID = req.GroupID groupRequest.JoinSource = req.JoinSource @@ -778,31 +777,31 @@ func (s *groupServer) QuitGroup(ctx context.Context, req *pbGroup.QuitGroupReq) return nil, err } if groupInfo.GroupType != constant.SuperGroup { - _, err = rocksCache.GetGroupMemberInfoFromCache(ctx, req.GroupID, tools.OpUserID(ctx)) + _, err = rocksCache.GetGroupMemberInfoFromCache(ctx, req.GroupID, utils.OpUserID(ctx)) if err != nil { return nil, err } - if err := s.DelGroupAndUserCache(ctx, req.GroupID, []string{tools.OpUserID(ctx)}); err != nil { + if err := s.DelGroupAndUserCache(ctx, req.GroupID, []string{utils.OpUserID(ctx)}); err != nil { return nil, err } - err = relation.DeleteGroupMemberByGroupIDAndUserID(req.GroupID, tools.OpUserID(ctx)) + err = relation.DeleteGroupMemberByGroupIDAndUserID(req.GroupID, utils.OpUserID(ctx)) if err != nil { return nil, err } } else { - okUserIDList := []string{tools.OpUserID(ctx)} + okUserIDList := []string{utils.OpUserID(ctx)} if err := db.DB.RemoverUserFromSuperGroup(req.GroupID, okUserIDList); err != nil { return nil, err } } if groupInfo.GroupType != constant.SuperGroup { - _ = rocksCache.DelGroupMemberInfoFromCache(ctx, req.GroupID, tools.OpUserID(ctx)) + _ = rocksCache.DelGroupMemberInfoFromCache(ctx, req.GroupID, utils.OpUserID(ctx)) chat.MemberQuitNotification(req) } else { - _ = rocksCache.DelJoinedSuperGroupIDListFromCache(ctx, tools.OpUserID(ctx)) + _ = rocksCache.DelJoinedSuperGroupIDListFromCache(ctx, utils.OpUserID(ctx)) _ = rocksCache.DelGroupMemberListHashFromCache(ctx, req.GroupID) - chat.SuperGroupNotification(tools.OperationID(ctx), tools.OpUserID(ctx), tools.OpUserID(ctx)) + chat.SuperGroupNotification(utils.OperationID(ctx), utils.OpUserID(ctx), utils.OpUserID(ctx)) } return resp, nil } @@ -871,7 +870,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf var groupInfo relation.Group utils.CopyStructFields(&groupInfo, req.GroupInfoForSet) if req.GroupInfoForSet.Notification != "" { - groupInfo.NotificationUserID = tools.OpUserID(ctx) + groupInfo.NotificationUserID = utils.OpUserID(ctx) groupInfo.NotificationUpdateTime = time.Now() } if err := rocksCache.DelGroupInfoFromCache(ctx, req.GroupInfoForSet.GroupID); err != nil { @@ -882,11 +881,11 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf return nil, err } if changedType != 0 { - chat.GroupInfoSetNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.GroupInfoForSet.GroupID, groupName, notification, introduction, faceURL, req.GroupInfoForSet.NeedVerification) + chat.GroupInfoSetNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.GroupInfoForSet.GroupID, groupName, notification, introduction, faceURL, req.GroupInfoForSet.NeedVerification) } if req.GroupInfoForSet.Notification != "" { //get group member user id - getGroupMemberIDListFromCacheReq := &pbCache.GetGroupMemberIDListFromCacheReq{OperationID: tools.OperationID(ctx), GroupID: req.GroupInfoForSet.GroupID} + getGroupMemberIDListFromCacheReq := &pbCache.GetGroupMemberIDListFromCacheReq{OperationID: utils.OperationID(ctx), GroupID: req.GroupInfoForSet.GroupID} etcdConn, err := getcdv3.GetConn(ctx, config.Config.RpcRegisterName.OpenImCacheName) if err != nil { return nil, err @@ -901,13 +900,13 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf } var conversationReq pbConversation.ModifyConversationFieldReq conversation := pbConversation.Conversation{ - OwnerUserID: tools.OpUserID(ctx), + OwnerUserID: utils.OpUserID(ctx), ConversationID: utils.GetConversationIDBySessionType(req.GroupInfoForSet.GroupID, constant.GroupChatType), ConversationType: constant.GroupChatType, GroupID: req.GroupInfoForSet.GroupID, } conversationReq.Conversation = &conversation - conversationReq.OperationID = tools.OperationID(ctx) + conversationReq.OperationID = utils.OperationID(ctx) conversationReq.FieldType = constant.FieldGroupAtType conversation.GroupAtType = constant.GroupNotification conversationReq.UserIDList = cacheResp.UserIDList @@ -1020,7 +1019,7 @@ func (s *groupServer) GetGroupMembersCMS(ctx context.Context, req *pbGroup.GetGr if err != nil { return nil, err } - log.NewInfo(tools.OperationID(ctx), groupMembersCount) + log.NewInfo(utils.OperationID(ctx), groupMembersCount) resp.MemberNums = int32(groupMembersCount) for _, groupMember := range groupMembers { member := open_im_sdk.GroupMemberFullInfo{} @@ -1065,7 +1064,7 @@ func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbGrou func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGroupReq) (*pbGroup.DismissGroupResp, error) { resp := &pbGroup.DismissGroupResp{} - if !token_verify.IsManagerUserID(tools.OpUserID(ctx)) && !relation.IsGroupOwnerAdmin(req.GroupID, tools.OpUserID(ctx)) { + if !token_verify.IsManagerUserID(utils.OpUserID(ctx)) && !relation.IsGroupOwnerAdmin(req.GroupID, utils.OpUserID(ctx)) { return nil, utils.Wrap(constant.ErrIdentity, "") } @@ -1093,7 +1092,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou var reqPb pbUser.SetConversationReq var c pbConversation.Conversation for _, v := range memberList { - reqPb.OperationID = tools.OperationID(ctx) + reqPb.OperationID = utils.OperationID(ctx) c.OwnerUserID = v.UserID c.ConversationID = utils.GetConversationIDBySessionType(req.GroupID, constant.GroupChatType) c.ConversationType = constant.GroupChatType @@ -1122,7 +1121,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGroupMemberReq) (*pbGroup.MuteGroupMemberResp, error) { resp := &pbGroup.MuteGroupMemberResp{} - opFlag, err := s.getGroupUserLevel(req.GroupID, tools.OpUserID(ctx)) + opFlag, err := s.getGroupUserLevel(req.GroupID, utils.OpUserID(ctx)) if err != nil { return nil, err } @@ -1150,14 +1149,14 @@ func (s *groupServer) MuteGroupMember(ctx context.Context, req *pbGroup.MuteGrou if err != nil { return nil, err } - chat.GroupMemberMutedNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.GroupID, req.UserID, req.MutedSeconds) + chat.GroupMemberMutedNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.GroupID, req.UserID, req.MutedSeconds) return resp, nil } func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.CancelMuteGroupMemberReq) (*pbGroup.CancelMuteGroupMemberResp, error) { resp := &pbGroup.CancelMuteGroupMemberResp{} - opFlag, err := s.getGroupUserLevel(req.GroupID, tools.OpUserID(ctx)) + opFlag, err := s.getGroupUserLevel(req.GroupID, utils.OpUserID(ctx)) if err != nil { return nil, err } @@ -1185,14 +1184,14 @@ func (s *groupServer) CancelMuteGroupMember(ctx context.Context, req *pbGroup.Ca if err != nil { return nil, err } - chat.GroupMemberCancelMutedNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.GroupID, req.UserID) + chat.GroupMemberCancelMutedNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.GroupID, req.UserID) return resp, nil } func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq) (*pbGroup.MuteGroupResp, error) { resp := &pbGroup.MuteGroupResp{} - opFlag, err := s.getGroupUserLevel(req.GroupID, tools.OpUserID(ctx)) + opFlag, err := s.getGroupUserLevel(req.GroupID, utils.OpUserID(ctx)) if err != nil { return nil, err } @@ -1225,14 +1224,14 @@ func (s *groupServer) MuteGroup(ctx context.Context, req *pbGroup.MuteGroupReq) return nil, err } - chat.GroupMutedNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.GroupID) + chat.GroupMutedNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.GroupID) return resp, nil } func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMuteGroupReq) (*pbGroup.CancelMuteGroupResp, error) { resp := &pbGroup.CancelMuteGroupResp{} - opFlag, err := s.getGroupUserLevel(req.GroupID, tools.OpUserID(ctx)) + opFlag, err := s.getGroupUserLevel(req.GroupID, utils.OpUserID(ctx)) if err != nil { return nil, err } @@ -1252,7 +1251,7 @@ func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMu // errMsg := req.OperationID + " mutedInfo.RoleLevel == constant.GroupAdmin " + req.GroupID + req.OpUserID + err.Error() // return &pbGroup.CancelMuteGroupResp{CommonResp: &pbGroup.CommonResp{ErrCode: constant.ErrAccess.ErrCode, ErrMsg: errMsg}}, nil //} - log.Debug(tools.OperationID(ctx), "UpdateGroupInfoDefaultZero ", req.GroupID, map[string]interface{}{"status": constant.GroupOk}) + log.Debug(utils.OperationID(ctx), "UpdateGroupInfoDefaultZero ", req.GroupID, map[string]interface{}{"status": constant.GroupOk}) if err := rocksCache.DelGroupInfoFromCache(ctx, req.GroupID); err != nil { return nil, err } @@ -1260,14 +1259,14 @@ func (s *groupServer) CancelMuteGroup(ctx context.Context, req *pbGroup.CancelMu if err != nil { return nil, err } - chat.GroupCancelMutedNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.GroupID) + chat.GroupCancelMutedNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.GroupID) return resp, nil } func (s *groupServer) SetGroupMemberNickname(ctx context.Context, req *pbGroup.SetGroupMemberNicknameReq) (*pbGroup.SetGroupMemberNicknameResp, error) { resp := &pbGroup.SetGroupMemberNicknameResp{} - if tools.OpUserID(ctx) != req.UserID && !token_verify.IsManagerUserID(tools.OpUserID(ctx)) { + if utils.OpUserID(ctx) != req.UserID && !token_verify.IsManagerUserID(utils.OpUserID(ctx)) { return nil, utils.Wrap(constant.ErrIdentity, "") } cbReq := &pbGroup.SetGroupMemberInfoReq{ @@ -1299,7 +1298,7 @@ func (s *groupServer) SetGroupMemberNickname(ctx context.Context, req *pbGroup.S if err := relation.UpdateGroupMemberInfo(groupMemberInfo); err != nil { return nil, err } - chat.GroupMemberInfoSetNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.GroupID, req.UserID) + chat.GroupMemberInfoSetNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.GroupID, req.UserID) return resp, nil } @@ -1338,13 +1337,13 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr switch req.RoleLevel.Value { case constant.GroupOrdinaryUsers: //msg.GroupMemberRoleLevelChangeNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, constant.GroupMemberSetToOrdinaryUserNotification) - chat.GroupMemberInfoSetNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.GroupID, req.UserID) + chat.GroupMemberInfoSetNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.GroupID, req.UserID) case constant.GroupAdmin, constant.GroupOwner: //msg.GroupMemberRoleLevelChangeNotification(req.OperationID, req.OpUserID, req.GroupID, req.UserID, constant.GroupMemberSetToAdminNotification) - chat.GroupMemberInfoSetNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.GroupID, req.UserID) + chat.GroupMemberInfoSetNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.GroupID, req.UserID) } } else { - chat.GroupMemberInfoSetNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.GroupID, req.UserID) + chat.GroupMemberInfoSetNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.GroupID, req.UserID) } return resp, nil } diff --git a/internal/rpc/msg/extend_msg.notification.go b/internal/rpc/msg/extend_msg.notification.go index 433ecfd65..dc9089f0d 100644 --- a/internal/rpc/msg/extend_msg.notification.go +++ b/internal/rpc/msg/extend_msg.notification.go @@ -1,7 +1,7 @@ package msg import ( - "Open_IM/pkg/base_info" + "Open_IM/pkg/api_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" @@ -14,7 +14,7 @@ import ( func ExtendMessageUpdatedNotification(operationID, sendID string, sourceID string, sessionType int32, req *msg.SetMessageReactionExtensionsReq, resp *msg.SetMessageReactionExtensionsResp, isHistory bool, isReactionFromCache bool) { - var m base_info.ReactionMessageModifierNotification + var m api_struct.ReactionMessageModifierNotification m.SourceID = req.SourceID m.OpUserID = req.OpUserID m.SessionType = req.SessionType @@ -37,7 +37,7 @@ func ExtendMessageUpdatedNotification(operationID, sendID string, sourceID strin } func ExtendMessageDeleteNotification(operationID, sendID string, sourceID string, sessionType int32, req *msg.DeleteMessageListReactionExtensionsReq, resp *msg.DeleteMessageListReactionExtensionsResp, isHistory bool, isReactionFromCache bool) { - var m base_info.ReactionMessageDeleteNotification + var m api_struct.ReactionMessageDeleteNotification m.SourceID = req.SourceID m.OpUserID = req.OpUserID m.SessionType = req.SessionType diff --git a/internal/rpc/msg/group_notification.go b/internal/rpc/msg/group_notification.go index ea5e14db2..5d8521afa 100644 --- a/internal/rpc/msg/group_notification.go +++ b/internal/rpc/msg/group_notification.go @@ -6,7 +6,6 @@ import ( 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/common/tools" utils2 "Open_IM/pkg/common/utils" pbGroup "Open_IM/pkg/proto/group" open_im_sdk "Open_IM/pkg/proto/sdk_ws" @@ -389,23 +388,23 @@ func JoinGroupApplicationNotification(ctx context.Context, req *pbGroup.JoinGrou JoinGroupApplicationTips := open_im_sdk.JoinGroupApplicationTips{Group: &open_im_sdk.GroupInfo{}, Applicant: &open_im_sdk.PublicUserInfo{}} err := setGroupInfo(req.GroupID, JoinGroupApplicationTips.Group) if err != nil { - log.Error(tools.OperationID(ctx), "setGroupInfo failed ", err.Error(), req.GroupID) + log.Error(utils.OperationID(ctx), "setGroupInfo failed ", err.Error(), req.GroupID) return } - if err = setPublicUserInfo(tools.OpUserID(ctx), JoinGroupApplicationTips.Applicant); err != nil { - log.Error(tools.OperationID(ctx), "setPublicUserInfo failed ", err.Error(), tools.OpUserID(ctx)) + if err = setPublicUserInfo(utils.OpUserID(ctx), JoinGroupApplicationTips.Applicant); err != nil { + log.Error(utils.OperationID(ctx), "setPublicUserInfo failed ", err.Error(), utils.OpUserID(ctx)) return } JoinGroupApplicationTips.ReqMsg = req.ReqMessage managerList, err := imdb.GetOwnerManagerByGroupID(req.GroupID) if err != nil { - log.NewError(tools.OperationID(ctx), "GetOwnerManagerByGroupId failed ", err.Error(), req.GroupID) + log.NewError(utils.OperationID(ctx), "GetOwnerManagerByGroupId failed ", err.Error(), req.GroupID) return } for _, v := range managerList { - groupNotification(constant.JoinGroupApplicationNotification, &JoinGroupApplicationTips, tools.OpUserID(ctx), "", v.UserID, tools.OperationID(ctx)) - log.NewInfo(tools.OperationID(ctx), "Notification ", v) + groupNotification(constant.JoinGroupApplicationNotification, &JoinGroupApplicationTips, utils.OpUserID(ctx), "", v.UserID, utils.OperationID(ctx)) + log.NewInfo(utils.OperationID(ctx), "Notification ", v) } } diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index bbeb289b8..1caebccd9 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -1,7 +1,6 @@ package msg import ( - utils2 "Open_IM/internal/utils" "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db" @@ -177,7 +176,7 @@ func (rpc *rpcChat) messageVerification(ctx context.Context, data *pbChat.SendMs return true, 0, "", nil } case constant.GroupChatType: - userIDList, err := utils2.GetGroupMemberUserIDList(ctx, data.MsgData.GroupID, data.OperationID) + userIDList, err := utils.GetGroupMemberUserIDList(ctx, data.MsgData.GroupID, data.OperationID) if err != nil { errMsg := data.OperationID + err.Error() log.NewError(data.OperationID, errMsg) @@ -251,7 +250,7 @@ func (rpc *rpcChat) messageVerification(ctx context.Context, data *pbChat.SendMs if groupInfo.GroupType == constant.SuperGroup { return true, 0, "", nil } else { - userIDList, err := utils2.GetGroupMemberUserIDList(ctx, data.MsgData.GroupID, data.OperationID) + userIDList, err := utils.GetGroupMemberUserIDList(ctx, data.MsgData.GroupID, data.OperationID) if err != nil { errMsg := data.OperationID + err.Error() log.NewError(data.OperationID, errMsg) diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 6edb04f42..2711c056c 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -9,7 +9,6 @@ import ( "Open_IM/pkg/common/log" promePkg "Open_IM/pkg/common/prometheus" "Open_IM/pkg/common/token_verify" - "Open_IM/pkg/common/tools" "Open_IM/pkg/getcdv3" pbFriend "Open_IM/pkg/proto/friend" pbGroup "Open_IM/pkg/proto/group" @@ -23,7 +22,6 @@ import ( grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - utils2 "Open_IM/internal/utils" "google.golang.org/grpc" ) @@ -173,7 +171,7 @@ func (s *userServer) GetUsersInfo(ctx context.Context, req *pbUser.GetUsersInfoR return nil, err } for _, v := range users { - n, err := utils2.NewDBUser(v).Convert() + n, err := utils.NewDBUser(v).Convert() if err != nil { return nil, err } @@ -196,7 +194,7 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI } oldNickname = u.Nickname } - user, err := utils2.NewPBUser(req.UserInfo).Convert() + user, err := utils.NewPBUser(req.UserInfo).Convert() if err != nil { return nil, err } @@ -216,16 +214,16 @@ func (s *userServer) UpdateUserInfo(ctx context.Context, req *pbUser.UpdateUserI } go func() { for _, v := range rpcResp.FriendInfoList { - chat.FriendInfoUpdatedNotification(tools.OperationID(ctx), req.UserInfo.UserID, v.FriendUser.UserID, tools.OpUserID(ctx)) + chat.FriendInfoUpdatedNotification(utils.OperationID(ctx), req.UserInfo.UserID, v.FriendUser.UserID, utils.OpUserID(ctx)) } }() - chat.UserInfoUpdatedNotification(tools.OperationID(ctx), tools.OpUserID(ctx), req.UserInfo.UserID) + chat.UserInfoUpdatedNotification(utils.OperationID(ctx), utils.OpUserID(ctx), req.UserInfo.UserID) if req.UserInfo.FaceURL != "" { - s.SyncJoinedGroupMemberFaceURL(ctx, req.UserInfo.UserID, req.UserInfo.FaceURL, tools.OperationID(ctx), tools.OpUserID(ctx)) + s.SyncJoinedGroupMemberFaceURL(ctx, req.UserInfo.UserID, req.UserInfo.FaceURL, utils.OperationID(ctx), utils.OpUserID(ctx)) } if req.UserInfo.Nickname != "" { - s.SyncJoinedGroupMemberNickname(ctx, req.UserInfo.UserID, req.UserInfo.Nickname, oldNickname, tools.OperationID(ctx), tools.OpUserID(ctx)) + s.SyncJoinedGroupMemberNickname(ctx, req.UserInfo.UserID, req.UserInfo.Nickname, oldNickname, utils.OperationID(ctx), utils.OpUserID(ctx)) } return &resp, nil } @@ -238,13 +236,13 @@ func (s *userServer) SetGlobalRecvMessageOpt(ctx context.Context, req *pbUser.Se if err != nil { return nil, err } - chat.UserInfoUpdatedNotification(tools.OperationID(ctx), req.UserID, req.UserID) + chat.UserInfoUpdatedNotification(utils.OperationID(ctx), req.UserID, req.UserID) return &resp, nil } func (s *userServer) AccountCheck(ctx context.Context, req *pbUser.AccountCheckReq) (*pbUser.AccountCheckResp, error) { resp := pbUser.AccountCheckResp{} - err := token_verify.CheckManagerUserID(ctx, tools.OpUserID(ctx)) + err := token_verify.CheckManagerUserID(ctx, utils.OpUserID(ctx)) if err != nil { return nil, err } @@ -279,7 +277,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb return nil, err } resp.Total = 1 - u1, err := utils2.NewDBUser(u).Convert() + u1, err := utils.NewDBUser(u).Convert() if err != nil { return nil, err } @@ -294,7 +292,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb } resp.Total = int32(total) for _, v := range usersDB { - u1, err := utils2.NewDBUser(v).Convert() + u1, err := utils.NewDBUser(v).Convert() if err != nil { return nil, err } @@ -308,7 +306,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb } resp.Total = int32(total) for _, v := range usersDB { - u1, err := utils2.NewDBUser(v).Convert() + u1, err := utils.NewDBUser(v).Convert() if err != nil { return nil, err } @@ -325,7 +323,7 @@ func (s *userServer) GetUsers(ctx context.Context, req *pbUser.GetUsersReq) (*pb resp.Total = int32(total) for _, userDB := range usersDB { - u, err := utils2.NewDBUser(userDB).Convert() + u, err := utils.NewDBUser(userDB).Convert() if err != nil { return nil, err } diff --git a/internal/utils/get_server_ip_test.go b/internal/utils/get_server_ip_test.go deleted file mode 100644 index d4b585bf7..000000000 --- a/internal/utils/get_server_ip_test.go +++ /dev/null @@ -1 +0,0 @@ -package utils diff --git a/internal/utils/utils.go b/internal/utils/utils.go deleted file mode 100644 index 73ebbf127..000000000 --- a/internal/utils/utils.go +++ /dev/null @@ -1,49 +0,0 @@ -package utils - -import ( - "encoding/json" - "github.com/golang/protobuf/jsonpb" - "github.com/golang/protobuf/proto" - "reflect" -) - -func JsonDataList(resp interface{}) []map[string]interface{} { - var list []proto.Message - if reflect.TypeOf(resp).Kind() == reflect.Slice { - s := reflect.ValueOf(resp) - for i := 0; i < s.Len(); i++ { - ele := s.Index(i) - list = append(list, ele.Interface().(proto.Message)) - } - } - - result := make([]map[string]interface{}, 0) - for _, v := range list { - m := ProtoToMap(v, false) - result = append(result, m) - } - return result -} - -func JsonDataOne(pb proto.Message) map[string]interface{} { - return ProtoToMap(pb, false) -} - -func ProtoToMap(pb proto.Message, idFix bool) map[string]interface{} { - marshaler := jsonpb.Marshaler{ - OrigName: true, - EnumsAsInts: false, - EmitDefaults: false, - } - - s, _ := marshaler.MarshalToString(pb) - out := make(map[string]interface{}) - json.Unmarshal([]byte(s), &out) - if idFix { - if _, ok := out["id"]; ok { - out["_id"] = out["id"] - delete(out, "id") - } - } - return out -} diff --git a/pkg/base_info/auth_api_struct.go b/pkg/api_struct/auth_api_struct.go similarity index 99% rename from pkg/base_info/auth_api_struct.go rename to pkg/api_struct/auth_api_struct.go index 93eebc2b5..e5b50730c 100644 --- a/pkg/base_info/auth_api_struct.go +++ b/pkg/api_struct/auth_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct //UserID string `protobuf:"bytes,1,opt,name=UserID" json:"UserID,omitempty"` // Nickname string `protobuf:"bytes,2,opt,name=Nickname" json:"Nickname,omitempty"` diff --git a/pkg/base_info/aws_api_struct.go b/pkg/api_struct/aws_api_struct.go similarity index 96% rename from pkg/base_info/aws_api_struct.go rename to pkg/api_struct/aws_api_struct.go index ebd26021e..0479080e4 100644 --- a/pkg/base_info/aws_api_struct.go +++ b/pkg/api_struct/aws_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct type AwsStorageCredentialReq struct { OperationID string `json:"operationID"` diff --git a/pkg/base_info/client_init.go b/pkg/api_struct/client_init.go similarity index 95% rename from pkg/base_info/client_init.go rename to pkg/api_struct/client_init.go index 47cfdcdea..4ceed6221 100644 --- a/pkg/base_info/client_init.go +++ b/pkg/api_struct/client_init.go @@ -1,4 +1,4 @@ -package base_info +package api_struct type SetClientInitConfigReq struct { OperationID string `json:"operationID" binding:"required"` diff --git a/pkg/base_info/common.go b/pkg/api_struct/common.go similarity index 93% rename from pkg/base_info/common.go rename to pkg/api_struct/common.go index a90a845a3..e17c6f036 100644 --- a/pkg/base_info/common.go +++ b/pkg/api_struct/common.go @@ -1,4 +1,4 @@ -package base_info +package api_struct type RequestPagination struct { PageNumber int `json:"pageNumber" binding:"required"` diff --git a/pkg/base_info/conversation_api_struct.go b/pkg/api_struct/conversation_api_struct.go similarity index 99% rename from pkg/base_info/conversation_api_struct.go rename to pkg/api_struct/conversation_api_struct.go index 08353e2ed..da4b5ced9 100644 --- a/pkg/base_info/conversation_api_struct.go +++ b/pkg/api_struct/conversation_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct type OptResult struct { ConversationID string `json:"conversationID"` diff --git a/pkg/base_info/cos_api_struct.go b/pkg/api_struct/cos_api_struct.go similarity index 95% rename from pkg/base_info/cos_api_struct.go rename to pkg/api_struct/cos_api_struct.go index e35931ad9..0c9e92a5b 100644 --- a/pkg/base_info/cos_api_struct.go +++ b/pkg/api_struct/cos_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct import sts "github.com/tencentyun/qcloud-cos-sts-sdk/go" diff --git a/pkg/base_info/friend_api_struct.go b/pkg/api_struct/friend_api_struct.go similarity index 99% rename from pkg/base_info/friend_api_struct.go rename to pkg/api_struct/friend_api_struct.go index 8c6da6b53..b89ba3208 100644 --- a/pkg/base_info/friend_api_struct.go +++ b/pkg/api_struct/friend_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct //type ParamsCommFriend struct { // OperationID string `json:"operationID" binding:"required"` diff --git a/pkg/base_info/group_api_struct.go b/pkg/api_struct/group_api_struct.go similarity index 99% rename from pkg/base_info/group_api_struct.go rename to pkg/api_struct/group_api_struct.go index e002ea203..b15458d79 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/api_struct/group_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct import ( open_im_sdk "Open_IM/pkg/proto/sdk_ws" diff --git a/pkg/base_info/manage_api_struct.go b/pkg/api_struct/manage_api_struct.go similarity index 99% rename from pkg/base_info/manage_api_struct.go rename to pkg/api_struct/manage_api_struct.go index 9837842fb..4e6c6977b 100644 --- a/pkg/base_info/manage_api_struct.go +++ b/pkg/api_struct/manage_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct import ( pbRelay "Open_IM/pkg/proto/relay" diff --git a/pkg/base_info/msg.go b/pkg/api_struct/msg.go similarity index 99% rename from pkg/base_info/msg.go rename to pkg/api_struct/msg.go index 5a7c7f538..6451f8542 100644 --- a/pkg/base_info/msg.go +++ b/pkg/api_struct/msg.go @@ -1,4 +1,4 @@ -package base_info +package api_struct import ( "Open_IM/pkg/proto/msg" diff --git a/pkg/base_info/office_struct.go b/pkg/api_struct/office_struct.go similarity index 99% rename from pkg/base_info/office_struct.go rename to pkg/api_struct/office_struct.go index 1e8e174bd..3eeb1ed3f 100644 --- a/pkg/base_info/office_struct.go +++ b/pkg/api_struct/office_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct import ( pbOffice "Open_IM/pkg/proto/office" diff --git a/pkg/base_info/organization_api_struct.go b/pkg/api_struct/organization_api_struct.go similarity index 99% rename from pkg/base_info/organization_api_struct.go rename to pkg/api_struct/organization_api_struct.go index 8daef2070..c6c1d8327 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/api_struct/organization_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct import open_im_sdk "Open_IM/pkg/proto/sdk_ws" diff --git a/pkg/base_info/oss_api_struct.go b/pkg/api_struct/oss_api_struct.go similarity index 96% rename from pkg/base_info/oss_api_struct.go rename to pkg/api_struct/oss_api_struct.go index 621d18820..9cbac79f8 100644 --- a/pkg/base_info/oss_api_struct.go +++ b/pkg/api_struct/oss_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct type OSSCredentialReq struct { OperationID string `json:"operationID"` diff --git a/pkg/base_info/pagination.go b/pkg/api_struct/pagination.go similarity index 88% rename from pkg/base_info/pagination.go rename to pkg/api_struct/pagination.go index d73725632..717664cb1 100644 --- a/pkg/base_info/pagination.go +++ b/pkg/api_struct/pagination.go @@ -1,4 +1,4 @@ -package base_info +package api_struct type Pagination struct { PageNumber int32 `json:"pageNumber" binding:"required"` diff --git a/pkg/base_info/public_struct.go b/pkg/api_struct/public_struct.go similarity index 99% rename from pkg/base_info/public_struct.go rename to pkg/api_struct/public_struct.go index ba7195d62..e5e8519bd 100644 --- a/pkg/base_info/public_struct.go +++ b/pkg/api_struct/public_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct import ( "net/http" diff --git a/pkg/base_info/super_group.go b/pkg/api_struct/super_group.go similarity index 92% rename from pkg/base_info/super_group.go rename to pkg/api_struct/super_group.go index 8ea24e014..449892e75 100644 --- a/pkg/base_info/super_group.go +++ b/pkg/api_struct/super_group.go @@ -1,4 +1,4 @@ -package base_info +package api_struct type GetJoinedSuperGroupListReq struct { GetJoinedGroupListReq diff --git a/pkg/base_info/swagger_example.go b/pkg/api_struct/swagger_example.go similarity index 93% rename from pkg/base_info/swagger_example.go rename to pkg/api_struct/swagger_example.go index b56f26276..8c5598614 100644 --- a/pkg/base_info/swagger_example.go +++ b/pkg/api_struct/swagger_example.go @@ -1,4 +1,4 @@ -package base_info +package api_struct type Swagger400Resp struct { ErrCode int32 `json:"errCode" example:"400"` diff --git a/pkg/base_info/third_api_struct.go b/pkg/api_struct/third_api_struct.go similarity index 99% rename from pkg/base_info/third_api_struct.go rename to pkg/api_struct/third_api_struct.go index 0f1480c12..258c19a42 100644 --- a/pkg/base_info/third_api_struct.go +++ b/pkg/api_struct/third_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct import "mime/multipart" diff --git a/pkg/base_info/user_api_struct.go b/pkg/api_struct/user_api_struct.go similarity index 98% rename from pkg/base_info/user_api_struct.go rename to pkg/api_struct/user_api_struct.go index 09e19bd6b..7cd165fbb 100644 --- a/pkg/base_info/user_api_struct.go +++ b/pkg/api_struct/user_api_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct import ( open_im_sdk "Open_IM/pkg/proto/sdk_ws" diff --git a/pkg/base_info/work_moments_struct.go b/pkg/api_struct/work_moments_struct.go similarity index 99% rename from pkg/base_info/work_moments_struct.go rename to pkg/api_struct/work_moments_struct.go index 1e09d849f..ce7fe59a4 100644 --- a/pkg/base_info/work_moments_struct.go +++ b/pkg/api_struct/work_moments_struct.go @@ -1,4 +1,4 @@ -package base_info +package api_struct import "Open_IM/pkg/proto/office" diff --git a/pkg/cms_api_struct/admin.go b/pkg/cms_struct/admin.go similarity index 93% rename from pkg/cms_api_struct/admin.go rename to pkg/cms_struct/admin.go index 0cde6c978..55e9f5bfa 100644 --- a/pkg/cms_api_struct/admin.go +++ b/pkg/cms_struct/admin.go @@ -1,7 +1,7 @@ -package cms_api_struct +package cms_struct import ( - "Open_IM/pkg/base_info" + "Open_IM/pkg/api_struct" server_api_params "Open_IM/pkg/proto/sdk_ws" ) @@ -47,10 +47,10 @@ type ReduceUserRegisterAddFriendIDListResponse struct { type GetUserRegisterAddFriendIDListRequest struct { OperationID string `json:"operationID" binding:"required"` - base_info.RequestPagination + api_struct.RequestPagination } type GetUserRegisterAddFriendIDListResponse struct { Users []*server_api_params.UserInfo `json:"users"` - base_info.ResponsePagination + api_struct.ResponsePagination } diff --git a/pkg/cms_api_struct/common.go b/pkg/cms_struct/common.go similarity index 91% rename from pkg/cms_api_struct/common.go rename to pkg/cms_struct/common.go index cbce2dfa3..264ec7942 100644 --- a/pkg/cms_api_struct/common.go +++ b/pkg/cms_struct/common.go @@ -1,4 +1,4 @@ -package cms_api_struct +package cms_struct type RequestPagination struct { PageNumber int `json:"pageNumber" binding:"required"` diff --git a/pkg/cms_api_struct/friend.go b/pkg/cms_struct/friend.go similarity index 96% rename from pkg/cms_api_struct/friend.go rename to pkg/cms_struct/friend.go index ce3af6ddc..40b8dd843 100644 --- a/pkg/cms_api_struct/friend.go +++ b/pkg/cms_struct/friend.go @@ -1,4 +1,4 @@ -package cms_api_struct +package cms_struct type GetFriendsReq struct { OperationID string `json:"operationID"` diff --git a/pkg/cms_api_struct/group.go b/pkg/cms_struct/group.go similarity index 99% rename from pkg/cms_api_struct/group.go rename to pkg/cms_struct/group.go index 00769e80f..8acd4d459 100644 --- a/pkg/cms_api_struct/group.go +++ b/pkg/cms_struct/group.go @@ -1,4 +1,4 @@ -package cms_api_struct +package cms_struct type GroupResponse struct { GroupOwnerName string `json:"GroupOwnerName"` diff --git a/pkg/cms_api_struct/message_cms.go b/pkg/cms_struct/message_cms.go similarity index 98% rename from pkg/cms_api_struct/message_cms.go rename to pkg/cms_struct/message_cms.go index c537ae228..27033e72f 100644 --- a/pkg/cms_api_struct/message_cms.go +++ b/pkg/cms_struct/message_cms.go @@ -1,4 +1,4 @@ -package cms_api_struct +package cms_struct import ( pbCommon "Open_IM/pkg/proto/sdk_ws" diff --git a/pkg/cms_api_struct/statistics.go b/pkg/cms_struct/statistics.go similarity index 99% rename from pkg/cms_api_struct/statistics.go rename to pkg/cms_struct/statistics.go index 0fd0eb76b..f1dc2b0c9 100644 --- a/pkg/cms_api_struct/statistics.go +++ b/pkg/cms_struct/statistics.go @@ -1,4 +1,4 @@ -package cms_api_struct +package cms_struct type GetStatisticsRequest struct { From string `json:"from" binding:"required"` diff --git a/pkg/cms_api_struct/user.go b/pkg/cms_struct/user.go similarity index 98% rename from pkg/cms_api_struct/user.go rename to pkg/cms_struct/user.go index 5390928d8..400514ac9 100644 --- a/pkg/cms_api_struct/user.go +++ b/pkg/cms_struct/user.go @@ -1,4 +1,4 @@ -package cms_api_struct +package cms_struct type UserResponse struct { FaceURL string `json:"faceURL"` diff --git a/pkg/common/callback/callback.go b/pkg/common/callback/callback.go index fa19e7961..3224f7853 100644 --- a/pkg/common/callback/callback.go +++ b/pkg/common/callback/callback.go @@ -10,11 +10,6 @@ func GetContent(msg *server_api_params.MsgData) string { if msg.ContentType >= constant.NotificationBegin && msg.ContentType <= constant.NotificationEnd { var tips server_api_params.TipsComm _ = proto.Unmarshal(msg.Content, &tips) - //marshaler := jsonpb.Marshaler{ - // OrigName: true, - // EnumsAsInts: false, - // EmitDefaults: false, - //} content := tips.JsonDetail return content } else { diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 9f65b75ed..9ee1b38e3 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -5,7 +5,6 @@ import ( "Open_IM/pkg/common/constant" commonDB "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" - "Open_IM/pkg/common/tools" "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" @@ -160,7 +159,7 @@ func CheckAccess(ctx context.Context, OpUserID string, OwnerUserID string) bool } func CheckAccessV3(ctx context.Context, ownerUserID string) (err error) { - opUserID := tools.OpUserID(ctx) + opUserID := utils.OpUserID(ctx) defer func() { tracelog.SetCtxInfo(ctx, utils.GetFuncName(1), err, "OpUserID", opUserID, "ownerUserID", ownerUserID) }() @@ -174,11 +173,11 @@ func CheckAccessV3(ctx context.Context, ownerUserID string) (err error) { } func IsAppManagerUid(ctx context.Context) bool { - return utils.IsContain(tools.OpUserID(ctx), config.Config.Manager.AppManagerUid) + return utils.IsContain(utils.OpUserID(ctx), config.Config.Manager.AppManagerUid) } func CheckAdmin(ctx context.Context) error { - if utils.IsContain(tools.OpUserID(ctx), config.Config.Manager.AppManagerUid) { + if utils.IsContain(utils.OpUserID(ctx), config.Config.Manager.AppManagerUid) { return nil } return constant.ErrIdentity.Wrap() diff --git a/pkg/common/tools/op.go b/pkg/common/tools/op.go deleted file mode 100644 index df901055a..000000000 --- a/pkg/common/tools/op.go +++ /dev/null @@ -1,13 +0,0 @@ -package tools - -import "context" - -func OperationID(ctx context.Context) string { - s, _ := ctx.Value("operationID").(string) - return s -} - -func OpUserID(ctx context.Context) string { - s, _ := ctx.Value("opUserID").(string) - return s -} diff --git a/pkg/common/tracelog/ctx.go b/pkg/common/tracelog/ctx.go index 98f241787..77a15da15 100644 --- a/pkg/common/tracelog/ctx.go +++ b/pkg/common/tracelog/ctx.go @@ -1,28 +1,20 @@ package tracelog import ( - "Open_IM/pkg/common/constant" "Open_IM/pkg/utils" "context" "github.com/sirupsen/logrus" - "google.golang.org/grpc/status" "runtime" "strings" //"errors" "fmt" "github.com/gin-gonic/gin" - "net/http" ) const TraceLogKey = "tracelog" func NewCtx(c *gin.Context, api string) context.Context { - req := &ApiInfo{ApiName: api, GinCtx: c, Funcs: &[]FuncInfo{}} - return context.WithValue(c, TraceLogKey, req) -} - -func NewCtx1(c *gin.Context, api string) context.Context { req := &ApiInfo{ApiName: api, GinCtx: c, OperationID: c.GetHeader("operationID"), Funcs: &[]FuncInfo{}} return context.WithValue(c, TraceLogKey, req) } @@ -42,77 +34,11 @@ func GetOperationID(ctx context.Context) string { return ctx.Value(TraceLogKey).(*ApiInfo).OperationID } -//func ShowLog(ctx context.Context) { -// t := ctx.Value(TraceLogKey).(*ApiInfo) -// if ctx.Value(TraceLogKey).(*ApiInfo).GinCtx != nil { -// log.Info(t.OperationID, "api: ", t.ApiName) -// } else { -// log.Info(t.OperationID, "rpc: ", t.ApiName) -// } -// for _, v := range *t.Funcs { -// if v.Err != nil { -// log.Error(t.OperationID, "func: ", v.FuncName, " args: ", v.Args, v.Err.Error()) -// } else { -// switch v.LogLevel { -// case logrus.InfoLevel: -// log.Info(t.OperationID, "func: ", v.FuncName, " args: ", v.Args) -// case logrus.DebugLevel: -// log.Debug(t.OperationID, "func: ", v.FuncName, " args: ", v.Args) -// case logrus.WarnLevel: -// log.Debug(t.OperationID, "func: ", v.FuncName, " args: ", v.Args) -// } -// } -// } -//} - -func WriteErrorResponse(ctx context.Context, funcName string, err error, args ...interface{}) { - SetCtxInfo(ctx, funcName, err, args) - e := Unwrap(err) - switch t := e.(type) { - case *constant.ErrInfo: - ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, baseResp{ErrCode: t.ErrCode, ErrMsg: t.ErrMsg, ErrDtl: t.DetailErrMsg}) - //ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, gin.H{"errCode": t.ErrCode, "errMsg": t.ErrMsg, "errDtl": t.DetailErrMsg}) - return - default: - s, ok := status.FromError(e) - if !ok { - ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, &baseResp{ErrCode: constant.ErrDefaultOther.ErrCode, ErrMsg: err.Error(), ErrDtl: fmt.Sprintf("%+v", err)}) - //ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, gin.H{"errCode": constant.ErrDefaultOther.ErrCode, "errMsg": err.Error(), "errDtl": fmt.Sprintf("%+v", err)}) - return - } - var details []string - if err != e { - details = append(details, fmt.Sprintf("%+v", err)) - } - for _, s := range s.Details() { - details = append(details, fmt.Sprintf("%+v", s)) - } - ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, &baseResp{ErrCode: int32(s.Code()), ErrMsg: s.Message(), ErrDtl: strings.Join(details, "\n")}) - //ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, gin.H{"errCode": s.Code(), "errMsg": s.Message(), "errDtl": strings.Join(details, "\n")}) - return - } +func GetOpUserID(ctx context.Context) string { + s, _ := ctx.Value("opUserID").(string) + return s } -type baseResp struct { - ErrCode int32 `json:"errCode"` - ErrMsg string `json:"errMsg"` - ErrDtl string `json:"errDtl"` - Data interface{} `json:"data"` -} - -//func WriteErrorResponse(ctx context.Context, funcName string, err error, args ...interface{}) { -// SetCtxInfo(ctx, funcName, err, args) -// e := new(constant.ErrInfo) -// switch { -// case errors.As(err, &e): -// ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, gin.H{"errCode": e.ErrCode, "errMsg": e.ErrMsg}) -// return -// default: -// ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, gin.H{"errCode": constant.ErrDefaultOther.ErrCode, "errMsg": constant.ErrDefaultOther.ErrMsg, "errDtl": err.Error()}) -// return -// } -//} - func Unwrap(err error) error { for err != nil { unwrap, ok := err.(interface { @@ -211,11 +137,6 @@ func SetRpcRespInfo(ctx context.Context, funcName string, resp string) { *t.Funcs = append(*t.Funcs, funcInfo) } -func SetSuccess(ctx context.Context, funcName string, data interface{}) { - SetCtxInfo(ctx, funcName, nil, "data", data) - ctx.Value(TraceLogKey).(*ApiInfo).GinCtx.JSON(http.StatusOK, gin.H{"errCode": 0, "errMsg": "", "errDtl": "", "data": data}) -} - func argsHandle(args []interface{}, fields map[string]interface{}) { for i := 0; i < len(args); i += 2 { if i+1 < len(args) { diff --git a/internal/utils/convert.go b/pkg/utils/convert.go similarity index 99% rename from internal/utils/convert.go rename to pkg/utils/convert.go index 1660219ae..5ed75c7a0 100644 --- a/internal/utils/convert.go +++ b/pkg/utils/convert.go @@ -3,7 +3,6 @@ package utils import ( "Open_IM/pkg/common/db/relation" sdk "Open_IM/pkg/proto/sdk_ws" - utils2 "Open_IM/pkg/utils" utils "github.com/OpenIMSDK/open_utils" "time" ) diff --git a/internal/utils/cors_middleware_test.go b/pkg/utils/cors_middleware_test.go similarity index 97% rename from internal/utils/cors_middleware_test.go rename to pkg/utils/cors_middleware_test.go index 248cc1ca0..0abfe3f3a 100644 --- a/internal/utils/cors_middleware_test.go +++ b/pkg/utils/cors_middleware_test.go @@ -1,7 +1,6 @@ package utils import ( - "Open_IM/pkg/utils" "net/http" "net/http/httptest" "testing" @@ -36,7 +35,7 @@ func performRequestWithHeaders(r http.Handler, method, origin string, header htt func newTestRouter() *gin.Engine { router := gin.New() - router.Use(utils.CorsHandler()) + router.Use(CorsHandler()) router.GET("/", func(c *gin.Context) { c.String(http.StatusOK, "get") }) diff --git a/internal/utils/id.go b/pkg/utils/id.go similarity index 100% rename from internal/utils/id.go rename to pkg/utils/id.go diff --git a/internal/utils/id_test.go b/pkg/utils/id_test.go similarity index 100% rename from internal/utils/id_test.go rename to pkg/utils/id_test.go diff --git a/internal/utils/image_test.go b/pkg/utils/image_test.go similarity index 53% rename from internal/utils/image_test.go rename to pkg/utils/image_test.go index ab328fbc4..f28cfc89d 100644 --- a/internal/utils/image_test.go +++ b/pkg/utils/image_test.go @@ -1,7 +1,6 @@ package utils import ( - "Open_IM/pkg/utils" "path/filepath" "runtime" "testing" @@ -17,12 +16,12 @@ var ( func Test_GenSmallImage(t *testing.T) { println(Root) - err := utils.GenSmallImage(Root+"/docs/open-im-logo.png", Root+"/out-test/open-im-logo-test.png") + err := GenSmallImage(Root+"/docs/open-im-logo.png", Root+"/out-test/open-im-logo-test.png") assert.Nil(t, err) - err = utils.GenSmallImage(Root+"/docs/open-im-logo.png", "out-test/open-im-logo-test.png") + err = GenSmallImage(Root+"/docs/open-im-logo.png", "out-test/open-im-logo-test.png") assert.Nil(t, err) - err = utils.GenSmallImage(Root+"/docs/Architecture.jpg", "out-test/Architecture-test.jpg") + err = GenSmallImage(Root+"/docs/Architecture.jpg", "out-test/Architecture-test.jpg") assert.Nil(t, err) } diff --git a/internal/utils/jwt_token_test.go b/pkg/utils/jwt_token_test.go similarity index 100% rename from internal/utils/jwt_token_test.go rename to pkg/utils/jwt_token_test.go diff --git a/internal/utils/local_cache.go b/pkg/utils/local_cache.go similarity index 94% rename from internal/utils/local_cache.go rename to pkg/utils/local_cache.go index 551563a73..6fc35a79e 100644 --- a/internal/utils/local_cache.go +++ b/pkg/utils/local_cache.go @@ -6,7 +6,6 @@ import ( "Open_IM/pkg/common/log" "Open_IM/pkg/getcdv3" pbCache "Open_IM/pkg/proto/cache" - "Open_IM/pkg/utils" "context" "errors" "sync" @@ -27,7 +26,7 @@ func GetGroupMemberUserIDList(ctx context.Context, groupID string, operationID s defer CacheGroupMtx.Unlock() delete(CacheGroupMemberUserIDList, groupID) log.Error(operationID, "GetGroupMemberUserIDListHashFromRemote failed ", err.Error(), groupID) - return nil, utils.Wrap(err, groupID) + return nil, Wrap(err, groupID) } CacheGroupMtx.Lock() @@ -48,7 +47,7 @@ func GetGroupMemberUserIDList(ctx context.Context, groupID string, operationID s memberUserIDListRemote, err := GetGroupMemberUserIDListFromRemote(groupID, operationID) if err != nil { log.Error(operationID, "GetGroupMemberUserIDListFromRemote failed ", err.Error(), groupID) - return nil, utils.Wrap(err, groupID) + return nil, Wrap(err, groupID) } CacheGroupMemberUserIDList[groupID] = &GroupMemberUserIDListHash{MemberListHash: groupHashRemote, UserIDList: memberUserIDListRemote} return memberUserIDListRemote, nil @@ -68,7 +67,7 @@ func GetGroupMemberUserIDListFromRemote(groupID string, operationID string) ([]s cacheResp, err := client.GetGroupMemberIDListFromCache(context.Background(), getGroupMemberIDListFromCacheReq) if err != nil { log.NewError(operationID, "GetGroupMemberIDListFromCache rpc call failed ", err.Error()) - return nil, utils.Wrap(err, "GetGroupMemberIDListFromCache rpc call failed") + return nil, Wrap(err, "GetGroupMemberIDListFromCache rpc call failed") } if cacheResp.CommonResp.ErrCode != 0 { errMsg := operationID + "GetGroupMemberIDListFromCache rpc logic call failed " + cacheResp.CommonResp.ErrMsg diff --git a/internal/utils/md5_test.go b/pkg/utils/md5_test.go similarity index 72% rename from internal/utils/md5_test.go rename to pkg/utils/md5_test.go index 4db7bd854..63eec8077 100644 --- a/internal/utils/md5_test.go +++ b/pkg/utils/md5_test.go @@ -1,16 +1,15 @@ package utils import ( - "Open_IM/pkg/utils" "testing" "github.com/stretchr/testify/assert" ) func Test_Md5(t *testing.T) { - result := utils.Md5("go") + result := Md5("go") assert.Equal(t, result, "34d1f91fb2e514b8576fab1a75a89a6b") - result2 := utils.Md5("go") + result2 := Md5("go") assert.Equal(t, result, result2) } diff --git a/internal/utils/platform_number_id_to_name_test.go b/pkg/utils/platform_number_id_to_name_test.go similarity index 100% rename from internal/utils/platform_number_id_to_name_test.go rename to pkg/utils/platform_number_id_to_name_test.go diff --git a/pkg/tools/retry/retry.go b/pkg/utils/retry/retry.go similarity index 100% rename from pkg/tools/retry/retry.go rename to pkg/utils/retry/retry.go diff --git a/pkg/tools/retry/stratey.go b/pkg/utils/retry/stratey.go similarity index 100% rename from pkg/tools/retry/stratey.go rename to pkg/utils/retry/stratey.go diff --git a/pkg/tools/splitter/tools.go b/pkg/utils/splitter/tools.go similarity index 100% rename from pkg/tools/splitter/tools.go rename to pkg/utils/splitter/tools.go diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 92db70379..de5e0eb5f 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -8,6 +8,7 @@ import ( "github.com/jinzhu/copier" "github.com/pkg/errors" "math/rand" + "reflect" "runtime" "strconv" "strings" @@ -166,6 +167,7 @@ func Map2Pb(m map[string]string) (pb proto.Message, err error) { } return pb, nil } + func Pb2Map(pb proto.Message) (map[string]interface{}, error) { _buffer := bytes.Buffer{} jsonbMarshaller := &jsonpb.Marshaler{ @@ -179,3 +181,44 @@ func Pb2Map(pb proto.Message) (map[string]interface{}, error) { err := json.Unmarshal(jsonCnt, &out) return out, err } + +func JsonDataList(resp interface{}) []map[string]interface{} { + var list []proto.Message + if reflect.TypeOf(resp).Kind() == reflect.Slice { + s := reflect.ValueOf(resp) + for i := 0; i < s.Len(); i++ { + ele := s.Index(i) + list = append(list, ele.Interface().(proto.Message)) + } + } + + result := make([]map[string]interface{}, 0) + for _, v := range list { + m := ProtoToMap(v, false) + result = append(result, m) + } + return result +} + +func JsonDataOne(pb proto.Message) map[string]interface{} { + return ProtoToMap(pb, false) +} + +func ProtoToMap(pb proto.Message, idFix bool) map[string]interface{} { + marshaler := jsonpb.Marshaler{ + OrigName: true, + EnumsAsInts: false, + EmitDefaults: false, + } + + s, _ := marshaler.MarshalToString(pb) + out := make(map[string]interface{}) + json.Unmarshal([]byte(s), &out) + if idFix { + if _, ok := out["id"]; ok { + out["_id"] = out["id"] + delete(out, "id") + } + } + return out +} From 5c99bdf14f2be27d14880615d43ab8ca46188e02 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Mon, 30 Jan 2023 15:41:30 +0800 Subject: [PATCH 2/6] 1 --- pkg/common/db/controller/group.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/common/db/controller/group.go b/pkg/common/db/controller/group.go index 176cbafd1..295698d93 100644 --- a/pkg/common/db/controller/group.go +++ b/pkg/common/db/controller/group.go @@ -158,13 +158,15 @@ func (g *GroupDataBase) FindGroupsByID(ctx context.Context, groupIDs []string) ( return g.cache.GetGroupsInfo(ctx, groupIDs) } -func (g *GroupDataBase) CreateGroup(ctx context.Context, groups []*relation.Group, groupMember []*relation.GroupMember) error { +func (g *GroupDataBase) CreateGroup(ctx context.Context, groups []*relation.Group, groupMembers []*relation.GroupMember) error { return g.db.Transaction(func(tx *gorm.DB) error { - if err := g.groupDB.Create(ctx, groups, tx); err != nil { - return err + if len(groups) > 0 { + if err := g.groupDB.Create(ctx, groups, tx); err != nil { + return err + } } - if len(groupMember) > 0 { - if err := g.groupMemberDB.Create(ctx, groupMember, tx); err != nil { + if len(groupMembers) > 0 { + if err := g.groupMemberDB.Create(ctx, groupMembers, tx); err != nil { return err } } From 1ba5cde0768cbb3e55e41f43ba813866c8e1dd83 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 Jan 2023 16:45:40 +0800 Subject: [PATCH 3/6] errcode --- cmd/open_im_api/docs/docs.go | 990 ++++++++++++------------ cmd/open_im_api/docs/swagger.json | 990 ++++++++++++------------ cmd/open_im_api/docs/swagger.yaml | 990 ++++++++++++------------ internal/cms_api/middleware/cors.go | 23 - internal/cms_api/middleware/jwt_auth.go | 32 - internal/cms_api/router.go | 5 - internal/cms_api/user/user.go | 145 +--- pkg/common/middleware/gin.go | 42 + pkg/utils/cors_middleware.go | 24 - pkg/utils/cors_middleware_test.go | 67 -- 10 files changed, 1528 insertions(+), 1780 deletions(-) delete mode 100644 internal/cms_api/middleware/cors.go delete mode 100644 internal/cms_api/middleware/jwt_auth.go delete mode 100644 pkg/utils/cors_middleware.go delete mode 100644 pkg/utils/cors_middleware_test.go diff --git a/cmd/open_im_api/docs/docs.go b/cmd/open_im_api/docs/docs.go index db9817fad..5d7cff87e 100644 --- a/cmd/open_im_api/docs/docs.go +++ b/cmd/open_im_api/docs/docs.go @@ -48,7 +48,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.ForceLogoutReq" + "$ref": "#/definitions/api_struct.ForceLogoutReq" } } ], @@ -56,19 +56,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.ForceLogoutResp" + "$ref": "#/definitions/api_struct.ForceLogoutResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -102,7 +102,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.ParseTokenReq" + "$ref": "#/definitions/api_struct.ParseTokenReq" } } ], @@ -112,13 +112,13 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ParseTokenResp" + "$ref": "#/definitions/api_struct.ParseTokenResp" }, { "type": "object", "properties": { "Data": { - "$ref": "#/definitions/base_info.ExpireTime" + "$ref": "#/definitions/api_struct.ExpireTime" } } } @@ -128,13 +128,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -161,7 +161,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UserRegisterReq" + "$ref": "#/definitions/api_struct.UserRegisterReq" } } ], @@ -169,19 +169,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UserRegisterResp" + "$ref": "#/definitions/api_struct.UserRegisterResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -208,7 +208,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UserTokenReq" + "$ref": "#/definitions/api_struct.UserTokenReq" } } ], @@ -216,19 +216,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UserTokenResp" + "$ref": "#/definitions/api_struct.UserTokenResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -262,7 +262,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.AddBlacklistReq" + "$ref": "#/definitions/api_struct.AddBlacklistReq" } } ], @@ -270,19 +270,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.AddBlacklistResp" + "$ref": "#/definitions/api_struct.AddBlacklistResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -316,7 +316,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.AddFriendReq" + "$ref": "#/definitions/api_struct.AddFriendReq" } } ], @@ -324,19 +324,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.AddFriendResp" + "$ref": "#/definitions/api_struct.AddFriendResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -370,7 +370,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.AddFriendResponseReq" + "$ref": "#/definitions/api_struct.AddFriendResponseReq" } } ], @@ -378,19 +378,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.AddFriendResponseResp" + "$ref": "#/definitions/api_struct.AddFriendResponseResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -424,7 +424,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteFriendReq" + "$ref": "#/definitions/api_struct.DeleteFriendReq" } } ], @@ -432,19 +432,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteFriendResp" + "$ref": "#/definitions/api_struct.DeleteFriendResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -478,7 +478,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetBlackListReq" + "$ref": "#/definitions/api_struct.GetBlackListReq" } } ], @@ -488,7 +488,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetBlackListResp" + "$ref": "#/definitions/api_struct.GetBlackListResp" }, { "type": "object", @@ -507,13 +507,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } } } @@ -547,7 +547,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetFriendApplyListReq" + "$ref": "#/definitions/api_struct.GetFriendApplyListReq" } } ], @@ -557,7 +557,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetFriendApplyListResp" + "$ref": "#/definitions/api_struct.GetFriendApplyListResp" }, { "type": "object", @@ -576,13 +576,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } } } @@ -616,7 +616,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetFriendListReq" + "$ref": "#/definitions/api_struct.GetFriendListReq" } } ], @@ -626,7 +626,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetFriendListResp" + "$ref": "#/definitions/api_struct.GetFriendListResp" }, { "type": "object", @@ -645,13 +645,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -685,7 +685,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetSelfApplyListReq" + "$ref": "#/definitions/api_struct.GetSelfApplyListReq" } } ], @@ -695,7 +695,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetSelfApplyListResp" + "$ref": "#/definitions/api_struct.GetSelfApplyListResp" }, { "type": "object", @@ -714,13 +714,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -754,7 +754,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.ImportFriendReq" + "$ref": "#/definitions/api_struct.ImportFriendReq" } } ], @@ -762,19 +762,19 @@ const docTemplate = `{ "0": { "description": "data列表中对象的result-1为添加该用户失败\u003cbr\u003e0为成功", "schema": { - "$ref": "#/definitions/base_info.ImportFriendResp" + "$ref": "#/definitions/api_struct.ImportFriendResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -808,7 +808,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.IsFriendReq" + "$ref": "#/definitions/api_struct.IsFriendReq" } } ], @@ -816,19 +816,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.IsFriendResp" + "$ref": "#/definitions/api_struct.IsFriendResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -862,7 +862,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.RemoveBlackListReq" + "$ref": "#/definitions/api_struct.RemoveBlackListReq" } } ], @@ -870,19 +870,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.RemoveBlackListResp" + "$ref": "#/definitions/api_struct.RemoveBlackListResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -916,7 +916,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SetFriendRemarkReq" + "$ref": "#/definitions/api_struct.SetFriendRemarkReq" } } ], @@ -924,19 +924,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SetFriendRemarkResp" + "$ref": "#/definitions/api_struct.SetFriendRemarkResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -970,7 +970,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CancelMuteGroupReq" + "$ref": "#/definitions/api_struct.CancelMuteGroupReq" } } ], @@ -978,19 +978,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CancelMuteGroupResp" + "$ref": "#/definitions/api_struct.CancelMuteGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1024,7 +1024,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CancelMuteGroupMemberReq" + "$ref": "#/definitions/api_struct.CancelMuteGroupMemberReq" } } ], @@ -1032,19 +1032,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CancelMuteGroupMemberResp" + "$ref": "#/definitions/api_struct.CancelMuteGroupMemberResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1078,7 +1078,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateGroupReq" + "$ref": "#/definitions/api_struct.CreateGroupReq" } } ], @@ -1088,7 +1088,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.CreateGroupResp" + "$ref": "#/definitions/api_struct.CreateGroupResp" }, { "type": "object", @@ -1104,13 +1104,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1144,7 +1144,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DismissGroupReq" + "$ref": "#/definitions/api_struct.DismissGroupReq" } } ], @@ -1152,19 +1152,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DismissGroupResp" + "$ref": "#/definitions/api_struct.DismissGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1198,7 +1198,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetGroupAllMemberReq" + "$ref": "#/definitions/api_struct.GetGroupAllMemberReq" } } ], @@ -1208,7 +1208,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetGroupAllMemberResp" + "$ref": "#/definitions/api_struct.GetGroupAllMemberResp" }, { "type": "object", @@ -1227,13 +1227,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1267,7 +1267,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetGroupMembersInfoReq" + "$ref": "#/definitions/api_struct.GetGroupMembersInfoReq" } } ], @@ -1277,7 +1277,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetGroupMembersInfoResp" + "$ref": "#/definitions/api_struct.GetGroupMembersInfoResp" }, { "type": "object", @@ -1296,13 +1296,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1336,7 +1336,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetGroupInfoReq" + "$ref": "#/definitions/api_struct.GetGroupInfoReq" } } ], @@ -1344,19 +1344,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetGroupInfoResp" + "$ref": "#/definitions/api_struct.GetGroupInfoResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1390,7 +1390,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetJoinedGroupListReq" + "$ref": "#/definitions/api_struct.GetJoinedGroupListReq" } } ], @@ -1400,7 +1400,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetJoinedGroupListResp" + "$ref": "#/definitions/api_struct.GetJoinedGroupListResp" }, { "type": "object", @@ -1419,13 +1419,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1459,7 +1459,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetGroupApplicationListReq" + "$ref": "#/definitions/api_struct.GetGroupApplicationListReq" } } ], @@ -1469,7 +1469,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetGroupApplicationListResp" + "$ref": "#/definitions/api_struct.GetGroupApplicationListResp" }, { "type": "object", @@ -1488,13 +1488,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1528,7 +1528,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserReqGroupApplicationListReq" + "$ref": "#/definitions/api_struct.GetUserReqGroupApplicationListReq" } } ], @@ -1538,7 +1538,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetGroupApplicationListResp" + "$ref": "#/definitions/api_struct.GetGroupApplicationListResp" }, { "type": "object", @@ -1557,13 +1557,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1597,7 +1597,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.ApplicationGroupResponseReq" + "$ref": "#/definitions/api_struct.ApplicationGroupResponseReq" } } ], @@ -1605,19 +1605,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.ApplicationGroupResponseResp" + "$ref": "#/definitions/api_struct.ApplicationGroupResponseResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1651,7 +1651,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.InviteUserToGroupReq" + "$ref": "#/definitions/api_struct.InviteUserToGroupReq" } } ], @@ -1659,19 +1659,19 @@ const docTemplate = `{ "0": { "description": "result为结果码, -1为失败, 0为成功", "schema": { - "$ref": "#/definitions/base_info.InviteUserToGroupResp" + "$ref": "#/definitions/api_struct.InviteUserToGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1705,7 +1705,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.JoinGroupReq" + "$ref": "#/definitions/api_struct.JoinGroupReq" } } ], @@ -1713,19 +1713,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.JoinGroupResp" + "$ref": "#/definitions/api_struct.JoinGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1759,7 +1759,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.KickGroupMemberReq" + "$ref": "#/definitions/api_struct.KickGroupMemberReq" } } ], @@ -1767,19 +1767,19 @@ const docTemplate = `{ "0": { "description": "result为结果码, -1为失败, 0为成功", "schema": { - "$ref": "#/definitions/base_info.KickGroupMemberResp" + "$ref": "#/definitions/api_struct.KickGroupMemberResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1813,7 +1813,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.MuteGroupReq" + "$ref": "#/definitions/api_struct.MuteGroupReq" } } ], @@ -1821,19 +1821,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.MuteGroupResp" + "$ref": "#/definitions/api_struct.MuteGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.MuteGroupResp" + "$ref": "#/definitions/api_struct.MuteGroupResp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.MuteGroupResp" + "$ref": "#/definitions/api_struct.MuteGroupResp" } } } @@ -1867,7 +1867,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.MuteGroupMemberReq" + "$ref": "#/definitions/api_struct.MuteGroupMemberReq" } } ], @@ -1875,19 +1875,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DismissGroupResp" + "$ref": "#/definitions/api_struct.DismissGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1921,7 +1921,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.QuitGroupReq" + "$ref": "#/definitions/api_struct.QuitGroupReq" } } ], @@ -1929,19 +1929,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.QuitGroupResp" + "$ref": "#/definitions/api_struct.QuitGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1975,7 +1975,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SetGroupInfoReq" + "$ref": "#/definitions/api_struct.SetGroupInfoReq" } } ], @@ -1983,19 +1983,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SetGroupInfoResp" + "$ref": "#/definitions/api_struct.SetGroupInfoResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2029,7 +2029,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SetGroupMemberInfoReq" + "$ref": "#/definitions/api_struct.SetGroupMemberInfoReq" } } ], @@ -2037,19 +2037,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SetGroupMemberInfoResp" + "$ref": "#/definitions/api_struct.SetGroupMemberInfoResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2083,7 +2083,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.TransferGroupOwnerReq" + "$ref": "#/definitions/api_struct.TransferGroupOwnerReq" } } ], @@ -2091,19 +2091,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.TransferGroupOwnerResp" + "$ref": "#/definitions/api_struct.TransferGroupOwnerResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2139,7 +2139,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ManagementBatchSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementBatchSendMsgReq" }, { "type": "object", @@ -2160,7 +2160,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ManagementSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementSendMsgReq" }, { "type": "object", @@ -2178,19 +2178,19 @@ const docTemplate = `{ "0": { "description": "serverMsgID为服务器消息ID \u003cbr\u003e clientMsgID为客户端消息ID \u003cbr\u003e sendTime为发送消息时间", "schema": { - "$ref": "#/definitions/base_info.ManagementBatchSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementBatchSendMsgReq" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.ManagementBatchSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementBatchSendMsgReq" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.ManagementBatchSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementBatchSendMsgReq" } } } @@ -2224,7 +2224,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CleanUpMsgReq" + "$ref": "#/definitions/api_struct.CleanUpMsgReq" } } ], @@ -2232,19 +2232,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CleanUpMsgResp" + "$ref": "#/definitions/api_struct.CleanUpMsgResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2278,7 +2278,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DelMsgReq" + "$ref": "#/definitions/api_struct.DelMsgReq" } } ], @@ -2286,19 +2286,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DelMsgResp" + "$ref": "#/definitions/api_struct.DelMsgResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2332,7 +2332,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetAllConversationsReq" + "$ref": "#/definitions/api_struct.GetAllConversationsReq" } } ], @@ -2340,19 +2340,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetAllConversationsResp" + "$ref": "#/definitions/api_struct.GetAllConversationsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2386,7 +2386,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetConversationReq" + "$ref": "#/definitions/api_struct.GetConversationReq" } } ], @@ -2394,19 +2394,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetConversationResp" + "$ref": "#/definitions/api_struct.GetConversationResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2440,7 +2440,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetConversationsReq" + "$ref": "#/definitions/api_struct.GetConversationsReq" } } ], @@ -2448,19 +2448,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetConversationsResp" + "$ref": "#/definitions/api_struct.GetConversationsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2496,7 +2496,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ManagementSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementSendMsgReq" }, { "type": "object", @@ -2517,7 +2517,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ManagementSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementSendMsgReq" }, { "type": "object", @@ -2538,7 +2538,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ManagementSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementSendMsgReq" }, { "type": "object", @@ -2556,19 +2556,19 @@ const docTemplate = `{ "0": { "description": "serverMsgID为服务器消息ID \u003cbr\u003e clientMsgID为客户端消息ID \u003cbr\u003e sendTime为发送消息时间", "schema": { - "$ref": "#/definitions/base_info.ManagementSendMsgResp" + "$ref": "#/definitions/api_struct.ManagementSendMsgResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.ManagementSendMsgResp" + "$ref": "#/definitions/api_struct.ManagementSendMsgResp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.ManagementSendMsgResp" + "$ref": "#/definitions/api_struct.ManagementSendMsgResp" } } } @@ -2602,7 +2602,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CommentOneWorkMomentReq" + "$ref": "#/definitions/api_struct.CommentOneWorkMomentReq" } } ], @@ -2610,19 +2610,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CommentOneWorkMomentResp" + "$ref": "#/definitions/api_struct.CommentOneWorkMomentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2656,7 +2656,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateOneWorkMomentReq" + "$ref": "#/definitions/api_struct.CreateOneWorkMomentReq" } } ], @@ -2664,19 +2664,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CreateOneWorkMomentResp" + "$ref": "#/definitions/api_struct.CreateOneWorkMomentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2710,7 +2710,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateTagReq" + "$ref": "#/definitions/api_struct.CreateTagReq" } } ], @@ -2718,19 +2718,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CreateTagResp" + "$ref": "#/definitions/api_struct.CreateTagResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2764,7 +2764,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteCommentReq" + "$ref": "#/definitions/api_struct.DeleteCommentReq" } } ], @@ -2772,19 +2772,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteCommentResp" + "$ref": "#/definitions/api_struct.DeleteCommentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2818,7 +2818,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteOneWorkMomentReq" + "$ref": "#/definitions/api_struct.DeleteOneWorkMomentReq" } } ], @@ -2826,19 +2826,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteOneWorkMomentResp" + "$ref": "#/definitions/api_struct.DeleteOneWorkMomentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2872,7 +2872,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteTagReq" + "$ref": "#/definitions/api_struct.DeleteTagReq" } } ], @@ -2880,19 +2880,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteTagResp" + "$ref": "#/definitions/api_struct.DeleteTagResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2926,7 +2926,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetTagSendLogsReq" + "$ref": "#/definitions/api_struct.GetTagSendLogsReq" } } ], @@ -2934,19 +2934,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetTagSendLogsResp" + "$ref": "#/definitions/api_struct.GetTagSendLogsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2980,7 +2980,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserFriendWorkMomentsReq" + "$ref": "#/definitions/api_struct.GetUserFriendWorkMomentsReq" } } ], @@ -2988,19 +2988,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetUserFriendWorkMomentsResp" + "$ref": "#/definitions/api_struct.GetUserFriendWorkMomentsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3034,7 +3034,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserTagByIDReq" + "$ref": "#/definitions/api_struct.GetUserTagByIDReq" } } ], @@ -3042,19 +3042,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetUserTagByIDResp" + "$ref": "#/definitions/api_struct.GetUserTagByIDResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3088,7 +3088,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserTagsReq" + "$ref": "#/definitions/api_struct.GetUserTagsReq" } } ], @@ -3096,19 +3096,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetUserTagsResp" + "$ref": "#/definitions/api_struct.GetUserTagsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3142,7 +3142,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserWorkMomentsReq" + "$ref": "#/definitions/api_struct.GetUserWorkMomentsReq" } } ], @@ -3150,19 +3150,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetUserWorkMomentsResp" + "$ref": "#/definitions/api_struct.GetUserWorkMomentsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3196,7 +3196,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetWorkMomentByIDReq" + "$ref": "#/definitions/api_struct.GetWorkMomentByIDReq" } } ], @@ -3204,19 +3204,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetWorkMomentByIDResp" + "$ref": "#/definitions/api_struct.GetWorkMomentByIDResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3250,7 +3250,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.LikeOneWorkMomentReq" + "$ref": "#/definitions/api_struct.LikeOneWorkMomentReq" } } ], @@ -3258,19 +3258,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.LikeOneWorkMomentResp" + "$ref": "#/definitions/api_struct.LikeOneWorkMomentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3304,7 +3304,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SendMsg2TagReq" + "$ref": "#/definitions/api_struct.SendMsg2TagReq" } } ], @@ -3312,19 +3312,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SendMsg2TagResp" + "$ref": "#/definitions/api_struct.SendMsg2TagResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3358,7 +3358,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SetTagReq" + "$ref": "#/definitions/api_struct.SetTagReq" } } ], @@ -3366,19 +3366,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SetTagResp" + "$ref": "#/definitions/api_struct.SetTagResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3412,7 +3412,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentReq" + "$ref": "#/definitions/api_struct.CreateDepartmentReq" } } ], @@ -3422,7 +3422,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.CreateDepartmentResp" + "$ref": "#/definitions/api_struct.CreateDepartmentResp" }, { "type": "object", @@ -3438,13 +3438,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3478,7 +3478,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentMemberReq" + "$ref": "#/definitions/api_struct.CreateDepartmentMemberReq" } } ], @@ -3486,19 +3486,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentMemberResp" + "$ref": "#/definitions/api_struct.CreateDepartmentMemberResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3532,7 +3532,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateOrganizationUserReq" + "$ref": "#/definitions/api_struct.CreateOrganizationUserReq" } } ], @@ -3540,19 +3540,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CreateOrganizationUserResp" + "$ref": "#/definitions/api_struct.CreateOrganizationUserResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3586,7 +3586,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteDepartmentReq" + "$ref": "#/definitions/api_struct.DeleteDepartmentReq" } } ], @@ -3594,19 +3594,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteDepartmentResp" + "$ref": "#/definitions/api_struct.DeleteDepartmentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3640,7 +3640,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteOrganizationUserReq" + "$ref": "#/definitions/api_struct.DeleteOrganizationUserReq" } } ], @@ -3648,19 +3648,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteOrganizationUserResp" + "$ref": "#/definitions/api_struct.DeleteOrganizationUserResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3694,7 +3694,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteUserInDepartmentReq" + "$ref": "#/definitions/api_struct.DeleteUserInDepartmentReq" } } ], @@ -3702,19 +3702,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteUserInDepartmentResp" + "$ref": "#/definitions/api_struct.DeleteUserInDepartmentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3748,7 +3748,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetDepartmentMemberReq" + "$ref": "#/definitions/api_struct.GetDepartmentMemberReq" } } ], @@ -3758,7 +3758,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetDepartmentMemberResp" + "$ref": "#/definitions/api_struct.GetDepartmentMemberResp" }, { "type": "object", @@ -3777,13 +3777,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3817,7 +3817,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetSubDepartmentReq" + "$ref": "#/definitions/api_struct.GetSubDepartmentReq" } } ], @@ -3827,7 +3827,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetSubDepartmentResp" + "$ref": "#/definitions/api_struct.GetSubDepartmentResp" }, { "type": "object", @@ -3846,13 +3846,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3886,7 +3886,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserInDepartmentReq" + "$ref": "#/definitions/api_struct.GetUserInDepartmentReq" } } ], @@ -3896,7 +3896,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetUserInDepartmentResp" + "$ref": "#/definitions/api_struct.GetUserInDepartmentResp" }, { "type": "object", @@ -3912,13 +3912,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3952,7 +3952,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UpdateDepartmentReq" + "$ref": "#/definitions/api_struct.UpdateDepartmentReq" } } ], @@ -3960,19 +3960,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UpdateDepartmentResp" + "$ref": "#/definitions/api_struct.UpdateDepartmentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4006,7 +4006,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UpdateOrganizationUserReq" + "$ref": "#/definitions/api_struct.UpdateOrganizationUserReq" } } ], @@ -4014,19 +4014,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UpdateOrganizationUserResp" + "$ref": "#/definitions/api_struct.UpdateOrganizationUserResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4060,7 +4060,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UpdateUserInDepartmentReq" + "$ref": "#/definitions/api_struct.UpdateUserInDepartmentReq" } } ], @@ -4068,19 +4068,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UpdateUserInDepartmentResp" + "$ref": "#/definitions/api_struct.UpdateUserInDepartmentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4134,19 +4134,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.MinioUploadFileResp" + "$ref": "#/definitions/api_struct.MinioUploadFileResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4180,7 +4180,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.AccountCheckReq" + "$ref": "#/definitions/api_struct.AccountCheckReq" } } ], @@ -4188,19 +4188,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.AccountCheckResp" + "$ref": "#/definitions/api_struct.AccountCheckResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4234,7 +4234,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetAllUsersUidReq" + "$ref": "#/definitions/api_struct.GetAllUsersUidReq" } } ], @@ -4242,19 +4242,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetAllUsersUidResp" + "$ref": "#/definitions/api_struct.GetAllUsersUidResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4288,7 +4288,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetSelfUserInfoReq" + "$ref": "#/definitions/api_struct.GetSelfUserInfoReq" } } ], @@ -4298,7 +4298,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetSelfUserInfoResp" + "$ref": "#/definitions/api_struct.GetSelfUserInfoResp" }, { "type": "object", @@ -4314,13 +4314,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4354,7 +4354,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUsersInfoReq" + "$ref": "#/definitions/api_struct.GetUsersInfoReq" } } ], @@ -4364,7 +4364,7 @@ const docTemplate = `{ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetUsersInfoResp" + "$ref": "#/definitions/api_struct.GetUsersInfoResp" }, { "type": "object", @@ -4383,13 +4383,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4423,7 +4423,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUsersOnlineStatusReq" + "$ref": "#/definitions/api_struct.GetUsersOnlineStatusReq" } } ], @@ -4431,19 +4431,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetUsersOnlineStatusResp" + "$ref": "#/definitions/api_struct.GetUsersOnlineStatusResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4477,7 +4477,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SetGlobalRecvMessageOptReq" + "$ref": "#/definitions/api_struct.SetGlobalRecvMessageOptReq" } } ], @@ -4485,19 +4485,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SetGlobalRecvMessageOptResp" + "$ref": "#/definitions/api_struct.SetGlobalRecvMessageOptResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4531,7 +4531,7 @@ const docTemplate = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UpdateSelfUserInfoReq" + "$ref": "#/definitions/api_struct.UpdateSelfUserInfoReq" } } ], @@ -4539,19 +4539,19 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UpdateUserInfoResp" + "$ref": "#/definitions/api_struct.UpdateUserInfoResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4745,7 +4745,7 @@ const docTemplate = `{ } } }, - "base_info.AccountCheckReq": { + "api_struct.AccountCheckReq": { "type": "object", "required": [ "checkUserIDList", @@ -4764,7 +4764,7 @@ const docTemplate = `{ } } }, - "base_info.AccountCheckResp": { + "api_struct.AccountCheckResp": { "type": "object", "properties": { "data": { @@ -4781,7 +4781,7 @@ const docTemplate = `{ } } }, - "base_info.AddBlacklistReq": { + "api_struct.AddBlacklistReq": { "type": "object", "required": [ "fromUserID", @@ -4800,7 +4800,7 @@ const docTemplate = `{ } } }, - "base_info.AddBlacklistResp": { + "api_struct.AddBlacklistResp": { "type": "object", "properties": { "errCode": { @@ -4811,7 +4811,7 @@ const docTemplate = `{ } } }, - "base_info.AddFriendReq": { + "api_struct.AddFriendReq": { "type": "object", "required": [ "fromUserID", @@ -4833,7 +4833,7 @@ const docTemplate = `{ } } }, - "base_info.AddFriendResp": { + "api_struct.AddFriendResp": { "type": "object", "properties": { "errCode": { @@ -4844,7 +4844,7 @@ const docTemplate = `{ } } }, - "base_info.AddFriendResponseReq": { + "api_struct.AddFriendResponseReq": { "type": "object", "required": [ "flag", @@ -4875,7 +4875,7 @@ const docTemplate = `{ } } }, - "base_info.AddFriendResponseResp": { + "api_struct.AddFriendResponseResp": { "type": "object", "properties": { "errCode": { @@ -4886,7 +4886,7 @@ const docTemplate = `{ } } }, - "base_info.ApplicationGroupResponseReq": { + "api_struct.ApplicationGroupResponseReq": { "type": "object", "required": [ "fromUserID", @@ -4917,7 +4917,7 @@ const docTemplate = `{ } } }, - "base_info.ApplicationGroupResponseResp": { + "api_struct.ApplicationGroupResponseResp": { "type": "object", "properties": { "errCode": { @@ -4928,7 +4928,7 @@ const docTemplate = `{ } } }, - "base_info.CancelMuteGroupMemberReq": { + "api_struct.CancelMuteGroupMemberReq": { "type": "object", "required": [ "groupID", @@ -4947,7 +4947,7 @@ const docTemplate = `{ } } }, - "base_info.CancelMuteGroupMemberResp": { + "api_struct.CancelMuteGroupMemberResp": { "type": "object", "properties": { "errCode": { @@ -4958,7 +4958,7 @@ const docTemplate = `{ } } }, - "base_info.CancelMuteGroupReq": { + "api_struct.CancelMuteGroupReq": { "type": "object", "required": [ "groupID", @@ -4973,7 +4973,7 @@ const docTemplate = `{ } } }, - "base_info.CancelMuteGroupResp": { + "api_struct.CancelMuteGroupResp": { "type": "object", "properties": { "errCode": { @@ -4984,7 +4984,7 @@ const docTemplate = `{ } } }, - "base_info.CleanUpMsgReq": { + "api_struct.CleanUpMsgReq": { "type": "object", "required": [ "operationID", @@ -4999,7 +4999,7 @@ const docTemplate = `{ } } }, - "base_info.CleanUpMsgResp": { + "api_struct.CleanUpMsgResp": { "type": "object", "properties": { "errCode": { @@ -5010,7 +5010,7 @@ const docTemplate = `{ } } }, - "base_info.Comment": { + "api_struct.Comment": { "type": "object", "properties": { "content": { @@ -5036,7 +5036,7 @@ const docTemplate = `{ } } }, - "base_info.CommentOneWorkMomentReq": { + "api_struct.CommentOneWorkMomentReq": { "type": "object", "required": [ "content", @@ -5058,7 +5058,7 @@ const docTemplate = `{ } } }, - "base_info.CommentOneWorkMomentResp": { + "api_struct.CommentOneWorkMomentResp": { "type": "object", "properties": { "data": { @@ -5072,7 +5072,7 @@ const docTemplate = `{ } } }, - "base_info.Conversation": { + "api_struct.Conversation": { "type": "object", "required": [ "conversationID", @@ -5129,7 +5129,7 @@ const docTemplate = `{ } } }, - "base_info.CreateDepartmentMemberReq": { + "api_struct.CreateDepartmentMemberReq": { "type": "object", "required": [ "operationID" @@ -5161,7 +5161,7 @@ const docTemplate = `{ } } }, - "base_info.CreateDepartmentMemberResp": { + "api_struct.CreateDepartmentMemberResp": { "type": "object", "properties": { "errCode": { @@ -5172,7 +5172,7 @@ const docTemplate = `{ } } }, - "base_info.CreateDepartmentReq": { + "api_struct.CreateDepartmentReq": { "type": "object", "required": [ "operationID" @@ -5213,7 +5213,7 @@ const docTemplate = `{ } } }, - "base_info.CreateDepartmentResp": { + "api_struct.CreateDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -5224,7 +5224,7 @@ const docTemplate = `{ } } }, - "base_info.CreateGroupReq": { + "api_struct.CreateGroupReq": { "type": "object", "required": [ "operationID" @@ -5251,7 +5251,7 @@ const docTemplate = `{ "memberList": { "type": "array", "items": { - "$ref": "#/definitions/base_info.GroupAddMemberInfo" + "$ref": "#/definitions/api_struct.GroupAddMemberInfo" } }, "notification": { @@ -5265,7 +5265,7 @@ const docTemplate = `{ } } }, - "base_info.CreateGroupResp": { + "api_struct.CreateGroupResp": { "type": "object", "properties": { "errCode": { @@ -5276,7 +5276,7 @@ const docTemplate = `{ } } }, - "base_info.CreateOneWorkMomentReq": { + "api_struct.CreateOneWorkMomentReq": { "type": "object", "properties": { "operationID": { @@ -5287,7 +5287,7 @@ const docTemplate = `{ } } }, - "base_info.CreateOneWorkMomentResp": { + "api_struct.CreateOneWorkMomentResp": { "type": "object", "properties": { "data": { @@ -5301,7 +5301,7 @@ const docTemplate = `{ } } }, - "base_info.CreateOrganizationUserReq": { + "api_struct.CreateOrganizationUserReq": { "type": "object", "required": [ "operationID" @@ -5345,7 +5345,7 @@ const docTemplate = `{ } } }, - "base_info.CreateOrganizationUserResp": { + "api_struct.CreateOrganizationUserResp": { "type": "object", "properties": { "errCode": { @@ -5356,7 +5356,7 @@ const docTemplate = `{ } } }, - "base_info.CreateTagReq": { + "api_struct.CreateTagReq": { "type": "object", "required": [ "operationID", @@ -5380,7 +5380,7 @@ const docTemplate = `{ } } }, - "base_info.CreateTagResp": { + "api_struct.CreateTagResp": { "type": "object", "properties": { "errCode": { @@ -5391,7 +5391,7 @@ const docTemplate = `{ } } }, - "base_info.DelMsgReq": { + "api_struct.DelMsgReq": { "type": "object", "required": [ "operationID", @@ -5413,7 +5413,7 @@ const docTemplate = `{ } } }, - "base_info.DelMsgResp": { + "api_struct.DelMsgResp": { "type": "object", "properties": { "errCode": { @@ -5424,7 +5424,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteCommentReq": { + "api_struct.DeleteCommentReq": { "type": "object", "required": [ "contentID", @@ -5443,7 +5443,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteCommentResp": { + "api_struct.DeleteCommentResp": { "type": "object", "properties": { "data": { @@ -5457,7 +5457,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteDepartmentReq": { + "api_struct.DeleteDepartmentReq": { "type": "object", "required": [ "departmentID", @@ -5472,7 +5472,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteDepartmentResp": { + "api_struct.DeleteDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -5483,7 +5483,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteFriendReq": { + "api_struct.DeleteFriendReq": { "type": "object", "required": [ "fromUserID", @@ -5502,7 +5502,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteFriendResp": { + "api_struct.DeleteFriendResp": { "type": "object", "properties": { "errCode": { @@ -5513,7 +5513,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteOneWorkMomentReq": { + "api_struct.DeleteOneWorkMomentReq": { "type": "object", "required": [ "operationID", @@ -5528,7 +5528,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteOneWorkMomentResp": { + "api_struct.DeleteOneWorkMomentResp": { "type": "object", "properties": { "data": { @@ -5542,7 +5542,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteOrganizationUserReq": { + "api_struct.DeleteOrganizationUserReq": { "type": "object", "required": [ "operationID", @@ -5557,7 +5557,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteOrganizationUserResp": { + "api_struct.DeleteOrganizationUserResp": { "type": "object", "properties": { "errCode": { @@ -5568,7 +5568,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteTagReq": { + "api_struct.DeleteTagReq": { "type": "object", "required": [ "operationID", @@ -5583,7 +5583,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteTagResp": { + "api_struct.DeleteTagResp": { "type": "object", "properties": { "errCode": { @@ -5594,7 +5594,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteUserInDepartmentReq": { + "api_struct.DeleteUserInDepartmentReq": { "type": "object", "required": [ "departmentID", @@ -5613,7 +5613,7 @@ const docTemplate = `{ } } }, - "base_info.DeleteUserInDepartmentResp": { + "api_struct.DeleteUserInDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -5624,7 +5624,7 @@ const docTemplate = `{ } } }, - "base_info.DismissGroupReq": { + "api_struct.DismissGroupReq": { "type": "object", "required": [ "groupID", @@ -5639,7 +5639,7 @@ const docTemplate = `{ } } }, - "base_info.DismissGroupResp": { + "api_struct.DismissGroupResp": { "type": "object", "properties": { "errCode": { @@ -5650,7 +5650,7 @@ const docTemplate = `{ } } }, - "base_info.ExpireTime": { + "api_struct.ExpireTime": { "type": "object", "properties": { "expireTimeSeconds": { @@ -5658,7 +5658,7 @@ const docTemplate = `{ } } }, - "base_info.ForceLogoutReq": { + "api_struct.ForceLogoutReq": { "type": "object", "required": [ "fromUserID", @@ -5681,7 +5681,7 @@ const docTemplate = `{ } } }, - "base_info.ForceLogoutResp": { + "api_struct.ForceLogoutResp": { "type": "object", "properties": { "errCode": { @@ -5692,7 +5692,7 @@ const docTemplate = `{ } } }, - "base_info.GetAllConversationsReq": { + "api_struct.GetAllConversationsReq": { "type": "object", "required": [ "operationID", @@ -5707,13 +5707,13 @@ const docTemplate = `{ } } }, - "base_info.GetAllConversationsResp": { + "api_struct.GetAllConversationsResp": { "type": "object", "properties": { "data": { "type": "array", "items": { - "$ref": "#/definitions/base_info.Conversation" + "$ref": "#/definitions/api_struct.Conversation" } }, "errCode": { @@ -5724,7 +5724,7 @@ const docTemplate = `{ } } }, - "base_info.GetAllUsersUidReq": { + "api_struct.GetAllUsersUidReq": { "type": "object", "required": [ "operationID" @@ -5735,7 +5735,7 @@ const docTemplate = `{ } } }, - "base_info.GetAllUsersUidResp": { + "api_struct.GetAllUsersUidResp": { "type": "object", "properties": { "data": { @@ -5752,7 +5752,7 @@ const docTemplate = `{ } } }, - "base_info.GetBlackListReq": { + "api_struct.GetBlackListReq": { "type": "object", "required": [ "fromUserID", @@ -5767,7 +5767,7 @@ const docTemplate = `{ } } }, - "base_info.GetBlackListResp": { + "api_struct.GetBlackListResp": { "type": "object", "properties": { "errCode": { @@ -5778,7 +5778,7 @@ const docTemplate = `{ } } }, - "base_info.GetConversationReq": { + "api_struct.GetConversationReq": { "type": "object", "required": [ "conversationID", @@ -5797,11 +5797,11 @@ const docTemplate = `{ } } }, - "base_info.GetConversationResp": { + "api_struct.GetConversationResp": { "type": "object", "properties": { "data": { - "$ref": "#/definitions/base_info.Conversation" + "$ref": "#/definitions/api_struct.Conversation" }, "errCode": { "type": "integer" @@ -5811,7 +5811,7 @@ const docTemplate = `{ } } }, - "base_info.GetConversationsReq": { + "api_struct.GetConversationsReq": { "type": "object", "required": [ "conversationIDs", @@ -5833,13 +5833,13 @@ const docTemplate = `{ } } }, - "base_info.GetConversationsResp": { + "api_struct.GetConversationsResp": { "type": "object", "properties": { "data": { "type": "array", "items": { - "$ref": "#/definitions/base_info.Conversation" + "$ref": "#/definitions/api_struct.Conversation" } }, "errCode": { @@ -5850,7 +5850,7 @@ const docTemplate = `{ } } }, - "base_info.GetDepartmentMemberReq": { + "api_struct.GetDepartmentMemberReq": { "type": "object", "required": [ "departmentID", @@ -5865,7 +5865,7 @@ const docTemplate = `{ } } }, - "base_info.GetDepartmentMemberResp": { + "api_struct.GetDepartmentMemberResp": { "type": "object", "properties": { "errCode": { @@ -5876,7 +5876,7 @@ const docTemplate = `{ } } }, - "base_info.GetFriendApplyListReq": { + "api_struct.GetFriendApplyListReq": { "type": "object", "required": [ "fromUserID", @@ -5891,7 +5891,7 @@ const docTemplate = `{ } } }, - "base_info.GetFriendApplyListResp": { + "api_struct.GetFriendApplyListResp": { "type": "object", "properties": { "errCode": { @@ -5902,7 +5902,7 @@ const docTemplate = `{ } } }, - "base_info.GetFriendListReq": { + "api_struct.GetFriendListReq": { "type": "object", "required": [ "fromUserID", @@ -5917,7 +5917,7 @@ const docTemplate = `{ } } }, - "base_info.GetFriendListResp": { + "api_struct.GetFriendListResp": { "type": "object", "properties": { "errCode": { @@ -5928,7 +5928,7 @@ const docTemplate = `{ } } }, - "base_info.GetGroupAllMemberReq": { + "api_struct.GetGroupAllMemberReq": { "type": "object", "required": [ "count", @@ -5951,7 +5951,7 @@ const docTemplate = `{ } } }, - "base_info.GetGroupAllMemberResp": { + "api_struct.GetGroupAllMemberResp": { "type": "object", "properties": { "errCode": { @@ -5962,7 +5962,7 @@ const docTemplate = `{ } } }, - "base_info.GetGroupApplicationListReq": { + "api_struct.GetGroupApplicationListReq": { "type": "object", "required": [ "fromUserID", @@ -5978,7 +5978,7 @@ const docTemplate = `{ } } }, - "base_info.GetGroupApplicationListResp": { + "api_struct.GetGroupApplicationListResp": { "type": "object", "properties": { "errCode": { @@ -5989,7 +5989,7 @@ const docTemplate = `{ } } }, - "base_info.GetGroupInfoReq": { + "api_struct.GetGroupInfoReq": { "type": "object", "required": [ "groupIDList", @@ -6007,7 +6007,7 @@ const docTemplate = `{ } } }, - "base_info.GetGroupInfoResp": { + "api_struct.GetGroupInfoResp": { "type": "object", "properties": { "errCode": { @@ -6018,7 +6018,7 @@ const docTemplate = `{ } } }, - "base_info.GetGroupMembersInfoReq": { + "api_struct.GetGroupMembersInfoReq": { "type": "object", "required": [ "groupID", @@ -6040,7 +6040,7 @@ const docTemplate = `{ } } }, - "base_info.GetGroupMembersInfoResp": { + "api_struct.GetGroupMembersInfoResp": { "type": "object", "properties": { "errCode": { @@ -6051,7 +6051,7 @@ const docTemplate = `{ } } }, - "base_info.GetJoinedGroupListReq": { + "api_struct.GetJoinedGroupListReq": { "type": "object", "required": [ "fromUserID", @@ -6066,7 +6066,7 @@ const docTemplate = `{ } } }, - "base_info.GetJoinedGroupListResp": { + "api_struct.GetJoinedGroupListResp": { "type": "object", "properties": { "errCode": { @@ -6077,7 +6077,7 @@ const docTemplate = `{ } } }, - "base_info.GetSelfApplyListReq": { + "api_struct.GetSelfApplyListReq": { "type": "object", "required": [ "fromUserID", @@ -6092,7 +6092,7 @@ const docTemplate = `{ } } }, - "base_info.GetSelfApplyListResp": { + "api_struct.GetSelfApplyListResp": { "type": "object", "properties": { "errCode": { @@ -6103,7 +6103,7 @@ const docTemplate = `{ } } }, - "base_info.GetSelfUserInfoReq": { + "api_struct.GetSelfUserInfoReq": { "type": "object", "required": [ "operationID", @@ -6118,7 +6118,7 @@ const docTemplate = `{ } } }, - "base_info.GetSelfUserInfoResp": { + "api_struct.GetSelfUserInfoResp": { "type": "object", "properties": { "errCode": { @@ -6129,7 +6129,7 @@ const docTemplate = `{ } } }, - "base_info.GetSubDepartmentReq": { + "api_struct.GetSubDepartmentReq": { "type": "object", "required": [ "departmentID", @@ -6144,7 +6144,7 @@ const docTemplate = `{ } } }, - "base_info.GetSubDepartmentResp": { + "api_struct.GetSubDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -6155,7 +6155,7 @@ const docTemplate = `{ } } }, - "base_info.GetTagSendLogsReq": { + "api_struct.GetTagSendLogsReq": { "type": "object", "required": [ "operationID", @@ -6174,7 +6174,7 @@ const docTemplate = `{ } } }, - "base_info.GetTagSendLogsResp": { + "api_struct.GetTagSendLogsResp": { "type": "object", "properties": { "data": { @@ -6202,7 +6202,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserFriendWorkMomentsReq": { + "api_struct.GetUserFriendWorkMomentsReq": { "type": "object", "required": [ "operationID", @@ -6221,7 +6221,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserFriendWorkMomentsResp": { + "api_struct.GetUserFriendWorkMomentsResp": { "type": "object", "properties": { "data": { @@ -6236,7 +6236,7 @@ const docTemplate = `{ "workMoments": { "type": "array", "items": { - "$ref": "#/definitions/base_info.WorkMoment" + "$ref": "#/definitions/api_struct.WorkMoment" } } } @@ -6249,7 +6249,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserInDepartmentReq": { + "api_struct.GetUserInDepartmentReq": { "type": "object", "required": [ "operationID", @@ -6264,7 +6264,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserInDepartmentResp": { + "api_struct.GetUserInDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -6275,7 +6275,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserReqGroupApplicationListReq": { + "api_struct.GetUserReqGroupApplicationListReq": { "type": "object", "required": [ "operationID", @@ -6290,7 +6290,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserTagByIDReq": { + "api_struct.GetUserTagByIDReq": { "type": "object", "required": [ "operationID", @@ -6305,7 +6305,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserTagByIDResp": { + "api_struct.GetUserTagByIDResp": { "type": "object", "properties": { "data": { @@ -6324,7 +6324,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserTagsReq": { + "api_struct.GetUserTagsReq": { "type": "object", "required": [ "operationID" @@ -6335,7 +6335,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserTagsResp": { + "api_struct.GetUserTagsResp": { "type": "object", "properties": { "data": { @@ -6357,7 +6357,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserWorkMomentsReq": { + "api_struct.GetUserWorkMomentsReq": { "type": "object", "required": [ "operationID", @@ -6379,7 +6379,7 @@ const docTemplate = `{ } } }, - "base_info.GetUserWorkMomentsResp": { + "api_struct.GetUserWorkMomentsResp": { "type": "object", "properties": { "data": { @@ -6394,7 +6394,7 @@ const docTemplate = `{ "workMoments": { "type": "array", "items": { - "$ref": "#/definitions/base_info.WorkMoment" + "$ref": "#/definitions/api_struct.WorkMoment" } } } @@ -6407,7 +6407,7 @@ const docTemplate = `{ } } }, - "base_info.GetUsersInfoReq": { + "api_struct.GetUsersInfoReq": { "type": "object", "required": [ "operationID", @@ -6425,7 +6425,7 @@ const docTemplate = `{ } } }, - "base_info.GetUsersInfoResp": { + "api_struct.GetUsersInfoResp": { "type": "object", "properties": { "errCode": { @@ -6436,7 +6436,7 @@ const docTemplate = `{ } } }, - "base_info.GetUsersOnlineStatusReq": { + "api_struct.GetUsersOnlineStatusReq": { "type": "object", "required": [ "operationID", @@ -6455,7 +6455,7 @@ const docTemplate = `{ } } }, - "base_info.GetUsersOnlineStatusResp": { + "api_struct.GetUsersOnlineStatusResp": { "type": "object", "properties": { "data": { @@ -6472,7 +6472,7 @@ const docTemplate = `{ } } }, - "base_info.GetWorkMomentByIDReq": { + "api_struct.GetWorkMomentByIDReq": { "type": "object", "required": [ "operationID", @@ -6487,14 +6487,14 @@ const docTemplate = `{ } } }, - "base_info.GetWorkMomentByIDResp": { + "api_struct.GetWorkMomentByIDResp": { "type": "object", "properties": { "data": { "type": "object", "properties": { "workMoment": { - "$ref": "#/definitions/base_info.WorkMoment" + "$ref": "#/definitions/api_struct.WorkMoment" } } }, @@ -6506,7 +6506,7 @@ const docTemplate = `{ } } }, - "base_info.GroupAddMemberInfo": { + "api_struct.GroupAddMemberInfo": { "type": "object", "required": [ "roleLevel", @@ -6525,7 +6525,7 @@ const docTemplate = `{ } } }, - "base_info.ImportFriendReq": { + "api_struct.ImportFriendReq": { "type": "object", "required": [ "friendUserIDList", @@ -6547,13 +6547,13 @@ const docTemplate = `{ } } }, - "base_info.ImportFriendResp": { + "api_struct.ImportFriendResp": { "type": "object", "properties": { "data": { "type": "array", "items": { - "$ref": "#/definitions/base_info.UserIDResult" + "$ref": "#/definitions/api_struct.UserIDResult" } }, "errCode": { @@ -6564,7 +6564,7 @@ const docTemplate = `{ } } }, - "base_info.InviteUserToGroupReq": { + "api_struct.InviteUserToGroupReq": { "type": "object", "required": [ "groupID", @@ -6589,13 +6589,13 @@ const docTemplate = `{ } } }, - "base_info.InviteUserToGroupResp": { + "api_struct.InviteUserToGroupResp": { "type": "object", "properties": { "data": { "type": "array", "items": { - "$ref": "#/definitions/base_info.UserIDResult" + "$ref": "#/definitions/api_struct.UserIDResult" } }, "errCode": { @@ -6606,7 +6606,7 @@ const docTemplate = `{ } } }, - "base_info.IsFriendReq": { + "api_struct.IsFriendReq": { "type": "object", "required": [ "fromUserID", @@ -6625,11 +6625,11 @@ const docTemplate = `{ } } }, - "base_info.IsFriendResp": { + "api_struct.IsFriendResp": { "type": "object", "properties": { "data": { - "$ref": "#/definitions/base_info.Response" + "$ref": "#/definitions/api_struct.Response" }, "errCode": { "type": "integer" @@ -6639,7 +6639,7 @@ const docTemplate = `{ } } }, - "base_info.JoinGroupReq": { + "api_struct.JoinGroupReq": { "type": "object", "required": [ "groupID", @@ -6663,7 +6663,7 @@ const docTemplate = `{ } } }, - "base_info.JoinGroupResp": { + "api_struct.JoinGroupResp": { "type": "object", "properties": { "errCode": { @@ -6674,7 +6674,7 @@ const docTemplate = `{ } } }, - "base_info.KickGroupMemberReq": { + "api_struct.KickGroupMemberReq": { "type": "object", "required": [ "groupID", @@ -6699,13 +6699,13 @@ const docTemplate = `{ } } }, - "base_info.KickGroupMemberResp": { + "api_struct.KickGroupMemberResp": { "type": "object", "properties": { "data": { "type": "array", "items": { - "$ref": "#/definitions/base_info.UserIDResult" + "$ref": "#/definitions/api_struct.UserIDResult" } }, "errCode": { @@ -6716,7 +6716,7 @@ const docTemplate = `{ } } }, - "base_info.LikeOneWorkMomentReq": { + "api_struct.LikeOneWorkMomentReq": { "type": "object", "required": [ "operationID", @@ -6731,7 +6731,7 @@ const docTemplate = `{ } } }, - "base_info.LikeOneWorkMomentResp": { + "api_struct.LikeOneWorkMomentResp": { "type": "object", "properties": { "data": { @@ -6745,7 +6745,7 @@ const docTemplate = `{ } } }, - "base_info.ManagementBatchSendMsgReq": { + "api_struct.ManagementBatchSendMsgReq": { "type": "object", "required": [ "contentType", @@ -6798,7 +6798,7 @@ const docTemplate = `{ } } }, - "base_info.ManagementSendMsgReq": { + "api_struct.ManagementSendMsgReq": { "type": "object", "required": [ "contentType", @@ -6848,7 +6848,7 @@ const docTemplate = `{ } } }, - "base_info.ManagementSendMsgResp": { + "api_struct.ManagementSendMsgResp": { "type": "object", "properties": { "data": { @@ -6862,7 +6862,7 @@ const docTemplate = `{ } } }, - "base_info.MinioUploadFileResp": { + "api_struct.MinioUploadFileResp": { "type": "object", "properties": { "data": { @@ -6890,7 +6890,7 @@ const docTemplate = `{ } } }, - "base_info.MuteGroupMemberReq": { + "api_struct.MuteGroupMemberReq": { "type": "object", "required": [ "groupID", @@ -6913,7 +6913,7 @@ const docTemplate = `{ } } }, - "base_info.MuteGroupReq": { + "api_struct.MuteGroupReq": { "type": "object", "required": [ "groupID", @@ -6928,7 +6928,7 @@ const docTemplate = `{ } } }, - "base_info.MuteGroupResp": { + "api_struct.MuteGroupResp": { "type": "object", "properties": { "errCode": { @@ -6939,7 +6939,7 @@ const docTemplate = `{ } } }, - "base_info.ParseTokenReq": { + "api_struct.ParseTokenReq": { "type": "object", "required": [ "operationID" @@ -6950,7 +6950,7 @@ const docTemplate = `{ } } }, - "base_info.ParseTokenResp": { + "api_struct.ParseTokenResp": { "type": "object", "properties": { "errCode": { @@ -6961,7 +6961,7 @@ const docTemplate = `{ } } }, - "base_info.QuitGroupReq": { + "api_struct.QuitGroupReq": { "type": "object", "required": [ "groupID", @@ -6976,7 +6976,7 @@ const docTemplate = `{ } } }, - "base_info.QuitGroupResp": { + "api_struct.QuitGroupResp": { "type": "object", "properties": { "errCode": { @@ -6987,7 +6987,7 @@ const docTemplate = `{ } } }, - "base_info.RemoveBlackListReq": { + "api_struct.RemoveBlackListReq": { "type": "object", "required": [ "fromUserID", @@ -7006,7 +7006,7 @@ const docTemplate = `{ } } }, - "base_info.RemoveBlackListResp": { + "api_struct.RemoveBlackListResp": { "type": "object", "properties": { "errCode": { @@ -7017,7 +7017,7 @@ const docTemplate = `{ } } }, - "base_info.Response": { + "api_struct.Response": { "type": "object", "properties": { "isFriend": { @@ -7025,7 +7025,7 @@ const docTemplate = `{ } } }, - "base_info.SendMsg2TagReq": { + "api_struct.SendMsg2TagReq": { "type": "object", "required": [ "content", @@ -7062,7 +7062,7 @@ const docTemplate = `{ } } }, - "base_info.SendMsg2TagResp": { + "api_struct.SendMsg2TagResp": { "type": "object", "properties": { "errCode": { @@ -7073,7 +7073,7 @@ const docTemplate = `{ } } }, - "base_info.SetFriendRemarkReq": { + "api_struct.SetFriendRemarkReq": { "type": "object", "required": [ "fromUserID", @@ -7095,7 +7095,7 @@ const docTemplate = `{ } } }, - "base_info.SetFriendRemarkResp": { + "api_struct.SetFriendRemarkResp": { "type": "object", "properties": { "errCode": { @@ -7106,7 +7106,7 @@ const docTemplate = `{ } } }, - "base_info.SetGlobalRecvMessageOptReq": { + "api_struct.SetGlobalRecvMessageOptReq": { "type": "object", "required": [ "operationID" @@ -7125,7 +7125,7 @@ const docTemplate = `{ } } }, - "base_info.SetGlobalRecvMessageOptResp": { + "api_struct.SetGlobalRecvMessageOptResp": { "type": "object", "properties": { "errCode": { @@ -7136,7 +7136,7 @@ const docTemplate = `{ } } }, - "base_info.SetGroupInfoReq": { + "api_struct.SetGroupInfoReq": { "type": "object", "required": [ "groupID", @@ -7175,7 +7175,7 @@ const docTemplate = `{ } } }, - "base_info.SetGroupInfoResp": { + "api_struct.SetGroupInfoResp": { "type": "object", "properties": { "errCode": { @@ -7186,7 +7186,7 @@ const docTemplate = `{ } } }, - "base_info.SetGroupMemberInfoReq": { + "api_struct.SetGroupMemberInfoReq": { "type": "object", "required": [ "groupID", @@ -7219,7 +7219,7 @@ const docTemplate = `{ } } }, - "base_info.SetGroupMemberInfoResp": { + "api_struct.SetGroupMemberInfoResp": { "type": "object", "properties": { "errCode": { @@ -7230,7 +7230,7 @@ const docTemplate = `{ } } }, - "base_info.SetTagReq": { + "api_struct.SetTagReq": { "type": "object", "required": [ "operationID", @@ -7260,7 +7260,7 @@ const docTemplate = `{ } } }, - "base_info.SetTagResp": { + "api_struct.SetTagResp": { "type": "object", "properties": { "errCode": { @@ -7271,7 +7271,7 @@ const docTemplate = `{ } } }, - "base_info.Swagger400Resp": { + "api_struct.Swagger400Resp": { "type": "object", "properties": { "errCode": { @@ -7284,7 +7284,7 @@ const docTemplate = `{ } } }, - "base_info.Swagger500Resp": { + "api_struct.Swagger500Resp": { "type": "object", "properties": { "errCode": { @@ -7297,7 +7297,7 @@ const docTemplate = `{ } } }, - "base_info.TransferGroupOwnerReq": { + "api_struct.TransferGroupOwnerReq": { "type": "object", "required": [ "groupID", @@ -7320,7 +7320,7 @@ const docTemplate = `{ } } }, - "base_info.TransferGroupOwnerResp": { + "api_struct.TransferGroupOwnerResp": { "type": "object", "properties": { "errCode": { @@ -7331,7 +7331,7 @@ const docTemplate = `{ } } }, - "base_info.UpdateDepartmentReq": { + "api_struct.UpdateDepartmentReq": { "type": "object", "required": [ "departmentID", @@ -7373,7 +7373,7 @@ const docTemplate = `{ } } }, - "base_info.UpdateDepartmentResp": { + "api_struct.UpdateDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -7384,7 +7384,7 @@ const docTemplate = `{ } } }, - "base_info.UpdateOrganizationUserReq": { + "api_struct.UpdateOrganizationUserReq": { "type": "object", "required": [ "operationID" @@ -7428,7 +7428,7 @@ const docTemplate = `{ } } }, - "base_info.UpdateOrganizationUserResp": { + "api_struct.UpdateOrganizationUserResp": { "type": "object", "properties": { "errCode": { @@ -7439,7 +7439,7 @@ const docTemplate = `{ } } }, - "base_info.UpdateSelfUserInfoReq": { + "api_struct.UpdateSelfUserInfoReq": { "type": "object", "required": [ "operationID", @@ -7488,7 +7488,7 @@ const docTemplate = `{ } } }, - "base_info.UpdateUserInDepartmentReq": { + "api_struct.UpdateUserInDepartmentReq": { "type": "object", "required": [ "operationID" @@ -7520,7 +7520,7 @@ const docTemplate = `{ } } }, - "base_info.UpdateUserInDepartmentResp": { + "api_struct.UpdateUserInDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -7531,7 +7531,7 @@ const docTemplate = `{ } } }, - "base_info.UpdateUserInfoResp": { + "api_struct.UpdateUserInfoResp": { "type": "object", "properties": { "errCode": { @@ -7542,7 +7542,7 @@ const docTemplate = `{ } } }, - "base_info.UserIDResult": { + "api_struct.UserIDResult": { "type": "object", "properties": { "result": { @@ -7553,7 +7553,7 @@ const docTemplate = `{ } } }, - "base_info.UserRegisterReq": { + "api_struct.UserRegisterReq": { "type": "object", "required": [ "operationID", @@ -7613,11 +7613,11 @@ const docTemplate = `{ } } }, - "base_info.UserRegisterResp": { + "api_struct.UserRegisterResp": { "type": "object", "properties": { "data": { - "$ref": "#/definitions/base_info.UserTokenInfo" + "$ref": "#/definitions/api_struct.UserTokenInfo" }, "errCode": { "type": "integer" @@ -7627,7 +7627,7 @@ const docTemplate = `{ } } }, - "base_info.UserTokenInfo": { + "api_struct.UserTokenInfo": { "type": "object", "properties": { "expiredTime": { @@ -7641,7 +7641,7 @@ const docTemplate = `{ } } }, - "base_info.UserTokenReq": { + "api_struct.UserTokenReq": { "type": "object", "required": [ "operationID", @@ -7669,11 +7669,11 @@ const docTemplate = `{ } } }, - "base_info.UserTokenResp": { + "api_struct.UserTokenResp": { "type": "object", "properties": { "data": { - "$ref": "#/definitions/base_info.UserTokenInfo" + "$ref": "#/definitions/api_struct.UserTokenInfo" }, "errCode": { "type": "integer" @@ -7683,19 +7683,19 @@ const docTemplate = `{ } } }, - "base_info.WorkMoment": { + "api_struct.WorkMoment": { "type": "object", "properties": { "atUsers": { "type": "array", "items": { - "$ref": "#/definitions/base_info.WorkMomentUser" + "$ref": "#/definitions/api_struct.WorkMomentUser" } }, "comments": { "type": "array", "items": { - "$ref": "#/definitions/base_info.Comment" + "$ref": "#/definitions/api_struct.Comment" } }, "content": { @@ -7710,7 +7710,7 @@ const docTemplate = `{ "likeUsers": { "type": "array", "items": { - "$ref": "#/definitions/base_info.WorkMomentUser" + "$ref": "#/definitions/api_struct.WorkMomentUser" } }, "permission": { @@ -7719,7 +7719,7 @@ const docTemplate = `{ "permissionUsers": { "type": "array", "items": { - "$ref": "#/definitions/base_info.WorkMomentUser" + "$ref": "#/definitions/api_struct.WorkMomentUser" } }, "userID": { @@ -7733,7 +7733,7 @@ const docTemplate = `{ } } }, - "base_info.WorkMomentUser": { + "api_struct.WorkMomentUser": { "type": "object", "properties": { "userID": { diff --git a/cmd/open_im_api/docs/swagger.json b/cmd/open_im_api/docs/swagger.json index e367d21cf..c9b06c636 100644 --- a/cmd/open_im_api/docs/swagger.json +++ b/cmd/open_im_api/docs/swagger.json @@ -40,7 +40,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.ForceLogoutReq" + "$ref": "#/definitions/api_struct.ForceLogoutReq" } } ], @@ -48,19 +48,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.ForceLogoutResp" + "$ref": "#/definitions/api_struct.ForceLogoutResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -94,7 +94,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.ParseTokenReq" + "$ref": "#/definitions/api_struct.ParseTokenReq" } } ], @@ -104,13 +104,13 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ParseTokenResp" + "$ref": "#/definitions/api_struct.ParseTokenResp" }, { "type": "object", "properties": { "Data": { - "$ref": "#/definitions/base_info.ExpireTime" + "$ref": "#/definitions/api_struct.ExpireTime" } } } @@ -120,13 +120,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -153,7 +153,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UserRegisterReq" + "$ref": "#/definitions/api_struct.UserRegisterReq" } } ], @@ -161,19 +161,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UserRegisterResp" + "$ref": "#/definitions/api_struct.UserRegisterResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -200,7 +200,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UserTokenReq" + "$ref": "#/definitions/api_struct.UserTokenReq" } } ], @@ -208,19 +208,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UserTokenResp" + "$ref": "#/definitions/api_struct.UserTokenResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -254,7 +254,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.AddBlacklistReq" + "$ref": "#/definitions/api_struct.AddBlacklistReq" } } ], @@ -262,19 +262,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.AddBlacklistResp" + "$ref": "#/definitions/api_struct.AddBlacklistResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -308,7 +308,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.AddFriendReq" + "$ref": "#/definitions/api_struct.AddFriendReq" } } ], @@ -316,19 +316,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.AddFriendResp" + "$ref": "#/definitions/api_struct.AddFriendResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -362,7 +362,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.AddFriendResponseReq" + "$ref": "#/definitions/api_struct.AddFriendResponseReq" } } ], @@ -370,19 +370,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.AddFriendResponseResp" + "$ref": "#/definitions/api_struct.AddFriendResponseResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -416,7 +416,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteFriendReq" + "$ref": "#/definitions/api_struct.DeleteFriendReq" } } ], @@ -424,19 +424,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteFriendResp" + "$ref": "#/definitions/api_struct.DeleteFriendResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -470,7 +470,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetBlackListReq" + "$ref": "#/definitions/api_struct.GetBlackListReq" } } ], @@ -480,7 +480,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetBlackListResp" + "$ref": "#/definitions/api_struct.GetBlackListResp" }, { "type": "object", @@ -499,13 +499,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } } } @@ -539,7 +539,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetFriendApplyListReq" + "$ref": "#/definitions/api_struct.GetFriendApplyListReq" } } ], @@ -549,7 +549,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetFriendApplyListResp" + "$ref": "#/definitions/api_struct.GetFriendApplyListResp" }, { "type": "object", @@ -568,13 +568,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } } } @@ -608,7 +608,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetFriendListReq" + "$ref": "#/definitions/api_struct.GetFriendListReq" } } ], @@ -618,7 +618,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetFriendListResp" + "$ref": "#/definitions/api_struct.GetFriendListResp" }, { "type": "object", @@ -637,13 +637,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -677,7 +677,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetSelfApplyListReq" + "$ref": "#/definitions/api_struct.GetSelfApplyListReq" } } ], @@ -687,7 +687,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetSelfApplyListResp" + "$ref": "#/definitions/api_struct.GetSelfApplyListResp" }, { "type": "object", @@ -706,13 +706,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -746,7 +746,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.ImportFriendReq" + "$ref": "#/definitions/api_struct.ImportFriendReq" } } ], @@ -754,19 +754,19 @@ "0": { "description": "data列表中对象的result-1为添加该用户失败\u003cbr\u003e0为成功", "schema": { - "$ref": "#/definitions/base_info.ImportFriendResp" + "$ref": "#/definitions/api_struct.ImportFriendResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -800,7 +800,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.IsFriendReq" + "$ref": "#/definitions/api_struct.IsFriendReq" } } ], @@ -808,19 +808,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.IsFriendResp" + "$ref": "#/definitions/api_struct.IsFriendResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -854,7 +854,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.RemoveBlackListReq" + "$ref": "#/definitions/api_struct.RemoveBlackListReq" } } ], @@ -862,19 +862,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.RemoveBlackListResp" + "$ref": "#/definitions/api_struct.RemoveBlackListResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -908,7 +908,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SetFriendRemarkReq" + "$ref": "#/definitions/api_struct.SetFriendRemarkReq" } } ], @@ -916,19 +916,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SetFriendRemarkResp" + "$ref": "#/definitions/api_struct.SetFriendRemarkResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -962,7 +962,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CancelMuteGroupReq" + "$ref": "#/definitions/api_struct.CancelMuteGroupReq" } } ], @@ -970,19 +970,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CancelMuteGroupResp" + "$ref": "#/definitions/api_struct.CancelMuteGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1016,7 +1016,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CancelMuteGroupMemberReq" + "$ref": "#/definitions/api_struct.CancelMuteGroupMemberReq" } } ], @@ -1024,19 +1024,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CancelMuteGroupMemberResp" + "$ref": "#/definitions/api_struct.CancelMuteGroupMemberResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1070,7 +1070,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateGroupReq" + "$ref": "#/definitions/api_struct.CreateGroupReq" } } ], @@ -1080,7 +1080,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.CreateGroupResp" + "$ref": "#/definitions/api_struct.CreateGroupResp" }, { "type": "object", @@ -1096,13 +1096,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1136,7 +1136,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DismissGroupReq" + "$ref": "#/definitions/api_struct.DismissGroupReq" } } ], @@ -1144,19 +1144,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DismissGroupResp" + "$ref": "#/definitions/api_struct.DismissGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1190,7 +1190,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetGroupAllMemberReq" + "$ref": "#/definitions/api_struct.GetGroupAllMemberReq" } } ], @@ -1200,7 +1200,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetGroupAllMemberResp" + "$ref": "#/definitions/api_struct.GetGroupAllMemberResp" }, { "type": "object", @@ -1219,13 +1219,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1259,7 +1259,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetGroupMembersInfoReq" + "$ref": "#/definitions/api_struct.GetGroupMembersInfoReq" } } ], @@ -1269,7 +1269,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetGroupMembersInfoResp" + "$ref": "#/definitions/api_struct.GetGroupMembersInfoResp" }, { "type": "object", @@ -1288,13 +1288,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1328,7 +1328,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetGroupInfoReq" + "$ref": "#/definitions/api_struct.GetGroupInfoReq" } } ], @@ -1336,19 +1336,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetGroupInfoResp" + "$ref": "#/definitions/api_struct.GetGroupInfoResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1382,7 +1382,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetJoinedGroupListReq" + "$ref": "#/definitions/api_struct.GetJoinedGroupListReq" } } ], @@ -1392,7 +1392,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetJoinedGroupListResp" + "$ref": "#/definitions/api_struct.GetJoinedGroupListResp" }, { "type": "object", @@ -1411,13 +1411,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1451,7 +1451,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetGroupApplicationListReq" + "$ref": "#/definitions/api_struct.GetGroupApplicationListReq" } } ], @@ -1461,7 +1461,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetGroupApplicationListResp" + "$ref": "#/definitions/api_struct.GetGroupApplicationListResp" }, { "type": "object", @@ -1480,13 +1480,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1520,7 +1520,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserReqGroupApplicationListReq" + "$ref": "#/definitions/api_struct.GetUserReqGroupApplicationListReq" } } ], @@ -1530,7 +1530,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetGroupApplicationListResp" + "$ref": "#/definitions/api_struct.GetGroupApplicationListResp" }, { "type": "object", @@ -1549,13 +1549,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1589,7 +1589,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.ApplicationGroupResponseReq" + "$ref": "#/definitions/api_struct.ApplicationGroupResponseReq" } } ], @@ -1597,19 +1597,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.ApplicationGroupResponseResp" + "$ref": "#/definitions/api_struct.ApplicationGroupResponseResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1643,7 +1643,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.InviteUserToGroupReq" + "$ref": "#/definitions/api_struct.InviteUserToGroupReq" } } ], @@ -1651,19 +1651,19 @@ "0": { "description": "result为结果码, -1为失败, 0为成功", "schema": { - "$ref": "#/definitions/base_info.InviteUserToGroupResp" + "$ref": "#/definitions/api_struct.InviteUserToGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1697,7 +1697,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.JoinGroupReq" + "$ref": "#/definitions/api_struct.JoinGroupReq" } } ], @@ -1705,19 +1705,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.JoinGroupResp" + "$ref": "#/definitions/api_struct.JoinGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1751,7 +1751,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.KickGroupMemberReq" + "$ref": "#/definitions/api_struct.KickGroupMemberReq" } } ], @@ -1759,19 +1759,19 @@ "0": { "description": "result为结果码, -1为失败, 0为成功", "schema": { - "$ref": "#/definitions/base_info.KickGroupMemberResp" + "$ref": "#/definitions/api_struct.KickGroupMemberResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1805,7 +1805,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.MuteGroupReq" + "$ref": "#/definitions/api_struct.MuteGroupReq" } } ], @@ -1813,19 +1813,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.MuteGroupResp" + "$ref": "#/definitions/api_struct.MuteGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.MuteGroupResp" + "$ref": "#/definitions/api_struct.MuteGroupResp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.MuteGroupResp" + "$ref": "#/definitions/api_struct.MuteGroupResp" } } } @@ -1859,7 +1859,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.MuteGroupMemberReq" + "$ref": "#/definitions/api_struct.MuteGroupMemberReq" } } ], @@ -1867,19 +1867,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DismissGroupResp" + "$ref": "#/definitions/api_struct.DismissGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1913,7 +1913,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.QuitGroupReq" + "$ref": "#/definitions/api_struct.QuitGroupReq" } } ], @@ -1921,19 +1921,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.QuitGroupResp" + "$ref": "#/definitions/api_struct.QuitGroupResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -1967,7 +1967,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SetGroupInfoReq" + "$ref": "#/definitions/api_struct.SetGroupInfoReq" } } ], @@ -1975,19 +1975,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SetGroupInfoResp" + "$ref": "#/definitions/api_struct.SetGroupInfoResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2021,7 +2021,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SetGroupMemberInfoReq" + "$ref": "#/definitions/api_struct.SetGroupMemberInfoReq" } } ], @@ -2029,19 +2029,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SetGroupMemberInfoResp" + "$ref": "#/definitions/api_struct.SetGroupMemberInfoResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2075,7 +2075,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.TransferGroupOwnerReq" + "$ref": "#/definitions/api_struct.TransferGroupOwnerReq" } } ], @@ -2083,19 +2083,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.TransferGroupOwnerResp" + "$ref": "#/definitions/api_struct.TransferGroupOwnerResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2131,7 +2131,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ManagementBatchSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementBatchSendMsgReq" }, { "type": "object", @@ -2152,7 +2152,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ManagementSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementSendMsgReq" }, { "type": "object", @@ -2170,19 +2170,19 @@ "0": { "description": "serverMsgID为服务器消息ID \u003cbr\u003e clientMsgID为客户端消息ID \u003cbr\u003e sendTime为发送消息时间", "schema": { - "$ref": "#/definitions/base_info.ManagementBatchSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementBatchSendMsgReq" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.ManagementBatchSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementBatchSendMsgReq" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.ManagementBatchSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementBatchSendMsgReq" } } } @@ -2216,7 +2216,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CleanUpMsgReq" + "$ref": "#/definitions/api_struct.CleanUpMsgReq" } } ], @@ -2224,19 +2224,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CleanUpMsgResp" + "$ref": "#/definitions/api_struct.CleanUpMsgResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2270,7 +2270,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DelMsgReq" + "$ref": "#/definitions/api_struct.DelMsgReq" } } ], @@ -2278,19 +2278,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DelMsgResp" + "$ref": "#/definitions/api_struct.DelMsgResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2324,7 +2324,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetAllConversationsReq" + "$ref": "#/definitions/api_struct.GetAllConversationsReq" } } ], @@ -2332,19 +2332,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetAllConversationsResp" + "$ref": "#/definitions/api_struct.GetAllConversationsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2378,7 +2378,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetConversationReq" + "$ref": "#/definitions/api_struct.GetConversationReq" } } ], @@ -2386,19 +2386,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetConversationResp" + "$ref": "#/definitions/api_struct.GetConversationResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2432,7 +2432,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetConversationsReq" + "$ref": "#/definitions/api_struct.GetConversationsReq" } } ], @@ -2440,19 +2440,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetConversationsResp" + "$ref": "#/definitions/api_struct.GetConversationsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2488,7 +2488,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ManagementSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementSendMsgReq" }, { "type": "object", @@ -2509,7 +2509,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ManagementSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementSendMsgReq" }, { "type": "object", @@ -2530,7 +2530,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.ManagementSendMsgReq" + "$ref": "#/definitions/api_struct.ManagementSendMsgReq" }, { "type": "object", @@ -2548,19 +2548,19 @@ "0": { "description": "serverMsgID为服务器消息ID \u003cbr\u003e clientMsgID为客户端消息ID \u003cbr\u003e sendTime为发送消息时间", "schema": { - "$ref": "#/definitions/base_info.ManagementSendMsgResp" + "$ref": "#/definitions/api_struct.ManagementSendMsgResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.ManagementSendMsgResp" + "$ref": "#/definitions/api_struct.ManagementSendMsgResp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.ManagementSendMsgResp" + "$ref": "#/definitions/api_struct.ManagementSendMsgResp" } } } @@ -2594,7 +2594,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CommentOneWorkMomentReq" + "$ref": "#/definitions/api_struct.CommentOneWorkMomentReq" } } ], @@ -2602,19 +2602,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CommentOneWorkMomentResp" + "$ref": "#/definitions/api_struct.CommentOneWorkMomentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2648,7 +2648,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateOneWorkMomentReq" + "$ref": "#/definitions/api_struct.CreateOneWorkMomentReq" } } ], @@ -2656,19 +2656,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CreateOneWorkMomentResp" + "$ref": "#/definitions/api_struct.CreateOneWorkMomentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2702,7 +2702,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateTagReq" + "$ref": "#/definitions/api_struct.CreateTagReq" } } ], @@ -2710,19 +2710,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CreateTagResp" + "$ref": "#/definitions/api_struct.CreateTagResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2756,7 +2756,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteCommentReq" + "$ref": "#/definitions/api_struct.DeleteCommentReq" } } ], @@ -2764,19 +2764,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteCommentResp" + "$ref": "#/definitions/api_struct.DeleteCommentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2810,7 +2810,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteOneWorkMomentReq" + "$ref": "#/definitions/api_struct.DeleteOneWorkMomentReq" } } ], @@ -2818,19 +2818,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteOneWorkMomentResp" + "$ref": "#/definitions/api_struct.DeleteOneWorkMomentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2864,7 +2864,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteTagReq" + "$ref": "#/definitions/api_struct.DeleteTagReq" } } ], @@ -2872,19 +2872,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteTagResp" + "$ref": "#/definitions/api_struct.DeleteTagResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2918,7 +2918,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetTagSendLogsReq" + "$ref": "#/definitions/api_struct.GetTagSendLogsReq" } } ], @@ -2926,19 +2926,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetTagSendLogsResp" + "$ref": "#/definitions/api_struct.GetTagSendLogsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -2972,7 +2972,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserFriendWorkMomentsReq" + "$ref": "#/definitions/api_struct.GetUserFriendWorkMomentsReq" } } ], @@ -2980,19 +2980,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetUserFriendWorkMomentsResp" + "$ref": "#/definitions/api_struct.GetUserFriendWorkMomentsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3026,7 +3026,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserTagByIDReq" + "$ref": "#/definitions/api_struct.GetUserTagByIDReq" } } ], @@ -3034,19 +3034,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetUserTagByIDResp" + "$ref": "#/definitions/api_struct.GetUserTagByIDResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3080,7 +3080,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserTagsReq" + "$ref": "#/definitions/api_struct.GetUserTagsReq" } } ], @@ -3088,19 +3088,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetUserTagsResp" + "$ref": "#/definitions/api_struct.GetUserTagsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3134,7 +3134,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserWorkMomentsReq" + "$ref": "#/definitions/api_struct.GetUserWorkMomentsReq" } } ], @@ -3142,19 +3142,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetUserWorkMomentsResp" + "$ref": "#/definitions/api_struct.GetUserWorkMomentsResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3188,7 +3188,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetWorkMomentByIDReq" + "$ref": "#/definitions/api_struct.GetWorkMomentByIDReq" } } ], @@ -3196,19 +3196,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetWorkMomentByIDResp" + "$ref": "#/definitions/api_struct.GetWorkMomentByIDResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3242,7 +3242,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.LikeOneWorkMomentReq" + "$ref": "#/definitions/api_struct.LikeOneWorkMomentReq" } } ], @@ -3250,19 +3250,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.LikeOneWorkMomentResp" + "$ref": "#/definitions/api_struct.LikeOneWorkMomentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3296,7 +3296,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SendMsg2TagReq" + "$ref": "#/definitions/api_struct.SendMsg2TagReq" } } ], @@ -3304,19 +3304,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SendMsg2TagResp" + "$ref": "#/definitions/api_struct.SendMsg2TagResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3350,7 +3350,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SetTagReq" + "$ref": "#/definitions/api_struct.SetTagReq" } } ], @@ -3358,19 +3358,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SetTagResp" + "$ref": "#/definitions/api_struct.SetTagResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3404,7 +3404,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentReq" + "$ref": "#/definitions/api_struct.CreateDepartmentReq" } } ], @@ -3414,7 +3414,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.CreateDepartmentResp" + "$ref": "#/definitions/api_struct.CreateDepartmentResp" }, { "type": "object", @@ -3430,13 +3430,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3470,7 +3470,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentMemberReq" + "$ref": "#/definitions/api_struct.CreateDepartmentMemberReq" } } ], @@ -3478,19 +3478,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentMemberResp" + "$ref": "#/definitions/api_struct.CreateDepartmentMemberResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3524,7 +3524,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.CreateOrganizationUserReq" + "$ref": "#/definitions/api_struct.CreateOrganizationUserReq" } } ], @@ -3532,19 +3532,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.CreateOrganizationUserResp" + "$ref": "#/definitions/api_struct.CreateOrganizationUserResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3578,7 +3578,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteDepartmentReq" + "$ref": "#/definitions/api_struct.DeleteDepartmentReq" } } ], @@ -3586,19 +3586,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteDepartmentResp" + "$ref": "#/definitions/api_struct.DeleteDepartmentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3632,7 +3632,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteOrganizationUserReq" + "$ref": "#/definitions/api_struct.DeleteOrganizationUserReq" } } ], @@ -3640,19 +3640,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteOrganizationUserResp" + "$ref": "#/definitions/api_struct.DeleteOrganizationUserResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3686,7 +3686,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.DeleteUserInDepartmentReq" + "$ref": "#/definitions/api_struct.DeleteUserInDepartmentReq" } } ], @@ -3694,19 +3694,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.DeleteUserInDepartmentResp" + "$ref": "#/definitions/api_struct.DeleteUserInDepartmentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3740,7 +3740,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetDepartmentMemberReq" + "$ref": "#/definitions/api_struct.GetDepartmentMemberReq" } } ], @@ -3750,7 +3750,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetDepartmentMemberResp" + "$ref": "#/definitions/api_struct.GetDepartmentMemberResp" }, { "type": "object", @@ -3769,13 +3769,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3809,7 +3809,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetSubDepartmentReq" + "$ref": "#/definitions/api_struct.GetSubDepartmentReq" } } ], @@ -3819,7 +3819,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetSubDepartmentResp" + "$ref": "#/definitions/api_struct.GetSubDepartmentResp" }, { "type": "object", @@ -3838,13 +3838,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3878,7 +3878,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUserInDepartmentReq" + "$ref": "#/definitions/api_struct.GetUserInDepartmentReq" } } ], @@ -3888,7 +3888,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetUserInDepartmentResp" + "$ref": "#/definitions/api_struct.GetUserInDepartmentResp" }, { "type": "object", @@ -3904,13 +3904,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3944,7 +3944,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UpdateDepartmentReq" + "$ref": "#/definitions/api_struct.UpdateDepartmentReq" } } ], @@ -3952,19 +3952,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UpdateDepartmentResp" + "$ref": "#/definitions/api_struct.UpdateDepartmentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -3998,7 +3998,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UpdateOrganizationUserReq" + "$ref": "#/definitions/api_struct.UpdateOrganizationUserReq" } } ], @@ -4006,19 +4006,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UpdateOrganizationUserResp" + "$ref": "#/definitions/api_struct.UpdateOrganizationUserResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4052,7 +4052,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UpdateUserInDepartmentReq" + "$ref": "#/definitions/api_struct.UpdateUserInDepartmentReq" } } ], @@ -4060,19 +4060,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UpdateUserInDepartmentResp" + "$ref": "#/definitions/api_struct.UpdateUserInDepartmentResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4126,19 +4126,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.MinioUploadFileResp" + "$ref": "#/definitions/api_struct.MinioUploadFileResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4172,7 +4172,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.AccountCheckReq" + "$ref": "#/definitions/api_struct.AccountCheckReq" } } ], @@ -4180,19 +4180,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.AccountCheckResp" + "$ref": "#/definitions/api_struct.AccountCheckResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4226,7 +4226,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetAllUsersUidReq" + "$ref": "#/definitions/api_struct.GetAllUsersUidReq" } } ], @@ -4234,19 +4234,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetAllUsersUidResp" + "$ref": "#/definitions/api_struct.GetAllUsersUidResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4280,7 +4280,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetSelfUserInfoReq" + "$ref": "#/definitions/api_struct.GetSelfUserInfoReq" } } ], @@ -4290,7 +4290,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetSelfUserInfoResp" + "$ref": "#/definitions/api_struct.GetSelfUserInfoResp" }, { "type": "object", @@ -4306,13 +4306,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4346,7 +4346,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUsersInfoReq" + "$ref": "#/definitions/api_struct.GetUsersInfoReq" } } ], @@ -4356,7 +4356,7 @@ "schema": { "allOf": [ { - "$ref": "#/definitions/base_info.GetUsersInfoResp" + "$ref": "#/definitions/api_struct.GetUsersInfoResp" }, { "type": "object", @@ -4375,13 +4375,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4415,7 +4415,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.GetUsersOnlineStatusReq" + "$ref": "#/definitions/api_struct.GetUsersOnlineStatusReq" } } ], @@ -4423,19 +4423,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetUsersOnlineStatusResp" + "$ref": "#/definitions/api_struct.GetUsersOnlineStatusResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4469,7 +4469,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.SetGlobalRecvMessageOptReq" + "$ref": "#/definitions/api_struct.SetGlobalRecvMessageOptReq" } } ], @@ -4477,19 +4477,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.SetGlobalRecvMessageOptResp" + "$ref": "#/definitions/api_struct.SetGlobalRecvMessageOptResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4523,7 +4523,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/base_info.UpdateSelfUserInfoReq" + "$ref": "#/definitions/api_struct.UpdateSelfUserInfoReq" } } ], @@ -4531,19 +4531,19 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.UpdateUserInfoResp" + "$ref": "#/definitions/api_struct.UpdateUserInfoResp" } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.Swagger400Resp" + "$ref": "#/definitions/api_struct.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.Swagger500Resp" + "$ref": "#/definitions/api_struct.Swagger500Resp" } } } @@ -4737,7 +4737,7 @@ } } }, - "base_info.AccountCheckReq": { + "api_struct.AccountCheckReq": { "type": "object", "required": [ "checkUserIDList", @@ -4756,7 +4756,7 @@ } } }, - "base_info.AccountCheckResp": { + "api_struct.AccountCheckResp": { "type": "object", "properties": { "data": { @@ -4773,7 +4773,7 @@ } } }, - "base_info.AddBlacklistReq": { + "api_struct.AddBlacklistReq": { "type": "object", "required": [ "fromUserID", @@ -4792,7 +4792,7 @@ } } }, - "base_info.AddBlacklistResp": { + "api_struct.AddBlacklistResp": { "type": "object", "properties": { "errCode": { @@ -4803,7 +4803,7 @@ } } }, - "base_info.AddFriendReq": { + "api_struct.AddFriendReq": { "type": "object", "required": [ "fromUserID", @@ -4825,7 +4825,7 @@ } } }, - "base_info.AddFriendResp": { + "api_struct.AddFriendResp": { "type": "object", "properties": { "errCode": { @@ -4836,7 +4836,7 @@ } } }, - "base_info.AddFriendResponseReq": { + "api_struct.AddFriendResponseReq": { "type": "object", "required": [ "flag", @@ -4867,7 +4867,7 @@ } } }, - "base_info.AddFriendResponseResp": { + "api_struct.AddFriendResponseResp": { "type": "object", "properties": { "errCode": { @@ -4878,7 +4878,7 @@ } } }, - "base_info.ApplicationGroupResponseReq": { + "api_struct.ApplicationGroupResponseReq": { "type": "object", "required": [ "fromUserID", @@ -4909,7 +4909,7 @@ } } }, - "base_info.ApplicationGroupResponseResp": { + "api_struct.ApplicationGroupResponseResp": { "type": "object", "properties": { "errCode": { @@ -4920,7 +4920,7 @@ } } }, - "base_info.CancelMuteGroupMemberReq": { + "api_struct.CancelMuteGroupMemberReq": { "type": "object", "required": [ "groupID", @@ -4939,7 +4939,7 @@ } } }, - "base_info.CancelMuteGroupMemberResp": { + "api_struct.CancelMuteGroupMemberResp": { "type": "object", "properties": { "errCode": { @@ -4950,7 +4950,7 @@ } } }, - "base_info.CancelMuteGroupReq": { + "api_struct.CancelMuteGroupReq": { "type": "object", "required": [ "groupID", @@ -4965,7 +4965,7 @@ } } }, - "base_info.CancelMuteGroupResp": { + "api_struct.CancelMuteGroupResp": { "type": "object", "properties": { "errCode": { @@ -4976,7 +4976,7 @@ } } }, - "base_info.CleanUpMsgReq": { + "api_struct.CleanUpMsgReq": { "type": "object", "required": [ "operationID", @@ -4991,7 +4991,7 @@ } } }, - "base_info.CleanUpMsgResp": { + "api_struct.CleanUpMsgResp": { "type": "object", "properties": { "errCode": { @@ -5002,7 +5002,7 @@ } } }, - "base_info.Comment": { + "api_struct.Comment": { "type": "object", "properties": { "content": { @@ -5028,7 +5028,7 @@ } } }, - "base_info.CommentOneWorkMomentReq": { + "api_struct.CommentOneWorkMomentReq": { "type": "object", "required": [ "content", @@ -5050,7 +5050,7 @@ } } }, - "base_info.CommentOneWorkMomentResp": { + "api_struct.CommentOneWorkMomentResp": { "type": "object", "properties": { "data": { @@ -5064,7 +5064,7 @@ } } }, - "base_info.Conversation": { + "api_struct.Conversation": { "type": "object", "required": [ "conversationID", @@ -5121,7 +5121,7 @@ } } }, - "base_info.CreateDepartmentMemberReq": { + "api_struct.CreateDepartmentMemberReq": { "type": "object", "required": [ "operationID" @@ -5153,7 +5153,7 @@ } } }, - "base_info.CreateDepartmentMemberResp": { + "api_struct.CreateDepartmentMemberResp": { "type": "object", "properties": { "errCode": { @@ -5164,7 +5164,7 @@ } } }, - "base_info.CreateDepartmentReq": { + "api_struct.CreateDepartmentReq": { "type": "object", "required": [ "operationID" @@ -5205,7 +5205,7 @@ } } }, - "base_info.CreateDepartmentResp": { + "api_struct.CreateDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -5216,7 +5216,7 @@ } } }, - "base_info.CreateGroupReq": { + "api_struct.CreateGroupReq": { "type": "object", "required": [ "operationID" @@ -5243,7 +5243,7 @@ "memberList": { "type": "array", "items": { - "$ref": "#/definitions/base_info.GroupAddMemberInfo" + "$ref": "#/definitions/api_struct.GroupAddMemberInfo" } }, "notification": { @@ -5257,7 +5257,7 @@ } } }, - "base_info.CreateGroupResp": { + "api_struct.CreateGroupResp": { "type": "object", "properties": { "errCode": { @@ -5268,7 +5268,7 @@ } } }, - "base_info.CreateOneWorkMomentReq": { + "api_struct.CreateOneWorkMomentReq": { "type": "object", "properties": { "operationID": { @@ -5279,7 +5279,7 @@ } } }, - "base_info.CreateOneWorkMomentResp": { + "api_struct.CreateOneWorkMomentResp": { "type": "object", "properties": { "data": { @@ -5293,7 +5293,7 @@ } } }, - "base_info.CreateOrganizationUserReq": { + "api_struct.CreateOrganizationUserReq": { "type": "object", "required": [ "operationID" @@ -5337,7 +5337,7 @@ } } }, - "base_info.CreateOrganizationUserResp": { + "api_struct.CreateOrganizationUserResp": { "type": "object", "properties": { "errCode": { @@ -5348,7 +5348,7 @@ } } }, - "base_info.CreateTagReq": { + "api_struct.CreateTagReq": { "type": "object", "required": [ "operationID", @@ -5372,7 +5372,7 @@ } } }, - "base_info.CreateTagResp": { + "api_struct.CreateTagResp": { "type": "object", "properties": { "errCode": { @@ -5383,7 +5383,7 @@ } } }, - "base_info.DelMsgReq": { + "api_struct.DelMsgReq": { "type": "object", "required": [ "operationID", @@ -5405,7 +5405,7 @@ } } }, - "base_info.DelMsgResp": { + "api_struct.DelMsgResp": { "type": "object", "properties": { "errCode": { @@ -5416,7 +5416,7 @@ } } }, - "base_info.DeleteCommentReq": { + "api_struct.DeleteCommentReq": { "type": "object", "required": [ "contentID", @@ -5435,7 +5435,7 @@ } } }, - "base_info.DeleteCommentResp": { + "api_struct.DeleteCommentResp": { "type": "object", "properties": { "data": { @@ -5449,7 +5449,7 @@ } } }, - "base_info.DeleteDepartmentReq": { + "api_struct.DeleteDepartmentReq": { "type": "object", "required": [ "departmentID", @@ -5464,7 +5464,7 @@ } } }, - "base_info.DeleteDepartmentResp": { + "api_struct.DeleteDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -5475,7 +5475,7 @@ } } }, - "base_info.DeleteFriendReq": { + "api_struct.DeleteFriendReq": { "type": "object", "required": [ "fromUserID", @@ -5494,7 +5494,7 @@ } } }, - "base_info.DeleteFriendResp": { + "api_struct.DeleteFriendResp": { "type": "object", "properties": { "errCode": { @@ -5505,7 +5505,7 @@ } } }, - "base_info.DeleteOneWorkMomentReq": { + "api_struct.DeleteOneWorkMomentReq": { "type": "object", "required": [ "operationID", @@ -5520,7 +5520,7 @@ } } }, - "base_info.DeleteOneWorkMomentResp": { + "api_struct.DeleteOneWorkMomentResp": { "type": "object", "properties": { "data": { @@ -5534,7 +5534,7 @@ } } }, - "base_info.DeleteOrganizationUserReq": { + "api_struct.DeleteOrganizationUserReq": { "type": "object", "required": [ "operationID", @@ -5549,7 +5549,7 @@ } } }, - "base_info.DeleteOrganizationUserResp": { + "api_struct.DeleteOrganizationUserResp": { "type": "object", "properties": { "errCode": { @@ -5560,7 +5560,7 @@ } } }, - "base_info.DeleteTagReq": { + "api_struct.DeleteTagReq": { "type": "object", "required": [ "operationID", @@ -5575,7 +5575,7 @@ } } }, - "base_info.DeleteTagResp": { + "api_struct.DeleteTagResp": { "type": "object", "properties": { "errCode": { @@ -5586,7 +5586,7 @@ } } }, - "base_info.DeleteUserInDepartmentReq": { + "api_struct.DeleteUserInDepartmentReq": { "type": "object", "required": [ "departmentID", @@ -5605,7 +5605,7 @@ } } }, - "base_info.DeleteUserInDepartmentResp": { + "api_struct.DeleteUserInDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -5616,7 +5616,7 @@ } } }, - "base_info.DismissGroupReq": { + "api_struct.DismissGroupReq": { "type": "object", "required": [ "groupID", @@ -5631,7 +5631,7 @@ } } }, - "base_info.DismissGroupResp": { + "api_struct.DismissGroupResp": { "type": "object", "properties": { "errCode": { @@ -5642,7 +5642,7 @@ } } }, - "base_info.ExpireTime": { + "api_struct.ExpireTime": { "type": "object", "properties": { "expireTimeSeconds": { @@ -5650,7 +5650,7 @@ } } }, - "base_info.ForceLogoutReq": { + "api_struct.ForceLogoutReq": { "type": "object", "required": [ "fromUserID", @@ -5673,7 +5673,7 @@ } } }, - "base_info.ForceLogoutResp": { + "api_struct.ForceLogoutResp": { "type": "object", "properties": { "errCode": { @@ -5684,7 +5684,7 @@ } } }, - "base_info.GetAllConversationsReq": { + "api_struct.GetAllConversationsReq": { "type": "object", "required": [ "operationID", @@ -5699,13 +5699,13 @@ } } }, - "base_info.GetAllConversationsResp": { + "api_struct.GetAllConversationsResp": { "type": "object", "properties": { "data": { "type": "array", "items": { - "$ref": "#/definitions/base_info.Conversation" + "$ref": "#/definitions/api_struct.Conversation" } }, "errCode": { @@ -5716,7 +5716,7 @@ } } }, - "base_info.GetAllUsersUidReq": { + "api_struct.GetAllUsersUidReq": { "type": "object", "required": [ "operationID" @@ -5727,7 +5727,7 @@ } } }, - "base_info.GetAllUsersUidResp": { + "api_struct.GetAllUsersUidResp": { "type": "object", "properties": { "data": { @@ -5744,7 +5744,7 @@ } } }, - "base_info.GetBlackListReq": { + "api_struct.GetBlackListReq": { "type": "object", "required": [ "fromUserID", @@ -5759,7 +5759,7 @@ } } }, - "base_info.GetBlackListResp": { + "api_struct.GetBlackListResp": { "type": "object", "properties": { "errCode": { @@ -5770,7 +5770,7 @@ } } }, - "base_info.GetConversationReq": { + "api_struct.GetConversationReq": { "type": "object", "required": [ "conversationID", @@ -5789,11 +5789,11 @@ } } }, - "base_info.GetConversationResp": { + "api_struct.GetConversationResp": { "type": "object", "properties": { "data": { - "$ref": "#/definitions/base_info.Conversation" + "$ref": "#/definitions/api_struct.Conversation" }, "errCode": { "type": "integer" @@ -5803,7 +5803,7 @@ } } }, - "base_info.GetConversationsReq": { + "api_struct.GetConversationsReq": { "type": "object", "required": [ "conversationIDs", @@ -5825,13 +5825,13 @@ } } }, - "base_info.GetConversationsResp": { + "api_struct.GetConversationsResp": { "type": "object", "properties": { "data": { "type": "array", "items": { - "$ref": "#/definitions/base_info.Conversation" + "$ref": "#/definitions/api_struct.Conversation" } }, "errCode": { @@ -5842,7 +5842,7 @@ } } }, - "base_info.GetDepartmentMemberReq": { + "api_struct.GetDepartmentMemberReq": { "type": "object", "required": [ "departmentID", @@ -5857,7 +5857,7 @@ } } }, - "base_info.GetDepartmentMemberResp": { + "api_struct.GetDepartmentMemberResp": { "type": "object", "properties": { "errCode": { @@ -5868,7 +5868,7 @@ } } }, - "base_info.GetFriendApplyListReq": { + "api_struct.GetFriendApplyListReq": { "type": "object", "required": [ "fromUserID", @@ -5883,7 +5883,7 @@ } } }, - "base_info.GetFriendApplyListResp": { + "api_struct.GetFriendApplyListResp": { "type": "object", "properties": { "errCode": { @@ -5894,7 +5894,7 @@ } } }, - "base_info.GetFriendListReq": { + "api_struct.GetFriendListReq": { "type": "object", "required": [ "fromUserID", @@ -5909,7 +5909,7 @@ } } }, - "base_info.GetFriendListResp": { + "api_struct.GetFriendListResp": { "type": "object", "properties": { "errCode": { @@ -5920,7 +5920,7 @@ } } }, - "base_info.GetGroupAllMemberReq": { + "api_struct.GetGroupAllMemberReq": { "type": "object", "required": [ "count", @@ -5943,7 +5943,7 @@ } } }, - "base_info.GetGroupAllMemberResp": { + "api_struct.GetGroupAllMemberResp": { "type": "object", "properties": { "errCode": { @@ -5954,7 +5954,7 @@ } } }, - "base_info.GetGroupApplicationListReq": { + "api_struct.GetGroupApplicationListReq": { "type": "object", "required": [ "fromUserID", @@ -5970,7 +5970,7 @@ } } }, - "base_info.GetGroupApplicationListResp": { + "api_struct.GetGroupApplicationListResp": { "type": "object", "properties": { "errCode": { @@ -5981,7 +5981,7 @@ } } }, - "base_info.GetGroupInfoReq": { + "api_struct.GetGroupInfoReq": { "type": "object", "required": [ "groupIDList", @@ -5999,7 +5999,7 @@ } } }, - "base_info.GetGroupInfoResp": { + "api_struct.GetGroupInfoResp": { "type": "object", "properties": { "errCode": { @@ -6010,7 +6010,7 @@ } } }, - "base_info.GetGroupMembersInfoReq": { + "api_struct.GetGroupMembersInfoReq": { "type": "object", "required": [ "groupID", @@ -6032,7 +6032,7 @@ } } }, - "base_info.GetGroupMembersInfoResp": { + "api_struct.GetGroupMembersInfoResp": { "type": "object", "properties": { "errCode": { @@ -6043,7 +6043,7 @@ } } }, - "base_info.GetJoinedGroupListReq": { + "api_struct.GetJoinedGroupListReq": { "type": "object", "required": [ "fromUserID", @@ -6058,7 +6058,7 @@ } } }, - "base_info.GetJoinedGroupListResp": { + "api_struct.GetJoinedGroupListResp": { "type": "object", "properties": { "errCode": { @@ -6069,7 +6069,7 @@ } } }, - "base_info.GetSelfApplyListReq": { + "api_struct.GetSelfApplyListReq": { "type": "object", "required": [ "fromUserID", @@ -6084,7 +6084,7 @@ } } }, - "base_info.GetSelfApplyListResp": { + "api_struct.GetSelfApplyListResp": { "type": "object", "properties": { "errCode": { @@ -6095,7 +6095,7 @@ } } }, - "base_info.GetSelfUserInfoReq": { + "api_struct.GetSelfUserInfoReq": { "type": "object", "required": [ "operationID", @@ -6110,7 +6110,7 @@ } } }, - "base_info.GetSelfUserInfoResp": { + "api_struct.GetSelfUserInfoResp": { "type": "object", "properties": { "errCode": { @@ -6121,7 +6121,7 @@ } } }, - "base_info.GetSubDepartmentReq": { + "api_struct.GetSubDepartmentReq": { "type": "object", "required": [ "departmentID", @@ -6136,7 +6136,7 @@ } } }, - "base_info.GetSubDepartmentResp": { + "api_struct.GetSubDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -6147,7 +6147,7 @@ } } }, - "base_info.GetTagSendLogsReq": { + "api_struct.GetTagSendLogsReq": { "type": "object", "required": [ "operationID", @@ -6166,7 +6166,7 @@ } } }, - "base_info.GetTagSendLogsResp": { + "api_struct.GetTagSendLogsResp": { "type": "object", "properties": { "data": { @@ -6194,7 +6194,7 @@ } } }, - "base_info.GetUserFriendWorkMomentsReq": { + "api_struct.GetUserFriendWorkMomentsReq": { "type": "object", "required": [ "operationID", @@ -6213,7 +6213,7 @@ } } }, - "base_info.GetUserFriendWorkMomentsResp": { + "api_struct.GetUserFriendWorkMomentsResp": { "type": "object", "properties": { "data": { @@ -6228,7 +6228,7 @@ "workMoments": { "type": "array", "items": { - "$ref": "#/definitions/base_info.WorkMoment" + "$ref": "#/definitions/api_struct.WorkMoment" } } } @@ -6241,7 +6241,7 @@ } } }, - "base_info.GetUserInDepartmentReq": { + "api_struct.GetUserInDepartmentReq": { "type": "object", "required": [ "operationID", @@ -6256,7 +6256,7 @@ } } }, - "base_info.GetUserInDepartmentResp": { + "api_struct.GetUserInDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -6267,7 +6267,7 @@ } } }, - "base_info.GetUserReqGroupApplicationListReq": { + "api_struct.GetUserReqGroupApplicationListReq": { "type": "object", "required": [ "operationID", @@ -6282,7 +6282,7 @@ } } }, - "base_info.GetUserTagByIDReq": { + "api_struct.GetUserTagByIDReq": { "type": "object", "required": [ "operationID", @@ -6297,7 +6297,7 @@ } } }, - "base_info.GetUserTagByIDResp": { + "api_struct.GetUserTagByIDResp": { "type": "object", "properties": { "data": { @@ -6316,7 +6316,7 @@ } } }, - "base_info.GetUserTagsReq": { + "api_struct.GetUserTagsReq": { "type": "object", "required": [ "operationID" @@ -6327,7 +6327,7 @@ } } }, - "base_info.GetUserTagsResp": { + "api_struct.GetUserTagsResp": { "type": "object", "properties": { "data": { @@ -6349,7 +6349,7 @@ } } }, - "base_info.GetUserWorkMomentsReq": { + "api_struct.GetUserWorkMomentsReq": { "type": "object", "required": [ "operationID", @@ -6371,7 +6371,7 @@ } } }, - "base_info.GetUserWorkMomentsResp": { + "api_struct.GetUserWorkMomentsResp": { "type": "object", "properties": { "data": { @@ -6386,7 +6386,7 @@ "workMoments": { "type": "array", "items": { - "$ref": "#/definitions/base_info.WorkMoment" + "$ref": "#/definitions/api_struct.WorkMoment" } } } @@ -6399,7 +6399,7 @@ } } }, - "base_info.GetUsersInfoReq": { + "api_struct.GetUsersInfoReq": { "type": "object", "required": [ "operationID", @@ -6417,7 +6417,7 @@ } } }, - "base_info.GetUsersInfoResp": { + "api_struct.GetUsersInfoResp": { "type": "object", "properties": { "errCode": { @@ -6428,7 +6428,7 @@ } } }, - "base_info.GetUsersOnlineStatusReq": { + "api_struct.GetUsersOnlineStatusReq": { "type": "object", "required": [ "operationID", @@ -6447,7 +6447,7 @@ } } }, - "base_info.GetUsersOnlineStatusResp": { + "api_struct.GetUsersOnlineStatusResp": { "type": "object", "properties": { "data": { @@ -6464,7 +6464,7 @@ } } }, - "base_info.GetWorkMomentByIDReq": { + "api_struct.GetWorkMomentByIDReq": { "type": "object", "required": [ "operationID", @@ -6479,14 +6479,14 @@ } } }, - "base_info.GetWorkMomentByIDResp": { + "api_struct.GetWorkMomentByIDResp": { "type": "object", "properties": { "data": { "type": "object", "properties": { "workMoment": { - "$ref": "#/definitions/base_info.WorkMoment" + "$ref": "#/definitions/api_struct.WorkMoment" } } }, @@ -6498,7 +6498,7 @@ } } }, - "base_info.GroupAddMemberInfo": { + "api_struct.GroupAddMemberInfo": { "type": "object", "required": [ "roleLevel", @@ -6517,7 +6517,7 @@ } } }, - "base_info.ImportFriendReq": { + "api_struct.ImportFriendReq": { "type": "object", "required": [ "friendUserIDList", @@ -6539,13 +6539,13 @@ } } }, - "base_info.ImportFriendResp": { + "api_struct.ImportFriendResp": { "type": "object", "properties": { "data": { "type": "array", "items": { - "$ref": "#/definitions/base_info.UserIDResult" + "$ref": "#/definitions/api_struct.UserIDResult" } }, "errCode": { @@ -6556,7 +6556,7 @@ } } }, - "base_info.InviteUserToGroupReq": { + "api_struct.InviteUserToGroupReq": { "type": "object", "required": [ "groupID", @@ -6581,13 +6581,13 @@ } } }, - "base_info.InviteUserToGroupResp": { + "api_struct.InviteUserToGroupResp": { "type": "object", "properties": { "data": { "type": "array", "items": { - "$ref": "#/definitions/base_info.UserIDResult" + "$ref": "#/definitions/api_struct.UserIDResult" } }, "errCode": { @@ -6598,7 +6598,7 @@ } } }, - "base_info.IsFriendReq": { + "api_struct.IsFriendReq": { "type": "object", "required": [ "fromUserID", @@ -6617,11 +6617,11 @@ } } }, - "base_info.IsFriendResp": { + "api_struct.IsFriendResp": { "type": "object", "properties": { "data": { - "$ref": "#/definitions/base_info.Response" + "$ref": "#/definitions/api_struct.Response" }, "errCode": { "type": "integer" @@ -6631,7 +6631,7 @@ } } }, - "base_info.JoinGroupReq": { + "api_struct.JoinGroupReq": { "type": "object", "required": [ "groupID", @@ -6655,7 +6655,7 @@ } } }, - "base_info.JoinGroupResp": { + "api_struct.JoinGroupResp": { "type": "object", "properties": { "errCode": { @@ -6666,7 +6666,7 @@ } } }, - "base_info.KickGroupMemberReq": { + "api_struct.KickGroupMemberReq": { "type": "object", "required": [ "groupID", @@ -6691,13 +6691,13 @@ } } }, - "base_info.KickGroupMemberResp": { + "api_struct.KickGroupMemberResp": { "type": "object", "properties": { "data": { "type": "array", "items": { - "$ref": "#/definitions/base_info.UserIDResult" + "$ref": "#/definitions/api_struct.UserIDResult" } }, "errCode": { @@ -6708,7 +6708,7 @@ } } }, - "base_info.LikeOneWorkMomentReq": { + "api_struct.LikeOneWorkMomentReq": { "type": "object", "required": [ "operationID", @@ -6723,7 +6723,7 @@ } } }, - "base_info.LikeOneWorkMomentResp": { + "api_struct.LikeOneWorkMomentResp": { "type": "object", "properties": { "data": { @@ -6737,7 +6737,7 @@ } } }, - "base_info.ManagementBatchSendMsgReq": { + "api_struct.ManagementBatchSendMsgReq": { "type": "object", "required": [ "contentType", @@ -6790,7 +6790,7 @@ } } }, - "base_info.ManagementSendMsgReq": { + "api_struct.ManagementSendMsgReq": { "type": "object", "required": [ "contentType", @@ -6840,7 +6840,7 @@ } } }, - "base_info.ManagementSendMsgResp": { + "api_struct.ManagementSendMsgResp": { "type": "object", "properties": { "data": { @@ -6854,7 +6854,7 @@ } } }, - "base_info.MinioUploadFileResp": { + "api_struct.MinioUploadFileResp": { "type": "object", "properties": { "data": { @@ -6882,7 +6882,7 @@ } } }, - "base_info.MuteGroupMemberReq": { + "api_struct.MuteGroupMemberReq": { "type": "object", "required": [ "groupID", @@ -6905,7 +6905,7 @@ } } }, - "base_info.MuteGroupReq": { + "api_struct.MuteGroupReq": { "type": "object", "required": [ "groupID", @@ -6920,7 +6920,7 @@ } } }, - "base_info.MuteGroupResp": { + "api_struct.MuteGroupResp": { "type": "object", "properties": { "errCode": { @@ -6931,7 +6931,7 @@ } } }, - "base_info.ParseTokenReq": { + "api_struct.ParseTokenReq": { "type": "object", "required": [ "operationID" @@ -6942,7 +6942,7 @@ } } }, - "base_info.ParseTokenResp": { + "api_struct.ParseTokenResp": { "type": "object", "properties": { "errCode": { @@ -6953,7 +6953,7 @@ } } }, - "base_info.QuitGroupReq": { + "api_struct.QuitGroupReq": { "type": "object", "required": [ "groupID", @@ -6968,7 +6968,7 @@ } } }, - "base_info.QuitGroupResp": { + "api_struct.QuitGroupResp": { "type": "object", "properties": { "errCode": { @@ -6979,7 +6979,7 @@ } } }, - "base_info.RemoveBlackListReq": { + "api_struct.RemoveBlackListReq": { "type": "object", "required": [ "fromUserID", @@ -6998,7 +6998,7 @@ } } }, - "base_info.RemoveBlackListResp": { + "api_struct.RemoveBlackListResp": { "type": "object", "properties": { "errCode": { @@ -7009,7 +7009,7 @@ } } }, - "base_info.Response": { + "api_struct.Response": { "type": "object", "properties": { "isFriend": { @@ -7017,7 +7017,7 @@ } } }, - "base_info.SendMsg2TagReq": { + "api_struct.SendMsg2TagReq": { "type": "object", "required": [ "content", @@ -7054,7 +7054,7 @@ } } }, - "base_info.SendMsg2TagResp": { + "api_struct.SendMsg2TagResp": { "type": "object", "properties": { "errCode": { @@ -7065,7 +7065,7 @@ } } }, - "base_info.SetFriendRemarkReq": { + "api_struct.SetFriendRemarkReq": { "type": "object", "required": [ "fromUserID", @@ -7087,7 +7087,7 @@ } } }, - "base_info.SetFriendRemarkResp": { + "api_struct.SetFriendRemarkResp": { "type": "object", "properties": { "errCode": { @@ -7098,7 +7098,7 @@ } } }, - "base_info.SetGlobalRecvMessageOptReq": { + "api_struct.SetGlobalRecvMessageOptReq": { "type": "object", "required": [ "operationID" @@ -7117,7 +7117,7 @@ } } }, - "base_info.SetGlobalRecvMessageOptResp": { + "api_struct.SetGlobalRecvMessageOptResp": { "type": "object", "properties": { "errCode": { @@ -7128,7 +7128,7 @@ } } }, - "base_info.SetGroupInfoReq": { + "api_struct.SetGroupInfoReq": { "type": "object", "required": [ "groupID", @@ -7167,7 +7167,7 @@ } } }, - "base_info.SetGroupInfoResp": { + "api_struct.SetGroupInfoResp": { "type": "object", "properties": { "errCode": { @@ -7178,7 +7178,7 @@ } } }, - "base_info.SetGroupMemberInfoReq": { + "api_struct.SetGroupMemberInfoReq": { "type": "object", "required": [ "groupID", @@ -7211,7 +7211,7 @@ } } }, - "base_info.SetGroupMemberInfoResp": { + "api_struct.SetGroupMemberInfoResp": { "type": "object", "properties": { "errCode": { @@ -7222,7 +7222,7 @@ } } }, - "base_info.SetTagReq": { + "api_struct.SetTagReq": { "type": "object", "required": [ "operationID", @@ -7252,7 +7252,7 @@ } } }, - "base_info.SetTagResp": { + "api_struct.SetTagResp": { "type": "object", "properties": { "errCode": { @@ -7263,7 +7263,7 @@ } } }, - "base_info.Swagger400Resp": { + "api_struct.Swagger400Resp": { "type": "object", "properties": { "errCode": { @@ -7276,7 +7276,7 @@ } } }, - "base_info.Swagger500Resp": { + "api_struct.Swagger500Resp": { "type": "object", "properties": { "errCode": { @@ -7289,7 +7289,7 @@ } } }, - "base_info.TransferGroupOwnerReq": { + "api_struct.TransferGroupOwnerReq": { "type": "object", "required": [ "groupID", @@ -7312,7 +7312,7 @@ } } }, - "base_info.TransferGroupOwnerResp": { + "api_struct.TransferGroupOwnerResp": { "type": "object", "properties": { "errCode": { @@ -7323,7 +7323,7 @@ } } }, - "base_info.UpdateDepartmentReq": { + "api_struct.UpdateDepartmentReq": { "type": "object", "required": [ "departmentID", @@ -7365,7 +7365,7 @@ } } }, - "base_info.UpdateDepartmentResp": { + "api_struct.UpdateDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -7376,7 +7376,7 @@ } } }, - "base_info.UpdateOrganizationUserReq": { + "api_struct.UpdateOrganizationUserReq": { "type": "object", "required": [ "operationID" @@ -7420,7 +7420,7 @@ } } }, - "base_info.UpdateOrganizationUserResp": { + "api_struct.UpdateOrganizationUserResp": { "type": "object", "properties": { "errCode": { @@ -7431,7 +7431,7 @@ } } }, - "base_info.UpdateSelfUserInfoReq": { + "api_struct.UpdateSelfUserInfoReq": { "type": "object", "required": [ "operationID", @@ -7480,7 +7480,7 @@ } } }, - "base_info.UpdateUserInDepartmentReq": { + "api_struct.UpdateUserInDepartmentReq": { "type": "object", "required": [ "operationID" @@ -7512,7 +7512,7 @@ } } }, - "base_info.UpdateUserInDepartmentResp": { + "api_struct.UpdateUserInDepartmentResp": { "type": "object", "properties": { "errCode": { @@ -7523,7 +7523,7 @@ } } }, - "base_info.UpdateUserInfoResp": { + "api_struct.UpdateUserInfoResp": { "type": "object", "properties": { "errCode": { @@ -7534,7 +7534,7 @@ } } }, - "base_info.UserIDResult": { + "api_struct.UserIDResult": { "type": "object", "properties": { "result": { @@ -7545,7 +7545,7 @@ } } }, - "base_info.UserRegisterReq": { + "api_struct.UserRegisterReq": { "type": "object", "required": [ "operationID", @@ -7605,11 +7605,11 @@ } } }, - "base_info.UserRegisterResp": { + "api_struct.UserRegisterResp": { "type": "object", "properties": { "data": { - "$ref": "#/definitions/base_info.UserTokenInfo" + "$ref": "#/definitions/api_struct.UserTokenInfo" }, "errCode": { "type": "integer" @@ -7619,7 +7619,7 @@ } } }, - "base_info.UserTokenInfo": { + "api_struct.UserTokenInfo": { "type": "object", "properties": { "expiredTime": { @@ -7633,7 +7633,7 @@ } } }, - "base_info.UserTokenReq": { + "api_struct.UserTokenReq": { "type": "object", "required": [ "operationID", @@ -7661,11 +7661,11 @@ } } }, - "base_info.UserTokenResp": { + "api_struct.UserTokenResp": { "type": "object", "properties": { "data": { - "$ref": "#/definitions/base_info.UserTokenInfo" + "$ref": "#/definitions/api_struct.UserTokenInfo" }, "errCode": { "type": "integer" @@ -7675,19 +7675,19 @@ } } }, - "base_info.WorkMoment": { + "api_struct.WorkMoment": { "type": "object", "properties": { "atUsers": { "type": "array", "items": { - "$ref": "#/definitions/base_info.WorkMomentUser" + "$ref": "#/definitions/api_struct.WorkMomentUser" } }, "comments": { "type": "array", "items": { - "$ref": "#/definitions/base_info.Comment" + "$ref": "#/definitions/api_struct.Comment" } }, "content": { @@ -7702,7 +7702,7 @@ "likeUsers": { "type": "array", "items": { - "$ref": "#/definitions/base_info.WorkMomentUser" + "$ref": "#/definitions/api_struct.WorkMomentUser" } }, "permission": { @@ -7711,7 +7711,7 @@ "permissionUsers": { "type": "array", "items": { - "$ref": "#/definitions/base_info.WorkMomentUser" + "$ref": "#/definitions/api_struct.WorkMomentUser" } }, "userID": { @@ -7725,7 +7725,7 @@ } } }, - "base_info.WorkMomentUser": { + "api_struct.WorkMomentUser": { "type": "object", "properties": { "userID": { diff --git a/cmd/open_im_api/docs/swagger.yaml b/cmd/open_im_api/docs/swagger.yaml index 77f32fd30..6c649c751 100644 --- a/cmd/open_im_api/docs/swagger.yaml +++ b/cmd/open_im_api/docs/swagger.yaml @@ -122,7 +122,7 @@ definitions: videoUUID: type: string type: object - base_info.AccountCheckReq: + api_struct.AccountCheckReq: properties: checkUserIDList: items: @@ -135,7 +135,7 @@ definitions: - checkUserIDList - operationID type: object - base_info.AccountCheckResp: + api_struct.AccountCheckResp: properties: data: items: @@ -146,7 +146,7 @@ definitions: errMsg: type: string type: object - base_info.AddBlacklistReq: + api_struct.AddBlacklistReq: properties: fromUserID: type: string @@ -159,14 +159,14 @@ definitions: - operationID - toUserID type: object - base_info.AddBlacklistResp: + api_struct.AddBlacklistResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.AddFriendReq: + api_struct.AddFriendReq: properties: fromUserID: type: string @@ -181,14 +181,14 @@ definitions: - operationID - toUserID type: object - base_info.AddFriendResp: + api_struct.AddFriendResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.AddFriendResponseReq: + api_struct.AddFriendResponseReq: properties: flag: enum: @@ -210,14 +210,14 @@ definitions: - operationID - toUserID type: object - base_info.AddFriendResponseResp: + api_struct.AddFriendResponseResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.ApplicationGroupResponseReq: + api_struct.ApplicationGroupResponseReq: properties: fromUserID: description: application from FromUserID @@ -239,14 +239,14 @@ definitions: - handleResult - operationID type: object - base_info.ApplicationGroupResponseResp: + api_struct.ApplicationGroupResponseResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.CancelMuteGroupMemberReq: + api_struct.CancelMuteGroupMemberReq: properties: groupID: type: string @@ -259,14 +259,14 @@ definitions: - operationID - userID type: object - base_info.CancelMuteGroupMemberResp: + api_struct.CancelMuteGroupMemberResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.CancelMuteGroupReq: + api_struct.CancelMuteGroupReq: properties: groupID: type: string @@ -276,14 +276,14 @@ definitions: - groupID - operationID type: object - base_info.CancelMuteGroupResp: + api_struct.CancelMuteGroupResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.CleanUpMsgReq: + api_struct.CleanUpMsgReq: properties: operationID: type: string @@ -293,14 +293,14 @@ definitions: - operationID - userID type: object - base_info.CleanUpMsgResp: + api_struct.CleanUpMsgResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.Comment: + api_struct.Comment: properties: content: type: string @@ -317,7 +317,7 @@ definitions: userName: type: string type: object - base_info.CommentOneWorkMomentReq: + api_struct.CommentOneWorkMomentReq: properties: content: type: string @@ -332,7 +332,7 @@ definitions: - operationID - workMomentID type: object - base_info.CommentOneWorkMomentResp: + api_struct.CommentOneWorkMomentResp: properties: data: type: object @@ -341,7 +341,7 @@ definitions: errMsg: type: string type: object - base_info.Conversation: + api_struct.Conversation: properties: attachedInfo: type: string @@ -380,7 +380,7 @@ definitions: - conversationType - ownerUserID type: object - base_info.CreateDepartmentMemberReq: + api_struct.CreateDepartmentMemberReq: properties: departmentID: type: string @@ -401,14 +401,14 @@ definitions: required: - operationID type: object - base_info.CreateDepartmentMemberResp: + api_struct.CreateDepartmentMemberResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.CreateDepartmentReq: + api_struct.CreateDepartmentReq: properties: createTime: type: integer @@ -435,14 +435,14 @@ definitions: required: - operationID type: object - base_info.CreateDepartmentResp: + api_struct.CreateDepartmentResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.CreateGroupReq: + api_struct.CreateGroupReq: properties: ex: type: string @@ -458,7 +458,7 @@ definitions: type: string memberList: items: - $ref: '#/definitions/base_info.GroupAddMemberInfo' + $ref: '#/definitions/api_struct.GroupAddMemberInfo' type: array notification: type: string @@ -469,21 +469,21 @@ definitions: required: - operationID type: object - base_info.CreateGroupResp: + api_struct.CreateGroupResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.CreateOneWorkMomentReq: + api_struct.CreateOneWorkMomentReq: properties: operationID: type: string workMoment: $ref: '#/definitions/office.WorkMoment' type: object - base_info.CreateOneWorkMomentResp: + api_struct.CreateOneWorkMomentResp: properties: data: type: object @@ -492,7 +492,7 @@ definitions: errMsg: type: string type: object - base_info.CreateOrganizationUserReq: + api_struct.CreateOrganizationUserReq: properties: birth: type: integer @@ -521,14 +521,14 @@ definitions: required: - operationID type: object - base_info.CreateOrganizationUserResp: + api_struct.CreateOrganizationUserResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.CreateTagReq: + api_struct.CreateTagReq: properties: operationID: type: string @@ -545,14 +545,14 @@ definitions: - tagName - userIDList type: object - base_info.CreateTagResp: + api_struct.CreateTagResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.DelMsgReq: + api_struct.DelMsgReq: properties: operationID: type: string @@ -567,14 +567,14 @@ definitions: - seqList - userID type: object - base_info.DelMsgResp: + api_struct.DelMsgResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.DeleteCommentReq: + api_struct.DeleteCommentReq: properties: contentID: type: string @@ -587,7 +587,7 @@ definitions: - operationID - workMomentID type: object - base_info.DeleteCommentResp: + api_struct.DeleteCommentResp: properties: data: type: object @@ -596,7 +596,7 @@ definitions: errMsg: type: string type: object - base_info.DeleteDepartmentReq: + api_struct.DeleteDepartmentReq: properties: departmentID: type: string @@ -606,14 +606,14 @@ definitions: - departmentID - operationID type: object - base_info.DeleteDepartmentResp: + api_struct.DeleteDepartmentResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.DeleteFriendReq: + api_struct.DeleteFriendReq: properties: fromUserID: type: string @@ -626,14 +626,14 @@ definitions: - operationID - toUserID type: object - base_info.DeleteFriendResp: + api_struct.DeleteFriendResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.DeleteOneWorkMomentReq: + api_struct.DeleteOneWorkMomentReq: properties: operationID: type: string @@ -643,7 +643,7 @@ definitions: - operationID - workMomentID type: object - base_info.DeleteOneWorkMomentResp: + api_struct.DeleteOneWorkMomentResp: properties: data: type: object @@ -652,7 +652,7 @@ definitions: errMsg: type: string type: object - base_info.DeleteOrganizationUserReq: + api_struct.DeleteOrganizationUserReq: properties: operationID: type: string @@ -662,14 +662,14 @@ definitions: - operationID - userID type: object - base_info.DeleteOrganizationUserResp: + api_struct.DeleteOrganizationUserResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.DeleteTagReq: + api_struct.DeleteTagReq: properties: operationID: type: string @@ -679,14 +679,14 @@ definitions: - operationID - tagID type: object - base_info.DeleteTagResp: + api_struct.DeleteTagResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.DeleteUserInDepartmentReq: + api_struct.DeleteUserInDepartmentReq: properties: departmentID: type: string @@ -699,14 +699,14 @@ definitions: - operationID - userID type: object - base_info.DeleteUserInDepartmentResp: + api_struct.DeleteUserInDepartmentResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.DismissGroupReq: + api_struct.DismissGroupReq: properties: groupID: type: string @@ -716,19 +716,19 @@ definitions: - groupID - operationID type: object - base_info.DismissGroupResp: + api_struct.DismissGroupResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.ExpireTime: + api_struct.ExpireTime: properties: expireTimeSeconds: type: integer type: object - base_info.ForceLogoutReq: + api_struct.ForceLogoutReq: properties: fromUserID: maxLength: 64 @@ -745,14 +745,14 @@ definitions: - operationID - platform type: object - base_info.ForceLogoutResp: + api_struct.ForceLogoutResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetAllConversationsReq: + api_struct.GetAllConversationsReq: properties: operationID: type: string @@ -762,25 +762,25 @@ definitions: - operationID - ownerUserID type: object - base_info.GetAllConversationsResp: + api_struct.GetAllConversationsResp: properties: data: items: - $ref: '#/definitions/base_info.Conversation' + $ref: '#/definitions/api_struct.Conversation' type: array errCode: type: integer errMsg: type: string type: object - base_info.GetAllUsersUidReq: + api_struct.GetAllUsersUidReq: properties: operationID: type: string required: - operationID type: object - base_info.GetAllUsersUidResp: + api_struct.GetAllUsersUidResp: properties: data: items: @@ -791,7 +791,7 @@ definitions: errMsg: type: string type: object - base_info.GetBlackListReq: + api_struct.GetBlackListReq: properties: fromUserID: type: string @@ -801,14 +801,14 @@ definitions: - fromUserID - operationID type: object - base_info.GetBlackListResp: + api_struct.GetBlackListResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetConversationReq: + api_struct.GetConversationReq: properties: conversationID: type: string @@ -821,16 +821,16 @@ definitions: - operationID - ownerUserID type: object - base_info.GetConversationResp: + api_struct.GetConversationResp: properties: data: - $ref: '#/definitions/base_info.Conversation' + $ref: '#/definitions/api_struct.Conversation' errCode: type: integer errMsg: type: string type: object - base_info.GetConversationsReq: + api_struct.GetConversationsReq: properties: conversationIDs: items: @@ -845,18 +845,18 @@ definitions: - operationID - ownerUserID type: object - base_info.GetConversationsResp: + api_struct.GetConversationsResp: properties: data: items: - $ref: '#/definitions/base_info.Conversation' + $ref: '#/definitions/api_struct.Conversation' type: array errCode: type: integer errMsg: type: string type: object - base_info.GetDepartmentMemberReq: + api_struct.GetDepartmentMemberReq: properties: departmentID: type: string @@ -866,14 +866,14 @@ definitions: - departmentID - operationID type: object - base_info.GetDepartmentMemberResp: + api_struct.GetDepartmentMemberResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetFriendApplyListReq: + api_struct.GetFriendApplyListReq: properties: fromUserID: type: string @@ -883,14 +883,14 @@ definitions: - fromUserID - operationID type: object - base_info.GetFriendApplyListResp: + api_struct.GetFriendApplyListResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetFriendListReq: + api_struct.GetFriendListReq: properties: fromUserID: type: string @@ -900,14 +900,14 @@ definitions: - fromUserID - operationID type: object - base_info.GetFriendListResp: + api_struct.GetFriendListResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetGroupAllMemberReq: + api_struct.GetGroupAllMemberReq: properties: count: type: integer @@ -923,14 +923,14 @@ definitions: - offset - operationID type: object - base_info.GetGroupAllMemberResp: + api_struct.GetGroupAllMemberResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetGroupApplicationListReq: + api_struct.GetGroupApplicationListReq: properties: fromUserID: description: 作为管理员或群主收到的 进群申请 @@ -941,14 +941,14 @@ definitions: - fromUserID - operationID type: object - base_info.GetGroupApplicationListResp: + api_struct.GetGroupApplicationListResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetGroupInfoReq: + api_struct.GetGroupInfoReq: properties: groupIDList: items: @@ -960,14 +960,14 @@ definitions: - groupIDList - operationID type: object - base_info.GetGroupInfoResp: + api_struct.GetGroupInfoResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetGroupMembersInfoReq: + api_struct.GetGroupMembersInfoReq: properties: groupID: type: string @@ -982,14 +982,14 @@ definitions: - memberList - operationID type: object - base_info.GetGroupMembersInfoResp: + api_struct.GetGroupMembersInfoResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetJoinedGroupListReq: + api_struct.GetJoinedGroupListReq: properties: fromUserID: type: string @@ -999,14 +999,14 @@ definitions: - fromUserID - operationID type: object - base_info.GetJoinedGroupListResp: + api_struct.GetJoinedGroupListResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetSelfApplyListReq: + api_struct.GetSelfApplyListReq: properties: fromUserID: type: string @@ -1016,14 +1016,14 @@ definitions: - fromUserID - operationID type: object - base_info.GetSelfApplyListResp: + api_struct.GetSelfApplyListResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetSelfUserInfoReq: + api_struct.GetSelfUserInfoReq: properties: operationID: type: string @@ -1033,14 +1033,14 @@ definitions: - operationID - userID type: object - base_info.GetSelfUserInfoResp: + api_struct.GetSelfUserInfoResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetSubDepartmentReq: + api_struct.GetSubDepartmentReq: properties: departmentID: type: string @@ -1050,14 +1050,14 @@ definitions: - departmentID - operationID type: object - base_info.GetSubDepartmentResp: + api_struct.GetSubDepartmentResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetTagSendLogsReq: + api_struct.GetTagSendLogsReq: properties: operationID: type: string @@ -1070,7 +1070,7 @@ definitions: - pageNumber - showNumber type: object - base_info.GetTagSendLogsResp: + api_struct.GetTagSendLogsResp: properties: data: properties: @@ -1088,7 +1088,7 @@ definitions: errMsg: type: string type: object - base_info.GetUserFriendWorkMomentsReq: + api_struct.GetUserFriendWorkMomentsReq: properties: operationID: type: string @@ -1101,7 +1101,7 @@ definitions: - pageNumber - showNumber type: object - base_info.GetUserFriendWorkMomentsResp: + api_struct.GetUserFriendWorkMomentsResp: properties: data: properties: @@ -1111,7 +1111,7 @@ definitions: type: integer workMoments: items: - $ref: '#/definitions/base_info.WorkMoment' + $ref: '#/definitions/api_struct.WorkMoment' type: array type: object errCode: @@ -1119,7 +1119,7 @@ definitions: errMsg: type: string type: object - base_info.GetUserInDepartmentReq: + api_struct.GetUserInDepartmentReq: properties: operationID: type: string @@ -1129,14 +1129,14 @@ definitions: - operationID - userID type: object - base_info.GetUserInDepartmentResp: + api_struct.GetUserInDepartmentResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetUserReqGroupApplicationListReq: + api_struct.GetUserReqGroupApplicationListReq: properties: operationID: type: string @@ -1146,7 +1146,7 @@ definitions: - operationID - userID type: object - base_info.GetUserTagByIDReq: + api_struct.GetUserTagByIDReq: properties: operationID: type: string @@ -1156,7 +1156,7 @@ definitions: - operationID - tagID type: object - base_info.GetUserTagByIDResp: + api_struct.GetUserTagByIDResp: properties: data: properties: @@ -1168,14 +1168,14 @@ definitions: errMsg: type: string type: object - base_info.GetUserTagsReq: + api_struct.GetUserTagsReq: properties: operationID: type: string required: - operationID type: object - base_info.GetUserTagsResp: + api_struct.GetUserTagsResp: properties: data: properties: @@ -1189,7 +1189,7 @@ definitions: errMsg: type: string type: object - base_info.GetUserWorkMomentsReq: + api_struct.GetUserWorkMomentsReq: properties: operationID: type: string @@ -1204,7 +1204,7 @@ definitions: - pageNumber - showNumber type: object - base_info.GetUserWorkMomentsResp: + api_struct.GetUserWorkMomentsResp: properties: data: properties: @@ -1214,7 +1214,7 @@ definitions: type: integer workMoments: items: - $ref: '#/definitions/base_info.WorkMoment' + $ref: '#/definitions/api_struct.WorkMoment' type: array type: object errCode: @@ -1222,7 +1222,7 @@ definitions: errMsg: type: string type: object - base_info.GetUsersInfoReq: + api_struct.GetUsersInfoReq: properties: operationID: type: string @@ -1234,14 +1234,14 @@ definitions: - operationID - userIDList type: object - base_info.GetUsersInfoResp: + api_struct.GetUsersInfoResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.GetUsersOnlineStatusReq: + api_struct.GetUsersOnlineStatusReq: properties: operationID: type: string @@ -1254,7 +1254,7 @@ definitions: - operationID - userIDList type: object - base_info.GetUsersOnlineStatusResp: + api_struct.GetUsersOnlineStatusResp: properties: data: items: @@ -1265,7 +1265,7 @@ definitions: errMsg: type: string type: object - base_info.GetWorkMomentByIDReq: + api_struct.GetWorkMomentByIDReq: properties: operationID: type: string @@ -1275,19 +1275,19 @@ definitions: - operationID - workMomentID type: object - base_info.GetWorkMomentByIDResp: + api_struct.GetWorkMomentByIDResp: properties: data: properties: workMoment: - $ref: '#/definitions/base_info.WorkMoment' + $ref: '#/definitions/api_struct.WorkMoment' type: object errCode: type: integer errMsg: type: string type: object - base_info.GroupAddMemberInfo: + api_struct.GroupAddMemberInfo: properties: roleLevel: enum: @@ -1300,7 +1300,7 @@ definitions: - roleLevel - userID type: object - base_info.ImportFriendReq: + api_struct.ImportFriendReq: properties: friendUserIDList: items: @@ -1315,18 +1315,18 @@ definitions: - fromUserID - operationID type: object - base_info.ImportFriendResp: + api_struct.ImportFriendResp: properties: data: items: - $ref: '#/definitions/base_info.UserIDResult' + $ref: '#/definitions/api_struct.UserIDResult' type: array errCode: type: integer errMsg: type: string type: object - base_info.InviteUserToGroupReq: + api_struct.InviteUserToGroupReq: properties: groupID: type: string @@ -1343,18 +1343,18 @@ definitions: - invitedUserIDList - operationID type: object - base_info.InviteUserToGroupResp: + api_struct.InviteUserToGroupResp: properties: data: items: - $ref: '#/definitions/base_info.UserIDResult' + $ref: '#/definitions/api_struct.UserIDResult' type: array errCode: type: integer errMsg: type: string type: object - base_info.IsFriendReq: + api_struct.IsFriendReq: properties: fromUserID: type: string @@ -1367,16 +1367,16 @@ definitions: - operationID - toUserID type: object - base_info.IsFriendResp: + api_struct.IsFriendResp: properties: data: - $ref: '#/definitions/base_info.Response' + $ref: '#/definitions/api_struct.Response' errCode: type: integer errMsg: type: string type: object - base_info.JoinGroupReq: + api_struct.JoinGroupReq: properties: groupID: type: string @@ -1392,14 +1392,14 @@ definitions: - groupID - operationID type: object - base_info.JoinGroupResp: + api_struct.JoinGroupResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.KickGroupMemberReq: + api_struct.KickGroupMemberReq: properties: groupID: type: string @@ -1416,18 +1416,18 @@ definitions: - kickedUserIDList - operationID type: object - base_info.KickGroupMemberResp: + api_struct.KickGroupMemberResp: properties: data: items: - $ref: '#/definitions/base_info.UserIDResult' + $ref: '#/definitions/api_struct.UserIDResult' type: array errCode: type: integer errMsg: type: string type: object - base_info.LikeOneWorkMomentReq: + api_struct.LikeOneWorkMomentReq: properties: operationID: type: string @@ -1437,7 +1437,7 @@ definitions: - operationID - workMomentID type: object - base_info.LikeOneWorkMomentResp: + api_struct.LikeOneWorkMomentResp: properties: data: type: object @@ -1446,7 +1446,7 @@ definitions: errMsg: type: string type: object - base_info.ManagementBatchSendMsgReq: + api_struct.ManagementBatchSendMsgReq: properties: businessOperationID: type: string @@ -1482,7 +1482,7 @@ definitions: - sendID - sessionType type: object - base_info.ManagementSendMsgReq: + api_struct.ManagementSendMsgReq: properties: businessOperationID: type: string @@ -1516,7 +1516,7 @@ definitions: - sendID - sessionType type: object - base_info.ManagementSendMsgResp: + api_struct.ManagementSendMsgResp: properties: data: $ref: '#/definitions/server_api_params.UserSendMsgResp' @@ -1525,7 +1525,7 @@ definitions: errMsg: type: string type: object - base_info.MinioUploadFileResp: + api_struct.MinioUploadFileResp: properties: data: properties: @@ -1543,7 +1543,7 @@ definitions: errMsg: type: string type: object - base_info.MuteGroupMemberReq: + api_struct.MuteGroupMemberReq: properties: groupID: type: string @@ -1559,7 +1559,7 @@ definitions: - operationID - userID type: object - base_info.MuteGroupReq: + api_struct.MuteGroupReq: properties: groupID: type: string @@ -1569,28 +1569,28 @@ definitions: - groupID - operationID type: object - base_info.MuteGroupResp: + api_struct.MuteGroupResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.ParseTokenReq: + api_struct.ParseTokenReq: properties: operationID: type: string required: - operationID type: object - base_info.ParseTokenResp: + api_struct.ParseTokenResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.QuitGroupReq: + api_struct.QuitGroupReq: properties: groupID: type: string @@ -1600,14 +1600,14 @@ definitions: - groupID - operationID type: object - base_info.QuitGroupResp: + api_struct.QuitGroupResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.RemoveBlackListReq: + api_struct.RemoveBlackListReq: properties: fromUserID: type: string @@ -1620,19 +1620,19 @@ definitions: - operationID - toUserID type: object - base_info.RemoveBlackListResp: + api_struct.RemoveBlackListResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.Response: + api_struct.Response: properties: isFriend: type: boolean type: object - base_info.SendMsg2TagReq: + api_struct.SendMsg2TagReq: properties: content: type: string @@ -1657,14 +1657,14 @@ definitions: - operationID - senderPlatformID type: object - base_info.SendMsg2TagResp: + api_struct.SendMsg2TagResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.SetFriendRemarkReq: + api_struct.SetFriendRemarkReq: properties: fromUserID: type: string @@ -1679,14 +1679,14 @@ definitions: - operationID - toUserID type: object - base_info.SetFriendRemarkResp: + api_struct.SetFriendRemarkResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.SetGlobalRecvMessageOptReq: + api_struct.SetGlobalRecvMessageOptReq: properties: globalRecvMsgOpt: enum: @@ -1699,14 +1699,14 @@ definitions: required: - operationID type: object - base_info.SetGlobalRecvMessageOptResp: + api_struct.SetGlobalRecvMessageOptResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.SetGroupInfoReq: + api_struct.SetGroupInfoReq: properties: applyMemberFriend: type: integer @@ -1732,14 +1732,14 @@ definitions: - groupID - operationID type: object - base_info.SetGroupInfoResp: + api_struct.SetGroupInfoResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.SetGroupMemberInfoReq: + api_struct.SetGroupMemberInfoReq: properties: ex: type: string @@ -1762,14 +1762,14 @@ definitions: - operationID - userID type: object - base_info.SetGroupMemberInfoResp: + api_struct.SetGroupMemberInfoResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.SetTagReq: + api_struct.SetTagReq: properties: increaseUserIDList: items: @@ -1789,14 +1789,14 @@ definitions: - operationID - tagID type: object - base_info.SetTagResp: + api_struct.SetTagResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.Swagger400Resp: + api_struct.Swagger400Resp: properties: errCode: example: 400 @@ -1805,7 +1805,7 @@ definitions: example: err msg type: string type: object - base_info.Swagger500Resp: + api_struct.Swagger500Resp: properties: errCode: example: 500 @@ -1814,7 +1814,7 @@ definitions: example: err msg type: string type: object - base_info.TransferGroupOwnerReq: + api_struct.TransferGroupOwnerReq: properties: groupID: type: string @@ -1830,14 +1830,14 @@ definitions: - oldOwnerUserID - operationID type: object - base_info.TransferGroupOwnerResp: + api_struct.TransferGroupOwnerResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.UpdateDepartmentReq: + api_struct.UpdateDepartmentReq: properties: createTime: type: integer @@ -1865,14 +1865,14 @@ definitions: - departmentID - operationID type: object - base_info.UpdateDepartmentResp: + api_struct.UpdateDepartmentResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.UpdateOrganizationUserReq: + api_struct.UpdateOrganizationUserReq: properties: birth: type: integer @@ -1901,14 +1901,14 @@ definitions: required: - operationID type: object - base_info.UpdateOrganizationUserResp: + api_struct.UpdateOrganizationUserResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.UpdateSelfUserInfoReq: + api_struct.UpdateSelfUserInfoReq: properties: birth: type: integer @@ -1944,7 +1944,7 @@ definitions: - operationID - userID type: object - base_info.UpdateUserInDepartmentReq: + api_struct.UpdateUserInDepartmentReq: properties: departmentID: type: string @@ -1965,28 +1965,28 @@ definitions: required: - operationID type: object - base_info.UpdateUserInDepartmentResp: + api_struct.UpdateUserInDepartmentResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.UpdateUserInfoResp: + api_struct.UpdateUserInfoResp: properties: errCode: type: integer errMsg: type: string type: object - base_info.UserIDResult: + api_struct.UserIDResult: properties: result: type: integer userID: type: string type: object - base_info.UserRegisterReq: + api_struct.UserRegisterReq: properties: birth: type: integer @@ -2031,16 +2031,16 @@ definitions: - secret - userID type: object - base_info.UserRegisterResp: + api_struct.UserRegisterResp: properties: data: - $ref: '#/definitions/base_info.UserTokenInfo' + $ref: '#/definitions/api_struct.UserTokenInfo' errCode: type: integer errMsg: type: string type: object - base_info.UserTokenInfo: + api_struct.UserTokenInfo: properties: expiredTime: type: integer @@ -2049,7 +2049,7 @@ definitions: userID: type: string type: object - base_info.UserTokenReq: + api_struct.UserTokenReq: properties: operationID: type: string @@ -2070,24 +2070,24 @@ definitions: - secret - userID type: object - base_info.UserTokenResp: + api_struct.UserTokenResp: properties: data: - $ref: '#/definitions/base_info.UserTokenInfo' + $ref: '#/definitions/api_struct.UserTokenInfo' errCode: type: integer errMsg: type: string type: object - base_info.WorkMoment: + api_struct.WorkMoment: properties: atUsers: items: - $ref: '#/definitions/base_info.WorkMomentUser' + $ref: '#/definitions/api_struct.WorkMomentUser' type: array comments: items: - $ref: '#/definitions/base_info.Comment' + $ref: '#/definitions/api_struct.Comment' type: array content: type: string @@ -2097,13 +2097,13 @@ definitions: type: string likeUsers: items: - $ref: '#/definitions/base_info.WorkMomentUser' + $ref: '#/definitions/api_struct.WorkMomentUser' type: array permission: type: integer permissionUsers: items: - $ref: '#/definitions/base_info.WorkMomentUser' + $ref: '#/definitions/api_struct.WorkMomentUser' type: array userID: type: string @@ -2112,7 +2112,7 @@ definitions: workMomentID: type: string type: object - base_info.WorkMomentUser: + api_struct.WorkMomentUser: properties: userID: type: string @@ -2671,22 +2671,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.ForceLogoutReq' + $ref: '#/definitions/api_struct.ForceLogoutReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.ForceLogoutResp' + $ref: '#/definitions/api_struct.ForceLogoutResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 强制登出 tags: - 鉴权认证 @@ -2707,7 +2707,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.ParseTokenReq' + $ref: '#/definitions/api_struct.ParseTokenReq' produces: - application/json responses: @@ -2715,19 +2715,19 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.ParseTokenResp' + - $ref: '#/definitions/api_struct.ParseTokenResp' - properties: Data: - $ref: '#/definitions/base_info.ExpireTime' + $ref: '#/definitions/api_struct.ExpireTime' type: object "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 解析当前用户token tags: - 鉴权认证 @@ -2744,22 +2744,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.UserRegisterReq' + $ref: '#/definitions/api_struct.UserRegisterReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.UserRegisterResp' + $ref: '#/definitions/api_struct.UserRegisterResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 用户注册 tags: - 鉴权认证 @@ -2775,22 +2775,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.UserTokenReq' + $ref: '#/definitions/api_struct.UserTokenReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.UserTokenResp' + $ref: '#/definitions/api_struct.UserTokenResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 用户登录 tags: - 鉴权认证 @@ -2811,22 +2811,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.AddBlacklistReq' + $ref: '#/definitions/api_struct.AddBlacklistReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.AddBlacklistResp' + $ref: '#/definitions/api_struct.AddBlacklistResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 添加黑名单 tags: - 好友相关 @@ -2847,22 +2847,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.AddFriendReq' + $ref: '#/definitions/api_struct.AddFriendReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.AddFriendResp' + $ref: '#/definitions/api_struct.AddFriendResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 添加好友 tags: - 好友相关 @@ -2884,22 +2884,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.AddFriendResponseReq' + $ref: '#/definitions/api_struct.AddFriendResponseReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.AddFriendResponseResp' + $ref: '#/definitions/api_struct.AddFriendResponseResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 同意/拒绝好友请求 tags: - 好友相关 @@ -2920,22 +2920,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.DeleteFriendReq' + $ref: '#/definitions/api_struct.DeleteFriendReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.DeleteFriendResp' + $ref: '#/definitions/api_struct.DeleteFriendResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 删除好友 tags: - 好友相关 @@ -2956,7 +2956,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetBlackListReq' + $ref: '#/definitions/api_struct.GetBlackListReq' produces: - application/json responses: @@ -2964,7 +2964,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetBlackListResp' + - $ref: '#/definitions/api_struct.GetBlackListResp' - properties: data: items: @@ -2974,11 +2974,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' summary: 获取黑名单列表 tags: - 好友相关 @@ -2999,7 +2999,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetFriendApplyListReq' + $ref: '#/definitions/api_struct.GetFriendApplyListReq' produces: - application/json responses: @@ -3007,7 +3007,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetFriendApplyListResp' + - $ref: '#/definitions/api_struct.GetFriendApplyListResp' - properties: data: items: @@ -3017,11 +3017,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' summary: 获取好友申请列表 tags: - 好友相关 @@ -3042,7 +3042,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetFriendListReq' + $ref: '#/definitions/api_struct.GetFriendListReq' produces: - application/json responses: @@ -3050,7 +3050,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetFriendListResp' + - $ref: '#/definitions/api_struct.GetFriendListResp' - properties: data: items: @@ -3060,11 +3060,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取用户的好友列表 tags: - 好友相关 @@ -3085,7 +3085,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetSelfApplyListReq' + $ref: '#/definitions/api_struct.GetSelfApplyListReq' produces: - application/json responses: @@ -3093,7 +3093,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetSelfApplyListResp' + - $ref: '#/definitions/api_struct.GetSelfApplyListResp' - properties: data: items: @@ -3103,11 +3103,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取自己的好友申请列表 tags: - 好友相关 @@ -3128,22 +3128,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.ImportFriendReq' + $ref: '#/definitions/api_struct.ImportFriendReq' produces: - application/json responses: "0": description: data列表中对象的result-1为添加该用户失败
0为成功 schema: - $ref: '#/definitions/base_info.ImportFriendResp' + $ref: '#/definitions/api_struct.ImportFriendResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 批量加好友 tags: - 好友相关 @@ -3164,22 +3164,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.IsFriendReq' + $ref: '#/definitions/api_struct.IsFriendReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.IsFriendResp' + $ref: '#/definitions/api_struct.IsFriendResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 检查用户之间是否为好友 tags: - 好友相关 @@ -3200,22 +3200,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.RemoveBlackListReq' + $ref: '#/definitions/api_struct.RemoveBlackListReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.RemoveBlackListResp' + $ref: '#/definitions/api_struct.RemoveBlackListResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 把用户移除黑名单 tags: - 好友相关 @@ -3236,22 +3236,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.SetFriendRemarkReq' + $ref: '#/definitions/api_struct.SetFriendRemarkReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.SetFriendRemarkResp' + $ref: '#/definitions/api_struct.SetFriendRemarkResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 设置好友备注 tags: - 好友相关 @@ -3272,22 +3272,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.CancelMuteGroupReq' + $ref: '#/definitions/api_struct.CancelMuteGroupReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.CancelMuteGroupResp' + $ref: '#/definitions/api_struct.CancelMuteGroupResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 取消禁言群组 tags: - 群组相关 @@ -3308,22 +3308,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.CancelMuteGroupMemberReq' + $ref: '#/definitions/api_struct.CancelMuteGroupMemberReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.CancelMuteGroupMemberResp' + $ref: '#/definitions/api_struct.CancelMuteGroupMemberResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 取消禁言群成员 tags: - 群组相关 @@ -3346,7 +3346,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.CreateGroupReq' + $ref: '#/definitions/api_struct.CreateGroupReq' produces: - application/json responses: @@ -3354,7 +3354,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.CreateGroupResp' + - $ref: '#/definitions/api_struct.CreateGroupResp' - properties: data: $ref: '#/definitions/server_api_params.GroupInfo' @@ -3362,11 +3362,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 创建群组 tags: - 群组相关 @@ -3387,22 +3387,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.DismissGroupReq' + $ref: '#/definitions/api_struct.DismissGroupReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.DismissGroupResp' + $ref: '#/definitions/api_struct.DismissGroupResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 解散群组 tags: - 群组相关 @@ -3423,7 +3423,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetGroupAllMemberReq' + $ref: '#/definitions/api_struct.GetGroupAllMemberReq' produces: - application/json responses: @@ -3431,7 +3431,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetGroupAllMemberResp' + - $ref: '#/definitions/api_struct.GetGroupAllMemberResp' - properties: data: items: @@ -3441,11 +3441,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取全部群成员列表 tags: - 群组相关 @@ -3466,7 +3466,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetGroupMembersInfoReq' + $ref: '#/definitions/api_struct.GetGroupMembersInfoReq' produces: - application/json responses: @@ -3474,7 +3474,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetGroupMembersInfoResp' + - $ref: '#/definitions/api_struct.GetGroupMembersInfoResp' - properties: data: items: @@ -3484,11 +3484,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取群成员信息 tags: - 群组相关 @@ -3509,22 +3509,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetGroupInfoReq' + $ref: '#/definitions/api_struct.GetGroupInfoReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetGroupInfoResp' + $ref: '#/definitions/api_struct.GetGroupInfoResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 通过群ID列表获取群信息 tags: - 群组相关 @@ -3545,7 +3545,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetJoinedGroupListReq' + $ref: '#/definitions/api_struct.GetJoinedGroupListReq' produces: - application/json responses: @@ -3553,7 +3553,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetJoinedGroupListResp' + - $ref: '#/definitions/api_struct.GetJoinedGroupListResp' - properties: data: items: @@ -3563,11 +3563,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取用户加入群列表 tags: - 群组相关 @@ -3588,7 +3588,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetGroupApplicationListReq' + $ref: '#/definitions/api_struct.GetGroupApplicationListReq' produces: - application/json responses: @@ -3596,7 +3596,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetGroupApplicationListResp' + - $ref: '#/definitions/api_struct.GetGroupApplicationListResp' - properties: data: items: @@ -3606,11 +3606,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取用户收到的加群信息列表 tags: - 群组相关 @@ -3631,7 +3631,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetUserReqGroupApplicationListReq' + $ref: '#/definitions/api_struct.GetUserReqGroupApplicationListReq' produces: - application/json responses: @@ -3639,7 +3639,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetGroupApplicationListResp' + - $ref: '#/definitions/api_struct.GetGroupApplicationListResp' - properties: data: items: @@ -3649,11 +3649,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取用户加群申请列表 tags: - 群组相关 @@ -3675,22 +3675,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.ApplicationGroupResponseReq' + $ref: '#/definitions/api_struct.ApplicationGroupResponseReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.ApplicationGroupResponseResp' + $ref: '#/definitions/api_struct.ApplicationGroupResponseResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 处理加群消息 tags: - 群组相关 @@ -3711,22 +3711,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.InviteUserToGroupReq' + $ref: '#/definitions/api_struct.InviteUserToGroupReq' produces: - application/json responses: "0": description: result为结果码, -1为失败, 0为成功 schema: - $ref: '#/definitions/base_info.InviteUserToGroupResp' + $ref: '#/definitions/api_struct.InviteUserToGroupResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 将用户拉入群组 tags: - 群组相关 @@ -3747,22 +3747,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.JoinGroupReq' + $ref: '#/definitions/api_struct.JoinGroupReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.JoinGroupResp' + $ref: '#/definitions/api_struct.JoinGroupResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 加入群聊 tags: - 群组相关 @@ -3783,22 +3783,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.KickGroupMemberReq' + $ref: '#/definitions/api_struct.KickGroupMemberReq' produces: - application/json responses: "0": description: result为结果码, -1为失败, 0为成功 schema: - $ref: '#/definitions/base_info.KickGroupMemberResp' + $ref: '#/definitions/api_struct.KickGroupMemberResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 把用户踢出群组 tags: - 群组相关 @@ -3819,22 +3819,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.MuteGroupReq' + $ref: '#/definitions/api_struct.MuteGroupReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.MuteGroupResp' + $ref: '#/definitions/api_struct.MuteGroupResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.MuteGroupResp' + $ref: '#/definitions/api_struct.MuteGroupResp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.MuteGroupResp' + $ref: '#/definitions/api_struct.MuteGroupResp' summary: 禁言群组 tags: - 群组相关 @@ -3855,22 +3855,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.MuteGroupMemberReq' + $ref: '#/definitions/api_struct.MuteGroupMemberReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.DismissGroupResp' + $ref: '#/definitions/api_struct.DismissGroupResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 禁言群成员 tags: - 群组相关 @@ -3891,22 +3891,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.QuitGroupReq' + $ref: '#/definitions/api_struct.QuitGroupReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.QuitGroupResp' + $ref: '#/definitions/api_struct.QuitGroupResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 当前用户退出群聊 tags: - 群组相关 @@ -3928,22 +3928,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.SetGroupInfoReq' + $ref: '#/definitions/api_struct.SetGroupInfoReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.SetGroupInfoResp' + $ref: '#/definitions/api_struct.SetGroupInfoResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 设置群信息 tags: - 群组相关 @@ -3965,22 +3965,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.SetGroupMemberInfoReq' + $ref: '#/definitions/api_struct.SetGroupMemberInfoReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.SetGroupMemberInfoResp' + $ref: '#/definitions/api_struct.SetGroupMemberInfoResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 修改群成员信息 tags: - 群组相关 @@ -4001,22 +4001,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.TransferGroupOwnerReq' + $ref: '#/definitions/api_struct.TransferGroupOwnerReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.TransferGroupOwnerResp' + $ref: '#/definitions/api_struct.TransferGroupOwnerResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 转让群主 tags: - 群组相关 @@ -4038,7 +4038,7 @@ paths: required: true schema: allOf: - - $ref: '#/definitions/base_info.ManagementBatchSendMsgReq' + - $ref: '#/definitions/api_struct.ManagementBatchSendMsgReq' - properties: content: $ref: '#/definitions/Open_IM_internal_api_manage.TextElem' @@ -4049,7 +4049,7 @@ paths: required: true schema: allOf: - - $ref: '#/definitions/base_info.ManagementSendMsgReq' + - $ref: '#/definitions/api_struct.ManagementSendMsgReq' - properties: content: $ref: '#/definitions/Open_IM_internal_api_manage.OANotificationElem' @@ -4060,15 +4060,15 @@ paths: "0": description: serverMsgID为服务器消息ID
clientMsgID为客户端消息ID
sendTime为发送消息时间 schema: - $ref: '#/definitions/base_info.ManagementBatchSendMsgReq' + $ref: '#/definitions/api_struct.ManagementBatchSendMsgReq' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.ManagementBatchSendMsgReq' + $ref: '#/definitions/api_struct.ManagementBatchSendMsgReq' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.ManagementBatchSendMsgReq' + $ref: '#/definitions/api_struct.ManagementBatchSendMsgReq' summary: 管理员批量发送群聊单聊消息 tags: - 消息相关 @@ -4089,22 +4089,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.CleanUpMsgReq' + $ref: '#/definitions/api_struct.CleanUpMsgReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.CleanUpMsgResp' + $ref: '#/definitions/api_struct.CleanUpMsgResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 清空用户消息 tags: - 消息相关 @@ -4125,22 +4125,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.DelMsgReq' + $ref: '#/definitions/api_struct.DelMsgReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.DelMsgResp' + $ref: '#/definitions/api_struct.DelMsgResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 根据seq列表删除消息 tags: - 消息相关 @@ -4161,22 +4161,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetAllConversationsReq' + $ref: '#/definitions/api_struct.GetAllConversationsReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetAllConversationsResp' + $ref: '#/definitions/api_struct.GetAllConversationsResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取用户所有会话 tags: - 会话相关 @@ -4197,22 +4197,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetConversationReq' + $ref: '#/definitions/api_struct.GetConversationReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetConversationResp' + $ref: '#/definitions/api_struct.GetConversationResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 根据会话ID获取会话 tags: - 会话相关 @@ -4233,22 +4233,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetConversationsReq' + $ref: '#/definitions/api_struct.GetConversationsReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetConversationsResp' + $ref: '#/definitions/api_struct.GetConversationsResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 根据会话ID列表获取会话 tags: - 会话相关 @@ -4270,7 +4270,7 @@ paths: required: true schema: allOf: - - $ref: '#/definitions/base_info.ManagementSendMsgReq' + - $ref: '#/definitions/api_struct.ManagementSendMsgReq' - properties: content: $ref: '#/definitions/Open_IM_internal_api_manage.TextElem' @@ -4281,7 +4281,7 @@ paths: required: true schema: allOf: - - $ref: '#/definitions/base_info.ManagementSendMsgReq' + - $ref: '#/definitions/api_struct.ManagementSendMsgReq' - properties: content: $ref: '#/definitions/Open_IM_internal_api_manage.OANotificationElem' @@ -4292,7 +4292,7 @@ paths: required: true schema: allOf: - - $ref: '#/definitions/base_info.ManagementSendMsgReq' + - $ref: '#/definitions/api_struct.ManagementSendMsgReq' - properties: content: $ref: '#/definitions/Open_IM_internal_api_manage.RevokeElem' @@ -4303,15 +4303,15 @@ paths: "0": description: serverMsgID为服务器消息ID
clientMsgID为客户端消息ID
sendTime为发送消息时间 schema: - $ref: '#/definitions/base_info.ManagementSendMsgResp' + $ref: '#/definitions/api_struct.ManagementSendMsgResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.ManagementSendMsgResp' + $ref: '#/definitions/api_struct.ManagementSendMsgResp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.ManagementSendMsgResp' + $ref: '#/definitions/api_struct.ManagementSendMsgResp' summary: 管理员发送/撤回消息 tags: - 消息相关 @@ -4332,22 +4332,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.CommentOneWorkMomentReq' + $ref: '#/definitions/api_struct.CommentOneWorkMomentReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.CommentOneWorkMomentResp' + $ref: '#/definitions/api_struct.CommentOneWorkMomentResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 评论一条工作圈 tags: - 工作圈 @@ -4369,22 +4369,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.CreateOneWorkMomentReq' + $ref: '#/definitions/api_struct.CreateOneWorkMomentReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.CreateOneWorkMomentResp' + $ref: '#/definitions/api_struct.CreateOneWorkMomentResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 创建一条工作圈 tags: - 工作圈 @@ -4405,22 +4405,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.CreateTagReq' + $ref: '#/definitions/api_struct.CreateTagReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.CreateTagResp' + $ref: '#/definitions/api_struct.CreateTagResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 创建标签 tags: - 标签 @@ -4441,22 +4441,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.DeleteCommentReq' + $ref: '#/definitions/api_struct.DeleteCommentReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.DeleteCommentResp' + $ref: '#/definitions/api_struct.DeleteCommentResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 删除一条评论 tags: - 工作圈 @@ -4477,22 +4477,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.DeleteOneWorkMomentReq' + $ref: '#/definitions/api_struct.DeleteOneWorkMomentReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.DeleteOneWorkMomentResp' + $ref: '#/definitions/api_struct.DeleteOneWorkMomentResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 删除一条工作圈 tags: - 工作圈 @@ -4513,22 +4513,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.DeleteTagReq' + $ref: '#/definitions/api_struct.DeleteTagReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.DeleteTagResp' + $ref: '#/definitions/api_struct.DeleteTagResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 删除标签 tags: - 标签 @@ -4549,22 +4549,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetTagSendLogsReq' + $ref: '#/definitions/api_struct.GetTagSendLogsReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetTagSendLogsResp' + $ref: '#/definitions/api_struct.GetTagSendLogsResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取发送历史记录 tags: - 标签 @@ -4585,22 +4585,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetUserFriendWorkMomentsReq' + $ref: '#/definitions/api_struct.GetUserFriendWorkMomentsReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetUserFriendWorkMomentsResp' + $ref: '#/definitions/api_struct.GetUserFriendWorkMomentsResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 查询自己大工作圈页面 tags: - 工作圈 @@ -4621,22 +4621,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetUserTagByIDReq' + $ref: '#/definitions/api_struct.GetUserTagByIDReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetUserTagByIDResp' + $ref: '#/definitions/api_struct.GetUserTagByIDResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取该用户的标签信息 tags: - 标签 @@ -4657,22 +4657,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetUserTagsReq' + $ref: '#/definitions/api_struct.GetUserTagsReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetUserTagsResp' + $ref: '#/definitions/api_struct.GetUserTagsResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取用户标签信息 tags: - 标签 @@ -4693,22 +4693,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetUserWorkMomentsReq' + $ref: '#/definitions/api_struct.GetUserWorkMomentsReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetUserWorkMomentsResp' + $ref: '#/definitions/api_struct.GetUserWorkMomentsResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 查询用户工作圈 tags: - 工作圈 @@ -4729,22 +4729,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetWorkMomentByIDReq' + $ref: '#/definitions/api_struct.GetWorkMomentByIDReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetWorkMomentByIDResp' + $ref: '#/definitions/api_struct.GetWorkMomentByIDResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 通过ID获取工作圈 tags: - 工作圈 @@ -4765,22 +4765,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.LikeOneWorkMomentReq' + $ref: '#/definitions/api_struct.LikeOneWorkMomentReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.LikeOneWorkMomentResp' + $ref: '#/definitions/api_struct.LikeOneWorkMomentResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 点赞一条工作圈 tags: - 工作圈 @@ -4801,22 +4801,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.SendMsg2TagReq' + $ref: '#/definitions/api_struct.SendMsg2TagReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.SendMsg2TagResp' + $ref: '#/definitions/api_struct.SendMsg2TagResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 发送标签消息 tags: - 标签 @@ -4837,22 +4837,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.SetTagReq' + $ref: '#/definitions/api_struct.SetTagReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.SetTagResp' + $ref: '#/definitions/api_struct.SetTagResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 修改标签 tags: - 标签 @@ -4873,7 +4873,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.CreateDepartmentReq' + $ref: '#/definitions/api_struct.CreateDepartmentReq' produces: - application/json responses: @@ -4881,7 +4881,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.CreateDepartmentResp' + - $ref: '#/definitions/api_struct.CreateDepartmentResp' - properties: data: $ref: '#/definitions/server_api_params.Department' @@ -4889,11 +4889,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 创建部门 tags: - 组织架构相关 @@ -4914,22 +4914,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.CreateDepartmentMemberReq' + $ref: '#/definitions/api_struct.CreateDepartmentMemberReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.CreateDepartmentMemberResp' + $ref: '#/definitions/api_struct.CreateDepartmentMemberResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 创建部门用户 tags: - 组织架构相关 @@ -4950,22 +4950,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.CreateOrganizationUserReq' + $ref: '#/definitions/api_struct.CreateOrganizationUserReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.CreateOrganizationUserResp' + $ref: '#/definitions/api_struct.CreateOrganizationUserResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 组织架构导入用户 tags: - 组织架构相关 @@ -4986,22 +4986,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.DeleteDepartmentReq' + $ref: '#/definitions/api_struct.DeleteDepartmentReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.DeleteDepartmentResp' + $ref: '#/definitions/api_struct.DeleteDepartmentResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 删除部门 tags: - 组织架构相关 @@ -5022,22 +5022,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.DeleteOrganizationUserReq' + $ref: '#/definitions/api_struct.DeleteOrganizationUserReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.DeleteOrganizationUserResp' + $ref: '#/definitions/api_struct.DeleteOrganizationUserResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 删除组织架构中某个用户 tags: - 组织架构相关 @@ -5058,22 +5058,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.DeleteUserInDepartmentReq' + $ref: '#/definitions/api_struct.DeleteUserInDepartmentReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.DeleteUserInDepartmentResp' + $ref: '#/definitions/api_struct.DeleteUserInDepartmentResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 删除部门中某个用户 tags: - 组织架构相关 @@ -5094,7 +5094,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetDepartmentMemberReq' + $ref: '#/definitions/api_struct.GetDepartmentMemberReq' produces: - application/json responses: @@ -5102,7 +5102,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetDepartmentMemberResp' + - $ref: '#/definitions/api_struct.GetDepartmentMemberResp' - properties: data: items: @@ -5112,11 +5112,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取部门中所有成员 tags: - 组织架构相关 @@ -5137,7 +5137,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetSubDepartmentReq' + $ref: '#/definitions/api_struct.GetSubDepartmentReq' produces: - application/json responses: @@ -5145,7 +5145,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetSubDepartmentResp' + - $ref: '#/definitions/api_struct.GetSubDepartmentResp' - properties: data: items: @@ -5155,11 +5155,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取子部门列表 tags: - 组织架构相关 @@ -5180,7 +5180,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetUserInDepartmentReq' + $ref: '#/definitions/api_struct.GetUserInDepartmentReq' produces: - application/json responses: @@ -5188,7 +5188,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetUserInDepartmentResp' + - $ref: '#/definitions/api_struct.GetUserInDepartmentResp' - properties: data: $ref: '#/definitions/server_api_params.UserInDepartment' @@ -5196,11 +5196,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取部门中的所有用户 tags: - 组织架构相关 @@ -5221,22 +5221,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.UpdateDepartmentReq' + $ref: '#/definitions/api_struct.UpdateDepartmentReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.UpdateDepartmentResp' + $ref: '#/definitions/api_struct.UpdateDepartmentResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 更新部门信息 tags: - 组织架构相关 @@ -5257,22 +5257,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.UpdateOrganizationUserReq' + $ref: '#/definitions/api_struct.UpdateOrganizationUserReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.UpdateOrganizationUserResp' + $ref: '#/definitions/api_struct.UpdateOrganizationUserResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 更新组织架构中的用户 tags: - 组织架构相关 @@ -5293,22 +5293,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.UpdateUserInDepartmentReq' + $ref: '#/definitions/api_struct.UpdateUserInDepartmentReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.UpdateUserInDepartmentResp' + $ref: '#/definitions/api_struct.UpdateUserInDepartmentResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 更新部门中某个用户 tags: - 组织架构相关 @@ -5345,15 +5345,15 @@ paths: "0": description: "" schema: - $ref: '#/definitions/base_info.MinioUploadFileResp' + $ref: '#/definitions/api_struct.MinioUploadFileResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: minio上传文件(web api) tags: - 第三方服务相关 @@ -5374,22 +5374,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.AccountCheckReq' + $ref: '#/definitions/api_struct.AccountCheckReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.AccountCheckResp' + $ref: '#/definitions/api_struct.AccountCheckResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 检查列表账户注册状态，并且返回结果 tags: - 用户相关 @@ -5410,22 +5410,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetAllUsersUidReq' + $ref: '#/definitions/api_struct.GetAllUsersUidReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetAllUsersUidResp' + $ref: '#/definitions/api_struct.GetAllUsersUidResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取所有用户uid列表 tags: - 用户相关 @@ -5446,7 +5446,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetSelfUserInfoReq' + $ref: '#/definitions/api_struct.GetSelfUserInfoReq' produces: - application/json responses: @@ -5454,7 +5454,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetSelfUserInfoResp' + - $ref: '#/definitions/api_struct.GetSelfUserInfoResp' - properties: data: $ref: '#/definitions/server_api_params.UserInfo' @@ -5462,11 +5462,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取自己的信息 tags: - 用户相关 @@ -5487,7 +5487,7 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetUsersInfoReq' + $ref: '#/definitions/api_struct.GetUsersInfoReq' produces: - application/json responses: @@ -5495,7 +5495,7 @@ paths: description: "" schema: allOf: - - $ref: '#/definitions/base_info.GetUsersInfoResp' + - $ref: '#/definitions/api_struct.GetUsersInfoResp' - properties: Data: items: @@ -5505,11 +5505,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取用户信息 tags: - 用户相关 @@ -5530,22 +5530,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.GetUsersOnlineStatusReq' + $ref: '#/definitions/api_struct.GetUsersOnlineStatusReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.GetUsersOnlineStatusResp' + $ref: '#/definitions/api_struct.GetUsersOnlineStatusResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 获取用户在线状态 tags: - 用户相关 @@ -5566,22 +5566,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.SetGlobalRecvMessageOptReq' + $ref: '#/definitions/api_struct.SetGlobalRecvMessageOptReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.SetGlobalRecvMessageOptResp' + $ref: '#/definitions/api_struct.SetGlobalRecvMessageOptResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 设置全局免打扰 tags: - 用户相关 @@ -5602,22 +5602,22 @@ paths: name: req required: true schema: - $ref: '#/definitions/base_info.UpdateSelfUserInfoReq' + $ref: '#/definitions/api_struct.UpdateSelfUserInfoReq' produces: - application/json responses: "0": description: "" schema: - $ref: '#/definitions/base_info.UpdateUserInfoResp' + $ref: '#/definitions/api_struct.UpdateUserInfoResp' "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.Swagger400Resp' + $ref: '#/definitions/api_struct.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.Swagger500Resp' + $ref: '#/definitions/api_struct.Swagger500Resp' summary: 修改用户信息 tags: - 用户相关 diff --git a/internal/cms_api/middleware/cors.go b/internal/cms_api/middleware/cors.go deleted file mode 100644 index 139a001af..000000000 --- a/internal/cms_api/middleware/cors.go +++ /dev/null @@ -1,23 +0,0 @@ -package middleware - -import ( - "github.com/gin-gonic/gin" - "net/http" -) - -func CorsHandler() gin.HandlerFunc { - return func(context *gin.Context) { - context.Writer.Header().Set("Access-Control-Allow-Origin", "*") - context.Header("Access-Control-Allow-Methods", "*") - context.Header("Access-Control-Allow-Headers", "*") - context.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma,FooBar") // 跨域关键设置 让浏览器可以解析 - context.Header("Access-Control-Max-Age", "172800") // 缓存请求信息 单位为秒 - context.Header("Access-Control-Allow-Credentials", "false") // 跨域请求是否需要带cookie信息 默认设置为true - context.Header("content-type", "application/json") // 设置返回格式是json - //Release all option pre-requests - if context.Request.Method == http.MethodOptions { - context.JSON(http.StatusOK, "Options Request!") - } - context.Next() - } -} diff --git a/internal/cms_api/middleware/jwt_auth.go b/internal/cms_api/middleware/jwt_auth.go deleted file mode 100644 index e546c0de1..000000000 --- a/internal/cms_api/middleware/jwt_auth.go +++ /dev/null @@ -1,32 +0,0 @@ -package middleware - -import ( - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/log" - "Open_IM/pkg/common/token_verify" - "Open_IM/pkg/utils" - "net/http" - - "github.com/gin-gonic/gin" -) - -func JWTAuth() gin.HandlerFunc { - return func(c *gin.Context) { - ok, userID, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), "") - // log.NewInfo("0", utils.GetSelfFuncName(), "userID: ", userID) - c.Set("userID", userID) - if !ok { - log.NewError("", "GetUserIDFromToken false ", c.Request.Header.Get("token")) - c.Abort() - c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": errInfo}) - return - } else { - if !utils.IsContain(userID, config.Config.Manager.AppManagerUid) { - c.Abort() - c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": "user is not admin"}) - return - } - log.NewInfo("0", utils.GetSelfFuncName(), "failed: ", errInfo) - } - } -} diff --git a/internal/cms_api/router.go b/internal/cms_api/router.go index 7fbb8db1e..7b2695a9c 100644 --- a/internal/cms_api/router.go +++ b/internal/cms_api/router.go @@ -48,11 +48,6 @@ func NewGinRouter() *gin.Engine { userRouterGroup := r2.Group("/user") { userRouterGroup.POST("/get_user_id_by_email_phone", user.GetUserIDByEmailAndPhoneNumber) - - userRouterGroup.POST("/add_user", user.AddUser) - userRouterGroup.POST("/unblock_user", user.UnblockUser) - userRouterGroup.POST("/block_user", user.BlockUser) - userRouterGroup.POST("/get_block_users", user.GetBlockUsers) } messageCMSRouterGroup := r2.Group("/message") { diff --git a/internal/cms_api/user/user.go b/internal/cms_api/user/user.go index 7f103ba57..507f924fb 100644 --- a/internal/cms_api/user/user.go +++ b/internal/cms_api/user/user.go @@ -2,6 +2,7 @@ package user import ( "Open_IM/pkg/cms_api_struct" + "Open_IM/pkg/cms_struct" "Open_IM/pkg/common/config" "Open_IM/pkg/common/log" "Open_IM/pkg/getcdv3" @@ -16,150 +17,6 @@ import ( "github.com/gin-gonic/gin" ) -func AddUser(c *gin.Context) { - var ( - req cms_struct.AddUserRequest - reqPb pb.AddUserReq - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "BindJSON failed ", err.Error()) - c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) - return - } - reqPb.OperationID = utils.OperationIDGenerator() - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - utils.CopyStructFields(&reqPb, &req) - etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID) - if etcdConn == nil { - errMsg := reqPb.OperationID + "getcdv3.GetConn == nil" - log.NewError(reqPb.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - client := pb.NewUserClient(etcdConn) - respPb, err := client.AddUser(context.Background(), &reqPb) - if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), reqPb.String()) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) - return - } - c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg}) -} - -func BlockUser(c *gin.Context) { - var ( - req cms_struct.BlockUserRequest - reqPb pb.BlockUserReq - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error()) - c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) - return - } - reqPb.OperationID = utils.OperationIDGenerator() - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - utils.CopyStructFields(&reqPb, &req) - etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID) - if etcdConn == nil { - errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil" - log.NewError(reqPb.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - client := pb.NewUserClient(etcdConn) - respPb, err := client.BlockUser(context.Background(), &reqPb) - if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), reqPb.String()) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) - return - } - c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg}) -} - -func UnblockUser(c *gin.Context) { - var ( - req cms_struct.UnblockUserRequest - resp cms_struct.UnBlockUserResponse - reqPb pb.UnBlockUserReq - ) - if err := c.BindJSON(&req); err != nil { - log.NewError(req.OperationID, "BindJSON failed ", err.Error()) - c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) - return - } - reqPb.OperationID = utils.OperationIDGenerator() - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - utils.CopyStructFields(&reqPb, &req) - etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID) - if etcdConn == nil { - errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil" - log.NewError(reqPb.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - client := pb.NewUserClient(etcdConn) - respPb, err := client.UnBlockUser(context.Background(), &reqPb) - if err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), err.Error(), reqPb.String()) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) - return - } - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "resp: ", resp) - c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg}) -} - -func GetBlockUsers(c *gin.Context) { - var ( - req cms_struct.GetBlockUsersRequest - resp cms_struct.GetBlockUsersResponse - reqPb pb.GetBlockUsersReq - respPb *pb.GetBlockUsersResp - ) - reqPb.Pagination = &commonPb.RequestPagination{} - if err := c.BindJSON(&req); err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "ShouldBindQuery failed ", err.Error()) - c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) - return - } - reqPb.OperationID = utils.OperationIDGenerator() - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", req) - utils.CopyStructFields(&reqPb.Pagination, &req) - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "blockUsers", reqPb.Pagination, req) - etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImUserName, reqPb.OperationID) - if etcdConn == nil { - errMsg := reqPb.OperationID + "getcdv3.GetDefaultConn == nil" - log.NewError(reqPb.OperationID, errMsg) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg}) - return - } - client := pb.NewUserClient(etcdConn) - respPb, err := client.GetBlockUsers(context.Background(), &reqPb) - if err != nil { - log.NewError(reqPb.OperationID, utils.GetSelfFuncName(), "GetBlockUsers rpc", err.Error()) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) - return - } - for _, v := range respPb.BlockUsers { - resp.BlockUsers = append(resp.BlockUsers, cms_struct.BlockUser{ - UserResponse: cms_struct.UserResponse{ - UserID: v.UserInfo.UserID, - FaceURL: v.UserInfo.FaceURL, - Nickname: v.UserInfo.Nickname, - PhoneNumber: v.UserInfo.PhoneNumber, - Email: v.UserInfo.Email, - Gender: int(v.UserInfo.Gender), - }, - BeginDisableTime: v.BeginDisableTime, - EndDisableTime: v.EndDisableTime, - }) - } - resp.ShowNumber = int(respPb.Pagination.ShowNumber) - resp.CurrentPage = int(respPb.Pagination.CurrentPage) - resp.UserNums = respPb.UserNums - log.NewInfo(reqPb.OperationID, utils.GetSelfFuncName(), "req: ", resp) - c.JSON(http.StatusOK, gin.H{"errCode": respPb.CommonResp.ErrCode, "errMsg": respPb.CommonResp.ErrMsg, "data": resp}) -} - func GetUserIDByEmailAndPhoneNumber(c *gin.Context) { var ( req cms_struct.GetUserIDByEmailAndPhoneNumberRequest diff --git a/pkg/common/middleware/gin.go b/pkg/common/middleware/gin.go index 8155086cd..19baaaa78 100644 --- a/pkg/common/middleware/gin.go +++ b/pkg/common/middleware/gin.go @@ -1,6 +1,10 @@ package middleware import ( + "Open_IM/pkg/common/config" + "Open_IM/pkg/common/log" + "Open_IM/pkg/common/token_verify" + "Open_IM/pkg/utils" "bytes" "encoding/json" "github.com/gin-gonic/gin" @@ -8,6 +12,44 @@ import ( "net/http" ) +func JWTAuth() gin.HandlerFunc { + return func(c *gin.Context) { + ok, userID, errInfo := token_verify.GetUserIDFromToken(c.Request.Header.Get("token"), "") + // log.NewInfo("0", utils.GetSelfFuncName(), "userID: ", userID) + c.Set("userID", userID) + if !ok { + log.NewError("", "GetUserIDFromToken false ", c.Request.Header.Get("token")) + c.Abort() + c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": errInfo}) + return + } else { + if !utils.IsContain(userID, config.Config.Manager.AppManagerUid) { + c.Abort() + c.JSON(http.StatusOK, gin.H{"errCode": 400, "errMsg": "user is not admin"}) + return + } + log.NewInfo("0", utils.GetSelfFuncName(), "failed: ", errInfo) + } + } +} + +func CorsHandler() gin.HandlerFunc { + return func(context *gin.Context) { + context.Writer.Header().Set("Access-Control-Allow-Origin", "*") + context.Header("Access-Control-Allow-Methods", "*") + context.Header("Access-Control-Allow-Headers", "*") + context.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma,FooBar") // 跨域关键设置 让浏览器可以解析 + context.Header("Access-Control-Max-Age", "172800") // 缓存请求信息 单位为秒 + context.Header("Access-Control-Allow-Credentials", "false") // 跨域请求是否需要带cookie信息 默认设置为true + context.Header("content-type", "application/json") // 设置返回格式是json + //Release all option pre-requests + if context.Request.Method == http.MethodOptions { + context.JSON(http.StatusOK, "Options Request!") + } + context.Next() + } +} + func GinParseOperationID(c *gin.Context) { if c.Request.Method == http.MethodPost { operationID := c.Request.Header.Get("operationID") diff --git a/pkg/utils/cors_middleware.go b/pkg/utils/cors_middleware.go deleted file mode 100644 index 6809d786d..000000000 --- a/pkg/utils/cors_middleware.go +++ /dev/null @@ -1,24 +0,0 @@ -package utils - -import ( - "net/http" - - "github.com/gin-gonic/gin" -) - -func CorsHandler() gin.HandlerFunc { - return func(context *gin.Context) { - context.Writer.Header().Set("Access-Control-Allow-Origin", "*") - context.Header("Access-Control-Allow-Methods", "*") - context.Header("Access-Control-Allow-Headers", "*") - context.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma,FooBar") // 跨域关键设置 让浏览器可以解析 - context.Header("Access-Control-Max-Age", "172800") // 缓存请求信息 单位为秒 - context.Header("Access-Control-Allow-Credentials", "false") // 跨域请求是否需要带cookie信息 默认设置为true - context.Header("content-type", "application/json") // 设置返回格式是json - //Release all option pre-requests - if context.Request.Method == http.MethodOptions { - context.JSON(http.StatusOK, "Options Request!") - } - context.Next() - } -} diff --git a/pkg/utils/cors_middleware_test.go b/pkg/utils/cors_middleware_test.go deleted file mode 100644 index 0abfe3f3a..000000000 --- a/pkg/utils/cors_middleware_test.go +++ /dev/null @@ -1,67 +0,0 @@ -package utils - -import ( - "net/http" - "net/http/httptest" - "testing" - - "github.com/gin-gonic/gin" - "github.com/stretchr/testify/assert" -) - -func init() { - gin.SetMode(gin.TestMode) -} - -func performRequest(r http.Handler, method, origin string) *httptest.ResponseRecorder { - return performRequestWithHeaders(r, method, origin, http.Header{}) -} - -func performRequestWithHeaders(r http.Handler, method, origin string, header http.Header) *httptest.ResponseRecorder { - req, _ := http.NewRequest(method, "/", nil) - // From go/net/http/request.go: - // For incoming requests, the Host header is promoted to the - // Request.Host field and removed from the Header map. - req.Host = header.Get("Host") - header.Del("Host") - if len(origin) > 0 { - header.Set("Origin", origin) - } - req.Header = header - w := httptest.NewRecorder() - r.ServeHTTP(w, req) - return w -} - -func newTestRouter() *gin.Engine { - router := gin.New() - router.Use(CorsHandler()) - router.GET("/", func(c *gin.Context) { - c.String(http.StatusOK, "get") - }) - router.POST("/", func(c *gin.Context) { - c.String(http.StatusOK, "post") - }) - router.PATCH("/", func(c *gin.Context) { - c.String(http.StatusOK, "patch") - }) - - return router -} - -func Test_CorsHandler(t *testing.T) { - router := newTestRouter() - // no CORS request, origin == "" - w := performRequest(router, "GET", "") - assert.Equal(t, "get", w.Body.String()) - assert.Equal(t, w.Header().Get("Access-Control-Allow-Origin"), "*") - assert.Equal(t, w.Header().Get("Access-Control-Allow-Methods"), "*") - assert.Equal(t, w.Header().Get("Access-Control-Allow-Headers"), "*") - assert.Equal(t, w.Header().Get("Access-Control-Expose-Headers"), "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers,Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma,FooBar") - assert.Equal(t, w.Header().Get("Access-Control-Max-Age"), "172800") - assert.Equal(t, w.Header().Get("Access-Control-Allow-Credentials"), "false") - assert.Equal(t, w.Header().Get("content-type"), "application/json") - - w = performRequest(router, "OPTIONS", "") - assert.Equal(t, w.Body.String(), "\"Options Request!\"") -} From 1b4f6054ae5e6b3cd3e3089a3c38e84b68339ed6 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 Jan 2023 16:47:58 +0800 Subject: [PATCH 4/6] errcode --- cmd/open_im_api/main.go | 3 ++- pkg/{utils => getcdv3}/getcd.go | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) rename pkg/{utils => getcdv3}/getcd.go (86%) diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 717f87b33..6d50ecad8 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -15,6 +15,7 @@ import ( "Open_IM/pkg/common/log" "Open_IM/pkg/common/middleware" "Open_IM/pkg/common/token_verify" + "Open_IM/pkg/getcdv3" "Open_IM/pkg/utils" "flag" "fmt" @@ -213,7 +214,7 @@ func main() { } // - go utils.RegisterConf() + go getcdv3.RegisterConf() go apiThird.MinioInit() defaultPorts := config.Config.Api.GinPort ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10002 as port") diff --git a/pkg/utils/getcd.go b/pkg/getcdv3/getcd.go similarity index 86% rename from pkg/utils/getcd.go rename to pkg/getcdv3/getcd.go index 88f7e6a8a..87243aef0 100644 --- a/pkg/utils/getcd.go +++ b/pkg/getcdv3/getcd.go @@ -1,7 +1,8 @@ -package utils +package getcdv3 import ( "Open_IM/pkg/common/config" + "Open_IM/pkg/utils" "context" "fmt" "github.com/OpenIMSDK/getcdv3" @@ -32,8 +33,8 @@ func RegisterConf() { if err != nil { panic(err.Error()) } - secretMD5 := Md5(config.Config.Etcd.Secret) - confBytes, err := AesEncrypt(bytes, []byte(secretMD5[0:16])) + secretMD5 := utils.Md5(config.Config.Etcd.Secret) + confBytes, err := utils.AesEncrypt(bytes, []byte(secretMD5[0:16])) if err != nil { panic(err.Error()) } From c1d6f5809b8a38d7a8f57c32cf1873df512a7575 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 Jan 2023 16:55:44 +0800 Subject: [PATCH 5/6] errcode --- cmdutils/mongo/cmd/main.go | 8 ++++---- pkg/{common/callback => utils}/callback.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename pkg/{common/callback => utils}/callback.go (96%) diff --git a/cmdutils/mongo/cmd/main.go b/cmdutils/mongo/cmd/main.go index e2c6e99b8..9644851d8 100644 --- a/cmdutils/mongo/cmd/main.go +++ b/cmdutils/mongo/cmd/main.go @@ -1,8 +1,8 @@ package main import ( + mongoUtils "Open_IM/cmdutils/mongo" "Open_IM/pkg/common/config" - mongo2 "Open_IM/test/mongo" "context" "flag" "fmt" @@ -26,11 +26,11 @@ func init() { } } var err error - mongo2.Client, err = mongo.Connect(context.TODO(), options.Client().ApplyURI(uri)) + mongoUtils.Client, err = mongo.Connect(context.TODO(), options.Client().ApplyURI(uri)) if err != nil { panic(err) } - err = mongo2.Client.Ping(context.TODO(), nil) + err = mongoUtils.Client.Ping(context.TODO(), nil) if err != nil { panic(err) } @@ -41,5 +41,5 @@ func main() { userID := flag.String("userID", "", "userID") flag.Parse() fmt.Println("userID:", *userID) - mongo2.GetUserAllChat(*userID) + mongoUtils.GetUserAllChat(*userID) } diff --git a/pkg/common/callback/callback.go b/pkg/utils/callback.go similarity index 96% rename from pkg/common/callback/callback.go rename to pkg/utils/callback.go index 3224f7853..73bc9e2ee 100644 --- a/pkg/common/callback/callback.go +++ b/pkg/utils/callback.go @@ -1,4 +1,4 @@ -package callback +package utils import ( "Open_IM/pkg/common/constant" From 169335901077659d50a9c4a52b60b126ed1b6709 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 Jan 2023 19:49:18 +0800 Subject: [PATCH 6/6] errcode --- cmd/rpc/open_im_cache/Makefile | 24 --- cmd/rpc/open_im_cache/main.go | 27 --- internal/rpc/admin_cms/admin_cms.go | 249 ++++++++--------------- pkg/common/db/relation/friend_model_k.go | 5 + 4 files changed, 89 insertions(+), 216 deletions(-) delete mode 100644 cmd/rpc/open_im_cache/Makefile delete mode 100644 cmd/rpc/open_im_cache/main.go diff --git a/cmd/rpc/open_im_cache/Makefile b/cmd/rpc/open_im_cache/Makefile deleted file mode 100644 index 1cb1e959e..000000000 --- a/cmd/rpc/open_im_cache/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -.PHONY: all build run gotool install clean help - -BINARY_NAME=open_im_cache -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_cache/main.go b/cmd/rpc/open_im_cache/main.go deleted file mode 100644 index 94fdabec3..000000000 --- a/cmd/rpc/open_im_cache/main.go +++ /dev/null @@ -1,27 +0,0 @@ -package main - -import ( - rpcCache "Open_IM/internal/rpc/cache" - "Open_IM/pkg/common/config" - "Open_IM/pkg/common/constant" - promePkg "Open_IM/pkg/common/prometheus" - - "flag" - "fmt" -) - -func main() { - defaultPorts := config.Config.RpcPort.OpenImCachePort - rpcPort := flag.Int("port", defaultPorts[0], "RpcToken default listen port 10800") - prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.CachePrometheusPort[0], "cachePrometheusPort default listen port") - flag.Parse() - fmt.Println("start cache rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n") - rpcServer := rpcCache.NewCacheServer(*rpcPort) - go func() { - err := promePkg.StartPromeSrv(*prometheusPort) - if err != nil { - panic(err) - } - }() - rpcServer.Run() -} diff --git a/internal/rpc/admin_cms/admin_cms.go b/internal/rpc/admin_cms/admin_cms.go index d17ad3874..b1448693d 100644 --- a/internal/rpc/admin_cms/admin_cms.go +++ b/internal/rpc/admin_cms/admin_cms.go @@ -4,6 +4,7 @@ import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/db/controller" + "Open_IM/pkg/common/db/relation" "Open_IM/pkg/common/log" promePkg "Open_IM/pkg/common/prometheus" "Open_IM/pkg/common/token_verify" @@ -115,7 +116,7 @@ func (s *adminCMSServer) AdminLogin(ctx context.Context, req *pbAdminCMS.AdminLo } } if resp.Token == "" { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "failed") + log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "failed") return nil, constant.ErrInternalServer } admin, err := s.userInterface.Take(ctx, req.AdminID) @@ -124,32 +125,23 @@ func (s *adminCMSServer) AdminLogin(ctx context.Context, req *pbAdminCMS.AdminLo } resp.UserName = admin.Nickname resp.FaceURL = admin.FaceURL - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) + log.NewInfo(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "resp: ", resp.String()) return resp, nil } -func (s *adminCMSServer) GetUserToken(_ context.Context, req *pbAdminCMS.GetUserTokenReq) (*pbAdminCMS.GetUserTokenResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp := &pbAdminCMS.GetUserTokenResp{ - CommonResp: &pbAdminCMS.CommonResp{}, - } +func (s *adminCMSServer) GetUserToken(ctx context.Context, req *pbAdminCMS.GetUserTokenReq) (*pbAdminCMS.GetUserTokenResp, error) { + resp := &pbAdminCMS.GetUserTokenResp{} token, expTime, err := token_verify.CreateToken(req.UserID, int(req.PlatformID)) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "generate token failed", "userID: ", req.UserID, req.PlatformID, err.Error()) - resp.CommonResp.ErrCode = constant.ErrTokenUnknown.ErrCode - resp.CommonResp.ErrMsg = err.Error() return resp, nil } resp.Token = token resp.ExpTime = expTime - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String()) return resp, nil } -func (s *adminCMSServer) GetChatLogs(_ context.Context, req *pbAdminCMS.GetChatLogsReq) (*pbAdminCMS.GetChatLogsResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "GetChatLogs", req.String()) - resp := &pbAdminCMS.GetChatLogsResp{CommonResp: &pbAdminCMS.CommonResp{}, Pagination: &server_api_params.ResponsePagination{}} - chatLog := imdb.ChatLog{ +func (s *adminCMSServer) GetChatLogs(ctx context.Context, req *pbAdminCMS.GetChatLogsReq) (*pbAdminCMS.GetChatLogsResp, error) { + chatLog := relation.ChatLog{ Content: req.Content, ContentType: req.ContentType, SessionType: req.SessionType, @@ -159,17 +151,13 @@ func (s *adminCMSServer) GetChatLogs(_ context.Context, req *pbAdminCMS.GetChatL if req.SendTime != "" { sendTime, err := utils.TimeStringToTime(req.SendTime) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "time string parse error", err.Error()) - resp.CommonResp.ErrCode = constant.ErrArgs.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "time string parse error", err.Error()) + return nil, err } chatLog.SendTime = sendTime } - - log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "chat_log: ", chatLog) - - num, chatLogs, err := imdb.GetChatLog(&chatLog, req.Pagination.PageNumber, req.Pagination.ShowNumber, []int32{ + resp := &pbAdminCMS.GetChatLogsResp{} + num, chatLogs, err := relation.GetChatLog(&chatLog, req.Pagination.PageNumber, req.Pagination.ShowNumber, []int32{ constant.Text, constant.Picture, constant.Voice, @@ -187,10 +175,7 @@ func (s *adminCMSServer) GetChatLogs(_ context.Context, req *pbAdminCMS.GetChatL constant.CustomNotTriggerConversation, }) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetChatLog", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } resp.ChatLogsNum = int32(num) for _, chatLog := range chatLogs { @@ -199,38 +184,30 @@ func (s *adminCMSServer) GetChatLogs(_ context.Context, req *pbAdminCMS.GetChatL pbChatLog.SendTime = chatLog.SendTime.Unix() pbChatLog.CreateTime = chatLog.CreateTime.Unix() if chatLog.SenderNickname == "" { - sendUser, err := imdb.GetUserByUserID(chatLog.SendID) + sendUser, err := s.userInterface.Take(ctx, chatLog.SendID) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserByUserID failed", err.Error()) - continue + return nil, err } pbChatLog.SenderNickname = sendUser.Nickname } switch chatLog.SessionType { case constant.SingleChatType: - recvUser, err := imdb.GetUserByUserID(chatLog.RecvID) + recvUser, err := s.userInterface.Take(ctx, chatLog.RecvID) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserByUserID failed", err.Error()) - continue + return nil, err } pbChatLog.SenderNickname = recvUser.Nickname case constant.GroupChatType, constant.SuperGroupChatType: - group, err := imdb.GetGroupInfoByGroupID(chatLog.RecvID) + group, err := s.groupInterface.TakeGroupByID(ctx, chatLog.RecvID) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupById failed") - continue + return nil, err } pbChatLog.RecvID = group.GroupID pbChatLog.GroupName = group.GroupName } resp.ChatLogs = append(resp.ChatLogs, pbChatLog) } - resp.Pagination = &server_api_params.ResponsePagination{ - CurrentPage: req.Pagination.PageNumber, - ShowNumber: req.Pagination.ShowNumber, - } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp output: ", resp.String()) return resp, nil } @@ -255,23 +232,16 @@ func (s *adminCMSServer) GetActiveGroup(_ context.Context, req *pbAdminCMS.GetAc return resp, nil } -func (s *adminCMSServer) GetActiveUser(_ context.Context, req *pbAdminCMS.GetActiveUserReq) (*pbAdminCMS.GetActiveUserResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String()) - resp := &pbAdminCMS.GetActiveUserResp{CommonResp: &pbAdminCMS.CommonResp{}} +func (s *adminCMSServer) GetActiveUser(ctx context.Context, req *pbAdminCMS.GetActiveUserReq) (*pbAdminCMS.GetActiveUserResp, error) { + resp := &pbAdminCMS.GetActiveUserResp{} fromTime, toTime, err := ParseTimeFromTo(req.StatisticsReq.From, req.StatisticsReq.To) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "ParseTimeFromTo failed", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "ParseTimeFromTo failed", err.Error()) + return nil, err } - log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "time: ", fromTime, toTime) - activeUsers, err := imdb.GetActiveUsers(fromTime, toTime, 12) + activeUsers, err := s.adminCMSInterface.GetActiveUsers(fromTime, toTime, 12) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetActiveUsers failed", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } for _, activeUser := range activeUsers { resp.Users = append(resp.Users, @@ -282,7 +252,6 @@ func (s *adminCMSServer) GetActiveUser(_ context.Context, req *pbAdminCMS.GetAct }, ) } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), resp.String()) return resp, nil } @@ -372,35 +341,23 @@ func getFirstDateOfNextNMonth(currentTime time.Time, n int) time.Time { return lastOfMonth } -func (s *adminCMSServer) GetGroupStatistics(_ context.Context, req *pbAdminCMS.GetGroupStatisticsReq) (*pbAdminCMS.GetGroupStatisticsResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String()) - resp := &pbAdminCMS.GetGroupStatisticsResp{CommonResp: &pbAdminCMS.CommonResp{}} +func (s *adminCMSServer) GetGroupStatistics(ctx context.Context, req *pbAdminCMS.GetGroupStatisticsReq) (*pbAdminCMS.GetGroupStatisticsResp, error) { + resp := &pbAdminCMS.GetGroupStatisticsResp{} fromTime, toTime, err := ParseTimeFromTo(req.StatisticsReq.From, req.StatisticsReq.To) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupStatistics failed", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } - increaseGroupNum, err := imdb.GetIncreaseGroupNum(fromTime, toTime.Add(time.Hour*24)) - + increaseGroupNum, err := s.adminCMSInterface.GetIncreaseGroupNum(fromTime, toTime.Add(time.Hour*24)) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum failed", err.Error(), fromTime, toTime) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } - totalGroupNum, err := imdb.GetTotalGroupNum() + totalGroupNum, err := s.adminCMSInterface.GetTotalGroupNum() if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } - resp.IncreaseGroupNum = increaseGroupNum - resp.TotalGroupNum = totalGroupNum + resp.IncreaseGroupNum = int32(increaseGroupNum) + resp.TotalGroupNum = int32(totalGroupNum) times := GetRangeDate(fromTime, toTime) - log.NewDebug(req.OperationID, "times:", times) wg := &sync.WaitGroup{} resp.IncreaseGroupNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times)) resp.TotalGroupNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times)) @@ -408,57 +365,47 @@ func (s *adminCMSServer) GetGroupStatistics(_ context.Context, req *pbAdminCMS.G for i, v := range times { go func(wg *sync.WaitGroup, index int, v [2]time.Time) { defer wg.Done() - num, err := imdb.GetIncreaseGroupNum(v[0], v[1]) + num, err := s.adminCMSInterface.GetIncreaseGroupNum(v[0], v[1]) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error()) + log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error()) } resp.IncreaseGroupNumList[index] = &pbAdminCMS.DateNumList{ Date: v[0].String(), - Num: num, + Num: int32(num), } - num, err = imdb.GetGroupNum(v[1]) + num, err = s.adminCMSInterface.GetGroupNum(v[1]) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error()) + log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error()) } resp.TotalGroupNumList[index] = &pbAdminCMS.DateNumList{ Date: v[0].String(), - Num: num, + Num: int32(num), } }(wg, i, v) } wg.Wait() - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp) return resp, nil } -func (s *adminCMSServer) GetMessageStatistics(_ context.Context, req *pbAdminCMS.GetMessageStatisticsReq) (*pbAdminCMS.GetMessageStatisticsResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), req.String()) - resp := &pbAdminCMS.GetMessageStatisticsResp{CommonResp: &pbAdminCMS.CommonResp{}} +func (s *adminCMSServer) GetMessageStatistics(ctx context.Context, req *pbAdminCMS.GetMessageStatisticsReq) (*pbAdminCMS.GetMessageStatisticsResp, error) { + resp := &pbAdminCMS.GetMessageStatisticsResp{} fromTime, toTime, err := ParseTimeFromTo(req.StatisticsReq.From, req.StatisticsReq.To) - log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "times: ", fromTime, toTime) + log.NewDebug(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "times: ", fromTime, toTime) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "ParseTimeFromTo failed", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "ParseTimeFromTo failed", err.Error()) + return nil, err } - privateMessageNum, err := imdb.GetSingleChatMessageNum(fromTime, toTime.Add(time.Hour*24)) + privateMessageNum, err := s.adminCMSInterface.GetSingleChatMessageNum(fromTime, toTime.Add(time.Hour*24)) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetSingleChatMessageNum failed", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } - groupMessageNum, err := imdb.GetGroupMessageNum(fromTime, toTime.Add(time.Hour*24)) + groupMessageNum, err := s.adminCMSInterface.GetGroupMessageNum(fromTime, toTime.Add(time.Hour*24)) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetGroupMessageNum failed", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } - log.NewDebug(req.OperationID, utils.GetSelfFuncName(), privateMessageNum, groupMessageNum) - resp.PrivateMessageNum = privateMessageNum - resp.GroupMessageNum = groupMessageNum + log.NewDebug(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), privateMessageNum, groupMessageNum) + resp.PrivateMessageNum = int32(privateMessageNum) + resp.GroupMessageNum = int32(groupMessageNum) times := GetRangeDate(fromTime, toTime) resp.GroupMessageNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times)) resp.PrivateMessageNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times)) @@ -467,22 +414,21 @@ func (s *adminCMSServer) GetMessageStatistics(_ context.Context, req *pbAdminCMS for i, v := range times { go func(wg *sync.WaitGroup, index int, v [2]time.Time) { defer wg.Done() - - num, err := imdb.GetSingleChatMessageNum(v[0], v[1]) + num, err := s.adminCMSInterface.GetSingleChatMessageNum(v[0], v[1]) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error()) + log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error()) } resp.PrivateMessageNumList[index] = &pbAdminCMS.DateNumList{ Date: v[0].String(), - Num: num, + Num: int32(num), } - num, err = imdb.GetGroupMessageNum(v[0], v[1]) + num, err = s.adminCMSInterface.GetGroupMessageNum(v[0], v[1]) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error()) + log.NewError(tracelog.GetOperationID(ctx), utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error()) } resp.GroupMessageNumList[index] = &pbAdminCMS.DateNumList{ Date: v[0].String(), - Num: num, + Num: int32(num), } }(wg, i, v) } @@ -491,39 +437,27 @@ func (s *adminCMSServer) GetMessageStatistics(_ context.Context, req *pbAdminCMS } func (s *adminCMSServer) GetUserStatistics(_ context.Context, req *pbAdminCMS.GetUserStatisticsReq) (*pbAdminCMS.GetUserStatisticsResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp := &pbAdminCMS.GetUserStatisticsResp{CommonResp: &pbAdminCMS.CommonResp{}} + resp := &pbAdminCMS.GetUserStatisticsResp{} fromTime, toTime, err := ParseTimeFromTo(req.StatisticsReq.From, req.StatisticsReq.To) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "ParseTimeFromTo failed", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } - activeUserNum, err := imdb.GetActiveUserNum(fromTime, toTime.Add(time.Hour*24)) + activeUserNum, err := s.adminCMSInterface.GetActiveUserNum(fromTime, toTime.Add(time.Hour*24)) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetActiveUserNum failed", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } - increaseUserNum, err := imdb.GetIncreaseUserNum(fromTime, toTime.Add(time.Hour*24)) + increaseUserNum, err := s.adminCMSInterface.GetIncreaseUserNum(fromTime, toTime.Add(time.Hour*24)) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseUserNum failed", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } - totalUserNum, err := imdb.GetTotalUserNum() + totalUserNum, err := s.adminCMSInterface.GetTotalUserNum() if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetTotalUserNum failed", err.Error()) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } - resp.ActiveUserNum = activeUserNum - resp.TotalUserNum = totalUserNum - resp.IncreaseUserNum = increaseUserNum + resp.ActiveUserNum = int32(activeUserNum) + resp.TotalUserNum = int32(totalUserNum) + resp.IncreaseUserNum = int32(increaseUserNum) times := GetRangeDate(fromTime, toTime) resp.TotalUserNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times)) resp.ActiveUserNumList = make([]*pbAdminCMS.DateNumList, len(times), len(times)) @@ -533,65 +467,56 @@ func (s *adminCMSServer) GetUserStatistics(_ context.Context, req *pbAdminCMS.Ge for i, v := range times { go func(wg *sync.WaitGroup, index int, v [2]time.Time) { defer wg.Done() - num, err := imdb.GetActiveUserNum(v[0], v[1]) + num, err := s.adminCMSInterface.GetActiveUserNum(v[0], v[1]) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseGroupNum", v, err.Error()) } resp.ActiveUserNumList[index] = &pbAdminCMS.DateNumList{ Date: v[0].String(), - Num: num, + Num: int32(num), } - num, err = imdb.GetTotalUserNumByDate(v[1]) + num, err = s.adminCMSInterface.GetTotalUserNumByDate(v[1]) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetTotalUserNumByDate", v, err.Error()) } resp.TotalUserNumList[index] = &pbAdminCMS.DateNumList{ Date: v[0].String(), - Num: num, + Num: int32(num), } - num, err = imdb.GetIncreaseUserNum(v[0], v[1]) + num, err = s.adminCMSInterface.GetIncreaseUserNum(v[0], v[1]) if err != nil { log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetIncreaseUserNum", v, err.Error()) } resp.IncreaseUserNumList[index] = &pbAdminCMS.DateNumList{ Date: v[0].String(), - Num: num, + Num: int32(num), } }(wg, i, v) } wg.Wait() - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp) return resp, nil } -func (s *adminCMSServer) GetUserFriends(_ context.Context, req *pbAdminCMS.GetUserFriendsReq) (*pbAdminCMS.GetUserFriendsResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp := &pbAdminCMS.GetUserFriendsResp{CommonResp: &pbAdminCMS.CommonResp{}, Pagination: &server_api_params.ResponsePagination{CurrentPage: req.Pagination.PageNumber, ShowNumber: req.Pagination.ShowNumber}} - var friendList []*imdb.FriendUser +func (s *adminCMSServer) GetUserFriends(ctx context.Context, req *pbAdminCMS.GetUserFriendsReq) (*pbAdminCMS.GetUserFriendsResp, error) { + resp := &pbAdminCMS.GetUserFriendsResp{} + var friendList []*relation.FriendUser var err error if req.FriendUserID != "" { - friend, err := imdb.GetFriendByIDCMS(req.UserID, req.FriendUserID) + friend, err := s.adminCMSInterface.GetFriendByIDCMS(req.UserID, req.FriendUserID) if err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err, req.UserID, req.FriendUserID) return resp, nil } - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserID, req.FriendUserID) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } friendList = append(friendList, friend) resp.FriendNums = 1 } else { var count int64 - friendList, count, err = imdb.GetUserFriendsCMS(req.UserID, req.FriendUserName, req.Pagination.PageNumber, req.Pagination.ShowNumber) + friendList, count, err = s.adminCMSInterface.GetUserFriendsCMS(req.UserID, req.FriendUserName, req.Pagination.PageNumber, req.Pagination.ShowNumber) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.UserID, req.FriendUserName, req.Pagination.PageNumber, req.Pagination.ShowNumber) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() - return resp, nil + return nil, err } resp.FriendNums = int32(count) } @@ -602,21 +527,15 @@ func (s *adminCMSServer) GetUserFriends(_ context.Context, req *pbAdminCMS.GetUs friendInfo.FriendUser = userInfo resp.FriendInfoList = append(resp.FriendInfoList, friendInfo) } - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) return resp, nil } -func (s *adminCMSServer) GetUserIDByEmailAndPhoneNumber(_ context.Context, req *pbAdminCMS.GetUserIDByEmailAndPhoneNumberReq) (*pbAdminCMS.GetUserIDByEmailAndPhoneNumberResp, error) { - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) - resp := &pbAdminCMS.GetUserIDByEmailAndPhoneNumberResp{CommonResp: &pbAdminCMS.CommonResp{}} - userIDList, err := imdb.GetUserIDsByEmailAndID(req.PhoneNumber, req.Email) +func (s *adminCMSServer) GetUserIDByEmailAndPhoneNumber(ctx context.Context, req *pbAdminCMS.GetUserIDByEmailAndPhoneNumberReq) (*pbAdminCMS.GetUserIDByEmailAndPhoneNumberResp, error) { + resp := &pbAdminCMS.GetUserIDByEmailAndPhoneNumberResp{} + userIDList, err := s.userInterface.GetUserIDsByEmailAndID(req.PhoneNumber, req.Email) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), req.PhoneNumber, req.Email) - resp.CommonResp.ErrCode = constant.ErrDB.ErrCode - resp.CommonResp.ErrMsg = err.Error() return resp, nil } resp.UserIDList = userIDList - log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) return resp, nil } diff --git a/pkg/common/db/relation/friend_model_k.go b/pkg/common/db/relation/friend_model_k.go index bca654a17..519e78fec 100644 --- a/pkg/common/db/relation/friend_model_k.go +++ b/pkg/common/db/relation/friend_model_k.go @@ -19,6 +19,11 @@ type Friend struct { DB *gorm.DB `gorm:"-"` } +type FriendUser struct { + Friend + Nickname string `gorm:"column:name;size:255"` +} + func NewFriendDB(db *gorm.DB) *Friend { var friend Friend friend.DB = initModel(db, friend)