优化文件OSS

manager/src/main/java/org/jiayunet/server/OssServer.java

@@ -40,27 +40,31 @@ public class OssServer {
      */
     @Transactional(rollbackFor = Exception.class)
     public OssUrlVo requestUploadUrl(String fileName, OssPathEnum pathEnum) {
+        
         Assert.notNull(pathEnum, " 上传路径不能为空");
         Assert.hasText(fileName, "文件不能为空");
         Assert.isTrue(fileName.lastIndexOf(".") >= 0, "文件名必须包含类型");
 
-        OssBucketEnum jiaYuPet = OssBucketEnum.HuiDongNi;
+        OssBucketEnum bucketEnum = pathEnum.getOssBucketEnum();
+
         Long userId = UserSecurityTool.getUserId();
         String type = fileName.substring(fileName.lastIndexOf(".") + 1);
+
         String path = pathEnum.getPath(fileName);
 
 
         OssUrlVo ossUrlVo = new OssUrlVo();
 
         try {
+
             //保存上传信息
-            ossFileMapper.insert(new OssFile(null, jiaYuPet.getBucketName(), type, path, fileName, userId, 0, Instant.now(), null));
+            ossFileMapper.insert(new OssFile(null, bucketEnum.getBucketName(), type, path, fileName, userId, 0, Instant.now(), null));
 
             //获取上传Url
-            String uploadUrl = aliOssAbility.signatureUrl(jiaYuPet.getEndpoint(), jiaYuPet.getBucketName(), path, 60, HttpMethod.PUT);
+            String uploadUrl = aliOssAbility.signatureUrl(bucketEnum.getEndpoint(), bucketEnum.getBucketName(), path, 60, HttpMethod.PUT);
 
             //组装下载地址
-            String downloadUrl = jiaYuPet.getDomain() + "/" + path;
+            String downloadUrl = bucketEnum.getDomain() + "/" + path;
 
             ossUrlVo.setUploadUrl(uploadUrl);
             ossUrlVo.setDownloadUrl(downloadUrl);
@@ -73,6 +77,9 @@ public class OssServer {
         }
     }
 
+
+
+
     public OssUrlVo simpleUpload(String fileName, OssPathEnum pathEnum, InputStream inputStream) {
         Assert.notNull(pathEnum, " 上传路径不能为空");
         Assert.hasText(fileName, "文件不能为空");
@@ -108,4 +115,8 @@ public class OssServer {
 
     }
 
+
+
+
+
 }