From 3dd77daecb9ee7492cfb60fde72b01e062f85c98 Mon Sep 17 00:00:00 2001
From: liupopo <liuzp315@tom.com>
Date: Wed, 20 Dec 2023 13:54:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8Fappid=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/yyth/biz/lpkcustomer/LpkCustomerService.java | 12 +++++++++---
 src/main/resources/application-devv.yml              |  4 ++++
 src/main/resources/application-pro.yml               |  7 ++++++-
 src/main/resources/application-test.yml              |  5 +++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java b/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java
index d9fde7d..f779cf2 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkcustomer/LpkCustomerService.java
@@ -17,6 +17,7 @@ import com.yxt.yyth.api.lpkcustomer.LpkCustomerQuery;
 import com.yxt.yyth.api.lpkcustomer.LpkCustomerVo;
 import com.yxt.yyth.api.lpkcustomer.WxBindMobileDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
@@ -33,13 +34,18 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
 
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Value("${weixin.miniprogram.appid:wx4724e3a3c27f36b5}")
+    String APP_ID;
+    @Value("${weixin.miniprogram.secret:971fd3b8aa7b08ce3e8a5f3e502b1a8d}")
+    String SECRET;
+
 // 汇融惠享
-    String APP_ID = "wx4724e3a3c27f36b5";
-    String SECRET = "971fd3b8aa7b08ce3e8a5f3e502b1a8d";
+//    String APP_ID = "wx4724e3a3c27f36b5";
+//    String SECRET = "971fd3b8aa7b08ce3e8a5f3e502b1a8d";
 //  汇融云眼
 //    String APP_ID = "wx11565021714ba796";
 //    String SECRET = "eb511fbb5f864cdabc3d044b639814c9";
-//  汇融惠家
+//  汇融惠农
 //    String APP_ID = "wx97c0a62c6d65207f";
 //    String SECRET = "e4572da4407573213377cd00e422397d";
     private static final String WX_URL_LOGIN = "https://api.weixin.qq.com/sns/jscode2session?appid=APPID&secret=SECRET&js_code=JSCODE&grant_type=authorization_code ";
diff --git a/src/main/resources/application-devv.yml b/src/main/resources/application-devv.yml
index e0b41dc..b06eb24 100644
--- a/src/main/resources/application-devv.yml
+++ b/src/main/resources/application-devv.yml
@@ -33,3 +33,7 @@ image:
     path: D:/works/projects/yxt/yxtgit/lipinka/yxt-yyth-biz/target/classes/static/upload/
   url:
     prefix: http:// 192.168.2.103:7201/upload/
+weixin:
+  miniprogram:
+    appid: wx97c0a62c6d65207f
+    secret: e4572da4407573213377cd00e422397d
\ No newline at end of file
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index de9a858..f784a80 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -26,4 +26,9 @@ image:
   url:
     prefix: https://supervise.yxtsoft.com/lpk/upload/
 import:
-  filePath: D:/yxt-supervise-gf/upload/
\ No newline at end of file
+  filePath: D:/yxt-supervise-gf/upload/
+
+weixin:
+  miniprogram:
+    appid: wx4724e3a3c27f36b5
+    secret: 971fd3b8aa7b08ce3e8a5f3e502b1a8d
\ No newline at end of file
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 9626203..1dccdc5 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -32,3 +32,8 @@ image:
     path: /home/lzh/docker_data/nginx/html/lipinka/yyth-ui/upload/
   url:
     prefix: https://lpk.yyundong.com/upload/
+
+weixin:
+  miniprogram:
+    appid: wx97c0a62c6d65207f
+    secret: e4572da4407573213377cd00e422397d
\ No newline at end of file