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