From 6c235963d6fc46b38ea59d9b19c6519b892e080b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 May 2022 09:42:06 +0800
Subject: [PATCH] 20220516 逻辑删除，更新字段IS_Delete字段为已删除，默认为空，删除后其余信息从查询中过滤了
---
zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java | 51 ++++++++++++++++-----------------------------------
1 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java b/zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java
index 7b0c2a4..bb73ee2 100644
--- a/zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java
+++ b/zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.PropertiesUtil;
import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.constance.AppConstance;
import org.apache.http.HttpResponse;
@@ -11,22 +10,25 @@
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.*;
+import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
import java.io.*;
import java.util.HashMap;
import java.util.Map;
-
+@Component
public class WxacodeUtil {
- /**
- * 小程序秘钥
- */
- private static final String XCX_SECRET = "xcx_secret";
- /**
- * 小程序appid
- */
- private static final String XCX_APPID = "xcx_appid";
+
+
+ @Value("${file_storage_path}")
+ private String fileStoragePath;
+
+ @Value("${static_resource_url}")
+ private String staticResourceUrl;
+
+
/**
* token获取地址
*/
@@ -37,11 +39,9 @@
*/
private static final String GET_WXACODE ="https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=";
- public static String getWxacode(String scene,String page,String fileName) throws Exception {
+ public String getWxacode(String scene,String page,String fileName,String appid,String secret) throws Exception {
LogUtil.debug("scene={},page={},fileName={}",scene,page,fileName);
//获取token
- String appid = PropertiesUtil.getString(XCX_APPID);
- String secret = PropertiesUtil.getString(XCX_SECRET);
String result1 = get(TOKEN_URL.replace("APPID", appid).replace("SECRET", secret));
String access_token = JSONObject.parseObject(result1).getString("access_token");
if(StringUtils.isNotBlank(access_token)) {
@@ -61,24 +61,13 @@
HttpResponse response;
response = httpClient.execute(httpPost);
InputStream inputStream = response.getEntity().getContent();
- /*Object inputObj= response.getEntity().getContent();
- if(inputObj instanceof InputStream){
- String strError = streamToString(inputStream,"GBK");
- LogUtil.info("-------------二维码生成------"+strError);
- return "error：" + strError;
- }*/
// 图片保存目录路径
- String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+ String baseSavePath = fileStoragePath;
File targetFile = new File(baseSavePath);
if(!targetFile.exists()){
targetFile.mkdirs();
}
-
- /*String inputstreamtofile = inputstreamtofile(inputStream, targetFile);
- if(null != inputstreamtofile){
- return inputstreamtofile;
- }*/
// 创建图片文件夹
baseSavePath += "wxacode" + File.separatorChar;
@@ -89,23 +78,15 @@
String qrcodePath = baseSavePath + fileName + ".png";
FileOutputStream out = new FileOutputStream(qrcodePath);
LogUtil.debug("qrcodePath:{}",qrcodePath);
- //本地调试创建（不用删）
- /*String filePath = "e:/test.png";
- File file = new File(filePath);
- if (!file.exists()) {
- file.mkdir();
- }
- FileOutputStream outs = new FileOutputStream(file);*/
+
byte[] buffer = new byte[1024];
int bytesRead = 0;
while((bytesRead = inputStream.read(buffer, 0, 1024)) != -1) {
out.write(buffer, 0, bytesRead);
- //outs.write(buffer, 0, bytesRead);
+
}
out.flush();
out.close();
- //outs.flush();
- //outs.close();
return qrcodePath;
} else {
--
Gitblit v1.9.1