二维码oss

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/dto/form/UploadBytesFormDTO.java

@@ -1,24 +0,0 @@
-package com.epmet.dto.form;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @description:
- * @author: liushaowen
- * @date: 2020/11/13 10:56
- */
-
-@Data
-public class UploadBytesFormDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @NotNull(message = "字节数组不能为空")
-    private byte[] bytes;
-
-    @NotBlank(message = "后缀不能为空")
-    private String extension;
-}

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/OssFeignClient.java

@@ -10,7 +10,6 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.feign.fallback.OssFeignClientFallback;
 import feign.codec.Encoder;
@@ -20,7 +19,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -45,10 +43,6 @@ public interface OssFeignClient {
     @PostMapping(value ="oss/file/uploadqrcode", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     Result<UploadImgResultDTO> uploadQrCode(@RequestPart(value = "file") MultipartFile file);
 
-    @PostMapping(value ="oss/file/uploadbytes", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result<UploadImgResultDTO> uploadBytes(@RequestBody UploadBytesFormDTO dto);
-
-
     @Configuration
     class MultipartSupportConfig {
         @Bean

epmet-module/epmet-oss/epmet-oss-client/src/main/java/com/epmet/feign/fallback/OssFeignClientFallback.java

@@ -11,7 +11,6 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.feign.OssFeignClient;
 import org.springframework.stereotype.Component;
@@ -36,8 +35,4 @@ public class OssFeignClientFallback implements OssFeignClient {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "uploadQrCode", file);
 	}
 
-	@Override
-	public Result<UploadImgResultDTO> uploadBytes(UploadBytesFormDTO dto) {
-		return ModuleUtils.feignConError(ServiceConstant.EPMET_OSS_SERVER, "uploadBytes", dto);
-	}
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -19,7 +19,6 @@ import com.epmet.commons.tools.validator.group.AliyunGroup;
 import com.epmet.commons.tools.validator.group.QcloudGroup;
 import com.epmet.commons.tools.validator.group.QiniuGroup;
 import com.epmet.dto.UploadDTO;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.OssEntity;
 import com.epmet.enums.OssTypeEnum;
@@ -157,12 +156,6 @@ public class OssController {
 		return ossService.uploadImg(file);
 	}
 
-	@PostMapping("uploadbytes")
-	public Result<UploadImgResultDTO> uploadBytes(@RequestBody UploadBytesFormDTO dto){
-	    ValidatorUtils.validateEntity(dto);
-		return ossService.uploadBytes(dto);
-	}
-
 	/**
 	 * 上传客户logo(考虑到以后可能会针对不同的业务有不同的限制条件，这里不再使用通用的接口
 	 * 针对每一个业务新建上传接口)

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java

@@ -11,7 +11,6 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.OssEntity;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,6 +31,4 @@ public interface OssService extends BaseService<OssEntity> {
 	Result<UploadImgResultDTO> uploadImg(MultipartFile file);
 
 	Result<UploadImgResultDTO> extUpload(MultipartFile file, String fileName);
-
-    Result<UploadImgResultDTO> uploadBytes(UploadBytesFormDTO dto);
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java

@@ -17,7 +17,6 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.OssDao;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.entity.OssEntity;
 import com.epmet.exception.ModuleErrorCode;
@@ -105,22 +104,4 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		dto.setUrl(url);
 		return new Result<UploadImgResultDTO>().ok(dto);
 	}
-
-	@Override
-	public Result<UploadImgResultDTO> uploadBytes(UploadBytesFormDTO dto) {
-		if (dto.getBytes().length == 0) {
-			return new Result<UploadImgResultDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
-		}
-		//上传文件
-		String url = null;
-		url = OssFactory.build().uploadSuffix(dto.getBytes(), dto.getExtension());
-		//保存文件信息
-		OssEntity ossEntity = new OssEntity();
-		ossEntity.setUrl(url);
-		baseDao.insert(ossEntity);
-		//文件信息
-		UploadImgResultDTO uploadImgResultDTO = new UploadImgResultDTO();
-		uploadImgResultDTO.setUrl(url);
-		return new Result<UploadImgResultDTO>().ok(uploadImgResultDTO);
-	}
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/QRCodeMultipartFileDTO.java

@@ -16,11 +16,11 @@ import java.io.InputStream;
 @Data
 public class QRCodeMultipartFileDTO implements MultipartFile {
 
-    private String name;
+    private String name = "file";
 
     private String originalFilename;
 
-    private String contentType;
+    private String contentType = "image/jpeg";
 
     private byte[] bytes;
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java

@@ -21,7 +21,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.enums.EnvEnum;
@@ -30,7 +29,6 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.UploadBytesFormDTO;
 import com.epmet.dto.result.CustomerTokensResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.feign.OssFeignClient;
@@ -50,7 +48,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;