合并微信小程序和支付宝小程序登录入口
This commit is contained in:
@@ -80,6 +80,7 @@ public class AlipayUtil {
|
|||||||
log.error("获取支付宝用户信息失败,错误码:{},错误信息:{}", e.getErrCode(), e.getErrMsg());
|
log.error("获取支付宝用户信息失败,错误码:{},错误信息:{}", e.getErrCode(), e.getErrMsg());
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
log.info("获取支付宝用户信息成功,返回结果:{}", response.getBody());
|
||||||
//调用失败
|
//调用失败
|
||||||
if (!response.isSuccess()) {
|
if (!response.isSuccess()) {
|
||||||
log.error("获取支付宝用户信息失败,错误码:{},错误信息:{}", response.getSubCode(), response.getSubMsg());
|
log.error("获取支付宝用户信息失败,错误码:{},错误信息:{}", response.getSubCode(), response.getSubMsg());
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ import com.chaozhanggui.system.cashierservice.util.MD5Utils;
|
|||||||
import com.chaozhanggui.system.cashierservice.util.StringUtil;
|
import com.chaozhanggui.system.cashierservice.util.StringUtil;
|
||||||
import com.chaozhanggui.system.cashierservice.util.TokenUtil;
|
import com.chaozhanggui.system.cashierservice.util.TokenUtil;
|
||||||
import com.chaozhanggui.system.cashierservice.wxUtil.WechatUtil;
|
import com.chaozhanggui.system.cashierservice.wxUtil.WechatUtil;
|
||||||
import lombok.SneakyThrows;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
@@ -100,7 +99,6 @@ public class LoginContoller {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@RequestMapping("/auth/custom/login")
|
@RequestMapping("/auth/custom/login")
|
||||||
@SneakyThrows
|
|
||||||
public Result authCustomLogin(HttpServletRequest request, @RequestBody Map<String, String> map) {
|
public Result authCustomLogin(HttpServletRequest request, @RequestBody Map<String, String> map) {
|
||||||
if (ObjectUtil.isNull(map) || ObjectUtil.isEmpty(map) || !map.containsKey("code") || ObjectUtil.isEmpty(map.get("code"))) {
|
if (ObjectUtil.isNull(map) || ObjectUtil.isEmpty(map) || !map.containsKey("code") || ObjectUtil.isEmpty(map.get("code"))) {
|
||||||
Result.fail("code不能为空");
|
Result.fail("code不能为空");
|
||||||
@@ -109,12 +107,17 @@ public class LoginContoller {
|
|||||||
String source = map.getOrDefault("source",AuthSource.WECHAT.getValue());
|
String source = map.getOrDefault("source",AuthSource.WECHAT.getValue());
|
||||||
String code = map.get("code");
|
String code = map.get("code");
|
||||||
if(AuthSource.WECHAT.getValue().equals(source)){
|
if(AuthSource.WECHAT.getValue().equals(source)){
|
||||||
// 1.接收小程序发送的code
|
|
||||||
// 2.开发者服务器 登录凭证校验接口 appi + appsecret + code
|
|
||||||
JSONObject SessionKeyOpenId = WechatUtil.getSessionKeyOrOpenId(code, customAppId, customSecrete);
|
|
||||||
// 3.接收微信接口服务 获取返回的参数
|
|
||||||
String openid = SessionKeyOpenId.getString("openid");
|
|
||||||
try {
|
try {
|
||||||
|
// 1.接收小程序发送的code
|
||||||
|
// 2.开发者服务器 登录凭证校验接口 appi + appsecret + code
|
||||||
|
JSONObject wxResp = WechatUtil.getSessionKeyOrOpenId(code, customAppId, customSecrete);
|
||||||
|
Integer errCode = wxResp.getInteger("errcode");
|
||||||
|
log.debug("微信获取openid响应报文:{}", wxResp.toJSONString());
|
||||||
|
if (errCode.intValue() != 0) {
|
||||||
|
return Result.fail("登录失败:" + wxResp.getString("errmsg"));
|
||||||
|
}
|
||||||
|
// 3.接收微信接口服务 获取返回的参数
|
||||||
|
String openid = wxResp.getString("openid");
|
||||||
return loginService.wxCustomLogin(openid, "", "", "", IpUtil.getIpAddr(request));
|
return loginService.wxCustomLogin(openid, "", "", "", IpUtil.getIpAddr(request));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
@@ -133,7 +136,6 @@ public class LoginContoller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Result.fail("登录失败");
|
return Result.fail("登录失败");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user