diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java index a5469b46..e955879e 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java @@ -1,5 +1,6 @@ package com.mdd.front.controller; +import com.baomidou.mybatisplus.core.toolkit.Assert; import com.mdd.common.core.AjaxResult; import com.mdd.common.utils.ConfigUtil; import com.mdd.front.LikeFrontThreadLocal; @@ -61,8 +62,9 @@ public class UserController { */ @PostMapping("/mnpMobile") public Object mnpMobile(@RequestBody Map params) { - iUserService.mnpMobile(params); - return AjaxResult.success(); + Assert.notNull(params.get("code"), "code参数缺失"); + Map map = iUserService.mnpMobile(params.get("code").trim()); + return AjaxResult.success(map); } } diff --git a/server/like-front/src/main/java/com/mdd/front/service/IUserService.java b/server/like-front/src/main/java/com/mdd/front/service/IUserService.java index a5ee1be0..0637f87c 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IUserService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IUserService.java @@ -28,6 +28,13 @@ public interface IUserService { */ UserInfoVo info(Integer userId); - void mnpMobile(Map params); + /** + * 微信手机 + * + * @author fzr + * @param code 获取手机号的Code + * @return Map + */ + Map mnpMobile(String code); } diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java index 3bb7f6a4..97f38b2c 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java @@ -10,6 +10,7 @@ import com.mdd.common.entity.system.SystemConfig; import com.mdd.common.entity.user.User; import com.mdd.common.entity.user.UserAuth; import com.mdd.common.enums.ClientEnum; +import com.mdd.common.exception.OperateException; import com.mdd.common.mapper.system.SystemConfigMapper; import com.mdd.common.mapper.user.UserAuthMapper; import com.mdd.common.mapper.user.UserMapper; @@ -24,6 +25,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.LinkedHashMap; import java.util.Map; /** @@ -104,9 +106,13 @@ public class UserServiceImpl implements IUserService { /** * 微信手机号 + * + * @author fzr + * @param code 获取手机号的Code + * @return Map */ @Override - public void mnpMobile(Map params) { + public Map mnpMobile(String code) { Map config = ConfigUtil.get("mp_channel"); WxMaService wxMaService = new WxMaServiceImpl(); WxMaDefaultConfigImpl wxConfig = new WxMaDefaultConfigImpl(); @@ -115,17 +121,15 @@ public class UserServiceImpl implements IUserService { wxMaService.setWxMaConfig(wxConfig); try { -// String sessionKey = ""; -// String encryptedData = params.get("encryptedData"); -// String ivStr = params.get("iv"); - WxMaPhoneNumberInfo wxMaPhoneNumberInfo = wxMaService.getUserService() - .getNewPhoneNoInfo("0330FG000I3kwO1Ui81000ZRkr00FG0Y"); - System.out.println(wxMaPhoneNumberInfo); + WxMaPhoneNumberInfo wxMaPhoneNumberInfo = wxMaService.getUserService().getNewPhoneNoInfo(code); + Map response = new LinkedHashMap<>(); + response.put("countryCode", wxMaPhoneNumberInfo.getCountryCode()); + response.put("phoneNumber", wxMaPhoneNumberInfo.getPhoneNumber()); + return response; } catch (WxErrorException e) { - System.out.println(e.getError()); + throw new OperateException(e.getError().getErrorCode() + ", " + e.getError().getErrorMsg()); } - } }