圆周率重定位改为单独压缩包上传

pom.xml

@@ -59,28 +59,40 @@
       <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-common-web</artifactId>
       <version>3.0.0-SNAPSHOT</version>
-        <exclusions>
-            <exclusion>
-                <groupId>com.aliyun</groupId>
-                <artifactId>aliyun-java-sdk-core</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>com.aliyun</groupId>
-                <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>com.auth0</groupId>
-                <artifactId>java-jwt</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>org.bytedeco.javacpp-presets</groupId>
-                <artifactId>ffmpeg-platform</artifactId>
-            </exclusion>
-            <exclusion>
-                <groupId>io.jsonwebtoken</groupId>
-                <artifactId>jjwt</artifactId>
-            </exclusion>
-        </exclusions>
+      <exclusions>
+        <exclusion>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>org.bytedeco.javacpp-presets</groupId>
+            <artifactId>ffmpeg-platform</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacv</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacv-platform</artifactId>
+        </exclusion>
+        <exclusion>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk</artifactId>
+        </exclusion>
+    </exclusions>
     </dependency>
 
 <!--    <dependency>-->
@@ -101,22 +113,22 @@
       <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-sms</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.fdkankan</groupId>-->
+<!--      <artifactId>4dkankan-utils-sms</artifactId>-->
+<!--      <version>3.0.0-SNAPSHOT</version>-->
+<!--    </dependency>-->
 
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-rubber-sheeting</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.fdkankan</groupId>-->
+<!--      <artifactId>4dkankan-utils-rubber-sheeting</artifactId>-->
+<!--      <version>3.0.0-SNAPSHOT</version>-->
+<!--    </dependency>-->
 
     <!-- https://mvnrepository.com/artifact/com.alibaba.cloud/spring-cloud-starter-alibaba-nacos-discovery -->
     <dependency>

src/main/java/com/fdkankan/contro/mq/listener/UploadSceneListener.java

@@ -106,7 +106,7 @@ public class UploadSceneListener {
             //资源包类型 orig-原始数据  offline 离线包
             if(UploadSceneSourceType.ORIG.getCode().equalsIgnoreCase(sourceType)){
                 if(relocation){
-
+                    this.uploadSceneRelocation(zipDir + uuid);
                 }else{
                     this.uploadSceneOirg(num, zipDir + uuid);
                 }

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -33,7 +33,6 @@ import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.sms.SendMailAcceUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -304,7 +303,6 @@ public class CommonServiceImpl implements ICommonService {
 
             MailTemplate mailTemplate = mailTemplateService.getOne(new LambdaQueryWrapper<MailTemplate>().eq(MailTemplate::getRemark, "计算完成").eq(MailTemplate::getLang, lang));
             String content = mailTemplate.getMsg().replaceAll("scene_name", title).replaceAll("scene_link", websize).replaceAll("help_link", helpLink);
-            SendMailAcceUtils.sendMail(mailTemplate.getSendMail(), mailTemplate.getSendPassword(), mailTemplate.getSendHost(), toEmail, mailTemplate.getSubject(), content, null);
         }catch (Exception e){
             log.error("发送邮件失败,num:" + num, e);
         }
@@ -323,7 +321,6 @@ public class CommonServiceImpl implements ICommonService {
                 "<p>------------------</p>\n" +
                 "<p><img src=\"http://4dkk.4dage.com/ucenter/image/4dkankan_en.png\" /></p>\n" +
                 "<p><br /><strong><em>Web：</em></strong><a href=\"http://eur.4dkankan.com/\" target=\"_blank\" rel=\"noopener\">eur.4dkankan.com</a></p>";
-        SendMailAcceUtils.sendMail("4Dkankan@4dage.com", "6996790AAaa", "smtp.exmail.qq.com", "qinyongcheng@cgaii.com", "The Scene Calculation is Now Complete.", content, null);
     }
 
     public String getOssOrignPath(String path) {