Browse Source

写文件指定字符编码

dengsixing 3 năm trước cách đây
mục cha
commit
29f0fb7449

+ 7 - 7
src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -258,7 +258,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         FileUtils.writeFile(localSceneJsonPath, JSON.toJSONString(sceneJson));
         //上传sceneJson文件
         String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
-        ossUtil.uploadFileBytes(sceneJsonPath, JSON.toJSONBytes(sceneJson));
+        ossUtil.uploadFileBytes(sceneJsonPath, JSON.toJSONString(sceneJson).getBytes(StandardCharsets.UTF_8));
 
         //sceneJson放入缓存
         String key = String.format(RedisKey.SCENE_JSON, num);
@@ -303,7 +303,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             linkPanArr.add(JSON.parseObject(linkPan));
         });
         String linkScenePath = userEditPath + "links.json";
-        ossUtil.uploadFileBytes(linkScenePath, linkPanArr.toString().getBytes());
+        ossUtil.uploadFileBytes(linkScenePath, linkPanArr.toString().getBytes(StandardCharsets.UTF_8));
 
         //拷贝编辑目录到发布目录
         ossUtil.deleteObject(imgViewPath + "panorama");
@@ -326,7 +326,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                 jsonhots.add(JSONObject.parseObject(hot));
             });
             String hotJsonPath = String.format(UploadFilePath.USER_EDIT_PATH, sceneNum) + "hot.json";
-            ossUtil.uploadFileBytes(hotJsonPath, jsonhots.toString().getBytes());
+            ossUtil.uploadFileBytes(hotJsonPath, jsonhots.toString().getBytes(StandardCharsets.UTF_8));
 
             //修改tags状态为是,标识有热点数据
             this.saveTagsToSceneEditInfo(sceneNum, sceneEditInfo);
@@ -477,7 +477,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if(StrUtil.isNotEmpty(floorJsonData)){
             JSONObject houseTypeJson = CreateHouseJsonUtil
                 .createHouseTypeJsonByUser(localDataPath + "floorplan_user.json");
-            ossUtil.uploadFileBytes(editUserPath + "houseType.json", houseTypeJson.toJSONString().getBytes());
+            ossUtil.uploadFileBytes(editUserPath + "houseType.json", houseTypeJson.toJSONString().getBytes(StandardCharsets.UTF_8));
 
             floorPlanUser = CommonStatus.YES.code();
         }
@@ -597,7 +597,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         }
 
         String hourseTypeJsonPath = String.format(UploadFilePath.USER_EDIT_PATH, num) + "houseType.json";
-        ossUtil.uploadFileBytes(hourseTypeJsonPath, result.toJSONString().getBytes());
+        ossUtil.uploadFileBytes(hourseTypeJsonPath, result.toJSONString().getBytes(StandardCharsets.UTF_8));
     }
 
     private JSONArray[] createHouseTypeJsonHandler(JSONObject floor){
@@ -713,7 +713,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             }
             item.put("name", name);
         }
-        ossUtil.uploadFileBytes(key, jsonObject.toJSONString().getBytes());
+        ossUtil.uploadFileBytes(key, jsonObject.toJSONString().getBytes(StandardCharsets.UTF_8));
         return ResultData.ok();
     }
 
@@ -1288,7 +1288,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         String objectContent = ossUtil.getFileContent(objectName);
         SceneJsonBean sceneJsonBean = JSON.parseObject(objectContent, SceneJsonBean.class);
         sceneJsonBean.setVersion(sceneJsonBean.getVersion() +1);
-        ossUtil.uploadFileBytes(objectName, JSON.toJSONString(sceneJsonBean).getBytes());
+        ossUtil.uploadFileBytes(objectName, JSON.toJSONString(sceneJsonBean).getBytes(StandardCharsets.UTF_8));
         redisUtil.set(key, JSON.toJSONString(sceneJsonBean));
     }
 

+ 2 - 1
src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -40,6 +40,7 @@ import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.vo.BaseSceneParamVO;
 import com.fdkankan.scene.vo.SceneCheckKeyParamVO;
 import com.fdkankan.scene.vo.SceneDataDownloadVO;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
@@ -262,7 +263,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
         //本地写sceneJson文件
         String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
-        ossUtil.uploadFileBytes(sceneJsonPath, JSON.toJSONBytes(sceneJson));
+        ossUtil.uploadFileBytes(sceneJsonPath, JSON.toJSONString(sceneJson).getBytes(StandardCharsets.UTF_8));
 
         redisUtil.del(String.format(RedisKey.SCENE_JSON, num));