消费端，重命名版本

720yun_fd_consumer/gis_consumer/pom.xml

@@ -16,11 +16,9 @@
 
         <dependency>
             <groupId>com.gis</groupId>
-            <artifactId>gis_oss</artifactId>
-            <version>1.0.0</version>
+            <artifactId>gis_consumer_oss</artifactId>
+            <!--<version>1.1.1</version>-->
         </dependency>
-
-
     </dependencies>
 
     <build>

720yun_fd_consumer/gis_oss/pom.xml

@@ -10,7 +10,8 @@
 
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>gis_oss</artifactId>
+    <artifactId>gis_consumer_oss</artifactId>
+    <version>1.1.1</version>
     <packaging>jar</packaging>
 
 

720yun_fd_consumer/gis_oss/src/main/java/com/gis/oss/util/AwsOssUtil.java

@@ -164,7 +164,8 @@ public class AwsOssUtil {
         String cmd = String.format(CmdConstant.UPLOAD_DIR, bucket, filePath, key , "aws");
           // CmdUtils.callShell(cmd);
         log.info("cmd aws: {}", cmd);
-        RuntimeUtil.exec(new String[]{"/bin/sh", "-c"}, cmd);
+        RuntimeUtil.exec(new String[]{"/bin/sh", "-c"}, cmd + "&");
+        log.info("cmd &&&&&&&: {}", cmd);
 //        CmdUtils.callLine(cmd);
     }
 }

720yun_fd_consumer/pom.xml

@@ -10,7 +10,7 @@
     <version>1.0.0</version>
     <modules>
         <module>gis_consumer</module>
-        <module>gis_oss</module>
+        <module>gis_consumer_oss</module>
     </modules>
 
     <parent>
@@ -51,6 +51,21 @@
     <dependencyManagement>
         <dependencies>
 
+
+
+            <dependency>
+                <groupId>com.gis</groupId>
+                <artifactId>gis_consumer_oss</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.gis</groupId>
+                <artifactId>gis_consumer</artifactId>
+                <version>${gis.version}</version>
+            </dependency>
+
+
             <!-- springboot -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>

720yun_fd_manage/gis_oss/pom.xml

@@ -11,6 +11,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>gis_oss</artifactId>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
 

720yun_fd_manage/gis_service/pom.xml

@@ -18,9 +18,11 @@
             <artifactId>gis_mapper</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>com.gis</groupId>
             <artifactId>gis_oss</artifactId>
+            <version>1.0.0</version>
         </dependency>
     </dependencies>
 

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/FodderServiceImpl.java

@@ -90,7 +90,7 @@ public class FodderServiceImpl extends IBaseServiceImpl<FodderEntity, Long> impl
             checkUserSize(phone);
         }
         // 检查非法文件上传
-        boolean checkFile = FileUtils.checkFile(file);
+        boolean checkFile = fileUtils.checkFile(file);
         if (!checkFile) {
             return Result.failure(ErrorEnum.FAILURE_CODE_3021.code(),"上传文件格式有误, 请重新上传");
         }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/TestServiceImpl.java

@@ -14,7 +14,6 @@ import com.gis.domain.entity.FodderEntity;
 import com.gis.domain.entity.WorkEntity;
 import com.gis.oss.util.AliYunOssUtil;
 import com.gis.oss.util.FileAndOssUtil;
-import com.gis.oss.util.FileUtils;
 import com.gis.service.FodderService;
 import com.gis.service.TestService;
 import com.gis.service.WorkService;
@@ -45,8 +44,8 @@ public class TestServiceImpl implements TestService {
     @Autowired
     ConfigConstant configConstant;
 
-    @Autowired
-    FileUtils fileUtils;
+//    @Autowired
+//    FileUtils fileUtils;
 
     @Autowired
     AliYunOssUtil aliyunOssUtil;
@@ -410,7 +409,8 @@ public class TestServiceImpl implements TestService {
             String fileName = StringUtils.substringAfterLast(ossUrl, "/");
             fileName = StringUtils.substringBeforeLast(fileName, "?");
 //            String savePath = basePath + "/" + sceneCode;
-            FileUtils.downLoadFromUrl(ossUrl, fileName, basePath);
+//            FileUtils.downLoadFromUrl(ossUrl, fileName, basePath);
+//            HttpUtil.downloadFile()
             log.info("场景：{} 保存路径： {} 完成", sceneCode, basePath);
         }
     }