office tag async send

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 != "" {

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 != "" {

cmd/open_im_demo/main.go

@@ -32,8 +32,8 @@ func main() {
 		authRouterGroup.POST("/login", register.Login)
 		authRouterGroup.POST("/reset_password", register.ResetPassword)
 	}
-
+	defaultPorts := config.Config.Demo.Port
-	ginPort := flag.Int("port", 42233, "get ginServerPort from cmd,default 42233 as 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)

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")
+	defaultRpcPorts := config.Config.RpcPort.OpenImMessageGatewayPort
-	wsPort := flag.Int("ws_port", 17778, "ws listening port")
+	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)

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)

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)

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)

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)

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)

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() {
-
+	defaultPorts := config.Config.RpcPort.OpenImFriendPort
-	rpcPort := flag.Int("port", 10200, "get RpcFriendPort from cmd,default 12000 as port")
+	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)

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)

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)

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)

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)

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)

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)

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)

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 && \

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

pkg/common/config/config.go

@@ -105,12 +105,19 @@ type config struct {
 	}
 	RpcPort struct {
 		OpenImUserPort           []int `yaml:"openImUserPort"`
-		openImFriendPort      []int `yaml:"openImFriendPort"`
+		OpenImFriendPort         []int `yaml:"openImFriendPort"`
-		RpcMessagePort        []int `yaml:"rpcMessagePort"`
+		OpenImMessagePort        []int `yaml:"openImMessagePort"`
-		RpcPushMessagePort    []int `yaml:"rpcPushMessagePort"`
+		OpenImMessageGatewayPort []int `yaml:"openImMessageGatewayPort"`
 		OpenImGroupPort          []int `yaml:"openImGroupPort"`
-		RpcModifyUserInfoPort []int `yaml:"rpcModifyUserInfoPort"`
+		OpenImAuthPort           []int `yaml:"openImAuthPort"`
-		RpcGetTokenPort       []int `yaml:"rpcGetTokenPort"`
+		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"`