From 491f304a04b8fe8d0f523286ce1871acc897ff27 Mon Sep 17 00:00:00 2001
From: Administrator <zyb2514@126.com>
Date: Fri, 10 May 2024 10:32:59 +0800
Subject: [PATCH] new

---
 .gitlab-ci.yml                              |  6 ++--
 docker-compose.yml                          | 31 +++++++++++++++++++--
 gateway/src/main/resources/application.yml  |  4 +--
 library/src/main/resources/application.yaml |  4 +--
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df805e0..c65392b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,10 +8,10 @@ build:
   stage: build
   script:
     - mvn clean package
-    - docker build -t library ./library
-    - docker build -t gateway ./gateway
+    - sudo docker build -t library ./library
+    - sudo docker build -t gateway ./gateway
 
 deploy:
   stage: deploy
   script:
-    - docker-compose up -d
+    - sudo docker-compose up -d
diff --git a/docker-compose.yml b/docker-compose.yml
index 0b9ff22..37b7aca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,17 +17,32 @@ services:
     image: nacos/nacos-server:2.0.2
     networks:
       - mynetwork
+    environment:
+      MODE: "standalone"
+
+
   library:
-    image: library
+    image: openjdk:8-jdk-alpine
+    volumes:
+      - ./library/target/library-0.0.1-SNAPSHOT.jar:/app/library-0.0.1-SNAPSHOT.jar
     environment:
       MYSQL_HOST: mysql
       REDIS_HOST: redis
       NACOS_HOST: nacos
     networks:
       - mynetwork
+    ports:
+      - 9200:8080
+    depends_on:
+      - nacos
+      - mysql
+      - redis
+    command:
+      - java -jar /app/library-0.0.1-SNAPSHOT.jar
+
 
   gateway:
-      image: gateway
+      image: openjdk:8-jdk-alpine
       environment:
         MYSQL_HOST: mysql
         REDIS_HOST: redis
@@ -35,6 +50,16 @@ services:
       networks:
         - mynetwork
       ports:
-        - 9000:9000
+        - 9100:8080
+      depends_on:
+        - nacos
+        - mysql
+        - redis
+      volumes:
+        - ./gateway/target/gateway-1.0-SNAPSHOT.jar:/app/gateway-1.0-SNAPSHOT.jar
+      command:
+        - java -jar /app/gateway-1.0-SNAPSHOT.jar
+
+
 networks:
   mynetwork:
diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
index e07499d..6e129a7 100644
--- a/gateway/src/main/resources/application.yml
+++ b/gateway/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 9000
+  port: 8080
 
 spring:
   application:
@@ -11,7 +11,7 @@ spring:
     gateway:
       routes:
         - id: demo-one
-          uri: lb://libirary-service
+          uri: lb://library-service
           predicates:
             - Path=/**
 #          predicates:
diff --git a/library/src/main/resources/application.yaml b/library/src/main/resources/application.yaml
index 4b042ea..3f67878 100644
--- a/library/src/main/resources/application.yaml
+++ b/library/src/main/resources/application.yaml
@@ -1,5 +1,5 @@
 server:
-  port: 9090
+  port: 8080
 
 spring:
   datasource:
@@ -10,7 +10,7 @@ spring:
 
 
   application:
-    name: libirary-service
+    name: library-service
 
   cloud:
     nacos: