wangliang 4 lat temu
rodzic
commit
30a2e8fb3b
19 zmienionych plików z 19 dodań i 269 usunięć
  1. 3 9
      themis-backend/src/main/java/com/qmth/themis/backend/api/SysController.java
  2. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBExamInvigilateUserController.java
  3. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBOrgController.java
  4. 1 5
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java
  5. 1 2
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamActivityController.java
  6. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamController.java
  7. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamPaperController.java
  8. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java
  9. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/api/TEStudentController.java
  10. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/aspect/ApiControllerAspect.java
  11. 1 1
      themis-backend/src/main/java/com/qmth/themis/backend/interceptor/AuthInterceptor.java
  12. 0 228
      themis-backend/src/main/java/com/qmth/themis/backend/util/ServletUtil.java
  13. 0 10
      themis-business/src/main/java/com/qmth/themis/business/service/impl/CacheServiceImpl.java
  14. 1 2
      themis-business/src/main/java/com/qmth/themis/business/util/ServletUtil.java
  15. 1 1
      themis-common/src/main/java/com/qmth/themis/common/enums/ExceptionResultEnum.java
  16. 1 1
      themis-exam/src/main/java/com/qmth/themis/exam/api/TEExamController.java
  17. 1 1
      themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java
  18. 1 1
      themis-exam/src/main/java/com/qmth/themis/exam/aspect/ApiControllerAspect.java
  19. 1 1
      themis-exam/src/main/java/com/qmth/themis/exam/interceptor/AuthInterceptor.java

+ 3 - 9
themis-backend/src/main/java/com/qmth/themis/backend/api/SysController.java

@@ -3,7 +3,6 @@ package com.qmth.themis.backend.api;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.themis.backend.config.DictionaryConfig;
-import com.qmth.themis.backend.util.ServletUtil;
 import com.qmth.themis.business.config.SystemConfig;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.*;
@@ -11,6 +10,7 @@ import com.qmth.themis.business.enums.DownloadFileEnum;
 import com.qmth.themis.business.enums.RoleEnum;
 import com.qmth.themis.business.service.*;
 import com.qmth.themis.business.util.EhcacheUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
@@ -72,14 +72,8 @@ public class SysController {
         if (Objects.isNull(tbUser)) {
             throw new BusinessException(ExceptionResultEnum.LOGIN_NO);
         }
-        List<TBPrivilege> tbPrivilegeList = null;
-//        if (Objects.nonNull(tbUser.getRemark()) && Objects.equals(tbUser.getRemark(), RoleEnum.SUPER_ADMIN.getCode())) {
-//            QueryWrapper<TBPrivilege> wrapper = new QueryWrapper<>();
-//            wrapper.lambda().eq(TBPrivilege::getType, SystemConstant.MENU).orderByAsc(TBPrivilege::getParentId, TBPrivilege::getSequence);
-//            tbPrivilegeList = tbPrivilegeService.list(wrapper);
-//        } else {
-        tbPrivilegeList = tbPrivilegeService.getMenu(tbUser.getId());
-//        }
+        List<TBPrivilege> tbPrivilegeList = tbPrivilegeService.getMenu(tbUser.getId());
+        ;
         Map map = new HashMap();
         map.put(SystemConstant.RECORDS, tbPrivilegeList);
         return ResultUtil.ok(map);

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TBExamInvigilateUserController.java

@@ -3,7 +3,6 @@ package com.qmth.themis.backend.api;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.themis.backend.util.ServletUtil;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.config.SystemConfig;
@@ -17,6 +16,7 @@ import com.qmth.themis.business.service.TBAttachmentService;
 import com.qmth.themis.business.service.TBExamInvigilateUserService;
 import com.qmth.themis.business.service.TBTaskHistoryService;
 import com.qmth.themis.business.util.JacksonUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TBOrgController.java

@@ -3,7 +3,6 @@ package com.qmth.themis.backend.api;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.themis.backend.util.ServletUtil;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.constant.SystemConstant;
@@ -13,6 +12,7 @@ import com.qmth.themis.business.service.TBOrgService;
 import com.qmth.themis.business.util.EhcacheUtil;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;

+ 1 - 5
themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.Gson;
-import com.qmth.themis.backend.util.ServletUtil;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.constant.SystemConstant;
@@ -21,10 +20,7 @@ import com.qmth.themis.business.service.CacheService;
 import com.qmth.themis.business.service.TBOrgService;
 import com.qmth.themis.business.service.TBUserRoleService;
 import com.qmth.themis.business.service.TBUserService;
-import com.qmth.themis.business.util.EhcacheUtil;
-import com.qmth.themis.business.util.JacksonUtil;
-import com.qmth.themis.business.util.RedisUtil;
-import com.qmth.themis.business.util.SessionUtil;
+import com.qmth.themis.business.util.*;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.enums.Platform;

+ 1 - 2
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamActivityController.java

@@ -2,8 +2,6 @@ package com.qmth.themis.backend.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.themis.backend.config.DictionaryConfig;
-import com.qmth.themis.backend.util.ServletUtil;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.entity.TEExam;
@@ -13,6 +11,7 @@ import com.qmth.themis.business.enums.MqEnum;
 import com.qmth.themis.business.service.TEExamActivityService;
 import com.qmth.themis.business.service.TEExamService;
 import com.qmth.themis.business.util.JacksonUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamController.java

@@ -3,7 +3,6 @@ package com.qmth.themis.backend.api;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.themis.backend.util.ServletUtil;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.constant.SystemConstant;
@@ -17,6 +16,7 @@ import com.qmth.themis.business.enums.MqEnum;
 import com.qmth.themis.business.service.TEExamActivityService;
 import com.qmth.themis.business.service.TEExamService;
 import com.qmth.themis.business.util.JacksonUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamPaperController.java

@@ -7,6 +7,7 @@ import java.util.Objects;
 
 import javax.annotation.Resource;
 
+import com.qmth.themis.business.util.ServletUtil;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qmth.themis.backend.util.ServletUtil;
 import com.qmth.themis.business.config.SystemConfig;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TBAttachment;

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java

@@ -3,7 +3,6 @@ package com.qmth.themis.backend.api;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.themis.backend.util.ServletUtil;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.config.SystemConfig;
@@ -14,6 +13,7 @@ import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.enums.TaskTypeEnum;
 import com.qmth.themis.business.service.*;
 import com.qmth.themis.business.util.JacksonUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TEStudentController.java

@@ -2,7 +2,6 @@ package com.qmth.themis.backend.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.themis.backend.util.ServletUtil;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.constant.SystemConstant;
@@ -11,6 +10,7 @@ import com.qmth.themis.business.entity.TEExamStudent;
 import com.qmth.themis.business.entity.TEStudent;
 import com.qmth.themis.business.service.TEStudentService;
 import com.qmth.themis.business.util.JacksonUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/aspect/ApiControllerAspect.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.backend.aspect;
 
-import com.qmth.themis.backend.util.ServletUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.util.ResultUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

+ 1 - 1
themis-backend/src/main/java/com/qmth/themis/backend/interceptor/AuthInterceptor.java

@@ -2,7 +2,6 @@ package com.qmth.themis.backend.interceptor;
 
 import cn.hutool.http.HttpStatus;
 import com.qmth.themis.backend.config.DictionaryConfig;
-import com.qmth.themis.backend.util.ServletUtil;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.AuthDto;
 import com.qmth.themis.business.entity.TBSession;
@@ -10,6 +9,7 @@ import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.service.CacheService;
 import com.qmth.themis.business.service.TBUserService;
 import com.qmth.themis.business.util.RedisUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.enums.Platform;
 import com.qmth.themis.common.exception.BusinessException;

+ 0 - 228
themis-backend/src/main/java/com/qmth/themis/backend/util/ServletUtil.java

@@ -1,228 +0,0 @@
-package com.qmth.themis.backend.util;
-
-import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.util.JacksonUtil;
-import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.common.enums.ExceptionResultEnum;
-import com.qmth.themis.common.exception.BusinessException;
-import com.qmth.themis.common.util.Result;
-import com.qmth.themis.common.util.ResultUtil;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Objects;
-
-/**
- * @Description: http工具
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-public class ServletUtil {
-
-    /**
-     * 输出错误
-     *
-     * @param code
-     * @param message
-     * @throws IOException
-     */
-    public static void responseError(int code, String message) throws IOException {
-        Result result = ResultUtil.error(code, message);
-        String json = JacksonUtil.parseJson(result);
-        getResponse().getWriter().print(json);
-    }
-
-    /**
-     * 获取请求的accessToken
-     *
-     * @return
-     */
-    public static String getRequestToken() {
-        HttpServletRequest request = getRequest();
-        // 从header中获取token
-        String token = request.getHeader(SystemConstant.ACCESS_TOKEN);
-        // 如果header中不存在token,则从参数中获取token
-        if (Objects.isNull(token)) {
-            token = request.getParameter(SystemConstant.ACCESS_TOKEN);
-        }
-        return token;
-    }
-
-    /**
-     * 获取请求的platform
-     *
-     * @return
-     */
-    public static String getRequestPlatform() {
-        HttpServletRequest request = getRequest();
-        // 从header中获取platform
-        String platform = request.getHeader(Constants.HEADER_PLATFORM);
-        // 如果header中不存在platform,则从参数中获取platform
-        if (Objects.isNull(platform)) {
-            platform = request.getParameter(Constants.HEADER_PLATFORM);
-            if (Objects.isNull(platform)) {
-                throw new BusinessException(ExceptionResultEnum.PLATFORM_INVALID);
-            }
-        }
-        return platform;
-    }
-
-    /**
-     * 获取请求的deviceId
-     *
-     * @return
-     */
-    public static String getRequestDeviceId() {
-        HttpServletRequest request = getRequest();
-        // 从header中获取deviceId
-        String deviceId = request.getHeader(Constants.HEADER_DEVICE_ID);
-        // 如果header中不存在deviceId,则从参数中获取deviceId
-        if (Objects.isNull(deviceId)) {
-            deviceId = request.getParameter(Constants.HEADER_DEVICE_ID);
-            if (Objects.isNull(deviceId)) {
-                throw new BusinessException(ExceptionResultEnum.DEVICE_ID_INVALID);
-            }
-        }
-        return deviceId;
-    }
-
-    /**
-     * 获取请求的time
-     *
-     * @return
-     */
-    public static String getRequestTime() {
-        HttpServletRequest request = getRequest();
-        // 从header中获取time
-        String time = request.getHeader(Constants.HEADER_TIME);
-        // 如果header中不存在time,则从参数中获取time
-        if (Objects.isNull(time)) {
-            time = request.getParameter(Constants.HEADER_TIME);
-            if (Objects.isNull(time)) {
-                throw new BusinessException(ExceptionResultEnum.TIME_INVALID);
-            }
-        }
-        return time;
-    }
-
-    /**
-     * 获取请求的Authorization
-     *
-     * @return
-     */
-    public static String getRequestAuthorization() {
-        HttpServletRequest request = getRequest();
-        // 从header中获取authorization
-        String authorization = request.getHeader(Constants.HEADER_AUTHORIZATION);
-        // 如果header中不存在authorization,则从参数中获取authorization
-        if (Objects.isNull(authorization)) {
-            authorization = request.getParameter(Constants.HEADER_AUTHORIZATION);
-            if (Objects.isNull(authorization)) {
-                throw new BusinessException(ExceptionResultEnum.AUTHORIZATION_INVALID);
-            }
-        }
-        return authorization;
-    }
-
-    /**
-     * 获取请求的Authorization
-     *
-     * @return
-     */
-    public static String getRequestAuthorizationForAspect() {
-        HttpServletRequest request = getRequest();
-        // 从header中获取authorization
-        String authorization = request.getHeader(Constants.HEADER_AUTHORIZATION);
-        // 如果header中不存在authorization,则从参数中获取authorization
-        if (Objects.isNull(authorization)) {
-            authorization = request.getParameter(Constants.HEADER_AUTHORIZATION);
-        }
-        return authorization;
-    }
-
-    /**
-     * 获取请求的time
-     *
-     * @return
-     */
-    public static String getRequestTimeForTime() {
-        HttpServletRequest request = getRequest();
-        // 从header中获取time
-        String time = request.getHeader(Constants.HEADER_TIME);
-        // 如果header中不存在time,则从参数中获取time
-        if (Objects.isNull(time)) {
-            time = request.getParameter(Constants.HEADER_TIME);
-        }
-        return time;
-    }
-
-    /**
-     * 获取请求的md5
-     *
-     * @return
-     */
-    public static String getRequestMd5() {
-        return getRequest().getHeader(SystemConstant.MD5);
-    }
-
-    /**
-     * 获取请求的path
-     *
-     * @return
-     */
-    public static String getRequestPath() {
-        return getRequest().getHeader(SystemConstant.PATH);
-    }
-
-    /**
-     * 获取请求的Session
-     *
-     * @return
-     */
-    public static Object getRequestSession() {
-        return getRequest().getAttribute(SystemConstant.SESSION);
-    }
-
-    /**
-     * 获取请求的account
-     *
-     * @return
-     */
-    public static Object getRequestAccount() {
-        return getRequest().getAttribute(SystemConstant.ACCOUNT);
-    }
-
-    /**
-     * 获取请求的org
-     *
-     * @return
-     */
-    public static Object getRequestOrg() {
-        return getRequest().getAttribute(SystemConstant.ORG);
-    }
-
-    /**
-     * 获取HttpServletRequest
-     *
-     * @return
-     */
-    public static HttpServletRequest getRequest() {
-        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        return servletRequestAttributes.getRequest();
-    }
-
-    /**
-     * 获取HttpServletResponse
-     *
-     * @return
-     */
-    public static HttpServletResponse getResponse() {
-        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-        return servletRequestAttributes.getResponse();
-    }
-}

+ 0 - 10
themis-business/src/main/java/com/qmth/themis/business/service/impl/CacheServiceImpl.java

@@ -74,15 +74,6 @@ public class CacheServiceImpl implements CacheService {
             uWrapper.lambda().eq(TBUserRole::getUserId, user.getId());
             List<TBUserRole> tbUserRoleList = tbUserRoleService.list(uWrapper);
             if (Objects.nonNull(tbUserRoleList)) {
-                //是否是系统管理员
-//                long count = tbUserRoleList.stream().filter(s -> Objects.equals(s.getRoleCode(), RoleEnum.SUPER_ADMIN.name())).count();
-//                if (count > 0) {
-//                    //系统管理员获取所有权限
-//                    QueryWrapper<TBPrivilege> pWrapper = new QueryWrapper<>();
-//                    pWrapper.lambda().eq(TBPrivilege::getType, SystemConstant.LINK);
-//                    List<TBPrivilege> tbPrivilegeList = tbPrivilegeService.list(pWrapper);
-//                    authDto = new AuthDto(tbUserRoleList.stream().map(s -> s.getRoleCode()).collect(Collectors.toSet()), tbPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()));
-//                } else {
                 TBOrg tbOrg = Objects.isNull(redisUtil.getOrg(user.getOrgId())) ? tbOrgService.getById(user.getOrgId()) : (TBOrg) redisUtil.getOrg(user.getOrgId());
                 //根据角色名查权限
                 Set<String> roleCodes = tbUserRoleList.stream().map(s -> s.getRoleCode()).collect(Collectors.toSet());
@@ -94,7 +85,6 @@ public class CacheServiceImpl implements CacheService {
                 pWrapper.lambda().in(TBPrivilege::getId, privilegeIds).eq(TBPrivilege::getType, SystemConstant.LINK);
                 List<TBPrivilege> tbPrivilegeList = tbPrivilegeService.list(pWrapper);
                 authDto = new AuthDto(roleCodes, tbPrivilegeList.stream().map(s -> s.getUrl()).collect(Collectors.toSet()), tbOrg);
-//                }
             }
         } catch (Exception e) {
             e.printStackTrace();

+ 1 - 2
themis-exam/src/main/java/com/qmth/themis/exam/util/ServletUtil.java → themis-business/src/main/java/com/qmth/themis/business/util/ServletUtil.java

@@ -1,7 +1,6 @@
-package com.qmth.themis.exam.util;
+package com.qmth.themis.business.util;
 
 import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;

+ 1 - 1
themis-common/src/main/java/com/qmth/themis/common/enums/ExceptionResultEnum.java

@@ -156,7 +156,7 @@ public enum ExceptionResultEnum {
 
     TASK_NO(500, 500006, "任务不存在"),
 
-    USER_NO(500, 500007, "用户不存在"),
+    USER_NO(500, 500007, "用户或密码不正确"),
 
     EXAM_NO(500, 500008, "考试批次信息不存在"),
 

+ 1 - 1
themis-exam/src/main/java/com/qmth/themis/exam/api/TEExamController.java

@@ -6,6 +6,7 @@ import java.util.Objects;
 
 import javax.annotation.Resource;
 
+import com.qmth.themis.business.util.ServletUtil;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -29,7 +30,6 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.exam.util.ServletUtil;
 import com.qmth.themis.mq.dto.MqDto;
 import com.qmth.themis.mq.enums.MqTagEnum;
 import com.qmth.themis.mq.enums.MqTopicEnum;

+ 1 - 1
themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -14,6 +14,7 @@ import com.qmth.themis.business.enums.SystemOperationEnum;
 import com.qmth.themis.business.service.*;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.business.util.SessionUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
@@ -25,7 +26,6 @@ import com.qmth.themis.common.signature.SignatureType;
 import com.qmth.themis.common.util.AesUtil;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.exam.util.ServletUtil;
 import com.qmth.themis.mq.enums.MqTagEnum;
 import com.qmth.themis.mq.enums.MqTopicEnum;
 import com.qmth.themis.mq.service.MqDtoService;

+ 1 - 1
themis-exam/src/main/java/com/qmth/themis/exam/aspect/ApiControllerAspect.java

@@ -1,7 +1,7 @@
 package com.qmth.themis.exam.aspect;
 
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.util.ResultUtil;
-import com.qmth.themis.exam.util.ServletUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

+ 1 - 1
themis-exam/src/main/java/com/qmth/themis/exam/interceptor/AuthInterceptor.java

@@ -9,13 +9,13 @@ import com.qmth.themis.business.enums.RoleEnum;
 import com.qmth.themis.business.service.CacheService;
 import com.qmth.themis.business.service.TEStudentService;
 import com.qmth.themis.business.util.RedisUtil;
+import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.enums.Platform;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.signature.SignatureInfo;
 import com.qmth.themis.common.signature.SignatureType;
 import com.qmth.themis.exam.config.DictionaryConfig;
-import com.qmth.themis.exam.util.ServletUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.HandlerInterceptor;