登录修改

xuhy

2024-08-22 017d50501d66cdf5b7018078dcca1aa8331785c7

登录修改

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AliLoginController.java

@@ -58,11 +58,11 @@
        if (response.isSuccess()) {
            // 获取用户信息
//            AlipayUserInfoShareResponse userInfo = new AliAppletTools(aliProperties).getUserInfo(response.getAccessToken());
            // 获取用户手机号
            String phoneNumber = new AliAppletTools(aliProperties).getPhoneNumber(appletUserLogin.getToken());
            if(StringUtils.isEmpty(phoneNumber)){
            if(StringUtils.isEmpty(appletUserLogin.getToken())){
                return AjaxResult.success();
            }
            // 获取用户手机号
            String phoneNumber = new AliAppletTools(aliProperties).getPhoneNumber(appletUserLogin.getToken());
            log.info("获取支付宝用户信息:{}", phoneNumber);
            // 用户信息封装
            return AjaxResult.success(appUserService.aliLogin(response,phoneNumber));

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/WxLoginController.java

@@ -60,10 +60,10 @@
//        if (StringUtils.isNotBlank(data.getSignature())) {
//            WxUtils.verifySignature(data.getRawData(), sessionKey, data.getSignature());
//        }
        AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey,  data.getIv());
        if(StringUtils.isEmpty(appletUserDecodeData.getPhoneNumber())){
        if(StringUtils.isEmpty(data.getEncryptedData()) || StringUtils.isEmpty(data.getIv())){
            return AjaxResult.success();
        }
        AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey,  data.getIv());
        appletUserDecodeData.setOpenId(openid);
        return AjaxResult.success(appUserService.wxLogin(appletUserDecodeData));
    }