winter 2 лет назад
Родитель
Сommit
79035c6357
3 измененных файлов: 27 добавлений и 4 удалений
  1. +16
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java
  2. +10
    -0
      mallinkService/src/main/java/com/iformall/domain/dto/UploadBase64DTO.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java

+ 16
- 3
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;
}


+ 10
- 0
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;
}

+ 1
- 1
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")


Загрузка…
Отмена
Сохранить