From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001 From: puhanshu <a9236326> Date: 星期二, 16 八月 2022 19:08:32 +0800 Subject: [PATCH] 服务范围优化 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java index c43d26a..97945b0 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java @@ -16,6 +16,7 @@ import com.panzhihua.applets.umf.UmfPayUtil; import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.utlis.DateUtils; +import com.panzhihua.common.utlis.MimeTypeUtils; import net.coobird.thumbnailator.Thumbnails; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.RandomUtils; @@ -42,6 +43,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; + +import static com.panzhihua.common.utlis.FileTypeUploadUtils.assertAllowed; /** * @program: springcloud_k8s_panzhihuazhihuishequ @@ -86,6 +89,8 @@ private CommunityService communityService; @Resource private MinioUtil minioUtil; + @Resource + private UmfPayUtil umfPayUtil; public static void main(String[] args) { // int nextInt = RandomUtils.nextInt(99999, 1000000); @@ -154,6 +159,7 @@ @PostMapping(value = "/uploadimages", consumes = "multipart/*", headers = "content-type=multipart/form-date") public R uploadImages(@RequestParam MultipartFile file, HttpServletRequest request) { try { + assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); String extension = FilenameUtils.getExtension(file.getOriginalFilename()); String name = UUID.randomUUID().toString().replaceAll("-", "") + "." + extension; String imageUrl = minioUtil.upload(file, name); @@ -168,6 +174,7 @@ @PostMapping(value = "/uploadimagescompress", consumes = "multipart/*", headers = "content-type=multipart/form-date") public R uploadImagesComPress(@RequestParam MultipartFile file, HttpServletRequest request) { try { + assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); String extension = FilenameUtils.getExtension(file.getOriginalFilename()); String uuid=UUID.randomUUID().toString().replaceAll("-", ""); String name = uuid + "."+ extension; @@ -209,18 +216,7 @@ @ApiOperation("uu洗车下单接口") @GetMapping("/uuPay") public R uuPay(@RequestParam("orderid") String orderid,@RequestParam("openid")String openid,@RequestParam("amount")String amount){ - SFTPUtil sftp = new SFTPUtil(userName, password, host, port); - sftp.login(); - try { - sftp.download("/mnt/data/web/excel/", "53461_.key.p8", "D:/mnt/data/web/file/53461_.key.p8"); - } catch (SftpException e) { - e.printStackTrace(); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } - sftp.logout(); - UmfPayUtil umfPayUtil=new UmfPayUtil(); - Map map=umfPayUtil.pay(openid, DateUtils.getCurrentDateString(),openid,amount); + Map map=umfPayUtil.pay(orderid, DateUtils.getCurrentDateString(),openid,amount); return R.ok(map); } } -- Gitblit v1.7.1