Browse Source

Merge branch 'release_toaliyun_real_202208' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202208

release_toaliyun_real
zhengfangyuan 3 years ago
parent
commit
46b6fecb1e
1 changed files with 20 additions and 19 deletions
  1. +20
    -19
      mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java

+ 20
- 19
mallinkBApi/src/main/java/com/iformall/controller/WxProfitSharingReceiverApplyController.java View File

@@ -187,7 +187,7 @@ public class WxProfitSharingReceiverApplyController extends BaseController {
*/
@PostMapping(value = "/getYwsqh")
@ApiOperation("获取图片")
public ResultData getYwsqh(@RequestParam Map<String, String> param) {
public ResultData getYwsqh(@RequestBody Map<String, String> param) {
logger.info("[" + getIpAddr() + "] WxMerchantMediaUploadController::getYwsqh");
TenantEntity tenantEntity = getTenantInfo();

@@ -207,24 +207,25 @@ public class WxProfitSharingReceiverApplyController extends BaseController {
if(bytes == null){
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"生成图片异常");
}
try {

String url = aliyunOSS.upload(tenantEntity.getTenantId(), ".png", new ByteArrayInputStream(bytes));
if(StringUtils.isBlank(url)){
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"获取图片异常");
}

Map<String,String> map = new HashMap<>();
map.put("url",url);
return new ResultData(map);

} catch(MallinkException e){
logger.error(e.getMessage());
return new ResultData(e.getErrorCode(),e.getMessage());
}catch (Exception e) {
logger.error(e.getMessage());
return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR);
}
return new ResultData(bytes);
// try {
//
// String url = aliyunOSS.upload(tenantEntity.getTenantId(), ".png", new ByteArrayInputStream(bytes));
// if(StringUtils.isBlank(url)){
// return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"获取图片异常");
// }
//
// Map<String,String> map = new HashMap<>();
// map.put("url",url);
// return new ResultData(map);
//
// } catch(MallinkException e){
// logger.error(e.getMessage());
// return new ResultData(e.getErrorCode(),e.getMessage());
// } catch (Exception e) {
// logger.error(e.getMessage());
// return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR);
// }
}

}

Loading…
Cancel
Save