From 281dc31c4a4d4e2cf266dd65a470c7d29e4e7332 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 20 Apr 2022 08:24:18 +0800
Subject: [PATCH] fix:修复距离计算精度损失问题

---
 zq-erp/src/main/java/com/matrix/component/tools/WxacodeUtil.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 1bd3bc1..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,15 +10,23 @@
 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 {
 
+
+    @Value("${file_storage_path}")
+    private String fileStoragePath;
+
+    @Value("${static_resource_url}")
+    private String staticResourceUrl;
 
 
 	/**
@@ -32,7 +39,7 @@
 	 */
 	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,String appid,String secret) 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 result1 = get(TOKEN_URL.replace("APPID", appid).replace("SECRET", secret));
@@ -56,7 +63,7 @@
             InputStream inputStream = response.getEntity().getContent();
 
             // 图片保存目录路径
-    		String baseSavePath = PropertiesUtil.getString(AppConstance.FILES_TORAGE_PATH);
+    		String baseSavePath = fileStoragePath;
             File targetFile = new File(baseSavePath);
             if(!targetFile.exists()){
                 targetFile.mkdirs();

--
Gitblit v1.9.1