111

src/main/java/com/fdkankan/scene/oss/OssUtil.java

@@ -9,6 +9,7 @@ import com.fdkankan.scene.util.CmdBuildUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Base64Utils;
+import sun.rmi.runtime.Log;
 
 import java.io.File;
 import java.io.InputStream;

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -1269,6 +1269,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             }
             String downloadName = fileName;
             String url = String.format(cacheFormat, num) + downloadName;
+            log.info("原始路径:{}", ossResultPath.concat(downloadName));
+            log.info("目标路径:{}", FdkkLaserConfig.getProfile(bucket).concat(String.format(cacheFormat, num).concat(downloadName)));
             FileUtil.copy(ossResultPath.concat(downloadName), FdkkLaserConfig.getProfile(bucket).concat(String.format(cacheFormat, num).concat(downloadName)), true);
             map.put("asyn", CommonStatus.NO.code());
             map.put("fileUrl", url + "?t=" + System.currentTimeMillis());
@@ -1314,7 +1316,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                     long end1 = Calendar.getInstance().getTimeInMillis();
                     log.info("打包耗时：" + (end1 - start));
                     //上传压缩包
-                    ossUtil.uploadFile(bucket, String.format(cacheFormat, num) + downloadName, zipPath, true);
+                    ossUtil.uploadFile(bucket, String.format(cacheFormat, num) + downloadName, zipPath, false);
                     String url = String.format(cacheFormat, num) + downloadName;
                     long end2 = Calendar.getInstance().getTimeInMillis();
                     log.info("上传耗时：" + (end2 - end1));

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

@@ -333,7 +333,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         sceneEditInfo.setScenePlusId(scenePlus.getId());
         sceneEditInfo.setTitle(title);
         sceneEditInfo.setDescription("<p>" + fdageData.getString("info") + "</p>");
-        sceneEditInfo.setScenePassword(fdageData.getString("pwd"));
+        if(StrUtil.isEmpty(sceneEditInfo.getScenePassword())){
+            sceneEditInfo.setScenePassword(fdageData.getString("pwd"));
+        }
         sceneEditInfoService.saveOrUpdate(sceneEditInfo);
         sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());