src/main/java/com/zy/sc/common/service/OssService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/sc/common/web/UploadController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/sc/manager/controller/AppController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/sc/manager/controller/param/MobileIssueParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/sc/common/service/OssService.java
@@ -12,14 +12,12 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; import java.net.URL; import java.security.SecureRandom; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Objects; /** * 阿里云OSS服务类 @@ -55,21 +53,16 @@ * 上传OSS文件 * @return the url */ public String upload(InputStream inputStream, String suffix){ if(suffix.trim().equals("file")){ suffix="jpg"; } public String upload(InputStream inputStream, String fileName){ OSSClient ossClient = new OSSClient(OSS_ENDPOINT, accessKeyId, accessKeySecret); String name = ""; try { if (!ossClient.doesBucketExist(bucket)) { ossClient.createBucket(bucket); log.info("您的Bucket不存在,创建Bucket:{}",bucket); } name = String.valueOf(snowflakeIdWorker.nextId()).concat(".").concat(suffix); // 添加 ContentType String suffix = Objects.requireNonNull(fileName).substring(fileName.lastIndexOf(".") + 1); String name = String.valueOf(snowflakeIdWorker.nextId()).concat(".").concat(suffix); ObjectMetadata objectMetadata = new ObjectMetadata(); objectMetadata.setContentType("image/jpg"); ossClient.putObject(bucket, name, inputStream, objectMetadata); Date expiration = new Date(new Date().getTime() + 3600L * 1000 * 24 * 365 * 100); URL url = ossClient.generatePresignedUrl(bucket, name, expiration); @@ -82,10 +75,6 @@ ossClient.shutdown(); } throw new CoolException("500-上传失败"); } public String upload(InputStream inputStream) { return upload(inputStream, ".jpg"); } /** @@ -120,23 +109,6 @@ ossClient.shutdown(); } return true; } public static void main(String[] args) { File file = new File("E:\\tmp\\v2-fbbb97b977b5cebc66dc3cefab0ac981_r.jpg"); try { InputStream in = new FileInputStream(file); OssService ossService = new OssService(); ossService.setAccessKeyId("LTAI4GDzr6ioSHuRw2mk22ug"); ossService.setAccessKeySecret("84CHL7tF21LbU1qpaP0jn9mIAZP9bv"); ossService.setBucket("tjdt"); ossService.setEndpoint("http://oss-cn-hangzhou.aliyuncs.com"); ossService.setSnowflakeIdWorker(new SnowflakeIdWorker()); System.out.println(ossService.upload(in)); } catch (FileNotFoundException e) { e.printStackTrace(); } } public String uploadFile(InputStream inputStream, String fileName, Long len, String suffix){ src/main/java/com/zy/sc/common/web/UploadController.java
@@ -31,14 +31,13 @@ @PostMapping("/upload.action") public R upload(MultipartFile file) { String suffix = file.getName().substring(file.getName().lastIndexOf(".") + 1); InputStream inputStream = null; try { inputStream = file.getInputStream(); } catch (IOException e) { e.printStackTrace(); } String upload=ossService.upload(inputStream,suffix); String upload = ossService.upload(inputStream,file.getOriginalFilename()); return R.ok(Cools.add("url", upload)); } @@ -58,14 +57,13 @@ return R.error("图片上传数量已到上限"); } // oss String suffix = file.getName().substring(file.getName().lastIndexOf(".") + 1); InputStream inputStream = null; try { inputStream = file.getInputStream(); } catch (IOException e) { e.printStackTrace(); } String upload = ossService.upload(inputStream,suffix); String upload = ossService.upload(inputStream,file.getOriginalFilename()); if (Cools.isEmpty(upload)) { return R.error("上传OSS服务失败"); } src/main/java/com/zy/sc/manager/controller/AppController.java
@@ -97,7 +97,7 @@ param.getTitle(), // 问题概述 null, // 故障原因 null, // 解决办法 null, // 文件列表 JSONArray.toJSONString(param.getVideoSrc()), // 文件列表 JSONArray.toJSONString(param.getImgArr()), // 图片 startTime, // 发生日期 null, // 处理日期 @@ -136,7 +136,7 @@ AppIssueVo vo = new AppIssueVo(); vo.setIssueId(issue.getId()); vo.setTitle(issue.getTitle().length()>12?issue.getTitle().substring(0, 12):issue.getTitle()); vo.setStartTime(issue.getStartTime$().substring(0, 11)); vo.setStartTime(issue.getStartTime$().length()>11?issue.getStartTime$().substring(0, 11):issue.getStartTime$()); vo.setSettle(issue.getSettle$()); if (!hostSet.contains(issue.getHostId())) { src/main/java/com/zy/sc/manager/controller/param/MobileIssueParam.java
@@ -26,5 +26,6 @@ private List<String> imgArr; private List<String> videoSrc; }