From 62d277337f838bbc47c82b08f118e58c35f6a0a1 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 28 二月 2020 21:39:31 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java
index 7b2d8cb..a122c1c 100644
--- a/WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/file/impl/GetFileSMOImpl.java
@@ -39,12 +39,12 @@
Assert.hasKeyAndValue(paramIn, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯ID");
Assert.hasKeyAndValue(paramIn, "fileId", "璇锋眰鎶ユ枃涓湭鍖呭惈鏂囦欢ID");
- super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.GET_FILE);
+ /*super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.GET_FILE);
ComponentValidateResult result = super.validateStoreStaffCommunityRelationship(pd, restTemplate);
Map paramMap = BeanConvertUtil.beanCovertMap(result);
- paramIn.putAll(paramMap);
+ paramIn.putAll(paramMap);*/
String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/file.getFile" + mapToUrlParam(paramIn);
@@ -68,7 +68,12 @@
//headers.add("Content-Disposition", "attachment; filename=" + outParam.getString("fileName"));
headers.add("Accept-Ranges", "bytes");
- byte[] context = Base64Convert.base64ToByte(outParam.getString("context").replace("data:image/webp;base64,", ""));
+ byte[] context = Base64Convert.base64ToByte(outParam.getString("context").replace("data:image/webp;base64,", "")
+ .replace("data:image/webp;base64,", "")
+ .replace("data:image/png;base64,", "")
+ .replace("data:image/jpeg;base64,", "")
+ .replace("data:application/octet-stream;base64,","")
+ );
return new ResponseEntity<Object>(context, headers, HttpStatus.OK);
}
--
Gitblit v1.8.0