若依 3.0

ruoyi/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -4,14 +4,14 @@ import java.io.File;
 import java.io.IOException;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;
 import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.IdUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.common.utils.uuid.IdUtils;
 
 /**
  * 文件上传工具类

ruoyi/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java

@@ -6,7 +6,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import javax.servlet.ServletRequest;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,7 +46,7 @@ public class HttpHelper
                 }
                 catch (IOException e)
                 {
-                    LOGGER.error(ExceptionUtils.getFullStackTrace(e));
+                    LOGGER.error(ExceptionUtils.getMessage(e));
                 }
             }
         }

ruoyi/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java

@@ -3,10 +3,10 @@ package com.ruoyi.common.utils.ip;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.framework.config.RuoYiConfig;
 
 /**
  * 获取地址类

ruoyi/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -41,17 +41,17 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFDataValidation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.annotation.Excel.Type;
+import com.ruoyi.common.annotation.Excels;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.reflect.ReflectUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type;
-import com.ruoyi.framework.aspectj.lang.annotation.Excels;
-import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.framework.web.domain.AjaxResult;
 
 /**
  * Excel相关处理

ruoyi/src/main/java/com/ruoyi/common/utils/IdUtils.java → ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java

-package com.ruoyi.common.utils;
+package com.ruoyi.common.utils.uuid;
 
-import com.ruoyi.common.core.lang.UUID;
+import com.ruoyi.common.utils.uuid.UUID;
 
 /**
  * ID生成器工具类