This commit is contained in:
wangchuxiao
2023-03-13 15:39:47 +08:00
parent 6187b15a88
commit eb946ad181
18 changed files with 82 additions and 128 deletions
+6 -5
View File
@@ -9,7 +9,7 @@ import (
"context"
"fmt"
"github.com/OpenIMSDK/openKeeper"
"os"
"net"
"strconv"
"OpenIM/pkg/common/constant"
@@ -20,8 +20,7 @@ func main() {
apiCmd.AddPortFlag()
apiCmd.AddApi(run)
if err := apiCmd.Execute(); err != nil {
fmt.Println(err)
os.Exit(1)
panic(err.Error())
}
}
@@ -36,9 +35,11 @@ func run(port int) error {
log.NewPrivateLog(constant.LogFileName)
zk.AddOption(mw.GrpcClient())
router := api.NewGinRouter(zk)
address := constant.LocalHost + ":" + strconv.Itoa(port)
var address string
if config.Config.Api.ListenIP != "" {
address = config.Config.Api.ListenIP + ":" + strconv.Itoa(port)
address = net.JoinHostPort(config.Config.Api.ListenIP, strconv.Itoa(port))
} else {
address = net.JoinHostPort("0.0.0.0", strconv.Itoa(port))
}
fmt.Println("start api server, address: ", address, ", OpenIM version: ", config.Version)
log.ZInfo(context.Background(), "start server success", "address", address, "version", config.Version)
+1 -4
View File
@@ -2,8 +2,6 @@ package main
import (
"OpenIM/pkg/common/cmd"
"fmt"
"os"
)
func main() {
@@ -17,7 +15,6 @@ func main() {
cmd.GetCmd.AddCommand(msgCmd.Command)
msgUtilsCmd.AddCommand(cmd.GetCmd, cmd.FixCmd, cmd.ClearCmd)
if err := msgUtilsCmd.Execute(); err != nil {
fmt.Println(err)
os.Exit(1)
panic(err.Error())
}
}
+1 -4
View File
@@ -3,14 +3,11 @@ package main
import (
"OpenIM/internal/tools"
"OpenIM/pkg/common/cmd"
"fmt"
"os"
)
func main() {
cronTaskCmd := cmd.NewCronTaskCmd()
if err := cronTaskCmd.Exec(tools.StartCronTask); err != nil {
fmt.Println(err)
os.Exit(1)
panic(err.Error())
}
}
+1 -4
View File
@@ -2,8 +2,6 @@ package main
import (
"OpenIM/pkg/common/cmd"
"fmt"
"os"
)
func main() {
@@ -12,7 +10,6 @@ func main() {
msgGatewayCmd.AddPortFlag()
msgGatewayCmd.AddPrometheusPortFlag()
if err := msgGatewayCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
}
+1 -4
View File
@@ -2,15 +2,12 @@ package main
import (
"OpenIM/pkg/common/cmd"
"fmt"
"os"
)
func main() {
msgTransferCmd := cmd.NewMsgTransferCmd()
msgTransferCmd.AddPrometheusPortFlag()
if err := msgTransferCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
}
+2 -6
View File
@@ -4,8 +4,6 @@ import (
"OpenIM/internal/push"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
@@ -13,11 +11,9 @@ func main() {
pushCmd.AddPortFlag()
pushCmd.AddPrometheusPortFlag()
if err := pushCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
if err := pushCmd.StartSvr(config.Config.RpcRegisterName.OpenImPushName, push.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
}
+2 -6
View File
@@ -4,8 +4,6 @@ import (
"OpenIM/internal/rpc/auth"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
@@ -13,11 +11,9 @@ func main() {
authCmd.AddPortFlag()
authCmd.AddPrometheusPortFlag()
if err := authCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
if err := authCmd.StartSvr(config.Config.RpcRegisterName.OpenImAuthName, auth.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
}
+2 -6
View File
@@ -4,8 +4,6 @@ import (
"OpenIM/internal/rpc/conversation"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
@@ -13,11 +11,9 @@ func main() {
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImConversationName, conversation.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
}
+2 -6
View File
@@ -4,8 +4,6 @@ import (
"OpenIM/internal/rpc/friend"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
@@ -13,11 +11,9 @@ func main() {
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImFriendName, friend.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
}
+4 -8
View File
@@ -1,11 +1,9 @@
package main
import (
"OpenIM/internal/rpc/friend"
"OpenIM/internal/rpc/group"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
@@ -13,11 +11,9 @@ func main() {
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImGroupName, friend.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImGroupName, group.Start); err != nil {
panic(err.Error())
}
}
+2 -6
View File
@@ -4,8 +4,6 @@ import (
"OpenIM/internal/rpc/msg"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
@@ -13,11 +11,9 @@ func main() {
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImMsgName, msg.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
}
+2 -6
View File
@@ -4,8 +4,6 @@ import (
"OpenIM/internal/rpc/third"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
@@ -13,11 +11,9 @@ func main() {
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImThirdName, third.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
}
+2 -6
View File
@@ -4,8 +4,6 @@ import (
"OpenIM/internal/rpc/user"
"OpenIM/pkg/common/cmd"
"OpenIM/pkg/common/config"
"fmt"
"os"
)
func main() {
@@ -13,11 +11,9 @@ func main() {
rpcCmd.AddPortFlag()
rpcCmd.AddPrometheusPortFlag()
if err := rpcCmd.Exec(); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
if err := rpcCmd.StartSvr(config.Config.RpcRegisterName.OpenImUserName, user.Start); err != nil {
fmt.Println(err.Error())
os.Exit(1)
panic(err.Error())
}
}