From a426c8bb2668ac200d818fd73956cd73fa3a9f96 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Mon, 25 Apr 2022 15:45:39 +0800 Subject: [PATCH 01/12] Adjust port --- cmd/Open-IM-SDK-Core | 2 +- cmd/open_im_demo/main.go | 2 +- config/config.yaml | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index 539290887..b0897aa3a 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit 539290887aff41515b291b7ecf174af25887f870 +Subproject commit b0897aa3abe719729c2ce099404f08806917bfe3 diff --git a/cmd/open_im_demo/main.go b/cmd/open_im_demo/main.go index af7809547..4cfd4b552 100644 --- a/cmd/open_im_demo/main.go +++ b/cmd/open_im_demo/main.go @@ -23,7 +23,7 @@ func main() { r := gin.Default() r.Use(utils.CorsHandler()) - authRouterGroup := r.Group("/auth") + authRouterGroup := r.Group("/demo") { authRouterGroup.POST("/code", register.SendVerificationCode) authRouterGroup.POST("/verify", register.Verify) diff --git a/config/config.yaml b/config/config.yaml index aab4e1737..f68ec633d 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -76,11 +76,11 @@ endpoints: rpc_office: openim_rpc_office api: - openImApiPort: [ 10000 ] #api服务端口，默认即可，需要开放此端口或做nginx转发 + openImApiPort: [ 10002 ] #api服务端口，默认即可，需要开放此端口或做nginx转发 cmsapi: - openImCmsApiPort: [ 8000 ] #管理后台api服务端口，默认即可，需要开放此端口或做nginx转发 + openImCmsApiPort: [ 10006 ] #管理后台api服务端口，默认即可，需要开放此端口或做nginx转发 sdk: - openImSdkWsPort: [ 30000 ] #jssdk服务端口，默认即可，项目中使用jssdk才需开放此端口或做nginx转发 + openImSdkWsPort: [ 10003 ] #jssdk服务端口，默认即可，项目中使用jssdk才需开放此端口或做nginx转发 #对象存储服务，以下配置二选一，目前支持两种，腾讯云和minio，二者配置好其中一种即可（如果使用minio参考https://doc.rentsoft.cn/#/qa/minio搭建minio服务器） credential: #腾讯cos，发送图片、视频、文件时需要，请自行申请后替换，必须修改 tencent: @@ -92,8 +92,8 @@ credential: #腾讯cos，发送图片、视频、文件时需要，请自行申 minio: #MinIO 发送图片、视频、文件时需要，请自行申请后替换，必须修改。 客户端初始化InitSDK，中 object_storage参数为minio bucket: openim location: us-east-1 - endpoint: http://127.0.0.1:9000 #minio外网ip 这个ip是给客户端访问的 - endpointInner: http://127.0.0.1:9000 #minio内网地址 如果im server 可以通过内网访问到 minio就可以填写 + endpoint: http://127.0.0.1:10005 #minio外网ip 这个ip是给客户端访问的 + endpointInner: http://127.0.0.1:10005 #minio内网地址 如果im server 可以通过内网访问到 minio就可以填写 endpointInnerEnable: true #是否启用minio内网地址 启用可以让桶初始化，IM server连接minio走内网地址访问 accessKeyID: user12345 secretAccessKey: key12345 @@ -166,7 +166,7 @@ modulename: #日志文件按模块命名，默认即可 pushName: push longconnsvr: - openImWsPort: [ 17778 ] # ws服务端口，默认即可，要开放此端口或做nginx转发 + openImWsPort: [ 10001 ] # ws服务端口，默认即可，要开放此端口或做nginx转发 websocketMaxConnNum: 10000 websocketMaxMsgLen: 4096 websocketTimeOut: 10 @@ -634,7 +634,7 @@ notification: demoswitch: true demo: #demo对外服务端口，默认即可，需要开放此端口或做nginx转发 - openImDemoPort: [ 42233 ] + openImDemoPort: [ 10004 ] alismsverify: #阿里云短信配置，在阿里云申请成功后修改以下四项，必须修改 accessKeyId: LTAI5tJPkn4HuuePdiLdGqe7 accessKeySecret: 4n9OJ7ZCVN1U6KeHDAtOyNeVZcjOuV From 9d691f24520245d0e3d0724b447a44d17a6ff5a4 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Mon, 25 Apr 2022 16:21:48 +0800 Subject: [PATCH 02/12] Adjust port --- config/config.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index f68ec633d..285dd0434 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -111,19 +111,19 @@ credential: #腾讯cos，发送图片、视频、文件时需要，请自行申 rpcport: #rpc服务端口 默认即可 - openImUserPort: [ 10100 ] - openImFriendPort: [ 10200 ] - openImMessagePort: [ 10300 ] - openImMessageGatewayPort: [ 10400 ] - openImGroupPort: [ 10500 ] - openImAuthPort: [ 10600 ] - openImPushPort: [ 10700 ] - openImStatisticsPort: [ 10800 ] - openImMessageCmsPort: [ 10900 ] - openImAdminCmsPort: [ 11000 ] - openImOfficePort: [ 11100 ] - openImOrganizationPort: [ 11200 ] - openImConversationPort: [ 11400 ] + openImUserPort: [ 10110 ] + openImFriendPort: [ 10120 ] + openImMessagePort: [ 10130 ] + openImMessageGatewayPort: [ 10140 ] + openImGroupPort: [ 10150 ] + openImAuthPort: [ 10160 ] + openImPushPort: [ 10170 ] + openImStatisticsPort: [ 10180 ] + openImMessageCmsPort: [ 10190 ] + openImAdminCmsPort: [ 10200 ] + openImOfficePort: [ 10210 ] + openImOrganizationPort: [ 10220 ] + openImConversationPort: [ 10230 ] c2c: callbackBeforeSendMsg: switch: false From e2905d01accdc30280e63209611900bcbf5d5a9e Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Mon, 25 Apr 2022 16:47:51 +0800 Subject: [PATCH 03/12] Adjust port --- internal/demo/register/login.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/demo/register/login.go b/internal/demo/register/login.go index e6de926dc..1c9d65fce 100644 --- a/internal/demo/register/login.go +++ b/internal/demo/register/login.go @@ -46,7 +46,7 @@ func Login(c *gin.Context) { c.JSON(http.StatusOK, gin.H{"errCode": constant.PasswordErr, "errMsg": "password err"}) return } - url := fmt.Sprintf("http://%s:10000/auth/user_token", utils.ServerIP) + url := fmt.Sprintf("http://%s:%d/auth/user_token", utils.ServerIP, config.Config.Api.GinPort) openIMGetUserToken := api.UserTokenReq{} openIMGetUserToken.OperationID = params.OperationID openIMGetUserToken.Platform = params.Platform From f754e951f7974a085233cfb5a951ec4bc67d42df Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Mon, 25 Apr 2022 16:55:56 +0800 Subject: [PATCH 04/12] Adjust port --- internal/demo/register/login.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/demo/register/login.go b/internal/demo/register/login.go index 1c9d65fce..3e20e3d4a 100644 --- a/internal/demo/register/login.go +++ b/internal/demo/register/login.go @@ -46,7 +46,7 @@ func Login(c *gin.Context) { c.JSON(http.StatusOK, gin.H{"errCode": constant.PasswordErr, "errMsg": "password err"}) return } - url := fmt.Sprintf("http://%s:%d/auth/user_token", utils.ServerIP, config.Config.Api.GinPort) + url := fmt.Sprintf("http://%s:%s/auth/user_token", utils.ServerIP, config.Config.Api.GinPort[0]) openIMGetUserToken := api.UserTokenReq{} openIMGetUserToken.OperationID = params.OperationID openIMGetUserToken.Platform = params.Platform From 7659cca8ba34452012735b598a8c2fbe7e68fca8 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Mon, 25 Apr 2022 16:58:05 +0800 Subject: [PATCH 05/12] Adjust port --- internal/demo/register/login.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/demo/register/login.go b/internal/demo/register/login.go index 3e20e3d4a..24ebc3e80 100644 --- a/internal/demo/register/login.go +++ b/internal/demo/register/login.go @@ -46,7 +46,7 @@ func Login(c *gin.Context) { c.JSON(http.StatusOK, gin.H{"errCode": constant.PasswordErr, "errMsg": "password err"}) return } - url := fmt.Sprintf("http://%s:%s/auth/user_token", utils.ServerIP, config.Config.Api.GinPort[0]) + url := fmt.Sprintf("http://%s:%d/auth/user_token", utils.ServerIP, config.Config.Api.GinPort[0]) openIMGetUserToken := api.UserTokenReq{} openIMGetUserToken.OperationID = params.OperationID openIMGetUserToken.Platform = params.Platform From a89bb33015d4dda9db40320b28b7a10d9b40bff6 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Mon, 25 Apr 2022 16:58:35 +0800 Subject: [PATCH 06/12] Adjust port --- internal/demo/register/login.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/demo/register/login.go b/internal/demo/register/login.go index 24ebc3e80..b5d587844 100644 --- a/internal/demo/register/login.go +++ b/internal/demo/register/login.go @@ -42,7 +42,7 @@ func Login(c *gin.Context) { return } if r.Password != params.Password { - log.NewError(params.OperationID, "password err", params.Password, account, r.Password, r.Account) + log.NewError(params.OperationID, "password err", params.Password, account, r.Password, r.Account) c.JSON(http.StatusOK, gin.H{"errCode": constant.PasswordErr, "errMsg": "password err"}) return } From 51ee2df755460569541c536177b5aabaeea6da48 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 25 Apr 2022 17:13:54 +0800 Subject: [PATCH 07/12] flag parse update --- cmd/open_im_cms_api/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/open_im_cms_api/main.go b/cmd/open_im_cms_api/main.go index 20e6380db..d4889dc9d 100644 --- a/cmd/open_im_cms_api/main.go +++ b/cmd/open_im_cms_api/main.go @@ -15,6 +15,7 @@ func main() { router := cms_api.NewGinRouter() router.Use(utils.CorsHandler()) ginPort := flag.Int("port", 8000, "get ginServerPort from cmd,default 8000 as port") + flag.Parse() fmt.Println("start cms api server, port: ", ginPort) router.Run(":" + strconv.Itoa(*ginPort)) } From d12d03fd5ee826c0c9540f71fe60d1ed927bdc3a Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Mon, 25 Apr 2022 17:28:43 +0800 Subject: [PATCH 08/12] Adjust port --- script/check_all.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/check_all.sh b/script/check_all.sh index 2ecd800b0..79a233bde 100644 --- a/script/check_all.sh +++ b/script/check_all.sh @@ -4,8 +4,11 @@ source ./style_info.cfg source ./path_info.cfg source ./function.sh service_port_name=( - openImCmsApiPort + openImWsPort openImApiPort + openImSdkWsPort + openImDemoPort + openImCmsApiPort openImUserPort openImFriendPort openImMessagePort @@ -13,13 +16,10 @@ service_port_name=( openImGroupPort openImAuthPort openImPushPort - openImWsPort - openImSdkWsPort - openImDemoPort - openImAdminCmsPort - openImMessageCmsPort openImStatisticsPort + openImMessageCmsPort openImOfficePort + openImAdminCmsPort openImOrganizationPort openImConversationPort ) From fdc462d0714404746e0980f5dfd1c3ca1cc50cd8 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Mon, 25 Apr 2022 17:30:13 +0800 Subject: [PATCH 09/12] Adjust port --- script/check_all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/check_all.sh b/script/check_all.sh index 79a233bde..60abfad69 100644 --- a/script/check_all.sh +++ b/script/check_all.sh @@ -18,8 +18,8 @@ service_port_name=( openImPushPort openImStatisticsPort openImMessageCmsPort - openImOfficePort openImAdminCmsPort + openImOfficePort openImOrganizationPort openImConversationPort ) From b3077fc15de76586b1d003214bf98fb2d5dbdd24 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 25 Apr 2022 19:14:51 +0800 Subject: [PATCH 10/12] conversation update --- pkg/common/db/mysql_model/im_mysql_model/conversation_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go b/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go index 2c252222d..ae90907bf 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go @@ -140,6 +140,6 @@ func UpdateColumnsConversations(ownerUserIDList []string, conversationID string, return err } dbConn.LogMode(false) - return dbConn.Model(&db.Conversation{}).Where("owner_user_id IN ? and conversation_id=?", ownerUserIDList, conversationID).Updates(args).Error + return dbConn.Debug().Model(&db.Conversation{}).Where("owner_user_id IN ? and conversation_id=?", ownerUserIDList, conversationID).Updates(args).Error } From eebe9cbd5faa621cc5ebaff01f503089ae10b66a Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 25 Apr 2022 19:41:17 +0800 Subject: [PATCH 11/12] conversation update --- pkg/common/db/mysql_model/im_mysql_model/conversation_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go b/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go index ae90907bf..6dc010784 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go @@ -140,6 +140,6 @@ func UpdateColumnsConversations(ownerUserIDList []string, conversationID string, return err } dbConn.LogMode(false) - return dbConn.Debug().Model(&db.Conversation{}).Where("owner_user_id IN ? and conversation_id=?", ownerUserIDList, conversationID).Updates(args).Error + return dbConn.Debug().Model(&db.Conversation{}).Where("owner_user_id IN (?) and conversation_id=?", ownerUserIDList, conversationID).Updates(args).Error } From 9a9f26c435405fe419e6170ad4b2054a7f81e906 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Mon, 25 Apr 2022 19:56:46 +0800 Subject: [PATCH 12/12] conversation update --- internal/rpc/conversation/conversaion.go | 2 +- .../db/mysql_model/im_mysql_model/conversation_model.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index aec03fd26..7012e0924 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -47,7 +47,7 @@ func (rpc *rpcConversation) ModifyConversationField(c context.Context, req *pbCo if err := utils.CopyStructFields(&conversation, req.Conversation); err != nil { log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", *req.Conversation, err.Error()) } - haveUserID, _ := imdb.GetExistConversationUserIDList(req.Conversation.ConversationID) + haveUserID, _ := imdb.GetExistConversationUserIDList(req.UserIDList, req.Conversation.ConversationID) switch req.FieldType { case constant.FieldRecvMsgOpt: for _, v := range req.UserIDList { diff --git a/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go b/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go index 6dc010784..0af86c57d 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/conversation_model.go @@ -93,13 +93,13 @@ func GetMultipleUserConversationByConversationID(ownerUserIDList []string, conve err = dbConn.Model(&db.Conversation{}).Where("owner_user_id IN ? and conversation_id=?", ownerUserIDList, conversationID).Find(&conversations).Error return conversations, err } -func GetExistConversationUserIDList(conversationID string) ([]string, error) { +func GetExistConversationUserIDList(ownerUserIDList []string, conversationID string) ([]string, error) { dbConn, err := db.DB.MysqlDB.DefaultGormDB() if err != nil { return nil, err } var resultArr []string - err = dbConn.Table("conversations").Where(" conversation_id=?", conversationID).Pluck("owner_user_id", &resultArr).Error + err = dbConn.Table("conversations").Where(" owner_user_id IN (?) and conversation_id=?", ownerUserIDList, conversationID).Pluck("owner_user_id", &resultArr).Error if err != nil { return nil, err }