Merge remote-tracking branch 'origin/master'

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneMQListener.java

@@ -75,7 +75,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
     @Value("${oss.type}")
     private String ossType;
 
-    @Value("${prefix.ali}")
+    @Value("${oss.prefix.ali}")
     private String prefixAli;
 
     @Autowired
@@ -486,6 +486,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
                 if(dataJson.containsKey("pushChannel") && dataJson.containsKey("pushToken")){
                     try{
                         if(!"s3".equals(ossType)){
+
                             PushMessageConfig demo = null;
                             if(dataJson.getIntValue("pushChannel") == 0){
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneFileController.java

@@ -91,7 +91,7 @@ public class SceneFileController extends BaseController {
     @Value("${oss.type}")
     private String type;
 
-    @Value("${prefix.ali}")
+    @Value("${oss.prefix.ali}")
     private String prefixAli;
 
     @Value("${ecs.type}")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/Scene3dfamilyServiceImpl.java

@@ -44,7 +44,7 @@ public class Scene3dfamilyServiceImpl extends ServiceImpl<IScene3dfamilyMapper,
 
     private static String DIR_NAME = "downloads/furnished/";
 
-    @Value("${prefix.ali}")
+    @Value("${oss.prefix.ali}")
     private String prefixAli;
 
     @Autowired

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneAppServiceImpl.java

@@ -48,7 +48,7 @@ import java.util.Objects;
 @Service
 public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implements ISceneAppService {
 
-    @Value("${prefix.ali}")
+    @Value("${oss.prefix.ali}")
     private String prefixAli;
 
     @Value("${oss.type}")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneFileBuildServiceImpl.java

@@ -72,7 +72,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Value("${oss.type}")
     private String type;
 
-    @Value("${prefix.ali}")
+    @Value("${oss.prefix.ali}")
     private String prefixAli;
 
     @Value("${ecs.type}")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProAppServiceImpl.java

@@ -51,7 +51,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
     @Value("${oss.type}")
     private String type;
 
-    @Value("${prefix.ali}")
+    @Value("${oss.prefix.ali}")
     private String prefixAli;
 
     @Value("${hot.domain.list}")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -52,7 +52,7 @@ import java.util.stream.Collectors;
 @Service
 public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro> implements ISceneProService {
 
-    @Value("${prefix.ali}")
+    @Value("${oss.prefix.ali}")
     private String prefixAli;
 
     @Value("${oss.type}")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -31,14 +31,12 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -56,7 +54,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     @Value("${oss.type}")
     private String type;
 
-    @Value("${prefix.ali}")
+    @Value("${oss.prefix.ali}")
     private String prefixAli;
 
     @Autowired

4dkankan-common/src/main/java/com/fdkankan/common/util/ComputerUtil.java

@@ -3,20 +3,17 @@ package com.fdkankan.common.util;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-//import com.fdkankan.base.mq.ModelingMsgProducer;
 import com.fdkankan.common.constant.ConstantFileName;
 import com.fdkankan.common.constant.ConstantFilePath;
-import com.fdkankan.common.constant.ConstantUrl;
 import com.fdkankan.mq.message.BuildSceneMqMessage;
 import lombok.extern.slf4j.Slf4j;
-import org.joda.time.DateTime;
 import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
 
 import java.io.File;
 import java.util.*;
 
+//import com.fdkankan.base.mq.ModelingMsgProducer;
+
 /**
  * 生成场景和计算场景
  * Created by Hb_zzZ on 2019/5/8.
@@ -575,6 +572,7 @@ public class ComputerUtil {
                                                              Date sceneProCreateTime, Long userId, String dataSource,
                                                              Integer sceneStatus, Integer PayStatus, String thumb) {
         BuildSceneMqMessage mqMsg = new BuildSceneMqMessage();
+        mqMsg.setSceneProId(sceneProId);
         mqMsg.setSceneNum(projectNum);
         mqMsg.setCameraName(cameraName);
         mqMsg.setUnicode(unicode);
@@ -596,6 +594,7 @@ public class ComputerUtil {
         mqMsg.setSceneStatus(sceneStatus);
         mqMsg.setPayStatus(PayStatus);
         mqMsg.setCreateTime(DateUtil.format(Calendar.getInstance().getTime(), DateExtUtil.dateStyle));
+        mqMsg.setThumb(thumb);
         return mqMsg;
     }
 

4dkankan-common/src/main/java/com/fdkankan/common/util/UploadToOssUtil.java

@@ -61,10 +61,10 @@ public class UploadToOssUtil {
 	@Value("${oss.secrey:JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4}")
 	private String secrey;
 
-	@Value("${oss.bucket.bucket:4dkankan}")
+	@Value("${oss.bucket:4dkankan}")
 	private String bucket;
 
-	@Value("${oss.bucket.sdk:4dscene}")
+	@Value("${oss.sdk:4dscene}")
 	private String bucketSdk;