...

src/main/java/cn/com/qmth/examcloud/commons/base/exception/ExamCloudRuntimeException.java → src/main/java/cn/com/qmth/examcloud/commons/exception/ExamCloudRuntimeException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.exception;
+package cn.com.qmth.examcloud.commons.exception;
 
 /**
  * 通用异常类<br>

src/main/java/cn/com/qmth/examcloud/commons/base/exception/StatusException.java → src/main/java/cn/com/qmth/examcloud/commons/exception/StatusException.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.commons.base.exception;
+package cn.com.qmth.examcloud.commons.exception;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import cn.com.qmth.examcloud.commons.base.util.JsonUtil;
+import cn.com.qmth.examcloud.commons.util.JsonUtil;
 
 /**
  * 状态异常类<br>

src/main/java/cn/com/qmth/examcloud/commons/base/helpers/Counter.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/Counter.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.helpers;
+package cn.com.qmth.examcloud.commons.helpers;
 
 import java.util.concurrent.atomic.AtomicLong;
 

src/main/java/cn/com/qmth/examcloud/commons/base/helpers/DataType.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/DataType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.helpers;
+package cn.com.qmth.examcloud.commons.helpers;
 
 /**
  * 数据类型

src/main/java/cn/com/qmth/examcloud/commons/base/helpers/DynamicEnum.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/DynamicEnum.java

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

src/main/java/cn/com/qmth/examcloud/commons/base/helpers/DynamicEnumManager.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/DynamicEnumManager.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.helpers;
+package cn.com.qmth.examcloud.commons.helpers;
 
 import java.io.File;
 import java.util.List;
@@ -7,8 +7,8 @@ import java.util.Map;
 import com.google.common.collect.Maps;
 import com.thoughtworks.xstream.XStream;
 
-import cn.com.qmth.examcloud.commons.base.exception.ExamCloudRuntimeException;
-import cn.com.qmth.examcloud.commons.base.util.PathUtil;
+import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
+import cn.com.qmth.examcloud.commons.util.PathUtil;
 
 /**
  * 动态属性管理器

src/main/java/cn/com/qmth/examcloud/commons/base/helpers/FileChangeWatchdog.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/FileChangeWatchdog.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.commons.base.helpers;
+package cn.com.qmth.examcloud.commons.helpers;
 
 import java.io.File;
 
-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/base/helpers/KeyValuePair.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/KeyValuePair.java

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

src/main/java/cn/com/qmth/examcloud/commons/base/helpers/ObjectHolder.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/ObjectHolder.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.helpers;
+package cn.com.qmth.examcloud.commons.helpers;
 
 /**
  * 基本类型对象化

src/main/java/cn/com/qmth/examcloud/commons/base/helpers/XStreamBuilder.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/XStreamBuilder.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.helpers;
+package cn.com.qmth.examcloud.commons.helpers;
 
 import java.util.TimeZone;
 

src/main/java/cn/com/qmth/examcloud/commons/base/helpers/poi/ExcelReader.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/poi/ExcelReader.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.helpers.poi;
+package cn.com.qmth.examcloud.commons.helpers.poi;
 
 import java.io.File;
 import java.io.FileInputStream;

src/main/java/cn/com/qmth/examcloud/commons/base/helpers/poi/ExcelWriter.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/poi/ExcelWriter.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.helpers.poi;
+package cn.com.qmth.examcloud.commons.helpers.poi;
 
 import java.awt.Color;
 import java.io.File;
@@ -19,7 +19,7 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
-import cn.com.qmth.examcloud.commons.base.util.DateUtil.DatePatterns;
+import cn.com.qmth.examcloud.commons.util.DateUtil.DatePatterns;
 
 /**
  * Excel 生产者

src/main/java/cn/com/qmth/examcloud/commons/base/helpers/poi/XlsxHandler.java → src/main/java/cn/com/qmth/examcloud/commons/helpers/poi/XlsxHandler.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.helpers.poi;
+package cn.com.qmth.examcloud.commons.helpers.poi;
 
 import java.io.InputStream;
 import java.util.Iterator;

src/main/java/cn/com/qmth/examcloud/commons/base/logging/ExamCloudLog.java → src/main/java/cn/com/qmth/examcloud/commons/logging/ExamCloudLog.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.logging;
+package cn.com.qmth.examcloud.commons.logging;
 
 /**
  * 通用日志写入器

src/main/java/cn/com/qmth/examcloud/commons/base/logging/ExamCloudLogFactory.java → src/main/java/cn/com/qmth/examcloud/commons/logging/ExamCloudLogFactory.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.logging;
+package cn.com.qmth.examcloud.commons.logging;
 
 import java.lang.reflect.Constructor;
 

src/main/java/cn/com/qmth/examcloud/commons/base/logging/NoLoggingImpl.java → src/main/java/cn/com/qmth/examcloud/commons/logging/NoLoggingImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.logging;
+package cn.com.qmth.examcloud.commons.logging;
 
 /**
  * no logging

src/main/java/cn/com/qmth/examcloud/commons/base/logging/Resources.java → src/main/java/cn/com/qmth/examcloud/commons/logging/Resources.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.logging;
+package cn.com.qmth.examcloud.commons.logging;
 
 /**
  * A class to simplify access to resources through the classloader.

src/main/java/cn/com/qmth/examcloud/commons/base/logging/SLF4JImpl.java → src/main/java/cn/com/qmth/examcloud/commons/logging/SLF4JImpl.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.logging;
+package cn.com.qmth.examcloud.commons.logging;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/cn/com/qmth/examcloud/commons/base/util/AES.java → src/main/java/cn/com/qmth/examcloud/commons/util/AES.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.security.GeneralSecurityException;
 import java.util.Locale;
@@ -12,7 +12,7 @@ import javax.crypto.spec.SecretKeySpec;
 
 import org.apache.commons.lang3.StringUtils;
 
-import cn.com.qmth.examcloud.commons.base.exception.ExamCloudRuntimeException;
+import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
 
 /**
  * AES算法<br>

src/main/java/cn/com/qmth/examcloud/commons/base/util/AsciiUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/AsciiUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 /**
  * Ascii转换

src/main/java/cn/com/qmth/examcloud/commons/base/util/ByteUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/ByteUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.io.IOException;
 import java.io.StringReader;

src/main/java/cn/com/qmth/examcloud/commons/base/util/DBUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/DBUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -12,8 +12,8 @@ import javax.sql.DataSource;
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 import com.mchange.v2.c3p0.DataSources;
 
-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/base/util/DateUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/DateUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

src/main/java/cn/com/qmth/examcloud/commons/base/util/FreeMarkerUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/FreeMarkerUtil.java

@@ -1,10 +1,10 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.Locale;
 
-import cn.com.qmth.examcloud.commons.base.exception.ExamCloudRuntimeException;
+import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 

src/main/java/cn/com/qmth/examcloud/commons/base/util/HttpClientPool.java → src/main/java/cn/com/qmth/examcloud/commons/util/HttpClientPool.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.security.NoSuchAlgorithmException;
 

src/main/java/cn/com/qmth/examcloud/commons/base/util/HttpClientUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/HttpClientUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -14,8 +14,8 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
 
-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/base/util/IOUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/IOUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;

src/main/java/cn/com/qmth/examcloud/commons/base/util/JsonUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/JsonUtil.java

@@ -1,11 +1,11 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.lang.reflect.Type;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import cn.com.qmth.examcloud.commons.base.util.DateUtil.DatePatterns;
+import cn.com.qmth.examcloud.commons.util.DateUtil.DatePatterns;
 
 /**
  * 类注释

src/main/java/cn/com/qmth/examcloud/commons/base/util/ObjectUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/ObjectUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

src/main/java/cn/com/qmth/examcloud/commons/base/util/PathUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/PathUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/cn/com/qmth/examcloud/commons/base/util/PropertiesUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/PropertiesUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -14,9 +14,9 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.google.common.collect.Sets;
 
-import cn.com.qmth.examcloud.commons.base.exception.ExamCloudRuntimeException;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLog;
-import cn.com.qmth.examcloud.commons.base.logging.ExamCloudLogFactory;
+import cn.com.qmth.examcloud.commons.exception.ExamCloudRuntimeException;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
+import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 
 /**
  * Properties 工具

src/main/java/cn/com/qmth/examcloud/commons/base/util/RegExpUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/RegExpUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/cn/com/qmth/examcloud/commons/base/util/ResourceLoader.java → src/main/java/cn/com/qmth/examcloud/commons/util/ResourceLoader.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/cn/com/qmth/examcloud/commons/base/util/SHA256.java → src/main/java/cn/com/qmth/examcloud/commons/util/SHA256.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

src/main/java/cn/com/qmth/examcloud/commons/base/util/SecurityUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/SecurityUtil.java

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

src/main/java/cn/com/qmth/examcloud/commons/base/util/StringUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/StringUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.util.List;
 

src/main/java/cn/com/qmth/examcloud/commons/base/util/ThreadLocalUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/ThreadLocalUtil.java

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

src/main/java/cn/com/qmth/examcloud/commons/base/util/UUID.java → src/main/java/cn/com/qmth/examcloud/commons/util/UUID.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 /**
  * UUID

src/main/java/cn/com/qmth/examcloud/commons/base/util/UrlUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/UrlUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;

src/main/java/cn/com/qmth/examcloud/commons/base/util/Util.java → src/main/java/cn/com/qmth/examcloud/commons/util/Util.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;

src/main/java/cn/com/qmth/examcloud/commons/base/util/ZipUtil.java → src/main/java/cn/com/qmth/examcloud/commons/util/ZipUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.commons.base.util;
+package cn.com.qmth.examcloud.commons.util;
 
 import java.io.BufferedInputStream;
 import java.io.File;