From 23b03919e612e30286198d7294847ed06ef5a41c Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 19 May 2022 10:44:39 +0800 Subject: [PATCH] office tag async send --- cmd/open_im_api/main.go | 3 ++- cmd/open_im_cms_api/main.go | 3 ++- cmd/open_im_demo/main.go | 4 ++-- cmd/open_im_msg_gateway/main.go | 7 +++++-- cmd/open_im_push/main.go | 4 +++- cmd/rpc/open_im_admin_cms/main.go | 4 +++- cmd/rpc/open_im_auth/main.go | 4 +++- cmd/rpc/open_im_cache/main.go | 4 +++- cmd/rpc/open_im_conversation/main.go | 4 +++- cmd/rpc/open_im_friend/main.go | 5 +++-- cmd/rpc/open_im_group/main.go | 4 +++- cmd/rpc/open_im_message_cms/main.go | 4 +++- cmd/rpc/open_im_msg/main.go | 4 +++- cmd/rpc/open_im_office/main.go | 4 +++- cmd/rpc/open_im_organization/main.go | 4 +++- cmd/rpc/open_im_statistics/main.go | 4 +++- cmd/rpc/open_im_user/main.go | 4 +++- deploy_k8s/admin_cms/admin_cms.Dockerfile | 2 +- deploy_k8s/auth/auth.Dockerfile | 15 +++++++++++++ deploy_k8s/cache/cache.Dockerfile | 15 +++++++++++++ deploy_k8s/cms_api/cms_api.Dockerfile | 15 +++++++++++++ .../conversation/conversation.Dockerfile | 15 +++++++++++++ deploy_k8s/demo/demo.Dockerfile | 15 +++++++++++++ deploy_k8s/dockerfiles/statistics.Dockerfile | 0 deploy_k8s/dockerfiles/transfer.Dockerfile | 0 deploy_k8s/dockerfiles/user.Dockerfile | 0 deploy_k8s/friend/friend.Dockerfile | 15 +++++++++++++ deploy_k8s/group/group.Dockerfile | 15 +++++++++++++ deploy_k8s/message_cms/message_cms.Dockerfile | 15 +++++++++++++ deploy_k8s/msg/msg.Dockerfile | 15 +++++++++++++ deploy_k8s/msg_gateway/msg_gateway.Dockerfile | 15 +++++++++++++ deploy_k8s/office/office.Dockerfile | 15 +++++++++++++ .../organization/organization.Dockerfile | 15 +++++++++++++ deploy_k8s/push/push.Dockerfile | 15 +++++++++++++ deploy_k8s/sdk_server/sdk_server.Dockerfile | 15 +++++++++++++ deploy_k8s/statistics/statistics.Dockerfile | 15 +++++++++++++ deploy_k8s/transfer/transfer.Dockerfile | 15 +++++++++++++ deploy_k8s/user/user.Dockerfile | 15 +++++++++++++ pkg/common/config/config.go | 21 ++++++++++++------- 39 files changed, 320 insertions(+), 28 deletions(-) delete mode 100644 deploy_k8s/dockerfiles/statistics.Dockerfile delete mode 100644 deploy_k8s/dockerfiles/transfer.Dockerfile delete mode 100644 deploy_k8s/dockerfiles/user.Dockerfile create mode 100644 deploy_k8s/statistics/statistics.Dockerfile create mode 100644 deploy_k8s/transfer/transfer.Dockerfile create mode 100644 deploy_k8s/user/user.Dockerfile diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index cd774627b..e7a333b3a 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -182,7 +182,8 @@ func main() { } go apiThird.MinioInit() - ginPort := flag.Int("port", 10002, "get ginServerPort from cmd,default 10002 as port") + defaultPorts := config.Config.Api.GinPort + ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10002 as port") flag.Parse() address := "0.0.0.0:" + strconv.Itoa(*ginPort) if config.Config.Api.ListenIP != "" { diff --git a/cmd/open_im_cms_api/main.go b/cmd/open_im_cms_api/main.go index 6a0068195..b2b1cae7c 100644 --- a/cmd/open_im_cms_api/main.go +++ b/cmd/open_im_cms_api/main.go @@ -15,7 +15,8 @@ func main() { gin.SetMode(gin.ReleaseMode) router := cms_api.NewGinRouter() router.Use(utils.CorsHandler()) - ginPort := flag.Int("port", 10006, "get ginServerPort from cmd,default 10006 as port") + defaultPorts := config.Config.CmsApi.GinPort + ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 10006 as port") flag.Parse() address := "0.0.0.0:" + strconv.Itoa(*ginPort) if config.Config.Api.ListenIP != "" { diff --git a/cmd/open_im_demo/main.go b/cmd/open_im_demo/main.go index c2ec21783..418d578a6 100644 --- a/cmd/open_im_demo/main.go +++ b/cmd/open_im_demo/main.go @@ -32,8 +32,8 @@ func main() { authRouterGroup.POST("/login", register.Login) authRouterGroup.POST("/reset_password", register.ResetPassword) } - - ginPort := flag.Int("port", 42233, "get ginServerPort from cmd,default 42233 as port") + defaultPorts := config.Config.Demo.Port + ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 42233 as port") flag.Parse() fmt.Println("start demo api server, port: ", *ginPort) address := "0.0.0.0:" + strconv.Itoa(*ginPort) diff --git a/cmd/open_im_msg_gateway/main.go b/cmd/open_im_msg_gateway/main.go index 283f831b8..5996a4ac5 100644 --- a/cmd/open_im_msg_gateway/main.go +++ b/cmd/open_im_msg_gateway/main.go @@ -2,6 +2,7 @@ package main import ( "Open_IM/internal/msg_gateway/gate" + "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "flag" @@ -11,8 +12,10 @@ import ( func main() { log.NewPrivateLog(constant.LogFileName) - rpcPort := flag.Int("rpc_port", 10400, "rpc listening port") - wsPort := flag.Int("ws_port", 17778, "ws listening port") + defaultRpcPorts := config.Config.RpcPort.OpenImMessageGatewayPort + defaultWsPorts := config.Config.LongConnSvr.WebsocketPort + rpcPort := flag.Int("rpc_port", defaultRpcPorts[0], "rpc listening port") + wsPort := flag.Int("ws_port", defaultWsPorts[0], "ws listening port") flag.Parse() var wg sync.WaitGroup wg.Add(1) diff --git a/cmd/open_im_push/main.go b/cmd/open_im_push/main.go index 95e8521dd..63b2aaa12 100644 --- a/cmd/open_im_push/main.go +++ b/cmd/open_im_push/main.go @@ -2,6 +2,7 @@ package main import ( "Open_IM/internal/push/logic" + "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "flag" @@ -10,7 +11,8 @@ import ( ) func main() { - rpcPort := flag.Int("port", 10700, "rpc listening port") + defaultPorts := config.Config.RpcPort.OpenImPushPort + rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port") flag.Parse() var wg sync.WaitGroup wg.Add(1) diff --git a/cmd/rpc/open_im_admin_cms/main.go b/cmd/rpc/open_im_admin_cms/main.go index c69135645..eeb4ca588 100644 --- a/cmd/rpc/open_im_admin_cms/main.go +++ b/cmd/rpc/open_im_admin_cms/main.go @@ -2,12 +2,14 @@ package main import ( rpcMessageCMS "Open_IM/internal/rpc/admin_cms" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 11000, "rpc listening port") + defaultPorts := config.Config.RpcPort.OpenImAdminCmsPort + rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port") flag.Parse() fmt.Println("start cms rpc server, port: ", *rpcPort) rpcServer := rpcMessageCMS.NewAdminCMSServer(*rpcPort) diff --git a/cmd/rpc/open_im_auth/main.go b/cmd/rpc/open_im_auth/main.go index 53b0f9de5..939c7d6f2 100644 --- a/cmd/rpc/open_im_auth/main.go +++ b/cmd/rpc/open_im_auth/main.go @@ -2,12 +2,14 @@ package main import ( rpcAuth "Open_IM/internal/rpc/auth" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 10600, "RpcToken default listen port 10800") + defaultPorts := config.Config.RpcPort.OpenImAuthPort + rpcPort := flag.Int("port", defaultPorts[0], "RpcToken default listen port 10800") flag.Parse() fmt.Println("start auth rpc server, port: ", *rpcPort) rpcServer := rpcAuth.NewRpcAuthServer(*rpcPort) diff --git a/cmd/rpc/open_im_cache/main.go b/cmd/rpc/open_im_cache/main.go index bc50cc28e..d0aacfbc9 100644 --- a/cmd/rpc/open_im_cache/main.go +++ b/cmd/rpc/open_im_cache/main.go @@ -2,12 +2,14 @@ package main import ( rpcCache "Open_IM/internal/rpc/cache" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 10600, "RpcToken default listen port 10800") + defaultPorts := config.Config.RpcPort.OpenImCachePort + rpcPort := flag.Int("port", defaultPorts[0], "RpcToken default listen port 10800") flag.Parse() fmt.Println("start auth rpc server, port: ", *rpcPort) rpcServer := rpcCache.NewCacheServer(*rpcPort) diff --git a/cmd/rpc/open_im_conversation/main.go b/cmd/rpc/open_im_conversation/main.go index dc43063e6..53769c4ac 100644 --- a/cmd/rpc/open_im_conversation/main.go +++ b/cmd/rpc/open_im_conversation/main.go @@ -2,12 +2,14 @@ package main import ( rpcConversation "Open_IM/internal/rpc/conversation" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 11400, "RpcConversation default listen port 11300") + defaultPorts := config.Config.RpcPort.OpenImConversationPort + rpcPort := flag.Int("port", defaultPorts[0], "RpcConversation default listen port 11300") flag.Parse() fmt.Println("start conversation rpc server, port: ", *rpcPort) rpcServer := rpcConversation.NewRpcConversationServer(*rpcPort) diff --git a/cmd/rpc/open_im_friend/main.go b/cmd/rpc/open_im_friend/main.go index 85d05e39c..b6a650e63 100644 --- a/cmd/rpc/open_im_friend/main.go +++ b/cmd/rpc/open_im_friend/main.go @@ -2,13 +2,14 @@ package main import ( "Open_IM/internal/rpc/friend" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - - rpcPort := flag.Int("port", 10200, "get RpcFriendPort from cmd,default 12000 as port") + defaultPorts := config.Config.RpcPort.OpenImFriendPort + rpcPort := flag.Int("port", defaultPorts[0], "get RpcFriendPort from cmd,default 12000 as port") flag.Parse() fmt.Println("start friend rpc server, port: ", *rpcPort) rpcServer := friend.NewFriendServer(*rpcPort) diff --git a/cmd/rpc/open_im_group/main.go b/cmd/rpc/open_im_group/main.go index 7afc7ec57..14cb56722 100644 --- a/cmd/rpc/open_im_group/main.go +++ b/cmd/rpc/open_im_group/main.go @@ -2,12 +2,14 @@ package main import ( "Open_IM/internal/rpc/group" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 10500, "get RpcGroupPort from cmd,default 16000 as port") + defaultPorts := config.Config.RpcPort.OpenImGroupPort + rpcPort := flag.Int("port", defaultPorts[0], "get RpcGroupPort from cmd,default 16000 as port") flag.Parse() fmt.Println("start group rpc server, port: ", *rpcPort) rpcServer := group.NewGroupServer(*rpcPort) diff --git a/cmd/rpc/open_im_message_cms/main.go b/cmd/rpc/open_im_message_cms/main.go index 16151a2ed..9c39a99e4 100644 --- a/cmd/rpc/open_im_message_cms/main.go +++ b/cmd/rpc/open_im_message_cms/main.go @@ -2,12 +2,14 @@ package main import ( rpcMessageCMS "Open_IM/internal/rpc/message_cms" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 10900, "rpc listening port") + defaultPorts := config.Config.RpcPort.OpenImMessageCmsPort[0] + rpcPort := flag.Int("port", defaultPorts, "rpc listening port") flag.Parse() fmt.Println("start msg cms rpc server, port: ", *rpcPort) rpcServer := rpcMessageCMS.NewMessageCMSServer(*rpcPort) diff --git a/cmd/rpc/open_im_msg/main.go b/cmd/rpc/open_im_msg/main.go index 95908f48a..8c7948c1a 100644 --- a/cmd/rpc/open_im_msg/main.go +++ b/cmd/rpc/open_im_msg/main.go @@ -2,12 +2,14 @@ package main import ( rpcChat "Open_IM/internal/rpc/msg" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 10300, "rpc listening port") + defaultPorts := config.Config.RpcPort.OpenImMessagePort + rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port") flag.Parse() fmt.Println("start msg rpc server, port: ", *rpcPort) rpcServer := rpcChat.NewRpcChatServer(*rpcPort) diff --git a/cmd/rpc/open_im_office/main.go b/cmd/rpc/open_im_office/main.go index c9a05c791..51ec154f0 100644 --- a/cmd/rpc/open_im_office/main.go +++ b/cmd/rpc/open_im_office/main.go @@ -2,12 +2,14 @@ package main import ( rpc "Open_IM/internal/rpc/office" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 11100, "rpc listening port") + defaultPorts := config.Config.RpcPort.OpenImOfficePort + rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port") flag.Parse() fmt.Println("start office rpc server, port: ", *rpcPort) rpcServer := rpc.NewOfficeServer(*rpcPort) diff --git a/cmd/rpc/open_im_organization/main.go b/cmd/rpc/open_im_organization/main.go index 906ac510f..2e8b94bb1 100644 --- a/cmd/rpc/open_im_organization/main.go +++ b/cmd/rpc/open_im_organization/main.go @@ -2,12 +2,14 @@ package main import ( "Open_IM/internal/rpc/organization" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 11200, "get RpcOrganizationPort from cmd,default 11200 as port") + defaultPorts := config.Config.RpcPort.OpenImOrganizationPort + rpcPort := flag.Int("port", defaultPorts[0], "get RpcOrganizationPort from cmd,default 11200 as port") flag.Parse() fmt.Println("start organization rpc server, port: ", *rpcPort) rpcServer := organization.NewServer(*rpcPort) diff --git a/cmd/rpc/open_im_statistics/main.go b/cmd/rpc/open_im_statistics/main.go index b87440abf..f9b0e8539 100644 --- a/cmd/rpc/open_im_statistics/main.go +++ b/cmd/rpc/open_im_statistics/main.go @@ -2,12 +2,14 @@ package main import ( "Open_IM/internal/rpc/statistics" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 10800, "rpc listening port") + defaultPorts := config.Config.RpcPort.OpenImStatisticsPort + rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port") flag.Parse() fmt.Println("start statistics rpc server, port: ", *rpcPort) rpcServer := statistics.NewStatisticsServer(*rpcPort) diff --git a/cmd/rpc/open_im_user/main.go b/cmd/rpc/open_im_user/main.go index d8644d028..e50ebef35 100644 --- a/cmd/rpc/open_im_user/main.go +++ b/cmd/rpc/open_im_user/main.go @@ -2,12 +2,14 @@ package main import ( "Open_IM/internal/rpc/user" + "Open_IM/pkg/common/config" "flag" "fmt" ) func main() { - rpcPort := flag.Int("port", 10100, "rpc listening port") + defaultPorts := config.Config.RpcPort.OpenImUserPort + rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port") flag.Parse() fmt.Println("start user rpc server, port: ", *rpcPort) rpcServer := user.NewUserServer(*rpcPort) diff --git a/deploy_k8s/admin_cms/admin_cms.Dockerfile b/deploy_k8s/admin_cms/admin_cms.Dockerfile index bf86691d8..6527d0e2a 100644 --- a/deploy_k8s/admin_cms/admin_cms.Dockerfile +++ b/deploy_k8s/admin_cms/admin_cms.Dockerfile @@ -5,7 +5,7 @@ ENV WORKDIR /bin ENV CONFIG_NAME $WORKDIR/config/config.yaml # 将可执行文件复制到目标目录 -ADD ./open_im_api $WORKDIR/main +ADD ./open_im_admin_cms $WORKDIR/main # 创建用于挂载的几个目录，添加可执行权限 RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ diff --git a/deploy_k8s/auth/auth.Dockerfile b/deploy_k8s/auth/auth.Dockerfile index e69de29bb..e0bc9f738 100644 --- a/deploy_k8s/auth/auth.Dockerfile +++ b/deploy_k8s/auth/auth.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_auth $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/cache/cache.Dockerfile b/deploy_k8s/cache/cache.Dockerfile index e69de29bb..d4ff085af 100644 --- a/deploy_k8s/cache/cache.Dockerfile +++ b/deploy_k8s/cache/cache.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_cache $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/cms_api/cms_api.Dockerfile b/deploy_k8s/cms_api/cms_api.Dockerfile index e69de29bb..b1fb004f5 100644 --- a/deploy_k8s/cms_api/cms_api.Dockerfile +++ b/deploy_k8s/cms_api/cms_api.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_cms_api $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/conversation/conversation.Dockerfile b/deploy_k8s/conversation/conversation.Dockerfile index e69de29bb..10b2071c2 100644 --- a/deploy_k8s/conversation/conversation.Dockerfile +++ b/deploy_k8s/conversation/conversation.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_conversation $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/demo/demo.Dockerfile b/deploy_k8s/demo/demo.Dockerfile index e69de29bb..eb9f3b146 100644 --- a/deploy_k8s/demo/demo.Dockerfile +++ b/deploy_k8s/demo/demo.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_demo $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/dockerfiles/statistics.Dockerfile b/deploy_k8s/dockerfiles/statistics.Dockerfile deleted file mode 100644 index e69de29bb..000000000 diff --git a/deploy_k8s/dockerfiles/transfer.Dockerfile b/deploy_k8s/dockerfiles/transfer.Dockerfile deleted file mode 100644 index e69de29bb..000000000 diff --git a/deploy_k8s/dockerfiles/user.Dockerfile b/deploy_k8s/dockerfiles/user.Dockerfile deleted file mode 100644 index e69de29bb..000000000 diff --git a/deploy_k8s/friend/friend.Dockerfile b/deploy_k8s/friend/friend.Dockerfile index e69de29bb..5e93252db 100644 --- a/deploy_k8s/friend/friend.Dockerfile +++ b/deploy_k8s/friend/friend.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_friend $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/group/group.Dockerfile b/deploy_k8s/group/group.Dockerfile index e69de29bb..ce6cd8c61 100644 --- a/deploy_k8s/group/group.Dockerfile +++ b/deploy_k8s/group/group.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_group $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/message_cms/message_cms.Dockerfile b/deploy_k8s/message_cms/message_cms.Dockerfile index e69de29bb..0e73e0f6f 100644 --- a/deploy_k8s/message_cms/message_cms.Dockerfile +++ b/deploy_k8s/message_cms/message_cms.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_message_cms $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/msg/msg.Dockerfile b/deploy_k8s/msg/msg.Dockerfile index e69de29bb..8ba79d0da 100644 --- a/deploy_k8s/msg/msg.Dockerfile +++ b/deploy_k8s/msg/msg.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_msg $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile index e69de29bb..88734306a 100644 --- a/deploy_k8s/msg_gateway/msg_gateway.Dockerfile +++ b/deploy_k8s/msg_gateway/msg_gateway.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_msg_gateway $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/office/office.Dockerfile b/deploy_k8s/office/office.Dockerfile index e69de29bb..fafc1cc36 100644 --- a/deploy_k8s/office/office.Dockerfile +++ b/deploy_k8s/office/office.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_office $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/organization/organization.Dockerfile b/deploy_k8s/organization/organization.Dockerfile index e69de29bb..2c820ed08 100644 --- a/deploy_k8s/organization/organization.Dockerfile +++ b/deploy_k8s/organization/organization.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_organization $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/push/push.Dockerfile b/deploy_k8s/push/push.Dockerfile index e69de29bb..a3294b53c 100644 --- a/deploy_k8s/push/push.Dockerfile +++ b/deploy_k8s/push/push.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_push $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/sdk_server/sdk_server.Dockerfile b/deploy_k8s/sdk_server/sdk_server.Dockerfile index e69de29bb..30b639c01 100644 --- a/deploy_k8s/sdk_server/sdk_server.Dockerfile +++ b/deploy_k8s/sdk_server/sdk_server.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_sdk_server $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/statistics/statistics.Dockerfile b/deploy_k8s/statistics/statistics.Dockerfile new file mode 100644 index 000000000..85604b2b7 --- /dev/null +++ b/deploy_k8s/statistics/statistics.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_statistics $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/transfer/transfer.Dockerfile b/deploy_k8s/transfer/transfer.Dockerfile new file mode 100644 index 000000000..bb6fc6f35 --- /dev/null +++ b/deploy_k8s/transfer/transfer.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_transfer $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/deploy_k8s/user/user.Dockerfile b/deploy_k8s/user/user.Dockerfile new file mode 100644 index 000000000..f2a5f5e95 --- /dev/null +++ b/deploy_k8s/user/user.Dockerfile @@ -0,0 +1,15 @@ +FROM ubuntu + +# 设置固定的项目路径 +ENV WORKDIR /bin +ENV CONFIG_NAME $WORKDIR/config/config.yaml + +# 将可执行文件复制到目标目录 +ADD ./open_im_user $WORKDIR/main + +# 创建用于挂载的几个目录，添加可执行权限 +RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/db && \ + chmod +x $WORKDIR/main + +WORKDIR $WORKDIR +CMD ./main diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index e898e5aa6..b60794a12 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -104,13 +104,20 @@ type config struct { DBPassWord string `yaml:"dbPassWord"` } RpcPort struct { - OpenImUserPort []int `yaml:"openImUserPort"` - openImFriendPort []int `yaml:"openImFriendPort"` - RpcMessagePort []int `yaml:"rpcMessagePort"` - RpcPushMessagePort []int `yaml:"rpcPushMessagePort"` - OpenImGroupPort []int `yaml:"openImGroupPort"` - RpcModifyUserInfoPort []int `yaml:"rpcModifyUserInfoPort"` - RpcGetTokenPort []int `yaml:"rpcGetTokenPort"` + OpenImUserPort []int `yaml:"openImUserPort"` + OpenImFriendPort []int `yaml:"openImFriendPort"` + OpenImMessagePort []int `yaml:"openImMessagePort"` + OpenImMessageGatewayPort []int `yaml:"openImMessageGatewayPort"` + OpenImGroupPort []int `yaml:"openImGroupPort"` + OpenImAuthPort []int `yaml:"openImAuthPort"` + OpenImPushPort []int `yaml:"openImPushPort"` + OpenImStatisticsPort []int `yaml:"openImStatisticsPort"` + OpenImMessageCmsPort []int `yaml:"openImMessageCmsPort"` + OpenImAdminCmsPort []int `yaml:"openImAdminCmsPort"` + OpenImOfficePort []int `yaml:"openImOfficePort"` + OpenImOrganizationPort []int `yaml:"openImOrganizationPort"` + OpenImConversationPort []int `yaml:"openImConversationPort"` + OpenImCachePort []int `yaml:"openImCachePort"` } RpcRegisterName struct { OpenImStatisticsName string `yaml:"openImStatisticsName"`