|
|
|
@@ -222,33 +222,33 @@ public class WxUserGrantController extends BaseController { |
|
|
|
|
|
|
|
String token = null; |
|
|
|
String session_key = null; |
|
|
|
String openId = "opvcM5IEkl0U5pNiHcN49Ens40jU"; |
|
|
|
String openId = null; |
|
|
|
String unionId = null; |
|
|
|
boolean boolHaveUnionId = false; |
|
|
|
boolean boolFindByUnionId = false; |
|
|
|
Long userId = null; |
|
|
|
|
|
|
|
// try { |
|
|
|
// WxMaJscode2SessionResult session = wxMaService.jsCode2SessionInfo(code); |
|
|
|
// logger.info("sessionResult: " + session); |
|
|
|
// if (null != session) { |
|
|
|
// logger.info("sessionResultDetail: [openid]" + session.getOpenid()+",[sessionkey]"+session.getSessionKey()+",[unionid]"+session.getUnionid()); |
|
|
|
try { |
|
|
|
WxMaJscode2SessionResult session = wxMaService.jsCode2SessionInfo(code); |
|
|
|
logger.info("sessionResult: " + session); |
|
|
|
if (null != session) { |
|
|
|
logger.info("sessionResultDetail: [openid]" + session.getOpenid()+",[sessionkey]"+session.getSessionKey()+",[unionid]"+session.getUnionid()); |
|
|
|
} |
|
|
|
|
|
|
|
//获取会话密钥(session_key) |
|
|
|
session_key = session.getSessionKey(); |
|
|
|
openId = session.getOpenid(); |
|
|
|
unionId = session.getUnionid(); |
|
|
|
// if (StringUtils.isNotBlank(unionId)) { |
|
|
|
// boolHaveUnionId = true; |
|
|
|
// } |
|
|
|
// |
|
|
|
// //获取会话密钥(session_key) |
|
|
|
// session_key = session.getSessionKey(); |
|
|
|
// openId = session.getOpenid(); |
|
|
|
// unionId = session.getUnionid(); |
|
|
|
//// if (StringUtils.isNotBlank(unionId)) { |
|
|
|
//// boolHaveUnionId = true; |
|
|
|
//// } |
|
|
|
// |
|
|
|
// logger.info("session_key: " + session_key + ", openId: " + openId + ", unionId: " + unionId); |
|
|
|
// resultMap.put("openId", openId); |
|
|
|
// } catch (WxErrorException e) { |
|
|
|
// logger.error(e.getMessage(), e); |
|
|
|
// return new ResultData(ErrorCode.SESSION_KEY_DECODE_ERR, resultMap); |
|
|
|
// } |
|
|
|
|
|
|
|
logger.info("session_key: " + session_key + ", openId: " + openId + ", unionId: " + unionId); |
|
|
|
resultMap.put("openId", openId); |
|
|
|
} catch (WxErrorException e) { |
|
|
|
logger.error(e.getMessage(), e); |
|
|
|
return new ResultData(ErrorCode.SESSION_KEY_DECODE_ERR, resultMap); |
|
|
|
} |
|
|
|
|
|
|
|
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); |
|
|
|
String ipaddress = IPUtil.getIpAddr(request); |
|
|
|
@@ -277,7 +277,7 @@ public class WxUserGrantController extends BaseController { |
|
|
|
} |
|
|
|
if (oldUser != null) { |
|
|
|
// 已有用户 |
|
|
|
token = oldUser.createToken(new Date()); |
|
|
|
token = oldUser.createToken(new Date(),oldUser.getTenantId()); |
|
|
|
|
|
|
|
resultMap.put("token", token); |
|
|
|
request.setAttribute(Constant.LOGIN_USER_KEY, oldUser.getId()); |
|
|
|
@@ -357,7 +357,7 @@ public class WxUserGrantController extends BaseController { |
|
|
|
if(StringUtils.isNotBlank(wxMall.getParentTenantId())){ |
|
|
|
newUser.setParentTenantId(wxMall.getParentTenantId()); |
|
|
|
} |
|
|
|
token = newUser.createToken(new Date()); |
|
|
|
token = newUser.createToken(new Date(),newUser.getTenantId()); |
|
|
|
|
|
|
|
newUser.setRegisterIp(ipaddress); |
|
|
|
if (StringUtils.isNotBlank(sceneAddress) && |
|
|
|
|