From 83eb40bee299c1112d4d361d5b95ce46966dc839 Mon Sep 17 00:00:00 2001
From: cfl <chaifulai@163.com>
Date: Tue, 31 Oct 2023 14:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=94=B9=E4=B8=BA=E5=86=99=E6=AD=BB=E5=9C=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/oss/config/CloudStorageConfigService.java | 23 +++++++++++++++++++---
 talkonlineweb/src/main/resources/oss.properties    | 19 ------------------
 2 files changed, 20 insertions(+), 22 deletions(-)
 delete mode 100644 talkonlineweb/src/main/resources/oss.properties

diff --git a/oss/src/main/java/com/lyms/oss/config/CloudStorageConfigService.java b/oss/src/main/java/com/lyms/oss/config/CloudStorageConfigService.java
index 5df6094..6515cea 100644
--- a/oss/src/main/java/com/lyms/oss/config/CloudStorageConfigService.java
+++ b/oss/src/main/java/com/lyms/oss/config/CloudStorageConfigService.java
@@ -8,11 +8,28 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
 
 @Component
-@PropertySource(value = "classpath:oss.properties")
 public class CloudStorageConfigService {
 
-    @Value("${oss.config}")
-    private String ossConfig;
+    //@Value("${oss.config}")
+    private String ossConfig = "{ \\\n" +
+            "\"type\": 1,\\\n" +
+            "\"qiniuDomain\": \"http://up.qiniup.com\",\\\n" +
+            "\"qiniuPrefix\": \"talk\",\\\n" +
+            "\"qiniuAccessKey\": \"hZgfmtYjqtz1UC96gy4uatu5FmyvtoPULkUB9QgA\",\\\n" +
+            "\"qiniuSecretKey\": \"xLD30JhNUkoNNafRL3U4ncMzoOJwSj1EaXAUY-si\",\\\n" +
+            "\"qiniuBucketName\": \"mommybaby\",\\\n" +
+            "\"aliyunDomain\": \"\",\\\n" +
+            "\"aliyunPrefix\": \"\",\\\n" +
+            "\"aliyunEndPoint\": \"\",\\\n" +
+            "\"aliyunAccessKeyId\": \"\",\\\n" +
+            "\"aliyunAccessKeySecret\": \"\",\\\n" +
+            "\"aliyunBucketName\": \"\",\\\n" +
+            "\"qcloudDomain\": \"\",\\\n" +
+            "\"qcloudPrefix\": \"\",\\\n" +
+            "\"qcloudSecretId\": \"\",\\\n" +
+            "\"qcloudSecretKey\": \"\",\\\n" +
+            "\"qcloudBucketName\": \"\"\\\n" +
+            "}";
 
 
 
diff --git a/talkonlineweb/src/main/resources/oss.properties b/talkonlineweb/src/main/resources/oss.properties
deleted file mode 100644
index aee3117..0000000
--- a/talkonlineweb/src/main/resources/oss.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-oss.config = { \
-"type": 1,\
-"qiniuDomain": "http://up.qiniup.com",\
-"qiniuPrefix": "talk",\
-"qiniuAccessKey": "hZgfmtYjqtz1UC96gy4uatu5FmyvtoPULkUB9QgA",\
-"qiniuSecretKey": "xLD30JhNUkoNNafRL3U4ncMzoOJwSj1EaXAUY-si",\
-"qiniuBucketName": "mommybaby",\
-"aliyunDomain": "",\
-"aliyunPrefix": "",\
-"aliyunEndPoint": "",\
-"aliyunAccessKeyId": "",\
-"aliyunAccessKeySecret": "",\
-"aliyunBucketName": "",\
-"qcloudDomain": "",\
-"qcloudPrefix": "",\
-"qcloudSecretId": "",\
-"qcloudSecretKey": "",\
-"qcloudBucketName": ""\
-}
\ No newline at end of file
-- 
1.8.3.1