();
- // 获取所有方法
- Method[] methods = obj.getClass().getMethods();
- // 查找getter方法
- for (Method method : methods)
- {
- Matcher m = GET_PATTERN.matcher(method.getName());
- if (m.matches() && (method.getParameterTypes().length == 0))
- {
- getterMethods.add(method);
- }
- }
- // 返回getter方法列表
- return getterMethods;
- }
-
- /**
- * 检查Bean方法名中的属性名是否相等。
- * 如getName()和setName()属性名一样，getName()和setAge()属性名不一样。
- *
- * @param m1 方法名1
- * @param m2 方法名2
- * @return 属性名一样返回true，否则返回false
- */
-
- public static boolean isMethodPropEquals(String m1, String m2)
- {
- return m1.substring(BEAN_METHOD_PROP_INDEX).equals(m2.substring(BEAN_METHOD_PROP_INDEX));
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java
deleted file mode 100644
index 68130b9c..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.ruoyi.common.utils.file;
-
-import java.io.File;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * 文件类型工具类
- *
- * @author ruoyi
- */
-public class FileTypeUtils
-{
- /**
- * 获取文件类型
- *
- * 例如: ruoyi.txt, 返回: txt
- *
- * @param file 文件名
- * @return 后缀（不含".")
- */
- public static String getFileType(File file)
- {
- if (null == file)
- {
- return StringUtils.EMPTY;
- }
- return getFileType(file.getName());
- }
-
- /**
- * 获取文件类型
- *
- * 例如: ruoyi.txt, 返回: txt
- *
- * @param fileName 文件名
- * @return 后缀（不含".")
- */
- public static String getFileType(String fileName)
- {
- int separatorIndex = fileName.lastIndexOf(".");
- if (separatorIndex < 0)
- {
- return "";
- }
- return fileName.substring(separatorIndex + 1).toLowerCase();
- }
-
- /**
- * 获取文件类型
- *
- * @param photoByte 文件字节码
- * @return 后缀（不含".")
- */
- public static String getFileExtendName(byte[] photoByte)
- {
- String strFileExtendName = "JPG";
- if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
- && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
- {
- strFileExtendName = "GIF";
- }
- else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
- {
- strFileExtendName = "JPG";
- }
- else if ((photoByte[0] == 66) && (photoByte[1] == 77))
- {
- strFileExtendName = "BMP";
- }
- else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
- {
- strFileExtendName = "PNG";
- }
- return strFileExtendName;
- }
-}
\ No newline at end of file
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
deleted file mode 100644
index eb12806e..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package com.ruoyi.common.utils.file;
-
-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.StringUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-
-/**
- * 文件上传工具类
- *
- * @author ruoyi
- */
-public class FileUploadUtils
-{
- /**
- * 默认大小 50M
- */
- public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
-
- /**
- * 默认的文件名最大长度 100
- */
- public static final int DEFAULT_FILE_NAME_LENGTH = 100;
-
- /**
- * 默认上传的地址
- */
- private static String defaultBaseDir = RuoYiConfig.getProfile();
-
- public static void setDefaultBaseDir(String defaultBaseDir)
- {
- FileUploadUtils.defaultBaseDir = defaultBaseDir;
- }
-
- public static String getDefaultBaseDir()
- {
- return defaultBaseDir;
- }
-
- /**
- * 以默认配置进行文件上传
- *
- * @param file 上传的文件
- * @return 文件名称
- * @throws Exception
- */
- public static final String upload(MultipartFile file) throws IOException
- {
- try
- {
- return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
- }
- catch (Exception e)
- {
- throw new IOException(e.getMessage(), e);
- }
- }
-
- /**
- * 根据文件路径上传
- *
- * @param baseDir 相对应用的基目录
- * @param file 上传的文件
- * @return 文件名称
- * @throws IOException
- */
- public static final String upload(String baseDir, MultipartFile file) throws IOException
- {
- try
- {
- return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
- }
- catch (Exception e)
- {
- throw new IOException(e.getMessage(), e);
- }
- }
-
- /**
- * 文件上传
- *
- * @param baseDir 相对应用的基目录
- * @param file 上传的文件
- * @param allowedExtension 上传文件类型
- * @return 返回上传成功的文件名
- * @throws FileSizeLimitExceededException 如果超出最大大小
- * @throws FileNameLengthLimitExceededException 文件名太长
- * @throws IOException 比如读写文件出错时
- * @throws InvalidExtensionException 文件校验异常
- */
- public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
- throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
- InvalidExtensionException
- {
- int fileNamelength = file.getOriginalFilename().length();
- if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
- {
- throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
- }
-
- assertAllowed(file, allowedExtension);
-
- String fileName = extractFilename(file);
-
- File desc = getAbsoluteFile(baseDir, fileName);
- file.transferTo(desc);
- String pathFileName = getPathFileName(baseDir, fileName);
- return pathFileName;
- }
-
- /**
- * 编码文件名
- */
- public static final String extractFilename(MultipartFile file)
- {
- String fileName = file.getOriginalFilename();
- String extension = getExtension(file);
- fileName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
- return fileName;
- }
-
- public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
- {
- File desc = new File(uploadDir + File.separator + fileName);
-
- if (!desc.exists())
- {
- if (!desc.getParentFile().exists())
- {
- desc.getParentFile().mkdirs();
- }
- }
- return desc;
- }
-
- public static final String getPathFileName(String uploadDir, String fileName) throws IOException
- {
- int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
- String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
- String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
- return pathFileName;
- }
-
- /**
- * 文件大小校验
- *
- * @param file 上传的文件
- * @return
- * @throws FileSizeLimitExceededException 如果超出最大大小
- * @throws InvalidExtensionException
- */
- public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
- throws FileSizeLimitExceededException, InvalidExtensionException
- {
- long size = file.getSize();
- if (DEFAULT_MAX_SIZE != -1 && size > DEFAULT_MAX_SIZE)
- {
- throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
- }
-
- String fileName = file.getOriginalFilename();
- String extension = getExtension(file);
- if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
- {
- if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
- {
- throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
- fileName);
- }
- else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
- {
- throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
- fileName);
- }
- else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
- {
- throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
- fileName);
- }
- else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
- {
- throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
- fileName);
- }
- else
- {
- throw new InvalidExtensionException(allowedExtension, extension, fileName);
- }
- }
-
- }
-
- /**
- * 判断MIME类型是否是允许的MIME类型
- *
- * @param extension
- * @param allowedExtension
- * @return
- */
- public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
- {
- for (String str : allowedExtension)
- {
- if (str.equalsIgnoreCase(extension))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 获取文件名的后缀
- *
- * @param file 表单文件
- * @return 后缀名
- */
- public static final String getExtension(MultipartFile file)
- {
- String extension = FilenameUtils.getExtension(file.getOriginalFilename());
- if (StringUtils.isEmpty(extension))
- {
- extension = MimeTypeUtils.getExtension(file.getContentType());
- }
- return extension;
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
deleted file mode 100644
index 7a244598..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package com.ruoyi.common.utils.file;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ArrayUtils;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-
-/**
- * 文件处理工具类
- *
- * @author ruoyi
- */
-public class FileUtils
-{
- public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
-
- /**
- * 输出指定文件的byte数组
- *
- * @param filePath 文件路径
- * @param os 输出流
- * @return
- */
- public static void writeBytes(String filePath, OutputStream os) throws IOException
- {
- FileInputStream fis = null;
- try
- {
- File file = new File(filePath);
- if (!file.exists())
- {
- throw new FileNotFoundException(filePath);
- }
- fis = new FileInputStream(file);
- byte[] b = new byte[1024];
- int length;
- while ((length = fis.read(b)) > 0)
- {
- os.write(b, 0, length);
- }
- }
- catch (IOException e)
- {
- throw e;
- }
- finally
- {
- IOUtils.close(os);
- IOUtils.close(fis);
- }
- }
-
- /**
- * 写数据到文件中
- *
- * @param data 数据
- * @return 目标文件
- * @throws IOException IO异常
- */
- public static String writeImportBytes(byte[] data) throws IOException
- {
- return writeBytes(data, RuoYiConfig.getImportPath());
- }
-
- /**
- * 写数据到文件中
- *
- * @param data 数据
- * @param uploadDir 目标文件
- * @return 目标文件
- * @throws IOException IO异常
- */
- public static String writeBytes(byte[] data, String uploadDir) throws IOException
- {
- FileOutputStream fos = null;
- String pathName = "";
- try
- {
- String extension = getFileExtendName(data);
- pathName = DateUtils.datePath() + "/" + IdUtils.fastUUID() + "." + extension;
- File file = FileUploadUtils.getAbsoluteFile(uploadDir, pathName);
- fos = new FileOutputStream(file);
- fos.write(data);
- }
- finally
- {
- IOUtils.close(fos);
- }
- return FileUploadUtils.getPathFileName(uploadDir, pathName);
- }
-
- /**
- * 删除文件
- *
- * @param filePath 文件
- * @return
- */
- public static boolean deleteFile(String filePath)
- {
- boolean flag = false;
- File file = new File(filePath);
- // 路径为文件且不为空则进行删除
- if (file.isFile() && file.exists())
- {
- file.delete();
- flag = true;
- }
- return flag;
- }
-
- /**
- * 文件名称验证
- *
- * @param filename 文件名称
- * @return true 正常 false 非法
- */
- public static boolean isValidFilename(String filename)
- {
- return filename.matches(FILENAME_PATTERN);
- }
-
- /**
- * 检查文件是否可下载
- *
- * @param resource 需要下载的文件
- * @return true 正常 false 非法
- */
- public static boolean checkAllowDownload(String resource)
- {
- // 禁止目录上跳级别
- if (StringUtils.contains(resource, ".."))
- {
- return false;
- }
-
- // 检查允许下载的文件规则
- if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)))
- {
- return true;
- }
-
- // 不在允许下载的文件规则
- return false;
- }
-
- /**
- * 下载文件名重新编码
- *
- * @param request 请求对象
- * @param fileName 文件名
- * @return 编码后的文件名
- */
- public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException
- {
- final String agent = request.getHeader("USER-AGENT");
- String filename = fileName;
- if (agent.contains("MSIE"))
- {
- // IE浏览器
- filename = URLEncoder.encode(filename, "utf-8");
- filename = filename.replace("+", " ");
- }
- else if (agent.contains("Firefox"))
- {
- // 火狐浏览器
- filename = new String(fileName.getBytes(), "ISO8859-1");
- }
- else if (agent.contains("Chrome"))
- {
- // google浏览器
- filename = URLEncoder.encode(filename, "utf-8");
- }
- else
- {
- // 其它浏览器
- filename = URLEncoder.encode(filename, "utf-8");
- }
- return filename;
- }
-
- /**
- * 下载文件名重新编码
- *
- * @param response 响应对象
- * @param realFileName 真实文件名
- * @return
- */
- public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException
- {
- String percentEncodedFileName = percentEncode(realFileName);
-
- StringBuilder contentDispositionValue = new StringBuilder();
- contentDispositionValue.append("attachment; filename=")
- .append(percentEncodedFileName)
- .append(";")
- .append("filename*=")
- .append("utf-8''")
- .append(percentEncodedFileName);
-
- response.addHeader("Access-Control-Allow-Origin", "*");
- response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename");
- response.setHeader("Content-disposition", contentDispositionValue.toString());
- response.setHeader("download-filename", percentEncodedFileName);
- }
-
- /**
- * 百分号编码工具方法
- *
- * @param s 需要百分号编码的字符串
- * @return 百分号编码后的字符串
- */
- public static String percentEncode(String s) throws UnsupportedEncodingException
- {
- String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
- return encode.replaceAll("\\+", "%20");
- }
-
- /**
- * 获取图像后缀
- *
- * @param photoByte 图像数据
- * @return 后缀名
- */
- public static String getFileExtendName(byte[] photoByte)
- {
- String strFileExtendName = "jpg";
- if ((photoByte[0] == 71) && (photoByte[1] == 73) && (photoByte[2] == 70) && (photoByte[3] == 56)
- && ((photoByte[4] == 55) || (photoByte[4] == 57)) && (photoByte[5] == 97))
- {
- strFileExtendName = "gif";
- }
- else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70))
- {
- strFileExtendName = "jpg";
- }
- else if ((photoByte[0] == 66) && (photoByte[1] == 77))
- {
- strFileExtendName = "bmp";
- }
- else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
- {
- strFileExtendName = "png";
- }
- return strFileExtendName;
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
deleted file mode 100644
index 0b7b5aaa..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.ruoyi.common.utils.file;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Arrays;
-import org.apache.poi.util.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 图片处理工具类
- *
- * @author ruoyi
- */
-public class ImageUtils
-{
- private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);
-
- public static byte[] getImage(String imagePath)
- {
- InputStream is = getFile(imagePath);
- try
- {
- return IOUtils.toByteArray(is);
- }
- catch (Exception e)
- {
- log.error("图片加载异常 {}", e);
- return null;
- }
- finally
- {
- IOUtils.closeQuietly(is);
- }
- }
-
- public static InputStream getFile(String imagePath)
- {
- try
- {
- byte[] result = readFile(imagePath);
- result = Arrays.copyOf(result, result.length);
- return new ByteArrayInputStream(result);
- }
- catch (Exception e)
- {
- log.error("获取图片异常 {}", e);
- }
- return null;
- }
-
- /**
- * 读取文件为字节数据
- *
- * @param key 地址
- * @return 字节数据
- */
- public static byte[] readFile(String url)
- {
- InputStream in = null;
- ByteArrayOutputStream baos = null;
- try
- {
- if (url.startsWith("http"))
- {
- // 网络地址
- URL urlObj = new URL(url);
- URLConnection urlConnection = urlObj.openConnection();
- urlConnection.setConnectTimeout(30 * 1000);
- urlConnection.setReadTimeout(60 * 1000);
- urlConnection.setDoInput(true);
- in = urlConnection.getInputStream();
- }
- else
- {
- // 本机地址
- String localPath = RuoYiConfig.getProfile();
- String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX);
- in = new FileInputStream(downloadPath);
- }
- return IOUtils.toByteArray(in);
- }
- catch (Exception e)
- {
- log.error("获取文件路径异常 {}", e);
- return null;
- }
- finally
- {
- IOUtils.closeQuietly(in);
- IOUtils.closeQuietly(baos);
- }
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
deleted file mode 100644
index f968f1a1..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.ruoyi.common.utils.file;
-
-/**
- * 媒体类型工具类
- *
- * @author ruoyi
- */
-public class MimeTypeUtils
-{
- public static final String IMAGE_PNG = "image/png";
-
- public static final String IMAGE_JPG = "image/jpg";
-
- public static final String IMAGE_JPEG = "image/jpeg";
-
- public static final String IMAGE_BMP = "image/bmp";
-
- public static final String IMAGE_GIF = "image/gif";
-
- public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
-
- public static final String[] FLASH_EXTENSION = { "swf", "flv" };
-
- public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
- "asf", "rm", "rmvb" };
-
- public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
-
- public static final String[] DEFAULT_ALLOWED_EXTENSION = {
- // 图片
- "bmp", "gif", "jpg", "jpeg", "png",
- // word excel powerpoint
- "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
- // 压缩文件
- "rar", "zip", "gz", "bz2",
- // 视频格式
- "mp4", "avi", "rmvb",
- // pdf
- "pdf" };
-
- public static String getExtension(String prefix)
- {
- switch (prefix)
- {
- case IMAGE_PNG:
- return "png";
- case IMAGE_JPG:
- return "jpg";
- case IMAGE_JPEG:
- return "jpeg";
- case IMAGE_BMP:
- return "bmp";
- case IMAGE_GIF:
- return "gif";
- default:
- return "";
- }
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
deleted file mode 100644
index f52e83e5..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.ruoyi.common.utils.html;
-
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 转义和反转义工具类
- *
- * @author ruoyi
- */
-public class EscapeUtil
-{
- public static final String RE_HTML_MARK = "(<[^<]*?>)|(<[\\s]*?/[^<]*?>)|(<[^<]*?/[\\s]*?>)";
-
- private static final char[][] TEXT = new char[64][];
-
- static
- {
- for (int i = 0; i < 64; i++)
- {
- TEXT[i] = new char[] { (char) i };
- }
-
- // special HTML characters
- TEXT['\''] = "'".toCharArray(); // 单引号
- TEXT['"'] = """.toCharArray(); // 双引号
- TEXT['&'] = "&".toCharArray(); // &符
- TEXT['<'] = "<".toCharArray(); // 小于号
- TEXT['>'] = ">".toCharArray(); // 大于号
- }
-
- /**
- * 转义文本中的HTML字符为安全的字符
- *
- * @param text 被转义的文本
- * @return 转义后的文本
- */
- public static String escape(String text)
- {
- return encode(text);
- }
-
- /**
- * 还原被转义的HTML特殊字符
- *
- * @param content 包含转义符的HTML内容
- * @return 转换后的字符串
- */
- public static String unescape(String content)
- {
- return decode(content);
- }
-
- /**
- * 清除所有HTML标签，但是不删除标签内的内容
- *
- * @param content 文本
- * @return 清除标签后的文本
- */
- public static String clean(String content)
- {
- return new HTMLFilter().filter(content);
- }
-
- /**
- * Escape编码
- *
- * @param text 被编码的文本
- * @return 编码后的字符
- */
- private static String encode(String text)
- {
- if (StringUtils.isEmpty(text))
- {
- return StringUtils.EMPTY;
- }
-
- final StringBuilder tmp = new StringBuilder(text.length() * 6);
- char c;
- for (int i = 0; i < text.length(); i++)
- {
- c = text.charAt(i);
- if (c < 256)
- {
- tmp.append("%");
- if (c < 16)
- {
- tmp.append("0");
- }
- tmp.append(Integer.toString(c, 16));
- }
- else
- {
- tmp.append("%u");
- if (c <= 0xfff)
- {
- // issue#I49JU8@Gitee
- tmp.append("0");
- }
- tmp.append(Integer.toString(c, 16));
- }
- }
- return tmp.toString();
- }
-
- /**
- * Escape解码
- *
- * @param content 被转义的内容
- * @return 解码后的字符串
- */
- public static String decode(String content)
- {
- if (StringUtils.isEmpty(content))
- {
- return content;
- }
-
- StringBuilder tmp = new StringBuilder(content.length());
- int lastPos = 0, pos = 0;
- char ch;
- while (lastPos < content.length())
- {
- pos = content.indexOf("%", lastPos);
- if (pos == lastPos)
- {
- if (content.charAt(pos + 1) == 'u')
- {
- ch = (char) Integer.parseInt(content.substring(pos + 2, pos + 6), 16);
- tmp.append(ch);
- lastPos = pos + 6;
- }
- else
- {
- ch = (char) Integer.parseInt(content.substring(pos + 1, pos + 3), 16);
- tmp.append(ch);
- lastPos = pos + 3;
- }
- }
- else
- {
- if (pos == -1)
- {
- tmp.append(content.substring(lastPos));
- lastPos = content.length();
- }
- else
- {
- tmp.append(content.substring(lastPos, pos));
- lastPos = pos;
- }
- }
- }
- return tmp.toString();
- }
-
- public static void main(String[] args)
- {
- String html = "";
- String escape = EscapeUtil.escape(html);
- // String html = "ipt>alert(\"XSS\")ipt>";
- // String html = "<123";
- // String html = "123>";
- System.out.println("clean: " + EscapeUtil.clean(html));
- System.out.println("escape: " + escape);
- System.out.println("unescape: " + EscapeUtil.unescape(escape));
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
deleted file mode 100644
index db069bc8..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java
+++ /dev/null
@@ -1,570 +0,0 @@
-package com.ruoyi.common.utils.html;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * HTML过滤器，用于去除XSS漏洞隐患。
- *
- * @author ruoyi
- */
-public final class HTMLFilter
-{
- /**
- * regex flag union representing /si modifiers in php
- **/
- private static final int REGEX_FLAGS_SI = Pattern.CASE_INSENSITIVE | Pattern.DOTALL;
- private static final Pattern P_COMMENTS = Pattern.compile("", Pattern.DOTALL);
- private static final Pattern P_COMMENT = Pattern.compile("^!--(.*)--$", REGEX_FLAGS_SI);
- private static final Pattern P_TAGS = Pattern.compile("<(.*?)>", Pattern.DOTALL);
- private static final Pattern P_END_TAG = Pattern.compile("^/([a-z0-9]+)", REGEX_FLAGS_SI);
- private static final Pattern P_START_TAG = Pattern.compile("^([a-z0-9]+)(.*?)(/?)$", REGEX_FLAGS_SI);
- private static final Pattern P_QUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)=([\"'])(.*?)\\2", REGEX_FLAGS_SI);
- private static final Pattern P_UNQUOTED_ATTRIBUTES = Pattern.compile("([a-z0-9]+)(=)([^\"\\s']+)", REGEX_FLAGS_SI);
- private static final Pattern P_PROTOCOL = Pattern.compile("^([^:]+):", REGEX_FLAGS_SI);
- private static final Pattern P_ENTITY = Pattern.compile("&#(\\d+);?");
- private static final Pattern P_ENTITY_UNICODE = Pattern.compile("&#x([0-9a-f]+);?");
- private static final Pattern P_ENCODE = Pattern.compile("%([0-9a-f]{2});?");
- private static final Pattern P_VALID_ENTITIES = Pattern.compile("&([^&;]*)(?=(;|&|$))");
- private static final Pattern P_VALID_QUOTES = Pattern.compile("(>|^)([^<]+?)(<|$)", Pattern.DOTALL);
- private static final Pattern P_END_ARROW = Pattern.compile("^>");
- private static final Pattern P_BODY_TO_END = Pattern.compile("<([^>]*?)(?=<|$)");
- private static final Pattern P_XML_CONTENT = Pattern.compile("(^|>)([^<]*?)(?=>)");
- private static final Pattern P_STRAY_LEFT_ARROW = Pattern.compile("<([^>]*?)(?=<|$)");
- private static final Pattern P_STRAY_RIGHT_ARROW = Pattern.compile("(^|>)([^<]*?)(?=>)");
- private static final Pattern P_AMP = Pattern.compile("&");
- private static final Pattern P_QUOTE = Pattern.compile("\"");
- private static final Pattern P_LEFT_ARROW = Pattern.compile("<");
- private static final Pattern P_RIGHT_ARROW = Pattern.compile(">");
- private static final Pattern P_BOTH_ARROWS = Pattern.compile("<>");
-
- // @xxx could grow large... maybe use sesat's ReferenceMap
- private static final ConcurrentMap P_REMOVE_PAIR_BLANKS = new ConcurrentHashMap<>();
- private static final ConcurrentMap P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>();
-
- /**
- * set of allowed html elements, along with allowed attributes for each element
- **/
- private final Map> vAllowed;
- /**
- * counts of open tags for each (allowable) html element
- **/
- private final Map vTagCounts = new HashMap<>();
-
- /**
- * html elements which must always be self-closing (e.g. "![]()
")
- **/
- private final String[] vSelfClosingTags;
- /**
- * html elements which must always have separate opening and closing tags (e.g. "")
- **/
- private final String[] vNeedClosingTags;
- /**
- * set of disallowed html elements
- **/
- private final String[] vDisallowed;
- /**
- * attributes which should be checked for valid protocols
- **/
- private final String[] vProtocolAtts;
- /**
- * allowed protocols
- **/
- private final String[] vAllowedProtocols;
- /**
- * tags which should be removed if they contain no content (e.g. "" or "")
- **/
- private final String[] vRemoveBlanks;
- /**
- * entities allowed within html markup
- **/
- private final String[] vAllowedEntities;
- /**
- * flag determining whether comments are allowed in input String.
- */
- private final boolean stripComment;
- private final boolean encodeQuotes;
- /**
- * flag determining whether to try to make tags when presented with "unbalanced" angle brackets (e.g. ""
- * becomes " text "). If set to false, unbalanced angle brackets will be html escaped.
- */
- private final boolean alwaysMakeTags;
-
- /**
- * Default constructor.
- */
- public HTMLFilter()
- {
- vAllowed = new HashMap<>();
-
- final ArrayList a_atts = new ArrayList<>();
- a_atts.add("href");
- a_atts.add("target");
- vAllowed.put("a", a_atts);
-
- final ArrayList img_atts = new ArrayList<>();
- img_atts.add("src");
- img_atts.add("width");
- img_atts.add("height");
- img_atts.add("alt");
- vAllowed.put("img", img_atts);
-
- final ArrayList no_atts = new ArrayList<>();
- vAllowed.put("b", no_atts);
- vAllowed.put("strong", no_atts);
- vAllowed.put("i", no_atts);
- vAllowed.put("em", no_atts);
-
- vSelfClosingTags = new String[] { "img" };
- vNeedClosingTags = new String[] { "a", "b", "strong", "i", "em" };
- vDisallowed = new String[] {};
- vAllowedProtocols = new String[] { "http", "mailto", "https" }; // no ftp.
- vProtocolAtts = new String[] { "src", "href" };
- vRemoveBlanks = new String[] { "a", "b", "strong", "i", "em" };
- vAllowedEntities = new String[] { "amp", "gt", "lt", "quot" };
- stripComment = true;
- encodeQuotes = true;
- alwaysMakeTags = false;
- }
-
- /**
- * Map-parameter configurable constructor.
- *
- * @param conf map containing configuration. keys match field names.
- */
- @SuppressWarnings("unchecked")
- public HTMLFilter(final Map conf)
- {
-
- assert conf.containsKey("vAllowed") : "configuration requires vAllowed";
- assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags";
- assert conf.containsKey("vNeedClosingTags") : "configuration requires vNeedClosingTags";
- assert conf.containsKey("vDisallowed") : "configuration requires vDisallowed";
- assert conf.containsKey("vAllowedProtocols") : "configuration requires vAllowedProtocols";
- assert conf.containsKey("vProtocolAtts") : "configuration requires vProtocolAtts";
- assert conf.containsKey("vRemoveBlanks") : "configuration requires vRemoveBlanks";
- assert conf.containsKey("vAllowedEntities") : "configuration requires vAllowedEntities";
-
- vAllowed = Collections.unmodifiableMap((HashMap>) conf.get("vAllowed"));
- vSelfClosingTags = (String[]) conf.get("vSelfClosingTags");
- vNeedClosingTags = (String[]) conf.get("vNeedClosingTags");
- vDisallowed = (String[]) conf.get("vDisallowed");
- vAllowedProtocols = (String[]) conf.get("vAllowedProtocols");
- vProtocolAtts = (String[]) conf.get("vProtocolAtts");
- vRemoveBlanks = (String[]) conf.get("vRemoveBlanks");
- vAllowedEntities = (String[]) conf.get("vAllowedEntities");
- stripComment = conf.containsKey("stripComment") ? (Boolean) conf.get("stripComment") : true;
- encodeQuotes = conf.containsKey("encodeQuotes") ? (Boolean) conf.get("encodeQuotes") : true;
- alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true;
- }
-
- private void reset()
- {
- vTagCounts.clear();
- }
-
- // ---------------------------------------------------------------
- // my versions of some PHP library functions
- public static String chr(final int decimal)
- {
- return String.valueOf((char) decimal);
- }
-
- public static String htmlSpecialChars(final String s)
- {
- String result = s;
- result = regexReplace(P_AMP, "&", result);
- result = regexReplace(P_QUOTE, """, result);
- result = regexReplace(P_LEFT_ARROW, "<", result);
- result = regexReplace(P_RIGHT_ARROW, ">", result);
- return result;
- }
-
- // ---------------------------------------------------------------
-
- /**
- * given a user submitted input String, filter out any invalid or restricted html.
- *
- * @param input text (i.e. submitted by a user) than may contain html
- * @return "clean" version of input, with only valid, whitelisted html elements allowed
- */
- public String filter(final String input)
- {
- reset();
- String s = input;
-
- s = escapeComments(s);
-
- s = balanceHTML(s);
-
- s = checkTags(s);
-
- s = processRemoveBlanks(s);
-
- // s = validateEntities(s);
-
- return s;
- }
-
- public boolean isAlwaysMakeTags()
- {
- return alwaysMakeTags;
- }
-
- public boolean isStripComments()
- {
- return stripComment;
- }
-
- private String escapeComments(final String s)
- {
- final Matcher m = P_COMMENTS.matcher(s);
- final StringBuffer buf = new StringBuffer();
- if (m.find())
- {
- final String match = m.group(1); // (.*?)
- m.appendReplacement(buf, Matcher.quoteReplacement(""));
- }
- m.appendTail(buf);
-
- return buf.toString();
- }
-
- private String balanceHTML(String s)
- {
- if (alwaysMakeTags)
- {
- //
- // try and form html
- //
- s = regexReplace(P_END_ARROW, "", s);
- // 不追加结束标签
- s = regexReplace(P_BODY_TO_END, "<$1>", s);
- s = regexReplace(P_XML_CONTENT, "$1<$2", s);
-
- }
- else
- {
- //
- // escape stray brackets
- //
- s = regexReplace(P_STRAY_LEFT_ARROW, "<$1", s);
- s = regexReplace(P_STRAY_RIGHT_ARROW, "$1$2><", s);
-
- //
- // the last regexp causes '<>' entities to appear
- // (we need to do a lookahead assertion so that the last bracket can
- // be used in the next pass of the regexp)
- //
- s = regexReplace(P_BOTH_ARROWS, "", s);
- }
-
- return s;
- }
-
- private String checkTags(String s)
- {
- Matcher m = P_TAGS.matcher(s);
-
- final StringBuffer buf = new StringBuffer();
- while (m.find())
- {
- String replaceStr = m.group(1);
- replaceStr = processTag(replaceStr);
- m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr));
- }
- m.appendTail(buf);
-
- // these get tallied in processTag
- // (remember to reset before subsequent calls to filter method)
- final StringBuilder sBuilder = new StringBuilder(buf.toString());
- for (String key : vTagCounts.keySet())
- {
- for (int ii = 0; ii < vTagCounts.get(key); ii++)
- {
- sBuilder.append("");
- }
- }
- s = sBuilder.toString();
-
- return s;
- }
-
- private String processRemoveBlanks(final String s)
- {
- String result = s;
- for (String tag : vRemoveBlanks)
- {
- if (!P_REMOVE_PAIR_BLANKS.containsKey(tag))
- {
- P_REMOVE_PAIR_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?>"));
- }
- result = regexReplace(P_REMOVE_PAIR_BLANKS.get(tag), "", result);
- if (!P_REMOVE_SELF_BLANKS.containsKey(tag))
- {
- P_REMOVE_SELF_BLANKS.putIfAbsent(tag, Pattern.compile("<" + tag + "(\\s[^>]*)?/>"));
- }
- result = regexReplace(P_REMOVE_SELF_BLANKS.get(tag), "", result);
- }
-
- return result;
- }
-
- private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s)
- {
- Matcher m = regex_pattern.matcher(s);
- return m.replaceAll(replacement);
- }
-
- private String processTag(final String s)
- {
- // ending tags
- Matcher m = P_END_TAG.matcher(s);
- if (m.find())
- {
- final String name = m.group(1).toLowerCase();
- if (allowed(name))
- {
- if (!inArray(name, vSelfClosingTags))
- {
- if (vTagCounts.containsKey(name))
- {
- vTagCounts.put(name, vTagCounts.get(name) - 1);
- return "";
- }
- }
- }
- }
-
- // starting tags
- m = P_START_TAG.matcher(s);
- if (m.find())
- {
- final String name = m.group(1).toLowerCase();
- final String body = m.group(2);
- String ending = m.group(3);
-
- // debug( "in a starting tag, name='" + name + "'; body='" + body + "'; ending='" + ending + "'" );
- if (allowed(name))
- {
- final StringBuilder params = new StringBuilder();
-
- final Matcher m2 = P_QUOTED_ATTRIBUTES.matcher(body);
- final Matcher m3 = P_UNQUOTED_ATTRIBUTES.matcher(body);
- final List paramNames = new ArrayList<>();
- final List paramValues = new ArrayList<>();
- while (m2.find())
- {
- paramNames.add(m2.group(1)); // ([a-z0-9]+)
- paramValues.add(m2.group(3)); // (.*?)
- }
- while (m3.find())
- {
- paramNames.add(m3.group(1)); // ([a-z0-9]+)
- paramValues.add(m3.group(3)); // ([^\"\\s']+)
- }
-
- String paramName, paramValue;
- for (int ii = 0; ii < paramNames.size(); ii++)
- {
- paramName = paramNames.get(ii).toLowerCase();
- paramValue = paramValues.get(ii);
-
- // debug( "paramName='" + paramName + "'" );
- // debug( "paramValue='" + paramValue + "'" );
- // debug( "allowed? " + vAllowed.get( name ).contains( paramName ) );
-
- if (allowedAttribute(name, paramName))
- {
- if (inArray(paramName, vProtocolAtts))
- {
- paramValue = processParamProtocol(paramValue);
- }
- params.append(' ').append(paramName).append("=\\\"").append(paramValue).append("\"");
- }
- }
-
- if (inArray(name, vSelfClosingTags))
- {
- ending = " /";
- }
-
- if (inArray(name, vNeedClosingTags))
- {
- ending = "";
- }
-
- if (ending == null || ending.length() < 1)
- {
- if (vTagCounts.containsKey(name))
- {
- vTagCounts.put(name, vTagCounts.get(name) + 1);
- }
- else
- {
- vTagCounts.put(name, 1);
- }
- }
- else
- {
- ending = " /";
- }
- return "<" + name + params + ending + ">";
- }
- else
- {
- return "";
- }
- }
-
- // comments
- m = P_COMMENT.matcher(s);
- if (!stripComment && m.find())
- {
- return "<" + m.group() + ">";
- }
-
- return "";
- }
-
- private String processParamProtocol(String s)
- {
- s = decodeEntities(s);
- final Matcher m = P_PROTOCOL.matcher(s);
- if (m.find())
- {
- final String protocol = m.group(1);
- if (!inArray(protocol, vAllowedProtocols))
- {
- // bad protocol, turn into local anchor link instead
- s = "#" + s.substring(protocol.length() + 1);
- if (s.startsWith("#//"))
- {
- s = "#" + s.substring(3);
- }
- }
- }
-
- return s;
- }
-
- private String decodeEntities(String s)
- {
- StringBuffer buf = new StringBuffer();
-
- Matcher m = P_ENTITY.matcher(s);
- while (m.find())
- {
- final String match = m.group(1);
- final int decimal = Integer.decode(match).intValue();
- m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
- }
- m.appendTail(buf);
- s = buf.toString();
-
- buf = new StringBuffer();
- m = P_ENTITY_UNICODE.matcher(s);
- while (m.find())
- {
- final String match = m.group(1);
- final int decimal = Integer.valueOf(match, 16).intValue();
- m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
- }
- m.appendTail(buf);
- s = buf.toString();
-
- buf = new StringBuffer();
- m = P_ENCODE.matcher(s);
- while (m.find())
- {
- final String match = m.group(1);
- final int decimal = Integer.valueOf(match, 16).intValue();
- m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
- }
- m.appendTail(buf);
- s = buf.toString();
-
- s = validateEntities(s);
- return s;
- }
-
- private String validateEntities(final String s)
- {
- StringBuffer buf = new StringBuffer();
-
- // validate entities throughout the string
- Matcher m = P_VALID_ENTITIES.matcher(s);
- while (m.find())
- {
- final String one = m.group(1); // ([^&;]*)
- final String two = m.group(2); // (?=(;|&|$))
- m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two)));
- }
- m.appendTail(buf);
-
- return encodeQuotes(buf.toString());
- }
-
- private String encodeQuotes(final String s)
- {
- if (encodeQuotes)
- {
- StringBuffer buf = new StringBuffer();
- Matcher m = P_VALID_QUOTES.matcher(s);
- while (m.find())
- {
- final String one = m.group(1); // (>|^)
- final String two = m.group(2); // ([^<]+?)
- final String three = m.group(3); // (<|$)
- // 不替换双引号为"，防止json格式无效 regexReplace(P_QUOTE, """, two)
- m.appendReplacement(buf, Matcher.quoteReplacement(one + two + three));
- }
- m.appendTail(buf);
- return buf.toString();
- }
- else
- {
- return s;
- }
- }
-
- private String checkEntity(final String preamble, final String term)
- {
-
- return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble;
- }
-
- private boolean isValidEntity(final String entity)
- {
- return inArray(entity, vAllowedEntities);
- }
-
- private static boolean inArray(final String s, final String[] array)
- {
- for (String item : array)
- {
- if (item != null && item.equals(s))
- {
- return true;
- }
- }
- return false;
- }
-
- private boolean allowed(final String name)
- {
- return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed);
- }
-
- private boolean allowedAttribute(final String name, final String paramName)
- {
- return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName));
- }
-}
\ No newline at end of file
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
deleted file mode 100644
index dac60ad0..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.ruoyi.common.utils.http;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.Charset;
-import javax.servlet.ServletRequest;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 通用http工具封装
- *
- * @author ruoyi
- */
-public class HttpHelper
-{
- private static final Logger LOGGER = LoggerFactory.getLogger(HttpHelper.class);
-
- public static String getBodyString(ServletRequest request)
- {
- StringBuilder sb = new StringBuilder();
- BufferedReader reader = null;
- try (InputStream inputStream = request.getInputStream())
- {
- reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
- String line = "";
- while ((line = reader.readLine()) != null)
- {
- sb.append(line);
- }
- }
- catch (IOException e)
- {
- LOGGER.warn("getBodyString出现问题！");
- }
- finally
- {
- if (reader != null)
- {
- try
- {
- reader.close();
- }
- catch (IOException e)
- {
- LOGGER.error(ExceptionUtils.getMessage(e));
- }
- }
- }
- return sb.toString();
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
deleted file mode 100644
index e319d370..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ /dev/null
@@ -1,274 +0,0 @@
-package com.ruoyi.common.utils.http;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.security.cert.X509Certificate;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * 通用http发送方法
- *
- * @author ruoyi
- */
-public class HttpUtils
-{
- private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
-
- /**
- * 向指定 URL 发送GET方法的请求
- *
- * @param url 发送请求的 URL
- * @return 所代表远程资源的响应结果
- */
- public static String sendGet(String url)
- {
- return sendGet(url, StringUtils.EMPTY);
- }
-
- /**
- * 向指定 URL 发送GET方法的请求
- *
- * @param url 发送请求的 URL
- * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
- * @return 所代表远程资源的响应结果
- */
- public static String sendGet(String url, String param)
- {
- return sendGet(url, param, Constants.UTF8);
- }
-
- /**
- * 向指定 URL 发送GET方法的请求
- *
- * @param url 发送请求的 URL
- * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
- * @param contentType 编码类型
- * @return 所代表远程资源的响应结果
- */
- public static String sendGet(String url, String param, String contentType)
- {
- StringBuilder result = new StringBuilder();
- BufferedReader in = null;
- try
- {
- String urlNameString = StringUtils.isNotBlank(param) ? url + "?" + param : url;
- log.info("sendGet - {}", urlNameString);
- URL realUrl = new URL(urlNameString);
- URLConnection connection = realUrl.openConnection();
- connection.setRequestProperty("accept", "*/*");
- connection.setRequestProperty("connection", "Keep-Alive");
- connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
- connection.connect();
- in = new BufferedReader(new InputStreamReader(connection.getInputStream(), contentType));
- String line;
- while ((line = in.readLine()) != null)
- {
- result.append(line);
- }
- log.info("recv - {}", result);
- }
- catch (ConnectException e)
- {
- log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e);
- }
- catch (SocketTimeoutException e)
- {
- log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e);
- }
- catch (IOException e)
- {
- log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e);
- }
- catch (Exception e)
- {
- log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e);
- }
- finally
- {
- try
- {
- if (in != null)
- {
- in.close();
- }
- }
- catch (Exception ex)
- {
- log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
- }
- }
- return result.toString();
- }
-
- /**
- * 向指定 URL 发送POST方法的请求
- *
- * @param url 发送请求的 URL
- * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
- * @return 所代表远程资源的响应结果
- */
- public static String sendPost(String url, String param)
- {
- PrintWriter out = null;
- BufferedReader in = null;
- StringBuilder result = new StringBuilder();
- try
- {
- String urlNameString = url;
- log.info("sendPost - {}", urlNameString);
- URL realUrl = new URL(urlNameString);
- URLConnection conn = realUrl.openConnection();
- conn.setRequestProperty("accept", "*/*");
- conn.setRequestProperty("connection", "Keep-Alive");
- conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
- conn.setRequestProperty("Accept-Charset", "utf-8");
- conn.setRequestProperty("contentType", "utf-8");
- conn.setDoOutput(true);
- conn.setDoInput(true);
- out = new PrintWriter(conn.getOutputStream());
- out.print(param);
- out.flush();
- in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
- String line;
- while ((line = in.readLine()) != null)
- {
- result.append(line);
- }
- log.info("recv - {}", result);
- }
- catch (ConnectException e)
- {
- log.error("调用HttpUtils.sendPost ConnectException, url=" + url + ",param=" + param, e);
- }
- catch (SocketTimeoutException e)
- {
- log.error("调用HttpUtils.sendPost SocketTimeoutException, url=" + url + ",param=" + param, e);
- }
- catch (IOException e)
- {
- log.error("调用HttpUtils.sendPost IOException, url=" + url + ",param=" + param, e);
- }
- catch (Exception e)
- {
- log.error("调用HttpsUtil.sendPost Exception, url=" + url + ",param=" + param, e);
- }
- finally
- {
- try
- {
- if (out != null)
- {
- out.close();
- }
- if (in != null)
- {
- in.close();
- }
- }
- catch (IOException ex)
- {
- log.error("调用in.close Exception, url=" + url + ",param=" + param, ex);
- }
- }
- return result.toString();
- }
-
- public static String sendSSLPost(String url, String param)
- {
- StringBuilder result = new StringBuilder();
- String urlNameString = url + "?" + param;
- try
- {
- log.info("sendSSLPost - {}", urlNameString);
- SSLContext sc = SSLContext.getInstance("SSL");
- sc.init(null, new TrustManager[] { new TrustAnyTrustManager() }, new java.security.SecureRandom());
- URL console = new URL(urlNameString);
- HttpsURLConnection conn = (HttpsURLConnection) console.openConnection();
- conn.setRequestProperty("accept", "*/*");
- conn.setRequestProperty("connection", "Keep-Alive");
- conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
- conn.setRequestProperty("Accept-Charset", "utf-8");
- conn.setRequestProperty("contentType", "utf-8");
- conn.setDoOutput(true);
- conn.setDoInput(true);
-
- conn.setSSLSocketFactory(sc.getSocketFactory());
- conn.setHostnameVerifier(new TrustAnyHostnameVerifier());
- conn.connect();
- InputStream is = conn.getInputStream();
- BufferedReader br = new BufferedReader(new InputStreamReader(is));
- String ret = "";
- while ((ret = br.readLine()) != null)
- {
- if (ret != null && !"".equals(ret.trim()))
- {
- result.append(new String(ret.getBytes("ISO-8859-1"), "utf-8"));
- }
- }
- log.info("recv - {}", result);
- conn.disconnect();
- br.close();
- }
- catch (ConnectException e)
- {
- log.error("调用HttpUtils.sendSSLPost ConnectException, url=" + url + ",param=" + param, e);
- }
- catch (SocketTimeoutException e)
- {
- log.error("调用HttpUtils.sendSSLPost SocketTimeoutException, url=" + url + ",param=" + param, e);
- }
- catch (IOException e)
- {
- log.error("调用HttpUtils.sendSSLPost IOException, url=" + url + ",param=" + param, e);
- }
- catch (Exception e)
- {
- log.error("调用HttpsUtil.sendSSLPost Exception, url=" + url + ",param=" + param, e);
- }
- return result.toString();
- }
-
- private static class TrustAnyTrustManager implements X509TrustManager
- {
- @Override
- public void checkClientTrusted(X509Certificate[] chain, String authType)
- {
- }
-
- @Override
- public void checkServerTrusted(X509Certificate[] chain, String authType)
- {
- }
-
- @Override
- public X509Certificate[] getAcceptedIssuers()
- {
- return new X509Certificate[] {};
- }
- }
-
- private static class TrustAnyHostnameVerifier implements HostnameVerifier
- {
- @Override
- public boolean verify(String hostname, SSLSession session)
- {
- return true;
- }
- }
-}
\ No newline at end of file
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
deleted file mode 100644
index 01c24fc7..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-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;
-
-/**
- * 获取地址类
- *
- * @author ruoyi
- */
-public class AddressUtils
-{
- private static final Logger log = LoggerFactory.getLogger(AddressUtils.class);
-
- // IP地址查询
- public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp";
-
- // 未知地址
- public static final String UNKNOWN = "XX XX";
-
- public static String getRealAddressByIP(String ip)
- {
- String address = UNKNOWN;
- // 内网不查询
- if (IpUtils.internalIp(ip))
- {
- return "内网IP";
- }
- if (RuoYiConfig.isAddressEnabled())
- {
- try
- {
- String rspStr = HttpUtils.sendGet(IP_URL, "ip=" + ip + "&json=true", Constants.GBK);
- if (StringUtils.isEmpty(rspStr))
- {
- log.error("获取地理位置异常 {}", ip);
- return UNKNOWN;
- }
- JSONObject obj = JSONObject.parseObject(rspStr);
- String region = obj.getString("pro");
- String city = obj.getString("city");
- return String.format("%s %s", region, city);
- }
- catch (Exception e)
- {
- log.error("获取地理位置异常 {}", ip);
- }
- }
- return address;
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
deleted file mode 100644
index 1b3f42ba..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.ruoyi.common.utils.ip;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import javax.servlet.http.HttpServletRequest;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.html.EscapeUtil;
-
-/**
- * 获取IP方法
- *
- * @author ruoyi
- */
-public class IpUtils
-{
- public static String getIpAddr(HttpServletRequest request)
- {
- if (request == null)
- {
- return "unknown";
- }
- String ip = request.getHeader("x-forwarded-for");
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("X-Forwarded-For");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("WL-Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getHeader("X-Real-IP");
- }
-
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
- ip = request.getRemoteAddr();
- }
- return "0:0:0:0:0:0:0:1".equals(ip) ? "127.0.0.1" : EscapeUtil.clean(ip);
- }
-
- public static boolean internalIp(String ip)
- {
- byte[] addr = textToNumericFormatV4(ip);
- return internalIp(addr) || "127.0.0.1".equals(ip);
- }
-
- private static boolean internalIp(byte[] addr)
- {
- if (StringUtils.isNull(addr) || addr.length < 2)
- {
- return true;
- }
- final byte b0 = addr[0];
- final byte b1 = addr[1];
- // 10.x.x.x/8
- final byte SECTION_1 = 0x0A;
- // 172.16.x.x/12
- final byte SECTION_2 = (byte) 0xAC;
- final byte SECTION_3 = (byte) 0x10;
- final byte SECTION_4 = (byte) 0x1F;
- // 192.168.x.x/16
- final byte SECTION_5 = (byte) 0xC0;
- final byte SECTION_6 = (byte) 0xA8;
- switch (b0)
- {
- case SECTION_1:
- return true;
- case SECTION_2:
- if (b1 >= SECTION_3 && b1 <= SECTION_4)
- {
- return true;
- }
- case SECTION_5:
- switch (b1)
- {
- case SECTION_6:
- return true;
- }
- default:
- return false;
- }
- }
-
- /**
- * 将IPv4地址转换成字节
- *
- * @param text IPv4地址
- * @return byte 字节
- */
- public static byte[] textToNumericFormatV4(String text)
- {
- if (text.length() == 0)
- {
- return null;
- }
-
- byte[] bytes = new byte[4];
- String[] elements = text.split("\\.", -1);
- try
- {
- long l;
- int i;
- switch (elements.length)
- {
- case 1:
- l = Long.parseLong(elements[0]);
- if ((l < 0L) || (l > 4294967295L)) {
- return null;
- }
- bytes[0] = (byte) (int) (l >> 24 & 0xFF);
- bytes[1] = (byte) (int) ((l & 0xFFFFFF) >> 16 & 0xFF);
- bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
- bytes[3] = (byte) (int) (l & 0xFF);
- break;
- case 2:
- l = Integer.parseInt(elements[0]);
- if ((l < 0L) || (l > 255L)) {
- return null;
- }
- bytes[0] = (byte) (int) (l & 0xFF);
- l = Integer.parseInt(elements[1]);
- if ((l < 0L) || (l > 16777215L)) {
- return null;
- }
- bytes[1] = (byte) (int) (l >> 16 & 0xFF);
- bytes[2] = (byte) (int) ((l & 0xFFFF) >> 8 & 0xFF);
- bytes[3] = (byte) (int) (l & 0xFF);
- break;
- case 3:
- for (i = 0; i < 2; ++i)
- {
- l = Integer.parseInt(elements[i]);
- if ((l < 0L) || (l > 255L)) {
- return null;
- }
- bytes[i] = (byte) (int) (l & 0xFF);
- }
- l = Integer.parseInt(elements[2]);
- if ((l < 0L) || (l > 65535L)) {
- return null;
- }
- bytes[2] = (byte) (int) (l >> 8 & 0xFF);
- bytes[3] = (byte) (int) (l & 0xFF);
- break;
- case 4:
- for (i = 0; i < 4; ++i)
- {
- l = Integer.parseInt(elements[i]);
- if ((l < 0L) || (l > 255L)) {
- return null;
- }
- bytes[i] = (byte) (int) (l & 0xFF);
- }
- break;
- default:
- return null;
- }
- }
- catch (NumberFormatException e)
- {
- return null;
- }
- return bytes;
- }
-
- public static String getHostIp()
- {
- try
- {
- return InetAddress.getLocalHost().getHostAddress();
- }
- catch (UnknownHostException e)
- {
- }
- return "127.0.0.1";
- }
-
- public static String getHostName()
- {
- try
- {
- return InetAddress.getLocalHost().getHostName();
- }
- catch (UnknownHostException e)
- {
- }
- return "未知";
- }
-}
\ No newline at end of file
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java
deleted file mode 100644
index 5ea74c11..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.ruoyi.common.utils.poi;
-
-/**
- * Excel数据格式处理适配器
- *
- * @author ruoyi
- */
-public interface ExcelHandlerAdapter
-{
- /**
- * 格式化
- *
- * @param value 单元格数据值
- * @param args excel注解args参数组
- *
- * @return 处理后的值
- */
- Object format(Object value, String[] args);
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
deleted file mode 100644
index 4557ca0b..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ /dev/null
@@ -1,1391 +0,0 @@
-package com.ruoyi.common.utils.poi;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFPicture;
-import org.apache.poi.hssf.usermodel.HSSFPictureData;
-import org.apache.poi.hssf.usermodel.HSSFShape;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ooxml.POIXMLDocumentPart;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.apache.poi.xssf.usermodel.XSSFDrawing;
-import org.apache.poi.xssf.usermodel.XSSFPicture;
-import org.apache.poi.xssf.usermodel.XSSFShape;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
-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.UtilException;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.DictUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileTypeUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.common.utils.file.ImageUtils;
-import com.ruoyi.common.utils.reflect.ReflectUtils;
-
-/**
- * Excel相关处理
- *
- * @author ruoyi
- */
-public class ExcelUtil
-{
- private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
-
- /**
- * Excel sheet最大行数，默认65536
- */
- public static final int sheetSize = 65536;
-
- /**
- * 工作表名称
- */
- private String sheetName;
-
- /**
- * 导出类型（EXPORT:导出数据；IMPORT：导入模板）
- */
- private Type type;
-
- /**
- * 工作薄对象
- */
- private Workbook wb;
-
- /**
- * 工作表对象
- */
- private Sheet sheet;
-
- /**
- * 样式列表
- */
- private Map styles;
-
- /**
- * 导入导出数据列表
- */
- private List list;
-
- /**
- * 注解列表
- */
- private List fields;
-
- /**
- * 当前行号
- */
- private int rownum;
-
- /**
- * 标题
- */
- private String title;
-
- /**
- * 最大高度
- */
- private short maxHeight;
-
- /**
- * 统计列表
- */
- private Map statistics = new HashMap();
-
- /**
- * 数字格式
- */
- private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
-
- /**
- * 实体对象
- */
- public Class clazz;
-
- public ExcelUtil(Class clazz)
- {
- this.clazz = clazz;
- }
-
- public void init(List list, String sheetName, String title, Type type)
- {
- if (list == null)
- {
- list = new ArrayList();
- }
- this.list = list;
- this.sheetName = sheetName;
- this.type = type;
- this.title = title;
- createExcelField();
- createWorkbook();
- createTitle();
- }
-
- /**
- * 创建excel第一行标题
- */
- public void createTitle()
- {
- if (StringUtils.isNotEmpty(title))
- {
- Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
- titleRow.setHeightInPoints(30);
- Cell titleCell = titleRow.createCell(0);
- titleCell.setCellStyle(styles.get("title"));
- titleCell.setCellValue(title);
- sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(),
- this.fields.size() - 1));
- }
- }
-
- /**
- * 对excel表单默认第一个索引名转换成list
- *
- * @param is 输入流
- * @return 转换后集合
- */
- public List importExcel(InputStream is) throws Exception
- {
- return importExcel(is, 0);
- }
-
- /**
- * 对excel表单默认第一个索引名转换成list
- *
- * @param is 输入流
- * @param titleNum 标题占用行数
- * @return 转换后集合
- */
- public List importExcel(InputStream is, int titleNum) throws Exception
- {
- return importExcel(StringUtils.EMPTY, is, titleNum);
- }
-
- /**
- * 对excel表单指定表格索引名转换成list
- *
- * @param sheetName 表格索引名
- * @param titleNum 标题占用行数
- * @param is 输入流
- * @return 转换后集合
- */
- public List importExcel(String sheetName, InputStream is, int titleNum) throws Exception
- {
- this.type = Type.IMPORT;
- this.wb = WorkbookFactory.create(is);
- List list = new ArrayList();
- // 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet
- Sheet sheet = StringUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
- if (sheet == null)
- {
- throw new IOException("文件sheet不存在");
- }
- boolean isXSSFWorkbook = !(wb instanceof HSSFWorkbook);
- Map pictures;
- if (isXSSFWorkbook)
- {
- pictures = getSheetPictures07((XSSFSheet) sheet, (XSSFWorkbook) wb);
- }
- else
- {
- pictures = getSheetPictures03((HSSFSheet) sheet, (HSSFWorkbook) wb);
- }
- // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1
- int rows = sheet.getLastRowNum();
-
- if (rows > 0)
- {
- // 定义一个map用于存放excel列的序号和field.
- Map cellMap = new HashMap();
- // 获取表头
- Row heard = sheet.getRow(titleNum);
- for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
- {
- Cell cell = heard.getCell(i);
- if (StringUtils.isNotNull(cell))
- {
- String value = this.getCellValue(heard, i).toString();
- cellMap.put(value, i);
- }
- else
- {
- cellMap.put(null, i);
- }
- }
- // 有数据时才处理 得到类的所有field.
- List fields = this.getFields();
- Map fieldsMap = new HashMap();
- for (Object[] objects : fields)
- {
- Excel attr = (Excel) objects[1];
- Integer column = cellMap.get(attr.name());
- if (column != null)
- {
- fieldsMap.put(column, objects);
- }
- }
- for (int i = titleNum + 1; i <= rows; i++)
- {
- // 从第2行开始取数据,默认第一行是表头.
- Row row = sheet.getRow(i);
- // 判断当前行是否是空行
- if (isRowEmpty(row))
- {
- continue;
- }
- T entity = null;
- for (Map.Entry entry : fieldsMap.entrySet())
- {
- Object val = this.getCellValue(row, entry.getKey());
-
- // 如果不存在实例则新建.
- entity = (entity == null ? clazz.newInstance() : entity);
- // 从map中得到对应列的field.
- Field field = (Field) entry.getValue()[0];
- Excel attr = (Excel) entry.getValue()[1];
- // 取得类型,并根据对象类型设置值.
- Class fieldType = field.getType();
- if (String.class == fieldType)
- {
- String s = Convert.toStr(val);
- if (StringUtils.endsWith(s, ".0"))
- {
- val = StringUtils.substringBefore(s, ".0");
- }
- else
- {
- String dateFormat = field.getAnnotation(Excel.class).dateFormat();
- if (StringUtils.isNotEmpty(dateFormat))
- {
- val = DateUtils.parseDateToStr(dateFormat, (Date) val);
- }
- else
- {
- val = Convert.toStr(val);
- }
- }
- }
- else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val)))
- {
- val = Convert.toInt(val);
- }
- else if (Long.TYPE == fieldType || Long.class == fieldType)
- {
- val = Convert.toLong(val);
- }
- else if (Double.TYPE == fieldType || Double.class == fieldType)
- {
- val = Convert.toDouble(val);
- }
- else if (Float.TYPE == fieldType || Float.class == fieldType)
- {
- val = Convert.toFloat(val);
- }
- else if (BigDecimal.class == fieldType)
- {
- val = Convert.toBigDecimal(val);
- }
- else if (Date.class == fieldType)
- {
- if (val instanceof String)
- {
- val = DateUtils.parseDate(val);
- }
- else if (val instanceof Double)
- {
- val = DateUtil.getJavaDate((Double) val);
- }
- }
- else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
- {
- val = Convert.toBool(val, false);
- }
- if (StringUtils.isNotNull(fieldType))
- {
- String propertyName = field.getName();
- if (StringUtils.isNotEmpty(attr.targetAttr()))
- {
- propertyName = field.getName() + "." + attr.targetAttr();
- }
- else if (StringUtils.isNotEmpty(attr.readConverterExp()))
- {
- val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
- }
- else if (StringUtils.isNotEmpty(attr.dictType()))
- {
- val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());
- }
- else if (!attr.handler().equals(ExcelHandlerAdapter.class))
- {
- val = dataFormatHandlerAdapter(val, attr);
- }
- else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures))
- {
- PictureData image = pictures.get(row.getRowNum() + "_" + entry.getKey());
- if (image == null)
- {
- val = "";
- }
- else
- {
- byte[] data = image.getData();
- val = FileUtils.writeImportBytes(data);
- }
- }
- ReflectUtils.invokeSetter(entity, propertyName, val);
- }
- }
- list.add(entity);
- }
- }
- return list;
- }
-
- /**
- * 对list数据源将其里面的数据导入到excel表单
- *
- * @param list 导出数据集合
- * @param sheetName 工作表的名称
- * @return 结果
- */
- public AjaxResult exportExcel(List list, String sheetName)
- {
- return exportExcel(list, sheetName, StringUtils.EMPTY);
- }
-
- /**
- * 对list数据源将其里面的数据导入到excel表单
- *
- * @param list 导出数据集合
- * @param sheetName 工作表的名称
- * @param title 标题
- * @return 结果
- */
- public AjaxResult exportExcel(List list, String sheetName, String title)
- {
- this.init(list, sheetName, title, Type.EXPORT);
- return exportExcel();
- }
-
- /**
- * 对list数据源将其里面的数据导入到excel表单
- *
- * @param response 返回数据
- * @param list 导出数据集合
- * @param sheetName 工作表的名称
- * @return 结果
- * @throws IOException
- */
- public void exportExcel(HttpServletResponse response, List list, String sheetName)
- {
- exportExcel(response, list, sheetName, StringUtils.EMPTY);
- }
-
- /**
- * 对list数据源将其里面的数据导入到excel表单
- *
- * @param response 返回数据
- * @param list 导出数据集合
- * @param sheetName 工作表的名称
- * @param title 标题
- * @return 结果
- * @throws IOException
- */
- public void exportExcel(HttpServletResponse response, List list, String sheetName, String title)
- {
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
- response.setCharacterEncoding("utf-8");
- this.init(list, sheetName, title, Type.EXPORT);
- exportExcel(response);
- }
-
- /**
- * 对list数据源将其里面的数据导入到excel表单
- *
- * @param sheetName 工作表的名称
- * @return 结果
- */
- public AjaxResult importTemplateExcel(String sheetName)
- {
- return importTemplateExcel(sheetName, StringUtils.EMPTY);
- }
-
- /**
- * 对list数据源将其里面的数据导入到excel表单
- *
- * @param sheetName 工作表的名称
- * @param title 标题
- * @return 结果
- */
- public AjaxResult importTemplateExcel(String sheetName, String title)
- {
- this.init(null, sheetName, title, Type.IMPORT);
- return exportExcel();
- }
-
- /**
- * 对list数据源将其里面的数据导入到excel表单
- *
- * @param sheetName 工作表的名称
- * @return 结果
- */
- public void importTemplateExcel(HttpServletResponse response, String sheetName)
- {
- importTemplateExcel(response, sheetName, StringUtils.EMPTY);
- }
-
- /**
- * 对list数据源将其里面的数据导入到excel表单
- *
- * @param sheetName 工作表的名称
- * @param title 标题
- * @return 结果
- */
- public void importTemplateExcel(HttpServletResponse response, String sheetName, String title)
- {
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
- response.setCharacterEncoding("utf-8");
- this.init(null, sheetName, title, Type.IMPORT);
- exportExcel(response);
- }
-
- /**
- * 对list数据源将其里面的数据导入到excel表单
- *
- * @return 结果
- */
- public void exportExcel(HttpServletResponse response)
- {
- try
- {
- writeSheet();
- wb.write(response.getOutputStream());
- }
- catch (Exception e)
- {
- log.error("导出Excel异常{}", e.getMessage());
- }
- finally
- {
- IOUtils.closeQuietly(wb);
- }
- }
-
- /**
- * 对list数据源将其里面的数据导入到excel表单
- *
- * @return 结果
- */
- public AjaxResult exportExcel()
- {
- OutputStream out = null;
- try
- {
- writeSheet();
- String filename = encodingFilename(sheetName);
- out = new FileOutputStream(getAbsoluteFile(filename));
- wb.write(out);
- return AjaxResult.success(filename);
- }
- catch (Exception e)
- {
- log.error("导出Excel异常{}", e.getMessage());
- throw new UtilException("导出Excel失败，请联系网站管理员！");
- }
- finally
- {
- IOUtils.closeQuietly(wb);
- IOUtils.closeQuietly(out);
- }
- }
-
- /**
- * 创建写入数据到Sheet
- */
- public void writeSheet()
- {
- // 取出一共有多少个sheet.
- int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize));
- for (int index = 0; index < sheetNo; index++)
- {
- createSheet(sheetNo, index);
-
- // 产生一行
- Row row = sheet.createRow(rownum);
- int column = 0;
- // 写入各个字段的列头名称
- for (Object[] os : fields)
- {
- Excel excel = (Excel) os[1];
- this.createCell(excel, row, column++);
- }
- if (Type.EXPORT.equals(type))
- {
- fillExcelData(index, row);
- addStatisticsRow();
- }
- }
- }
-
- /**
- * 填充excel数据
- *
- * @param index 序号
- * @param row 单元格行
- */
- public void fillExcelData(int index, Row row)
- {
- int startNo = index * sheetSize;
- int endNo = Math.min(startNo + sheetSize, list.size());
- for (int i = startNo; i < endNo; i++)
- {
- row = sheet.createRow(i + 1 + rownum - startNo);
- // 得到导出对象.
- T vo = (T) list.get(i);
- int column = 0;
- for (Object[] os : fields)
- {
- Field field = (Field) os[0];
- Excel excel = (Excel) os[1];
- this.addCell(excel, row, vo, field, column++);
- }
- }
- }
-
- /**
- * 创建表格样式
- *
- * @param wb 工作薄对象
- * @return 样式列表
- */
- private Map createStyles(Workbook wb)
- {
- // 写入各条记录,每条记录对应excel表中的一行
- Map styles = new HashMap();
- CellStyle style = wb.createCellStyle();
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- Font titleFont = wb.createFont();
- titleFont.setFontName("Arial");
- titleFont.setFontHeightInPoints((short) 16);
- titleFont.setBold(true);
- style.setFont(titleFont);
- styles.put("title", style);
-
- style = wb.createCellStyle();
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- style.setBorderRight(BorderStyle.THIN);
- style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderLeft(BorderStyle.THIN);
- style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderTop(BorderStyle.THIN);
- style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setBorderBottom(BorderStyle.THIN);
- style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
- Font dataFont = wb.createFont();
- dataFont.setFontName("Arial");
- dataFont.setFontHeightInPoints((short) 10);
- style.setFont(dataFont);
- styles.put("data", style);
-
- style = wb.createCellStyle();
- style.cloneStyleFrom(styles.get("data"));
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
- style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
- Font headerFont = wb.createFont();
- headerFont.setFontName("Arial");
- headerFont.setFontHeightInPoints((short) 10);
- headerFont.setBold(true);
- headerFont.setColor(IndexedColors.WHITE.getIndex());
- style.setFont(headerFont);
- styles.put("header", style);
-
- style = wb.createCellStyle();
- style.setAlignment(HorizontalAlignment.CENTER);
- style.setVerticalAlignment(VerticalAlignment.CENTER);
- Font totalFont = wb.createFont();
- totalFont.setFontName("Arial");
- totalFont.setFontHeightInPoints((short) 10);
- style.setFont(totalFont);
- styles.put("total", style);
-
- style = wb.createCellStyle();
- style.cloneStyleFrom(styles.get("data"));
- style.setAlignment(HorizontalAlignment.LEFT);
- styles.put("data1", style);
-
- style = wb.createCellStyle();
- style.cloneStyleFrom(styles.get("data"));
- style.setAlignment(HorizontalAlignment.CENTER);
- styles.put("data2", style);
-
- style = wb.createCellStyle();
- style.cloneStyleFrom(styles.get("data"));
- style.setAlignment(HorizontalAlignment.RIGHT);
- styles.put("data3", style);
-
- return styles;
- }
-
- /**
- * 创建单元格
- */
- public Cell createCell(Excel attr, Row row, int column)
- {
- // 创建列
- Cell cell = row.createCell(column);
- // 写入列信息
- cell.setCellValue(attr.name());
- setDataValidation(attr, row, column);
- cell.setCellStyle(styles.get("header"));
- return cell;
- }
-
- /**
- * 设置单元格信息
- *
- * @param value 单元格值
- * @param attr 注解相关
- * @param cell 单元格信息
- */
- public void setCellVo(Object value, Excel attr, Cell cell)
- {
- if (ColumnType.STRING == attr.cellType())
- {
- cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());
- }
- else if (ColumnType.NUMERIC == attr.cellType())
- {
- if (StringUtils.isNotNull(value))
- {
- cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
- }
- }
- else if (ColumnType.IMAGE == attr.cellType())
- {
- ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1), cell.getRow().getRowNum() + 1);
- String imagePath = Convert.toStr(value);
- if (StringUtils.isNotEmpty(imagePath))
- {
- byte[] data = ImageUtils.getImage(imagePath);
- getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
- cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
- }
- }
- }
-
- /**
- * 获取画布
- */
- public static Drawing getDrawingPatriarch(Sheet sheet)
- {
- if (sheet.getDrawingPatriarch() == null)
- {
- sheet.createDrawingPatriarch();
- }
- return sheet.getDrawingPatriarch();
- }
-
- /**
- * 获取图片类型,设置图片插入类型
- */
- public int getImageType(byte[] value)
- {
- String type = FileTypeUtils.getFileExtendName(value);
- if ("JPG".equalsIgnoreCase(type))
- {
- return Workbook.PICTURE_TYPE_JPEG;
- }
- else if ("PNG".equalsIgnoreCase(type))
- {
- return Workbook.PICTURE_TYPE_PNG;
- }
- return Workbook.PICTURE_TYPE_JPEG;
- }
-
- /**
- * 创建表格样式
- */
- public void setDataValidation(Excel attr, Row row, int column)
- {
- if (attr.name().indexOf("注：") >= 0)
- {
- sheet.setColumnWidth(column, 6000);
- }
- else
- {
- // 设置列宽
- sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
- }
- // 如果设置了提示信息则鼠标放上去提示.
- if (StringUtils.isNotEmpty(attr.prompt()))
- {
- // 这里默认设了2-101列提示.
- setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
- }
- // 如果设置了combo属性则本列只能选择不能输入
- if (attr.combo().length > 0)
- {
- // 这里默认设了2-101列只能选择不能输入.
- setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
- }
- }
-
- /**
- * 添加单元格
- */
- public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
- {
- Cell cell = null;
- try
- {
- // 设置行高
- row.setHeight(maxHeight);
- // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
- if (attr.isExport())
- {
- // 创建cell
- cell = row.createCell(column);
- int align = attr.align().value();
- cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
-
- // 用于读取对象中的属性
- Object value = getTargetValue(vo, field, attr);
- String dateFormat = attr.dateFormat();
- String readConverterExp = attr.readConverterExp();
- String separator = attr.separator();
- String dictType = attr.dictType();
- if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
- {
- cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));
- }
- else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
- {
- cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
- }
- else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value))
- {
- cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));
- }
- else if (value instanceof BigDecimal && -1 != attr.scale())
- {
- cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString());
- }
- else if (!attr.handler().equals(ExcelHandlerAdapter.class))
- {
- cell.setCellValue(dataFormatHandlerAdapter(value, attr));
- }
- else
- {
- // 设置列类型
- setCellVo(value, attr, cell);
- }
- addStatisticsData(column, Convert.toStr(value), attr);
- }
- }
- catch (Exception e)
- {
- log.error("导出Excel失败{}", e);
- }
- return cell;
- }
-
- /**
- * 设置 POI XSSFSheet 单元格提示
- *
- * @param sheet 表单
- * @param promptTitle 提示标题
- * @param promptContent 提示内容
- * @param firstRow 开始行
- * @param endRow 结束行
- * @param firstCol 开始列
- * @param endCol 结束列
- */
- public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
- int firstCol, int endCol)
- {
- DataValidationHelper helper = sheet.getDataValidationHelper();
- DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
- CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
- DataValidation dataValidation = helper.createValidation(constraint, regions);
- dataValidation.createPromptBox(promptTitle, promptContent);
- dataValidation.setShowPromptBox(true);
- sheet.addValidationData(dataValidation);
- }
-
- /**
- * 设置某些列的值只能输入预制的数据,显示下拉框.
- *
- * @param sheet 要设置的sheet.
- * @param textlist 下拉框显示的内容
- * @param firstRow 开始行
- * @param endRow 结束行
- * @param firstCol 开始列
- * @param endCol 结束列
- * @return 设置好的sheet.
- */
- public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol)
- {
- DataValidationHelper helper = sheet.getDataValidationHelper();
- // 加载下拉列表内容
- DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
- // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
- CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
- // 数据有效性对象
- DataValidation dataValidation = helper.createValidation(constraint, regions);
- // 处理Excel兼容性问题
- if (dataValidation instanceof XSSFDataValidation)
- {
- dataValidation.setSuppressDropDownArrow(true);
- dataValidation.setShowErrorBox(true);
- }
- else
- {
- dataValidation.setSuppressDropDownArrow(false);
- }
-
- sheet.addValidationData(dataValidation);
- }
-
- /**
- * 解析导出值 0=男,1=女,2=未知
- *
- * @param propertyValue 参数值
- * @param converterExp 翻译注解
- * @param separator 分隔符
- * @return 解析后值
- */
- public static String convertByExp(String propertyValue, String converterExp, String separator)
- {
- StringBuilder propertyString = new StringBuilder();
- String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
- {
- String[] itemArray = item.split("=");
- if (StringUtils.containsAny(separator, propertyValue))
- {
- for (String value : propertyValue.split(separator))
- {
- if (itemArray[0].equals(value))
- {
- propertyString.append(itemArray[1] + separator);
- break;
- }
- }
- }
- else
- {
- if (itemArray[0].equals(propertyValue))
- {
- return itemArray[1];
- }
- }
- }
- return StringUtils.stripEnd(propertyString.toString(), separator);
- }
-
- /**
- * 反向解析值 男=0,女=1,未知=2
- *
- * @param propertyValue 参数值
- * @param converterExp 翻译注解
- * @param separator 分隔符
- * @return 解析后值
- */
- public static String reverseByExp(String propertyValue, String converterExp, String separator)
- {
- StringBuilder propertyString = new StringBuilder();
- String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
- {
- String[] itemArray = item.split("=");
- if (StringUtils.containsAny(separator, propertyValue))
- {
- for (String value : propertyValue.split(separator))
- {
- if (itemArray[1].equals(value))
- {
- propertyString.append(itemArray[0] + separator);
- break;
- }
- }
- }
- else
- {
- if (itemArray[1].equals(propertyValue))
- {
- return itemArray[0];
- }
- }
- }
- return StringUtils.stripEnd(propertyString.toString(), separator);
- }
-
- /**
- * 解析字典值
- *
- * @param dictValue 字典值
- * @param dictType 字典类型
- * @param separator 分隔符
- * @return 字典标签
- */
- public static String convertDictByExp(String dictValue, String dictType, String separator)
- {
- return DictUtils.getDictLabel(dictType, dictValue, separator);
- }
-
- /**
- * 反向解析值字典值
- *
- * @param dictLabel 字典标签
- * @param dictType 字典类型
- * @param separator 分隔符
- * @return 字典值
- */
- public static String reverseDictByExp(String dictLabel, String dictType, String separator)
- {
- return DictUtils.getDictValue(dictType, dictLabel, separator);
- }
-
- /**
- * 数据处理器
- *
- * @param value 数据值
- * @param excel 数据注解
- * @return
- */
- public String dataFormatHandlerAdapter(Object value, Excel excel)
- {
- try
- {
- Object instance = excel.handler().newInstance();
- Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class });
- value = formatMethod.invoke(instance, value, excel.args());
- }
- catch (Exception e)
- {
- log.error("不能格式化数据 " + excel.handler(), e.getMessage());
- }
- return Convert.toStr(value);
- }
-
- /**
- * 合计统计信息
- */
- private void addStatisticsData(Integer index, String text, Excel entity)
- {
- if (entity != null && entity.isStatistics())
- {
- Double temp = 0D;
- if (!statistics.containsKey(index))
- {
- statistics.put(index, temp);
- }
- try
- {
- temp = Double.valueOf(text);
- }
- catch (NumberFormatException e)
- {
- }
- statistics.put(index, statistics.get(index) + temp);
- }
- }
-
- /**
- * 创建统计行
- */
- public void addStatisticsRow()
- {
- if (statistics.size() > 0)
- {
- Row row = sheet.createRow(sheet.getLastRowNum() + 1);
- Set keys = statistics.keySet();
- Cell cell = row.createCell(0);
- cell.setCellStyle(styles.get("total"));
- cell.setCellValue("合计");
-
- for (Integer key : keys)
- {
- cell = row.createCell(key);
- cell.setCellStyle(styles.get("total"));
- cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
- }
- statistics.clear();
- }
- }
-
- /**
- * 编码文件名
- */
- public String encodingFilename(String filename)
- {
- filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";
- return filename;
- }
-
- /**
- * 获取下载路径
- *
- * @param filename 文件名称
- */
- public String getAbsoluteFile(String filename)
- {
- String downloadPath = RuoYiConfig.getDownloadPath() + filename;
- File desc = new File(downloadPath);
- if (!desc.getParentFile().exists())
- {
- desc.getParentFile().mkdirs();
- }
- return downloadPath;
- }
-
- /**
- * 获取bean中的属性值
- *
- * @param vo 实体对象
- * @param field 字段
- * @param excel 注解
- * @return 最终的属性值
- * @throws Exception
- */
- private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
- {
- Object o = field.get(vo);
- if (StringUtils.isNotEmpty(excel.targetAttr()))
- {
- String target = excel.targetAttr();
- if (target.indexOf(".") > -1)
- {
- String[] targets = target.split("[.]");
- for (String name : targets)
- {
- o = getValue(o, name);
- }
- }
- else
- {
- o = getValue(o, target);
- }
- }
- return o;
- }
-
- /**
- * 以类的属性的get方法方法形式获取值
- *
- * @param o
- * @param name
- * @return value
- * @throws Exception
- */
- private Object getValue(Object o, String name) throws Exception
- {
- if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name))
- {
- Class clazz = o.getClass();
- Field field = clazz.getDeclaredField(name);
- field.setAccessible(true);
- o = field.get(o);
- }
- return o;
- }
-
- /**
- * 得到所有定义字段
- */
- private void createExcelField()
- {
- this.fields = getFields();
- this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
- this.maxHeight = getRowHeight();
- }
-
- /**
- * 获取字段注解信息
- */
- public List getFields()
- {
- List fields = new ArrayList();
- List tempFields = new ArrayList<>();
- tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
- tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
- for (Field field : tempFields)
- {
- // 单注解
- if (field.isAnnotationPresent(Excel.class))
- {
- Excel attr = field.getAnnotation(Excel.class);
- if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
- {
- field.setAccessible(true);
- fields.add(new Object[] { field, attr });
- }
- }
-
- // 多注解
- if (field.isAnnotationPresent(Excels.class))
- {
- Excels attrs = field.getAnnotation(Excels.class);
- Excel[] excels = attrs.value();
- for (Excel attr : excels)
- {
- if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
- {
- field.setAccessible(true);
- fields.add(new Object[] { field, attr });
- }
- }
- }
- }
- return fields;
- }
-
- /**
- * 根据注解获取最大行高
- */
- public short getRowHeight()
- {
- double maxHeight = 0;
- for (Object[] os : this.fields)
- {
- Excel excel = (Excel) os[1];
- maxHeight = maxHeight > excel.height() ? maxHeight : excel.height();
- }
- return (short) (maxHeight * 20);
- }
-
- /**
- * 创建一个工作簿
- */
- public void createWorkbook()
- {
- this.wb = new SXSSFWorkbook(500);
- this.sheet = wb.createSheet();
- wb.setSheetName(0, sheetName);
- this.styles = createStyles(wb);
- }
-
- /**
- * 创建工作表
- *
- * @param sheetNo sheet数量
- * @param index 序号
- */
- public void createSheet(int sheetNo, int index)
- {
- // 设置工作表的名称.
- if (sheetNo > 1 && index > 0)
- {
- this.sheet = wb.createSheet();
- this.createTitle();
- wb.setSheetName(index, sheetName + index);
- }
- }
-
- /**
- * 获取单元格值
- *
- * @param row 获取的行
- * @param column 获取单元格列号
- * @return 单元格值
- */
- public Object getCellValue(Row row, int column)
- {
- if (row == null)
- {
- return row;
- }
- Object val = "";
- try
- {
- Cell cell = row.getCell(column);
- if (StringUtils.isNotNull(cell))
- {
- if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA)
- {
- val = cell.getNumericCellValue();
- if (DateUtil.isCellDateFormatted(cell))
- {
- val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
- }
- else
- {
- if ((Double) val % 1 != 0)
- {
- val = new BigDecimal(val.toString());
- }
- else
- {
- val = new DecimalFormat("0").format(val);
- }
- }
- }
- else if (cell.getCellType() == CellType.STRING)
- {
- val = cell.getStringCellValue();
- }
- else if (cell.getCellType() == CellType.BOOLEAN)
- {
- val = cell.getBooleanCellValue();
- }
- else if (cell.getCellType() == CellType.ERROR)
- {
- val = cell.getErrorCellValue();
- }
-
- }
- }
- catch (Exception e)
- {
- return val;
- }
- return val;
- }
-
- /**
- * 判断是否是空行
- *
- * @param row 判断的行
- * @return
- */
- private boolean isRowEmpty(Row row)
- {
- if (row == null)
- {
- return true;
- }
- for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++)
- {
- Cell cell = row.getCell(i);
- if (cell != null && cell.getCellType() != CellType.BLANK)
- {
- return false;
- }
- }
- return true;
- }
-
- /**
- * 获取Excel2003图片
- *
- * @param sheet 当前sheet对象
- * @param workbook 工作簿对象
- * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData
- */
- public static Map getSheetPictures03(HSSFSheet sheet, HSSFWorkbook workbook)
- {
- Map sheetIndexPicMap = new HashMap();
- List pictures = workbook.getAllPictures();
- if (!pictures.isEmpty())
- {
- for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren())
- {
- HSSFClientAnchor anchor = (HSSFClientAnchor) shape.getAnchor();
- if (shape instanceof HSSFPicture)
- {
- HSSFPicture pic = (HSSFPicture) shape;
- int pictureIndex = pic.getPictureIndex() - 1;
- HSSFPictureData picData = pictures.get(pictureIndex);
- String picIndex = String.valueOf(anchor.getRow1()) + "_" + String.valueOf(anchor.getCol1());
- sheetIndexPicMap.put(picIndex, picData);
- }
- }
- return sheetIndexPicMap;
- }
- else
- {
- return sheetIndexPicMap;
- }
- }
-
- /**
- * 获取Excel2007图片
- *
- * @param sheet 当前sheet对象
- * @param workbook 工作簿对象
- * @return Map key:图片单元格索引（1_1）String，value:图片流PictureData
- */
- public static Map getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook)
- {
- Map sheetIndexPicMap = new HashMap();
- for (POIXMLDocumentPart dr : sheet.getRelations())
- {
- if (dr instanceof XSSFDrawing)
- {
- XSSFDrawing drawing = (XSSFDrawing) dr;
- List shapes = drawing.getShapes();
- for (XSSFShape shape : shapes)
- {
- if (shape instanceof XSSFPicture)
- {
- XSSFPicture pic = (XSSFPicture) shape;
- XSSFClientAnchor anchor = pic.getPreferredSize();
- CTMarker ctMarker = anchor.getFrom();
- String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol();
- sheetIndexPicMap.put(picIndex, pic.getPictureData());
- }
- }
- }
- }
- return sheetIndexPicMap;
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
deleted file mode 100644
index b19953e0..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
+++ /dev/null
@@ -1,410 +0,0 @@
-package com.ruoyi.common.utils.reflect;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Date;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.utils.DateUtils;
-
-/**
- * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
- *
- * @author ruoyi
- */
-@SuppressWarnings("rawtypes")
-public class ReflectUtils
-{
- private static final String SETTER_PREFIX = "set";
-
- private static final String GETTER_PREFIX = "get";
-
- private static final String CGLIB_CLASS_SEPARATOR = "$$";
-
- private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
-
- /**
- * 调用Getter方法.
- * 支持多级，如：对象名.对象名.方法
- */
- @SuppressWarnings("unchecked")
- public static E invokeGetter(Object obj, String propertyName)
- {
- Object object = obj;
- for (String name : StringUtils.split(propertyName, "."))
- {
- String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
- object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
- }
- return (E) object;
- }
-
- /**
- * 调用Setter方法, 仅匹配方法名。
- * 支持多级，如：对象名.对象名.方法
- */
- public static void invokeSetter(Object obj, String propertyName, E value)
- {
- Object object = obj;
- String[] names = StringUtils.split(propertyName, ".");
- for (int i = 0; i < names.length; i++)
- {
- if (i < names.length - 1)
- {
- String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
- object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
- }
- else
- {
- String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
- invokeMethodByName(object, setterMethodName, new Object[] { value });
- }
- }
- }
-
- /**
- * 直接读取对象属性值, 无视private/protected修饰符, 不经过getter函数.
- */
- @SuppressWarnings("unchecked")
- public static E getFieldValue(final Object obj, final String fieldName)
- {
- Field field = getAccessibleField(obj, fieldName);
- if (field == null)
- {
- logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
- return null;
- }
- E result = null;
- try
- {
- result = (E) field.get(obj);
- }
- catch (IllegalAccessException e)
- {
- logger.error("不可能抛出的异常{}", e.getMessage());
- }
- return result;
- }
-
- /**
- * 直接设置对象属性值, 无视private/protected修饰符, 不经过setter函数.
- */
- public static void setFieldValue(final Object obj, final String fieldName, final E value)
- {
- Field field = getAccessibleField(obj, fieldName);
- if (field == null)
- {
- // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
- logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
- return;
- }
- try
- {
- field.set(obj, value);
- }
- catch (IllegalAccessException e)
- {
- logger.error("不可能抛出的异常: {}", e.getMessage());
- }
- }
-
- /**
- * 直接调用对象方法, 无视private/protected修饰符.
- * 用于一次性调用的情况，否则应使用getAccessibleMethod()函数获得Method后反复调用.
- * 同时匹配方法名+参数类型，
- */
- @SuppressWarnings("unchecked")
- public static E invokeMethod(final Object obj, final String methodName, final Class[] parameterTypes,
- final Object[] args)
- {
- if (obj == null || methodName == null)
- {
- return null;
- }
- Method method = getAccessibleMethod(obj, methodName, parameterTypes);
- if (method == null)
- {
- logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
- return null;
- }
- try
- {
- return (E) method.invoke(obj, args);
- }
- catch (Exception e)
- {
- String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
- throw convertReflectionExceptionToUnchecked(msg, e);
- }
- }
-
- /**
- * 直接调用对象方法, 无视private/protected修饰符，
- * 用于一次性调用的情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用.
- * 只匹配函数名，如果有多个同名函数调用第一个。
- */
- @SuppressWarnings("unchecked")
- public static E invokeMethodByName(final Object obj, final String methodName, final Object[] args)
- {
- Method method = getAccessibleMethodByName(obj, methodName, args.length);
- if (method == null)
- {
- // 如果为空不报错，直接返回空。
- logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
- return null;
- }
- try
- {
- // 类型转换（将参数数据类型转换为目标方法参数类型）
- Class[] cs = method.getParameterTypes();
- for (int i = 0; i < cs.length; i++)
- {
- if (args[i] != null && !args[i].getClass().equals(cs[i]))
- {
- if (cs[i] == String.class)
- {
- args[i] = Convert.toStr(args[i]);
- if (StringUtils.endsWith((String) args[i], ".0"))
- {
- args[i] = StringUtils.substringBefore((String) args[i], ".0");
- }
- }
- else if (cs[i] == Integer.class)
- {
- args[i] = Convert.toInt(args[i]);
- }
- else if (cs[i] == Long.class)
- {
- args[i] = Convert.toLong(args[i]);
- }
- else if (cs[i] == Double.class)
- {
- args[i] = Convert.toDouble(args[i]);
- }
- else if (cs[i] == Float.class)
- {
- args[i] = Convert.toFloat(args[i]);
- }
- else if (cs[i] == Date.class)
- {
- if (args[i] instanceof String)
- {
- args[i] = DateUtils.parseDate(args[i]);
- }
- else
- {
- args[i] = DateUtil.getJavaDate((Double) args[i]);
- }
- }
- else if (cs[i] == boolean.class || cs[i] == Boolean.class)
- {
- args[i] = Convert.toBool(args[i]);
- }
- }
- }
- return (E) method.invoke(obj, args);
- }
- catch (Exception e)
- {
- String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
- throw convertReflectionExceptionToUnchecked(msg, e);
- }
- }
-
- /**
- * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问.
- * 如向上转型到Object仍无法找到, 返回null.
- */
- public static Field getAccessibleField(final Object obj, final String fieldName)
- {
- // 为空不报错。直接返回 null
- if (obj == null)
- {
- return null;
- }
- Validate.notBlank(fieldName, "fieldName can't be blank");
- for (Class superClass = obj.getClass(); superClass != Object.class; superClass = superClass.getSuperclass())
- {
- try
- {
- Field field = superClass.getDeclaredField(fieldName);
- makeAccessible(field);
- return field;
- }
- catch (NoSuchFieldException e)
- {
- continue;
- }
- }
- return null;
- }
-
- /**
- * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
- * 如向上转型到Object仍无法找到, 返回null.
- * 匹配函数名+参数类型。
- * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
- */
- public static Method getAccessibleMethod(final Object obj, final String methodName,
- final Class... parameterTypes)
- {
- // 为空不报错。直接返回 null
- if (obj == null)
- {
- return null;
- }
- Validate.notBlank(methodName, "methodName can't be blank");
- for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
- {
- try
- {
- Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
- makeAccessible(method);
- return method;
- }
- catch (NoSuchMethodException e)
- {
- continue;
- }
- }
- return null;
- }
-
- /**
- * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
- * 如向上转型到Object仍无法找到, 返回null.
- * 只匹配函数名。
- * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
- */
- public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum)
- {
- // 为空不报错。直接返回 null
- if (obj == null)
- {
- return null;
- }
- Validate.notBlank(methodName, "methodName can't be blank");
- for (Class searchType = obj.getClass(); searchType != Object.class; searchType = searchType.getSuperclass())
- {
- Method[] methods = searchType.getDeclaredMethods();
- for (Method method : methods)
- {
- if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum)
- {
- makeAccessible(method);
- return method;
- }
- }
- }
- return null;
- }
-
- /**
- * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
- */
- public static void makeAccessible(Method method)
- {
- if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
- && !method.isAccessible())
- {
- method.setAccessible(true);
- }
- }
-
- /**
- * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
- */
- public static void makeAccessible(Field field)
- {
- if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
- || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())
- {
- field.setAccessible(true);
- }
- }
-
- /**
- * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处
- * 如无法找到, 返回Object.class.
- */
- @SuppressWarnings("unchecked")
- public static Class getClassGenricType(final Class clazz)
- {
- return getClassGenricType(clazz, 0);
- }
-
- /**
- * 通过反射, 获得Class定义中声明的父类的泛型参数的类型.
- * 如无法找到, 返回Object.class.
- */
- public static Class getClassGenricType(final Class clazz, final int index)
- {
- Type genType = clazz.getGenericSuperclass();
-
- if (!(genType instanceof ParameterizedType))
- {
- logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");
- return Object.class;
- }
-
- Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
-
- if (index >= params.length || index < 0)
- {
- logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: "
- + params.length);
- return Object.class;
- }
- if (!(params[index] instanceof Class))
- {
- logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
- return Object.class;
- }
-
- return (Class) params[index];
- }
-
- public static Class getUserClass(Object instance)
- {
- if (instance == null)
- {
- throw new RuntimeException("Instance must not be null");
- }
- Class clazz = instance.getClass();
- if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR))
- {
- Class superClass = clazz.getSuperclass();
- if (superClass != null && !Object.class.equals(superClass))
- {
- return superClass;
- }
- }
- return clazz;
-
- }
-
- /**
- * 将反射时的checked exception转换为unchecked exception.
- */
- public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e)
- {
- if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException
- || e instanceof NoSuchMethodException)
- {
- return new IllegalArgumentException(msg, e);
- }
- else if (e instanceof InvocationTargetException)
- {
- return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException());
- }
- return new RuntimeException(msg, e);
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java
deleted file mode 100644
index ca1cd924..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/sign/Base64.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package com.ruoyi.common.utils.sign;
-
-/**
- * Base64工具类
- *
- * @author ruoyi
- */
-public final class Base64
-{
- static private final int BASELENGTH = 128;
- static private final int LOOKUPLENGTH = 64;
- static private final int TWENTYFOURBITGROUP = 24;
- static private final int EIGHTBIT = 8;
- static private final int SIXTEENBIT = 16;
- static private final int FOURBYTE = 4;
- static private final int SIGN = -128;
- static private final char PAD = '=';
- static final private byte[] base64Alphabet = new byte[BASELENGTH];
- static final private char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
-
- static
- {
- for (int i = 0; i < BASELENGTH; ++i)
- {
- base64Alphabet[i] = -1;
- }
- for (int i = 'Z'; i >= 'A'; i--)
- {
- base64Alphabet[i] = (byte) (i - 'A');
- }
- for (int i = 'z'; i >= 'a'; i--)
- {
- base64Alphabet[i] = (byte) (i - 'a' + 26);
- }
-
- for (int i = '9'; i >= '0'; i--)
- {
- base64Alphabet[i] = (byte) (i - '0' + 52);
- }
-
- base64Alphabet['+'] = 62;
- base64Alphabet['/'] = 63;
-
- for (int i = 0; i <= 25; i++)
- {
- lookUpBase64Alphabet[i] = (char) ('A' + i);
- }
-
- for (int i = 26, j = 0; i <= 51; i++, j++)
- {
- lookUpBase64Alphabet[i] = (char) ('a' + j);
- }
-
- for (int i = 52, j = 0; i <= 61; i++, j++)
- {
- lookUpBase64Alphabet[i] = (char) ('0' + j);
- }
- lookUpBase64Alphabet[62] = (char) '+';
- lookUpBase64Alphabet[63] = (char) '/';
- }
-
- private static boolean isWhiteSpace(char octect)
- {
- return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
- }
-
- private static boolean isPad(char octect)
- {
- return (octect == PAD);
- }
-
- private static boolean isData(char octect)
- {
- return (octect < BASELENGTH && base64Alphabet[octect] != -1);
- }
-
- /**
- * Encodes hex octects into Base64
- *
- * @param binaryData Array containing binaryData
- * @return Encoded Base64 array
- */
- public static String encode(byte[] binaryData)
- {
- if (binaryData == null)
- {
- return null;
- }
-
- int lengthDataBits = binaryData.length * EIGHTBIT;
- if (lengthDataBits == 0)
- {
- return "";
- }
-
- int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
- int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
- int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
- char encodedData[] = null;
-
- encodedData = new char[numberQuartet * 4];
-
- byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
-
- int encodedIndex = 0;
- int dataIndex = 0;
-
- for (int i = 0; i < numberTriplets; i++)
- {
- b1 = binaryData[dataIndex++];
- b2 = binaryData[dataIndex++];
- b3 = binaryData[dataIndex++];
-
- l = (byte) (b2 & 0x0f);
- k = (byte) (b1 & 0x03);
-
- byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
- byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
- byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
-
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
- }
-
- // form integral number of 6-bit groups
- if (fewerThan24bits == EIGHTBIT)
- {
- b1 = binaryData[dataIndex];
- k = (byte) (b1 & 0x03);
- byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
- encodedData[encodedIndex++] = PAD;
- encodedData[encodedIndex++] = PAD;
- }
- else if (fewerThan24bits == SIXTEENBIT)
- {
- b1 = binaryData[dataIndex];
- b2 = binaryData[dataIndex + 1];
- l = (byte) (b2 & 0x0f);
- k = (byte) (b1 & 0x03);
-
- byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
- byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
-
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
- encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
- encodedData[encodedIndex++] = PAD;
- }
- return new String(encodedData);
- }
-
- /**
- * Decodes Base64 data into octects
- *
- * @param encoded string containing Base64 data
- * @return Array containind decoded data.
- */
- public static byte[] decode(String encoded)
- {
- if (encoded == null)
- {
- return null;
- }
-
- char[] base64Data = encoded.toCharArray();
- // remove white spaces
- int len = removeWhiteSpace(base64Data);
-
- if (len % FOURBYTE != 0)
- {
- return null;// should be divisible by four
- }
-
- int numberQuadruple = (len / FOURBYTE);
-
- if (numberQuadruple == 0)
- {
- return new byte[0];
- }
-
- byte decodedData[] = null;
- byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
- char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
-
- int i = 0;
- int encodedIndex = 0;
- int dataIndex = 0;
- decodedData = new byte[(numberQuadruple) * 3];
-
- for (; i < numberQuadruple - 1; i++)
- {
-
- if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))
- || !isData((d3 = base64Data[dataIndex++])) || !isData((d4 = base64Data[dataIndex++])))
- {
- return null;
- } // if found "no data" just return null
-
- b1 = base64Alphabet[d1];
- b2 = base64Alphabet[d2];
- b3 = base64Alphabet[d3];
- b4 = base64Alphabet[d4];
-
- decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
- decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
- decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
- }
-
- if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++])))
- {
- return null;// if found "no data" just return null
- }
-
- b1 = base64Alphabet[d1];
- b2 = base64Alphabet[d2];
-
- d3 = base64Data[dataIndex++];
- d4 = base64Data[dataIndex++];
- if (!isData((d3)) || !isData((d4)))
- {// Check if they are PAD characters
- if (isPad(d3) && isPad(d4))
- {
- if ((b2 & 0xf) != 0)// last 4 bits should be zero
- {
- return null;
- }
- byte[] tmp = new byte[i * 3 + 1];
- System.arraycopy(decodedData, 0, tmp, 0, i * 3);
- tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
- return tmp;
- }
- else if (!isPad(d3) && isPad(d4))
- {
- b3 = base64Alphabet[d3];
- if ((b3 & 0x3) != 0)// last 2 bits should be zero
- {
- return null;
- }
- byte[] tmp = new byte[i * 3 + 2];
- System.arraycopy(decodedData, 0, tmp, 0, i * 3);
- tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
- tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
- return tmp;
- }
- else
- {
- return null;
- }
- }
- else
- { // No PAD e.g 3cQl
- b3 = base64Alphabet[d3];
- b4 = base64Alphabet[d4];
- decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
- decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
- decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
-
- }
- return decodedData;
- }
-
- /**
- * remove WhiteSpace from MIME containing encoded Base64 data.
- *
- * @param data the byte array of base64 data (with WS)
- * @return the new length
- */
- private static int removeWhiteSpace(char[] data)
- {
- if (data == null)
- {
- return 0;
- }
-
- // count characters that's not whitespace
- int newSize = 0;
- int len = data.length;
- for (int i = 0; i < len; i++)
- {
- if (!isWhiteSpace(data[i]))
- {
- data[newSize++] = data[i];
- }
- }
- return newSize;
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
deleted file mode 100644
index de77ee82..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.ruoyi.common.utils.sign;
-
-import java.security.MessageDigest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Md5加密方法
- *
- * @author ruoyi
- */
-public class Md5Utils
-{
- private static final Logger log = LoggerFactory.getLogger(Md5Utils.class);
-
- private static byte[] md5(String s)
- {
- MessageDigest algorithm;
- try
- {
- algorithm = MessageDigest.getInstance("MD5");
- algorithm.reset();
- algorithm.update(s.getBytes("UTF-8"));
- byte[] messageDigest = algorithm.digest();
- return messageDigest;
- }
- catch (Exception e)
- {
- log.error("MD5 Error...", e);
- }
- return null;
- }
-
- private static final String toHex(byte hash[])
- {
- if (hash == null)
- {
- return null;
- }
- StringBuffer buf = new StringBuffer(hash.length * 2);
- int i;
-
- for (i = 0; i < hash.length; i++)
- {
- if ((hash[i] & 0xff) < 0x10)
- {
- buf.append("0");
- }
- buf.append(Long.toString(hash[i] & 0xff, 16));
- }
- return buf.toString();
- }
-
- public static String hash(String s)
- {
- try
- {
- return new String(toHex(md5(s)).getBytes("UTF-8"), "UTF-8");
- }
- catch (Exception e)
- {
- log.error("not supported charset...{}", e);
- return s;
- }
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
deleted file mode 100644
index 9993b98f..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.ruoyi.common.utils.spring;
-
-import org.springframework.aop.framework.AopContext;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * spring工具类 方便在非spring管理环境中获取bean
- *
- * @author ruoyi
- */
-@Component
-public final class SpringUtils implements BeanFactoryPostProcessor, ApplicationContextAware
-{
- /** Spring应用上下文环境 */
- private static ConfigurableListableBeanFactory beanFactory;
-
- private static ApplicationContext applicationContext;
-
- @Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
- {
- SpringUtils.beanFactory = beanFactory;
- }
-
- @Override
- public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
- {
- SpringUtils.applicationContext = applicationContext;
- }
-
- /**
- * 获取对象
- *
- * @param name
- * @return Object 一个以所给名字注册的bean的实例
- * @throws org.springframework.beans.BeansException
- *
- */
- @SuppressWarnings("unchecked")
- public static T getBean(String name) throws BeansException
- {
- return (T) beanFactory.getBean(name);
- }
-
- /**
- * 获取类型为requiredType的对象
- *
- * @param clz
- * @return
- * @throws org.springframework.beans.BeansException
- *
- */
- public static T getBean(Class clz) throws BeansException
- {
- T result = (T) beanFactory.getBean(clz);
- return result;
- }
-
- /**
- * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true
- *
- * @param name
- * @return boolean
- */
- public static boolean containsBean(String name)
- {
- return beanFactory.containsBean(name);
- }
-
- /**
- * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException）
- *
- * @param name
- * @return boolean
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
- */
- public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.isSingleton(name);
- }
-
- /**
- * @param name
- * @return Class 注册对象的类型
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
- */
- public static Class getType(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.getType(name);
- }
-
- /**
- * 如果给定的bean名字在bean定义中有别名，则返回这些别名
- *
- * @param name
- * @return
- * @throws org.springframework.beans.factory.NoSuchBeanDefinitionException
- *
- */
- public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
- {
- return beanFactory.getAliases(name);
- }
-
- /**
- * 获取aop代理对象
- *
- * @param invoker
- * @return
- */
- @SuppressWarnings("unchecked")
- public static T getAopProxy(T invoker)
- {
- return (T) AopContext.currentProxy();
- }
-
- /**
- * 获取当前的环境配置，无配置返回null
- *
- * @return 当前的环境配置
- */
- public static String[] getActiveProfiles()
- {
- return applicationContext.getEnvironment().getActiveProfiles();
- }
-
- /**
- * 获取当前的环境配置，当有多个环境配置时，只获取第一个
- *
- * @return 当前的环境配置
- */
- public static String getActiveProfile()
- {
- final String[] activeProfiles = getActiveProfiles();
- return StringUtils.isNotEmpty(activeProfiles) ? activeProfiles[0] : null;
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
deleted file mode 100644
index a1989463..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.ruoyi.common.utils.sql;
-
-import com.ruoyi.common.exception.UtilException;
-import com.ruoyi.common.utils.StringUtils;
-
-/**
- * sql操作工具类
- *
- * @author ruoyi
- */
-public class SqlUtil
-{
- /**
- * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
- */
- public static String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+";
-
- /**
- * 检查字符，防止注入绕过
- */
- public static String escapeOrderBySql(String value)
- {
- if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value))
- {
- throw new UtilException("参数不符合规范，不能进行查询");
- }
- return value;
- }
-
- /**
- * 验证 order by 语法是否符合规范
- */
- public static boolean isValidOrderBySql(String value)
- {
- return value.matches(SQL_PATTERN);
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
deleted file mode 100644
index 2c844271..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.ruoyi.common.utils.uuid;
-
-/**
- * ID生成器工具类
- *
- * @author ruoyi
- */
-public class IdUtils
-{
- /**
- * 获取随机UUID
- *
- * @return 随机UUID
- */
- public static String randomUUID()
- {
- return UUID.randomUUID().toString();
- }
-
- /**
- * 简化的UUID，去掉了横线
- *
- * @return 简化的UUID，去掉了横线
- */
- public static String simpleUUID()
- {
- return UUID.randomUUID().toString(true);
- }
-
- /**
- * 获取随机UUID，使用性能更好的ThreadLocalRandom生成UUID
- *
- * @return 随机UUID
- */
- public static String fastUUID()
- {
- return UUID.fastUUID().toString();
- }
-
- /**
- * 简化的UUID，去掉了横线，使用性能更好的ThreadLocalRandom生成UUID
- *
- * @return 简化的UUID，去掉了横线
- */
- public static String fastSimpleUUID()
- {
- return UUID.fastUUID().toString(true);
- }
-}
diff --git a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
deleted file mode 100644
index dfda46cf..00000000
--- a/springboot/wumei-common/src/main/java/com/ruoyi/common/utils/uuid/UUID.java
+++ /dev/null
@@ -1,484 +0,0 @@
-package com.ruoyi.common.utils.uuid;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-import com.ruoyi.common.exception.UtilException;
-
-/**
- * 提供通用唯一识别码（universally unique identifier）（UUID）实现
- *
- * @author ruoyi
- */
-public final class UUID implements java.io.Serializable, Comparable
-{
- private static final long serialVersionUID = -1185015143654744140L;
-
- /**
- * SecureRandom 的单例
- *
- */
- private static class Holder
- {
- static final SecureRandom numberGenerator = getSecureRandom();
- }
-
- /** 此UUID的最高64有效位 */
- private final long mostSigBits;
-
- /** 此UUID的最低64有效位 */
- private final long leastSigBits;
-
- /**
- * 私有构造
- *
- * @param data 数据
- */
- private UUID(byte[] data)
- {
- long msb = 0;
- long lsb = 0;
- assert data.length == 16 : "data must be 16 bytes in length";
- for (int i = 0; i < 8; i++)
- {
- msb = (msb << 8) | (data[i] & 0xff);
- }
- for (int i = 8; i < 16; i++)
- {
- lsb = (lsb << 8) | (data[i] & 0xff);
- }
- this.mostSigBits = msb;
- this.leastSigBits = lsb;
- }
-
- /**
- * 使用指定的数据构造新的 UUID。
- *
- * @param mostSigBits 用于 {@code UUID} 的最高有效 64 位
- * @param leastSigBits 用于 {@code UUID} 的最低有效 64 位
- */
- public UUID(long mostSigBits, long leastSigBits)
- {
- this.mostSigBits = mostSigBits;
- this.leastSigBits = leastSigBits;
- }
-
- /**
- * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的本地线程伪随机数生成器生成该 UUID。
- *
- * @return 随机生成的 {@code UUID}
- */
- public static UUID fastUUID()
- {
- return randomUUID(false);
- }
-
- /**
- * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
- *
- * @return 随机生成的 {@code UUID}
- */
- public static UUID randomUUID()
- {
- return randomUUID(true);
- }
-
- /**
- * 获取类型 4（伪随机生成的）UUID 的静态工厂。 使用加密的强伪随机数生成器生成该 UUID。
- *
- * @param isSecure 是否使用{@link SecureRandom}如果是可以获得更安全的随机码，否则可以得到更好的性能
- * @return 随机生成的 {@code UUID}
- */
- public static UUID randomUUID(boolean isSecure)
- {
- final Random ng = isSecure ? Holder.numberGenerator : getRandom();
-
- byte[] randomBytes = new byte[16];
- ng.nextBytes(randomBytes);
- randomBytes[6] &= 0x0f; /* clear version */
- randomBytes[6] |= 0x40; /* set to version 4 */
- randomBytes[8] &= 0x3f; /* clear variant */
- randomBytes[8] |= 0x80; /* set to IETF variant */
- return new UUID(randomBytes);
- }
-
- /**
- * 根据指定的字节数组获取类型 3（基于名称的）UUID 的静态工厂。
- *
- * @param name 用于构造 UUID 的字节数组。
- *
- * @return 根据指定数组生成的 {@code UUID}
- */
- public static UUID nameUUIDFromBytes(byte[] name)
- {
- MessageDigest md;
- try
- {
- md = MessageDigest.getInstance("MD5");
- }
- catch (NoSuchAlgorithmException nsae)
- {
- throw new InternalError("MD5 not supported");
- }
- byte[] md5Bytes = md.digest(name);
- md5Bytes[6] &= 0x0f; /* clear version */
- md5Bytes[6] |= 0x30; /* set to version 3 */
- md5Bytes[8] &= 0x3f; /* clear variant */
- md5Bytes[8] |= 0x80; /* set to IETF variant */
- return new UUID(md5Bytes);
- }
-
- /**
- * 根据 {@link #toString()} 方法中描述的字符串标准表示形式创建{@code UUID}。
- *
- * @param name 指定 {@code UUID} 字符串
- * @return 具有指定值的 {@code UUID}
- * @throws IllegalArgumentException 如果 name 与 {@link #toString} 中描述的字符串表示形式不符抛出此异常
- *
- */
- public static UUID fromString(String name)
- {
- String[] components = name.split("-");
- if (components.length != 5)
- {
- throw new IllegalArgumentException("Invalid UUID string: " + name);
- }
- for (int i = 0; i < 5; i++)
- {
- components[i] = "0x" + components[i];
- }
-
- long mostSigBits = Long.decode(components[0]).longValue();
- mostSigBits <<= 16;
- mostSigBits |= Long.decode(components[1]).longValue();
- mostSigBits <<= 16;
- mostSigBits |= Long.decode(components[2]).longValue();
-
- long leastSigBits = Long.decode(components[3]).longValue();
- leastSigBits <<= 48;
- leastSigBits |= Long.decode(components[4]).longValue();
-
- return new UUID(mostSigBits, leastSigBits);
- }
-
- /**
- * 返回此 UUID 的 128 位值中的最低有效 64 位。
- *
- * @return 此 UUID 的 128 位值中的最低有效 64 位。
- */
- public long getLeastSignificantBits()
- {
- return leastSigBits;
- }
-
- /**
- * 返回此 UUID 的 128 位值中的最高有效 64 位。
- *
- * @return 此 UUID 的 128 位值中最高有效 64 位。
- */
- public long getMostSignificantBits()
- {
- return mostSigBits;
- }
-
- /**
- * 与此 {@code UUID} 相关联的版本号. 版本号描述此 {@code UUID} 是如何生成的。
- *
- * 版本号具有以下含意:
- *
- * - 1 基于时间的 UUID
- *
- 2 DCE 安全 UUID
- *
- 3 基于名称的 UUID
- *
- 4 随机生成的 UUID
- *
- *
- * @return 此 {@code UUID} 的版本号
- */
- public int version()
- {
- // Version is bits masked by 0x000000000000F000 in MS long
- return (int) ((mostSigBits >> 12) & 0x0f);
- }
-
- /**
- * 与此 {@code UUID} 相关联的变体号。变体号描述 {@code UUID} 的布局。
- *
- * 变体号具有以下含意：
- *
- * - 0 为 NCS 向后兼容保留
- *
- 2 IETF RFC 4122(Leach-Salz), 用于此类
- *
- 6 保留，微软向后兼容
- *
- 7 保留供以后定义使用
- *
- *
- * @return 此 {@code UUID} 相关联的变体号
- */
- public int variant()
- {
- // This field is composed of a varying number of bits.
- // 0 - - Reserved for NCS backward compatibility
- // 1 0 - The IETF aka Leach-Salz variant (used by this class)
- // 1 1 0 Reserved, Microsoft backward compatibility
- // 1 1 1 Reserved for future definition.
- return (int) ((leastSigBits >>> (64 - (leastSigBits >>> 62))) & (leastSigBits >> 63));
- }
-
- /**
- * 与此 UUID 相关联的时间戳值。
- *
- *
- * 60 位的时间戳值根据此 {@code UUID} 的 time_low、time_mid 和 time_hi 字段构造。
- * 所得到的时间戳以 100 毫微秒为单位，从 UTC（通用协调时间） 1582 年 10 月 15 日零时开始。
- *
- *
- * 时间戳值仅在在基于时间的 UUID（其 version 类型为 1）中才有意义。
- * 如果此 {@code UUID} 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
- *
- * @throws UnsupportedOperationException 如果此 {@code UUID} 不是 version 为 1 的 UUID。
- */
- public long timestamp() throws UnsupportedOperationException
- {
- checkTimeBase();
- return (mostSigBits & 0x0FFFL) << 48//
- | ((mostSigBits >> 16) & 0x0FFFFL) << 32//
- | mostSigBits >>> 32;
- }
-
- /**
- * 与此 UUID 相关联的时钟序列值。
- *
- *
- * 14 位的时钟序列值根据此 UUID 的 clock_seq 字段构造。clock_seq 字段用于保证在基于时间的 UUID 中的时间唯一性。
- *
- * {@code clockSequence} 值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。 如果此 UUID 不是基于时间的 UUID，则此方法抛出
- * UnsupportedOperationException。
- *
- * @return 此 {@code UUID} 的时钟序列
- *
- * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
- */
- public int clockSequence() throws UnsupportedOperationException
- {
- checkTimeBase();
- return (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
- }
-
- /**
- * 与此 UUID 相关的节点值。
- *
- *
- * 48 位的节点值根据此 UUID 的 node 字段构造。此字段旨在用于保存机器的 IEEE 802 地址，该地址用于生成此 UUID 以保证空间唯一性。
- *
- * 节点值仅在基于时间的 UUID（其 version 类型为 1）中才有意义。
- * 如果此 UUID 不是基于时间的 UUID，则此方法抛出 UnsupportedOperationException。
- *
- * @return 此 {@code UUID} 的节点值
- *
- * @throws UnsupportedOperationException 如果此 UUID 的 version 不为 1
- */
- public long node() throws UnsupportedOperationException
- {
- checkTimeBase();
- return leastSigBits & 0x0000FFFFFFFFFFFFL;
- }
-
- /**
- * 返回此{@code UUID} 的字符串表现形式。
- *
- *
- * UUID 的字符串表示形式由此 BNF 描述：
- *
- *
- * {@code
- * UUID = ----
- * time_low = 4*
- * time_mid = 2*
- * time_high_and_version = 2*
- * variant_and_sequence = 2*
- * node = 6*
- * hexOctet =
- * hexDigit = [0-9a-fA-F]
- * }
- *
- *
- *
- *
- * @return 此{@code UUID} 的字符串表现形式
- * @see #toString(boolean)
- */
- @Override
- public String toString()
- {
- return toString(false);
- }
-
- /**
- * 返回此{@code UUID} 的字符串表现形式。
- *
- *
- * UUID 的字符串表示形式由此 BNF 描述：
- *
- *
- * {@code
- * UUID = ----
- * time_low = 4*
- * time_mid = 2*
- * time_high_and_version = 2*
- * variant_and_sequence = 2*
- * node = 6*
- * hexOctet =
- * hexDigit = [0-9a-fA-F]
- * }
- *
- *
- *
- *
- * @param isSimple 是否简单模式，简单模式为不带'-'的UUID字符串
- * @return 此{@code UUID} 的字符串表现形式
- */
- public String toString(boolean isSimple)
- {
- final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
- // time_low
- builder.append(digits(mostSigBits >> 32, 8));
- if (!isSimple)
- {
- builder.append('-');
- }
- // time_mid
- builder.append(digits(mostSigBits >> 16, 4));
- if (!isSimple)
- {
- builder.append('-');
- }
- // time_high_and_version
- builder.append(digits(mostSigBits, 4));
- if (!isSimple)
- {
- builder.append('-');
- }
- // variant_and_sequence
- builder.append(digits(leastSigBits >> 48, 4));
- if (!isSimple)
- {
- builder.append('-');
- }
- // node
- builder.append(digits(leastSigBits, 12));
-
- return builder.toString();
- }
-
- /**
- * 返回此 UUID 的哈希码。
- *
- * @return UUID 的哈希码值。
- */
- @Override
- public int hashCode()
- {
- long hilo = mostSigBits ^ leastSigBits;
- return ((int) (hilo >> 32)) ^ (int) hilo;
- }
-
- /**
- * 将此对象与指定对象比较。
- *
- * 当且仅当参数不为 {@code null}、而是一个 UUID 对象、具有与此 UUID 相同的 varriant、包含相同的值（每一位均相同）时，结果才为 {@code true}。
- *
- * @param obj 要与之比较的对象
- *
- * @return 如果对象相同，则返回 {@code true}；否则返回 {@code false}
- */
- @Override
- public boolean equals(Object obj)
- {
- if ((null == obj) || (obj.getClass() != UUID.class))
- {
- return false;
- }
- UUID id = (UUID) obj;
- return (mostSigBits == id.mostSigBits && leastSigBits == id.leastSigBits);
- }
-
- // Comparison Operations
-
- /**
- * 将此 UUID 与指定的 UUID 比较。
- *
- *
- * 如果两个 UUID 不同，且第一个 UUID 的最高有效字段大于第二个 UUID 的对应字段，则第一个 UUID 大于第二个 UUID。
- *
- * @param val 与此 UUID 比较的 UUID
- *
- * @return 在此 UUID 小于、等于或大于 val 时，分别返回 -1、0 或 1。
- *
- */
- @Override
- public int compareTo(UUID val)
- {
- // The ordering is intentionally set up so that the UUIDs
- // can simply be numerically compared as two numbers
- return (this.mostSigBits < val.mostSigBits ? -1 : //
- (this.mostSigBits > val.mostSigBits ? 1 : //
- (this.leastSigBits < val.leastSigBits ? -1 : //
- (this.leastSigBits > val.leastSigBits ? 1 : //
- 0))));
- }
-
- // -------------------------------------------------------------------------------------------------------------------
- // Private method start
- /**
- * 返回指定数字对应的hex值
- *
- * @param val 值
- * @param digits 位
- * @return 值
- */
- private static String digits(long val, int digits)
- {
- long hi = 1L << (digits * 4);
- return Long.toHexString(hi | (val & (hi - 1))).substring(1);
- }
-
- /**
- * 检查是否为time-based版本UUID
- */
- private void checkTimeBase()
- {
- if (version() != 1)
- {
- throw new UnsupportedOperationException("Not a time-based UUID");
- }
- }
-
- /**
- * 获取{@link SecureRandom}，类提供加密的强随机数生成器 (RNG)
- *
- * @return {@link SecureRandom}
- */
- public static SecureRandom getSecureRandom()
- {
- try
- {
- return SecureRandom.getInstance("SHA1PRNG");
- }
- catch (NoSuchAlgorithmException e)
- {
- throw new UtilException(e);
- }
- }
-
- /**
- * 获取随机数生成器对象
- * ThreadLocalRandom是JDK 7之后提供并发产生随机数，能够解决多个线程发生的竞争争夺。
- *
- * @return {@link ThreadLocalRandom}
- */
- public static ThreadLocalRandom getRandom()
- {
- return ThreadLocalRandom.current();
- }
-}
diff --git a/springboot/wumei-framework/pom.xml b/springboot/wumei-framework/pom.xml
deleted file mode 100644
index cb502414..00000000
--- a/springboot/wumei-framework/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
- wumei
- com.wumei
- 3.8.0
-
- 4.0.0
-
- wumei-framework
-
-
- framework框架核心
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
-
-
- org.springframework.boot
- spring-boot-starter-aop
-
-
-
-
- com.alibaba
- druid-spring-boot-starter
-
-
-
-
- com.github.penggle
- kaptcha
-
-
- javax.servlet-api
- javax.servlet
-
-
-
-
-
-
- com.github.oshi
- oshi-core
-
-
-
-
- com.wumei
- wumei-system
-
-
-
-
-
\ No newline at end of file
diff --git a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
deleted file mode 100644
index 48f8d728..00000000
--- a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.ruoyi.framework.aspectj;
-
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.annotation.DataScope;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-
-/**
- * 数据过滤处理
- *
- * @author ruoyi
- */
-@Aspect
-@Component
-public class DataScopeAspect
-{
- /**
- * 全部数据权限
- */
- public static final String DATA_SCOPE_ALL = "1";
-
- /**
- * 自定数据权限
- */
- public static final String DATA_SCOPE_CUSTOM = "2";
-
- /**
- * 部门数据权限
- */
- public static final String DATA_SCOPE_DEPT = "3";
-
- /**
- * 部门及以下数据权限
- */
- public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
-
- /**
- * 仅本人数据权限
- */
- public static final String DATA_SCOPE_SELF = "5";
-
- /**
- * 数据权限过滤关键字
- */
- public static final String DATA_SCOPE = "dataScope";
-
- @Before("@annotation(controllerDataScope)")
- public void doBefore(JoinPoint point, DataScope controllerDataScope) throws Throwable
- {
- clearDataScope(point);
- handleDataScope(point, controllerDataScope);
- }
-
- protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope)
- {
- // 获取当前的用户
- LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNotNull(loginUser))
- {
- SysUser currentUser = loginUser.getUser();
- // 如果是超级管理员，则不过滤数据
- if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
- {
- dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
- controllerDataScope.userAlias());
- }
- }
- }
-
- /**
- * 数据范围过滤
- *
- * @param joinPoint 切点
- * @param user 用户
- * @param userAlias 别名
- */
- public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias)
- {
- StringBuilder sqlString = new StringBuilder();
-
- for (SysRole role : user.getRoles())
- {
- String dataScope = role.getDataScope();
- if (DATA_SCOPE_ALL.equals(dataScope))
- {
- sqlString = new StringBuilder();
- break;
- }
- else if (DATA_SCOPE_CUSTOM.equals(dataScope))
- {
- sqlString.append(StringUtils.format(
- " OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias,
- role.getRoleId()));
- }
- else if (DATA_SCOPE_DEPT.equals(dataScope))
- {
- sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
- }
- else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
- {
- sqlString.append(StringUtils.format(
- " OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
- deptAlias, user.getDeptId(), user.getDeptId()));
- }
- else if (DATA_SCOPE_SELF.equals(dataScope))
- {
- if (StringUtils.isNotBlank(userAlias))
- {
- sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
- }
- else
- {
- // 数据权限为仅本人且没有userAlias别名不查询任何数据
- sqlString.append(" OR 1=0 ");
- }
- }
- }
-
- if (StringUtils.isNotBlank(sqlString.toString()))
- {
- Object params = joinPoint.getArgs()[0];
- if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
- {
- BaseEntity baseEntity = (BaseEntity) params;
- baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
- }
- }
- }
-
- /**
- * 拼接权限sql前先清空params.dataScope参数防止注入
- */
- private void clearDataScope(final JoinPoint joinPoint)
- {
- Object params = joinPoint.getArgs()[0];
- if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
- {
- BaseEntity baseEntity = (BaseEntity) params;
- baseEntity.getParams().put(DATA_SCOPE, "");
- }
- }
-}
diff --git a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
deleted file mode 100644
index 8c2c9f43..00000000
--- a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.ruoyi.framework.aspectj;
-
-import java.util.Objects;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
-
-/**
- * 多数据源处理
- *
- * @author ruoyi
- */
-@Aspect
-@Order(1)
-@Component
-public class DataSourceAspect
-{
- protected Logger logger = LoggerFactory.getLogger(getClass());
-
- @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"
- + "|| @within(com.ruoyi.common.annotation.DataSource)")
- public void dsPointCut()
- {
-
- }
-
- @Around("dsPointCut()")
- public Object around(ProceedingJoinPoint point) throws Throwable
- {
- DataSource dataSource = getDataSource(point);
-
- if (StringUtils.isNotNull(dataSource))
- {
- DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
- }
-
- try
- {
- return point.proceed();
- }
- finally
- {
- // 销毁数据源 在执行方法之后
- DynamicDataSourceContextHolder.clearDataSourceType();
- }
- }
-
- /**
- * 获取需要切换的数据源
- */
- public DataSource getDataSource(ProceedingJoinPoint point)
- {
- MethodSignature signature = (MethodSignature) point.getSignature();
- DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class);
- if (Objects.nonNull(dataSource))
- {
- return dataSource;
- }
-
- return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class);
- }
-}
diff --git a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
deleted file mode 100644
index 9bf5b8c5..00000000
--- a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package com.ruoyi.framework.aspectj;
-
-import java.util.Collection;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.HandlerMapping;
-import com.alibaba.fastjson.JSON;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.BusinessStatus;
-import com.ruoyi.common.enums.HttpMethod;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.manager.AsyncManager;
-import com.ruoyi.framework.manager.factory.AsyncFactory;
-import com.ruoyi.system.domain.SysOperLog;
-
-/**
- * 操作日志记录处理
- *
- * @author ruoyi
- */
-@Aspect
-@Component
-public class LogAspect
-{
- private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
-
- /**
- * 处理完请求后执行
- *
- * @param joinPoint 切点
- */
- @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")
- public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult)
- {
- handleLog(joinPoint, controllerLog, null, jsonResult);
- }
-
- /**
- * 拦截异常操作
- *
- * @param joinPoint 切点
- * @param e 异常
- */
- @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e")
- public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e)
- {
- handleLog(joinPoint, controllerLog, e, null);
- }
-
- protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult)
- {
- try
- {
-
- // 获取当前的用户
- LoginUser loginUser = SecurityUtils.getLoginUser();
-
- // *========数据库日志=========*//
- SysOperLog operLog = new SysOperLog();
- operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
- // 请求的地址
- String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
- operLog.setOperIp(ip);
- operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
- if (loginUser != null)
- {
- operLog.setOperName(loginUser.getUsername());
- }
-
- if (e != null)
- {
- operLog.setStatus(BusinessStatus.FAIL.ordinal());
- operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
- }
- // 设置方法名称
- String className = joinPoint.getTarget().getClass().getName();
- String methodName = joinPoint.getSignature().getName();
- operLog.setMethod(className + "." + methodName + "()");
- // 设置请求方式
- operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
- // 处理设置注解上的参数
- getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
- // 保存数据库
- AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
- }
- catch (Exception exp)
- {
- // 记录本地异常日志
- log.error("==前置通知异常==");
- log.error("异常信息:{}", exp.getMessage());
- exp.printStackTrace();
- }
- }
-
- /**
- * 获取注解中对方法的描述信息 用于Controller层注解
- *
- * @param log 日志
- * @param operLog 操作日志
- * @throws Exception
- */
- public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception
- {
- // 设置action动作
- operLog.setBusinessType(log.businessType().ordinal());
- // 设置标题
- operLog.setTitle(log.title());
- // 设置操作人类别
- operLog.setOperatorType(log.operatorType().ordinal());
- // 是否需要保存request，参数和值
- if (log.isSaveRequestData())
- {
- // 获取参数的信息，传入到数据库中。
- setRequestValue(joinPoint, operLog);
- }
- // 是否需要保存response，参数和值
- if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult))
- {
- operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000));
- }
- }
-
- /**
- * 获取请求的参数，放到log中
- *
- * @param operLog 操作日志
- * @throws Exception 异常
- */
- private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception
- {
- String requestMethod = operLog.getRequestMethod();
- if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))
- {
- String params = argsArrayToString(joinPoint.getArgs());
- operLog.setOperParam(StringUtils.substring(params, 0, 2000));
- }
- else
- {
- Map paramsMap = (Map) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
- operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
- }
- }
-
- /**
- * 参数拼装
- */
- private String argsArrayToString(Object[] paramsArray)
- {
- String params = "";
- if (paramsArray != null && paramsArray.length > 0)
- {
- for (Object o : paramsArray)
- {
- if (StringUtils.isNotNull(o) && !isFilterObject(o))
- {
- try
- {
- Object jsonObj = JSON.toJSON(o);
- params += jsonObj.toString() + " ";
- }
- catch (Exception e)
- {
- }
- }
- }
- }
- return params.trim();
- }
-
- /**
- * 判断是否需要过滤的对象。
- *
- * @param o 对象信息。
- * @return 如果是需要过滤的对象，则返回true；否则返回false。
- */
- @SuppressWarnings("rawtypes")
- public boolean isFilterObject(final Object o)
- {
- Class clazz = o.getClass();
- if (clazz.isArray())
- {
- return clazz.getComponentType().isAssignableFrom(MultipartFile.class);
- }
- else if (Collection.class.isAssignableFrom(clazz))
- {
- Collection collection = (Collection) o;
- for (Object value : collection)
- {
- return value instanceof MultipartFile;
- }
- }
- else if (Map.class.isAssignableFrom(clazz))
- {
- Map map = (Map) o;
- for (Object value : map.entrySet())
- {
- Map.Entry entry = (Map.Entry) value;
- return entry.getValue() instanceof MultipartFile;
- }
- }
- return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
- || o instanceof BindingResult;
- }
-}
diff --git a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
deleted file mode 100644
index 0d1b62f1..00000000
--- a/springboot/wumei-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.ruoyi.framework.aspectj;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.script.RedisScript;
-import org.springframework.stereotype.Component;
-import com.ruoyi.common.annotation.RateLimiter;
-import com.ruoyi.common.enums.LimitType;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.ip.IpUtils;
-
-/**
- * 限流处理
- *
- * @author ruoyi
- */
-@Aspect
-@Component
-public class RateLimiterAspect
-{
- private static final Logger log = LoggerFactory.getLogger(RateLimiterAspect.class);
-
- private RedisTemplate redisTemplate;
-
- private RedisScript limitScript;
-
- @Autowired
- public void setRedisTemplate1(RedisTemplate redisTemplate)
- {
- this.redisTemplate = redisTemplate;
- }
-
- @Autowired
- public void setLimitScript(RedisScript limitScript)
- {
- this.limitScript = limitScript;
- }
-
- @Before("@annotation(rateLimiter)")
- public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable
- {
- String key = rateLimiter.key();
- int time = rateLimiter.time();
- int count = rateLimiter.count();
-
- String combineKey = getCombineKey(rateLimiter, point);
- List