Commit 6ff67d4d authored by 唐峰's avatar 唐峰

stms鉴权去掉默认通过规则

parent af34f6ee
...@@ -36,9 +36,6 @@ public class StmsInnerInterceptor implements HandlerInterceptor { ...@@ -36,9 +36,6 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
if (true) {
return true;
}
//所有开放出去的外部接口,都需要验证租户id和注册来源 //所有开放出去的外部接口,都需要验证租户id和注册来源
String tenantId = request.getHeader(Constants.X_AUTH_TENANT); String tenantId = request.getHeader(Constants.X_AUTH_TENANT);
String registeredFrom = request.getHeader(Constants.X_AUTH_FROM); String registeredFrom = request.getHeader(Constants.X_AUTH_FROM);
...@@ -57,7 +54,7 @@ public class StmsInnerInterceptor implements HandlerInterceptor { ...@@ -57,7 +54,7 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
} }
SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(stmsToken, Integer.valueOf(tenantId),org.apache.commons.lang3.StringUtils.isEmpty(registeredFrom) ? null:Long.valueOf(registeredFrom)); SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(stmsToken, Integer.valueOf(tenantId),org.apache.commons.lang3.StringUtils.isEmpty(registeredFrom) ? null:Long.valueOf(registeredFrom));
log.info("从redis获取sessionStruct结果:{}",JSONObject.toJSONString(sessionStruct));
if (sessionStruct == null) { if (sessionStruct == null) {
OauthResult oauthResult = stmsRemoteService.checkToken(stmsToken); OauthResult oauthResult = stmsRemoteService.checkToken(stmsToken);
if (oauthResult != null && 2000 == oauthResult.getCode()) { if (oauthResult != null && 2000 == oauthResult.getCode()) {
...@@ -74,6 +71,7 @@ public class StmsInnerInterceptor implements HandlerInterceptor { ...@@ -74,6 +71,7 @@ public class StmsInnerInterceptor implements HandlerInterceptor {
} else { } else {
//session续期 //session续期
sessionService.persistSession(sessionStruct.getSid(), sessionStruct.getValues(), sessionStruct.getTenantId()); sessionService.persistSession(sessionStruct.getSid(), sessionStruct.getValues(), sessionStruct.getTenantId());
log.info("sessionStruct需求完成:{}",JSONObject.toJSONString(sessionStruct));
} }
//校验接口权限 //校验接口权限
......
...@@ -66,7 +66,6 @@ public class SMSLoginStrategy implements LoginStrategy { ...@@ -66,7 +66,6 @@ public class SMSLoginStrategy implements LoginStrategy {
public LoginBean login(BaseLoginParam param) { public LoginBean login(BaseLoginParam param) {
SMSLoginParam smsLoginParam = (SMSLoginParam) param; SMSLoginParam smsLoginParam = (SMSLoginParam) param;
SessionStruct sessionStruct = XyqbSessionContextHolder.getXSession(); SessionStruct sessionStruct = XyqbSessionContextHolder.getXSession();
sessionStruct = sessionStruct == null ? new SessionStruct() : sessionStruct;
// 执行短信验证码检查 // 执行短信验证码检查
verifyPhoneAndCodeForOnce(smsLoginParam.getPhone(), smsLoginParam.getCode()); verifyPhoneAndCodeForOnce(smsLoginParam.getPhone(), smsLoginParam.getCode());
......
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