From dc288bf6ab1201894c6668fc5899dffb53eb7e49 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 10:59:53 +0800
Subject: [PATCH] Merge branch 'local_20221115' into local_20221104
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 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 b6c0204..68827d7 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
@@ -3,18 +3,16 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-
import com.panzhihua.applets.config.MinioUtil;
+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;
@@ -24,7 +22,6 @@
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-
import com.alibaba.fastjson.JSON;
import com.panzhihua.applets.config.WxMaConfiguration;
import com.panzhihua.common.constants.Constants;
@@ -36,11 +33,12 @@
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.HttpUtils;
import com.panzhihua.common.utlis.SFTPUtil;
-
import cn.binarywang.wx.miniapp.api.WxMaSecCheckService;
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
@@ -85,6 +83,8 @@
private CommunityService communityService;
@Resource
private MinioUtil minioUtil;
+ @Resource
+ private UmfPayUtil umfPayUtil;
public static void main(String[] args) {
// int nextInt = RandomUtils.nextInt(99999, 1000000);
@@ -153,6 +153,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);
@@ -167,13 +168,16 @@
@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;
- minioUtil.upload(file, name);
- Thumbnails.of(file.getInputStream()).scale(0.3).outputQuality(0.51).outputFormat("jpg").toFile(uuid+"_compress");
+ String fileName = minioUtil.uploadRetFileName(file, name);
+ Thumbnails.of(file.getInputStream()).scale(0.5).outputQuality(0.71).outputFormat("jpg").toFile(uuid+"_compress");
File file1=new File(uuid+"_compress.jpg");
String imageUrl = minioUtil.uploadFile(file1, uuid+"_compress.jpg");
+ //上传完压缩图后把原图清理，防止文件服务器资源爆满
+ minioUtil.removeMinio(fileName);
return R.ok(imageUrl);
} catch (Exception e) {
log.error("上传照片失败【{}】", e.getMessage());
@@ -205,4 +209,16 @@
String result = HttpUtils.sendGet(url, param);
return R.ok(JSON.parseObject(result));
}
+ @ApiOperation("uu洗车下单接口")
+ @GetMapping("/uuPay")
+ public R uuPay(@RequestParam("orderid") String orderid,@RequestParam("openid")String openid,@RequestParam("amount")String amount){
+ Map map=umfPayUtil.pay(orderid, DateUtils.getCurrentDateString(),openid,amount);
+ return R.ok(map);
+ }
+ @ApiOperation("无水洗车下单接口")
+ @GetMapping("/wsPay")
+ public R wsPay(@RequestParam("orderid") String orderid,@RequestParam("openid")String openid,@RequestParam("amount")String amount){
+ Map map=umfPayUtil.pay2(orderid, DateUtils.getCurrentDateString(),openid,amount);
+ return R.ok(map);
+ }
}
--
Gitblit v1.7.1