From 63dfd0f7722e5e61e300aa71070dd6a86dc16c1d Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 29 八月 2024 16:12:50 +0800
Subject: [PATCH] 添加se-file
---
docker-compose/file/bootstrap.yml | 25 ++++++++++++
docker-compose/mysql/initdb/se_config_20231204.sql | 2
docker-compose/nginx/conf/nginx.conf | 9 ++++
docker-compose/docker-compose.yml | 31 +++++++++++----
4 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index ffd797f..434bca5 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -36,8 +36,8 @@
- ./nacos/conf/application.properties:/home/nacos/conf/application.properties
ports:
- 8848:8848
- - 9848:9848
- - 9849:9849
+# - 9848:9848
+# - 9849:9849
depends_on:
- se-mysql
networks:
@@ -58,8 +58,8 @@
# gateway
se-gateway:
image: openjdk:8-jre
- ports:
- - 9204:8080
+# ports:
+# - 9204:8080
volumes:
- ./gateway:/data
environment:
@@ -77,8 +77,8 @@
# auth
se-auth:
image: openjdk:8-jre
- ports:
- - 9200:9200
+# ports:
+# - 9200:9200
volumes:
- ./auth:/data
environment:
@@ -93,8 +93,8 @@
# system
se-system:
image: openjdk:8-jre
- ports:
- - 9201:9201
+# ports:
+# - 9201:9201
volumes:
- ./system:/data
environment:
@@ -107,6 +107,21 @@
networks:
- network-se
restart: always
+ # se-file
+ se-file:
+ image: openjdk:8-jre
+# ports:
+# - 9300:9300
+ volumes:
+ - ./file:/data
+ environment:
+ TZ: Asia/Shanghai
+ entrypoint: java -jar /data/se-modules-file.jar --spring.config.location=file:/data/
+ depends_on:
+ - se-nacos
+ networks:
+ - network-se
+ restart: always
# nginx
se-nginx:
image: nginx:latest
diff --git a/docker-compose/file/bootstrap.yml b/docker-compose/file/bootstrap.yml
new file mode 100644
index 0000000..10e6f14
--- /dev/null
+++ b/docker-compose/file/bootstrap.yml
@@ -0,0 +1,25 @@
+# Tomcat
+server:
+ port: 9300
+
+# Spring
+spring:
+ application:
+ # 搴旂敤鍚嶇О
+ name: se-file
+ 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/mysql/initdb/se_config_20231204.sql b/docker-compose/mysql/initdb/se_config_20231204.sql
index abf0c60..79ed49f 100644
--- a/docker-compose/mysql/initdb/se_config_20231204.sql
+++ b/docker-compose/mysql/initdb/se_config_20231204.sql
@@ -40,7 +40,7 @@
(5,'se-system-dev.yml','DEFAULT_GROUP','# spring閰嶇疆\nspring:\n redis:\n host: se-redis\n port: 6379\n password: Redis_s!E_6.2.6\n datasource:\n druid:\n stat-view-servlet:\n enabled: false\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 涓诲簱鏁版嵁婧怽n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://se-mysql:3306/se-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: My_Sql_s!E_v5.7\n # 浠庡簱鏁版嵁婧怽n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis閰嶇疆\nmybatis:\n # 鎼滅储鎸囧畾鍖呭埆鍚峔n typeAliasesPackage: com.se.system\n # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger閰嶇疆\nswagger:\n title: 绯荤粺妯″潡鎺ュ彛鏂囨。\n license: Powered By se','00678c89684ec0b825cb9b71e032db64','2020-11-20 00:00:00','2023-12-04 07:51:28','nacos','0:0:0:0:0:0:0:1','','','绯荤粺妯″潡','null','null','yaml','',''),
(6,'se-gen-dev.yml','DEFAULT_GROUP','# spring閰嶇疆\nspring:\n redis:\n host: se-redis\n port: 6379\n password: Redis_s!E_6.2.6\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://se-mysql:3306/se-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: My_Sql_s!E_v5.7\n\n# mybatis閰嶇疆\nmybatis:\n # 鎼滅储鎸囧畾鍖呭埆鍚峔n typeAliasesPackage: com.se.gen.domain\n # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger閰嶇疆\nswagger:\n title: 浠ｇ爜鐢熸垚鎺ュ彛鏂囨。\n # 浠ｇ爜鐢熸垚\ngen:\n # 浣滆�匼n author: se\n # 榛樿鐢熸垚鍖呰矾寰� system 闇�鏀规垚鑷繁鐨勬ā鍧楀悕绉� 濡� system monitor tool\n packageName: com.se.system\n # 鑷姩鍘婚櫎琛ㄥ墠缂�锛岄粯璁ゆ槸false\n autoRemovePre: false\n # 琛ㄥ墠缂�锛堢敓鎴愮被鍚嶄笉浼氬寘鍚〃鍓嶇紑锛屽涓敤閫楀彿鍒嗛殧锛塡n tablePrefix: sys_\n','eb592420b3fceae1402881887b8a6a0d','2020-11-20 00:00:00','2022-09-29 02:49:42','nacos','0:0:0:0:0:0:0:1','','','浠ｇ爜鐢熸垚','null','null','yaml','',''),
(7,'se-job-dev.yml','DEFAULT_GROUP','# spring閰嶇疆\nspring:\n redis:\n host: se-redis\n port: 6379\n password: Redis_s!E_6.2.6\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://se-mysql:3306/se-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: My_Sql_s!E_v5.7\n\n# mybatis閰嶇疆\nmybatis:\n # 鎼滅储鎸囧畾鍖呭埆鍚峔n typeAliasesPackage: com.se.job.domain\n # 閰嶇疆mapper鐨勬壂鎻忥紝鎵惧埌鎵�鏈夌殑mapper.xml鏄犲皠鏂囦欢\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger閰嶇疆\nswagger:\n title: 瀹氭椂浠诲姟鎺ュ彛鏂囨。\n ','edcf0e3fe13fea07b4ec08b1088f30b3','2020-11-20 00:00:00','2022-09-29 02:50:50','nacos','0:0:0:0:0:0:0:1','','','瀹氭椂浠诲姟','null','null','yaml','',''),
-(8,'se-file-dev.yml','DEFAULT_GROUP','# 鏈湴鏂囦欢涓婁紶 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/se/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS閰嶇疆\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio閰嶇疆\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','鏂囦欢鏈嶅姟','null','null','yaml',NULL,''),
+(8,'se-file-dev.yml','DEFAULT_GROUP','# 鏈湴鏂囦欢涓婁紶 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: /data/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS閰嶇疆\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio閰嶇疆\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','鏂囦欢鏈嶅姟','null','null','yaml',NULL,''),
(9,'sentinel-se-gateway','DEFAULT_GROUP','[\r\n {\r\n \"resource\": \"se-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"se-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"se-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"se-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]','9f3a3069261598f74220bc47958ec252','2020-11-20 00:00:00','2020-11-20 00:00:00',NULL,'0:0:0:0:0:0:0:1','','','闄愭祦绛栫暐','null','null','json',NULL,'');
diff --git a/docker-compose/nginx/conf/nginx.conf b/docker-compose/nginx/conf/nginx.conf
index e3efd20..47c0c36 100644
--- a/docker-compose/nginx/conf/nginx.conf
+++ b/docker-compose/nginx/conf/nginx.conf
@@ -31,6 +31,15 @@
try_files $uri $uri/ /sys/;
#index index.html index.htm;
}
+
+ location /se-file/ {
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header REMOTE-HOST $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+ proxy_pass http://se-file:9300/;
+ }
location /prod-api/ {
proxy_set_header Host $http_host;
--
Gitblit v1.9.3