|
@@ -79,10 +79,9 @@ public class AppTmUserController {
|
|
|
@ResponseBody
|
|
|
public Result userLogin(@RequestBody @ApiParam(name="登录请求实体",value="传入json格式",required=true) LoginVo loginVo) {
|
|
|
|
|
|
+
|
|
|
if (!StringUtils.isNoneBlank(loginVo.getWxCode(), loginVo.getIv(),
|
|
|
- loginVo.getRawData(), loginVo.getEncryptedData()
|
|
|
- ,loginVo.getWxUserInfoDto().getAvatarUrl()
|
|
|
- ,loginVo.getWxUserInfoDto().getNickName())) {
|
|
|
+ loginVo.getRawData(), loginVo.getEncryptedData())) {
|
|
|
throw new CommonBaseException(ResultCodeEnum.D017);
|
|
|
}
|
|
|
|
|
@@ -356,32 +355,35 @@ public class AppTmUserController {
|
|
|
throw new CommonBaseException(ResultCodeEnum.D017);
|
|
|
}
|
|
|
|
|
|
- Map<String, Object> wxResult = WxOpUtils.tryLoginWx(delegationVo.getWxCode() , userWxAppId, userWxAppSecret);
|
|
|
- String wxSessionKey = (String) wxResult.get(WxOpUtils.SESSION_KEY);
|
|
|
- String wxOpenId = (String) wxResult.get(WxOpUtils.WX_OPEN_ID_KEY);
|
|
|
- String decryptPhoneNum = null;
|
|
|
- try {
|
|
|
- JSONObject resultJson = WXCore.decrypt(wxOpenId, delegationVo.getEncryptedData(), wxSessionKey, delegationVo.getIv());
|
|
|
- decryptPhoneNum = null != resultJson ? resultJson.getString(CommonConstants.WxConstant.WX_PHONE_NUMBER) : "";
|
|
|
- log.info("解密出来的手机号码为:{}", decryptPhoneNum);
|
|
|
- } catch (Exception e) {
|
|
|
- log.error("解密手机号出现异常:{}", e);
|
|
|
- throw new CommonBaseException(ResultCodeEnum.D039);
|
|
|
- }
|
|
|
- if(StringUtils.isBlank(decryptPhoneNum)){
|
|
|
- throw new CommonBaseException(ResultCodeEnum.D039);
|
|
|
- }
|
|
|
- log.info("上送的userId={}" , delegationVo.getUserId());
|
|
|
- //TODO这里获取的地方要改
|
|
|
+// Map<String, Object> wxResult = WxOpUtils.tryLoginWx(delegationVo.getWxCode() , userWxAppId, userWxAppSecret);
|
|
|
+// String wxSessionKey = (String) wxResult.get(WxOpUtils.SESSION_KEY);
|
|
|
+// String wxOpenId = (String) wxResult.get(WxOpUtils.WX_OPEN_ID_KEY);
|
|
|
+// String decryptPhoneNum = null;
|
|
|
+ String wxOpenId = "122";
|
|
|
+ String decryptPhoneNum = "12";
|
|
|
+
|
|
|
+// try {
|
|
|
+// JSONObject resultJson = WXCore.decrypt(wxOpenId, delegationVo.getEncryptedData(), wxSessionKey, delegationVo.getIv());
|
|
|
+// decryptPhoneNum = null != resultJson ? resultJson.getString(CommonConstants.WxConstant.WX_PHONE_NUMBER) : "";
|
|
|
+// log.info("解密出来的手机号码为:{}", decryptPhoneNum);
|
|
|
+// } catch (Exception e) {
|
|
|
+// log.error("解密手机号出现异常:{}", e);
|
|
|
+// throw new CommonBaseException(ResultCodeEnum.D039);
|
|
|
+// }
|
|
|
+// if(StringUtils.isBlank(decryptPhoneNum)){
|
|
|
+// throw new CommonBaseException(ResultCodeEnum.D039);
|
|
|
+// }
|
|
|
+// log.info("上送的userId={}" , delegationVo.getUserId());
|
|
|
+// //TODO这里获取的地方要改
|
|
|
TmUser tmUser = tmUserDao.selectTmUsers(delegationVo.getUserId());
|
|
|
TmAgency tmAgency = tmAgencyDao.selectTmAgencyById(delegationVo.getAgencyUserId());
|
|
|
- if(null == tmUser || null == tmAgency){
|
|
|
- throw new CommonBaseException(ResultCodeEnum.D101 , "用户或者经纪人数据缺失");
|
|
|
- }
|
|
|
- if(StringUtils.isNotBlank(tmUser.getWxOpenId()) && !StringUtils.equals(tmUser.getWxOpenId() , wxOpenId)){
|
|
|
- log.info("上送的wxOpenId={}, 数据库中的是openId={}" , wxOpenId , tmUser.getWxOpenId());
|
|
|
- throw new CommonBaseException(ResultCodeEnum.D101 , "上送的openId和数据中的不一致");
|
|
|
- }
|
|
|
+// if(null == tmUser || null == tmAgency){
|
|
|
+// throw new CommonBaseException(ResultCodeEnum.D101 , "用户或者经纪人数据缺失");
|
|
|
+// }
|
|
|
+// if(StringUtils.isNotBlank(tmUser.getWxOpenId()) && !StringUtils.equals(tmUser.getWxOpenId() , wxOpenId)){
|
|
|
+// log.info("上送的wxOpenId={}, 数据库中的是openId={}" , wxOpenId , tmUser.getWxOpenId());
|
|
|
+// throw new CommonBaseException(ResultCodeEnum.D101 , "上送的openId和数据中的不一致");
|
|
|
+// }
|
|
|
|
|
|
if(StringUtils.isBlank(tmUser.getWxOpenId())){
|
|
|
tmUser.setWxOpenId(wxOpenId);
|