From 00de62d474fd785336a5b6c2d0e409a59b5bd6df Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Wed, 5 Aug 2020 10:44:50 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=90=88=E5=90=8Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxMerchantMapper.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 23d11aeae..0feca470f 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -585,5 +585,15 @@ + - +s From dbc5043632e0f4617d739bb9532c00c8d83f57b6 Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Wed, 5 Aug 2020 11:11:33 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=90=88=E5=90=8Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 0feca470f..e0834204c 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -214,6 +214,9 @@ and `status` = #{status} + + and `type` = #{type} + order by create_date desc From c32d81981e3445e153bc26e89020015d19080753 Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Wed, 5 Aug 2020 11:22:50 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=AD=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxMerchantMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index e0834204c..f8882b1bd 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -599,4 +599,4 @@ order by create_date desc -s + From 3b42a2709fd7508bf09fde3c4a8cd4ce0f7a1b59 Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Mon, 10 Aug 2020 18:06:46 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=95=86=E6=88=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxMerchantServiceImpl.java | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 2cac7183e..9180725e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -247,13 +247,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { return; } - if(!wxMerchant.getCarVendorType().equals(EnumCarVendor.CAR_NOTFOUND.getCode())){ + if (!wxMerchant.getCarVendorType().equals(EnumCarVendor.CAR_NOTFOUND.getCode())) { logger.info("不能停用停车商户"); return; } - - wxMerchant.setStatus(EnumMerchantStatus.NOT_VALID.getCode()); - wxMerchantMapper.updateById(wxMerchant); //是否有租赁合同 WxRentContract wxRentContract = new WxRentContract(); wxRentContract.setMerchantId(id); @@ -270,6 +267,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { c.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count(); //解绑商铺-没有租赁合同或物业合同才可以 if (countRentContract == 0 || countPropertyContract == 0) { + wxMerchant.setStatus(EnumMerchantStatus.NOT_VALID.getCode()); + wxMerchantMapper.updateById(wxMerchant); WxMerchantShop wxMerchantShopQuery = new WxMerchantShop(); wxMerchantShopQuery.updateTenantInfo(wxMerchant); wxMerchantShopQuery.setMerchantId(wxMerchant.getId()); @@ -285,30 +284,30 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); wxShopMapper.updateById(wxShop); } + //解绑用户 + WxMerchantBUser bUser = new WxMerchantBUser(); + bUser.setMerchantId(wxMerchant.getId()); + List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); + for (WxMerchantBUser wxMerchantBUser : wxMerchantBUserMapperList) { + wxMerchantBUser.setStatus(EnumMerchantBUserStatus.INVALID.getCode()); + wxMerchantBUserMapper.updateById(wxMerchantBUser); + } + //作废卡券 + WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); + wxCouponMerchant.updateTenantInfo(wxMerchant); + wxCouponMerchant.setMerchantId(wxMerchant.getId()); + wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); + List wxCouponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); + List couponIds = wxCouponMerchantList.stream().map(cm -> cm.getProductId()).collect(Collectors.toList()); + + couponIds.stream().filter(cid -> !isCouponMerchantValid(cid)).forEach(cid -> { + WxCoupon wxCoupon = new WxCoupon(); + wxCoupon.setId(cid); + wxCoupon.updateTenantInfo(wxMerchant); + wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()); + wxCouponService.saveOrUpdate(wxCoupon); + }); } - //解绑用户 - WxMerchantBUser bUser = new WxMerchantBUser(); - bUser.setMerchantId(wxMerchant.getId()); - List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); - for (WxMerchantBUser wxMerchantBUser : wxMerchantBUserMapperList) { - wxMerchantBUser.setStatus(EnumMerchantBUserStatus.INVALID.getCode()); - wxMerchantBUserMapper.updateById(wxMerchantBUser); - } - //作废卡券 - WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); - wxCouponMerchant.updateTenantInfo(wxMerchant); - wxCouponMerchant.setMerchantId(wxMerchant.getId()); - wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); - List wxCouponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); - List couponIds = wxCouponMerchantList.stream().map(cm->cm.getProductId()).collect(Collectors.toList()); - - couponIds.stream().filter(cid->!isCouponMerchantValid(cid)).forEach(cid->{ - WxCoupon wxCoupon = new WxCoupon(); - wxCoupon.setId(cid); - wxCoupon.updateTenantInfo(wxMerchant); - wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()); - wxCouponService.saveOrUpdate(wxCoupon); - }); } @Transactional(rollbackFor = {Exception.class}) From 66efaeb32092fb62a2eb20dff77c97edf8f3393b Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Mon, 10 Aug 2020 18:10:13 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=AD=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/schedule/ContractSchedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index bcfac2fca..0f71ecdbd 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -36,7 +36,7 @@ public class ContractSchedule { /** * 2小时执行一次 */ - @Scheduled(cron = "0 */1 * * * ?") + @Scheduled(cron = "0 0 0/2 * * ?") public void sendMsg() { logger.info("合同状态更新开始"); From 52eda7238921c427864da9a3ae0de8ab2637d078 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 10 Aug 2020 18:27:40 +0800 Subject: [PATCH 06/13] update --- .../src/main/java/com/iformall/schedule/ContractSchedule.java | 4 ++-- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java index 0f71ecdbd..f4b6b2536 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/ContractSchedule.java @@ -34,9 +34,9 @@ public class ContractSchedule { /** - * 2小时执行一次 + * 凌晨5分 */ - @Scheduled(cron = "0 0 0/2 * * ?") + @Scheduled(cron = "0 5 0 * * ?") public void sendMsg() { logger.info("合同状态更新开始"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index c56b447ed..6c9df719f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1637,7 +1637,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxMerchant merchant = wxMerchantMapper.selectById((Long) merchantId); Integer status = merchant.getStatus(); if (status.equals(EnumMerchantStatus.VALID.getCode())) { - wxMerchantService.disable((Long) merchantId); + //wxMerchantService.disable((Long) merchantId); } } } From 6e8d28cf20456c7ac8aacebe39cf105a7a78c596 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Aug 2020 18:55:19 +0800 Subject: [PATCH 07/13] qrcode --- .../com/iformall/service/impl/QrCodeServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java index 10a0fb264..9684a82b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java @@ -20,6 +20,7 @@ import com.iformall.domain.po.MallResource; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxAppinfo; import com.iformall.exception.MallinkException; +import com.iformall.file.aliyun.AliyunOSS; import com.iformall.service.MallResourceService; import com.iformall.service.QrCodeService; import com.iformall.service.WxAppinfoService; @@ -59,6 +60,9 @@ public class QrCodeServiceImpl implements QrCodeService { private AmazonS3 s3 = null; + @Autowired + private AliyunOSS aliyunOSS; + @Override public ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity) { ResultData data = new ResultData(); @@ -286,14 +290,16 @@ public class QrCodeServiceImpl implements QrCodeService { String fn = UUID.randomUUID().toString(); int dot = fileName.lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = dest.getName().substring(dot, dest.getName().length()); + fileFormat = dest.getName().substring(dot, dest.getName().length()); fn = getFileName(tenantEntity, fn + fileFormat); } else { fn = getFileName(tenantEntity, fn); } - ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantEntity); +// ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, new FileInputStream(dest)); org.apache.commons.io.FileUtils.forceDelete(dest); return data; } catch (Exception e) { From 2b5b40f62fdad12beb308689cd89eed34a27276e Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 10 Aug 2020 19:13:57 +0800 Subject: [PATCH 08/13] update --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index a45fdc757..afc14ae26 100644 --- a/pom.xml +++ b/pom.xml @@ -362,12 +362,6 @@ 2.1.0 - - com.amazonaws - aws-java-sdk-s3 - 1.11.423 - - com.belerweb From 035dc26249522dea2551b311294b9a41a81af83b Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Aug 2020 19:48:24 +0800 Subject: [PATCH 09/13] qrcode --- .../controller/sys/UploadController.java | 61 +------ .../iformall/controller/UploadController.java | 136 +------------- .../iformall/controller/UploadController.java | 115 +----------- .../com/iformall/service/QrCodeService.java | 4 +- .../service/impl/QrCodeServiceImpl.java | 106 ----------- .../controller/sys/UploadController.java | 168 +----------------- 6 files changed, 9 insertions(+), 581 deletions(-) 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 dfb6172bc..a853255fb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -1,13 +1,11 @@ package com.iformall.controller.sys; -import com.amazonaws.services.s3.model.*; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.TenantEntity; import com.iformall.file.aliyun.AliyunOSS; -import com.iformall.service.QrCodeService; import com.iformall.utils.ImgUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -37,18 +35,6 @@ public class UploadController extends BaseController { @Autowired private AliyunOSS aliyunOSS; - @Autowired - private QrCodeService qrCodeService; - - private String getFileName(TenantEntity tenantEntity, String fileName) { - if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { - fileName = tenantEntity.getTenantId() + "/" + fileName; - } else { - fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" +fileName; - } - return fileName; - } - /** * 上传文件 * @@ -64,21 +50,12 @@ public class UploadController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); - - String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } -// ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } @@ -103,16 +80,13 @@ public class UploadController extends BaseController { if (size > length) { return new ResultData(ErrorCode.PICTURE_SIZE_EXCEED); } - String fileName = UUID.randomUUID().toString(); - String tempFileName = fileName; + + String tempFileName = UUID.randomUUID().toString(); String fileFormat = ""; int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } @@ -138,19 +112,11 @@ public class UploadController extends BaseController { logger.info("local new file: " + localNewImgFileName); // 删除本地缓存 localFile.delete(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(newFile.length()); -// ResultData data = qrCodeService.awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, new FileInputStream(newFile)); // 删除本地缓存 newFile.delete(); return data; } else { - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(size); -// ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } @@ -180,26 +146,14 @@ public class UploadController extends BaseController { for(MultipartFile multipartFile: files) { Map map = new HashMap<>(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multipartFile.getContentType()); - metadata.setContentLength(multipartFile.getSize()); - - FileOutputStream fos = null; - BufferedInputStream fs = null; - map.put("key", multipartFile.getOriginalFilename()); - String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length());; - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } -// ResultData data1 = qrCodeService.awsUpload(multipartFile.getInputStream(), metadata, fileName, getTenantInfo()); ResultData data1 = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multipartFile.getInputStream()); if(data1.code == ResultData.SUCCESS) { @@ -233,21 +187,12 @@ public class UploadController extends BaseController { public ResultData cimgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception{ logger.info("[" + getIpAddr() + "] UploadController::cimgUpload"); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); - - String fileName = multiReq.getOriginalFilename(); - int dot = multiReq.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); } - fileName = "cimg/" + fileName; -// ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, new TenantEntity() {{ -// setTenantId("cimg"); -// }}); + ResultData data = aliyunOSS.uploadFile("cimg", fileFormat, multiReq.getInputStream()); return data; } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java index a2c29c53e..9f745fae6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java @@ -1,22 +1,9 @@ package com.iformall.controller; -import com.amazonaws.AmazonClientException; -import com.amazonaws.AmazonServiceException; -import com.amazonaws.auth.AWSCredentials; -import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.auth.BasicAWSCredentials; -import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import com.amazonaws.services.s3.model.CannedAccessControlList; -import com.amazonaws.services.s3.model.ObjectMetadata; -import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.common.ResultData; -import com.iformall.config.AwsProperty; -import com.iformall.domain.po.MallResource; import com.iformall.domain.po.base.TenantEntity; import com.iformall.file.aliyun.AliyunOSS; -import com.iformall.service.MallResourceService; import com.iformall.utils.ImgUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import java.io.*; -import java.net.URL; import java.util.*; import java.util.List; @@ -42,94 +28,12 @@ public class UploadController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired - private AwsProperty awsProperty; - - @Autowired - private MallResourceService mallResourceService; - @Autowired private String fmUploadDir; @Autowired private AliyunOSS aliyunOSS; - private AmazonS3 s3 = null; - - private String getFileName(TenantEntity tenantEntity, String fileName) { - if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { - fileName = tenantEntity.getTenantId() + "/" + fileName; - } else { - fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" + fileName; - } - return fileName; - } - - private ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity) { - ResultData data = new ResultData(); - try { - if (s3 == null) { - s3 = AmazonS3ClientBuilder.standard() - .withRegion(awsProperty.getClientRegion()) - .withCredentials(new AWSCredentialsProvider() { - @Override - public AWSCredentials getCredentials() { - return new BasicAWSCredentials(awsProperty.getAccess(), awsProperty.getSecret()); - } - - @Override - public void refresh() { - - } - }) - .build(); - } - - s3.putObject( - new PutObjectRequest(awsProperty.getBucketName(), fileName, inputStream, metadata) - .withCannedAcl(CannedAccessControlList.PublicRead)); - URL url = s3.getUrl(awsProperty.getBucketName(), fileName); - logger.info(url.toString()); - - MallResource mr = new MallResource(); - mr.updateTenantInfo(tenantEntity); - mr.setBucket(awsProperty.getBucketName()); - mr.setS3Key(fileName); - mr.setUrl(url.toString()); - mallResourceService.saveOrUpdate(mr); - - data.code = ResultData.SUCCESS; - Map map = new HashMap<>(); - map.put("url", url.toString()); - data.data = map; - } catch (AmazonServiceException ase) { - data.code = ResultData.ERROR; - logger.warn("Caught an AmazonServiceException, which " + - "means your request made it " + - "to Amazon S3, but was rejected with an error response" + - " for some reason."); - logger.warn(ase.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } catch (AmazonClientException ace) { - data.code = ResultData.ERROR; - logger.warn("Caught an AmazonClientException, which " + - "means the client encountered " + - "an internal error while trying to " + - "communicate with S3, " + - "such as not being able to access the network."); - logger.warn("Error Message: " + ace.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } catch (Exception ioe) { - data.code = ResultData.ERROR; - logger.warn("Caught an IOException: " + ioe.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } - return data; - } - /** * 上传文件 * @@ -144,24 +48,12 @@ public class UploadController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); - - FileOutputStream fos = null; - BufferedInputStream fs = null; - - String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } -// ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } @@ -180,20 +72,14 @@ public class UploadController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); - String fileName = UUID.randomUUID().toString(); - String tempFileName = fileName; + String tempFileName = UUID.randomUUID().toString(); String fileFormat = ""; int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } - System.out.println(fileName); - FileOutputStream fos = null; String imgFormat = ImgUtil.getImgFormat(fileFormat); @@ -215,19 +101,11 @@ public class UploadController extends BaseController { File newFile = ImgUtil.thinImage(localImgFileName, localNewImgFileName, imgFormat); // 删除本地缓存 localFile.delete(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(newFile.length()); -// ResultData data = awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, new FileInputStream(newFile)); // 删除本地缓存 newFile.delete(); return data; } else { - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); -// ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } @@ -253,26 +131,14 @@ public class UploadController extends BaseController { for (MultipartFile multipartFile : files) { Map map = new HashMap<>(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multipartFile.getContentType()); - metadata.setContentLength(multipartFile.getSize()); - - FileOutputStream fos = null; - BufferedInputStream fs = null; - map.put("key", multipartFile.getOriginalFilename()); - String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); - getFileName(tenantEntity, fileName + fileFormat); - } else { - getFileName(tenantEntity, fileName); } -// ResultData data1 = awsUpload(multipartFile.getInputStream(), metadata, fileName, tenantEntity); ResultData data1 = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multipartFile.getInputStream()); if (data1.code == ResultData.SUCCESS) { Map _data = (Map) data1.data; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java index 7241d91d8..633396d33 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java @@ -1,24 +1,11 @@ package com.iformall.controller; - -import com.amazonaws.AmazonClientException; -import com.amazonaws.AmazonServiceException; -import com.amazonaws.auth.AWSCredentials; -import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.auth.BasicAWSCredentials; -import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import com.amazonaws.services.s3.model.CannedAccessControlList; -import com.amazonaws.services.s3.model.ObjectMetadata; -import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; -import com.iformall.config.AwsProperty; import com.iformall.domain.po.base.TenantEntity; import com.iformall.file.aliyun.AliyunOSS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -28,10 +15,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import java.io.BufferedInputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.net.URL; import java.util.*; @RestController @@ -41,80 +25,9 @@ public class UploadController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired - private AwsProperty awsProperty; - @Autowired private AliyunOSS aliyunOSS; - private AmazonS3 s3 = null; - - private ResultData awsUpload(MultipartFile multiReq, ObjectMetadata metadata, String fileName) { - ResultData data = new ResultData(); - try { - if (s3 == null) { - s3 = AmazonS3ClientBuilder.standard() - .withRegion(awsProperty.getClientRegion()) - .withCredentials(new AWSCredentialsProvider() { - @Override - public AWSCredentials getCredentials() { - return new BasicAWSCredentials(awsProperty.getAccess(), awsProperty.getSecret()); - } - - @Override - public void refresh() { - - } - }) - .build(); - } - - s3.putObject( - new PutObjectRequest(awsProperty.getBucketName(), fileName, multiReq.getInputStream(), metadata) - .withCannedAcl(CannedAccessControlList.PublicRead)); - URL url = s3.getUrl(awsProperty.getBucketName(), fileName); - logger.info(url.toString()); - - data.code = ResultData.SUCCESS; - Map map = new HashMap<>(); - map.put("url", url.toString()); - data.data = map; - } catch (AmazonServiceException ase) { - data.code = ResultData.ERROR; - logger.warn("Caught an AmazonServiceException, which " + - "means your request made it " + - "to Amazon S3, but was rejected with an error response" + - " for some reason."); - logger.warn(ase.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } catch (AmazonClientException ace) { - data.code = ResultData.ERROR; - logger.warn("Caught an AmazonClientException, which " + - "means the client encountered " + - "an internal error while trying to " + - "communicate with S3, " + - "such as not being able to access the network."); - logger.warn("Error Message: " + ace.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } catch (IOException ioe) { - data.code = ResultData.ERROR; - logger.warn("Caught an IOException: " + ioe.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } - return data; - } - - private String getFileName(TenantEntity tenantEntity, String fileName) { - if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { - fileName = tenantEntity.getTenantId() + "/" + fileName; - } else { - fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" + fileName; - } - return fileName; - } /** * 上传文件 @@ -130,29 +43,16 @@ public class UploadController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); - - FileOutputStream fos = null; - BufferedInputStream fs = null; - - String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } -// ResultData data = awsUpload(multiReq, metadata, fileName); try { ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } catch (IOException e) { - //e.printStackTrace(); logger.error(e.getMessage()); return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); } @@ -179,26 +79,14 @@ public class UploadController extends BaseController { for (MultipartFile multipartFile : files) { Map map = new HashMap<>(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multipartFile.getContentType()); - metadata.setContentLength(multipartFile.getSize()); - - FileOutputStream fos = null; - BufferedInputStream fs = null; - map.put("key", multipartFile.getOriginalFilename()); - String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } - -// ResultData data1 = awsUpload(multipartFile, metadata, fileName); + try { ResultData data1 = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multipartFile.getInputStream()); if (data1.code == ResultData.SUCCESS) { @@ -212,7 +100,6 @@ public class UploadController extends BaseController { return data; } } catch (IOException e) { - //e.printStackTrace(); logger.error(e.getMessage()); return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); } diff --git a/mallinkService/src/main/java/com/iformall/service/QrCodeService.java b/mallinkService/src/main/java/com/iformall/service/QrCodeService.java index f27221e95..68c70da4f 100644 --- a/mallinkService/src/main/java/com/iformall/service/QrCodeService.java +++ b/mallinkService/src/main/java/com/iformall/service/QrCodeService.java @@ -1,6 +1,5 @@ package com.iformall.service; -import com.amazonaws.services.s3.model.ObjectMetadata; import com.iformall.common.ResultData; import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; @@ -8,7 +7,6 @@ import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.InputStream; import java.util.Map; @Service @@ -23,5 +21,5 @@ public interface QrCodeService { ResultData uploadQrcode(TenantEntity tenantEntity, int type, String pageUrl, String sceneParam, int withText, String text1, String text2, String name); - ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java index 9684a82b8..52efb3929 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/QrCodeServiceImpl.java @@ -2,26 +2,13 @@ package com.iformall.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor; -import com.amazonaws.AmazonClientException; -import com.amazonaws.AmazonServiceException; -import com.amazonaws.auth.AWSCredentials; -import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.auth.BasicAWSCredentials; -import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import com.amazonaws.services.s3.model.CannedAccessControlList; -import com.amazonaws.services.s3.model.ObjectMetadata; -import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.config.AwsProperty; -import com.iformall.domain.po.MallResource; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxAppinfo; import com.iformall.exception.MallinkException; import com.iformall.file.aliyun.AliyunOSS; -import com.iformall.service.MallResourceService; import com.iformall.service.QrCodeService; import com.iformall.service.WxAppinfoService; import com.iformall.service.wechat.FmOpenService; @@ -36,7 +23,6 @@ import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; -import java.net.URL; import java.util.*; /** @@ -52,82 +38,11 @@ public class QrCodeServiceImpl implements QrCodeService { @Autowired private boolean isFmOpen; @Autowired - private AwsProperty awsProperty; - @Autowired - private MallResourceService mallResourceService; - @Autowired private String fmUploadDir; - private AmazonS3 s3 = null; - @Autowired private AliyunOSS aliyunOSS; - @Override - public ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantEntity) { - ResultData data = new ResultData(); - try { - if(s3 == null) { - s3 = AmazonS3ClientBuilder.standard() - .withRegion(awsProperty.getClientRegion()) - .withCredentials(new AWSCredentialsProvider() { - @Override - public AWSCredentials getCredentials() { - return new BasicAWSCredentials(awsProperty.getAccess(), awsProperty.getSecret()); - } - - @Override - public void refresh() { - - } - }) - .build(); - } - - s3.putObject( - new PutObjectRequest(awsProperty.getBucketName(), fileName, inputStream, metadata) - .withCannedAcl(CannedAccessControlList.PublicRead)); - URL url = s3.getUrl(awsProperty.getBucketName(), fileName); - logger.info(url.toString()); - - MallResource mr = new MallResource(); - mr.updateTenantInfo(tenantEntity); - mr.setBucket(awsProperty.getBucketName()); - mr.setS3Key(fileName); - mr.setUrl(url.toString()); - mallResourceService.saveOrUpdate(mr); - - data.code = ResultData.SUCCESS; - Map map = new HashMap<>(); - map.put("url", url.toString()); - data.data = map; - } catch (AmazonServiceException ase) { - data.code = ResultData.ERROR; - logger.warn("Caught an AmazonServiceException, which " + - "means your request made it " + - "to Amazon S3, but was rejected with an error response" + - " for some reason."); - logger.warn(ase.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } catch (AmazonClientException ace) { - data.code = ResultData.ERROR; - logger.warn("Caught an AmazonClientException, which " + - "means the client encountered " + - "an internal error while trying to " + - "communicate with S3, " + - "such as not being able to access the network."); - logger.warn("Error Message: " + ace.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } catch (Exception ioe) { - data.code = ResultData.ERROR; - logger.warn("Caught an IOException: " + ioe.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } - return data; - } @Override public void downQrCode(TenantEntity tenantEntity, HttpServletRequest request, HttpServletResponse response, Map params) throws MallinkException { @@ -281,24 +196,12 @@ public class QrCodeServiceImpl implements QrCodeService { try { //上传 - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType("image/jpeg"); - metadata.setContentLength(dest.length()); - - FileOutputStream fos = null; - BufferedInputStream fs = null; - - String fn = UUID.randomUUID().toString(); int dot = fileName.lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = dest.getName().substring(dot, dest.getName().length()); - fn = getFileName(tenantEntity, fn + fileFormat); - } else { - fn = getFileName(tenantEntity, fn); } -// ResultData data = awsUpload(new FileInputStream(dest), metadata, fn, tenantEntity); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, new FileInputStream(dest)); org.apache.commons.io.FileUtils.forceDelete(dest); return data; @@ -308,15 +211,6 @@ public class QrCodeServiceImpl implements QrCodeService { return new ResultData(); } - private String getFileName(TenantEntity tenantEntity, String fn) { - if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { - fn = tenantEntity.getTenantId() + "/" + fn; - } else { - fn = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" + fn; - } - return fn; - } - private void copyFileToDest(int withText, String text1, String text2, String destPath1, File dest, File codeFile) throws IOException { if (withText == 1) { File dest1 = new File(destPath1); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index c878d468f..52f1dfe56 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -1,21 +1,10 @@ package com.iformall.controller.sys; -import com.amazonaws.AmazonClientException; -import com.amazonaws.AmazonServiceException; -import com.amazonaws.auth.AWSCredentials; -import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.auth.BasicAWSCredentials; -import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import com.amazonaws.services.s3.model.*; import com.iformall.common.ResultData; -import com.iformall.config.AwsProperty; import com.iformall.controller.base.BaseController; -import com.iformall.domain.po.MallResource; import com.iformall.domain.po.base.TenantEntity; import com.iformall.file.aliyun.AliyunOSS; -import com.iformall.service.MallResourceService; import com.iformall.utils.ImgUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -27,7 +16,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.*; -import java.net.URL; import java.util.*; import java.util.List; @@ -38,93 +26,12 @@ public class UploadController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired - private AwsProperty awsProperty; - @Autowired private String fmUploadDir; @Autowired private AliyunOSS aliyunOSS; - @Autowired - private MallResourceService mallResourceService; - - private String getFileName(TenantEntity tenantEntity, String fileName) { - if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { - fileName = tenantEntity.getTenantId() + "/" + fileName; - } else { - fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" +fileName; - } - return fileName; - } - - private AmazonS3 s3 = null; - - private ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, TenantEntity tenantVEntity) { - ResultData data = new ResultData(); - try { - if(s3 == null) { - s3 = AmazonS3ClientBuilder.standard() - .withRegion(awsProperty.getClientRegion()) - .withCredentials(new AWSCredentialsProvider() { - @Override - public AWSCredentials getCredentials() { - return new BasicAWSCredentials(awsProperty.getAccess(), awsProperty.getSecret()); - } - - @Override - public void refresh() { - - } - }) - .build(); - } - - s3.putObject( - new PutObjectRequest(awsProperty.getBucketName(), fileName, inputStream, metadata) - .withCannedAcl(CannedAccessControlList.PublicRead)); - URL url = s3.getUrl(awsProperty.getBucketName(), fileName); - logger.info(url.toString()); - - MallResource mr = new MallResource(); - mr.updateTenantInfo(tenantVEntity); - mr.setBucket(awsProperty.getBucketName()); - mr.setS3Key(fileName); - mr.setUrl(url.toString()); - mallResourceService.saveOrUpdate(mr); - - data.code = ResultData.SUCCESS; - Map map = new HashMap<>(); - map.put("url", url.toString()); - data.data = map; - } catch (AmazonServiceException ase) { - data.code = ResultData.ERROR; - logger.warn("Caught an AmazonServiceException, which " + - "means your request made it " + - "to Amazon S3, but was rejected with an error response" + - " for some reason."); - logger.warn(ase.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } catch (AmazonClientException ace) { - data.code = ResultData.ERROR; - logger.warn("Caught an AmazonClientException, which " + - "means the client encountered " + - "an internal error while trying to " + - "communicate with S3, " + - "such as not being able to access the network."); - logger.warn("Error Message: " + ace.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } catch (Exception ioe) { - data.code = ResultData.ERROR; - logger.warn("Caught an IOException: " + ioe.getMessage()); - data.code = ResultData.ERROR; - data.message = "上传失败"; - } - return data; - } /** * 上传文件 @@ -140,24 +47,12 @@ public class UploadController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); - - FileOutputStream fos = null; - BufferedInputStream fs = null; - - String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } -// ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } @@ -176,20 +71,13 @@ public class UploadController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); - String fileName = UUID.randomUUID().toString(); - String tempFileName = fileName; + String tempFileName = UUID.randomUUID().toString(); String fileFormat = ""; - int dot = multiReq.getOriginalFilename().lastIndexOf('.'); if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } - System.out.println(fileName); - FileOutputStream fos = null; String imgFormat = ImgUtil.getImgFormat(fileFormat); if(StringUtils.isNotBlank(imgFormat)) { @@ -210,19 +98,12 @@ public class UploadController extends BaseController { File newFile = ImgUtil.thinImage(localImgFileName, localNewImgFileName, imgFormat); // 删除本地缓存 localFile.delete(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(newFile.length()); -// ResultData data = awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, new FileInputStream(newFile)); // 删除本地缓存 newFile.delete(); return data; } else { - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); -// ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } @@ -248,26 +129,14 @@ public class UploadController extends BaseController { for(MultipartFile multipartFile: files) { Map map = new HashMap<>(); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multipartFile.getContentType()); - metadata.setContentLength(multipartFile.getSize()); - - FileOutputStream fos = null; - BufferedInputStream fs = null; - map.put("key", multipartFile.getOriginalFilename()); - String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } -// ResultData data1 = awsUpload(multipartFile.getInputStream(), metadata, fileName, tenantEntity); ResultData data1 = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multipartFile.getInputStream()); if(data1.code == ResultData.SUCCESS) { Map _data = (Map)data1.data; @@ -300,46 +169,15 @@ public class UploadController extends BaseController { public ResultData cimgUpload(@RequestParam("file") MultipartFile multiReq) throws Exception { logger.info("[" + getIpAddr() + "] UploadController::cimgUpload"); - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); - - String fileName = multiReq.getOriginalFilename(); - fileName = "cimg/" + fileName; int dot = multiReq.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); } -// ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, new TenantEntity() {{ -// setTenantId("cimg"); -// }}); + ResultData data = aliyunOSS.uploadFile("cimg", fileFormat, multiReq.getInputStream()); return data; } -// /** -// * AWS -// * @return -// * @throws Exception -// */ -// @GetMapping(value = "/lists") -// @ApiOperation("aws列举文件") -// public ResultData awsList() throws Exception { -// logger.info("[" + getIpAddr() + "] UploadController::cimgUpload"); -// -// try{ -// ObjectListing ol = s3.listObjects(awsProperty.getBucketName()); -// List objects = ol.getObjectSummaries(); -// for (S3ObjectSummary os: objects) { -// logger.info(os.toString()); -// break; -// } -// }catch (Exception e){ -// e.printStackTrace(); -// } -// -// return new ResultData(); -// } } From 4ee0653d95503e59d04889113179652133ae4eb4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Aug 2020 19:57:11 +0800 Subject: [PATCH 10/13] qrcode --- .../com/iformall/ueditor/upload/Uploader.java | 84 +------------------ 1 file changed, 1 insertion(+), 83 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java index 4e7f3ee3d..c545323ec 100644 --- a/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java +++ b/mallinkAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java @@ -1,17 +1,5 @@ package com.iformall.ueditor.upload; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.amazonaws.AmazonClientException; -import com.amazonaws.AmazonServiceException; -import com.amazonaws.auth.AWSCredentials; -import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.auth.BasicAWSCredentials; -import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import com.amazonaws.services.s3.model.CannedAccessControlList; -import com.amazonaws.services.s3.model.ObjectMetadata; -import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.common.ResultData; import com.iformall.domain.po.MallResource; import com.iformall.domain.po.base.TenantEntity; @@ -25,15 +13,12 @@ import org.apache.shiro.SecurityUtils; import org.apache.shiro.session.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.servlet.http.HttpServletRequest; import java.io.IOException; -import java.net.URL; import java.util.Map; -import java.util.UUID; public class Uploader { @@ -42,38 +27,14 @@ public class Uploader { private HttpServletRequest request = null; private Map conf = null; private MallResourceService mallResourceService = null; - private AmazonS3 s3 = null; private AliyunOSS aliyunOSS; - private String getFileName(TenantEntity tenantEntity, String fileName) { - if (StringUtils.isBlank(tenantEntity.getParentTenantId())) { - fileName = tenantEntity.getTenantId() + "/" + fileName; - } else { - fileName = tenantEntity.getTenantId() + "/" + tenantEntity.getParentTenantId() + "/" + fileName; - } - return fileName; - } - public Uploader(HttpServletRequest request, Map conf, MallResourceService mallResourceService, AliyunOSS aliyunOSS) { this.request = request; this.conf = conf; this.mallResourceService = mallResourceService; this.aliyunOSS = aliyunOSS; -// this.s3 = AmazonS3ClientBuilder.standard() -// .withRegion(conf.get("clientRegion").toString()) -// .withCredentials(new AWSCredentialsProvider() { -// @Override -// public AWSCredentials getCredentials() { -// return new BasicAWSCredentials(conf.get("access").toString(), conf.get("secret").toString()); -// } -// -// @Override -// public void refresh() { -// -// } -// }) -// .build(); } public final State doExec() { @@ -99,32 +60,17 @@ public class Uploader { logger.error("TENANT is null"); } - String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } - state = state = new BaseState(true); + state = new BaseState(true); state.putInfo("size", multiReq.getSize()); state.putInfo("title", filedName); - JSONObject stateJson = JSON.parseObject(state.toJSONString()); - - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); - try { -// s3.putObject( -// new PutObjectRequest(conf.get("bucketName").toString(), fileName, multiReq.getInputStream(), metadata) -// .withCannedAcl(CannedAccessControlList.PublicRead)); -// URL url = s3.getUrl(conf.get("bucketName").toString(), fileName); - //logger.info(url.toString()); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); Map map = (Map) data.data; @@ -133,38 +79,10 @@ public class Uploader { MallResource mr = new MallResource(); mr.updateTenantInfo(tenantEntity); mr.setBucket(map.get("bucketName")); - //mr.setS3Key(fileName); mr.setUrl(map.get("url")); -// state.putInfo("url", url.toString()); -// -// MallResource mr = new MallResource(); -// mr.updateTenantInfo(tenantEntity); -// mr.setBucket(conf.get("bucketName").toString()); -// mr.setS3Key(fileName); -// mr.setUrl(url.toString()); mallResourceService.saveOrUpdate(mr); - } catch (AmazonServiceException ase) { - /* - logger.warn("Caught an AmazonServiceException, which " + - "means your request made it " + - "to Amazon S3, but was rejected with an error response" + - " for some reason."); - logger.warn(ase.getMessage()); - */ - ase.printStackTrace(); - } catch (AmazonClientException ace) { - /* - logger.warn("Caught an AmazonClientException, which " + - "means the client encountered " + - "an internal error while trying to " + - "communicate with S3, " + - "such as not being able to access the network."); - logger.warn("Error Message: " + ace.getMessage()); - */ - ace.printStackTrace(); } catch (IOException ioe) { - //logger.warn("Caught an IOException: " + ioe.getMessage()); ioe.printStackTrace(); } } From ab345e90257d8d1fdea0e980360489d2d1f62181 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Aug 2020 20:01:39 +0800 Subject: [PATCH 11/13] qrcode --- .../com/iformall/ueditor/upload/Uploader.java | 79 +------------------ 1 file changed, 1 insertion(+), 78 deletions(-) diff --git a/mallinkSysAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java b/mallinkSysAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java index 10b576070..a50e86435 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/ueditor/upload/Uploader.java @@ -1,17 +1,5 @@ package com.iformall.ueditor.upload; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.amazonaws.AmazonClientException; -import com.amazonaws.AmazonServiceException; -import com.amazonaws.auth.AWSCredentials; -import com.amazonaws.auth.AWSCredentialsProvider; -import com.amazonaws.auth.BasicAWSCredentials; -import com.amazonaws.services.s3.AmazonS3; -import com.amazonaws.services.s3.AmazonS3ClientBuilder; -import com.amazonaws.services.s3.model.CannedAccessControlList; -import com.amazonaws.services.s3.model.ObjectMetadata; -import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.common.ResultData; import com.iformall.domain.po.MallResource; import com.iformall.domain.po.base.TenantEntity; @@ -30,9 +18,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.servlet.http.HttpServletRequest; import java.io.IOException; -import java.net.URL; import java.util.Map; -import java.util.UUID; public class Uploader { @@ -41,34 +27,14 @@ public class Uploader { private HttpServletRequest request = null; private Map conf = null; private MallResourceService mallResourceService = null; - private AmazonS3 s3 = null; private AliyunOSS aliyunOSS; - private String getFileName(TenantEntity tenantEntity, String fileName) { - fileName = tenantEntity.getTenantId() + "/" + fileName; - return fileName; - } - public Uploader(HttpServletRequest request, Map conf, MallResourceService mallResourceService, AliyunOSS aliyunOSS) { this.request = request; this.conf = conf; this.mallResourceService = mallResourceService; this.aliyunOSS = aliyunOSS; -// this.s3 = AmazonS3ClientBuilder.standard() -// .withRegion(conf.get("clientRegion").toString()) -// .withCredentials(new AWSCredentialsProvider() { -// @Override -// public AWSCredentials getCredentials() { -// return new BasicAWSCredentials(conf.get("access").toString(), conf.get("secret").toString()); -// } -// -// @Override -// public void refresh() { -// -// } -// }) -// .build(); } public final State doExec() { @@ -89,32 +55,17 @@ public class Uploader { logger.error("TENANT is null"); } - String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); String fileFormat = ""; if (dot >= 0) { fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); - fileName = getFileName(tenantEntity, fileName + fileFormat); - } else { - fileName = getFileName(tenantEntity, fileName); } - state = state = new BaseState(true); + state = new BaseState(true); state.putInfo("size", multiReq.getSize()); state.putInfo("title", filedName); - JSONObject stateJson = JSON.parseObject(state.toJSONString()); - - ObjectMetadata metadata = new ObjectMetadata(); - metadata.setContentType(multiReq.getContentType()); - metadata.setContentLength(multiReq.getSize()); - try { -// s3.putObject( -// new PutObjectRequest(conf.get("bucketName").toString(), fileName, multiReq.getInputStream(), metadata) -// .withCannedAcl(CannedAccessControlList.PublicRead)); -// URL url = s3.getUrl(conf.get("bucketName").toString(), fileName); - //logger.info(url.toString()); ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); Map map = (Map) data.data; state.putInfo("url",map.get("url")); @@ -122,38 +73,10 @@ public class Uploader { MallResource mr = new MallResource(); mr.updateTenantInfo(tenantEntity); mr.setBucket(map.get("bucketName")); - //mr.setS3Key(fileName); mr.setUrl(map.get("url")); -// state.putInfo("url", url.toString()); -// -// MallResource mr = new MallResource(); -// mr.updateTenantInfo(tenantEntity); -// mr.setBucket(conf.get("bucketName").toString()); -// mr.setS3Key(fileName); -// mr.setUrl(url.toString()); mallResourceService.saveOrUpdate(mr); - } catch (AmazonServiceException ase) { - /* - logger.warn("Caught an AmazonServiceException, which " + - "means your request made it " + - "to Amazon S3, but was rejected with an error response" + - " for some reason."); - logger.warn(ase.getMessage()); - */ - ase.printStackTrace(); - } catch (AmazonClientException ace) { - /* - logger.warn("Caught an AmazonClientException, which " + - "means the client encountered " + - "an internal error while trying to " + - "communicate with S3, " + - "such as not being able to access the network."); - logger.warn("Error Message: " + ace.getMessage()); - */ - ace.printStackTrace(); } catch (IOException ioe) { - //logger.warn("Caught an IOException: " + ioe.getMessage()); ioe.printStackTrace(); } } From 10afff16848eafb6b24164360867311753cdfb9b Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 10 Aug 2020 21:38:26 +0800 Subject: [PATCH 12/13] url --- .../main/java/com/iformall/controller/PosController.java | 4 ++-- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 6 +++--- .../iformall/service/impl/WxMallBuildingServiceImpl.java | 2 +- .../service/impl/WxMsgValidationcodeModelServiceImpl.java | 2 +- .../src/main/java/com/iformall/utils/Constant.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java index 499d0e5e2..3188c2903 100644 --- a/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkPosApi/src/main/java/com/iformall/controller/PosController.java @@ -46,9 +46,9 @@ public class PosController extends BaseController { "\"return_code\":\"SUCCESS\",\"return_msg\":\"\",\"result_code\":\"SUCCESS\"," + "\"tenant_id\":\"456\",\"mall_name\":\"富茂中心\"," + "\"merchant_id\":\"320833942159982592\",\"merchant_name\":\"东软合作\"," + - "\"merchant_img\":\"https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/234/WechatIMG5071.png\"," + + "\"merchant_img\":\"https://formall.oss-accelerate.aliyuncs.com/234/WechatIMG5071.png\"," + "\"order_operation_id\":\"320834180694245376\"," + - "\"qrcode_url\":\"https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/456/formall_c.png\"," + + "\"qrcode_url\":\" https://formall.oss-accelerate.aliyuncs.com/456/formall_c.png\"," + "\"pos_qrcode_rule\":\"https://ctest.malls.iformall.com/order/(二维码规则: url + POS订单ID)\"," + "\"discount\":\"false(是否支持会员折扣,false:禁用,true:可用)\"," + "\"coupon\":\"0(会员优惠券是否开启,0-禁用,1-单选可用,2-多选可用)\",\"coupon_desc\":\"禁用(会员优惠券是否开启描述)\"," + diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 334325451..f6b9fcbad 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -531,7 +531,7 @@ public class WxFlowServiceImpl implements WxFlowService { if (record.getStatus().equals(EnumFlowRecordStatus.NEW.getCode())) { taskListHtml += "
"; taskListHtml += "
"; - taskListHtml += "
"; + taskListHtml += "
"; taskListHtml += "
发起申请
"; taskListHtml += "
"+record.getUserName()+"
"; taskListHtml += "
"; @@ -544,7 +544,7 @@ public class WxFlowServiceImpl implements WxFlowService { } else if (record.getStatus().equals(EnumFlowRecordStatus.ASSIGNEE.getCode())) { taskListHtml += "
"; taskListHtml += "
"; - taskListHtml += "
"; + taskListHtml += "
"; taskListHtml += "
待审批
"; taskListHtml += "
"+record.getUserName()+"
"; taskListHtml += "
"; @@ -557,7 +557,7 @@ public class WxFlowServiceImpl implements WxFlowService { } else { taskListHtml += "
"; taskListHtml += "
"; - taskListHtml += "
"; + taskListHtml += "
"; taskListHtml += "
审批通过
"; taskListHtml += "
"+record.getUserName()+"
"; taskListHtml += "
"; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java index d724c999d..85b4107bc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -64,7 +64,7 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { wxMallFloor.setBuildingId(wxMallBuilding.getId()); wxMallFloor.setFloorName(cha); //默认图片---------------------------------------------------- - wxMallFloor.setBackgroundImg("https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"); + wxMallFloor.setBackgroundImg("https://formall.oss-accelerate.aliyuncs.com/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"); wxMallFloor.setCreateDate(new Date()); wxMallFloor.setUpdateDate(new Date()); wxMallFloorMapper.insert(wxMallFloor); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java index a5b29b668..82105dbd4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java @@ -57,7 +57,7 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM " ( '" + idWorker.nextId() + "', '" + tenantId + "', '16', '商户分账账户删除提醒', '" + signature + "', '{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户', '" + nowTimestr + "', '1', '0', null, null);" + "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`)" + "values ( '" + idWorker.nextId() + "', '" + tenantId + "', '10', '审批通过通知', '富茂', " + - " '\\n\\n\\n\\n \\n \\n \\n \\n \\n \\n 富茂审批邮件\\n \\n \\n\\n\\n\\n
\\n
\\n \\n
\\n
\\n
审批通过通知
\\n
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
\\n
\\n
\\n\\n\\n', " + + " '\\n\\n\\n\\n \\n \\n \\n \\n \\n \\n 富茂审批邮件\\n \\n \\n\\n\\n\\n
\\n
\\n \\n
\\n
\\n
审批通过通知
\\n
编号{contract}的{bustype}已经审批通过,请登录{page}跟进后续工作
\\n
\\n
\\n\\n\\n', " + " '" + nowTimestr + "', '1', null, '500', '" + emailBgImg + "');" + "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`)" + "values ( '" + idWorker.nextId() + "', '" + tenantId + "', '11', '待缴账单通知', '富茂', " + diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index 879e2650b..ad21326a2 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -30,7 +30,7 @@ public class Constant { public static final String adminPage = "https://admin.malls.iformall.com"; - public static final String floor_back_img = "https://s3.cn-northwest-1.amazonaws.com.cn/iformall-net/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"; + public static final String floor_back_img = " https://formall.oss-accelerate.aliyuncs.com/789/9eea8e0e-15ea-4be0-a43d-31e2e9d8db8c.jpg"; /// REDIS key Prev From fb90c8f46c9f92508de2345d5bf27a4d652413b4 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 11 Aug 2020 12:26:50 +0800 Subject: [PATCH 13/13] update --- .../iformall/domain/po/WxCUserBasicInfo.java | 8 ++++- .../com/iformall/service/ExcelService.java | 24 ++++++++++++++ .../impl/WxCUserBasicInfoServiceImpl.java | 32 +++++++++++++------ .../mapper/WxCUserBasicInfoMapper.xml | 15 ++++++--- 4 files changed, 64 insertions(+), 15 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index ceed2dd95..c9b2917a1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -98,7 +98,7 @@ public class WxCUserBasicInfo extends TenantEntity { private Integer status; @TableField(exist = false) - @Excel(name="标签",width = 50,orderNum = "10") + //@Excel(name="标签",width = 50,orderNum = "10") private String tagNames; @@ -119,6 +119,12 @@ public class WxCUserBasicInfo extends TenantEntity { @TableField(exist = false) private Date endTime; + + @TableField(exist = false) + private Integer begin; + + @TableField(exist = false) + private Integer limit; public String getAddressStr() { if (address == null) diff --git a/mallinkService/src/main/java/com/iformall/service/ExcelService.java b/mallinkService/src/main/java/com/iformall/service/ExcelService.java index 0116856b8..b4adfe50e 100644 --- a/mallinkService/src/main/java/com/iformall/service/ExcelService.java +++ b/mallinkService/src/main/java/com/iformall/service/ExcelService.java @@ -7,6 +7,8 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.ImportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.afterturn.easypoi.handler.inter.IExcelExportServer; + import com.iformall.common.ErrorCode; import com.iformall.exception.MallinkException; import org.apache.commons.lang3.StringUtils; @@ -37,6 +39,28 @@ public class ExcelService { defaultExport(list, pojoClass, fileName, response, exportParams, false); } + public void exportBigExcel(IExcelExportServer server,Object queryParams, String title, String sheetName, Class pojoClass, String fileName, HttpServletResponse response, boolean template) { + exportBig(server,queryParams, pojoClass, fileName, response, new ExportParams(title, sheetName, ExcelType.XSSF), template); + } + + private void exportBig(IExcelExportServer server,Object queryParams,Class pojoClass, String fileName, HttpServletResponse response, ExportParams exportParams, boolean template) { + Workbook workbook = ExcelExportUtil.exportBigExcel(exportParams, pojoClass, server, queryParams); + if (workbook != null) { + if (template) { + Sheet sheetAt = workbook.getSheetAt(0); + CellStyle cellStyle = workbook.createCellStyle(); + Font font = workbook.createFont(); + font.setColor(IndexedColors.RED.getIndex()); + cellStyle.setFont(font); + Row row = sheetAt.createRow(sheetAt.getLastRowNum() + 2); + Cell cell = row.createCell(0); + cell.setCellValue("*为必填字段(导入数据时此行文字请删除)"); + cell.setCellStyle(cellStyle); + } + } + downLoadExcel(fileName, response, workbook); + } + public void exportExcel(List list, String title, String sheetName, Class pojoClass, String fileName, HttpServletResponse response, boolean template) { defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName, ExcelType.XSSF), template); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 7a2c5349c..1295248af 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -16,6 +16,9 @@ import com.iformall.domain.vo.*; import com.iformall.enums.*; import com.iformall.mapper.*; import com.iformall.service.*; + +import cn.afterturn.easypoi.handler.inter.IExcelExportServer; + import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -38,7 +41,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @Service -public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { +public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExcelExportServer { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired @@ -656,15 +659,15 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { public void exportData(WxCUserBasicInfo basicInfo, HttpServletRequest request, HttpServletResponse response) { - List list = wxCUserBasicInfoMapper.findVoList(basicInfo); - List tagList = wxTagsMapper.findListAll(); - Map tagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName)); - list.stream().filter(u->u.getTags()!=null).forEach(u->{ - List ids = JSONObject.parseArray(u.getTags(), Long.class); - String tagNames = StringUtils.join(ids.stream().map(id->tagMap.get(id)).collect(Collectors.toList()),"/"); - u.setTagNames(tagNames); - }); - excelService.exportExcel(list, null, "会员信息", WxCUserBasicInfoVo.class, "会员信息数据.xlsx", response, false); +// List list = wxCUserBasicInfoMapper.findVoList(basicInfo); +// List tagList = wxTagsMapper.findListAll(); +// Map tagMap = tagList.stream().collect(Collectors.toMap(WxTags::getId, WxTags::getName)); +// list.stream().filter(u->u.getTags()!=null).forEach(u->{ +// List ids = JSONObject.parseArray(u.getTags(), Long.class); +// String tagNames = StringUtils.join(ids.stream().map(id->tagMap.get(id)).collect(Collectors.toList()),"/"); +// u.setTagNames(tagNames); +// }); + excelService.exportBigExcel(this,basicInfo, null, "会员信息", WxCUserBasicInfoVo.class, "会员信息数据.xlsx", response, false); } public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { @@ -1021,5 +1024,14 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { wxCUserBasicInfoMapper.updateById(wxCUserBasicInfo); return new ResultData(); } + + @Override + public List selectListForExcelExport(Object queryParams, int page) { + WxCUserBasicInfo basicInfo = (WxCUserBasicInfo) queryParams; + basicInfo.setBegin((page-1)*10000); + basicInfo.setLimit(10000); + List a = wxCUserBasicInfoMapper.findVoList(basicInfo); + return a; + } } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 6021edd5d..4cb0cd233 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -33,6 +33,11 @@ where poins >= points and tenant_id=wcubi.tenant_id order by points desc limit 1 ) level,status + + + `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`, + `create_date`,`update_date`,`tenant_id`,`parent_tenant_id`,`name`,`nick_name`,`credit`,`active_time`,`act_record` + where 1 = 1 @@ -444,17 +449,19 @@