feat 结构调整

Server/gateway/app/app.go

@@ -22,7 +22,7 @@ func (p *Program) Init(_ svc.Environment) error {
 	p.moduleList = append(p.moduleList, &ModuleBase{})
 	p.moduleList = append(p.moduleList, &ModuleDB{})
 	p.moduleList = append(p.moduleList, &ModulePrometheus{})
-	p.moduleList = append(p.moduleList, &ModuleWebServer{})
+	p.moduleList = append(p.moduleList, &ModuleGrpcGateway{})
 	p.moduleList = append(p.moduleList, &ModuleWebsocketServer{})
 	p.moduleList = append(p.moduleList, &ModuleGrpcServer{})
 

Server/gateway/app/grpc.go

@@ -3,7 +3,7 @@ package app
 import (
 	"common/net/grpc/service"
 	"gateway/config"
-	"gateway/grpc_server/server"
+	"gateway/internal/grpc_server/server"
 )
 
 // ModuleGrpcServer Grpc服务模块

Server/gateway/app/grpc_gateway.go

@@ -0,0 +1,63 @@
+package app
+
+import (
+	"common/log"
+	"common/net/grpc/service"
+	"common/proto/ss/grpc_pb"
+	"context"
+	"errors"
+	"fmt"
+	"gateway/config"
+	"gateway/internal/net/http_gateway"
+	"net/http"
+	"sync"
+)
+
+// ModuleGrpcGateway GrpcGateway服务模块
+type ModuleGrpcGateway struct {
+	wg *sync.WaitGroup
+	// 微服务列表
+	services []service.IService
+	server   *http.Server
+}
+
+func (m *ModuleGrpcGateway) init() error {
+	m.wg = &sync.WaitGroup{}
+	return nil
+}
+
+func (m *ModuleGrpcGateway) start() error {
+	m.wg.Add(1)
+	go func() {
+		defer m.wg.Done()
+		conn, err := service.UserNewClientLB()
+		if err != nil {
+			log.Errorf("get user conn failed: %v", err)
+			return
+		}
+
+		gwMux := http_gateway.InitServeMux()
+		if err = grpc_pb.RegisterUserHandlerClient(context.Background(), gwMux, conn); err != nil {
+			log.Errorf("RegisterUserHandlerClient err: %v", err)
+			return
+		}
+
+		m.server = &http.Server{
+			Addr:    fmt.Sprintf("%v:%v", config.Get().Serve.Http.Address, config.Get().Serve.Http.Port),
+			Handler: http_gateway.InitRouter(gwMux),
+		}
+		if err := m.server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
+			log.Errorf("http server failed: %v", err.Error())
+		}
+		log.Infof("http server stop.")
+	}()
+	return nil
+}
+
+func (m *ModuleGrpcGateway) stop() error {
+	if err := m.server.Shutdown(context.Background()); err != nil {
+		log.Errorf("stop http server failed: %v", err)
+	}
+	m.wg.Wait()
+	return nil
+}

Server/gateway/app/web.go

@@ -1,50 +0,0 @@
-package app
-
-import (
-	"common/log"
-	"context"
-	"errors"
-	"fmt"
-	"gateway/config"
-	"gateway/net/http_gateway"
-	"github.com/gin-gonic/gin"
-	"net/http"
-	"sync"
-)
-
-// ModuleWebServer Web服务模块
-type ModuleWebServer struct {
-	wg     *sync.WaitGroup
-	server *http.Server
-	router *gin.Engine
-}
-
-func (m *ModuleWebServer) init() error {
-	m.wg = &sync.WaitGroup{}
-	m.router = http_gateway.InitRouter()
-	return nil
-}
-
-func (m *ModuleWebServer) start() error {
-	m.wg.Add(1)
-	go func() {
-		defer m.wg.Done()
-		m.server = &http.Server{
-			Addr:    fmt.Sprintf("%v:%v", config.Get().Serve.Http.Address, config.Get().Serve.Http.Port),
-			Handler: m.router,
-		}
-		if err := m.server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
-			log.Errorf("http server failed: %v", err.Error())
-		}
-		log.Infof("http server stop.")
-	}()
-	return nil
-}
-
-func (m *ModuleWebServer) stop() error {
-	if err := m.server.Shutdown(context.Background()); err != nil {
-		log.Errorf("stop http server failed: %v", err)
-	}
-	m.wg.Wait()
-	return nil
-}

Server/gateway/app/websocket.go

@@ -5,7 +5,7 @@ import (
 	"common/net/socket/websocket"
 	"fmt"
 	"gateway/config"
-	"gateway/net/ws_gateway"
+	"gateway/internal/net/ws_gateway"
 	"sync"
 	"time"
 )