Merge remote-tracking branch 'origin/feature-v4-20220801' into feature-v4-20220801

4dkankan-utils-fyun-local/src/main/java/com/fdkankan/fyun/local/LocalFileService.java

@@ -60,7 +60,7 @@ public class LocalFileService extends AbstractFYunFileService {
     @Override
     public void downloadFileByCommand(String bucket, String filePath, String remoteFilePath) {
         try {
-            String optType = new File(filePath).isDirectory() ? "folder" : "file";
+            String optType = remoteFilePath.contains(".") ? "file" : "folder";
             String command = String.format(fYunConstants.DOWNLOAD_SH, bucket, filePath, remoteFilePath, FYunTypeEnum.LOCAL.code(), optType);
             log.info("开始下载文件, ossPath:{}, srcPath:{}", remoteFilePath, filePath);
             callshell(command);

4dkankan-utils-fyun-oss/src/main/java/com/fdkankan/fyun/oss/OssFileService.java

@@ -93,7 +93,7 @@ public class OssFileService extends AbstractFYunFileService {
     @Override
     public void downloadFileByCommand(String bucket, String filePath, String remoteFilePath) {
         try {
-            String optType = new File(filePath).isDirectory() ? "folder" : "file";
+            String optType = remoteFilePath.contains(".") ? "file" : "folder";
             String command = String.format(fYunConstants.DOWNLOAD_SH, bucket, remoteFilePath, filePath, FYunTypeEnum.OSS.code(), optType);
             log.info("开始下载文件, ossPath:{}, srcPath:{}", remoteFilePath, filePath);
             callshell(command);

4dkankan-utils-fyun-s3/src/main/java/com/fdkankan/fyun/s3/S3FileService.java

@@ -102,7 +102,7 @@ public class S3FileService extends AbstractFYunFileService {
     @Override
     public void downloadFileByCommand(String bucket, String filePath, String remoteFilePath) {
         try {
-            String optType = new File(filePath).isDirectory() ? "folder" : "file";
+            String optType = remoteFilePath.contains(".") ? "file" : "folder";
             String command = String.format(fYunConstants.DOWNLOAD_SH, bucket, remoteFilePath, filePath, FYunTypeEnum.AWS.code(), optType);
             log.info("开始下载文件, ossPath:{}, srcPath:{}", remoteFilePath, filePath);
             callshell(command);

4dkankan-utils-model/src/main/java/com/fdkankan/model/constants/ConstantFilePath.java

@@ -37,7 +37,7 @@ public class ConstantFilePath {
     //生成模型的路径
     public static final String BUILD_MODEL_PATH = "/mnt/data/";
     //生成模型的路径
-    public static String BUILD_MODEL_LASER_PATH ="/mnt-laser/data/";
+    public static String BUILD_MODEL_LASER_PATH ="/mnt/data/";
 
     //支付二维码图片存放路径
     public static final String ALI_QRCODE_FOLDER = "/mnt/4Dkankan/alicode/";

4dkankan-utils-pay/src/main/java/com/fdkankan/pay/wx/WXPayDefaultConfig.java

@@ -23,7 +23,7 @@ public class WXPayDefaultConfig implements WXPayConfig {
     }
 
     public String getMchID() {
-        return "1505605401";
+        return "1627275258";
     }
 
     public String getKey() {
@@ -31,7 +31,7 @@ public class WXPayDefaultConfig implements WXPayConfig {
     }
 
     public String getSecret() {
-        return "b578c41b560f37c2c2c1981114830d23";
+        return "306d0d03b372232e03dca1107525f4fc";
     }
 
     public String getCreateIP() {

4dkankan-utils-rabbitmq/src/main/java/com/fdkankan/rabbitmq/bean/BaseBuildSceneMessage.java

@@ -1,6 +1,8 @@
 package com.fdkankan.rabbitmq.bean;
 
 import java.io.Serializable;
+import java.util.Map;
+
 import lombok.Data;
 
 @Data
@@ -25,6 +27,11 @@ public class BaseBuildSceneMessage implements Serializable{
      */
     private String resultReceiverMqName;
 
+    /**
+     * 构建上下文，此字段信息在计算完成之后会再次设置到构建结果中。
+     */
+    private Map<String,Object> buildContext;
+
     public String getRebuild() {
         return rebuild;
     }
@@ -56,4 +63,12 @@ public class BaseBuildSceneMessage implements Serializable{
     public void setResultReceiverMqName(String resultReceiverMqName) {
         this.resultReceiverMqName = resultReceiverMqName;
     }
+
+    public Map<String, Object> getBuildContext() {
+        return buildContext;
+    }
+
+    public void setBuildContext(Map<String, Object> buildContext) {
+        this.buildContext = buildContext;
+    }
 }

4dkankan-utils-rabbitmq/src/main/java/com/fdkankan/rabbitmq/bean/BuildSceneCallMessage.java

@@ -35,108 +35,6 @@ public class BuildSceneCallMessage extends BaseBuildSceneMessage {
     private Integer PayStatus;
     private String thumb;
 
-//    public String getUnicode() {
-//        return unicode;
-//    }
-//
-//    public void setUnicode(String unicode) {
-//        this.unicode = unicode;
-//    }
-//
-//    public String getPath() {
-//        return path;
-//    }
-//
-//    public void setPath(String path) {
-//        this.path = path;
-//    }
-//
-//    public String getPrefix() {
-//        return prefix;
-//    }
-//
-//    public void setPrefix(String prefix) {
-//        this.prefix = prefix;
-//    }
-//
-//    public String getImgsName() {
-//        return imgsName;
-//    }
-//
-//    public void setImgsName(String imgsName) {
-//        this.imgsName = imgsName;
-//    }
-//
-//    public String getSceneNum() {
-//        return sceneNum;
-//    }
-//
-//    public void setSceneNum(String sceneNum) {
-//        this.sceneNum = sceneNum;
-//    }
-//
-//    public String getIsModel() {
-//        return isModel;
-//    }
-//
-//    public void setIsModel(String isModel) {
-//        this.isModel = isModel;
-//    }
-//
-//    public String getUserName() {
-//        return userName;
-//    }
-//
-//    public void setUserName(String userName) {
-//        this.userName = userName;
-//    }
-//
-//    public String getCameraType() {
-//        return cameraType;
-//    }
-//
-//    public void setCameraType(String cameraType) {
-//        this.cameraType = cameraType;
-//    }
-//
-//    public String getAlgorithm() {
-//        return algorithm;
-//    }
-//
-//    public void setAlgorithm(String algorithm) {
-//        this.algorithm = algorithm;
-//    }
-//
-//    public String getFileId() {
-//        return fileId;
-//    }
-//
-//    public void setFileId(String fileId) {
-//        this.fileId = fileId;
-//    }
-//
-//    public String getCameraName() {
-//        return cameraName;
-//    }
-//
-//    public void setCameraName(String cameraName) {
-//        this.cameraName = cameraName;
-//    }
-//
-//    public String getResolution() {
-//        return resolution;
-//    }
-//
-//    public void setResolution(String resolution) {
-//        this.resolution = resolution;
-//    }
-//
-//    public String getBuildType() {
-//        return buildType;
-//    }
-//
-//    public void setBuildType(String buildType) {
-//        this.buildType = buildType;
-//    }
+
 
 }

4dkankan-utils-rabbitmq/src/main/java/com/fdkankan/rabbitmq/bean/BuildSceneResultMqMessage.java

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class BuildSceneResultMqMessage {
+public class BuildSceneResultMqMessage extends BaseBuildSceneMessage{
 
     private String cameraType;