From a38cd4fc32a99f95dfa9d8b4c304dc832a8e8331 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 20 八月 2024 15:11:48 +0800
Subject: [PATCH] 11

---
 docker-compose/auth/bootstrap.yml    |   25 ++++++++
 docker-compose/system/bootstrap.yml  |   25 ++++++++
 docker-compose/gateway/bootstrap.yml |   40 +++++++++++++
 docker-compose/docker-compose.yml    |   34 +++++++----
 4 files changed, 111 insertions(+), 13 deletions(-)

diff --git a/docker-compose/auth/bootstrap.yml b/docker-compose/auth/bootstrap.yml
new file mode 100644
index 0000000..0ca30e2
--- /dev/null
+++ b/docker-compose/auth/bootstrap.yml
@@ -0,0 +1,25 @@
+# Tomcat
+server: 
+  port: 9200
+
+# Spring
+spring: 
+  application:
+    # 搴旂敤鍚嶇О
+    name: se-auth
+  profiles:
+    # 鐜閰嶇疆
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 鏈嶅姟娉ㄥ唽鍦板潃
+        server-addr: se-nacos:8848
+      config:
+        # 閰嶇疆涓績鍦板潃
+        server-addr: se-nacos:8848
+        # 閰嶇疆鏂囦欢鏍煎紡
+        file-extension: yml
+        # 鍏变韩閰嶇疆
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 139141c..6323696 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -19,13 +19,16 @@
           '--lower-case-table-names=1'
         ]
     environment:
+      TZ: Asia/Shanghai
       MYSQL_DATABASE: 'se-cloud'
       MYSQL_ROOT_PASSWORD: My_Sql_s!E_v5.7
+    restart: always
   # nacos
   se-nacos:
-    image: nacos/nacos-server:2.3.2
+    image: nacos/nacos-server:v2.4.1
     environment:
-      - MODE=standalone
+      MODE: standalone
+      TZ: Asia/Shanghai
     volumes:
       - ./nacos/logs/:/home/nacos/logs
       - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
@@ -35,6 +38,7 @@
       - 9849:9849
     depends_on:
       - se-mysql
+    restart: always
   # redis
   se-redis:
     image: redis:latest
@@ -44,6 +48,7 @@
       - ./redis/data/redis.conf:/data/redis.conf
       - ./redis/data:/data
     command: redis-server /data/redis.conf
+    restart: always
   # gateway
   se-gateway:
     image: openjdk:8-jre
@@ -53,11 +58,14 @@
       - ./gateway:/data
     environment:
       TZ: Asia/Shanghai
-    entrypoint: java -jar /data/se-gateway.jar
+    entrypoint: java -jar /data/se-gateway.jar --spring.config.location=file:/data/
     depends_on:
       - se-redis
+      - se-nacos
     links:
       - se-redis
+      - se-nacos
+    restart: always
   # auth
   se-auth:
     image: openjdk:8-jre
@@ -67,13 +75,13 @@
       - ./auth:/data
     environment:
       TZ: Asia/Shanghai
-    entrypoint: java -jar /data/se-auth.jar
+    entrypoint: java -jar /data/se-auth.jar --spring.config.location=file:/data/
     depends_on:
       - se-redis
-    links:
-      - se-redis
+      - se-nacos
+    restart: always
   # system
-  se-modules-system:
+  se-system:
     image: openjdk:8-jre
     ports:
       - 9201:9201
@@ -81,18 +89,19 @@
       - ./system:/data
     environment:
       TZ: Asia/Shanghai
-    entrypoint: java -jar /data/se-modules-system.jar
+    entrypoint: java -jar /data/se-modules-system.jar --spring.config.location=file:/data/
     depends_on:
       - se-redis
+      - se-nacos
       - se-mysql
-    links:
-      - se-redis
-      - se-mysql
+    restart: always
   # nginx
   se-nginx:
     image: nginx:latest
     ports:
       - 8090:80
+    environment:
+      TZ: Asia/Shanghai
     volumes:
       - ./nginx/logs:/var/log/nginx
       - ./nginx/conf.d:/etc/nginx/conf.d
@@ -100,5 +109,4 @@
       - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
     depends_on:
       - se-gateway
-    links:
-      - se-gateway
+    restart: always
diff --git a/docker-compose/gateway/bootstrap.yml b/docker-compose/gateway/bootstrap.yml
new file mode 100644
index 0000000..5672f35
--- /dev/null
+++ b/docker-compose/gateway/bootstrap.yml
@@ -0,0 +1,40 @@
+# Tomcat
+server:
+  port: 8080
+
+# Spring
+spring: 
+  application:
+    # 搴旂敤鍚嶇О
+    name: se-gateway
+  profiles:
+    # 鐜閰嶇疆
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 鏈嶅姟娉ㄥ唽鍦板潃
+        server-addr: se-nacos:8848
+      config:
+        # 閰嶇疆涓績鍦板潃
+        server-addr: se-nacos:8848
+        # 閰嶇疆鏂囦欢鏍煎紡
+        file-extension: yml
+        # 鍏变韩閰嶇疆
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    sentinel:
+      # 鍙栨秷鎺у埗鍙版噿鍔犺浇
+      eager: true
+      transport:
+        # 鎺у埗鍙板湴鍧�
+        dashboard: 127.0.0.1:8718
+      # nacos閰嶇疆鎸佷箙鍖�
+      datasource:
+        ds1:
+          nacos:
+            server-addr: se-nacos:8848
+            dataId: sentinel-se-gateway
+            groupId: DEFAULT_GROUP
+            data-type: json
+            rule-type: gw-flow
diff --git a/docker-compose/system/bootstrap.yml b/docker-compose/system/bootstrap.yml
new file mode 100644
index 0000000..68120e5
--- /dev/null
+++ b/docker-compose/system/bootstrap.yml
@@ -0,0 +1,25 @@
+# Tomcat
+server:
+  port: 9201
+
+# Spring
+spring: 
+  application:
+    # 搴旂敤鍚嶇О
+    name: se-system
+  profiles:
+    # 鐜閰嶇疆
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 鏈嶅姟娉ㄥ唽鍦板潃
+        server-addr: se-nacos:8848
+      config:
+        # 閰嶇疆涓績鍦板潃
+        server-addr: se-nacos:8848
+        # 閰嶇疆鏂囦欢鏍煎紡
+        file-extension: yml
+        # 鍏变韩閰嶇疆
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

--
Gitblit v1.9.3