From 4b5eb2ee5cfcffe55a72e29a388c75715eb45d28 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 23 十月 2024 20:52:07 +0800
Subject: [PATCH] bug修改

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
index 4d5e00f..a3d64ac 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java
@@ -15,6 +15,7 @@
 import com.ruoyi.account.wx.pojo.AppletUserEncrypteData;
 import com.ruoyi.account.wx.tools.WxAppletTools;
 import com.ruoyi.account.wx.tools.WxUtils;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.FileUploadUtils;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -37,6 +38,7 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -63,11 +65,14 @@
     private WeixinProperties wxConfig;
     @Autowired
     private RestTemplate wxRestTemplate;
+    @Resource
+    private RedisService redisService;
+
     /**
      * 上传文件存储在本地的根路径
      */
-    @Value("${file.upload.location}")
-    private String localFilePath;
+//    @Value("${file.upload.location}")
+//    private String localFilePath;
 
 
 
@@ -76,7 +81,7 @@
     @PostMapping("/openIdByJsCode")
     public AjaxResult<Map<String, Object>> openIdByJsCode(@RequestBody AppletUserEncrypteData data) {
         log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", data.getCode());
-        WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig);
+        WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisService);
         Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
         String openid = body.getOpenid();
         String sessionKey = body.getSessionKey();
@@ -113,7 +118,7 @@
     public AjaxResult getQRCode() {
         InputStream inputStream = null;
         OutputStream outputStream = null;
-        WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig);
+        WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisService);
         String accessToken = appletTools.getAccessToken("");
         try {
             String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken;
@@ -162,5 +167,16 @@
         }
         return AjaxResult.success();
     }
-
+    
+    
+    /**
+     * 获取微信token
+     * @return
+     */
+    @PostMapping("/getWXToken")
+    public R<String> getWXToken(){
+        WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisService);
+        String accessToken = appletTools.getAccessToken("");
+        return R.ok(accessToken);
+    }
 }

--
Gitblit v1.7.1