proto modify

cmd/cmdutils/main.go

@@ -2,7 +2,9 @@ package main
 
 import (
 	"OpenIM/internal/task"
+	"OpenIM/internal/tools"
 	"OpenIM/pkg/common/config"
+	"context"
 	"flag"
 	"fmt"
 	"time"
@@ -22,8 +24,33 @@ func main() {
 	var userIDFixSeq = flag.String("user_id_fix_seq", "", "userID to Fix Seq")
 	var superGroupIDFixSeq = flag.String("super_group_id_fix_seq", "", "super groupID to fix Seq")
 	var fixAllSeq = flag.Bool("fix_all_seq", false, "fix seq")
-
 	flag.Parse()
-	fmt.Println(time.Now(), "start cronTask", *userIDFixSeq, *superGroupIDFixSeq)
-	task.FixSeq(*userID, *superGroupID, *fixAllSeq)
+	msgTool, err := tools.InitMsgTool()
+	if err != nil {
+		panic(err.Error())
+	}
+	ctx := context.Background()
+	if userIDFixSeq != nil {
+		msgTool.GetAndFixUserSeqs(ctx, *userIDFixSeq)
+	}
+	if superGroupIDFixSeq != nil {
+		msgTool.FixGroupSeq(ctx, *superGroupIDFixSeq)
+	}
+	if fixAllSeq != nil {
+		msgTool.FixAllSeq(ctx)
+	}
+	if userIDClearMsg != nil {
+		msgTool.ClearUsersMsg(ctx, []string{*userIDClearMsg})
+	}
+
+	if superGroupIDClearMsg != nil {
+		msgTool.ClearSuperGroupMsg(ctx, []string{*superGroupIDClearMsg})
+	}
+	if userIDShowSeq != nil {
+		msgTool.ShowUserSeqs(ctx, *userIDShowSeq)
+	}
+
+	if superGroupIDShowSeq != nil {
+		msgTool.ShowSuperGroupSeqs(ctx, *superGroupIDShowSeq)
+	}
 }

cmd/crontask/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"OpenIM/internal/task"
+	"OpenIM/internal/tools"
 	"OpenIM/pkg/common/config"
 	"fmt"
 	"time"
@@ -12,7 +13,7 @@ func main() {
 	if err := config.InitConfig(); err != nil {
 		panic(err.Error())
 	}
-	if err := task.StartCronTask(); err != nil {
+	if err := tools.StartCronTask(); err != nil {
 		panic(err.Error())
 	}
 }

cmd/msgtransfer/main.go

@@ -6,7 +6,6 @@ import (
 	"OpenIM/pkg/common/constant"
 	"OpenIM/pkg/common/log"
 	"flag"
-	"fmt"
 	"sync"
 )
 
@@ -18,8 +17,8 @@ func main() {
 	wg.Add(1)
 	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.MessageTransferPrometheusPort[0], "MessageTransferPrometheusPort default listen port")
 	log.NewPrivateLog(constant.LogFileName)
-	msgTransfer := msgtransfer.NewMsgTransfer()
-	fmt.Println("start msg_transfer server ", ", OpenIM version: ", constant.CurrentVersion, "\n")
-	msgTransfer.Run(*prometheusPort)
+	if err := msgtransfer.StartTransfer(*prometheusPort); err != nil {
+		panic(err)
+	}
 	wg.Wait()
 }

cmd/push/main.go

@@ -2,30 +2,18 @@ package main
 
 import (
 	"OpenIM/internal/push"
+	"OpenIM/internal/startrpc"
 	"OpenIM/pkg/common/config"
 	"OpenIM/pkg/common/constant"
 	"OpenIM/pkg/common/log"
-	"flag"
-	"fmt"
-	"sync"
 )
 
 func main() {
 	if err := config.InitConfig(); err != nil {
 		panic(err.Error())
 	}
-	defaultPorts := config.Config.RpcPort.OpenImPushPort
-	rpcPort := flag.Int("port", defaultPorts[0], "rpc listening port")
-	prometheusPort := flag.Int("prometheus_port", config.Config.Prometheus.MessageTransferPrometheusPort[0], "PushrometheusPort default listen port")
-	flag.Parse()
-	var wg sync.WaitGroup
-	wg.Add(1)
 	log.NewPrivateLog(constant.LogFileName)
-	fmt.Println("start push rpc server, port: ", *rpcPort, ", OpenIM version: ", constant.CurrentVersion, "\n")
-	pusher := push.Push{}
-	if err := pusher.Init(*rpcPort); err != nil {
+	if err := startrpc.Start(config.Config.RpcPort.OpenImAuthPort[0], config.Config.RpcRegisterName.OpenImAuthName, config.Config.Prometheus.AuthPrometheusPort[0], push.Start); err != nil {
 		panic(err.Error())
 	}
-	pusher.Run(*prometheusPort)
-	wg.Wait()
 }