1

pom.xml

@@ -29,6 +29,23 @@
             <version>2.2.7.RELEASE</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-fyun-parent</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-fyun-oss</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-fyun-s3</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>

src/main/java/com/fdkankan/tk/service/impl/RoomServiceImpl.java

@@ -10,6 +10,7 @@ import com.auth0.jwt.JWT;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.tk.common.FilePath;
@@ -19,7 +20,6 @@ import com.fdkankan.tk.common.WxSharCodePath;
 import com.fdkankan.tk.common.util.JwtUtil;
 import com.fdkankan.tk.common.util.RedisKeyUtil;
 import com.fdkankan.tk.common.util.RoomUtil;
-import com.fdkankan.tk.common.util.UploadToOssUtil;
 import com.fdkankan.tk.entity.Room;
 import com.fdkankan.tk.entity.RoomUser;
 import com.fdkankan.tk.entity.WxUser;
@@ -62,7 +62,7 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
     @Autowired
     ISceneService sceneService;
     @Autowired
-    UploadToOssUtil uploadToOssUtil;
+    FYunFileServiceInterface uploadToOssUtil;
     @Autowired
     IWxService wxService;
     @Value("${upload.query-path}")
@@ -217,7 +217,11 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         roomNumService.deleteByRoomId(roomId);
         roomUserService.delByRoomId(roomId);
         if(StringUtils.isNotBlank(room.getRoomShareUrl())){
-            uploadToOssUtil.delete(room.getRoomShareUrl());
+            try {
+                uploadToOssUtil.deleteFile(room.getRoomShareUrl());
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
         this.removeById(roomId);
     }
@@ -317,13 +321,13 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         }
 
         if(type.equals("follower") && StringUtils.isNotBlank(roomShareCode)){     //普通用户二维码
-            if(uploadToOssUtil.existKey(roomShareCode) && uploadToOssUtil.getSize(roomShareCode) >0){
+            if(uploadToOssUtil.fileExist(roomShareCode) ){
                 return  roomShareCode +"?"+System.currentTimeMillis();
             }
         }
 
         if(type.equals("leader") && StringUtils.isNotBlank(roomHostCode)){      //主持人二维码
-            if(uploadToOssUtil.existKey(roomHostCode) && uploadToOssUtil.getSize(roomHostCode) >0){
+            if(uploadToOssUtil.fileExist(roomHostCode) ){
                 return  roomHostCode +"?"+System.currentTimeMillis();
             }
         }
@@ -348,8 +352,8 @@ public class RoomServiceImpl extends ServiceImpl<IRoomMapper, Room> implements I
         if(!new File(localPath).exists()){
             throw new BusinessException(ResultCode.QRCODE_MISS);
         }
-        uploadToOssUtil.uploadOss(localPath,ossPath);
-        if(!uploadToOssUtil.existKey(ossPath)){
+        uploadToOssUtil.uploadFile(localPath,ossPath);
+        if(!uploadToOssUtil.fileExist(ossPath)){
             FileUtil.del(localPath);
             throw new BusinessException(ResultCode.QRCODE_MISS);
         }

src/main/java/com/fdkankan/tk/service/impl/UploadService.java

@@ -1,7 +1,7 @@
 package com.fdkankan.tk.service.impl;
 
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.tk.common.ResultCode;
-import com.fdkankan.tk.common.util.UploadToOssUtil;
 import com.fdkankan.tk.exception.BusinessException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -16,7 +16,7 @@ import java.util.UUID;
 public class UploadService {
 
     @Resource
-    private UploadToOssUtil uploadToOssUtil;
+    private FYunFileServiceInterface uploadToOssUtil;
 
     @Value("${upload.query-path}")
     private String queryPath;
@@ -47,8 +47,8 @@ public class UploadService {
             localFile = File.createTempFile(fileName + suffixName,suffixName);
             file.transferTo(localFile);
             String path = localFile.getPath();
-            uploadToOssUtil.uploadOss(path,filePathAdd+ fileName + suffixName);
-            if(!uploadToOssUtil.existKey(filePathAdd + fileName + suffixName)){
+            uploadToOssUtil.uploadFile(path,filePathAdd+ fileName + suffixName);
+            if(!uploadToOssUtil.fileExist(filePathAdd + fileName + suffixName)){
                 throw new BusinessException(ResultCode.UPLOAD_ERROR.code,ResultCode.UPLOAD_ERROR.msg);
             }
             return queryPath +filePathAdd+ fileName + suffixName;
@@ -65,7 +65,7 @@ public class UploadService {
     public void deleteOssUrl(String path) {
         try {
             String replace = path.replace(queryPath, "");
-            uploadToOssUtil.delete(replace);
+            uploadToOssUtil.deleteFile(replace);
         }catch (Exception e){
             e.printStackTrace();
         }

src/main/java/com/fdkankan/tk/service/impl/WxServiceImpl.java

@@ -7,7 +7,6 @@ import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.tk.common.FilePath;
 import com.fdkankan.tk.common.ResultCode;
 import com.fdkankan.tk.common.util.RedisKeyUtil;
-import com.fdkankan.tk.common.util.UploadToOssUtil;
 import com.fdkankan.tk.entity.Room;
 import com.fdkankan.tk.entity.WxConfig;
 import com.fdkankan.tk.entity.WxUser;
@@ -140,8 +139,8 @@ public class WxServiceImpl implements IWxService {
             log.error("下载微信小程序二维码出现异常", e);
         }finally {
             try {
-                IOUtils.close(is);
-                IOUtils.close(fileOutputStream);
+                IOUtils.closeQuietly(is);
+                IOUtils.closeQuietly(fileOutputStream);
             }catch (Exception e){
             }
         }

src/main/resources/bootstrap-eurtest.yml

@@ -18,6 +18,9 @@ spring:
           - data-id: forest-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+          - data-id: common-fyun-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}

src/main/resources/bootstrap-prod.yml

@@ -19,6 +19,9 @@ spring:
           - data-id: forest-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+          - data-id: common-fyun-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}

src/main/resources/bootstrap-test.yml

@@ -18,6 +18,9 @@ spring:
             - data-id: forest-config.yaml
               group: DEFAULT_GROUP
               refresh: true
+            - data-id: common-fyun-config.yaml
+              group: DEFAULT_GROUP
+              refresh: true
         discovery:
           server-addr: ${spring.cloud.nacos.config.server-addr}
           namespace: ${spring.cloud.nacos.config.namespace}