|
|
|
@ -15,10 +15,7 @@ import com.hai.common.exception.ErrorCode; |
|
|
|
|
import com.hai.common.exception.ErrorHelp; |
|
|
|
|
import com.hai.common.exception.SysCode; |
|
|
|
|
import com.hai.common.security.*; |
|
|
|
|
import com.hai.common.utils.HttpsUtils; |
|
|
|
|
import com.hai.common.utils.IDGenerator; |
|
|
|
|
import com.hai.common.utils.RedisUtil; |
|
|
|
|
import com.hai.common.utils.ResponseMsgUtil; |
|
|
|
|
import com.hai.common.utils.*; |
|
|
|
|
import com.hai.entity.HighUser; |
|
|
|
|
import com.hai.model.HighUserModel; |
|
|
|
|
import com.hai.model.ResponseData; |
|
|
|
@ -90,6 +87,11 @@ public class WechatController { |
|
|
|
|
@RequestParam(value = "regionId", required = false) String regionId, |
|
|
|
|
HttpServletRequest request, HttpServletResponse response) { |
|
|
|
|
try { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 记录登录信息
|
|
|
|
|
String requestIp = RequestUtils.getIpAddress(request); |
|
|
|
|
|
|
|
|
|
log.error("origin encryptedData:" + encryptedData + ";iv:" + iv); |
|
|
|
|
//校验openId不能为空
|
|
|
|
|
//encryptedData,iv与unionId不能同时为空
|
|
|
|
@ -113,6 +115,7 @@ public class WechatController { |
|
|
|
|
throw ErrorHelp.genException(SysCode.MiniProgram, ErrorCode.WECHAT_DECRYPT_ERROR, "用户phoneNumber解析失败"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 根据手机号查询用户
|
|
|
|
|
HighUser user = highUserService.findByPhone(phoneNoInfo.getPurePhoneNumber()); |
|
|
|
|
if (user == null) { |
|
|
|
|