Commit b1101470 authored by 唐峰's avatar 唐峰

微信登录接口和接口定义不一致,修正

parent 6ff67d4d
...@@ -3,6 +3,8 @@ package cn.quantgroup.xyqb.model.v2.login; ...@@ -3,6 +3,8 @@ package cn.quantgroup.xyqb.model.v2.login;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class WechatMiniLoginParam extends BaseLoginParam{ public class WechatMiniLoginParam extends BaseLoginParam{
...@@ -13,6 +15,9 @@ public class WechatMiniLoginParam extends BaseLoginParam{ ...@@ -13,6 +15,9 @@ public class WechatMiniLoginParam extends BaseLoginParam{
/** /**
* 微信login的code * 微信login的code
* 接口定义的是token,修正
*/ */
private String code; //private String code;
@NotNull
private String token;
} }
...@@ -11,7 +11,9 @@ public class WechatMiniPhoneLoginParam extends WechatMiniLoginParam { ...@@ -11,7 +11,9 @@ public class WechatMiniPhoneLoginParam extends WechatMiniLoginParam {
/** /**
* 手机号获取凭证 * 手机号获取凭证
*/ */
//@NotNull
//private String phoneCode;
@NotNull @NotNull
private String phoneCode; private String phoneToken;
} }
...@@ -64,7 +64,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy { ...@@ -64,7 +64,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy {
//1、微信登录逻辑 //1、微信登录逻辑
WechatConfigBean wechatConfigBean = wechatConfiguration.getByAppIdAndTenantId(loginParam.getAppId(), sessionStruct.getTenantId()); WechatConfigBean wechatConfigBean = wechatConfiguration.getByAppIdAndTenantId(loginParam.getAppId(), sessionStruct.getTenantId());
String response = wechatRemoteService.login(wechatConfigBean.getAppId(), wechatConfigBean.getAppSecret(), ((WechatMiniLoginParam) param).getCode()); String response = wechatRemoteService.login(wechatConfigBean.getAppId(), wechatConfigBean.getAppSecret(), ((WechatMiniLoginParam) param).getToken());
Type resultType = new TypeToken<Map<String, String>>() { Type resultType = new TypeToken<Map<String, String>>() {
}.getType(); }.getType();
...@@ -76,7 +76,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy { ...@@ -76,7 +76,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy {
assert responseMap != null; assert responseMap != null;
if (responseMap.containsKey("errcode") && Integer.parseInt(responseMap.get("errcode")) != 0) { if (responseMap.containsKey("errcode") && Integer.parseInt(responseMap.get("errcode")) != 0) {
log.error("code:{},errcode:{},errmsg:{}", ((WechatMiniLoginParam) param).getCode(), responseMap.get("errcode"), log.error("code:{},errcode:{},errmsg:{}", ((WechatMiniLoginParam) param).getToken(), responseMap.get("errcode"),
responseMap.get("errmsg")); responseMap.get("errmsg"));
throw new BizException(BizExceptionEnum.ERROR_WECHAT_LOGIN, responseMap.get("errmsg")); throw new BizException(BizExceptionEnum.ERROR_WECHAT_LOGIN, responseMap.get("errmsg"));
} else { } else {
......
...@@ -76,7 +76,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy { ...@@ -76,7 +76,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
//1、微信登录逻辑 //1、微信登录逻辑
WechatConfigBean wechatConfigBean = wechatConfiguration.getByAppIdAndTenantId(loginParam.getAppId(), sessionStruct.getTenantId()); WechatConfigBean wechatConfigBean = wechatConfiguration.getByAppIdAndTenantId(loginParam.getAppId(), sessionStruct.getTenantId());
String response = wechatRemoteService.login(wechatConfigBean.getAppId(), wechatConfigBean.getAppSecret(), ((WechatMiniLoginParam) param).getCode()); String response = wechatRemoteService.login(wechatConfigBean.getAppId(), wechatConfigBean.getAppSecret(), ((WechatMiniLoginParam) param).getToken());
Type resultType = new TypeToken<Map<String, String>>() { Type resultType = new TypeToken<Map<String, String>>() {
}.getType(); }.getType();
...@@ -88,7 +88,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy { ...@@ -88,7 +88,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
assert responseMap != null; assert responseMap != null;
if (responseMap.containsKey("errcode") && Integer.parseInt(responseMap.get("errcode")) != 0) { if (responseMap.containsKey("errcode") && Integer.parseInt(responseMap.get("errcode")) != 0) {
log.error("code:{},errcode:{},errmsg:{}", ((WechatMiniLoginParam) param).getCode(), responseMap.get("errcode"), log.error("code:{},errcode:{},errmsg:{}", ((WechatMiniLoginParam) param).getToken(), responseMap.get("errcode"),
responseMap.get("errmsg")); responseMap.get("errmsg"));
throw new BizException(BizExceptionEnum.ERROR_WECHAT_LOGIN, responseMap.get("errmsg")); throw new BizException(BizExceptionEnum.ERROR_WECHAT_LOGIN, responseMap.get("errmsg"));
} else { } else {
...@@ -103,7 +103,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy { ...@@ -103,7 +103,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
Map<String, String> phoneParam = new HashMap<>(); Map<String, String> phoneParam = new HashMap<>();
boolean register = false; boolean register = false;
User user; User user;
phoneParam.put("code", loginParam.getPhoneCode()); phoneParam.put("code", loginParam.getPhoneToken());
AccessTokenResponse accessTokenResponse = JSON.parseObject(redisTemplate.opsForValue().get(Constants.WECHAT_ACCESS_TOKEN_REDIS + sessionStruct.getTenantId() + ":" + loginParam.getAppId()), AccessTokenResponse.class); AccessTokenResponse accessTokenResponse = JSON.parseObject(redisTemplate.opsForValue().get(Constants.WECHAT_ACCESS_TOKEN_REDIS + sessionStruct.getTenantId() + ":" + loginParam.getAppId()), AccessTokenResponse.class);
if (Objects.isNull(accessTokenResponse)) { if (Objects.isNull(accessTokenResponse)) {
throw new BizException(BizExceptionEnum.EXPIRE_WECHAT_TOKEN); throw new BizException(BizExceptionEnum.EXPIRE_WECHAT_TOKEN);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment