blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

errcode

Browse Source
This commit is contained in:
wangchuxiao 2023-02-09 20:36:34 +08:00
parent 8a1702fcf7
commit 759432794f
216 changed files with 2299 additions and 4059 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
cmd/open_im_api/Makefile → cmd/api/Makefile
View File

80
cmd/open_im_api/docs/docs.go → cmd/api/docs/docs.go
View File

@ -496,7 +496,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.PublicUserInfo"
"$ref": "#/definitions/sdkws.PublicUserInfo"
}
}
}
@ -565,7 +565,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.FriendRequest"
"$ref": "#/definitions/sdkws.FriendRequest"
}
}
}
@ -634,7 +634,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.FriendInfo"
"$ref": "#/definitions/sdkws.FriendInfo"
}
}
}
@ -703,7 +703,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.FriendRequest"
"$ref": "#/definitions/sdkws.FriendRequest"
}
}
}
@ -1094,7 +1094,7 @@ const docTemplate = `{
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/server_api_params.GroupInfo"
"$ref": "#/definitions/sdkws.GroupInfo"
}
}
}
@ -1216,7 +1216,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.GroupMemberFullInfo"
"$ref": "#/definitions/sdkws.GroupMemberFullInfo"
}
}
}
@ -1285,7 +1285,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.GroupMemberFullInfo"
"$ref": "#/definitions/sdkws.GroupMemberFullInfo"
}
}
}
@ -1408,7 +1408,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.GroupInfo"
"$ref": "#/definitions/sdkws.GroupInfo"
}
}
}
@ -1477,7 +1477,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.GroupRequest"
"$ref": "#/definitions/sdkws.GroupRequest"
}
}
}
@ -1546,7 +1546,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.GroupRequest"
"$ref": "#/definitions/sdkws.GroupRequest"
}
}
}
@ -3428,7 +3428,7 @@ const docTemplate = `{
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/server_api_params.Department"
"$ref": "#/definitions/sdkws.Department"
}
}
}
@ -3766,7 +3766,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.UserDepartmentMember"
"$ref": "#/definitions/sdkws.UserDepartmentMember"
}
}
}
@ -3835,7 +3835,7 @@ const docTemplate = `{
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.Department"
"$ref": "#/definitions/sdkws.Department"
}
}
}
@ -3902,7 +3902,7 @@ const docTemplate = `{
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/server_api_params.UserInDepartment"
"$ref": "#/definitions/sdkws.UserInDepartment"
}
}
}
@ -4304,7 +4304,7 @@ const docTemplate = `{
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/server_api_params.UserInfo"
"$ref": "#/definitions/sdkws.UserInfo"
}
}
}
@ -4372,7 +4372,7 @@ const docTemplate = `{
"Data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.PublicUserInfo"
"$ref": "#/definitions/sdkws.PublicUserInfo"
}
}
}
@ -6770,7 +6770,7 @@ const docTemplate = `{
"type": "boolean"
},
"offlinePushInfo": {
"$ref": "#/definitions/server_api_params.OfflinePushInfo"
"$ref": "#/definitions/sdkws.OfflinePushInfo"
},
"operationID": {
"type": "string"
@ -6823,7 +6823,7 @@ const docTemplate = `{
"type": "boolean"
},
"offlinePushInfo": {
"$ref": "#/definitions/server_api_params.OfflinePushInfo"
"$ref": "#/definitions/sdkws.OfflinePushInfo"
},
"operationID": {
"type": "string"
@ -6852,7 +6852,7 @@ const docTemplate = `{
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/server_api_params.UserSendMsgResp"
"$ref": "#/definitions/sdkws.UserSendMsgResp"
},
"errCode": {
"type": "integer"
@ -8110,7 +8110,7 @@ const docTemplate = `{
}
}
},
"server_api_params.Department": {
"sdkws.Department": {
"type": "object",
"properties": {
"createTime": {
@ -8145,7 +8145,7 @@ const docTemplate = `{
}
}
},
"server_api_params.DepartmentMember": {
"sdkws.DepartmentMember": {
"type": "object",
"properties": {
"departmentID": {
@ -8171,7 +8171,7 @@ const docTemplate = `{
}
}
},
"server_api_params.FriendInfo": {
"sdkws.FriendInfo": {
"type": "object",
"properties": {
"addSource": {
@ -8184,7 +8184,7 @@ const docTemplate = `{
"type": "string"
},
"friendUser": {
"$ref": "#/definitions/server_api_params.UserInfo"
"$ref": "#/definitions/sdkws.UserInfo"
},
"operatorUserID": {
"type": "string"
@ -8197,7 +8197,7 @@ const docTemplate = `{
}
}
},
"server_api_params.FriendRequest": {
"sdkws.FriendRequest": {
"type": "object",
"properties": {
"createTime": {
@ -8247,7 +8247,7 @@ const docTemplate = `{
}
}
},
"server_api_params.GroupInfo": {
"sdkws.GroupInfo": {
"type": "object",
"properties": {
"applyMemberFriend": {
@ -8303,7 +8303,7 @@ const docTemplate = `{
}
}
},
"server_api_params.GroupMemberFullInfo": {
"sdkws.GroupMemberFullInfo": {
"type": "object",
"properties": {
"appMangerLevel": {
@ -8344,14 +8344,14 @@ const docTemplate = `{
}
}
},
"server_api_params.GroupRequest": {
"sdkws.GroupRequest": {
"type": "object",
"properties": {
"ex": {
"type": "string"
},
"groupInfo": {
"$ref": "#/definitions/server_api_params.GroupInfo"
"$ref": "#/definitions/sdkws.GroupInfo"
},
"handleMsg": {
"type": "string"
@ -8378,11 +8378,11 @@ const docTemplate = `{
"type": "integer"
},
"userInfo": {
"$ref": "#/definitions/server_api_params.PublicUserInfo"
"$ref": "#/definitions/sdkws.PublicUserInfo"
}
}
},
"server_api_params.OfflinePushInfo": {
"sdkws.OfflinePushInfo": {
"type": "object",
"properties": {
"desc": {
@ -8402,7 +8402,7 @@ const docTemplate = `{
}
}
},
"server_api_params.OrganizationUser": {
"sdkws.OrganizationUser": {
"type": "object",
"properties": {
"birth": {
@ -8440,7 +8440,7 @@ const docTemplate = `{
}
}
},
"server_api_params.PublicUserInfo": {
"sdkws.PublicUserInfo": {
"type": "object",
"properties": {
"ex": {
@ -8460,32 +8460,32 @@ const docTemplate = `{
}
}
},
"server_api_params.UserDepartmentMember": {
"sdkws.UserDepartmentMember": {
"type": "object",
"properties": {
"departmentMember": {
"$ref": "#/definitions/server_api_params.DepartmentMember"
"$ref": "#/definitions/sdkws.DepartmentMember"
},
"organizationUser": {
"$ref": "#/definitions/server_api_params.OrganizationUser"
"$ref": "#/definitions/sdkws.OrganizationUser"
}
}
},
"server_api_params.UserInDepartment": {
"sdkws.UserInDepartment": {
"type": "object",
"properties": {
"departmentMemberList": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.DepartmentMember"
"$ref": "#/definitions/sdkws.DepartmentMember"
}
},
"organizationUser": {
"$ref": "#/definitions/server_api_params.OrganizationUser"
"$ref": "#/definitions/sdkws.OrganizationUser"
}
}
},
"server_api_params.UserInfo": {
"sdkws.UserInfo": {
"type": "object",
"properties": {
"appMangerLevel": {
@ -8523,7 +8523,7 @@ const docTemplate = `{
}
}
},
"server_api_params.UserSendMsgResp": {
"sdkws.UserSendMsgResp": {
"type": "object",
"properties": {
"clientMsgID": {

80
cmd/open_im_api/docs/swagger.json → cmd/api/docs/swagger.json
View File

@ -488,7 +488,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.PublicUserInfo"
"$ref": "#/definitions/sdkws.PublicUserInfo"
}
}
}
@ -557,7 +557,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.FriendRequest"
"$ref": "#/definitions/sdkws.FriendRequest"
}
}
}
@ -626,7 +626,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.FriendInfo"
"$ref": "#/definitions/sdkws.FriendInfo"
}
}
}
@ -695,7 +695,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.FriendRequest"
"$ref": "#/definitions/sdkws.FriendRequest"
}
}
}
@ -1086,7 +1086,7 @@
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/server_api_params.GroupInfo"
"$ref": "#/definitions/sdkws.GroupInfo"
}
}
}
@ -1208,7 +1208,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.GroupMemberFullInfo"
"$ref": "#/definitions/sdkws.GroupMemberFullInfo"
}
}
}
@ -1277,7 +1277,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.GroupMemberFullInfo"
"$ref": "#/definitions/sdkws.GroupMemberFullInfo"
}
}
}
@ -1400,7 +1400,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.GroupInfo"
"$ref": "#/definitions/sdkws.GroupInfo"
}
}
}
@ -1469,7 +1469,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.GroupRequest"
"$ref": "#/definitions/sdkws.GroupRequest"
}
}
}
@ -1538,7 +1538,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.GroupRequest"
"$ref": "#/definitions/sdkws.GroupRequest"
}
}
}
@ -3420,7 +3420,7 @@
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/server_api_params.Department"
"$ref": "#/definitions/sdkws.Department"
}
}
}
@ -3758,7 +3758,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.UserDepartmentMember"
"$ref": "#/definitions/sdkws.UserDepartmentMember"
}
}
}
@ -3827,7 +3827,7 @@
"data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.Department"
"$ref": "#/definitions/sdkws.Department"
}
}
}
@ -3894,7 +3894,7 @@
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/server_api_params.UserInDepartment"
"$ref": "#/definitions/sdkws.UserInDepartment"
}
}
}
@ -4296,7 +4296,7 @@
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/server_api_params.UserInfo"
"$ref": "#/definitions/sdkws.UserInfo"
}
}
}
@ -4364,7 +4364,7 @@
"Data": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.PublicUserInfo"
"$ref": "#/definitions/sdkws.PublicUserInfo"
}
}
}
@ -6762,7 +6762,7 @@
"type": "boolean"
},
"offlinePushInfo": {
"$ref": "#/definitions/server_api_params.OfflinePushInfo"
"$ref": "#/definitions/sdkws.OfflinePushInfo"
},
"operationID": {
"type": "string"
@ -6815,7 +6815,7 @@
"type": "boolean"
},
"offlinePushInfo": {
"$ref": "#/definitions/server_api_params.OfflinePushInfo"
"$ref": "#/definitions/sdkws.OfflinePushInfo"
},
"operationID": {
"type": "string"
@ -6844,7 +6844,7 @@
"type": "object",
"properties": {
"data": {
"$ref": "#/definitions/server_api_params.UserSendMsgResp"
"$ref": "#/definitions/sdkws.UserSendMsgResp"
},
"errCode": {
"type": "integer"
@ -8102,7 +8102,7 @@
}
}
},
"server_api_params.Department": {
"sdkws.Department": {
"type": "object",
"properties": {
"createTime": {
@ -8137,7 +8137,7 @@
}
}
},
"server_api_params.DepartmentMember": {
"sdkws.DepartmentMember": {
"type": "object",
"properties": {
"departmentID": {
@ -8163,7 +8163,7 @@
}
}
},
"server_api_params.FriendInfo": {
"sdkws.FriendInfo": {
"type": "object",
"properties": {
"addSource": {
@ -8176,7 +8176,7 @@
"type": "string"
},
"friendUser": {
"$ref": "#/definitions/server_api_params.UserInfo"
"$ref": "#/definitions/sdkws.UserInfo"
},
"operatorUserID": {
"type": "string"
@ -8189,7 +8189,7 @@
}
}
},
"server_api_params.FriendRequest": {
"sdkws.FriendRequest": {
"type": "object",
"properties": {
"createTime": {
@ -8239,7 +8239,7 @@
}
}
},
"server_api_params.GroupInfo": {
"sdkws.GroupInfo": {
"type": "object",
"properties": {
"applyMemberFriend": {
@ -8295,7 +8295,7 @@
}
}
},
"server_api_params.GroupMemberFullInfo": {
"sdkws.GroupMemberFullInfo": {
"type": "object",
"properties": {
"appMangerLevel": {
@ -8336,14 +8336,14 @@
}
}
},
"server_api_params.GroupRequest": {
"sdkws.GroupRequest": {
"type": "object",
"properties": {
"ex": {
"type": "string"
},
"groupInfo": {
"$ref": "#/definitions/server_api_params.GroupInfo"
"$ref": "#/definitions/sdkws.GroupInfo"
},
"handleMsg": {
"type": "string"
@ -8370,11 +8370,11 @@
"type": "integer"
},
"userInfo": {
"$ref": "#/definitions/server_api_params.PublicUserInfo"
"$ref": "#/definitions/sdkws.PublicUserInfo"
}
}
},
"server_api_params.OfflinePushInfo": {
"sdkws.OfflinePushInfo": {
"type": "object",
"properties": {
"desc": {
@ -8394,7 +8394,7 @@
}
}
},
"server_api_params.OrganizationUser": {
"sdkws.OrganizationUser": {
"type": "object",
"properties": {
"birth": {
@ -8432,7 +8432,7 @@
}
}
},
"server_api_params.PublicUserInfo": {
"sdkws.PublicUserInfo": {
"type": "object",
"properties": {
"ex": {
@ -8452,32 +8452,32 @@
}
}
},
"server_api_params.UserDepartmentMember": {
"sdkws.UserDepartmentMember": {
"type": "object",
"properties": {
"departmentMember": {
"$ref": "#/definitions/server_api_params.DepartmentMember"
"$ref": "#/definitions/sdkws.DepartmentMember"
},
"organizationUser": {
"$ref": "#/definitions/server_api_params.OrganizationUser"
"$ref": "#/definitions/sdkws.OrganizationUser"
}
}
},
"server_api_params.UserInDepartment": {
"sdkws.UserInDepartment": {
"type": "object",
"properties": {
"departmentMemberList": {
"type": "array",
"items": {
"$ref": "#/definitions/server_api_params.DepartmentMember"
"$ref": "#/definitions/sdkws.DepartmentMember"
}
},
"organizationUser": {
"$ref": "#/definitions/server_api_params.OrganizationUser"
"$ref": "#/definitions/sdkws.OrganizationUser"
}
}
},
"server_api_params.UserInfo": {
"sdkws.UserInfo": {
"type": "object",
"properties": {
"appMangerLevel": {
@ -8515,7 +8515,7 @@
}
}
},
"server_api_params.UserSendMsgResp": {
"sdkws.UserSendMsgResp": {
"type": "object",
"properties": {
"clientMsgID": {

80
cmd/open_im_api/docs/swagger.yaml → cmd/api/docs/swagger.yaml
View File

@ -1459,7 +1459,7 @@ definitions:
notOfflinePush:
type: boolean
offlinePushInfo:
$ref: '#/definitions/server_api_params.OfflinePushInfo'
$ref: '#/definitions/sdkws.OfflinePushInfo'
operationID:
type: string
recvIDList:
@ -1495,7 +1495,7 @@ definitions:
notOfflinePush:
type: boolean
offlinePushInfo:
$ref: '#/definitions/server_api_params.OfflinePushInfo'
$ref: '#/definitions/sdkws.OfflinePushInfo'
operationID:
type: string
recvID:
@ -1519,7 +1519,7 @@ definitions:
api_struct.ManagementSendMsgResp:
properties:
data:
$ref: '#/definitions/server_api_params.UserSendMsgResp'
$ref: '#/definitions/sdkws.UserSendMsgResp'
errCode:
type: integer
errMsg:
@ -2358,7 +2358,7 @@ definitions:
userID:
type: string
type: object
server_api_params.Department:
sdkws.Department:
properties:
createTime:
type: integer
@ -2381,7 +2381,7 @@ definitions:
subDepartmentNum:
type: integer
type: object
server_api_params.DepartmentMember:
sdkws.DepartmentMember:
properties:
departmentID:
type: string
@ -2398,7 +2398,7 @@ definitions:
userID:
type: string
type: object
server_api_params.FriendInfo:
sdkws.FriendInfo:
properties:
addSource:
type: integer
@ -2407,7 +2407,7 @@ definitions:
ex:
type: string
friendUser:
$ref: '#/definitions/server_api_params.UserInfo'
$ref: '#/definitions/sdkws.UserInfo'
operatorUserID:
type: string
ownerUserID:
@ -2415,7 +2415,7 @@ definitions:
remark:
type: string
type: object
server_api_params.FriendRequest:
sdkws.FriendRequest:
properties:
createTime:
type: integer
@ -2448,7 +2448,7 @@ definitions:
toUserID:
type: string
type: object
server_api_params.GroupInfo:
sdkws.GroupInfo:
properties:
applyMemberFriend:
type: integer
@ -2485,7 +2485,7 @@ definitions:
status:
type: integer
type: object
server_api_params.GroupMemberFullInfo:
sdkws.GroupMemberFullInfo:
properties:
appMangerLevel:
type: integer
@ -2512,12 +2512,12 @@ definitions:
userID:
type: string
type: object
server_api_params.GroupRequest:
sdkws.GroupRequest:
properties:
ex:
type: string
groupInfo:
$ref: '#/definitions/server_api_params.GroupInfo'
$ref: '#/definitions/sdkws.GroupInfo'
handleMsg:
type: string
handleResult:
@ -2535,9 +2535,9 @@ definitions:
reqTime:
type: integer
userInfo:
$ref: '#/definitions/server_api_params.PublicUserInfo'
$ref: '#/definitions/sdkws.PublicUserInfo'
type: object
server_api_params.OfflinePushInfo:
sdkws.OfflinePushInfo:
properties:
desc:
type: string
@ -2550,7 +2550,7 @@ definitions:
title:
type: string
type: object
server_api_params.OrganizationUser:
sdkws.OrganizationUser:
properties:
birth:
type: integer
@ -2575,7 +2575,7 @@ definitions:
userID:
type: string
type: object
server_api_params.PublicUserInfo:
sdkws.PublicUserInfo:
properties:
ex:
type: string
@ -2588,23 +2588,23 @@ definitions:
userID:
type: string
type: object
server_api_params.UserDepartmentMember:
sdkws.UserDepartmentMember:
properties:
departmentMember:
$ref: '#/definitions/server_api_params.DepartmentMember'
$ref: '#/definitions/sdkws.DepartmentMember'
organizationUser:
$ref: '#/definitions/server_api_params.OrganizationUser'
$ref: '#/definitions/sdkws.OrganizationUser'
type: object
server_api_params.UserInDepartment:
sdkws.UserInDepartment:
properties:
departmentMemberList:
items:
$ref: '#/definitions/server_api_params.DepartmentMember'
$ref: '#/definitions/sdkws.DepartmentMember'
type: array
organizationUser:
$ref: '#/definitions/server_api_params.OrganizationUser'
$ref: '#/definitions/sdkws.OrganizationUser'
type: object
server_api_params.UserInfo:
sdkws.UserInfo:
properties:
appMangerLevel:
type: integer
@ -2629,7 +2629,7 @@ definitions:
userID:
type: string
type: object
server_api_params.UserSendMsgResp:
sdkws.UserSendMsgResp:
properties:
clientMsgID:
type: string
@ -2968,7 +2968,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.PublicUserInfo'
$ref: '#/definitions/sdkws.PublicUserInfo'
type: array
type: object
"400":
@ -3011,7 +3011,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.FriendRequest'
$ref: '#/definitions/sdkws.FriendRequest'
type: array
type: object
"400":
@ -3054,7 +3054,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.FriendInfo'
$ref: '#/definitions/sdkws.FriendInfo'
type: array
type: object
"400":
@ -3097,7 +3097,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.FriendRequest'
$ref: '#/definitions/sdkws.FriendRequest'
type: array
type: object
"400":
@ -3357,7 +3357,7 @@ paths:
- $ref: '#/definitions/api_struct.CreateGroupResp'
- properties:
data:
$ref: '#/definitions/server_api_params.GroupInfo'
$ref: '#/definitions/sdkws.GroupInfo'
type: object
"400":
description: errCode为400 一般为参数输入错误, token未带上等
@ -3435,7 +3435,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.GroupMemberFullInfo'
$ref: '#/definitions/sdkws.GroupMemberFullInfo'
type: array
type: object
"400":
@ -3478,7 +3478,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.GroupMemberFullInfo'
$ref: '#/definitions/sdkws.GroupMemberFullInfo'
type: array
type: object
"400":
@ -3557,7 +3557,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.GroupInfo'
$ref: '#/definitions/sdkws.GroupInfo'
type: array
type: object
"400":
@ -3600,7 +3600,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.GroupRequest'
$ref: '#/definitions/sdkws.GroupRequest'
type: array
type: object
"400":
@ -3643,7 +3643,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.GroupRequest'
$ref: '#/definitions/sdkws.GroupRequest'
type: array
type: object
"400":
@ -4884,7 +4884,7 @@ paths:
- $ref: '#/definitions/api_struct.CreateDepartmentResp'
- properties:
data:
$ref: '#/definitions/server_api_params.Department'
$ref: '#/definitions/sdkws.Department'
type: object
"400":
description: errCode为400 一般为参数输入错误, token未带上等
@ -5106,7 +5106,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.UserDepartmentMember'
$ref: '#/definitions/sdkws.UserDepartmentMember'
type: array
type: object
"400":
@ -5149,7 +5149,7 @@ paths:
- properties:
data:
items:
$ref: '#/definitions/server_api_params.Department'
$ref: '#/definitions/sdkws.Department'
type: array
type: object
"400":
@ -5191,7 +5191,7 @@ paths:
- $ref: '#/definitions/api_struct.GetUserInDepartmentResp'
- properties:
data:
$ref: '#/definitions/server_api_params.UserInDepartment'
$ref: '#/definitions/sdkws.UserInDepartment'
type: object
"400":
description: errCode为400 一般为参数输入错误, token未带上等
@ -5457,7 +5457,7 @@ paths:
- $ref: '#/definitions/api_struct.GetSelfUserInfoResp'
- properties:
data:
$ref: '#/definitions/server_api_params.UserInfo'
$ref: '#/definitions/sdkws.UserInfo'
type: object
"400":
description: errCode为400 一般为参数输入错误, token未带上等
@ -5499,7 +5499,7 @@ paths:
- properties:
Data:
items:
$ref: '#/definitions/server_api_params.PublicUserInfo'
$ref: '#/definitions/sdkws.PublicUserInfo'
type: array
type: object
"400":

0
cmd/open_im_api/main.go → cmd/api/main.go
View File

0
cmd/open_im_cms_api/Makefile → cmd/cmsapi/Makefile
View File

0
cmd/open_im_cms_api/main.go → cmd/cmsapi/main.go
View File

0
cmd/open_im_cron_task/Makefile → cmd/crontask/Makefile
View File

0
cmd/open_im_cron_task/main.go → cmd/crontask/main.go
View File

0
cmd/open_im_msg_gateway/Makefile → cmd/msggateway/Makefile
View File

0
cmd/open_im_msg_gateway/main.go → cmd/msggateway/main.go
View File

0
cmd/open_im_msg_transfer/Makefile → cmd/msgtransfer/Makefile
View File

0
cmd/open_im_msg_transfer/main.go → cmd/msgtransfer/main.go
View File

25
cmd/open_im_demo/Makefile
View File

@ -1,25 +0,0 @@
.PHONY: all build run gotool install clean help
BINARY_NAME=open_im_demo
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

62
cmd/open_im_demo/main.go
View File

@ -1,62 +0,0 @@
package main
import (
"Open_IM/internal/demo/register"
"Open_IM/pkg/utils"
"flag"
"fmt"
"io"
"os"
"strconv"
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/constant"
"Open_IM/pkg/common/log"
promePkg "Open_IM/pkg/common/prometheus"
"github.com/gin-gonic/gin"
)
func main() {
log.NewPrivateLog(constant.LogFileName)
gin.SetMode(gin.ReleaseMode)
f, _ := os.Create("../logs/api.log")
gin.DefaultWriter = io.MultiWriter(f)
r := gin.Default()
r.Use(utils.CorsHandler())
if config.Config.Prometheus.Enable {
r.GET("/metrics", promePkg.PrometheusHandler())
}
authRouterGroup := r.Group("/demo")
{
authRouterGroup.POST("/code", register.SendVerificationCode)
authRouterGroup.POST("/verify", register.Verify)
authRouterGroup.POST("/password", register.SetPassword)
authRouterGroup.POST("/login", register.Login)
authRouterGroup.POST("/reset_password", register.ResetPassword)
}
demoRouterGroup := r.Group("/auth")
{
demoRouterGroup.POST("/code", register.SendVerificationCode)
demoRouterGroup.POST("/verify", register.Verify)
demoRouterGroup.POST("/password", register.SetPassword)
demoRouterGroup.POST("/login", register.Login)
demoRouterGroup.POST("/reset_password", register.ResetPassword)
}
defaultPorts := config.Config.Demo.Port
ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10004 as port")
flag.Parse()
address := "0.0.0.0:" + strconv.Itoa(*ginPort)
if config.Config.Api.ListenIP != "" {
address = config.Config.Api.ListenIP + ":" + strconv.Itoa(*ginPort)
}
address = config.Config.CmsApi.ListenIP + ":" + strconv.Itoa(*ginPort)
fmt.Println("start demo api server address: ", address, ", OpenIM version: ", constant.CurrentVersion, "\n")
go register.ImportFriendRoutine()
err := r.Run(address)
if err != nil {
log.Error("", "run failed ", *ginPort, err.Error())
}
}

0
cmd/open_im_push/Makefile → cmd/push/Makefile
View File

0
cmd/open_im_push/main.go → cmd/push/main.go
View File

0
cmd/rpc/open_im_admin_cms/Makefile → cmd/rpc/admincms/Makefile
View File

0
cmd/rpc/open_im_admin_cms/main.go → cmd/rpc/admincms/main.go
View File

0
cmd/rpc/open_im_auth/Makefile → cmd/rpc/auth/Makefile
View File

0
cmd/rpc/open_im_auth/main.go → cmd/rpc/auth/main.go
View File

0
cmd/rpc/open_im_conversation/Makefile → cmd/rpc/conversation/Makefile
View File

0
cmd/rpc/open_im_conversation/main.go → cmd/rpc/conversation/main.go
View File

0
cmd/rpc/open_im_friend/Makefile → cmd/rpc/friend/Makefile
View File

0
cmd/rpc/open_im_friend/main.go → cmd/rpc/friend/main.go
View File

0
cmd/rpc/open_im_group/Makefile → cmd/rpc/group/Makefile
View File

0
cmd/rpc/open_im_group/main.go → cmd/rpc/group/main.go
View File

0
cmd/rpc/open_im_msg/Makefile → cmd/rpc/msg/Makefile
View File

0
cmd/rpc/open_im_msg/main.go → cmd/rpc/msg/main.go
View File

0
cmd/rpc/open_im_office/Makefile → cmd/rpc/office/Makefile
View File

0
cmd/rpc/open_im_office/main.go → cmd/rpc/office/main.go
View File

0
cmd/rpc/open_im_user/Makefile → cmd/rpc/user/Makefile
View File

0
cmd/rpc/open_im_user/main.go → cmd/rpc/user/main.go
View File

4
cmdutils/mongo/mongo_utils.go
View File

@ -2,7 +2,7 @@ package mongo
import (
"Open_IM/pkg/common/config"
server_api_params "Open_IM/pkg/proto/sdk_ws"
sdkws "Open_IM/pkg/proto/sdkws"
"context"
"fmt"
"github.com/golang/protobuf/proto"
@ -42,7 +42,7 @@ func GetUserAllChat(uid string) {
}
for _, userChat := range userChatList {
for _, msg := range userChat.Msg {
msgData := &server_api_params.MsgData{}
msgData := &sdkws.MsgData{}
err := proto.Unmarshal(msg.Msg, msgData)
if err != nil {
fmt.Println(err.Error(), msg)

1
config/config.yaml
View File

@ -185,7 +185,6 @@ rpcregistername: #rpc注册服务名，默认即可
openImAdminCMSName: AdminCMS
openImOfficeName: Office
openImConversationName: Conversation
openImCacheName: Cache
openImRealTimeCommName: RealTimeComm
log:
storageLocation: ../logs/

19
deploy_k8s/cache/cache.Dockerfile vendored
View File

@ -1,19 +0,0 @@
FROM ubuntu
# 设置固定的项目路径
ENV WORKDIR /Open-IM-Server
ENV CMDDIR $WORKDIR/cmd
ENV CONFIG_NAME $WORKDIR/config/config.yaml
# 将可执行文件复制到目标目录
ADD ./open_im_cache $WORKDIR/cmd/main
# 创建用于挂载的几个目录，添加可执行权限
RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
chmod +x $WORKDIR/cmd/main
VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
WORKDIR $CMDDIR
CMD ./main

42
deploy_k8s/cache/deployment.yaml vendored
View File

@ -1,42 +0,0 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: cache-deployment
spec:
selector:
matchLabels:
app: cache # 选择这个指定标签执行
replicas: 1 # 运行pod数量
template:
metadata:
labels:
app: cache # 标签
spec:
containers:
- name: cache
image: openim/cache:v2.3.4
# imagePullPolicy: Always
ports:
- containerPort: 10240
volumeMounts:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualConfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
- name: USUAL_CONFIG_NAME
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: openim-config
- name: usualConfig
configMap:
name: openim-usualConfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

19
deploy_k8s/demo/demo.Dockerfile
View File

@ -1,19 +0,0 @@
FROM ubuntu
# 设置固定的项目路径
ENV WORKDIR /Open-IM-Server
ENV CMDDIR $WORKDIR/cmd
ENV CONFIG_NAME $WORKDIR/config/config.yaml
# 将可执行文件复制到目标目录
ADD ./open_im_demo $WORKDIR/cmd/main
# 创建用于挂载的几个目录，添加可执行权限
RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
chmod +x $WORKDIR/cmd/main
VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
WORKDIR $CMDDIR
CMD ./main

56
deploy_k8s/demo/deployment.yaml
View File

@ -1,56 +0,0 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: demo-deployment
spec:
selector:
matchLabels:
app: demo # 选择这个指定标签执行
replicas: 1 # 运行pod数量
template:
metadata:
labels:
app: demo # 标签
spec:
containers:
- name: demo
image: openim/demo:v2.3.4
imagePullPolicy: Always
ports:
- containerPort: 10004
volumeMounts:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualConfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
- name: USUAL_CONFIG_NAME
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: openim-config
- name: usualConfig
configMap:
name: openim-usualConfig
strategy: #更新策略
type: RollingUpdate # 滚动更新
---
apiVersion: v1
kind: Service
metadata:
name: demo
spec:
ports:
- name: demo
protocol: TCP
port: 10004
targetPort: 10004
selector:
app: demo
type: NodePort

42
deploy_k8s/organization/deployment.yaml
View File

@ -1,42 +0,0 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: organization-deployment
spec:
selector:
matchLabels:
app: organization # 选择这个指定标签执行
replicas: 1 # 运行pod数量
template:
metadata:
labels:
app: organization # 标签
spec:
containers:
- name: organization
image: openim/organization:v2.3.4
# imagePullPolicy: Always
ports:
- containerPort: 10220
volumeMounts:
- name: config
mountPath: /Open-IM-Server/config
readOnly: true
- name: usualConfig
mountPath: /Open-IM-Server/config
readOnly: true
env:
- name: CONFIG_NAME
value: "/Open-IM-Server"
- name: USUAL_CONFIG_NAME
value: "/Open-IM-Server"
volumes:
- name: config
configMap:
name: openim-config
- name: usualConfig
configMap:
name: openim-usualConfig
strategy: #更新策略
type: RollingUpdate # 滚动更新

20
deploy_k8s/organization/organization.Dockerfile
View File

@ -1,20 +0,0 @@
FROM ubuntu
# 设置固定的项目路径
ENV WORKDIR /Open-IM-Server
ENV CMDDIR $WORKDIR/cmd
ENV CONFIG_NAME $WORKDIR/config/config.yaml
# 将可执行文件复制到目标目录
ADD ./open_im_organization $WORKDIR/cmd/main
# 创建用于挂载的几个目录，添加可执行权限
RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
chmod +x $WORKDIR/cmd/main
VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
WORKDIR $CMDDIR
CMD ./main

0
deploy_k8s/admin_cms/admin_cms.Dockerfile → deployk8s/admincms/admin_cms.Dockerfile
View File

0
deploy_k8s/admin_cms/deployment.yaml → deployk8s/admincms/deployment.yaml
View File

0
deploy_k8s/api/api.Dockerfile → deployk8s/api/api.Dockerfile
View File

0
deploy_k8s/api/deployment.yaml → deployk8s/api/deployment.yaml
View File

0
deploy_k8s/auth/auth.Dockerfile → deployk8s/auth/auth.Dockerfile
View File

0
deploy_k8s/auth/deployment.yaml → deployk8s/auth/deployment.yaml
View File

0
deploy_k8s/build_push_all_images.sh → deployk8s/build_push_all_images.sh
View File

0
deploy_k8s/cms_api/cms_api.Dockerfile → deployk8s/cmsapi/cms_api.Dockerfile
View File

0
deploy_k8s/cms_api/deployment.yaml → deployk8s/cmsapi/deployment.yaml
View File

0
deploy_k8s/conversation/conversation.Dockerfile → deployk8s/conversation/conversation.Dockerfile
View File

0
deploy_k8s/conversation/deployment.yaml → deployk8s/conversation/deployment.yaml
View File

0
deploy_k8s/friend/deployment.yaml → deployk8s/friend/deployment.yaml
View File

0
deploy_k8s/friend/friend.Dockerfile → deployk8s/friend/friend.Dockerfile
View File

0
deploy_k8s/group/deployment.yaml → deployk8s/group/deployment.yaml
View File

0
deploy_k8s/group/group.Dockerfile → deployk8s/group/group.Dockerfile
View File

0
deploy_k8s/ingress.yaml → deployk8s/ingress.yaml
View File

0
deploy_k8s/k8s_openim_deploy.md → deployk8s/k8s_openim_deploy.md
View File

0
deploy_k8s/kubectl_start_all.sh → deployk8s/kubectl_start_all.sh Executable file → Normal file
View File

0
deploy_k8s/kubectl_stop_all.sh → deployk8s/kubectl_stop_all.sh Executable file → Normal file
View File

0
deploy_k8s/msg/deployment.yaml → deployk8s/msg/deployment.yaml
View File

0
deploy_k8s/msg/msg.Dockerfile → deployk8s/msg/msg.Dockerfile
View File

0
deploy_k8s/msg_gateway/deployment.yaml → deployk8s/msggateway/deployment.yaml
View File

0
deploy_k8s/msg_gateway/msg_gateway.Dockerfile → deployk8s/msggateway/msg_gateway.Dockerfile
View File

0
deploy_k8s/msg_transfer/deployment.yaml → deployk8s/msgtransfer/deployment.yaml
View File

0
deploy_k8s/msg_transfer/msg_transfer.Dockerfile → deployk8s/msgtransfer/msg_transfer.Dockerfile
View File

0
deploy_k8s/office/deployment.yaml → deployk8s/office/deployment.yaml
View File

0
deploy_k8s/office/office.Dockerfile → deployk8s/office/office.Dockerfile
View File

13
deploy_k8s/path_info.cfg → deployk8s/path_info.cfg
View File

@ -2,21 +2,18 @@
service=(
#api service file
api
cms_api
cmsapi
#rpc service file
user
friend
group
auth
admin_cms
admincms
office
organization
conversation
cache
msg_gateway
msg_transfer
msggateway
msgtransfer
msg
push
sdk_server
demo
sdkserver
)

0
deploy_k8s/push/deployment.yaml → deployk8s/push/deployment.yaml
View File

0
deploy_k8s/push/push.Dockerfile → deployk8s/push/push.Dockerfile
View File

2
deploy_k8s/sdk_server/deployment.yaml → deployk8s/sdkserver/deployment.yaml
View File

@ -29,7 +29,7 @@ spec:
- name: CONFIG_NAME
value: "/Open-IM-Server"
command: ["/Open-IM-Server/main"]
args: ["-openIM_ws_address", "ws_addr", "-sdk_ws_port", "10003", "-openIM_api_address", "api_address", "-openIM_log_level", "6"]
args: ["-openIM_ws_address", "ws_addr", "-sdkws_port", "10003", "-openIM_api_address", "api_address", "-openIM_log_level", "6"]
volumes:
- name: config
configMap:

0
deploy_k8s/sdk_server/sdk_server.Dockerfile → deployk8s/sdkserver/sdk_server.Dockerfile
View File

0
deploy_k8s/user/deployment.yaml → deployk8s/user/deployment.yaml
View File

0
deploy_k8s/user/user.Dockerfile → deployk8s/user/user.Dockerfile
View File

2
internal/api/auth/auth.go
View File

@ -8,7 +8,7 @@ import (
"Open_IM/pkg/common/tokenverify"
"Open_IM/pkg/getcdv3"
rpc "Open_IM/pkg/proto/auth"
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
open_im_sdk "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"net/http"

73
internal/api/client_init/init_config.go
View File

@ -1,73 +0,0 @@
package clientInit
import (
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/tokenverify"
"Open_IM/pkg/utils"
"net/http"
"github.com/gin-gonic/gin"
)
func SetClientInitConfig(c *gin.Context) {
var req api.SetClientInitConfigReq
var resp api.SetClientInitConfigResp
if err := c.BindJSON(&req); err != nil {
log.NewError("0", utils.GetSelfFuncName(), err.Error())
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
return
}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
err, _ := tokenverify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID)
if err != nil {
errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token")
log.NewError(req.OperationID, errMsg, errMsg)
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
return
}
m := make(map[string]interface{})
if req.DiscoverPageURL != nil {
m["discover_page_url"] = *req.DiscoverPageURL
}
if len(m) > 0 {
err := imdb.SetClientInitConfig(m)
if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
return
}
}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
c.JSON(http.StatusOK, resp)
}
func GetClientInitConfig(c *gin.Context) {
var req api.GetClientInitConfigReq
var resp api.GetClientInitConfigResp
if err := c.BindJSON(&req); err != nil {
log.NewError("0", utils.GetSelfFuncName(), err.Error())
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()})
return
}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req)
err, _ := tokenverify.ParseTokenGetUserID(c.Request.Header.Get("token"), req.OperationID)
if err != nil {
errMsg := "ParseTokenGetUserID failed " + err.Error() + c.Request.Header.Get("token")
log.NewError(req.OperationID, errMsg, errMsg)
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": errMsg})
return
}
config, err := imdb.GetClientInitConfig()
if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
return
}
resp.Data.DiscoverPageURL = config.DiscoverPageURL
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp ", resp)
c.JSON(http.StatusOK, resp)
}

2
internal/api/friend/friend.go
View File

@ -8,7 +8,7 @@ package friend
// "Open_IM/pkg/common/tokenverify"
// "Open_IM/pkg/getcdv3"
// rpc "Open_IM/pkg/proto/friend"
// open_im_sdk "Open_IM/pkg/proto/sdk_ws"
// open_im_sdk "Open_IM/pkg/proto/sdkws"
// "Open_IM/pkg/utils"
// "context"
// "github.com/gin-gonic/gin"

2
internal/api/manage/management_chat.go
View File

@ -15,7 +15,7 @@ import (
"Open_IM/pkg/common/tokenverify"
"Open_IM/pkg/getcdv3"
pbChat "Open_IM/pkg/proto/msg"
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
open_im_sdk "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"net/http"

2
internal/api/msg/del_msg.go
View File

@ -8,7 +8,7 @@ import (
"Open_IM/pkg/common/tokenverify"
"Open_IM/pkg/getcdv3"
rpc "Open_IM/pkg/proto/msg"
pbCommon "Open_IM/pkg/proto/sdk_ws"
pbCommon "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"github.com/gin-gonic/gin"

4
internal/api/msg/get_max_min_seq.go
View File

@ -6,7 +6,7 @@ import (
"Open_IM/pkg/common/tokenverify"
"Open_IM/pkg/getcdv3"
pbChat "Open_IM/pkg/proto/msg"
sdk_ws "Open_IM/pkg/proto/sdk_ws"
sdkws "Open_IM/pkg/proto/sdkws"
"context"
"github.com/gin-gonic/gin"
"net/http"
@ -32,7 +32,7 @@ func GetSeq(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": "token validate err" + err.Error()})
return
}
pbData := sdk_ws.GetMaxAndMinSeqReq{}
pbData := sdkws.GetMaxAndMinSeqReq{}
pbData.UserID = params.SendID
pbData.OperationID = params.OperationID
grpcConn := rpc.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImMsgName, pbData.OperationID)

2
internal/api/msg/pull_msg.go
View File

@ -6,7 +6,7 @@ import (
"Open_IM/pkg/common/tokenverify"
"Open_IM/pkg/getcdv3"
"Open_IM/pkg/proto/msg"
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
open_im_sdk "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"github.com/gin-gonic/gin"

2
internal/api/msg/send_msg.go
View File

@ -4,7 +4,7 @@ import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
pbChat "Open_IM/pkg/proto/msg"
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
open_im_sdk "Open_IM/pkg/proto/sdkws"
"context"
"Open_IM/pkg/getcdv3"

2
internal/api/office/tag.go
View File

@ -7,7 +7,7 @@ import (
"Open_IM/pkg/common/tokenverify"
"Open_IM/pkg/getcdv3"
pbOffice "Open_IM/pkg/proto/office"
pbCommon "Open_IM/pkg/proto/sdk_ws"
pbCommon "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"github.com/gin-gonic/gin"

2
internal/api/office/work_moments.go
View File

@ -7,7 +7,7 @@ import (
"Open_IM/pkg/common/tokenverify"
"Open_IM/pkg/getcdv3"
pbOffice "Open_IM/pkg/proto/office"
pbCommon "Open_IM/pkg/proto/sdk_ws"
pbCommon "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"github.com/gin-gonic/gin"

2
internal/api/user/user.go
View File

@ -10,7 +10,7 @@ import (
"Open_IM/pkg/getcdv3"
cacheRpc "Open_IM/pkg/proto/cache"
pbRelay "Open_IM/pkg/proto/relay"
open_im_sdk "Open_IM/pkg/proto/sdk_ws"
open_im_sdk "Open_IM/pkg/proto/sdkws"
rpc "Open_IM/pkg/proto/user"
"Open_IM/pkg/utils"
"context"

2
internal/cmsapi/admin/admin.go
View File

@ -7,7 +7,7 @@ import (
"Open_IM/pkg/common/log"
"Open_IM/pkg/getcdv3"
pbAdmin "Open_IM/pkg/proto/admin_cms"
pbCommon "Open_IM/pkg/proto/sdk_ws"
pbCommon "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"net/http"

2
internal/cmsapi/friend/friend.go
View File

@ -6,7 +6,7 @@ import (
"Open_IM/pkg/common/log"
"Open_IM/pkg/getcdv3"
pbAdmin "Open_IM/pkg/proto/admin_cms"
pbCommon "Open_IM/pkg/proto/sdk_ws"
pbCommon "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"net/http"

2
internal/cmsapi/group/group.go
View File

@ -5,7 +5,7 @@ import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/log"
"Open_IM/pkg/getcdv3"
common "Open_IM/pkg/proto/sdk_ws"
common "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"net/http"

2
internal/cmsapi/message_cms/message.go
View File

@ -6,7 +6,7 @@ import (
"Open_IM/pkg/common/log"
"Open_IM/pkg/getcdv3"
pbAdminCMS "Open_IM/pkg/proto/admin_cms"
pbCommon "Open_IM/pkg/proto/sdk_ws"
pbCommon "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"net/http"

2
internal/cmsapi/user/user.go
View File

@ -7,7 +7,7 @@ import (
"Open_IM/pkg/common/log"
"Open_IM/pkg/getcdv3"
pbAdminCms "Open_IM/pkg/proto/admin_cms"
common "Open_IM/pkg/proto/sdk_ws"
common "Open_IM/pkg/proto/sdkws"
pb "Open_IM/pkg/proto/user"
"Open_IM/pkg/utils"
"context"

4
internal/common/check/friend.go
View File

@ -1,11 +1,11 @@
package check
import (
server_api_params "Open_IM/pkg/proto/sdk_ws"
sdkws "Open_IM/pkg/proto/sdkws"
"context"
"errors"
)
func GetFriendsInfo(ctx context.Context, ownerUserID, friendUserID string) (*server_api_params.FriendInfo, error) {
func GetFriendsInfo(ctx context.Context, ownerUserID, friendUserID string) (*sdkws.FriendInfo, error) {
return nil, errors.New("TODO:GetUserInfo")
}

4
internal/common/check/group.go
View File

@ -1,7 +1,7 @@
package check
import (
server_api_params "Open_IM/pkg/proto/sdk_ws"
sdkws "Open_IM/pkg/proto/sdkws"
"errors"
)
@ -12,6 +12,6 @@ func NewGroupChecker() *GroupChecker {
return &GroupChecker{}
}
func (g *GroupChecker) GetGroupInfo(groupID string) (*server_api_params.GroupInfo, error) {
func (g *GroupChecker) GetGroupInfo(groupID string) (*sdkws.GroupInfo, error) {
return nil, errors.New("TODO:GetUserInfo")
}

4
internal/common/check/user.go
View File

@ -1,11 +1,11 @@
package check
import (
server_api_params "Open_IM/pkg/proto/sdk_ws"
sdkws "Open_IM/pkg/proto/sdkws"
"context"
"errors"
)
func GetUsersInfo(ctx context.Context, args ...interface{}) ([]*server_api_params.UserInfo, error) {
func GetUsersInfo(ctx context.Context, args ...interface{}) ([]*sdkws.UserInfo, error) {
return nil, errors.New("TODO:GetUserInfo")
}

2
internal/common/convert/convert.go
View File

@ -2,7 +2,7 @@ package convert
import (
"Open_IM/pkg/common/db/table/relation"
sdk "Open_IM/pkg/proto/sdk_ws"
sdk "Open_IM/pkg/proto/sdkws"
utils "github.com/OpenIMSDK/open_utils"
"time"
)

6
internal/crontask/clear_msg.go
View File

@ -6,7 +6,7 @@ import (
"Open_IM/pkg/common/db"
"Open_IM/pkg/common/db/mongo"
"Open_IM/pkg/common/log"
server_api_params "Open_IM/pkg/proto/sdk_ws"
sdkws "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"math"
"strconv"
@ -109,7 +109,7 @@ func deleteMongoMsg(operationID string, ID string, index int64, delStruct *delMs
}
if msgs.Msg[len(msgs.Msg)-1].SendTime+(int64(config.Config.Mongo.DBRetainChatRecords)*24*60*60*1000) > utils.GetCurrentTimestampByMill() && msgListIsFull(msgs) {
delStruct.delUidList = append(delStruct.delUidList, msgs.UID)
lastMsgPb := &server_api_params.MsgData{}
lastMsgPb := &sdkws.MsgData{}
err = proto.Unmarshal(msgs.Msg[len(msgs.Msg)-1].Msg, lastMsgPb)
if err != nil {
log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), len(msgs.Msg)-1, msgs.UID)
@ -119,7 +119,7 @@ func deleteMongoMsg(operationID string, ID string, index int64, delStruct *delMs
} else {
var hasMarkDelFlag bool
for _, msg := range msgs.Msg {
msgPb := &server_api_params.MsgData{}
msgPb := &sdkws.MsgData{}
err = proto.Unmarshal(msg.Msg, msgPb)
if err != nil {
log.NewError(operationID, utils.GetSelfFuncName(), err.Error(), len(msgs.Msg)-1, msgs.UID)

4
internal/crontask/clear_msg_test.go
View File

@ -3,7 +3,7 @@ package cronTask
import (
"Open_IM/pkg/common/constant"
mongo2 "Open_IM/pkg/common/db/mongo"
server_api_params "Open_IM/pkg/proto/sdk_ws"
sdkws "Open_IM/pkg/proto/sdkws"
"context"
"fmt"
"strconv"
@ -25,7 +25,7 @@ var (
func GenUserChat(startSeq, stopSeq, delSeq, index uint32, userID string) *mongo2.UserChat {
chat := &mongo2.UserChat{UID: userID + strconv.Itoa(int(index))}
for i := startSeq; i <= stopSeq; i++ {
msg := server_api_params.MsgData{
msg := sdkws.MsgData{
SendID: "sendID1",
RecvID: "recvID1",
GroupID: "",

25
internal/msggateway/gate/batch_push.go → internal/msggateway/batch_push.go
View File

@ -1,12 +1,11 @@
package gate
package msggateway
import (
"Open_IM/pkg/common/config"
"Open_IM/pkg/common/db"
"Open_IM/pkg/common/log"
"Open_IM/pkg/getcdv3"
pbChat "Open_IM/pkg/proto/msg"
sdk_ws "Open_IM/pkg/proto/sdk_ws"
sdkws "Open_IM/pkg/proto/sdkws"
"Open_IM/pkg/utils"
"context"
"strings"
@ -34,8 +33,8 @@ func (r *RPCServer) GenPullSeqList(currentSeq uint32, operationID string, userID
return seqList, nil
}
func (r *RPCServer) GetSingleUserMsgForPushPlatforms(operationID string, msgData *sdk_ws.MsgData, pushToUserID string, platformIDList []int) map[int]*sdk_ws.MsgDataList {
user2PushMsg := make(map[int]*sdk_ws.MsgDataList, 0)
func (r *RPCServer) GetSingleUserMsgForPushPlatforms(operationID string, msgData *sdkws.MsgData, pushToUserID string, platformIDList []int) map[int]*sdkws.MsgDataList {
user2PushMsg := make(map[int]*sdkws.MsgDataList, 0)
for _, v := range platformIDList {
user2PushMsg[v] = r.GetSingleUserMsgForPush(operationID, msgData, pushToUserID, v)
//log.Info(operationID, "GetSingleUserMsgForPush", msgData.Seq, pushToUserID, v, "len:", len(user2PushMsg[v]))
@ -43,14 +42,14 @@ func (r *RPCServer) GetSingleUserMsgForPushPlatforms(operationID string, msgData
return user2PushMsg
}
func (r *RPCServer) GetSingleUserMsgForPush(operationID string, msgData *sdk_ws.MsgData, pushToUserID string, platformID int) *sdk_ws.MsgDataList {
func (r *RPCServer) GetSingleUserMsgForPush(operationID string, msgData *sdkws.MsgData, pushToUserID string, platformID int) *sdkws.MsgDataList {
//msgData.MsgDataList = nil
return &sdk_ws.MsgDataList{MsgDataList: []*sdk_ws.MsgData{msgData}}
return &sdkws.MsgDataList{MsgDataList: []*sdkws.MsgData{msgData}}
//userConn := ws.getUserConn(pushToUserID, platformID)
//if userConn == nil {
// log.Debug(operationID, "userConn == nil")
// return []*sdk_ws.MsgData{msgData}
// return []*sdkws.MsgData{msgData}
//}
//
//if msgData.Seq <= userConn.PushedMaxSeq {
@ -62,7 +61,7 @@ func (r *RPCServer) GetSingleUserMsgForPush(operationID string, msgData *sdk_ws.
//if msgList == nil {
// log.Debug(operationID, "GetSingleUserMsg msgList == nil", msgData.Seq, userConn.PushedMaxSeq)
// userConn.PushedMaxSeq = msgData.Seq
// return []*sdk_ws.MsgData{msgData}
// return []*sdkws.MsgData{msgData}
//}
//msgList = append(msgList, msgData)
//
@ -75,7 +74,7 @@ func (r *RPCServer) GetSingleUserMsgForPush(operationID string, msgData *sdk_ws.
//return msgList
}
func (r *RPCServer) GetSingleUserMsg(operationID string, currentMsgSeq uint32, userID string) []*sdk_ws.MsgData {
func (r *RPCServer) GetSingleUserMsg(operationID string, currentMsgSeq uint32, userID string) []*sdkws.MsgData {
seqList, err := r.GenPullSeqList(currentMsgSeq, operationID, userID)
if err != nil {
log.Error(operationID, "GenPullSeqList failed ", err.Error(), currentMsgSeq, userID)
@ -85,7 +84,7 @@ func (r *RPCServer) GetSingleUserMsg(operationID string, currentMsgSeq uint32, u
log.Error(operationID, "GenPullSeqList len == 0 ", currentMsgSeq, userID)
return nil
}
rpcReq := sdk_ws.PullMessageBySeqListReq{}
rpcReq := sdkws.PullMessageBySeqListReq{}
rpcReq.SeqList = seqList
rpcReq.UserID = userID
rpcReq.OperationID = operationID
@ -108,8 +107,8 @@ func (r *RPCServer) GetSingleUserMsg(operationID string, currentMsgSeq uint32, u
return reply.List
}
//func (r *RPCServer) GetBatchUserMsgForPush(operationID string, msgData *sdk_ws.MsgData, pushToUserIDList []string, platformID int) map[string][]*sdk_ws.MsgData {
// user2PushMsg := make(map[string][]*sdk_ws.MsgData, 0)
//func (r *RPCServer) GetBatchUserMsgForPush(operationID string, msgData *sdkws.MsgData, pushToUserIDList []string, platformID int) map[string][]*sdkws.MsgData {
// user2PushMsg := make(map[string][]*sdkws.MsgData, 0)
// for _, v := range pushToUserIDList {
// user2PushMsg[v] = r.GetSingleUserMsgForPush(operationID, msgData, v, platformID)
// }

2
internal/msggateway/gate/callback.go → internal/msggateway/callback.go
View File

@ -1,4 +1,4 @@
package gate
package msggateway
import (
cbApi "Open_IM/pkg/callback_struct"

22
internal/msggateway/gate/open_im_media/room.go
View File

@ -1,22 +0,0 @@
package open_im_media
const (
// Address gRPC服务地址
Address = "127.0.0.1:11300"
)
type Media struct {
}
func NewMedia() *Media {
return &Media{}
}
func init() {
}
func (m *Media) CreateRoom(roomName string) (error, error) {
return nil, nil
}

Some files were not shown because too many files have changed in this diff Show More