From c7ca1ba0d2fcaf5e52800fc86ee466da3aa882a1 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 21 十一月 2024 11:30:20 +0800
Subject: [PATCH] 1
---
docker-compose/auth/bootstrap.yml | 2
docker-compose/system/bootstrap.yml | 2
docker-compose/nginx/conf/nginx.conf | 3
说明.txt | 22 ++++-
docker-compose/docker-compose_241121.yml | 169 ++++++++++++++++++++++++++++++++++++++++++
docker-compose/docker-compose.yml | 39 ---------
6 files changed, 193 insertions(+), 44 deletions(-)
diff --git a/docker-compose/auth/bootstrap.yml b/docker-compose/auth/bootstrap.yml
index 954c38f..c56d6ac 100644
--- a/docker-compose/auth/bootstrap.yml
+++ b/docker-compose/auth/bootstrap.yml
@@ -25,4 +25,4 @@
# 鍏变韩閰嶇疆
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-enableEncrypt: true
\ No newline at end of file
+enableEncrypt: false
\ No newline at end of file
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 4eff45d..50ea4ba 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -67,31 +67,13 @@
- ./gateway:/data
environment:
TZ: Asia/Shanghai
- entrypoint: java -jar /data/se-gateway.jar --spring.config.location=file:/data/
+ entrypoint: /bin/sh -c "sleep 25 && java -jar /data/se-gateway.jar --spring.config.location=file:/data/"
depends_on:
- se-redis
- se-mysql
- se-nacos
# links:
# - se-redis
- networks:
- - network-se
- restart: always
- # auth
- se-auth:
- image: openjdk:8-jre
-# ports:
-# - 9200:9200
- volumes:
- - ./auth/logs:/logs
- - ./auth:/data
- environment:
- TZ: Asia/Shanghai
- entrypoint: java -jar /data/se-auth.jar --spring.config.location=file:/data/
- depends_on:
- - se-redis
- - se-mysql
- - se-nacos
networks:
- network-se
restart: always
@@ -105,26 +87,9 @@
- ./system:/data
environment:
TZ: Asia/Shanghai
- entrypoint: java -jar /data/se-modules-system.jar --spring.config.location=file:/data/
+ entrypoint: /bin/sh -c "sleep 30 && java -jar /data/se-modules-system.jar --spring.config.location=file:/data/"
depends_on:
- se-redis
- - se-mysql
- - se-nacos
- networks:
- - network-se
- restart: always
- # se-file
- se-file:
- image: openjdk:8-jre
-# ports:
-# - 9300:9300
- volumes:
- - ./file/logs:/logs
- - ./file:/data
- environment:
- TZ: Asia/Shanghai
- entrypoint: java -jar /data/se-modules-file.jar --spring.config.location=file:/data/
- depends_on:
- se-mysql
- se-nacos
networks:
diff --git a/docker-compose/docker-compose_241121.yml b/docker-compose/docker-compose_241121.yml
new file mode 100644
index 0000000..4eff45d
--- /dev/null
+++ b/docker-compose/docker-compose_241121.yml
@@ -0,0 +1,169 @@
+version : '3.8'
+services:
+ # mysql
+ se-mysql:
+ image: mysql:5.7
+ ports:
+ - 3307:3306
+ volumes:
+ - ./mysql/logs:/logs
+ - ./mysql/data:/var/lib/mysql
+ - ./mysql/conf:/etc/mysql/conf.d
+ - ./mysql/initdb:/docker-entrypoint-initdb.d
+ command: [
+ 'mysqld',
+ '--innodb-buffer-pool-size=80M',
+ '--character-set-server=utf8mb4',
+ '--collation-server=utf8mb4_unicode_ci',
+ '--default-time-zone=+8:00',
+ '--lower-case-table-names=1'
+ ]
+ environment:
+ TZ: Asia/Shanghai
+ MYSQL_DATABASE: 'se-cloud'
+ MYSQL_ROOT_PASSWORD: My_Sql_s!E_v5.7
+ networks:
+ - network-se
+ restart: always
+ # nacos
+ se-nacos:
+ image: nacos/nacos-server:v2.4.1
+ environment:
+ MODE: standalone
+ TZ: Asia/Shanghai
+ volumes:
+ - ./nacos/logs/:/home/nacos/logs
+ - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
+ ports:
+# - 7848:7848
+ - 8848:8848
+ - 9848:9848
+# - 9849:9849
+ depends_on:
+ - se-mysql
+ networks:
+ - network-se
+ restart: always
+ # redis
+ se-redis:
+ image: redis:latest
+ ports:
+ - 6379:6379
+ volumes:
+ - ./redis/data/redis.conf:/data/redis.conf
+ - ./redis/data:/data
+ command: redis-server /data/redis.conf
+# command: redis-server --requirepass Redis_s!E_6.2.6
+ networks:
+ - network-se
+ restart: always
+ # gateway
+ se-gateway:
+ image: openjdk:8-jre
+# ports:
+# - 9204:8080
+ volumes:
+ - ./gateway/logs:/logs
+ - ./gateway:/data
+ environment:
+ TZ: Asia/Shanghai
+ entrypoint: java -jar /data/se-gateway.jar --spring.config.location=file:/data/
+ depends_on:
+ - se-redis
+ - se-mysql
+ - se-nacos
+# links:
+# - se-redis
+ networks:
+ - network-se
+ restart: always
+ # auth
+ se-auth:
+ image: openjdk:8-jre
+# ports:
+# - 9200:9200
+ volumes:
+ - ./auth/logs:/logs
+ - ./auth:/data
+ environment:
+ TZ: Asia/Shanghai
+ entrypoint: java -jar /data/se-auth.jar --spring.config.location=file:/data/
+ depends_on:
+ - se-redis
+ - se-mysql
+ - se-nacos
+ networks:
+ - network-se
+ restart: always
+ # system
+ se-system:
+ image: openjdk:8-jre
+# ports:
+# - 9201:9201
+ volumes:
+ - ./system/logs:/logs
+ - ./system:/data
+ environment:
+ TZ: Asia/Shanghai
+ entrypoint: java -jar /data/se-modules-system.jar --spring.config.location=file:/data/
+ depends_on:
+ - se-redis
+ - se-mysql
+ - se-nacos
+ networks:
+ - network-se
+ restart: always
+ # se-file
+ se-file:
+ image: openjdk:8-jre
+# ports:
+# - 9300:9300
+ volumes:
+ - ./file/logs:/logs
+ - ./file:/data
+ environment:
+ TZ: Asia/Shanghai
+ entrypoint: java -jar /data/se-modules-file.jar --spring.config.location=file:/data/
+ depends_on:
+ - se-mysql
+ - se-nacos
+ networks:
+ - network-se
+ restart: always
+ # se-wgcloud
+ se-wgcloud:
+ image: openjdk:8-jre
+ ports:
+ - 9999:9999
+ volumes:
+ - ./wgcloud/logs:/log
+ - ./wgcloud:/data
+ environment:
+ TZ: Asia/Shanghai
+ entrypoint: java -jar /data/wgcloud-server-release.jar --spring.config.location=file:/data/
+ depends_on:
+ - se-mysql
+ networks:
+ - network-se
+ 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
+ - ./nginx/html:/usr/share/nginx/html
+ - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
+ depends_on:
+ - se-gateway
+ networks:
+ - network-se
+ restart: always
+# networks
+networks:
+ network-se:
+ driver: bridge
diff --git a/docker-compose/nginx/conf/nginx.conf b/docker-compose/nginx/conf/nginx.conf
index 7582db2..883ed22 100644
--- a/docker-compose/nginx/conf/nginx.conf
+++ b/docker-compose/nginx/conf/nginx.conf
@@ -38,7 +38,8 @@
proxy_set_header REMOTE-HOST $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_pass http://se-file:9300/;
+ #proxy_pass http://se-file:9300/;
+ proxy_pass http://se-system:9201/;
}
location /prod-api/ {
diff --git a/docker-compose/system/bootstrap.yml b/docker-compose/system/bootstrap.yml
index 25621a5..2a1984f 100644
--- a/docker-compose/system/bootstrap.yml
+++ b/docker-compose/system/bootstrap.yml
@@ -25,4 +25,4 @@
# 鍏变韩閰嶇疆
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-enableEncrypt: true
\ No newline at end of file
+enableEncrypt: false
\ No newline at end of file
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index 2e7370f..7d79468 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -1,6 +1,21 @@
-se-system-dev.yml锛屾坊鍔�
+http://192.168.11.203:8090/sso/login
+http://192.168.11.203:8848/nacos锛宯Acos_!9#_admIn
-# 鏈湴鏂囦欢涓婁紶
+
+
+docker-compose logs -f -n 50 se-system
+
+se-gateway-dev.yml锛屼慨鏀�
+--------------------------------------------------------
+uri: lb://se-auth 鈫� uri: lb://se-system
+
+uri: lb://se-file 鈫� uri: lb://se-system
+
+--------------------------------------------------------
+
+se-system-dev.yml锛屾坊鍔�
+--------------------------------------------------------
+# 鏈湴鏂囦欢涓婁紶
file:
domain: http://127.0.0.1:9300
path: D:/se/uploadPath
@@ -19,5 +34,4 @@
accessKey: minioadmin
secretKey: minioadmin
bucketName: test
-
-
+--------------------------------------------------------
--
Gitblit v1.9.3