|
|
|
@@ -38,7 +38,7 @@ import java.util.UUID; |
|
|
|
@RestController |
|
|
|
@RequestMapping(value = "upload") |
|
|
|
@Api(description = "文件上传接口") |
|
|
|
public class UploadController { |
|
|
|
public class UploadController extends BaseController { |
|
|
|
|
|
|
|
private final Logger logger = LoggerFactory.getLogger(this.getClass()); |
|
|
|
|
|
|
|
@@ -83,7 +83,7 @@ public class UploadController { |
|
|
|
fs.close(); |
|
|
|
data.code = ResultData.SUCCESS; |
|
|
|
Map<String, String> map = new HashMap<>(); |
|
|
|
map.put("imgarray", server + "/" + fileName); |
|
|
|
map.put("url", server + "/" + fileName); |
|
|
|
data.data = map; |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
@@ -146,7 +146,7 @@ public class UploadController { |
|
|
|
.build(); |
|
|
|
String fileName = UUID.randomUUID().toString(); |
|
|
|
int dot = multiReq.getOriginalFilename().lastIndexOf('.'); |
|
|
|
fileName = fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); |
|
|
|
fileName = getTenantId() + "/" + fileName + multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); |
|
|
|
|
|
|
|
s3.putObject( |
|
|
|
new PutObjectRequest(awsProperty.getBucketName(), fileName, multiReq.getInputStream(), metadata) |
|
|
|
@@ -157,7 +157,7 @@ public class UploadController { |
|
|
|
|
|
|
|
data.code = ResultData.SUCCESS; |
|
|
|
Map<String, String> map = new HashMap<>(); |
|
|
|
map.put("imgarray", url.toString()); |
|
|
|
map.put("url", url.toString()); |
|
|
|
data.data = map; |
|
|
|
return data; |
|
|
|
} catch (AmazonServiceException ase) { |
|
|
|
|