...

src/main/java/cn/com/qmth/examcloud/commons/web/RedisKeys.java → src/main/java/cn/com/qmth/examcloud/web/RedisKeys.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web;
+package cn.com.qmth.examcloud.web;
 
 /**
  * redis keys

src/main/java/cn/com/qmth/examcloud/commons/web/boot/BootSecurityManager.java → src/main/java/cn/com/qmth/examcloud/web/boot/BootSecurityManager.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.boot;
+package cn.com.qmth.examcloud.web.boot;
 
 /**
  * 安全处理器

src/main/java/cn/com/qmth/examcloud/commons/web/boot/ExamCloudApp.java → src/main/java/cn/com/qmth/examcloud/web/boot/ExamCloudApp.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.boot;
+package cn.com.qmth.examcloud.web.boot;
 
 import java.util.Map;
 import java.util.Map.Entry;
@@ -18,13 +18,13 @@ import org.springframework.context.ConfigurableApplicationContext;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-import cn.com.qmth.examcloud.commons.base.exception.ExamCloudRuntimeException;
-import cn.com.qmth.examcloud.commons.base.util.HttpClientPool;
-import cn.com.qmth.examcloud.commons.base.util.HttpClientUtil;
-import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
-import cn.com.qmth.examcloud.commons.base.util.PropertiesUtil;
-import cn.com.qmth.examcloud.commons.base.util.SecurityUtil;
-import cn.com.qmth.examcloud.commons.base.util.Util;
+import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
+import cn.com.qmth.examcloud.commons.util.HttpClientPool;
+import cn.com.qmth.examcloud.commons.util.HttpClientUtil;
+import cn.com.qmth.examcloud.commons.util.JsonUtil;
+import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
+import cn.com.qmth.examcloud.commons.util.SecurityUtil;
+import cn.com.qmth.examcloud.commons.util.Util;
 
 /**
  * 启动器<br>

src/main/java/cn/com/qmth/examcloud/commons/web/cloud/api/BaseRequest.java → src/main/java/cn/com/qmth/examcloud/web/cloud/api/BaseRequest.java

@@ -1,6 +1,6 @@
-package cn.com.qmth.examcloud.commons.web.cloud.api;
+package cn.com.qmth.examcloud.web.cloud.api;
 
-import cn.com.qmth.examcloud.commons.web.enums.DataExecutionStatus;
+import cn.com.qmth.examcloud.web.enums.DataExecutionStatus;
 import io.swagger.annotations.ApiModelProperty;
 
 /**

src/main/java/cn/com/qmth/examcloud/commons/web/cloud/api/BaseResponse.java → src/main/java/cn/com/qmth/examcloud/web/cloud/api/BaseResponse.java

@@ -1,6 +1,6 @@
-package cn.com.qmth.examcloud.commons.web.cloud.api;
+package cn.com.qmth.examcloud.web.cloud.api;
 
-import cn.com.qmth.examcloud.commons.web.enums.DataExecutionStatus;
+import cn.com.qmth.examcloud.web.enums.DataExecutionStatus;
 import io.swagger.annotations.ApiModelProperty;
 
 /**

src/main/java/cn/com/qmth/examcloud/commons/web/cloud/api/CloudService.java → src/main/java/cn/com/qmth/examcloud/web/cloud/api/CloudService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.cloud.api;
+package cn.com.qmth.examcloud.web.cloud.api;
 
 import java.io.Serializable;
 

src/main/java/cn/com/qmth/examcloud/commons/web/cloud/api/ExchangeBean.java → src/main/java/cn/com/qmth/examcloud/web/cloud/api/ExchangeBean.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.cloud.api;
+package cn.com.qmth.examcloud.web.cloud.api;
 
 /**
  * bean 基类

src/main/java/cn/com/qmth/examcloud/commons/web/cloud/api/JsonSerializable.java → src/main/java/cn/com/qmth/examcloud/web/cloud/api/JsonSerializable.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.cloud.api;
+package cn.com.qmth.examcloud.web.cloud.api;
 
 import java.io.Serializable;
 

src/main/java/cn/com/qmth/examcloud/commons/web/cloud/api/OuterService.java → src/main/java/cn/com/qmth/examcloud/web/cloud/api/OuterService.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.cloud.api;
+package cn.com.qmth.examcloud.web.cloud.api;
 
 import java.io.Serializable;
 

src/main/java/cn/com/qmth/examcloud/commons/web/config/SystemConfig.java → src/main/java/cn/com/qmth/examcloud/web/config/SystemConfig.java

@@ -1,11 +1,11 @@
-package cn.com.qmth.examcloud.commons.web.config;
+package cn.com.qmth.examcloud.web.config;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
-import cn.com.qmth.examcloud.commons.base.util.PropertiesUtil;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
 
 /**
  * 系统配置

src/main/java/cn/com/qmth/examcloud/commons/web/enums/BooleanSelect.java → src/main/java/cn/com/qmth/examcloud/web/enums/BooleanSelect.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.enums;
+package cn.com.qmth.examcloud.web.enums;
 
 /**
  * 页面boolean选择

src/main/java/cn/com/qmth/examcloud/commons/web/enums/DataExecutionStatus.java → src/main/java/cn/com/qmth/examcloud/web/enums/DataExecutionStatus.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.enums;
+package cn.com.qmth.examcloud.web.enums;
 
 /**
  * 数据执行状态

src/main/java/cn/com/qmth/examcloud/commons/web/helpers/page/PageInfo.java → src/main/java/cn/com/qmth/examcloud/web/helpers/page/PageInfo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.helpers.page;
+package cn.com.qmth.examcloud.web.helpers.page;
 
 import java.io.Serializable;
 import java.util.List;

src/main/java/cn/com/qmth/examcloud/commons/web/helpers/tree/EleTreeNode.java → src/main/java/cn/com/qmth/examcloud/web/helpers/tree/EleTreeNode.java

@@ -1,8 +1,8 @@
-package cn.com.qmth.examcloud.commons.web.helpers.tree;
+package cn.com.qmth.examcloud.web.helpers.tree;
 
 import java.util.List;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
 
 /**
  * element-UI tree

src/main/java/cn/com/qmth/examcloud/commons/web/helpers/tree/TreeNode.java → src/main/java/cn/com/qmth/examcloud/web/helpers/tree/TreeNode.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.helpers.tree;
+package cn.com.qmth.examcloud.web.helpers.tree;
 
 /**
  * 树节点接口

src/main/java/cn/com/qmth/examcloud/commons/web/helpers/tree/TreeUtil.java → src/main/java/cn/com/qmth/examcloud/web/helpers/tree/TreeUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.helpers.tree;
+package cn.com.qmth.examcloud.web.helpers.tree;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,8 +9,8 @@ import org.apache.commons.lang3.StringUtils;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import cn.com.qmth.examcloud.commons.base.exception.ExamCloudRuntimeException;
-import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
+import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
+import cn.com.qmth.examcloud.commons.util.JsonUtil;
 
 /**
  * 树工具

src/main/java/cn/com/qmth/examcloud/commons/web/helpers/tree/ZtreeNode.java → src/main/java/cn/com/qmth/examcloud/web/helpers/tree/ZtreeNode.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.helpers.tree;
+package cn.com.qmth.examcloud.web.helpers.tree;
 
 /**
  * ztree

src/main/java/cn/com/qmth/examcloud/commons/web/interceptor/FirstInterceptor.java → src/main/java/cn/com/qmth/examcloud/web/interceptor/FirstInterceptor.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.interceptor;
+package cn.com.qmth.examcloud.web.interceptor;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,16 +24,16 @@ import org.springframework.web.servlet.ModelAndView;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
-import cn.com.qmth.examcloud.commons.base.helpers.FileChangeWatchdog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.commons.base.logging.SLF4JImpl;
-import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
-import cn.com.qmth.examcloud.commons.base.util.PathUtil;
-import cn.com.qmth.examcloud.commons.base.util.StringUtil;
-import cn.com.qmth.examcloud.commons.base.util.ThreadLocalUtil;
-import cn.com.qmth.examcloud.commons.web.support.ServletUtil;
-import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
+import cn.com.qmth.examcloud.commons.helpers.FileChangeWatchdog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.logging.SLF4JImpl;
+import cn.com.qmth.examcloud.commons.util.JsonUtil;
+import cn.com.qmth.examcloud.commons.util.PathUtil;
+import cn.com.qmth.examcloud.commons.util.StringUtil;
+import cn.com.qmth.examcloud.commons.util.ThreadLocalUtil;
+import cn.com.qmth.examcloud.web.support.ServletUtil;
+import cn.com.qmth.examcloud.web.support.StatusResponse;
 
 /**
  * 首发拦截器

src/main/java/cn/com/qmth/examcloud/commons/web/interceptor/Seqlock.java → src/main/java/cn/com/qmth/examcloud/web/interceptor/Seqlock.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.interceptor;
+package cn.com.qmth.examcloud.web.interceptor;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

src/main/java/cn/com/qmth/examcloud/commons/web/interceptor/SeqlockInterceptor.java → src/main/java/cn/com/qmth/examcloud/web/interceptor/SeqlockInterceptor.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.interceptor;
+package cn.com.qmth.examcloud.web.interceptor;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -8,13 +8,13 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.commons.base.util.ThreadLocalUtil;
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.support.ServletUtil;
-import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.util.ThreadLocalUtil;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
+import cn.com.qmth.examcloud.web.security.bean.User;
+import cn.com.qmth.examcloud.web.support.ServletUtil;
+import cn.com.qmth.examcloud.web.support.StatusResponse;
 
 /**
  * 顺序锁拦截器

src/main/java/cn/com/qmth/examcloud/commons/web/interceptor/SessionSeqlock.java → src/main/java/cn/com/qmth/examcloud/web/interceptor/SessionSeqlock.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.interceptor;
+package cn.com.qmth.examcloud.web.interceptor;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

src/main/java/cn/com/qmth/examcloud/commons/web/jpa/JpaEntity.java → src/main/java/cn/com/qmth/examcloud/web/jpa/JpaEntity.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.jpa;
+package cn.com.qmth.examcloud.web.jpa;
 
 import java.util.Date;
 
@@ -10,7 +10,7 @@ import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
 
 /**
  * JPA 数据库实体父类

src/main/java/cn/com/qmth/examcloud/commons/web/redis/RedisClient.java → src/main/java/cn/com/qmth/examcloud/web/redis/RedisClient.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.redis;
+package cn.com.qmth.examcloud.web.redis;
 
 import java.io.Serializable;
 

src/main/java/cn/com/qmth/examcloud/commons/web/redis/RedisClientImpl.java → src/main/java/cn/com/qmth/examcloud/web/redis/RedisClientImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.redis;
+package cn.com.qmth.examcloud.web.redis;
 
 import java.io.Serializable;
 import java.util.concurrent.TimeUnit;

src/main/java/cn/com/qmth/examcloud/commons/web/reports/BaseReport.java → src/main/java/cn/com/qmth/examcloud/web/reports/BaseReport.java

@@ -1,8 +1,8 @@
-package cn.com.qmth.examcloud.commons.web.reports;
+package cn.com.qmth.examcloud.web.reports;
 
 import java.util.Date;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
 
 /**
  * 报表数据体基类

src/main/java/cn/com/qmth/examcloud/commons/web/reports/ReportFileFilter.java → src/main/java/cn/com/qmth/examcloud/web/reports/ReportFileFilter.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.reports;
+package cn.com.qmth.examcloud.web.reports;
 
 import java.io.File;
 import java.io.FilenameFilter;

src/main/java/cn/com/qmth/examcloud/commons/web/reports/ReportLoggerFactory.java → src/main/java/cn/com/qmth/examcloud/web/reports/ReportLoggerFactory.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.reports;
+package cn.com.qmth.examcloud.web.reports;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -14,7 +14,7 @@ import ch.qos.logback.core.rolling.RollingFileAppender;
 import ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy;
 import ch.qos.logback.core.util.FileSize;
 import ch.qos.logback.core.util.OptionHelper;
-import cn.com.qmth.examcloud.commons.web.config.SystemConfig;
+import cn.com.qmth.examcloud.web.config.SystemConfig;
 
 /**
  * 报表日志工厂

src/main/java/cn/com/qmth/examcloud/commons/web/reports/ReportsCollector.java → src/main/java/cn/com/qmth/examcloud/web/reports/ReportsCollector.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.commons.web.reports;
+package cn.com.qmth.examcloud.web.reports;
 
 import java.util.List;
 
 import com.google.common.collect.Lists;
 
-import cn.com.qmth.examcloud.commons.base.util.ThreadLocalUtil;
+import cn.com.qmth.examcloud.commons.util.ThreadLocalUtil;
 
 /**
  * 报表数据收集器工具

src/main/java/cn/com/qmth/examcloud/commons/web/reports/ReportsController.java → src/main/java/cn/com/qmth/examcloud/web/reports/ReportsController.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.reports;
+package cn.com.qmth.examcloud.web.reports;
 
 import java.io.File;
 import java.io.IOException;
@@ -19,10 +19,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
-import cn.com.qmth.examcloud.commons.web.config.SystemConfig;
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.web.config.SystemConfig;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
+import cn.com.qmth.examcloud.web.support.ControllerSupport;
 import io.swagger.annotations.ApiOperation;
 
 /**

src/main/java/cn/com/qmth/examcloud/commons/web/security/RequestPermissionInterceptor.java → src/main/java/cn/com/qmth/examcloud/web/security/RequestPermissionInterceptor.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.security;
+package cn.com.qmth.examcloud.web.security;
 
 import java.io.File;
 import java.io.IOException;
@@ -18,18 +18,18 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.google.common.collect.Sets;
 
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
-import cn.com.qmth.examcloud.commons.base.util.PathUtil;
-import cn.com.qmth.examcloud.commons.base.util.RegExpUtil;
-import cn.com.qmth.examcloud.commons.web.RedisKeys;
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.commons.web.cloud.api.OuterService;
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.support.ServletUtil;
-import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.util.JsonUtil;
+import cn.com.qmth.examcloud.commons.util.PathUtil;
+import cn.com.qmth.examcloud.commons.util.RegExpUtil;
+import cn.com.qmth.examcloud.web.RedisKeys;
+import cn.com.qmth.examcloud.web.cloud.api.CloudService;
+import cn.com.qmth.examcloud.web.cloud.api.OuterService;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
+import cn.com.qmth.examcloud.web.security.bean.User;
+import cn.com.qmth.examcloud.web.support.ServletUtil;
+import cn.com.qmth.examcloud.web.support.StatusResponse;
 
 /**
  * 请求鉴权

src/main/java/cn/com/qmth/examcloud/commons/web/security/SpringCloudInterceptor.java → src/main/java/cn/com/qmth/examcloud/web/security/SpringCloudInterceptor.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.security;
+package cn.com.qmth.examcloud.web.security;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -7,13 +7,13 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.commons.base.util.ThreadLocalUtil;
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.commons.web.support.ServletUtil;
-import cn.com.qmth.examcloud.commons.web.support.StatusResponse;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.util.ThreadLocalUtil;
+import cn.com.qmth.examcloud.web.cloud.api.CloudService;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
+import cn.com.qmth.examcloud.web.support.ServletUtil;
+import cn.com.qmth.examcloud.web.support.StatusResponse;
 
 /**
  * spring cloud 请求接入

src/main/java/cn/com/qmth/examcloud/commons/web/security/bean/Role.java → src/main/java/cn/com/qmth/examcloud/web/security/bean/Role.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.security.bean;
+package cn.com.qmth.examcloud.web.security.bean;
 
 /**
  * 角色

src/main/java/cn/com/qmth/examcloud/commons/web/security/bean/User.java → src/main/java/cn/com/qmth/examcloud/web/security/bean/User.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.commons.web.security.bean;
+package cn.com.qmth.examcloud.web.security.bean;
 
 import java.util.Date;
 import java.util.List;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
 
 /**
  * 用户

src/main/java/cn/com/qmth/examcloud/commons/web/security/bean/UserType.java → src/main/java/cn/com/qmth/examcloud/web/security/bean/UserType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.security.bean;
+package cn.com.qmth.examcloud.web.security.bean;
 
 /**
  * 用户类型

src/main/java/cn/com/qmth/examcloud/commons/web/security/enums/RoleMeta.java → src/main/java/cn/com/qmth/examcloud/web/security/enums/RoleMeta.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.security.enums;
+package cn.com.qmth.examcloud.web.security.enums;
 
 /**
  * Created by songyue on 17/2/24.

src/main/java/cn/com/qmth/examcloud/commons/web/support/CloudClientSupport.java → src/main/java/cn/com/qmth/examcloud/web/support/CloudClientSupport.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 import java.io.File;
 import java.util.Map;
@@ -14,15 +14,15 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
-import cn.com.qmth.examcloud.commons.base.util.StringUtil;
-import cn.com.qmth.examcloud.commons.base.util.ThreadLocalUtil;
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.util.JsonUtil;
+import cn.com.qmth.examcloud.commons.util.StringUtil;
+import cn.com.qmth.examcloud.commons.util.ThreadLocalUtil;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * 云服务客户端基类

src/main/java/cn/com/qmth/examcloud/commons/web/support/ControllerAspect.java → src/main/java/cn/com/qmth/examcloud/web/support/ControllerAspect.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 import java.util.Collection;
 import java.util.Date;
@@ -16,16 +16,16 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
 import ch.qos.logback.classic.Logger;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
-import cn.com.qmth.examcloud.commons.base.util.ObjectUtil;
-import cn.com.qmth.examcloud.commons.base.util.StringUtil;
-import cn.com.qmth.examcloud.commons.base.util.ThreadLocalUtil;
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-import cn.com.qmth.examcloud.commons.web.reports.BaseReport;
-import cn.com.qmth.examcloud.commons.web.reports.ReportLoggerFactory;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.util.JsonUtil;
+import cn.com.qmth.examcloud.commons.util.ObjectUtil;
+import cn.com.qmth.examcloud.commons.util.StringUtil;
+import cn.com.qmth.examcloud.commons.util.ThreadLocalUtil;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.reports.BaseReport;
+import cn.com.qmth.examcloud.web.reports.ReportLoggerFactory;
 
 /**
  * spring mvc controller aspect.

src/main/java/cn/com/qmth/examcloud/commons/web/support/ControllerSupport.java → src/main/java/cn/com/qmth/examcloud/web/support/ControllerSupport.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -22,14 +22,14 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import com.google.common.collect.Lists;
 
-import cn.com.qmth.examcloud.commons.base.exception.ExamCloudRuntimeException;
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.commons.base.util.ObjectUtil;
-import cn.com.qmth.examcloud.commons.web.security.bean.Role;
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
-import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
+import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.util.ObjectUtil;
+import cn.com.qmth.examcloud.web.security.bean.Role;
+import cn.com.qmth.examcloud.web.security.bean.User;
+import cn.com.qmth.examcloud.web.security.enums.RoleMeta;
 
 /**
  * contorller 基类

src/main/java/cn/com/qmth/examcloud/commons/web/support/CustomExceptionHandler.java → src/main/java/cn/com/qmth/examcloud/web/support/CustomExceptionHandler.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 import java.util.HashSet;
 import java.util.List;
@@ -15,12 +15,12 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import cn.com.qmth.examcloud.commons.base.exception.StatusException;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
-import cn.com.qmth.examcloud.commons.base.util.PropertiesUtil;
-import cn.com.qmth.examcloud.commons.base.util.RegExpUtil;
+import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.util.JsonUtil;
+import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
+import cn.com.qmth.examcloud.commons.util.RegExpUtil;
 
 /**
  * 类注释
@@ -117,8 +117,8 @@ public class CustomExceptionHandler {
 	public ResponseEntity<StatusResponse> handleException(Exception e, HttpServletRequest request) {
 
 		StatusResponse body = new StatusResponse(
-				cn.com.qmth.examcloud.commons.web.support.ResponseStatus.FATAL_ERROR.getCode(),
-				cn.com.qmth.examcloud.commons.web.support.ResponseStatus.FATAL_ERROR.getDesc());
+				cn.com.qmth.examcloud.web.support.ResponseStatus.FATAL_ERROR.getCode(),
+				cn.com.qmth.examcloud.web.support.ResponseStatus.FATAL_ERROR.getDesc());
 
 		boolean alwaysOK = alwaysOK(request);
 		if (alwaysOK) {

src/main/java/cn/com/qmth/examcloud/commons/web/support/CustomResponseErrorHandler.java → src/main/java/cn/com/qmth/examcloud/web/support/CustomResponseErrorHandler.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 import java.io.IOException;
 

src/main/java/cn/com/qmth/examcloud/commons/web/support/RemoteProcedureCallTester.java → src/main/java/cn/com/qmth/examcloud/web/support/RemoteProcedureCallTester.java

@@ -1,12 +1,12 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 
 /**
  * 远程调用测试

src/main/java/cn/com/qmth/examcloud/commons/web/support/ResponseStatus.java → src/main/java/cn/com/qmth/examcloud/web/support/ResponseStatus.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 /**
  * 全局响应状态

src/main/java/cn/com/qmth/examcloud/commons/web/support/RuntimeController.java → src/main/java/cn/com/qmth/examcloud/web/support/RuntimeController.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 import java.util.Map;
 

src/main/java/cn/com/qmth/examcloud/commons/web/support/ServletUtil.java → src/main/java/cn/com/qmth/examcloud/web/support/ServletUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -10,9 +10,9 @@ import org.apache.commons.io.IOUtils;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
-import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.util.JsonUtil;
 
 /**
  * servlet 工具

src/main/java/cn/com/qmth/examcloud/commons/web/support/SpringContextHolder.java → src/main/java/cn/com/qmth/examcloud/web/support/SpringContextHolder.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

src/main/java/cn/com/qmth/examcloud/commons/web/support/StatusResponse.java → src/main/java/cn/com/qmth/examcloud/web/support/StatusResponse.java

@@ -1,6 +1,6 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
 import io.swagger.annotations.ApiModelProperty;
 
 /**

src/main/java/cn/com/qmth/examcloud/commons/web/support/SystemController.java → src/main/java/cn/com/qmth/examcloud/web/support/SystemController.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.web.support;
+package cn.com.qmth.examcloud.web.support;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -16,10 +16,10 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import cn.com.qmth.examcloud.commons.base.util.DateUtil;
-import cn.com.qmth.examcloud.commons.base.util.PropertiesUtil;
-import cn.com.qmth.examcloud.commons.web.interceptor.Seqlock;
-import cn.com.qmth.examcloud.commons.web.interceptor.SessionSeqlock;
+import cn.com.qmth.examcloud.commons.util.DateUtil;
+import cn.com.qmth.examcloud.commons.util.PropertiesUtil;
+import cn.com.qmth.examcloud.web.interceptor.Seqlock;
+import cn.com.qmth.examcloud.web.interceptor.SessionSeqlock;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -81,7 +81,7 @@ public class SystemController extends ControllerSupport {
 	@GetMapping("seqlock")
 	@Seqlock
 	public String seqlock() {
-		cn.com.qmth.examcloud.commons.base.util.Util.sleep(TimeUnit.SECONDS, 1);
+		cn.com.qmth.examcloud.commons.util.Util.sleep(TimeUnit.SECONDS, 1);
 		return DateUtil.getNowISO();
 	}
 
@@ -89,7 +89,7 @@ public class SystemController extends ControllerSupport {
 	@GetMapping("sessionSeqlock")
 	@SessionSeqlock
 	public String sessionSeqlock() {
-		cn.com.qmth.examcloud.commons.base.util.Util.sleep(TimeUnit.SECONDS, 1);
+		cn.com.qmth.examcloud.commons.util.Util.sleep(TimeUnit.SECONDS, 1);
 		return DateUtil.getNowISO();
 	}