Merge remote-tracking branch 'origin/master'

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -169,8 +169,8 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 String newViewPath = String.format(UploadFilePath.VIEW_PATH, newNum);
                 fYunFileServiceInterface.copyFileInBucket(oldViewPath, newViewPath);
                 // 拷贝本地资源
-                String oldPath = String.format("/mnt/4Dkankan/scene/%s/caches/images/", num);
-                String newPath = String.format("/mnt/4Dkankan/scene/%s/caches/images/", newNum);
+                String oldPath = String.format("/mnt/4Dkankan/scene/%s/caches/images", num);
+                String newPath = String.format("/mnt/4Dkankan/scene/%s/caches/images", newNum);
                 if(new File(oldPath).exists()){
                     FileUtils.copyDirectiory(oldPath, newPath);
                 }

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -944,6 +944,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         if(ObjectUtils.isEmpty(sceneProEntity)){
             generatePlusObjFile(num);
+            return;
         }
 
         if(sceneProEntity.getSceneSource() != 4){