minio

Makefile

@@ -2,7 +2,7 @@ merge:
 	git checkout master;git merge dev;git push;git checkout dev;
 
 create-tag:
-	git checkout master;git tag v1.0.5;git push origin --tags;git checkout dev;
+	git checkout master;git tag v1.0.8;git push origin --tags;git checkout dev;
 
 remove-tag:
 	git tag -d v1.0.1;git push origin :refs/tags/v1.0.1;

src/main/java/com/xjrsoft/module/oss/factory/MinioService.java

@@ -17,7 +17,7 @@ import java.io.InputStream;
 public class MinioService extends CloudStorageService {
     private MinioClient client;
 
-    public MinioService(OSSConfig config){
+    public MinioService(OSSConfig config) {
         this.config = config;
 
         //初始化
@@ -25,8 +25,8 @@ public class MinioService extends CloudStorageService {
     }
 
     @SneakyThrows
-    private void init(){
-        client = MinioClient.builder().endpoint(config.getEndpoint()).credentials(config.getAccessKey(),config.getSecretKey()).build();
+    private void init() {
+        client = MinioClient.builder().endpoint(config.getEndpoint()).credentials(config.getAccessKey(), config.getSecretKey()).build();
     }
 
     @Override
@@ -38,14 +38,17 @@ public class MinioService extends CloudStorageService {
     public String upload(InputStream inputStream, String path) {
         try {
             PutObjectArgs args = PutObjectArgs.builder()
-                            .bucket(config.getBucketName())
-                                    .object(path).stream(inputStream,inputStream.available(), -1).build();
+                    .bucket(config.getBucketName())
+                    .object(path).stream(inputStream, inputStream.available(), -1).build();
             client.putObject(args);
-        } catch (Exception e){
+        } catch (Exception e) {
             throw new MyException("上传文件失败，请检查配置信息", e);
         }
-
-        return config.getEndpoint() + StringPool.SLASH + config.getBucketName() +  StringPool.SLASH + path;
+        if (!config.getEndpointPreview().isEmpty()) {
+            return config.getEndpointPreview() + StringPool.SLASH + config.getBucketName() + StringPool.SLASH + path;
+        } else {
+            return config.getEndpoint() + StringPool.SLASH + config.getBucketName() + StringPool.SLASH + path;
+        }
     }
 
     @Override