From 609d91e1e62b1e8932b34b15b09baf02e7f09a93 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 10:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/util/weChat/WeChatUtil.java |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 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..34adfb8 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
@@ -5,11 +5,15 @@
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.redis.service.RedisService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 微信工具类
@@ -24,14 +28,16 @@
     @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;
+    
+    @Resource
+    private RedisService redisService;
+    
+    
 
 
     /**
@@ -39,7 +45,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);
@@ -72,13 +78,24 @@
         }
         return null;
     }
-
+    
+    
+    public String getWxAppletsAccessToken(){
+        Object wxAppletsAccessToken = redisService.getCacheObject("wxAppletsAccessToken");
+        if(null != wxAppletsAccessToken){
+            return wxAppletsAccessToken.toString();
+        }
+        String appletsAccessToken = getAppletsAccessToken();
+        redisService.setCacheObject("wxAppletsAccessToken", appletsAccessToken, 7200L, TimeUnit.SECONDS);
+        return appletsAccessToken;
+    }
+    
 
     /**
      * 获取微信小程序token
      * @return
      */
-    public String getWxAppletsAccessToken() throws Exception{
+    public String getAppletsAccessToken() {
         String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + wxAppletsAppid + "&secret=" + wxAppletsAppSecret;
         HttpRequest get = HttpUtil.createGet(url);
         HttpResponse response = get.execute();

--
Gitblit v1.7.1