From f993ddf8763955e4a449c7f7ea0e8721cc809f3f Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 15:29:22 +0800 Subject: [PATCH 01/15] test --- docker-compose.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index df9c69b9d..0d234cc60 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -74,11 +74,10 @@ services: KAFKA_BROKER_ID: 0 KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" - KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9093 + KAFKA_ADVERTISED_LISTENERS: INSIDE://172.19.0.14:9092,OUTSIDE://103.116.45.174:9093 KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE - network_mode: "host" depends_on: - zookeeper From 813b6a6a68618bd257f917594af605adc72be003 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 15:33:35 +0800 Subject: [PATCH 02/15] test --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 0d234cc60..33128d3d8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -74,7 +74,7 @@ services: KAFKA_BROKER_ID: 0 KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" - KAFKA_ADVERTISED_LISTENERS: INSIDE://172.19.0.14:9092,OUTSIDE://103.116.45.174:9093 + KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9093 KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE From 088f9dae9b1ff846d78b951899db8bb74294d081 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 1 Jul 2022 15:36:44 +0800 Subject: [PATCH 03/15] demo --- cmd/open_im_api/docs/docs.go | 172 +++++++++++----------- cmd/open_im_api/docs/swagger.json | 172 +++++++++++----------- cmd/open_im_api/docs/swagger.yaml | 157 ++++++++++---------- internal/api/conversation/conversation.go | 12 +- internal/api/manage/management_user.go | 8 +- internal/api/office/tag.go | 28 ++-- internal/api/office/work_moments.go | 32 ++-- internal/api/organization/organization.go | 53 ++++--- pkg/base_info/organization_api_struct.go | 8 +- 9 files changed, 313 insertions(+), 329 deletions(-) diff --git a/cmd/open_im_api/docs/docs.go b/cmd/open_im_api/docs/docs.go index 50981d32a..183ab0bf4 100644 --- a/cmd/open_im_api/docs/docs.go +++ b/cmd/open_im_api/docs/docs.go @@ -2360,13 +2360,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetAllConversationsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetAllConversationsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2414,13 +2414,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetConversationResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetConversationResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2468,13 +2468,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetConversationsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetConversationsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2630,13 +2630,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CommentOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CommentOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2684,13 +2684,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CreateOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CreateOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2738,13 +2738,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CreateTagResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CreateTagResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2792,13 +2792,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteCommentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteCommentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2846,13 +2846,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2900,13 +2900,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteTagResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteTagResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2954,13 +2954,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetTagSendLogsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetTagSendLogsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3008,13 +3008,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetUserFriendWorkMomentsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetUserFriendWorkMomentsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3062,13 +3062,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetUserTagByIDResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetUserTagByIDResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3116,13 +3116,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetUserTagsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetUserTagsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3170,13 +3170,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetUserWorkMomentsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetUserWorkMomentsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3224,13 +3224,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetWorkMomentByIDResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetWorkMomentByIDResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3278,13 +3278,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.LikeOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.LikeOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3332,13 +3332,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.SendMsg2TagResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.SendMsg2TagResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3386,13 +3386,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.SetTagResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.SetTagResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3452,13 +3452,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3506,13 +3506,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentMemberResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentMemberResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3560,13 +3560,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CreateOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CreateOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3614,13 +3614,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3668,13 +3668,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3722,13 +3722,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3778,7 +3778,10 @@ const docTemplate = `{ "type": "object", "properties": { "data": { - "$ref": "#/definitions/server_api_params.UserDepartmentMember" + "type": "array", + "items": { + "$ref": "#/definitions/server_api_params.UserDepartmentMember" + } } } } @@ -3788,13 +3791,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetDepartmentMemberResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetDepartmentMemberResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3836,19 +3839,34 @@ const docTemplate = `{ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetSubDepartmentResp" + "allOf": [ + { + "$ref": "#/definitions/base_info.GetSubDepartmentResp" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/server_api_params.Department" + } + } + } + } + ] } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetSubDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetSubDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3908,13 +3926,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3962,13 +3980,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.UpdateDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.UpdateDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -4016,13 +4034,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.UpdateOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.UpdateOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -4070,13 +4088,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.UpdateUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.UpdateUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -4190,13 +4208,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.AccountCheckResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.AccountCheckResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -4244,13 +4262,13 @@ const docTemplate = `{ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetAllUsersUidResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetAllUsersUidResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -5213,10 +5231,6 @@ const docTemplate = `{ "base_info.CreateDepartmentResp": { "type": "object", "properties": { - "data": { - "type": "object", - "additionalProperties": true - }, "errCode": { "type": "integer" }, @@ -5869,13 +5883,6 @@ const docTemplate = `{ "base_info.GetDepartmentMemberResp": { "type": "object", "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "additionalProperties": true - } - }, "errCode": { "type": "integer" }, @@ -6147,13 +6154,6 @@ const docTemplate = `{ "base_info.GetSubDepartmentResp": { "type": "object", "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "additionalProperties": true - } - }, "errCode": { "type": "integer" }, @@ -6274,10 +6274,6 @@ const docTemplate = `{ "base_info.GetUserInDepartmentResp": { "type": "object", "properties": { - "data": { - "type": "object", - "additionalProperties": true - }, "errCode": { "type": "integer" }, diff --git a/cmd/open_im_api/docs/swagger.json b/cmd/open_im_api/docs/swagger.json index 6e03a6912..d93a390f8 100644 --- a/cmd/open_im_api/docs/swagger.json +++ b/cmd/open_im_api/docs/swagger.json @@ -2352,13 +2352,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetAllConversationsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetAllConversationsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2406,13 +2406,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetConversationResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetConversationResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2460,13 +2460,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetConversationsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetConversationsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2622,13 +2622,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CommentOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CommentOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2676,13 +2676,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CreateOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CreateOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2730,13 +2730,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CreateTagResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CreateTagResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2784,13 +2784,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteCommentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteCommentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2838,13 +2838,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2892,13 +2892,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteTagResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteTagResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -2946,13 +2946,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetTagSendLogsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetTagSendLogsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3000,13 +3000,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetUserFriendWorkMomentsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetUserFriendWorkMomentsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3054,13 +3054,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetUserTagByIDResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetUserTagByIDResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3108,13 +3108,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetUserTagsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetUserTagsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3162,13 +3162,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetUserWorkMomentsResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetUserWorkMomentsResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3216,13 +3216,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetWorkMomentByIDResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetWorkMomentByIDResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3270,13 +3270,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.LikeOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.LikeOneWorkMomentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3324,13 +3324,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.SendMsg2TagResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.SendMsg2TagResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3378,13 +3378,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.SetTagResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.SetTagResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3444,13 +3444,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3498,13 +3498,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentMemberResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CreateDepartmentMemberResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3552,13 +3552,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.CreateOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.CreateOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3606,13 +3606,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3660,13 +3660,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3714,13 +3714,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.DeleteUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.DeleteUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3770,7 +3770,10 @@ "type": "object", "properties": { "data": { - "$ref": "#/definitions/server_api_params.UserDepartmentMember" + "type": "array", + "items": { + "$ref": "#/definitions/server_api_params.UserDepartmentMember" + } } } } @@ -3780,13 +3783,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetDepartmentMemberResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetDepartmentMemberResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3828,19 +3831,34 @@ "0": { "description": "", "schema": { - "$ref": "#/definitions/base_info.GetSubDepartmentResp" + "allOf": [ + { + "$ref": "#/definitions/base_info.GetSubDepartmentResp" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/server_api_params.Department" + } + } + } + } + ] } }, "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetSubDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetSubDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3900,13 +3918,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -3954,13 +3972,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.UpdateDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.UpdateDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -4008,13 +4026,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.UpdateOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.UpdateOrganizationUserResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -4062,13 +4080,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.UpdateUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.UpdateUserInDepartmentResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -4182,13 +4200,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.AccountCheckResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.AccountCheckResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -4236,13 +4254,13 @@ "400": { "description": "errCode为400 一般为参数输入错误, token未带上等", "schema": { - "$ref": "#/definitions/base_info.GetAllUsersUidResp" + "$ref": "#/definitions/base_info.Swagger400Resp" } }, "500": { "description": "errCode为500 一般为服务器内部错误", "schema": { - "$ref": "#/definitions/base_info.GetAllUsersUidResp" + "$ref": "#/definitions/base_info.Swagger500Resp" } } } @@ -5205,10 +5223,6 @@ "base_info.CreateDepartmentResp": { "type": "object", "properties": { - "data": { - "type": "object", - "additionalProperties": true - }, "errCode": { "type": "integer" }, @@ -5861,13 +5875,6 @@ "base_info.GetDepartmentMemberResp": { "type": "object", "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "additionalProperties": true - } - }, "errCode": { "type": "integer" }, @@ -6139,13 +6146,6 @@ "base_info.GetSubDepartmentResp": { "type": "object", "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "additionalProperties": true - } - }, "errCode": { "type": "integer" }, @@ -6266,10 +6266,6 @@ "base_info.GetUserInDepartmentResp": { "type": "object", "properties": { - "data": { - "type": "object", - "additionalProperties": true - }, "errCode": { "type": "integer" }, diff --git a/cmd/open_im_api/docs/swagger.yaml b/cmd/open_im_api/docs/swagger.yaml index f030e5353..08b433cd2 100644 --- a/cmd/open_im_api/docs/swagger.yaml +++ b/cmd/open_im_api/docs/swagger.yaml @@ -438,9 +438,6 @@ definitions: type: object base_info.CreateDepartmentResp: properties: - data: - additionalProperties: true - type: object errCode: type: integer errMsg: @@ -872,11 +869,6 @@ definitions: type: object base_info.GetDepartmentMemberResp: properties: - data: - items: - additionalProperties: true - type: object - type: array errCode: type: integer errMsg: @@ -1055,11 +1047,6 @@ definitions: type: object base_info.GetSubDepartmentResp: properties: - data: - items: - additionalProperties: true - type: object - type: array errCode: type: integer errMsg: @@ -1139,9 +1126,6 @@ definitions: type: object base_info.GetUserInDepartmentResp: properties: - data: - additionalProperties: true - type: object errCode: type: integer errMsg: @@ -4162,11 +4146,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetAllConversationsResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetAllConversationsResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 获取用户所有会话 tags: - 会话相关 @@ -4198,11 +4182,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetConversationResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetConversationResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 根据会话ID获取会话 tags: - 会话相关 @@ -4234,11 +4218,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetConversationsResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetConversationsResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 根据会话ID列表获取会话 tags: - 会话相关 @@ -4333,11 +4317,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.CommentOneWorkMomentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.CommentOneWorkMomentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 评论一条工作圈 tags: - 工作圈 @@ -4370,11 +4354,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.CreateOneWorkMomentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.CreateOneWorkMomentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 创建一条工作圈 tags: - 工作圈 @@ -4406,11 +4390,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.CreateTagResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.CreateTagResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 创建标签 tags: - 标签 @@ -4442,11 +4426,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.DeleteCommentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.DeleteCommentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 删除一条评论 tags: - 工作圈 @@ -4478,11 +4462,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.DeleteOneWorkMomentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.DeleteOneWorkMomentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 删除一条工作圈 tags: - 工作圈 @@ -4514,11 +4498,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.DeleteTagResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.DeleteTagResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 删除标签 tags: - 标签 @@ -4550,11 +4534,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetTagSendLogsResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetTagSendLogsResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 获取发送历史记录 tags: - 标签 @@ -4586,11 +4570,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetUserFriendWorkMomentsResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetUserFriendWorkMomentsResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 查询自己大工作圈页面 tags: - 工作圈 @@ -4622,11 +4606,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetUserTagByIDResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetUserTagByIDResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 获取该用户的标签信息 tags: - 标签 @@ -4658,11 +4642,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetUserTagsResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetUserTagsResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 获取用户标签信息 tags: - 标签 @@ -4694,11 +4678,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetUserWorkMomentsResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetUserWorkMomentsResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 查询用户工作圈 tags: - 工作圈 @@ -4730,11 +4714,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetWorkMomentByIDResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetWorkMomentByIDResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 通过ID获取工作圈 tags: - 工作圈 @@ -4766,11 +4750,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.LikeOneWorkMomentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.LikeOneWorkMomentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 点赞一条工作圈 tags: - 工作圈 @@ -4802,11 +4786,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.SendMsg2TagResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.SendMsg2TagResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 发送标签消息 tags: - 标签 @@ -4838,11 +4822,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.SetTagResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.SetTagResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 修改标签 tags: - 标签 @@ -4879,11 +4863,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.CreateDepartmentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.CreateDepartmentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 创建部门 tags: - 组织架构相关 @@ -4915,11 +4899,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.CreateDepartmentMemberResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.CreateDepartmentMemberResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 创建部门用户 tags: - 组织架构相关 @@ -4951,11 +4935,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.CreateOrganizationUserResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.CreateOrganizationUserResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 组织架构导入用户 tags: - 组织架构相关 @@ -4987,11 +4971,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.DeleteDepartmentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.DeleteDepartmentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 删除部门 tags: - 组织架构相关 @@ -5023,11 +5007,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.DeleteOrganizationUserResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.DeleteOrganizationUserResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 删除组织架构中某个用户 tags: - 组织架构相关 @@ -5059,11 +5043,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.DeleteUserInDepartmentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.DeleteUserInDepartmentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 删除部门中某个用户 tags: - 组织架构相关 @@ -5095,16 +5079,18 @@ paths: - $ref: '#/definitions/base_info.GetDepartmentMemberResp' - properties: data: - $ref: '#/definitions/server_api_params.UserDepartmentMember' + items: + $ref: '#/definitions/server_api_params.UserDepartmentMember' + type: array type: object "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetDepartmentMemberResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetDepartmentMemberResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 获取部门中所有成员 tags: - 组织架构相关 @@ -5132,15 +5118,22 @@ paths: "0": description: "" schema: - $ref: '#/definitions/base_info.GetSubDepartmentResp' + allOf: + - $ref: '#/definitions/base_info.GetSubDepartmentResp' + - properties: + data: + items: + $ref: '#/definitions/server_api_params.Department' + type: array + type: object "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetSubDepartmentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetSubDepartmentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 获取子部门列表 tags: - 组织架构相关 @@ -5177,11 +5170,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetUserInDepartmentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetUserInDepartmentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 获取部门中的所有用户 tags: - 组织架构相关 @@ -5213,11 +5206,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.UpdateDepartmentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.UpdateDepartmentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 更新部门信息 tags: - 组织架构相关 @@ -5249,11 +5242,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.UpdateOrganizationUserResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.UpdateOrganizationUserResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 更新组织架构中的用户 tags: - 组织架构相关 @@ -5285,11 +5278,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.UpdateUserInDepartmentResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.UpdateUserInDepartmentResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 更新部门中某个用户 tags: - 组织架构相关 @@ -5366,11 +5359,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.AccountCheckResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.AccountCheckResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 检查列表账户注册状态，并且返回结果 tags: - 用户相关 @@ -5402,11 +5395,11 @@ paths: "400": description: errCode为400 一般为参数输入错误, token未带上等 schema: - $ref: '#/definitions/base_info.GetAllUsersUidResp' + $ref: '#/definitions/base_info.Swagger400Resp' "500": description: errCode为500 一般为服务器内部错误 schema: - $ref: '#/definitions/base_info.GetAllUsersUidResp' + $ref: '#/definitions/base_info.Swagger500Resp' summary: 获取所有用户uid列表 tags: - 用户相关 diff --git a/internal/api/conversation/conversation.go b/internal/api/conversation/conversation.go index 36d7388bf..2c26d4f0e 100644 --- a/internal/api/conversation/conversation.go +++ b/internal/api/conversation/conversation.go @@ -136,8 +136,8 @@ func BatchSetConversations(c *gin.Context) { // @Param req body api.GetAllConversationsReq true "ownerUserID为要获取的用户ID" // @Produce json // @Success 0 {object} api.GetAllConversationsResp -// @Failure 500 {object} api.GetAllConversationsResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetAllConversationsResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /msg/get_all_conversations [post] func GetAllConversations(c *gin.Context) { var ( @@ -186,8 +186,8 @@ func GetAllConversations(c *gin.Context) { // @Param req body api.GetConversationReq true "ownerUserID为要获取的用户ID
conversationID为要获取的会话ID" // @Produce json // @Success 0 {object} api.GetConversationResp -// @Failure 500 {object} api.GetConversationResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetConversationResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /msg/get_conversation [post] func GetConversation(c *gin.Context) { var ( @@ -236,8 +236,8 @@ func GetConversation(c *gin.Context) { // @Param req body api.GetConversationsReq true "ownerUserID为要获取的用户ID
conversationIDs为要获取的会话ID列表" // @Produce json // @Success 0 {object} api.GetConversationsResp -// @Failure 500 {object} api.GetConversationsResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetConversationsResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /msg/get_conversations [post] func GetConversations(c *gin.Context) { var ( diff --git a/internal/api/manage/management_user.go b/internal/api/manage/management_user.go index 775c31366..3d2c89a65 100644 --- a/internal/api/manage/management_user.go +++ b/internal/api/manage/management_user.go @@ -74,8 +74,8 @@ func DeleteUser(c *gin.Context) { // @Param req body api.GetAllUsersUidReq true "请求体" // @Produce json // @Success 0 {object} api.GetAllUsersUidResp -// @Failure 500 {object} api.GetAllUsersUidResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetAllUsersUidResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /user/get_all_users_uid [post] func GetAllUsersUid(c *gin.Context) { params := api.GetAllUsersUidReq{} @@ -129,8 +129,8 @@ func GetAllUsersUid(c *gin.Context) { // @Param req body api.AccountCheckReq true "请求体" // @Produce json // @Success 0 {object} api.AccountCheckResp -// @Failure 500 {object} api.AccountCheckResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.AccountCheckResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /user/account_check [post] func AccountCheck(c *gin.Context) { params := api.AccountCheckReq{} diff --git a/internal/api/office/tag.go b/internal/api/office/tag.go index b23c75826..c64e736cd 100644 --- a/internal/api/office/tag.go +++ b/internal/api/office/tag.go @@ -25,8 +25,8 @@ import ( // @Param req body api.GetUserTagsReq true "请求" // @Produce json // @Success 0 {object} api.GetUserTagsResp -// @Failure 500 {object} api.GetUserTagsResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetUserTagsResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/get_user_tags [post] func GetUserTags(c *gin.Context) { var ( @@ -88,8 +88,8 @@ func GetUserTags(c *gin.Context) { // @Param req body api.CreateTagReq true "请求" // @Produce json // @Success 0 {object} api.CreateTagResp -// @Failure 500 {object} api.CreateTagResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.CreateTagResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/create_tag [post] func CreateTag(c *gin.Context) { var ( @@ -148,8 +148,8 @@ func CreateTag(c *gin.Context) { // @Param req body api.DeleteTagReq true "请求" // @Produce json // @Success 0 {object} api.DeleteTagResp -// @Failure 500 {object} api.DeleteTagResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.DeleteTagResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/delete_tag [post] func DeleteTag(c *gin.Context) { var ( @@ -208,8 +208,8 @@ func DeleteTag(c *gin.Context) { // @Param req body api.SetTagReq true "请求" // @Produce json // @Success 0 {object} api.SetTagResp -// @Failure 500 {object} api.SetTagResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.SetTagResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/set_tag [post] func SetTag(c *gin.Context) { var ( @@ -268,8 +268,8 @@ func SetTag(c *gin.Context) { // @Param req body api.SendMsg2TagReq true "请求" // @Produce json // @Success 0 {object} api.SendMsg2TagResp -// @Failure 500 {object} api.SendMsg2TagResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.SendMsg2TagResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/send_msg_to_tag [post] func SendMsg2Tag(c *gin.Context) { var ( @@ -328,8 +328,8 @@ func SendMsg2Tag(c *gin.Context) { // @Param req body api.GetTagSendLogsReq true "请求" // @Produce json // @Success 0 {object} api.GetTagSendLogsResp -// @Failure 500 {object} api.GetTagSendLogsResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetTagSendLogsResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/get_send_tag_log [post] func GetTagSendLogs(c *gin.Context) { var ( @@ -398,8 +398,8 @@ func GetTagSendLogs(c *gin.Context) { // @Param req body api.GetUserTagByIDReq true "请求" // @Produce json // @Success 0 {object} api.GetUserTagByIDResp -// @Failure 500 {object} api.GetUserTagByIDResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetUserTagByIDResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/get_user_tag_by_id [post] func GetUserTagByID(c *gin.Context) { var ( diff --git a/internal/api/office/work_moments.go b/internal/api/office/work_moments.go index 86b3dc7bf..0c37f5b1d 100644 --- a/internal/api/office/work_moments.go +++ b/internal/api/office/work_moments.go @@ -24,8 +24,8 @@ import ( // @Param req body api.CreateOneWorkMomentReq true "请求 atUserList likeUserList permissionGroupList permissionUserList 字段中userName可以不填" // @Produce json // @Success 0 {object} api.CreateOneWorkMomentResp -// @Failure 500 {object} api.CreateOneWorkMomentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.CreateOneWorkMomentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/create_one_work_moment [post] func CreateOneWorkMoment(c *gin.Context) { var ( @@ -88,8 +88,8 @@ func CreateOneWorkMoment(c *gin.Context) { // @Param req body api.DeleteOneWorkMomentReq true "请求" // @Produce json // @Success 0 {object} api.DeleteOneWorkMomentResp -// @Failure 500 {object} api.DeleteOneWorkMomentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.DeleteOneWorkMomentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/delete_one_work_moment [post] func DeleteOneWorkMoment(c *gin.Context) { var ( @@ -151,8 +151,8 @@ func DeleteOneWorkMoment(c *gin.Context) { // @Param req body api.LikeOneWorkMomentReq true "请求" // @Produce json // @Success 0 {object} api.LikeOneWorkMomentResp -// @Failure 500 {object} api.LikeOneWorkMomentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.LikeOneWorkMomentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/like_one_work_moment [post] func LikeOneWorkMoment(c *gin.Context) { var ( @@ -213,8 +213,8 @@ func LikeOneWorkMoment(c *gin.Context) { // @Param req body api.CommentOneWorkMomentReq true "请求" // @Produce json // @Success 0 {object} api.CommentOneWorkMomentResp -// @Failure 500 {object} api.CommentOneWorkMomentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.CommentOneWorkMomentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/comment_one_work_moment [post] func CommentOneWorkMoment(c *gin.Context) { var ( @@ -275,8 +275,8 @@ func CommentOneWorkMoment(c *gin.Context) { // @Param req body api.DeleteCommentReq true "请求" // @Produce json // @Success 0 {object} api.DeleteCommentResp -// @Failure 500 {object} api.DeleteCommentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.DeleteCommentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/delete_comment [post] func DeleteComment(c *gin.Context) { var ( @@ -335,8 +335,8 @@ func DeleteComment(c *gin.Context) { // @Param req body api.GetWorkMomentByIDReq true "请求" // @Produce json // @Success 0 {object} api.GetWorkMomentByIDResp -// @Failure 500 {object} api.GetWorkMomentByIDResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetWorkMomentByIDResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/get_work_moment_by_id [post] func GetWorkMomentByID(c *gin.Context) { var ( @@ -401,8 +401,8 @@ func GetWorkMomentByID(c *gin.Context) { // @Param req body api.GetUserWorkMomentsReq true "请求" // @Produce json // @Success 0 {object} api.GetUserWorkMomentsResp -// @Failure 500 {object} api.GetUserWorkMomentsResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetUserWorkMomentsResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/get_user_work_moments [post] func GetUserWorkMoments(c *gin.Context) { var ( @@ -514,8 +514,8 @@ func GetUserWorkMoments(c *gin.Context) { // @Param req body api.GetUserFriendWorkMomentsReq true "请求" // @Produce json // @Success 0 {object} api.GetUserFriendWorkMomentsResp -// @Failure 500 {object} api.GetUserFriendWorkMomentsResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetUserFriendWorkMomentsResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /office/get_user_friend_work_moments [post] func GetUserFriendWorkMoments(c *gin.Context) { var ( diff --git a/internal/api/organization/organization.go b/internal/api/organization/organization.go index 32273756f..1d6542306 100644 --- a/internal/api/organization/organization.go +++ b/internal/api/organization/organization.go @@ -25,8 +25,8 @@ import ( // @Param req body api.CreateDepartmentReq true "请求" // @Produce json // @Success 0 {object} api.CreateDepartmentResp{data=open_im_sdk.Department} -// @Failure 500 {object} api.CreateDepartmentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.CreateDepartmentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/create_department [post] func CreateDepartment(c *gin.Context) { params := api.CreateDepartmentReq{} @@ -80,8 +80,8 @@ func CreateDepartment(c *gin.Context) { // @Param req body api.UpdateDepartmentReq true "请求" // @Produce json // @Success 0 {object} api.UpdateDepartmentResp -// @Failure 500 {object} api.UpdateDepartmentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.UpdateDepartmentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/update_department [post] func UpdateDepartment(c *gin.Context) { params := api.UpdateDepartmentReq{} @@ -133,9 +133,9 @@ func UpdateDepartment(c *gin.Context) { // @Param token header string true "im token" // @Param req body api.GetSubDepartmentReq true "请求" // @Produce json -// @Success 0 {object} api.GetSubDepartmentResp -// @Failure 500 {object} api.GetSubDepartmentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetSubDepartmentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Success 0 {object} api.GetSubDepartmentResp{data=[]open_im_sdk.Department} +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/get_sub_department [post] func GetSubDepartment(c *gin.Context) { params := api.GetSubDepartmentReq{} @@ -191,8 +191,8 @@ func GetAllDepartment(c *gin.Context) { // @Param req body api.DeleteDepartmentReq true "请求" // @Produce json // @Success 0 {object} api.DeleteDepartmentResp -// @Failure 500 {object} api.DeleteDepartmentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.DeleteDepartmentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/delete_department [post] func DeleteDepartment(c *gin.Context) { params := api.DeleteDepartmentReq{} @@ -242,8 +242,8 @@ func DeleteDepartment(c *gin.Context) { // @Param req body api.CreateOrganizationUserReq true "请求" // @Produce json // @Success 0 {object} api.CreateOrganizationUserResp -// @Failure 500 {object} api.CreateOrganizationUserResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.CreateOrganizationUserResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/create_organization_user [post] func CreateOrganizationUser(c *gin.Context) { params := api.CreateOrganizationUserReq{} @@ -296,8 +296,8 @@ func CreateOrganizationUser(c *gin.Context) { // @Param req body api.UpdateOrganizationUserReq true "请求" // @Produce json // @Success 0 {object} api.UpdateOrganizationUserResp -// @Failure 500 {object} api.UpdateOrganizationUserResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.UpdateOrganizationUserResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/update_organization_user [post] func UpdateOrganizationUser(c *gin.Context) { params := api.UpdateOrganizationUserReq{} @@ -348,8 +348,8 @@ func UpdateOrganizationUser(c *gin.Context) { // @Param req body api.CreateDepartmentMemberReq true "请求" // @Produce json // @Success 0 {object} api.CreateDepartmentMemberResp -// @Failure 500 {object} api.CreateDepartmentMemberResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.CreateDepartmentMemberResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/create_department_member [post] func CreateDepartmentMember(c *gin.Context) { params := api.CreateDepartmentMemberReq{} @@ -402,8 +402,8 @@ func CreateDepartmentMember(c *gin.Context) { // @Param req body api.GetUserInDepartmentReq true "请求" // @Produce json // @Success 0 {object} api.GetUserInDepartmentResp{data=open_im_sdk.UserInDepartment} -// @Failure 500 {object} api.GetUserInDepartmentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetUserInDepartmentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/get_user_in_department [post] func GetUserInDepartment(c *gin.Context) { params := api.GetUserInDepartmentReq{} @@ -456,8 +456,8 @@ func GetUserInDepartment(c *gin.Context) { // @Param req body api.UpdateUserInDepartmentReq true "请求" // @Produce json // @Success 0 {object} api.UpdateUserInDepartmentResp -// @Failure 500 {object} api.UpdateUserInDepartmentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.UpdateUserInDepartmentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/update_user_in_department [post] func UpdateUserInDepartment(c *gin.Context) { params := api.UpdateUserInDepartmentReq{} @@ -509,8 +509,8 @@ func UpdateUserInDepartment(c *gin.Context) { // @Param req body api.DeleteOrganizationUserReq true "请求" // @Produce json // @Success 0 {object} api.DeleteOrganizationUserResp -// @Failure 500 {object} api.DeleteOrganizationUserResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.DeleteOrganizationUserResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/delete_organization_user [post] func DeleteOrganizationUser(c *gin.Context) { params := api.DeleteOrganizationUserReq{} @@ -561,9 +561,9 @@ func DeleteOrganizationUser(c *gin.Context) { // @Param token header string true "im token" // @Param req body api.GetDepartmentMemberReq true "请求" // @Produce json -// @Success 0 {object} api.GetDepartmentMemberResp{data=open_im_sdk.UserDepartmentMember} -// @Failure 500 {object} api.GetDepartmentMemberResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.GetDepartmentMemberResp "errCode为400 一般为参数输入错误, token未带上等" +// @Success 0 {object} api.GetDepartmentMemberResp{data=[]open_im_sdk.UserDepartmentMember} +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/get_department_member [post] func GetDepartmentMember(c *gin.Context) { params := api.GetDepartmentMemberReq{} @@ -572,7 +572,6 @@ func GetDepartmentMember(c *gin.Context) { c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) return } - req := &rpc.GetDepartmentMemberReq{} utils.CopyStructFields(req, ¶ms) @@ -616,8 +615,8 @@ func GetDepartmentMember(c *gin.Context) { // @Param req body api.DeleteUserInDepartmentReq true "请求" // @Produce json // @Success 0 {object} api.DeleteUserInDepartmentResp -// @Failure 500 {object} api.DeleteUserInDepartmentResp "errCode为500 一般为服务器内部错误" -// @Failure 400 {object} api.DeleteUserInDepartmentResp "errCode为400 一般为参数输入错误, token未带上等" +// @Failure 500 {object} api.Swagger500Resp "errCode为500 一般为服务器内部错误" +// @Failure 400 {object} api.Swagger400Resp "errCode为400 一般为参数输入错误, token未带上等" // @Router /organization/delete_user_in_department [post] func DeleteUserInDepartment(c *gin.Context) { params := api.DeleteUserInDepartmentReq{} diff --git a/pkg/base_info/organization_api_struct.go b/pkg/base_info/organization_api_struct.go index 31a9c038b..b3c77ad8f 100644 --- a/pkg/base_info/organization_api_struct.go +++ b/pkg/base_info/organization_api_struct.go @@ -9,7 +9,7 @@ type CreateDepartmentReq struct { type CreateDepartmentResp struct { CommResp Department *open_im_sdk.Department `json:"-"` - Data map[string]interface{} `json:"data"` + Data map[string]interface{} `json:"data" swaggerignore:"true"` } type UpdateDepartmentReq struct { @@ -28,7 +28,7 @@ type GetSubDepartmentReq struct { type GetSubDepartmentResp struct { CommResp DepartmentList []*open_im_sdk.Department `json:"-"` - Data []map[string]interface{} `json:"data"` + Data []map[string]interface{} `json:"data" swaggerignore:"true"` } type DeleteDepartmentReq struct { @@ -71,7 +71,7 @@ type GetUserInDepartmentReq struct { type GetUserInDepartmentResp struct { CommResp UserInDepartment *open_im_sdk.UserInDepartment `json:"-"` - Data map[string]interface{} `json:"data"` + Data map[string]interface{} `json:"data" swaggerignore:"true"` } type UpdateUserInDepartmentReq struct { @@ -97,7 +97,7 @@ type GetDepartmentMemberReq struct { type GetDepartmentMemberResp struct { CommResp UserInDepartmentList []*open_im_sdk.UserDepartmentMember `json:"-"` - Data []map[string]interface{} `json:"data"` + Data []map[string]interface{} `json:"data" swaggerignore:"true"` } type DeleteUserInDepartmentReq struct { From 566d5e832c46ef93bdf043aa2312b204d887719d Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 16:23:28 +0800 Subject: [PATCH 04/15] test --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 33128d3d8..5f72bde6f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -72,7 +72,7 @@ services: environment: TZ: Asia/Shanghai KAFKA_BROKER_ID: 0 - KAFKA_ZOOKEEPER_CONNECT: 127.0.0.1:2181 + KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9093 KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 From e02150cdb01b4bc99dff31e7ff9f366ed58a5b34 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 16:38:11 +0800 Subject: [PATCH 05/15] test --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 5f72bde6f..96aef7136 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -68,13 +68,13 @@ services: container_name: kafka restart: always ports: - - 9093:9093 + - 9092:9092 environment: TZ: Asia/Shanghai KAFKA_BROKER_ID: 0 KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" - KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9093 + KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092 KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE From 834b88f68f60fc474196705c0af4458e3b4b51ca Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 1 Jul 2022 16:41:47 +0800 Subject: [PATCH 06/15] mongo docker-compose --- config/config.yaml | 4 ++-- docker-compose.yaml | 10 +++++++--- script/mongo-init.sh | 12 ++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 script/mongo-init.sh diff --git a/config/config.yaml b/config/config.yaml index bf9f3309c..10fa18cf5 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -28,8 +28,8 @@ mongo: dbTimeout: 60 dbDatabase: openIM #mongo db 默认即可 dbSource: admin - dbUserName: #mongo用户名，建议先不设置 - dbPassword: #mongo密码，建议先不设置 + dbUserName: openIM #mongo用户名，建议先不设置 + dbPassword: openIM #mongo密码，建议先不设置 dbMaxPoolSize: 100 dbRetainChatRecords: 3650 #mongo保存离线消息时间（天），根据需求修改 diff --git a/docker-compose.yaml b/docker-compose.yaml index 5f72bde6f..39b2888c8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -20,17 +20,21 @@ services: ports: - 37017:27017 container_name: mongo - command: --wiredTigerCacheSizeGB 1 + command: --wiredTigerCacheSizeGB 1 --auth volumes: - ./components/mongodb/data/db:/data/db - ./components/mongodb/data/logs:/data/logs - ./components/mongodb/data/conf:/etc/mongo + - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh environment: - TZ=Asia/Shanghai # cache - wiredTigerCacheSizeGB=1 - #- MONGO_INITDB_ROOT_USERNAME=openIM - #- MONGO_INITDB_ROOT_PASSWORD=openIM + MONGO_USERNAME: openIM + MONGO_PASSWORD: openIM + MONGO_INITDB_ROOT_USERNAME: root + MONGO_INITDB_ROOT_PASSWORD: root + MONGO_INITDB_DATABASE: openIM #TZ: Asia/Shanghai restart: always diff --git a/script/mongo-init.sh b/script/mongo-init.sh new file mode 100644 index 000000000..ad9c84428 --- /dev/null +++ b/script/mongo-init.sh @@ -0,0 +1,12 @@ +mongo -- "$MONGO_INITDB_DATABASE" < Date: Fri, 1 Jul 2022 16:45:12 +0800 Subject: [PATCH 07/15] mongo docker-compose --- docker-compose.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index aad4436f1..d0969d0f3 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -30,11 +30,11 @@ services: - TZ=Asia/Shanghai # cache - wiredTigerCacheSizeGB=1 - MONGO_USERNAME: openIM - MONGO_PASSWORD: openIM - MONGO_INITDB_ROOT_USERNAME: root - MONGO_INITDB_ROOT_PASSWORD: root - MONGO_INITDB_DATABASE: openIM + - MONGO_USERNAME=openIM + - MONGO_PASSWORD=openIM + - MONGO_INITDB_ROOT_USERNAME=root + - MONGO_INITDB_ROOT_PASSWORD=root + - MONGO_INITDB_DATABASE=openIM #TZ: Asia/Shanghai restart: always From 5f0873221a8cf02e21dd38aadbfa34dc356228e0 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 16:51:44 +0800 Subject: [PATCH 08/15] test --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 96aef7136..9e2a8d6b9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -74,8 +74,8 @@ services: KAFKA_BROKER_ID: 0 KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" - KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092 - KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 + KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9093,OUTSIDE://103.116.45.174:9092 + KAFKA_LISTENERS: INSIDE://:9093,OUTSIDE://:9092 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE depends_on: From f3144f92c55bffb88b8524fe4b84fae977ce6e14 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 1 Jul 2022 16:53:45 +0800 Subject: [PATCH 09/15] mongo docker-compose --- docker-compose.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index d0969d0f3..69a84277c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -20,22 +20,21 @@ services: ports: - 37017:27017 container_name: mongo - command: --wiredTigerCacheSizeGB 1 --auth + command: --wiredTigerCacheSizeGB 1 volumes: - ./components/mongodb/data/db:/data/db - ./components/mongodb/data/logs:/data/logs - ./components/mongodb/data/conf:/etc/mongo - - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh +# - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh environment: - TZ=Asia/Shanghai # cache - wiredTigerCacheSizeGB=1 - - MONGO_USERNAME=openIM - - MONGO_PASSWORD=openIM - - MONGO_INITDB_ROOT_USERNAME=root - - MONGO_INITDB_ROOT_PASSWORD=root - - MONGO_INITDB_DATABASE=openIM - #TZ: Asia/Shanghai +# - MONGO_USERNAME=openIM +# - MONGO_PASSWORD=openIM +# - MONGO_INITDB_ROOT_USERNAME=root +# - MONGO_INITDB_ROOT_PASSWORD=root +# - MONGO_INITDB_DATABASE=openIM restart: always redis: From 7c18012ef2e89927e3b3af175e2ebc747fdb4484 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 1 Jul 2022 16:59:16 +0800 Subject: [PATCH 10/15] mongo docker-compose --- config/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 10fa18cf5..bf9f3309c 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -28,8 +28,8 @@ mongo: dbTimeout: 60 dbDatabase: openIM #mongo db 默认即可 dbSource: admin - dbUserName: openIM #mongo用户名，建议先不设置 - dbPassword: openIM #mongo密码，建议先不设置 + dbUserName: #mongo用户名，建议先不设置 + dbPassword: #mongo密码，建议先不设置 dbMaxPoolSize: 100 dbRetainChatRecords: 3650 #mongo保存离线消息时间（天），根据需求修改 From 21e9958da9c02b5865b7e14b6d6326273bf41407 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 16:59:49 +0800 Subject: [PATCH 11/15] test --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 8317f213e..3c0a4a54e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -77,8 +77,8 @@ services: KAFKA_BROKER_ID: 0 KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" - KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9093,OUTSIDE://103.116.45.174:9092 - KAFKA_LISTENERS: INSIDE://:9093,OUTSIDE://:9092 + KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092 + KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9092 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE depends_on: From 50d1646ce01768ae636df185fa43af0c304ed594 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 17:05:16 +0800 Subject: [PATCH 12/15] test --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 3c0a4a54e..8317f213e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -77,8 +77,8 @@ services: KAFKA_BROKER_ID: 0 KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" - KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092 - KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9092 + KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9093,OUTSIDE://103.116.45.174:9092 + KAFKA_LISTENERS: INSIDE://:9093,OUTSIDE://:9092 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE depends_on: From 5a825df6a1991f5c023586a56e63d21ce2398b43 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 17:06:55 +0800 Subject: [PATCH 13/15] test --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 8317f213e..cdd3f1e40 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -77,7 +77,7 @@ services: KAFKA_BROKER_ID: 0 KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" - KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9093,OUTSIDE://103.116.45.174:9092 + KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092 KAFKA_LISTENERS: INSIDE://:9093,OUTSIDE://:9092 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE From 804b5423e520a03efd227222b8c9f4da12290370 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 17:11:41 +0800 Subject: [PATCH 14/15] test --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 5fefcb9d6..f5075d928 100644 --- a/go.mod +++ b/go.mod @@ -62,4 +62,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) -replace github.com/Shopify/sarama => github.com/Shopify/sarama v1.29.0 +replace github.com/Shopify/sarama => github.com/Shopify/sarama v1.29.1 From 7d172d718f4494c29364b7ea251233698bc23aaf Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 1 Jul 2022 17:23:21 +0800 Subject: [PATCH 15/15] test --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index cdd3f1e40..69a84277c 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -78,7 +78,7 @@ services: KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 KAFKA_CREATE_TOPICS: "ws2ms_chat:8:1,ms2ps_chat:8:1,msg_to_mongo:8:1" KAFKA_ADVERTISED_LISTENERS: INSIDE://127.0.0.1:9092,OUTSIDE://103.116.45.174:9092 - KAFKA_LISTENERS: INSIDE://:9093,OUTSIDE://:9092 + KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE depends_on: