fix:change the parameter service to server_name

cmd/static/server_flags.go

@@ -26,6 +26,7 @@ func serverFlags() []cli.Flag {
 	globalArgs := config.GetGlobalArgs()
 	return []cli.Flag{
 		&cli.StringFlag{Name: consts.Service, Usage: "Specify the service name.", Destination: &globalArgs.ServerArgument.Service},
+		&cli.StringFlag{Name: consts.ServerName, Usage: "Specify the server name.", Destination: &globalArgs.ServerArgument.ServerName},
 		&cli.StringFlag{Name: consts.ServiceType, Usage: "Specify the generate type. (RPC or HTTP)", Value: consts.RPC},
 		&cli.StringFlag{Name: consts.Module, Aliases: []string{"mod"}, Usage: "Specify the Go module name to generate go.mod.", Destination: &globalArgs.ServerArgument.GoMod},
 		&cli.StringFlag{Name: consts.IDLPath, Usage: "Specify the IDL file path. (.thrift or .proto)", Destination: &globalArgs.ServerArgument.IdlPath},

config/server.go

@@ -40,12 +40,13 @@ type ServerArgument struct {
 }
 
 type CommonParam struct {
-	Service  string // service name
-	Type     string // GenerateType: RPC or HTTP
-	GoMod    string // Go Mod name
-	IdlPath  string
-	OutDir   string // output path
-	Registry string
+	Service    string // service name
+	ServerName string //server name
+	Type       string // GenerateType: RPC or HTTP
+	GoMod      string // Go Mod name
+	IdlPath    string
+	OutDir     string // output path
+	Registry   string
 }
 
 func NewServerArgument() *ServerArgument {

pkg/client/check.go

@@ -41,8 +41,8 @@ func check(ca *config.ClientArgument) error {
 		return errors.New("unsupported registry")
 	}
 
-	if ca.Service == "" {
-		return errors.New("must specify service name when use registry")
+	if ca.Service == "" && ca.ServerName == "" {
+		return errors.New("must specify server name when use registry")
 	}
 
 	// handle cwd and output dir

pkg/client/hz.go

@@ -61,7 +61,12 @@ func convertHzArgument(ca *config.ClientArgument, hzArgument *hzConfig.Argument)
 
 	hzArgument.IdlPaths = []string{abPath}
 	hzArgument.Gomod = ca.GoMod
-	hzArgument.ServiceName = ca.Service
+	if ca.Service != "" {
+		hzArgument.ServiceName = ca.Service
+	}
+	if ca.ServerName != "" {
+		hzArgument.ServiceName = ca.ServerName
+	}
 	hzArgument.Includes = ca.SliceParam.ProtoSearchPath
 	hzArgument.Cwd = ca.Cwd
 	hzArgument.Gosrc = ca.GoSrc

pkg/client/kitex.go

@@ -39,6 +39,12 @@ func convertKitexArgs(sa *config.ClientArgument, kitexArgument *kargs.Arguments)
 
 	kitexArgument.ModuleName = sa.GoMod
 	kitexArgument.ServiceName = sa.Service
+	if sa.Service != "" {
+		kitexArgument.ServiceName = sa.Service
+	}
+	if sa.ServerName != "" {
+		kitexArgument.ServiceName = sa.ServerName
+	}
 	kitexArgument.Includes = sa.SliceParam.ProtoSearchPath
 	kitexArgument.Version = kitex.Version
 	kitexArgument.RecordCmd = os.Args

pkg/consts/const.go

@@ -131,6 +131,7 @@ const (
 	DaoDir   = "dao_dir"
 
 	Service         = "service"
+	ServerName      = "server_name"
 	ServiceType     = "type"
 	Module          = "module"
 	IDLPath         = "idl"

pkg/server/check.go

@@ -41,8 +41,8 @@ func check(sa *config.ServerArgument) error {
 		return errors.New("unsupported registry")
 	}
 
-	if sa.Service == "" {
-		return errors.New("must specify service name")
+	if sa.Service == "" && sa.ServerName == "" {
+		return errors.New("must specify server name")
 	}
 
 	// handle cwd and output dir

pkg/server/hz.go

@@ -74,7 +74,12 @@ func convertHzArgument(sa *config.ServerArgument, hzArgument *hzConfig.Argument)
 
 	hzArgument.IdlPaths = []string{abPath}
 	hzArgument.Gomod = sa.GoMod
-	hzArgument.ServiceName = sa.Service
+	if sa.Service != "" {
+		hzArgument.ServiceName = sa.Service
+	}
+	if sa.ServerName != "" {
+		hzArgument.ServiceName = sa.ServerName
+	}
 	hzArgument.OutDir = sa.OutDir
 	hzArgument.Includes = sa.SliceParam.ProtoSearchPath
 	hzArgument.Cwd = sa.Cwd

pkg/server/kitex.go

@@ -46,7 +46,12 @@ func convertKitexArgs(sa *config.ServerArgument, kitexArgument *kargs.Arguments)
 	f := flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
 
 	kitexArgument.ModuleName = sa.GoMod
-	kitexArgument.ServiceName = sa.Service
+	if sa.Service != "" {
+		kitexArgument.ServiceName = sa.Service
+	}
+	if sa.ServerName != "" {
+		kitexArgument.ServiceName = sa.ServerName
+	}
 	kitexArgument.Includes = sa.SliceParam.ProtoSearchPath
 	kitexArgument.Version = kitex.Version
 	kitexArgument.RecordCmd = os.Args