refactor: clean up code

Author: Cooooing

app/gateway/internal/server/http.go

@@ -12,7 +12,6 @@ import (
 	"gateway/internal/service"
 	"io"
 	"net/http"
-	"net/url"
 	"strings"
 
 	"github.com/go-kratos/kratos/contrib/middleware/validate/v2"
@@ -53,12 +52,6 @@ func NewHTTPServer(c *conf.Bootstrap, logger log.Logger, consulClient *client.Co
 		transporthttp.ResponseEncoder(pkg.HttpResponseEncoder),
 		transporthttp.ErrorEncoder(pkg.HttpErrorEncoder),
 	}
-	if c.Server.RegisterAddress != "" {
-		opts = append(opts, transporthttp.Endpoint(&url.URL{
-			Scheme: "http",
-			Host:   fmt.Sprintf("%s:%d", c.Server.RegisterAddress, c.Server.Http.Port),
-		}))
-	}
 	if c.Server.Http.Network != "" {
 		opts = append(opts, transporthttp.Network(c.Server.Http.Network))
 	}

deploy/infra-compose.yml

@@ -2,6 +2,12 @@ version: "3.9"
 
 name: bass-infra
 
+# docker network create bass
+networks:
+  bass:
+    driver: bridge
+    external: true
+
 services:
   postgres:
     image: postgres:18.0
@@ -13,6 +19,8 @@ services:
       - "5432:5432"
     volumes:
       - postgres_data:/var/lib/postgresql18/data
+    networks:
+      - bass
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U $$POSTGRES_USER" ]
       interval: 30s
@@ -30,6 +38,8 @@ services:
       - "6379:6379"
     volumes:
       - redis_data:/data
+    networks:
+      - bass
     healthcheck:
       test: [ "CMD", "redis-cli", "-a", "${REDIS_PASSWORD}", "ping" ]
       interval: 30s
@@ -47,14 +57,16 @@ services:
       - "15672:15672"
     volumes:
       - rabbitmq_data:/var/lib/rabbitmq
+    networks:
+      - bass
     healthcheck:
       test: [ "CMD", "rabbitmq-diagnostics", "ping" ]
       interval: 30s
       timeout: 10s
       retries: 5
 
   consul:
-    image: hashicorp/consul:1.16
+    image: hashicorp/consul:1.22.3
     container_name: consul
     restart: always
     env_file:
@@ -85,6 +97,8 @@ services:
       - "8600:8600/udp"
     volumes:
       - consul_data:/consul/data
+    networks:
+      - bass
     healthcheck:
       test: [ "CMD", "consul", "info", "-token=${CONSUL_ACL_MASTER_TOKEN}" ]
       interval: 10s

deploy/service-compose.yml

@@ -3,8 +3,9 @@ version: '3.9'
 name: bass-application
 
 networks:
-  microservice:
+  bass:
     driver: bridge
+    external: true
 
 services:
   treble:
@@ -16,7 +17,7 @@ services:
     ports:
       - "2324:2324"
     networks:
-      - microservice
+      - bass
 
   gateway:
     image: registry.cn-hangzhou.aliyuncs.com/docker-cooooing/gateway:latest
@@ -28,7 +29,7 @@ services:
       - "8000:8000"
       - "9000:9000"
     networks:
-      - microservice
+      - bass
 
   infra:
     image: registry.cn-hangzhou.aliyuncs.com/docker-cooooing/infra:latest
@@ -40,7 +41,7 @@ services:
       - "8001:8000"
       - "9001:9000"
     networks:
-      - microservice
+      - bass
 
   user:
     image: registry.cn-hangzhou.aliyuncs.com/docker-cooooing/user:latest
@@ -52,7 +53,7 @@ services:
       - "8002:8000"
       - "9002:9000"
     networks:
-      - microservice
+      - bass
 
   content:
     image: registry.cn-hangzhou.aliyuncs.com/docker-cooooing/content:latest
@@ -64,7 +65,7 @@ services:
       - "8003:8000"
       - "9003:9000"
     networks:
-      - microservice
+      - bass
 
   notify:
     image: registry.cn-hangzhou.aliyuncs.com/docker-cooooing/notify:latest
@@ -76,7 +77,7 @@ services:
       - "8004:8000"
       - "9004:9000"
     networks:
-      - microservice
+      - bass
 
   im:
     image: registry.cn-hangzhou.aliyuncs.com/docker-cooooing/im:latest
@@ -88,7 +89,7 @@ services:
       - "8005:8000"
       - "9005:9000"
     networks:
-      - microservice
+      - bass
 
   signal:
     image: registry.cn-hangzhou.aliyuncs.com/docker-cooooing/signal:latest
@@ -100,7 +101,7 @@ services:
       - "8006:8000"
       - "9006:9000"
     networks:
-      - microservice
+      - bass
 
   connector:
     image: registry.cn-hangzhou.aliyuncs.com/docker-cooooing/connector:latest
@@ -112,4 +113,4 @@ services:
       - "8007:8000"
       - "9007:9000"
     networks:
-      - microservice
+      - bass