|
@@ -5,14 +5,11 @@ import cn.efunbox.audio.service.DeviceService;
|
|
|
import cn.efunbox.audio.utils.ApiCode;
|
|
|
import cn.efunbox.audio.utils.HttpUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.RequestHeader;
|
|
|
import org.springframework.web.servlet.HandlerInterceptor;
|
|
|
import org.springframework.web.servlet.ModelAndView;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* 用户验证拦截器
|
|
@@ -43,8 +40,8 @@ public class AuthInterceptor implements HandlerInterceptor {
|
|
|
if(device==null){
|
|
|
HttpUtil.responseApiCode(request, response, ApiCode.NOT_FOUND);
|
|
|
return false;
|
|
|
- }else if((device.getTokenNew()==null || false == device.getTokenNew().equalsIgnoreCase(token))
|
|
|
- && (device.getTokenOld()==null || false == device.getTokenOld().equalsIgnoreCase(token))){
|
|
|
+ }else if(device.getTokenNew()==null || !device.getTokenNew().equalsIgnoreCase(token)
|
|
|
+ || device.getTokenOld()==null || !device.getTokenOld().equalsIgnoreCase(token)){
|
|
|
HttpUtil.responseApiCode(request,response, ApiCode.INVALID_TOKEN);
|
|
|
return false;
|
|
|
}
|