From df5ef3c9f7e86b669fbbae2157aeb783a060967f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 24 Sep 2024 10:42:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=BE=AE=E4=BF=A1=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=92=8C=E6=94=AF=E4=BB=98=E5=AE=9D=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=99=BB=E5=BD=95=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/auth/LoginFilter.java | 4 ++-- .../system/cashierservice/controller/LoginContoller.java | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java index f15ea8e..cb6cfc2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/auth/LoginFilter.java @@ -95,7 +95,7 @@ public class LoginFilter implements Filter { return; } - //environment 环境标识 wx app 后续environment不可为空 + //environment 环境标识 wx alipay app 后续environment不可为空 String environment = request.getHeader("environment"); // 判断用户TOKEN是否存在 @@ -131,7 +131,7 @@ public class LoginFilter implements Filter { String userId = jsonObject1.getString("userId"); tokenKey=RedisCst.ONLINE_APP_USER.concat(userId); //获取redis中的token - }else if(environment.equals("wx")){ + }else if(environment.equals("wx") || environment.equals("alipay")){ //获取当前登录人的用户id String openId = jsonObject1.getString("openId"); if(StringUtils.isBlank(openId)){ 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 ab82adf..0d08fc5 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java @@ -2,7 +2,6 @@ package com.chaozhanggui.system.cashierservice.controller; import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alipay.api.AlipayApiException; import com.chaozhanggui.system.cashierservice.alipayUtil.AlipayUtil; @@ -110,18 +109,13 @@ public class LoginContoller { String source = map.getOrDefault("source",AuthSource.WECHAT.getValue()); String code = map.get("code"); if(AuthSource.WECHAT.getValue().equals(source)){ - String rawData = map.get("rawData"); - // 签名：signature - JSONObject rawDataJson = JSON.parseObject(rawData); // 1.接收小程序发送的code // 2.开发者服务器 登录凭证校验接口 appi + appsecret + code JSONObject SessionKeyOpenId = WechatUtil.getSessionKeyOrOpenId(code, customAppId, customSecrete); // 3.接收微信接口服务 获取返回的参数 String openid = SessionKeyOpenId.getString("openid"); - String nickName = rawDataJson.getString("nickName"); - String avatarUrl = rawDataJson.getString("avatarUrl"); try { - return loginService.wxCustomLogin(openid, avatarUrl, nickName, "", IpUtil.getIpAddr(request)); + return loginService.wxCustomLogin(openid, "", "", "", IpUtil.getIpAddr(request)); } catch (Exception e) { e.printStackTrace(); }