fix version 1

module/social/feed/internal/server/new.go

@@ -5,6 +5,7 @@ import (
 	pb "bsm/full/module/social/feed/pb"
 	"context"
 
+	"git.apinb.com/bsm-sdk/core/printer"
 	gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
@@ -17,10 +18,16 @@ type Server struct {
 	grpcConns map[string]*grpc.ClientConn // 连接池
 }
 
-func New(addr string) *Server {
+func New(grpcServ *grpc.Server) *Server {
+	// grpcServ 为空表示独立进程启动，自行创建 gRPC Server
+	standalone := grpcServ == nil
+	if standalone {
+		grpcServ = grpc.NewServer()
+	}
+
 	srv := &Server{
 		Ctx:       context.Background(),
-		Grpc:      grpc.NewServer(),
+		Grpc:      grpcServ,
 		grpcConns: make(map[string]*grpc.ClientConn),
 	}
 
@@ -30,7 +37,28 @@ func New(addr string) *Server {
 	pb.RegisterTagServer(srv.Grpc, NewTagServer())
 	pb.RegisterTimelineServer(srv.Grpc, NewTimelineServer())
 
-	reflection.Register(srv.Grpc)
+	if standalone {
+		// 独立进程需自行初始化网关路由并注册 handler，否则 /feed.* 全部 404
+		srv.Mux = gwRuntime.NewServeMux()
+		if err := RegisterGateway(srv.Ctx, srv.Mux); err != nil {
+			printer.Error(err.Error())
+		}
+		reflection.Register(srv.Grpc)
+	}
 
 	return srv
 }
+
+// RegisterGateway 注册四个 service 的 gateway handler
+func RegisterGateway(ctx context.Context, mux *gwRuntime.ServeMux) error {
+	if err := pb.RegisterPostHandlerServer(ctx, mux, NewPostServer()); err != nil {
+		return err
+	}
+	if err := pb.RegisterSettingHandlerServer(ctx, mux, NewSettingServer()); err != nil {
+		return err
+	}
+	if err := pb.RegisterTagHandlerServer(ctx, mux, NewTagServer()); err != nil {
+		return err
+	}
+	return pb.RegisterTimelineHandlerServer(ctx, mux, NewTimelineServer())
+}