111

pom.xml

@@ -55,6 +55,32 @@
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-web</artifactId>
             <version>3.0.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bytedeco</groupId>
+                    <artifactId>javacpp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bytedeco</groupId>
+                    <artifactId>javacv</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.bytedeco</groupId>
+                    <artifactId>javacv-platform</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.aliyun</groupId>
+                    <artifactId>openapiutil</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.aliyun</groupId>
+                    <artifactId>aliyun-java-sdk-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.aliyun</groupId>
+                    <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -70,17 +96,17 @@
         </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-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>-->
+<!--            <artifactId>4dkankan-utils-fyun-s3</artifactId>-->
+<!--            <version>3.0.0-SNAPSHOT</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.fdkankan</groupId>

src/main/java/com/fdkankan/download/controller/ScrbController.java

@@ -1,10 +1,12 @@
 package com.fdkankan.download.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.download.service.IScrbService;
 import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -24,8 +26,8 @@ public class ScrbController {
     private IScrbService scrbService;
 
     @PostMapping("/syncScene")
-    public ResultData syncScene(String num) throws Exception {
-        scrbService.syncScene(num);
+    public ResultData syncScene(@RequestBody JSONObject param) throws Exception {
+        scrbService.syncScene(param);
         return ResultData.ok();
     }
 

src/main/java/com/fdkankan/download/service/IScrbService.java

@@ -1,11 +1,13 @@
 package com.fdkankan.download.service;
 
+import com.alibaba.fastjson.JSONObject;
+
 import java.util.Map;
 import java.util.Set;
 
 public interface IScrbService {
 
-    void syncScene(String num) throws Exception;
+    void syncScene(JSONObject param) throws Exception;
 
     public void initUserEditData(String num, Set<String> bizs, Map<String, Map<String ,Object>> params) throws Exception;
 

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

@@ -5,6 +5,7 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.CmdUtils;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.download.constant.ScrbCanstant;
@@ -40,14 +41,15 @@ public class ScrbServiceImpl implements IScrbService {
     private ISceneEditControlsService sceneEditControlsService;
 
     @Override
-    public void syncScene(String num) throws Exception {
+    public void syncScene(JSONObject param) throws Exception {
 
+        String num = param.getString("num");
         String basePath = "/mnt/scrb/";
         String zipPath = basePath + num + ".zip";
         String scenePath = basePath + "num/";
 
         //下载zip包、解压
-        String key = String.format(ScrbCanstant.ObsCanstant.scene_zip_key, num);
+        String key = param.getString("key");
         fYunFileService.downloadFile(key, zipPath);
         ZipUtil.unzip(zipPath, basePath);
 

src/main/resources/bootstrap-dev.yml

@@ -1,28 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene-download
-  cloud:
-    nacos:
-      server-addr: 120.24.144.164:8848
-      namespace: 4dkankan-v4-test
-      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
-      discovery:
-        namespace: ${spring.cloud.nacos.namespace}
-
-
-
-

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-prod.yml

@@ -1,32 +0,0 @@
-spring:
-  application:
-    name: 4dkankan-center-scene-download
-  cloud:
-    nacos:
-      server-addr: 172.20.1.63:8848
-      namespace: 4dkankan-v4-prod
-      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}
-
-
-
-

src/main/resources/bootstrap-test.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
-      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.yml

@@ -1,3 +1,32 @@
 spring:
-  profiles:
-    active: dev
+  application:
+    name: 4dkankan-center-scene-download
+  cloud:
+    nacos:
+      server-addr: 172.20.1.63:8848
+      namespace: prod
+      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}
+
+
+
+