1111

pom.xml

@@ -82,13 +82,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>
 
@@ -122,12 +116,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.alibaba.csp</groupId>
-            <artifactId>sentinel-datasource-nacos</artifactId>
-            <version>1.7.2</version>
-        </dependency>
-
-        <dependency>
             <groupId>com.yomahub</groupId>
             <artifactId>tlog-web-spring-boot-starter</artifactId>
             <version>1.3.6</version>

src/main/java/com/fdkankan/scene/util/OssBodySegmentUtil.java

@@ -1,21 +1,14 @@
 package com.fdkankan.scene.util;
 
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.http.HttpUtil;
 import com.aliyun.imageseg20191230.models.SegmentBodyResponse;
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.OSSClientBuilder;
-import com.aliyun.tea.TeaException;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.scene.httpclient.MyClient;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.io.File;
 
 @Slf4j
 @Component
@@ -41,19 +34,19 @@ public class OssBodySegmentUtil {
     private MyClient myClient;
 
     public void uploadOss(String filePath, String key){
-        OSS ossClient = new OSSClientBuilder().build(endPoint, accessKeyId, accessKeySecret);
-        try {
-            File file = new File(filePath);
-            if (!file.exists()) {
-                log.error("要上传的文件不存在：" + filePath);
-                return;
-            }
-            ossClient.putObject(bucket, key, new File(filePath));
-        } catch (Exception e) {
-            log.error(e.toString() + filePath);
-        } finally {
-            ossClient.shutdown();
-        }
+//        OSS ossClient = new OSSClientBuilder().build(endPoint, accessKeyId, accessKeySecret);
+//        try {
+//            File file = new File(filePath);
+//            if (!file.exists()) {
+//                log.error("要上传的文件不存在：" + filePath);
+//                return;
+//            }
+//            ossClient.putObject(bucket, key, new File(filePath));
+//        } catch (Exception e) {
+//            log.error(e.toString() + filePath);
+//        } finally {
+//            ossClient.shutdown();
+//        }
     }
 
     public void extracted(String imageUrl, String dir, String fileName) throws Exception {

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

@@ -1,72 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene
-  cloud:
-    nacos:
-      config:
-        server-addr: 192.168.0.47:8848
-        file-extension: yaml
-        namespace: 4dkankan-dev
-        extension-configs:
-          - data-id: 4dkankan-center-scene.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-        shared-configs:
-          - data-id: common-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-redis-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: other-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        server-addr: 192.168.0.47:8848
-        namespace: 4dkankan-dev
-    sentinel:
-      transport:
-        dashboard: 192.168.0.47:8888
-        heartbeat-interval-ms: 500
-        port: 8719
-      eager: true #取消sentinel控制台懒加载
-      #sentinel配置持久化nacos
-      datasource:
-        #流控规则
-        flow:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-flow-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-dev
-            rule-type: flow
-        #熔断规则
-        degrade:
-          nacos:
-            server-addr: ${spring.cloud.nacos.config.server-addr}
-            dataId: ${spring.application.name}-degrade-rules
-            groupId: SENTINEL_GROUP
-            namespace: 4dkankan-dev
-            rule-type: degrade
-#      log:
-#        dir: ./logs # 默认值${home}/logs/csp/
-#        switch-pid: true # 日志带上线程id
-
-#开启feign熔断降级，如果没有开启，feign调用链路不会显示再sentinel控制中
-#feign:
-#  sentinel:
-#    enabled: true
-
-feign:
-  httpclient:
-    connection-timeout: 200000
-
-
-
-

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

@@ -1,36 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene
-  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-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - 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-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: forest-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        namespace: ${spring.cloud.nacos.namespace}

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

@@ -1,43 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene
-  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-db-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - 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-rabbitmq-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
-          - data-id: forest-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-      discovery:
-        namespace: ${spring.cloud.nacos.namespace}
-
-
-
-
-
-
-