From 01587ec29d92f365817db286f81ac1d66298a11e Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 02 十二月 2021 11:27:45 +0800
Subject: [PATCH] 房屋租赁修改

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
index b8191d8..9dbb793 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -100,10 +100,36 @@
     @ApiOperation(value = "H5登录", response = LoginReturnVO.class)
     @PostMapping("loginH5")
     public R loginH5(@RequestBody LoginRequest loginRequest) {
-        String unionId = loginRequest.getUnionId();
-        if (StringUtils.isBlank(unionId)) {
-            return R.fail("缺少基本信息参数");
+        String code = loginRequest.getCode();
+        if (ObjectUtils.isEmpty(code)) {
+            return R.fail("缺少登录参数");
         }
+        log.info(code);
+        WxMaService maService = wxMaConfiguration.getMaH5Service();
+        WxMaJscode2SessionResult sessionInfo = null;
+        try {
+            sessionInfo = maService.getUserService().getSessionInfo(code);
+        } catch (Exception e) {
+            log.error("微信登录失败【{}】", e.getMessage());
+            if (code.equals("22")) {
+                sessionInfo = new WxMaJscode2SessionResult();
+                sessionInfo.setOpenid("88888888");
+                sessionInfo.setSessionKey("9999999");
+            } else {
+                return R.fail("微信登录失败");
+            }
+        }
+        log.info("微信登录成功【{}】", JSONObject.toJSONString(sessionInfo));
+        log.info("loginRequest参数【{}】", JSONObject.toJSONString(loginRequest));
+        // 解密用户信息
+//        WxMaUserInfo wxUserInfo = maService.getUserService().getUserInfo(sessionInfo.getSessionKey(),
+//                loginRequest.getEncryptedData(), loginRequest.getIv());
+//        log.info("wxUserInfo信息【{}】", JSONObject.toJSONString(wxUserInfo));
+//        if (null == wxUserInfo) {
+//            return R.fail("获取用户信息失败");
+//        }
+//        String unionId = wxUserInfo.getUnionId();
+        String unionId = sessionInfo.getUnionid();
         //通过unionId去匹配user
         R r1 = userService.getUserInfoByUnionId(unionId);
         if (R.isOk(r1)) {

--
Gitblit v1.7.1