Commit 42c176ea authored by 技术部-任文超's avatar 技术部-任文超

重构:提取常量 "x-auth-token"

parent f48edd99
...@@ -12,6 +12,7 @@ public interface Constants { ...@@ -12,6 +12,7 @@ public interface Constants {
String PASSWORD_SALT = "_lkb"; String PASSWORD_SALT = "_lkb";
String IMAGE_CAPTCHA_KEY = "img_captcha:"; String IMAGE_CAPTCHA_KEY = "img_captcha:";
String X_AUTH_TOKEN = "x-auth-token";
String ONE_TIME_TOKEN = "oneTimeToken"; String ONE_TIME_TOKEN = "oneTimeToken";
String REDIS_PASSWORD_ERROR_COUNT = "password_error_4_phone:"; String REDIS_PASSWORD_ERROR_COUNT = "password_error_4_phone:";
String REDIS_CAPTCHA_KEY = "auth:"; String REDIS_CAPTCHA_KEY = "auth:";
......
...@@ -679,7 +679,7 @@ public class MotanUserServiceImpl implements UserMotanService { ...@@ -679,7 +679,7 @@ public class MotanUserServiceImpl implements UserMotanService {
return returnErrorValue("用户未登录"); return returnErrorValue("用户未登录");
} }
String checkUrl = xyqbAuthUrl+"/innerapi/is_login"; String checkUrl = xyqbAuthUrl+"/innerapi/is_login";
ImmutableMap<String, String> headMap = ImmutableMap.of("x-auth-token", token); ImmutableMap<String, String> headMap = ImmutableMap.of(Constants.X_AUTH_TOKEN, token);
String response = httpService.get(checkUrl, headMap, null); String response = httpService.get(checkUrl, headMap, null);
log.info("去向函谷关查询用户信息,response:[{}]",response); log.info("去向函谷关查询用户信息,response:[{}]",response);
JsonResult result = JSONObject.parseObject(response, JsonResult.class); JsonResult result = JSONObject.parseObject(response, JsonResult.class);
...@@ -722,7 +722,7 @@ public class MotanUserServiceImpl implements UserMotanService { ...@@ -722,7 +722,7 @@ public class MotanUserServiceImpl implements UserMotanService {
}else { }else {
log.info("去向函谷关查询用户信息"); log.info("去向函谷关查询用户信息");
String checkUrl = xyqbAuthUrl+"/innerapi/is_login"; String checkUrl = xyqbAuthUrl+"/innerapi/is_login";
ImmutableMap<String, String> headMap = ImmutableMap.of("x-auth-token", token); ImmutableMap<String, String> headMap = ImmutableMap.of(Constants.X_AUTH_TOKEN, token);
String response = httpService.get(checkUrl, headMap, null); String response = httpService.get(checkUrl, headMap, null);
log.info("去向函谷关查询用户信息,response:[{}]",response); log.info("去向函谷关查询用户信息,response:[{}]",response);
JsonResult result = JSONObject.parseObject(response, JsonResult.class); JsonResult result = JSONObject.parseObject(response, JsonResult.class);
......
package cn.quantgroup.xyqb.controller.external.queryLog; package cn.quantgroup.xyqb.controller.external.queryLog;
import cn.quantgroup.xyqb.Constants;
import cn.quantgroup.xyqb.entity.Address; import cn.quantgroup.xyqb.entity.Address;
import cn.quantgroup.xyqb.entity.UserDetail; import cn.quantgroup.xyqb.entity.UserDetail;
import cn.quantgroup.xyqb.entity.UserQueryLog; import cn.quantgroup.xyqb.entity.UserQueryLog;
...@@ -75,7 +76,7 @@ public class UserQueryLogController { ...@@ -75,7 +76,7 @@ public class UserQueryLogController {
public JsonResult queryLog(HttpServletRequest request,@RequestParam(required=false) String beginDate,@RequestParam(required=false) String endDate, Integer pageId, Integer pageSize) { public JsonResult queryLog(HttpServletRequest request,@RequestParam(required=false) String beginDate,@RequestParam(required=false) String endDate, Integer pageId, Integer pageSize) {
LOGGER.info("查询日期:beginDate{},endDate{}",beginDate,endDate); LOGGER.info("查询日期:beginDate{},endDate{}",beginDate,endDate);
String token=request.getHeader("x-auth-token"); String token=request.getHeader(Constants.X_AUTH_TOKEN);
if(token==null||token.equals("")){ if(token==null||token.equals("")){
LOGGER.info("token为空,非法查询"); LOGGER.info("token为空,非法查询");
return JsonResult.buildErrorStateResult("缺少授权信息",null); return JsonResult.buildErrorStateResult("缺少授权信息",null);
...@@ -142,7 +143,7 @@ public class UserQueryLogController { ...@@ -142,7 +143,7 @@ public class UserQueryLogController {
public JsonResult queryForResult(HttpServletRequest request,String key,String keyValues, String columns,Integer pageId,Integer pageSize) { public JsonResult queryForResult(HttpServletRequest request,String key,String keyValues, String columns,Integer pageId,Integer pageSize) {
LOGGER.info("查询条件:key{},columns{}",key,columns); LOGGER.info("查询条件:key{},columns{}",key,columns);
String token=request.getHeader("x-auth-token"); String token=request.getHeader(Constants.X_AUTH_TOKEN);
if(token==null||token.equals("")){ if(token==null||token.equals("")){
LOGGER.info("token为空,非法查询"); LOGGER.info("token为空,非法查询");
return JsonResult.buildErrorStateResult("缺少授权信息",null); return JsonResult.buildErrorStateResult("缺少授权信息",null);
...@@ -372,7 +373,7 @@ public class UserQueryLogController { ...@@ -372,7 +373,7 @@ public class UserQueryLogController {
public JsonResult exportExcel(final HttpServletResponse response, HttpServletRequest request,String key,String keyValues, String columns){ public JsonResult exportExcel(final HttpServletResponse response, HttpServletRequest request,String key,String keyValues, String columns){
String token=request.getHeader("x-auth-token"); String token=request.getHeader(Constants.X_AUTH_TOKEN);
if(token==null||token.equals("")){ if(token==null||token.equals("")){
LOGGER.info("token为空,非法查询"); LOGGER.info("token为空,非法查询");
return JsonResult.buildErrorStateResult("缺少授权信息",null); return JsonResult.buildErrorStateResult("缺少授权信息",null);
......
package cn.quantgroup.xyqb.controller.internal.login; package cn.quantgroup.xyqb.controller.internal.login;
import cn.quantgroup.xyqb.Constants;
import cn.quantgroup.xyqb.controller.IBaseController; import cn.quantgroup.xyqb.controller.IBaseController;
import cn.quantgroup.xyqb.entity.User; import cn.quantgroup.xyqb.entity.User;
import cn.quantgroup.xyqb.entity.UserBtRegister; import cn.quantgroup.xyqb.entity.UserBtRegister;
...@@ -15,9 +16,7 @@ import com.google.common.collect.ImmutableMap; ...@@ -15,9 +16,7 @@ import com.google.common.collect.ImmutableMap;
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;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
...@@ -67,12 +66,12 @@ public class AuthInfoController implements IBaseController { ...@@ -67,12 +66,12 @@ public class AuthInfoController implements IBaseController {
// 函谷关去查token 返回值高仿 // 函谷关去查token 返回值高仿
log.info("去向函谷关查询用户信息"); log.info("去向函谷关查询用户信息");
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request.getHeader("x-auth-token"); String token = request.getHeader(Constants.X_AUTH_TOKEN);
if(StringUtils.isBlank(token) ||token.length() != 36){ if(StringUtils.isBlank(token) ||token.length() != 36){
return JsonResult.buildErrorStateResult("用户未登录",null); return JsonResult.buildErrorStateResult("用户未登录",null);
} }
String checkUrl = xyqbAuthUrl+"/innerapi/is_login"; String checkUrl = xyqbAuthUrl+"/innerapi/is_login";
ImmutableMap<String, String> headMap = ImmutableMap.of("x-auth-token", token); ImmutableMap<String, String> headMap = ImmutableMap.of(Constants.X_AUTH_TOKEN, token);
String response = httpService.get(checkUrl, headMap, null); String response = httpService.get(checkUrl, headMap, null);
log.info("去向函谷关查询用户信息,response:[{}]",response); log.info("去向函谷关查询用户信息,response:[{}]",response);
JsonResult result = JSONObject.parseObject(response, JsonResult.class); JsonResult result = JSONObject.parseObject(response, JsonResult.class);
......
...@@ -27,7 +27,7 @@ public class XyqbSessionContextHolder { ...@@ -27,7 +27,7 @@ public class XyqbSessionContextHolder {
return threadSession.get(); return threadSession.get();
} }
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request.getHeader("x-auth-token"); String token = request.getHeader(Constants.X_AUTH_TOKEN);
if (token == null || token.length() != 36) { if (token == null || token.length() != 36) {
return null; return null;
} }
...@@ -54,7 +54,7 @@ public class XyqbSessionContextHolder { ...@@ -54,7 +54,7 @@ public class XyqbSessionContextHolder {
public static SessionStruct getXSessionFromRedis(){ public static SessionStruct getXSessionFromRedis(){
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String token = request.getHeader("x-auth-token"); String token = request.getHeader(Constants.X_AUTH_TOKEN);
if (token == null || token.length() != 36) { if (token == null || token.length() != 36) {
return null; return null;
} }
......
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