代码调整

backend/src/main/java/io/metersphere/api/controller/APIReportController.java

@@ -6,18 +6,16 @@ import io.metersphere.api.dto.APIReportResult;
 import io.metersphere.api.dto.DeleteAPIReportRequest;
 import io.metersphere.api.dto.QueryAPIReportRequest;
 import io.metersphere.api.service.APIReportService;
-import io.metersphere.base.domain.ApiTestReport;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
-import io.metersphere.user.SessionUtils;
+import io.metersphere.commons.utils.SessionUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/api/report")

backend/src/main/java/io/metersphere/api/controller/APITestController.java

@@ -11,15 +11,14 @@ import io.metersphere.base.domain.ApiTestWithBLOBs;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
-import io.metersphere.user.SessionUtils;
+import io.metersphere.commons.utils.SessionUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/api")

backend/src/main/java/io/metersphere/commons/user/SessionUser.java

@@ -1,4 +1,4 @@
-package io.metersphere.user;
+package io.metersphere.commons.user;
 
 import io.metersphere.dto.UserDTO;
 import org.springframework.beans.BeanUtils;

backend/src/main/java/io/metersphere/commons/utils/SessionUtils.java

@@ -1,5 +1,6 @@
-package io.metersphere.user;
+package io.metersphere.commons.utils;
 
+import io.metersphere.commons.user.SessionUser;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;

backend/src/main/java/io/metersphere/controller/IndexController.java

@@ -1,6 +1,6 @@
 package io.metersphere.controller;
 
-import io.metersphere.user.SessionUtils;
+import io.metersphere.commons.utils.SessionUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

backend/src/main/java/io/metersphere/controller/ProjectController.java

@@ -6,10 +6,10 @@ import io.metersphere.base.domain.Project;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.ProjectRequest;
 import io.metersphere.dto.ProjectDTO;
 import io.metersphere.service.ProjectService;
-import io.metersphere.user.SessionUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;

backend/src/main/java/io/metersphere/controller/TestController.java

@@ -1,6 +1,6 @@
 package io.metersphere.controller;
 
-import io.metersphere.user.SessionUtils;
+import io.metersphere.commons.utils.SessionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

backend/src/main/java/io/metersphere/controller/UserController.java

@@ -5,8 +5,10 @@ import com.github.pagehelper.PageHelper;
 import io.metersphere.base.domain.User;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.UserRequest;
 import io.metersphere.controller.request.member.AddMemberRequest;
 import io.metersphere.controller.request.member.EditPassWordRequest;
@@ -18,8 +20,6 @@ import io.metersphere.dto.UserDTO;
 import io.metersphere.service.OrganizationService;
 import io.metersphere.service.UserService;
 import io.metersphere.service.WorkspaceService;
-import io.metersphere.user.SessionUser;
-import io.metersphere.user.SessionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;

backend/src/main/java/io/metersphere/controller/WorkspaceController.java

@@ -6,16 +6,17 @@ import io.metersphere.base.domain.Workspace;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.WorkspaceRequest;
 import io.metersphere.dto.WorkspaceDTO;
 import io.metersphere.dto.WorkspaceMemberDTO;
 import io.metersphere.service.OrganizationService;
 import io.metersphere.service.UserService;
 import io.metersphere.service.WorkspaceService;
-import io.metersphere.user.SessionUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
+
 import javax.annotation.Resource;
 import java.util.List;
 

backend/src/main/java/io/metersphere/performance/controller/PerformanceReportController.java

@@ -6,12 +6,12 @@ import io.metersphere.base.domain.LoadTestReport;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.dto.LogDetailDTO;
 import io.metersphere.dto.ReportDTO;
 import io.metersphere.performance.base.*;
 import io.metersphere.performance.controller.request.ReportRequest;
 import io.metersphere.performance.service.ReportService;
-import io.metersphere.user.SessionUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.http.HttpHeaders;

backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java

@@ -6,11 +6,11 @@ import io.metersphere.base.domain.FileMetadata;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
-import io.metersphere.track.request.testplan.*;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.dto.LoadTestDTO;
 import io.metersphere.performance.service.PerformanceTestService;
 import io.metersphere.service.FileService;
-import io.metersphere.user.SessionUtils;
+import io.metersphere.track.request.testplan.*;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.http.HttpHeaders;

backend/src/main/java/io/metersphere/security/ShiroDBRealm.java

@@ -2,10 +2,10 @@ package io.metersphere.security;
 
 
 import io.metersphere.base.domain.Role;
+import io.metersphere.commons.user.SessionUser;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.service.UserService;
-import io.metersphere.user.SessionUser;
-import io.metersphere.user.SessionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.AuthorizationInfo;

backend/src/main/java/io/metersphere/service/OrganizationService.java

@@ -9,15 +9,14 @@ import io.metersphere.base.mapper.ext.ExtOrganizationMapper;
 import io.metersphere.base.mapper.ext.ExtUserRoleMapper;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.user.SessionUser;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.OrganizationRequest;
 import io.metersphere.dto.OrganizationMemberDTO;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.dto.UserRoleHelpDTO;
 import io.metersphere.i18n.Translator;
-import io.metersphere.user.SessionUser;
-import io.metersphere.user.SessionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

backend/src/main/java/io/metersphere/service/ProjectService.java

@@ -8,12 +8,12 @@ import io.metersphere.base.mapper.LoadTestMapper;
 import io.metersphere.base.mapper.ProjectMapper;
 import io.metersphere.base.mapper.ext.ExtProjectMapper;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.ProjectRequest;
-import io.metersphere.track.request.testplan.DeleteTestPlanRequest;
 import io.metersphere.dto.ProjectDTO;
 import io.metersphere.i18n.Translator;
 import io.metersphere.performance.service.PerformanceTestService;
-import io.metersphere.user.SessionUtils;
+import io.metersphere.track.request.testplan.DeleteTestPlanRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

backend/src/main/java/io/metersphere/service/UserService.java

@@ -6,7 +6,9 @@ import io.metersphere.base.mapper.ext.ExtUserMapper;
 import io.metersphere.base.mapper.ext.ExtUserRoleMapper;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.CodingUtil;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.UserRequest;
 import io.metersphere.controller.request.member.AddMemberRequest;
 import io.metersphere.controller.request.member.EditPassWordRequest;
@@ -16,8 +18,6 @@ import io.metersphere.controller.request.organization.AddOrgMemberRequest;
 import io.metersphere.controller.request.organization.QueryOrgMemberRequest;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.i18n.Translator;
-import io.metersphere.user.SessionUser;
-import io.metersphere.user.SessionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

backend/src/main/java/io/metersphere/service/WorkspaceService.java

@@ -10,16 +10,15 @@ import io.metersphere.base.mapper.ext.ExtUserRoleMapper;
 import io.metersphere.base.mapper.ext.ExtWorkspaceMapper;
 import io.metersphere.commons.constants.RoleConstants;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.user.SessionUser;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.WorkspaceRequest;
 import io.metersphere.dto.UserDTO;
 import io.metersphere.dto.UserRoleHelpDTO;
 import io.metersphere.dto.WorkspaceDTO;
 import io.metersphere.dto.WorkspaceMemberDTO;
 import io.metersphere.i18n.Translator;
-import io.metersphere.user.SessionUser;
-import io.metersphere.user.SessionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

backend/src/main/java/io/metersphere/track/controller/TestCaseController.java

@@ -2,15 +2,17 @@ package io.metersphere.track.controller;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import io.metersphere.base.domain.*;
+import io.metersphere.base.domain.Project;
+import io.metersphere.base.domain.TestCase;
+import io.metersphere.base.domain.TestCaseWithBLOBs;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.excel.domain.ExcelResponse;
+import io.metersphere.track.dto.TestCaseDTO;
 import io.metersphere.track.request.testcase.QueryTestCaseRequest;
 import io.metersphere.track.request.testcase.TestCaseBatchRequest;
-import io.metersphere.track.dto.TestCaseDTO;
-import io.metersphere.excel.domain.ExcelResponse;
 import io.metersphere.track.service.TestCaseService;
-import io.metersphere.user.SessionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 

backend/src/main/java/io/metersphere/track/controller/TestPlanController.java

@@ -5,11 +5,11 @@ import com.github.pagehelper.PageHelper;
 import io.metersphere.base.domain.TestPlan;
 import io.metersphere.commons.utils.PageUtils;
 import io.metersphere.commons.utils.Pager;
+import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.track.dto.TestPlanDTO;
 import io.metersphere.track.request.testcase.PlanCaseRelevanceRequest;
 import io.metersphere.track.request.testcase.QueryTestPlanRequest;
-import io.metersphere.track.dto.TestPlanDTO;
 import io.metersphere.track.service.TestPlanService;
-import io.metersphere.user.SessionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

backend/src/main/java/io/metersphere/track/service/TestCaseService.java

@@ -7,11 +7,10 @@ import io.metersphere.base.domain.*;
 import io.metersphere.base.mapper.*;
 import io.metersphere.base.mapper.ext.ExtTestCaseMapper;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.user.SessionUser;
 import io.metersphere.commons.utils.BeanUtils;
 import io.metersphere.commons.utils.LogUtil;
-import io.metersphere.track.request.testcase.QueryTestCaseRequest;
+import io.metersphere.commons.utils.SessionUtils;
-import io.metersphere.track.request.testcase.TestCaseBatchRequest;
-import io.metersphere.track.dto.TestCaseDTO;
 import io.metersphere.excel.domain.ExcelErrData;
 import io.metersphere.excel.domain.ExcelResponse;
 import io.metersphere.excel.domain.TestCaseExcelData;
@@ -19,8 +18,9 @@ import io.metersphere.excel.listener.EasyExcelListener;
 import io.metersphere.excel.listener.TestCaseDataListener;
 import io.metersphere.excel.utils.EasyExcelUtil;
 import io.metersphere.i18n.Translator;
-import io.metersphere.user.SessionUser;
+import io.metersphere.track.dto.TestCaseDTO;
-import io.metersphere.user.SessionUtils;
+import io.metersphere.track.request.testcase.QueryTestCaseRequest;
+import io.metersphere.track.request.testcase.TestCaseBatchRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;

backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java

@@ -7,12 +7,12 @@ import io.metersphere.base.mapper.TestPlanTestCaseMapper;
 import io.metersphere.base.mapper.ext.ExtTestPlanTestCaseMapper;
 import io.metersphere.commons.constants.TestPlanTestCaseStatus;
 import io.metersphere.commons.utils.BeanUtils;
+import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.member.QueryMemberRequest;
+import io.metersphere.service.UserService;
+import io.metersphere.track.dto.TestPlanCaseDTO;
 import io.metersphere.track.request.testcase.TestPlanCaseBatchRequest;
 import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest;
-import io.metersphere.track.dto.TestPlanCaseDTO;
-import io.metersphere.service.UserService;
-import io.metersphere.user.SessionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

backend/src/main/java/io/metersphere/websocket/ServerEndpointConfigurator.java

@@ -1,6 +1,6 @@
 package io.metersphere.websocket;
 
-import io.metersphere.user.SessionUtils;
+import io.metersphere.commons.utils.SessionUtils;
 
 import javax.websocket.HandshakeResponse;
 import javax.websocket.server.HandshakeRequest;

backend/src/main/java/io/metersphere/websocket/WebSocketServer.java

@@ -1,6 +1,5 @@
 package io.metersphere.websocket;
 
-import io.metersphere.user.SessionUtils;
 import org.springframework.stereotype.Component;
 
 import javax.websocket.*;