From 652fca264c2468782a2d5a4fbe21a13df448b91a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Mon, 22 Aug 2022 15:50:39 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
index fdbf22d..f7b67cb 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -50,8 +50,6 @@
cloud:
nacos:
discovery:
- # server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu
- # server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin
server-addr: http://192.168.0.52:8848
namespace: e07a2454-136b-4498-99eb-09dae3336ebe
username: gkhy_safeplatform_out
@@ -63,6 +61,9 @@
namespace: e07a2454-136b-4498-99eb-09dae3336ebe
username: gkhy_safeplatform_out
password: 9485uyJHISes09t
+
+ #是否允许跨域 true：允许；false：不允许
+ enableCors: true
mybatis-plus:
configuration:
@@ -99,12 +100,14 @@
minio:
endPoint: 192.168.0.52
- port: 9001
- accessKey: kH6eiQtNrWqGNb1r
- secretKey: ff5ykVUJJn0hi5PghsitdGNSsrW0Xrju
+ port: 9000
+ accessKey: oddER8eSv211WVG3
+ secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M
secure: false
- bucketName: szh-stu
+ bucketName: safeplatform-dev
urlPrefix: http://192.168.0.52/file
+ #用户名 gkhy_team_out_dev
+ #密码 12345678
token:
--
Gitblit v1.9.2