From 1e322e359ad16e6bd48f3f5f30d3f1fcde564942 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 六月 2022 15:49:13 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 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 513bd86..c43d26a 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
@@ -1,20 +1,21 @@
package com.panzhihua.applets.api;
import java.io.File;
+import java.io.FileNotFoundException;
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.jcraft.jsch.SftpException;
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 net.coobird.thumbnailator.Thumbnails;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.RandomUtils;
@@ -77,6 +78,8 @@
private int port;
@Value("${ftp.url}")
private String url;
+ @Value("${minio.url}")
+ private String minUrl;
@Resource
private WxMaConfiguration wxMaConfiguration;
@Resource
@@ -166,11 +169,13 @@
public R uploadImagesComPress(@RequestParam MultipartFile file, HttpServletRequest request) {
try {
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
- String uuid=UUID.randomUUID().toString().replaceAll("-", "") + ".";
- String name = uuid + extension;
- String imageUrl = minioUtil.upload(file, name);
- Thumbnails.of(file.getInputStream()).scale(1).outputQuality(0.25).outputFormat("jpg").toFile("D://image/compress"+uuid);
- return R.ok(url + "/idcard/compress" + uuid+".jpg");
+ String uuid=UUID.randomUUID().toString().replaceAll("-", "");
+ String name = uuid + "."+ extension;
+ minioUtil.upload(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");
+ return R.ok(imageUrl);
} catch (Exception e) {
log.error("上传照片失败【{}】", e.getMessage());
return R.fail();
@@ -201,4 +206,21 @@
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){
+ 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);
+ return R.ok(map);
+ }
}
--
Gitblit v1.7.1