config update

Author: berry_cooper

src/main/java/com/berry/storage/BucketManage.java

@@ -48,7 +48,7 @@ public BucketManage(Auth auth, Config config) {
      * @return 列表
      */
     public List<BucketInfoVo> queryBucket(@Nullable String bucketName) {
-        String url = String.format("%s%s", config.defaultHost(), UrlFactory.BucketUr.list.getUrl());
+        String url = String.format("%s%s", config.getAddress(), UrlFactory.BucketUr.list.getUrl());
         StringMap params = new StringMap();
         params.putNotNull("name", bucketName);
         Response response = get(url, params.size() > 1 ? params : null);
@@ -98,7 +98,7 @@ public Boolean createBucket(String name, String region, @Nullable String acl) {
             }
             params.put("acl", acl);
         }
-        String url = String.format("%s%s", config.defaultHost(), UrlFactory.BucketUr.new_create_bucket.getUrl());
+        String url = String.format("%s%s", config.getAddress(), UrlFactory.BucketUr.new_create_bucket.getUrl());
         return getResult(url, params);
     }
 
@@ -113,7 +113,7 @@ public Boolean updateAcl(String bucket, String acl) {
         if (StringUtils.isAnyBlank(bucket, acl)) {
             throw new IllegalArgumentException("bucket and acl cannot be blank!");
         }
-        String url = String.format("%s%s", config.defaultHost(), UrlFactory.BucketUr.set_acl.getUrl());
+        String url = String.format("%s%s", config.getAddress(), UrlFactory.BucketUr.set_acl.getUrl());
         StringMap params = new StringMap();
         params.put("bucket", bucket);
         params.put("acl", acl);
@@ -130,7 +130,7 @@ public Boolean delete(String bucket) {
         if (StringUtils.isBlank(bucket)) {
             throw new IllegalArgumentException("bucket cannot be blank!");
         }
-        String url = String.format("%s%s", config.defaultHost(), UrlFactory.BucketUr.delete_bucket.getUrl());
+        String url = String.format("%s%s", config.getAddress(), UrlFactory.BucketUr.delete_bucket.getUrl());
         StringMap params = new StringMap();
         params.put("bucket", bucket);
         return getResult(url, params);

src/main/java/com/berry/storage/Config.java

@@ -46,7 +46,7 @@ public void setUseHttpsDomains(boolean useHttpsDomains) {
         this.useHttpsDomains = useHttpsDomains;
     }
 
-    String defaultHost() {
+    public String getAddress() {
         String scheme = "http://";
         if (useHttpsDomains) {
             scheme = "https://";

src/main/java/com/berry/storage/ObjectManage.java

@@ -54,7 +54,7 @@ public Boolean upload(String bucket, String acl, @Nullable String filePath, Stri
         }
         params.put("fileName", fileName);
         params.put("data", fileData);
-        String url = String.format("%s%s", config.defaultHost(), UrlFactory.ObjectUrl.upload_byte.getUrl());
+        String url = String.format("%s%s", config.getAddress(), UrlFactory.ObjectUrl.upload_byte.getUrl());
         StringMap header = auth.authorization(url);
         Response response = HttpClient.postComplex(url, params, header);
         Result result = response.jsonToObject(Result.class);
@@ -84,7 +84,7 @@ public Boolean upload(String bucket, String acl, @Nullable String filePath, File
         if (StringUtils.isNotBlank(filePath)) {
             fields.put("filePath", filePath);
         }
-        String url = String.format("%s%s", config.defaultHost(), UrlFactory.ObjectUrl.create.getUrl());
+        String url = String.format("%s%s", config.getAddress(), UrlFactory.ObjectUrl.create.getUrl());
 
         StringMap header = auth.authorization(url);
         Response response = HttpClient.multipartPost(url, fields, "file", "demo.png", file, Constants.MULTIPART_MIME, header);
@@ -109,7 +109,7 @@ public Boolean upload(String bucket, String acl, @Nullable String filePath, Stri
         }
         params.put("fileName", fileName);
         params.put("data", base64Data);
-        String url = String.format("%s%s", config.defaultHost(), UrlFactory.ObjectUrl.upload_base64.getUrl());
+        String url = String.format("%s%s", config.getAddress(), UrlFactory.ObjectUrl.upload_base64.getUrl());
         StringMap header = auth.authorization(url);
         Response response = HttpClient.postComplex(url, params, header);
         Result result = response.jsonToObject(Result.class);
@@ -131,7 +131,7 @@ public byte[] getObject(String bucket, String fullObjectPath) {
         if (fullObjectPath.startsWith("/")) {
             throw new IllegalArgumentException("object full path not allow start with / ");
         }
-        String url = String.format(config.defaultHost() + UrlFactory.ObjectUrl.get_object.getUrl(), bucket, fullObjectPath);
+        String url = String.format(config.getAddress() + UrlFactory.ObjectUrl.get_object.getUrl(), bucket, fullObjectPath);
         Response response = get(url);
         System.out.println(response.getContentType());
         if (response.isSuccessful() && response.getContentType().startsWith(Constants.DEFAULT_MIME)) {
@@ -159,7 +159,7 @@ public boolean createFolder(String bucket, String folder) {
         StringMap params = new StringMap();
         params.put("bucket", bucket);
         params.put("folder", folder);
-        String url = String.format("%s%s", config.defaultHost(), UrlFactory.ObjectUrl.create_folder.getUrl());
+        String url = String.format("%s%s", config.getAddress(), UrlFactory.ObjectUrl.create_folder.getUrl());
         Response response = post(url, params);
         Result result = response.jsonToObject(Result.class);
         return result.getCode().equals(Constants.API_SUCCESS_CODE) && result.getMsg().equals(Constants.API_SUCCESS_MSG);
@@ -176,7 +176,7 @@ public boolean removeObjectOrFolder(String bucket, String objects) {
         StringMap params = new StringMap();
         params.put("bucket", bucket);
         params.put("objects", objects);
-        String url = String.format("%s%s", config.defaultHost(), UrlFactory.ObjectUrl.delete_objects.getUrl());
+        String url = String.format("%s%s", config.getAddress(), UrlFactory.ObjectUrl.delete_objects.getUrl());
         Response response = post(url, params);
         Result result = response.jsonToObject(Result.class);
         return result.getCode().equals(Constants.API_SUCCESS_CODE) && result.getMsg().equals(Constants.API_SUCCESS_MSG);
@@ -198,7 +198,7 @@ public String getObjectTempAccessUrlWithExpired(String bucket, String objectPath
         params.put("bucket", bucket);
         params.put("objectPath", objectPath);
         params.put("timeout", timeout);
-        String url = String.format("%s%s", config.defaultHost(), UrlFactory.ObjectUrl.generate_url_with_signed.getUrl());
+        String url = String.format("%s%s", config.getAddress(), UrlFactory.ObjectUrl.generate_url_with_signed.getUrl());
         Response response = post(url, params);
         Result result = response.jsonToObject(Result.class);
         if (result.getCode().equals(Constants.API_SUCCESS_CODE) && result.getMsg().equals(Constants.API_SUCCESS_MSG)) {