21

pom.xml

@@ -17,11 +17,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-common-utils</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
-        </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
@@ -31,14 +26,8 @@
 
         <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>
+            <artifactId>4dkankan-utils-fyun</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

src/main/java/com/fdkankan/agent/service/impl/SceneProServiceImpl.java

@@ -18,10 +18,10 @@ import com.fdkankan.agent.request.SceneParam;
 import com.fdkankan.agent.response.SceneVo;
 import com.fdkankan.agent.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.agent.util.MangerUploadToOssUtil;
 import com.fdkankan.agent.util.SceneStatusUtil;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,9 +61,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IUserIncrementService userIncrementService;
     @Autowired
     IIncrementTypeService incrementTypeService;
-    @Resource
-    FYunFileServiceInterface fYunFileService;
-
+    @Autowired
+    MangerUploadToOssUtil mangerUploadToOssUtil;
 
     @Override
     public Object pageList(SceneParam param) {
@@ -335,10 +334,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
      */
     private void updateOssStatus(String path,Integer payStatus) {
         try {
-            if(!fYunFileService.fileExist(path)){
+            if(!mangerUploadToOssUtil.existKey(path)){
                 return;
             }
-            String data = fYunFileService.getFileContent("4dkankan",path);
+            String data = mangerUploadToOssUtil.getObjectContent("4dkankan",path);
             if(StringUtils.isBlank(data)){
                 return;
             }
@@ -347,7 +346,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             String json = JSONUtil.toJsonStr(jsonObject);
             FileUtils.writeFile(OssPath.localStatusPath ,json);
             log.info("updateOssStatus--localPath:{},ossPath:{}",OssPath.localStatusPath,path);
-            fYunFileService.uploadFile(OssPath.localStatusPath,path);
+            mangerUploadToOssUtil.upload(OssPath.localStatusPath,path);
         }catch (Exception e){
             e.printStackTrace();
         }finally {

src/main/resources/bootstrap-dev.yml

@@ -12,7 +12,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
-          -
+
           - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true