1111

pom.xml

@@ -72,13 +72,7 @@
 
         <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>
+            <artifactId>4dkankan-utils-fyun-local</artifactId>
             <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
@@ -89,12 +83,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-nacos</artifactId>
-            <version>1.7.2</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
         </dependency>

src/main/java/com/fdkankan/download/service/impl/SceneDownloadHandlerServiceImpl.java

@@ -371,7 +371,7 @@ public class SceneDownloadHandlerServiceImpl {
             fYunFileService.uploadFileByCommand(bucket, zipPath, uploadPath);
 
             //更新进度100
-            String url = this.publicUrl + uploadPath + "?t=" + Calendar.getInstance().getTimeInMillis();
+            String url = uploadPath + "?t=" + Calendar.getInstance().getTimeInMillis();
             this.updateProgress(null, num, SceneDownloadProgressStatus.DOWNLOAD_SUCCESS.code(), url, "v3");
 
         }catch (Exception e){
@@ -690,9 +690,11 @@ public class SceneDownloadHandlerServiceImpl {
         }else{
 //            HttpUtil.downloadFile(url, String.format(sourceLocal, num, prefix + key));
             try {
-                this.downloadFile(url, String.format(sourceLocal, num, prefix + key));
+                fYunFileService.downloadFileByCommand(String.format(sourceLocal, num, prefix + key), key);
+//                this.downloadFile(url, String.format(sourceLocal, num, prefix + key));
             }catch (Exception e){
                 log.info("下载文件报错，path:{}", String.format(sourceLocal, num, prefix + key));
+                log.error("下载oss文件出错",e);
             }
         }
     }

src/main/resources/bootstrap-prod-eur.yml

@@ -1,28 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene-download
-  cloud:
-    nacos:
-      server-addr: 172.31.47.163:8848
-      namespace: 4dkankan-v4-prod-eur
-      config:
-        file-extension: yaml
-        namespace: ${spring.cloud.nacos.namespace}
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        namespace: ${spring.cloud.nacos.namespace}

src/main/resources/bootstrap-test-eur.yml

@@ -1,32 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene-download
-  cloud:
-    nacos:
-      server-addr: 120.24.144.164:8848
-      namespace: 4dkankan-v4-test-eur
-      config:
-        file-extension: yaml
-        namespace: ${spring.cloud.nacos.namespace}
-        shared-configs:
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-fyun-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        namespace: ${spring.cloud.nacos.namespace}
-
-
-
-