From d2542a6123fa6834e01ed3af23c7ba0a02696bc6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 16:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java
index 7322624..31b295c 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java
@@ -24,13 +24,10 @@
     @Value("${wx.appletsAppSecret}")
     private String wxAppletsAppSecret;
 
-    @Value("{wx.officialAccountAppSecret}")
-    private String officialAccountAppSecret;
-
-    @Value("${wx.appid}")
+//    @Value("${wx.appid}")
     private String webAppId;
 
-    @Value("${wx.appSecret}")
+//    @Value("${wx.appSecret}")
     private String webAppSecret;
 
 
@@ -39,7 +36,7 @@
      * @param jscode
      * @return
      */
-    public Map<String, Object> code2Session(String jscode) throws Exception{
+    public Map<String, Object> code2Session(String jscode) {
         String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + wxAppletsAppid + "&secret=" + wxAppletsAppSecret
                 + "&js_code=" + jscode + "&grant_type=authorization_code";
         HttpRequest get = HttpUtil.createGet(url);

--
Gitblit v1.7.1