From f91ddb3b3f8f498f46f114489c8ba4419e8f6b4d Mon Sep 17 00:00:00 2001
From: limqhz <lmq540344226@163.com>
Date: Wed, 3 Mar 2021 17:32:13 +0800
Subject: [PATCH] =?UTF-8?q?oss=20=E8=BD=AC=E5=85=AC=E5=85=B1=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/config/application-development.yml  |  8 --------
 .../main/resources/config/application-production.yml   |  9 ---------
 api/src/main/resources/config/application.yml          | 10 +++++++++-
 .../src/main/resources/config/application-dev.yml      |  8 --------
 .../src/main/resources/config/application-prod.yml     |  8 --------
 netty-pad/src/main/resources/config/application.yml    |  9 ++++++++-
 6 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/api/src/main/resources/config/application-development.yml b/api/src/main/resources/config/application-development.yml
index eca6316..98491db 100644
--- a/api/src/main/resources/config/application-development.yml
+++ b/api/src/main/resources/config/application-development.yml
@@ -18,11 +18,3 @@ spring:
 
   jpa:
     show-sql: true
-
-oss:
-  accessKeyId: LTAIlbtS4W2Xe4OV
-  accessKeySecret: qWMYkSfmXFtRoIv9q9OCbszcF9U7dX
-  protocol: http
-  name: smartvenue
-  endPoint: http://oss-cn-beijing.aliyuncs.com
-  url: https://smartvenue.oss-cn-beijing.aliyuncs.com/
\ No newline at end of file
diff --git a/api/src/main/resources/config/application-production.yml b/api/src/main/resources/config/application-production.yml
index c5d52da..518ed96 100644
--- a/api/src/main/resources/config/application-production.yml
+++ b/api/src/main/resources/config/application-production.yml
@@ -11,12 +11,3 @@ spring:
 
 #  jpa:
 #    show-sql: true
-
-
-oss:
-  accessKeyId: LTAIlbtS4W2Xe4OV
-  accessKeySecret: qWMYkSfmXFtRoIv9q9OCbszcF9U7dX
-  protocol: http
-  name: smartvenue
-  endPoint: http://oss-cn-beijing.aliyuncs.com
-  url: https://smartvenue.oss-cn-beijing.aliyuncs.com/
\ No newline at end of file
diff --git a/api/src/main/resources/config/application.yml b/api/src/main/resources/config/application.yml
index 85b19ec..74fc73c 100644
--- a/api/src/main/resources/config/application.yml
+++ b/api/src/main/resources/config/application.yml
@@ -72,6 +72,14 @@ mybatis:
   config-location: classpath:mybatis/mybatis-config.xml
   mapper-locations: classpath:mybatis/mapper/*/*.xml
 
+oss:
+  accessKeyId: LTAIlbtS4W2Xe4OV
+  accessKeySecret: qWMYkSfmXFtRoIv9q9OCbszcF9U7dX
+  protocol: http
+  name: smartvenue
+  endPoint: http://oss-cn-beijing.aliyuncs.com
+  url: https://smartvenue.oss-cn-beijing.aliyuncs.com/
+
 face:
 #  url: 192.168.1.111
   url: 23r3o72310.iask.in
@@ -98,4 +106,4 @@ so:
   keepalive: true
   backlog: 128
   reuseaddr: true
-tcp_nodelay: true
\ No newline at end of file
+tcp_nodelay: true
diff --git a/netty-pad/src/main/resources/config/application-dev.yml b/netty-pad/src/main/resources/config/application-dev.yml
index b28576f..7a5e801 100644
--- a/netty-pad/src/main/resources/config/application-dev.yml
+++ b/netty-pad/src/main/resources/config/application-dev.yml
@@ -6,11 +6,3 @@ spring:
 
   jpa:
     show-sql: true
-
-oss:
-  accessKeyId: LTAIlbtS4W2Xe4OV
-  accessKeySecret: qWMYkSfmXFtRoIv9q9OCbszcF9U7dX
-  protocol: http
-  name: smartvenue
-  endPoint: http://oss-cn-beijing.aliyuncs.com
-  url: https://smartvenue.oss-cn-beijing.aliyuncs.com/
\ No newline at end of file
diff --git a/netty-pad/src/main/resources/config/application-prod.yml b/netty-pad/src/main/resources/config/application-prod.yml
index bdd9b4a..f48ce47 100644
--- a/netty-pad/src/main/resources/config/application-prod.yml
+++ b/netty-pad/src/main/resources/config/application-prod.yml
@@ -7,11 +7,3 @@ spring:
 
   jpa:
     show-sql: true
-
-oss:
-  accessKeyId: LTAIlbtS4W2Xe4OV
-  accessKeySecret: qWMYkSfmXFtRoIv9q9OCbszcF9U7dX
-  protocol: http
-  name: smartvenue
-  endPoint: http://oss-cn-beijing.aliyuncs.com
-  url: https://smartvenue.oss-cn-beijing.aliyuncs.com/
\ No newline at end of file
diff --git a/netty-pad/src/main/resources/config/application.yml b/netty-pad/src/main/resources/config/application.yml
index c56fd2c..c085c23 100644
--- a/netty-pad/src/main/resources/config/application.yml
+++ b/netty-pad/src/main/resources/config/application.yml
@@ -72,6 +72,13 @@ mybatis:
   config-location: classpath:mybatis/mybatis-config.xml
   mapper-locations: classpath:mybatis/mapper/*/*.xml
 
+oss:
+  accessKeyId: LTAIlbtS4W2Xe4OV
+  accessKeySecret: qWMYkSfmXFtRoIv9q9OCbszcF9U7dX
+  protocol: http
+  name: smartvenue
+  endPoint: http://oss-cn-beijing.aliyuncs.com
+  url: https://smartvenue.oss-cn-beijing.aliyuncs.com/
 
 face:
   url: 192.168.1.111
@@ -101,4 +108,4 @@ logging:
   level:
     com:
       sv:
-        mapper: DEBUG
\ No newline at end of file
+        mapper: DEBUG