修复h5、小程序绑定手机号

This commit is contained in:
xuwenbo
2020-07-30 13:55:48 +08:00
parent 8a6e29b72b
commit d0c3ab1fcb

View File

@ -1,135 +1,133 @@
///** /**
// * Copyright (C) 2018-2020 * Copyright (C) 2018-2020
// * All rights reserved, Designed By www.yixiang.co * All rights reserved, Designed By www.yixiang.co
// * 注意: * 注意:
// * 本软件为www.yixiang.co开发研制未经购买不得使用 * 本软件为www.yixiang.co开发研制未经购买不得使用
// * 购买后可获得全部源代码禁止转卖、分享、上传到码云、github等开源平台 * 购买后可获得全部源代码禁止转卖、分享、上传到码云、github等开源平台
// * 一经发现盗用、分享等行为,将追究法律责任,后果自负 * 一经发现盗用、分享等行为,将追究法律责任,后果自负
// */ */
//package co.yixiang.modules.wechat.rest.rest; package co.yixiang.modules.wechat.rest.controller;
//
//import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.WxMaService;
//import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
//import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
//import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
//import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
//import co.yixiang.commonold.api.ApiResult; import co.yixiang.api.ApiResult;
//import co.yixiang.exception.ErrorRequestException; import co.yixiang.common.bean.LocalUser;
//import co.yixiang.modules.user.entity.YxUser; import co.yixiang.exception.BadRequestException;
//import co.yixiang.modules.user.service.YxUserService; import co.yixiang.exception.ErrorRequestException;
//import co.yixiang.modules.user.service.YxWechatUserService; import co.yixiang.modules.user.domain.YxUser;
//import co.yixiang.modules.user.rest.vo.YxUserQueryVo; import co.yixiang.modules.user.service.YxUserService;
//import co.yixiang.modules.wechat.rest.param.BindPhoneParam; import co.yixiang.modules.user.vo.YxUserQueryVo;
//import co.yixiang.modules.wechat.rest.param.WxPhoneParam; import co.yixiang.modules.wechat.rest.param.BindPhoneParam;
//import co.yixiang.mp.config.ShopKeyUtils; import co.yixiang.modules.wechat.rest.param.WxPhoneParam;
//import co.yixiang.utils.RedisUtil; import co.yixiang.utils.RedisUtil;
//import co.yixiang.utils.RedisUtils; import co.yixiang.utils.RedisUtils;
//import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.SecurityUtils;
//import io.swagger.annotations.Api; import co.yixiang.utils.ShopKeyUtils;
//import io.swagger.annotations.ApiOperation; import io.swagger.annotations.Api;
//import lombok.RequiredArgsConstructor; import io.swagger.annotations.ApiOperation;
//import me.chanjar.weixin.commonold.error.WxErrorException; import lombok.RequiredArgsConstructor;
//import org.springframework.beans.factory.annotation.Autowired; import me.chanjar.weixin.common.error.WxErrorException;
//import org.springframework.validation.annotation.Validated; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.rest.bind.annotation.PostMapping; import org.springframework.validation.annotation.Validated;
//import org.springframework.rest.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.rest.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestBody;
// import org.springframework.web.bind.annotation.RestController;
//import java.util.LinkedHashMap;
//import java.util.Map; import java.util.LinkedHashMap;
// import java.util.Map;
///**
// * @author hupeng /**
// * @date 2020/02/07 * @author hupeng
// */ * @date 2020/02/07
//@RestController */
//@RequiredArgsConstructor(onConstructor = @__(@Autowired)) @RestController
//@Api(value = "微信其他", tags = "微信:微信其他", description = "微信其他") @RequiredArgsConstructor(onConstructor = @__(@Autowired))
//public class WxMaUserController { @Api(value = "微信其他", tags = "微信:微信其他", description = "微信其他")
// public class WxMaUserController {
// private final WxMaService wxMaService;
// private final YxWechatUserService wechatUserService; private final WxMaService wxMaService;
// private final YxUserService userService; private final YxUserService userService;
// private final RedisUtils redisUtils; private final RedisUtils redisUtils;
//
//
//
// @PostMapping("/binding") @PostMapping("/binding")
// @ApiOperation(value = "公众号绑定手机号", notes = "公众号绑定手机号") @ApiOperation(value = "公众号绑定手机号", notes = "公众号绑定手机号")
// public ApiResult<String> verify(@Validated @RequestBody BindPhoneParam param) { public ApiResult<String> verify(@Validated @RequestBody BindPhoneParam param) {
//
// Object codeObj = redisUtils.get("code_" + param.getPhone()); Object codeObj = redisUtils.get("code_" + param.getPhone());
// if(codeObj == null){ if(codeObj == null){
// return ApiResult.fail("请先获取验证码"); return ApiResult.fail("请先获取验证码");
// } }
// String code = codeObj.toString(); String code = codeObj.toString();
//
//
// if (!StrUtil.equals(code, param.getCaptcha())) { if (!StrUtil.equals(code, param.getCaptcha())) {
// return ApiResult.fail("验证码错误"); return ApiResult.fail("验证码错误");
// } }
// YxUser user = LocalUser.getUser();
// int uid = SecurityUtils.getUserId().intValue(); YxUserQueryVo userQueryVo = userService.getYxUserById(user.getUid());
// YxUserQueryVo userQueryVo = userService.getYxUserById(uid); if(StrUtil.isNotBlank(userQueryVo.getPhone())){
// if(StrUtil.isNotBlank(userQueryVo.getPhone())){ return ApiResult.fail("您的账号已经绑定过手机号码");
// return ApiResult.fail("您的账号已经绑定过手机号码"); }
// }
// YxUser yxUser = new YxUser();
// YxUser yxUser = new YxUser(); yxUser.setPhone(param.getPhone());
// yxUser.setPhone(param.getPhone()); yxUser.setUid(user.getUid());
// yxUser.setUid(uid); userService.updateById(yxUser);
// userService.updateById(yxUser);
// return ApiResult.ok("绑定成功");
// return ApiResult.ok("绑定成功");
// }
// }
//
//
// @PostMapping("/wxapp/binding")
// @PostMapping("/wxapp/binding") @ApiOperation(value = "小程序绑定手机号", notes = "小程序绑定手机号")
// @ApiOperation(value = "小程序绑定手机号", notes = "小程序绑定手机号") public ApiResult<Map<String,Object>> phone(@Validated @RequestBody WxPhoneParam param) {
// public ApiResult<Map<String,Object>> phone(@Validated @RequestBody WxPhoneParam param) { YxUser user = LocalUser.getUser();
// YxUserQueryVo userQueryVo = userService.getYxUserById(user.getUid());
// int uid = SecurityUtils.getUserId().intValue(); if(StrUtil.isNotBlank(userQueryVo.getPhone())){
// YxUserQueryVo userQueryVo = userService.getYxUserById(uid); throw new BadRequestException("您的账号已经绑定过手机号码");
// if(StrUtil.isNotBlank(userQueryVo.getPhone())){ }
// return ApiResult.fail("您的账号已经绑定过手机号码");
// } //读取redis配置
// String appId = RedisUtil.get(ShopKeyUtils.getWxAppAppId());
// //读取redis配置 String secret = RedisUtil.get(ShopKeyUtils.getWxAppSecret());
// String appId = RedisUtil.get(ShopKeyUtils.getWxAppAppId()); if (StrUtil.isBlank(appId) || StrUtil.isBlank(secret)) {
// String secret = RedisUtil.get(ShopKeyUtils.getWxAppSecret()); throw new ErrorRequestException("请先配置小程序");
// if (StrUtil.isBlank(appId) || StrUtil.isBlank(secret)) { }
// throw new ErrorRequestException("请先配置小程序"); WxMaDefaultConfigImpl wxMaConfig = new WxMaDefaultConfigImpl();
// } wxMaConfig.setAppid(appId);
// WxMaDefaultConfigImpl wxMaConfig = new WxMaDefaultConfigImpl(); wxMaConfig.setSecret(secret);
// wxMaConfig.setAppid(appId); wxMaService.setWxMaConfig(wxMaConfig);
// wxMaConfig.setSecret(secret); String phone = "";
// wxMaService.setWxMaConfig(wxMaConfig); try {
// String phone = ""; WxMaJscode2SessionResult session = wxMaService.getUserService()
// try { .getSessionInfo(param.getCode());
// WxMaJscode2SessionResult session = wxMaService.getUserService()
// .getSessionInfo(param.getCode()); // 解密
// WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService()
// // 解密 .getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
// WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService()
// .getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv()); phone = phoneNoInfo.getPhoneNumber();
// YxUser yxUser = new YxUser();
// phone = phoneNoInfo.getPhoneNumber(); yxUser.setPhone(phone);
// YxUser yxUser = new YxUser(); yxUser.setUid(user.getUid());
// yxUser.setPhone(phone); userService.updateById(yxUser);
// yxUser.setUid(uid); } catch (WxErrorException e) {
// userService.updateById(yxUser); throw new BadRequestException(e.getMessage());
// } catch (WxErrorException e) { //e.printStackTrace();
// return ApiResult.fail(e.getMessage()); }
// //e.printStackTrace(); Map<String,Object> map = new LinkedHashMap<>();
// } map.put("phone",phone);
// Map<String,Object> map = new LinkedHashMap<>();
// map.put("phone",phone); return ApiResult.ok(map,"绑定成功");
// }
// return ApiResult.ok(map,"绑定成功");
// }
//
// }
//
//}