From e5ba0010800695a27b840a551e9db7cfbc044dcb Mon Sep 17 00:00:00 2001
From: liangzai <2440983361@qq.com>
Date: Wed, 2 Oct 2024 13:50:26 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dgateway=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E4=B8=B4=E6=97=B6=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=E3=80=822=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddocker=20etcd=E7=94=9F=E4=BA=A7=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E8=BF=9E=E6=8E=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/api/internal/service/west_dex_service.go |   7 +-
 apps/gateway/Dockerfile                       |   2 +
 docker-compose-dev.yml                        | 113 ------------------
 docker-compose.yml                            |   3 +-
 4 files changed, 10 insertions(+), 115 deletions(-)

diff --git a/apps/api/internal/service/west_dex_service.go b/apps/api/internal/service/west_dex_service.go
index 2b568fc..fce1c81 100644
--- a/apps/api/internal/service/west_dex_service.go
+++ b/apps/api/internal/service/west_dex_service.go
@@ -71,7 +71,12 @@ func (w *WestDexService) CallAPI(code string, reqData map[string]interface{}) (r
 		logx.Errorf("【西部数据请求】发送请求错误: %v", err)
 		return nil, errors.New("业务异常")
 	}
-	defer httpResp.Body.Close()
+	defer func(Body io.ReadCloser) {
+		err := Body.Close()
+		if err != nil {
+
+		}
+	}(httpResp.Body)
 
 	// 检查请求是否成功
 	if httpResp.StatusCode == 200 {
diff --git a/apps/gateway/Dockerfile b/apps/gateway/Dockerfile
index 3038d44..90cdfaa 100644
--- a/apps/gateway/Dockerfile
+++ b/apps/gateway/Dockerfile
@@ -24,6 +24,8 @@ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifi
 COPY --from=builder /usr/share/zoneinfo/Asia/Shanghai /usr/share/zoneinfo/Asia/Shanghai
 ENV TZ Asia/Shanghai
 
+RUN mkdir -p /tmp && chmod 1777 /tmp
+
 WORKDIR /app
 COPY --from=builder /app/gateway /app/gateway
 COPY --from=builder /app/etc /app/etc
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 4882eb0..f0cfbaa 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -75,119 +75,6 @@ services:
       - tyapi_network
     restart: always
 
-  tyapi_gateway:
-    container_name: tyapi_gateway
-    build:
-      context: .
-      dockerfile: ./apps/gateway/Dockerfile
-    ports:
-      - "10001:10001"
-    environment:
-      - ENV=production
-    depends_on:
-      - tyapi_etcd
-      - tyapi_redis
-      - tyapi_mysql
-      - tyapi_user
-      - tyapi_sentinel
-    networks:
-      - tyapi_network
-    restart: always
-
-  tyapi_admin:
-    container_name: tyapi_admin
-    build:
-      context: .
-      dockerfile: ./apps/admin/Dockerfile
-    ports:
-      - "10002:10002"
-    environment:
-      - ENV=production
-    depends_on:
-      - tyapi_etcd
-      - tyapi_redis
-      - tyapi_mysql
-      - tyapi_user
-      - tyapi_sentinel
-    networks:
-      - tyapi_network
-    restart: always
-
-  tyapi_api:
-    container_name: tyapi_api
-    build:
-      context: .
-      dockerfile: ./apps/api/Dockerfile
-    ports:
-      - "10003:10003"
-    environment:
-      - ENV=production
-    depends_on:
-      - tyapi_etcd
-      - tyapi_redis
-      - tyapi_mysql
-      - tyapi_user
-      - tyapi_sentinel
-      - tyapi_mqs
-      - tyapi_kafka
-    networks:
-      - tyapi_network
-    restart: always
-
-  tyapi_mqs:
-    container_name: tyapi_mqs
-    build:
-      context: .
-      dockerfile: ./apps/mqs/Dockerfile
-    environment:
-      - ENV=production
-    ports:
-      - "12001:12001"
-    depends_on:
-      - tyapi_kafka
-      - tyapi_etcd
-      - tyapi_redis
-      - tyapi_user
-      - tyapi_sentinel
-    networks:
-      - tyapi_network
-    restart: always
-
-  tyapi_sentinel:
-    container_name: tyapi_sentinel
-    build:
-      context: .
-      dockerfile: ./apps/sentinel/Dockerfile
-    environment:
-      - ENV=production
-    depends_on:
-      - tyapi_redis
-      - tyapi_mysql
-      - tyapi_etcd
-    ports:
-      - "11002:11002"
-    networks:
-      - tyapi_network
-    restart: always
-
-  tyapi_user:
-    container_name: tyapi_user
-    build:
-      context: .
-      dockerfile: ./apps/user/Dockerfile
-    environment:
-      - ENV=production
-    ports:
-      - "11001:11001"
-    depends_on:
-      - tyapi_mysql
-      - tyapi_redis
-      - tyapi_etcd
-      - tyapi_sentinel
-    networks:
-      - tyapi_network
-    restart: always
-
 volumes:
   mysql_data:
     driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
index 6278808..f64dd12 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,8 @@ services:
     environment:
       - TZ=Asia/Shanghai
       - ALLOW_NONE_AUTHENTICATION=yes
-      - ETCD_ADVERTISE_CLIENT_URLS=http://127.0.0.1:2379
+      - ETCD_ADVERTISE_CLIENT_URLS=http://tyapi_etcd:2379
+      - ETCD_LISTEN_CLIENT_URLS=http://0.0.0.0:2379
     networks:
       - tyapi_network
     restart: always