From b8b80415cd3730ec4f8f50b81c66e0e05256c180 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 30 May 2024 09:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LoginContoller.java            | 31 +++++++------------
 .../cashierservice/service/LoginService.java  |  2 +-
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
index 463c43e..2911e96 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java
@@ -101,26 +101,16 @@ public class LoginContoller {
 //                                @RequestParam(value = "rawData", required = false) String rawData,
 //                                @RequestParam(value = "signature", required = false) String signature
     ) {
-
-
         if (ObjectUtil.isNull(map) || ObjectUtil.isEmpty(map) || !map.containsKey("code") || ObjectUtil.isEmpty(map.get("code"))) {
             Result.fail("code不能为空");
         }
-
         String code = map.get("code").toString();
-
-//        String qrCode = map.get("qrCode");
-
         String rawData = map.get("rawData");
-
         String signature = map.get("signature");
-
-//        String encryptedData = map.get("encryptedData");
-//
-//        String ivStr = map.get("iv");
-
-        String phone = map.get("phone");
-
+        String encryptedData = map.get("encryptedData");
+        String ivStr = map.get("iv");
+//        String phone = map.get("phone");
+        log.info("登录传参：入参：{}",JSONUtil.toJSONString(map));
         // 用户非敏感信息：rawData
         // 签名：signature
         JSONObject rawDataJson = JSON.parseObject(rawData);
@@ -136,12 +126,12 @@ public class LoginContoller {
         if (!signature.equals(signature2)) {
             return Result.fail("签名校验失败");
         }
-
+        String data = WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr);
+        log.info("登录传参：解码获取手机号{}",data);
+        String phone =JSONObject.parseObject(data).get("phoneNumber").toString();
         String nickName = rawDataJson.getString("nickName");
         String avatarUrl = rawDataJson.getString("avatarUrl");
-
         try {
-//            return loginService.wxCustomLogin(openid, avatarUrl, nickName, phone, qrCode, IpUtil.getIpAddr(request));
             return loginService.wxCustomLogin(openid, avatarUrl, nickName, phone, IpUtil.getIpAddr(request));
         } catch (Exception e) {
             e.printStackTrace();
@@ -158,7 +148,7 @@ public class LoginContoller {
      * @param map
      * @return
      */
-    @RequestMapping("getPhoneNumber")
+//    @RequestMapping("getPhoneNumber")
     public Result getPhoneNumber(@RequestBody Map<String, String> map) {
 
         if (ObjectUtil.isNull(map) || ObjectUtil.isEmpty(map) || !map.containsKey("code") || ObjectUtil.isEmpty(map.get("code"))) {
@@ -180,12 +170,13 @@ public class LoginContoller {
         String data = WxMaCryptUtils.decrypt(sessionKey, encryptedData, ivStr);
         try {
             if (ObjectUtil.isNotEmpty(data) && JSONObject.parseObject(data).containsKey("phoneNumber")) {
+                log.info("登录传参 获取手机号成功 sessionKey:{}\n encryptedData:{} \nivStr:{} \n data:{},",sessionKey,encryptedData,ivStr,JSONObject.parseObject(data).get("phoneNumber"));
                 return Result.success(CodeEnum.SUCCESS, JSONObject.parseObject(data).get("phoneNumber"));
             }
         } catch (Exception e){
-
+            log.info("登录传参 获取手机号失败 sessionKey:{}\n encryptedData:{} \nivStr:{} \n data:{},",sessionKey,encryptedData,ivStr,data);
         }
-        return Result.fail("获取手机号失败");
+        return Result.fail("获取手机号失败,请重试！");
     }
 
     @Resource
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
index 9587fb4..1dae9dd 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/LoginService.java
@@ -133,7 +133,7 @@ public class LoginService {
             //展示描述
             //图标
 //            map.put("", );
-            log.info("登录结果：" + JSONUtil.toJSONString(map));
+            log.info("登录传参 结果：" + JSONUtil.toJSONString(map));
             return Result.success(CodeEnum.SUCCESS, map);
         } catch (Exception e) {
             e.printStackTrace();