diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java index 5acb556b7..d7224312d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java @@ -13,13 +13,11 @@ import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; -import com.iformall.utils.AwsClient; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -27,7 +25,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import java.io.BufferedInputStream; -import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.net.URL; @@ -45,6 +42,8 @@ public class UploadController extends BaseController { @Autowired private AwsProperty awsProperty; + private AmazonS3 s3 = null; + /* @Value("${fileUpload.path}") private String filePath; @@ -108,7 +107,22 @@ public class UploadController extends BaseController { private ResultData awsUpload(MultipartFile multiReq, ObjectMetadata metadata, String fileName) { ResultData data = new ResultData(); try { - AmazonS3 s3 = AwsClient.getInstance(); + if(s3 == null) { + s3 = AmazonS3ClientBuilder.standard() + .withRegion(awsProperty.getClientRegion()) + .withCredentials(new AWSCredentialsProvider() { + @Override + public AWSCredentials getCredentials() { + return new BasicAWSCredentials(awsProperty.getAccess(), awsProperty.getSecret()); + } + + @Override + public void refresh() { + + } + }) + .build(); + } s3.putObject( new PutObjectRequest(awsProperty.getBucketName(), fileName, multiReq.getInputStream(), metadata) diff --git a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java index 363134c50..1e6e33caf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java +++ b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java @@ -15,7 +15,6 @@ import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.shiro.UserSession; import com.iformall.ueditor.define.BaseState; import com.iformall.ueditor.define.State; -import com.iformall.utils.AwsClient; import org.apache.shiro.SecurityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mallinkAdmin/src/main/java/com/iformall/utils/AwsClient.java b/mallinkAdmin/src/main/java/com/iformall/utils/AwsClient.java deleted file mode 100644 index 7ca271e8e..000000000 --- a/mallinkAdmin/src/main/java/com/iformall/utils/AwsClient.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.iformall.utils; - -import com.amazonaws.auth.AWSCredentials; -import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.auth.BasicAWSCredentials; -import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import com.iformall.config.AwsProperty; -import org.springframework.beans.factory.annotation.Autowired; - -public class AwsClient { - - @Autowired - private static AwsProperty awsProperty; - - private static AmazonS3 s3 = null; - - private AwsClient() { - - } - - public static AmazonS3 getInstance() { - if(s3 == null) { - s3 = AmazonS3ClientBuilder.standard() - .withRegion(awsProperty.getClientRegion()) - .withCredentials(new AWSCredentialsProvider() { - @Override - public AWSCredentials getCredentials() { - return new BasicAWSCredentials(awsProperty.getAccess(), awsProperty.getSecret()); - } - - @Override - public void refresh() { - - } - }) - .build(); - } - return s3; - } -}