diff --git a/ms-biz/src/main/java/com/ms/api/biz/MoveService.java b/ms-biz/src/main/java/com/ms/api/biz/MoveService.java index 9b01ac20..f593372d 100644 --- a/ms-biz/src/main/java/com/ms/api/biz/MoveService.java +++ b/ms-biz/src/main/java/com/ms/api/biz/MoveService.java @@ -682,8 +682,6 @@ public class MoveService { public void processDsProduct(long shopId, long detailId, String status, String sourceItemId, Ret addProductRet) { // 分销关系填入 if (!status.equals(StatusConst.success)) { - //TODO 测试强行停掉 - // E.throwMSException("状态不为成功,不进行分销关系填入"); log.info("状态不为成功,不进行分销关系填入"); return; } diff --git a/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java b/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java index 723d16f8..2120b875 100644 --- a/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java @@ -324,9 +324,6 @@ public class ProcessProductPublishTaskService extends TaskBaseService { nextData.put("brandList", brandList); log.info(JSON.toJSONString(nextData)); - //TODO 测试强行停掉 - //E.throwMSException("测试,强行停掉"); - // 信息保存到oss上 Ret uploadMoveDataToOssret = moveService.uploadMoveDataToOss(nextData, shopId, queueMsg.getMoveCollectTaskDetailId()); if (CommonTool.isFailRet(uploadMoveDataToOssret)) { diff --git a/ms-biz/src/main/java/com/ms/api/tool/TosTemplate.java b/ms-biz/src/main/java/com/ms/api/tool/TosTemplate.java index ab5b09e7..9c1fa0d9 100644 --- a/ms-biz/src/main/java/com/ms/api/tool/TosTemplate.java +++ b/ms-biz/src/main/java/com/ms/api/tool/TosTemplate.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Component; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.Objects; @@ -68,7 +69,7 @@ public class TosTemplate { public Ret upload(String key, String data) { TOSV2 tosClient = getClient(); try { - ByteArrayInputStream stream = new ByteArrayInputStream(data.getBytes()); + ByteArrayInputStream stream = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8)); PutObjectBasicInput basicInput = new PutObjectBasicInput().setBucket(getBucket()).setKey(key); PutObjectInput putObjectInput = new PutObjectInput().setPutObjectBasicInput(basicInput).setContent(stream); tosClient.putObject(putObjectInput);