|
@@ -29,17 +29,18 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
|
|
String[] strs = token.split("#");
|
|
String[] strs = token.split("#");
|
|
String loginName = strs[1];
|
|
String loginName = strs[1];
|
|
if (loginConfig.adminLoginConfig().getLoginName().equals(loginName)
|
|
if (loginConfig.adminLoginConfig().getLoginName().equals(loginName)
|
|
- || loginConfig.inspectionLoginConfig().getLoginName().equals(loginName)) {
|
|
|
|
|
|
+// || loginConfig.inspectionLoginConfig().getLoginName().equals(loginName)
|
|
|
|
+ ) {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
// else if (loginConfig.clientLoginConfig().getLoginName().equals(loginName)) {
|
|
// else if (loginConfig.clientLoginConfig().getLoginName().equals(loginName)) {
|
|
// response.sendError(HttpStatus.UNAUTHORIZED.value(), "该账户只能在采集端登录");
|
|
// response.sendError(HttpStatus.UNAUTHORIZED.value(), "该账户只能在采集端登录");
|
|
// return false;
|
|
// return false;
|
|
// }
|
|
// }
|
|
- else if (loginConfig.uploadLoginConfig().getLoginName().equals(loginName)) {
|
|
|
|
- response.sendError(HttpStatus.UNAUTHORIZED.value(), "该账户只能在图片客户端登录");
|
|
|
|
- return false;
|
|
|
|
- }
|
|
|
|
|
|
+// else if (loginConfig.uploadLoginConfig().getLoginName().equals(loginName)) {
|
|
|
|
+// response.sendError(HttpStatus.UNAUTHORIZED.value(), "该账户只能在图片客户端登录");
|
|
|
|
+// return false;
|
|
|
|
+// }
|
|
AbstractUser user = markUserRepo.findByLoginName(loginName);
|
|
AbstractUser user = markUserRepo.findByLoginName(loginName);
|
|
if (Objects.equals(Role.COLLECTOR, ((MarkUser) user).getRole())) {
|
|
if (Objects.equals(Role.COLLECTOR, ((MarkUser) user).getRole())) {
|
|
response.sendError(HttpStatus.UNAUTHORIZED.value(), "该账户只能在采集端登录");
|
|
response.sendError(HttpStatus.UNAUTHORIZED.value(), "该账户只能在采集端登录");
|