diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index f9e4f1ac1..5e0887e57 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -2,8 +2,10 @@ package com.iformall.controller.sys; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.dto.UploadBase64DTO; import com.iformall.domain.po.base.TenantEntity; import com.iformall.file.aliyun.AliyunOSS; import com.iformall.ueditor.define.FileType; @@ -215,11 +217,22 @@ public class UploadController extends BaseController { @ApiOperation("base64Upload") - @PostMapping("base64Upload") - public ResultData base64Upload(String content) { + @PostMapping("/base64Upload") + public ResultData base64Upload(@RequestBody UploadBase64DTO uploadReq) { + if (null == uploadReq || StringUtils.isBlank(uploadReq.getContent())) { + return new ResultData(Result.ERROR,"base64内容为空"); + } TenantEntity tenantEntity = getTenantInfo(); + String content = uploadReq.getContent(); + String suffix = "JPG"; + if (content.contains(";")) { + suffix = content.split(";")[0].split("/")[1]; + content = content.split(",")[1]; + } byte[] fileBytes = Base64.decodeBase64(content); - String suffix = FileType.getSuffix("JPG"); + if (null == fileBytes || fileBytes.length <= 0 ) { + return new ResultData(Result.ERROR,"base64内容非法"); + } ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), suffix, fileBytes); return data; } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/UploadBase64DTO.java b/mallinkService/src/main/java/com/iformall/domain/dto/UploadBase64DTO.java new file mode 100644 index 000000000..1132f7c8d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/dto/UploadBase64DTO.java @@ -0,0 +1,10 @@ +package com.iformall.domain.dto; + +import lombok.Data; + +/** + */ +@Data +public class UploadBase64DTO { + private String content; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 99a0404e9..a5199ddb2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -307,7 +307,7 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "调整比例", name = "adjustRatio") private String revenueYear; - @io.swagger.annotations.ApiModelProperty(value = "计租开始时间", name = "startDate") + @io.swagger.annotations.ApiModelProperty(value = "计租日", name = "startDate") private Date startDate; @io.swagger.annotations.ApiModelProperty(value = "", name = "endDate")