+ * 和 CommonResult#getDetailMessage() 一致的设计 */ private String detailMessage; /** * 空构造方法，避免反序列化问题 */ - public GlobalException() - { + public GlobalException() { } - public GlobalException(String message) - { + public GlobalException(String message) { this.message = message; } - public String getDetailMessage() - { + public String getDetailMessage() { return detailMessage; } - public GlobalException setDetailMessage(String detailMessage) - { + public GlobalException setDetailMessage(String detailMessage) { this.detailMessage = detailMessage; return this; } - public String getMessage() - { + @Override + public String getMessage() { return message; } - public GlobalException setMessage(String message) - { + public GlobalException setMessage(String message) { this.message = message; return this; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java index 8a7abe9f..5cc2eadc 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java @@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception; /** * 内部认证异常 - * + * * @author ruoyi */ -public class InnerAuthException extends RuntimeException -{ +public class InnerAuthException extends RuntimeException { private static final long serialVersionUID = 1L; - public InnerAuthException(String message) - { + public InnerAuthException(String message) { super(message); } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java index 3d420c41..5d786c3a 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java @@ -2,14 +2,12 @@ package com.ruoyi.common.core.exception; /** * 权限异常 - * + * * @author ruoyi */ -public class PreAuthorizeException extends RuntimeException -{ +public class PreAuthorizeException extends RuntimeException { private static final long serialVersionUID = 1L; - public PreAuthorizeException() - { + public PreAuthorizeException() { } } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java index d2b7763b..2eb680f8 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java @@ -2,11 +2,10 @@ package com.ruoyi.common.core.exception; /** * 业务异常 - * + * * @author ruoyi */ -public final class ServiceException extends RuntimeException -{ +public final class ServiceException extends RuntimeException { private static final long serialVersionUID = 1L; /** @@ -21,53 +20,46 @@ public final class ServiceException extends RuntimeException /** * 错误明细，内部调试错误 - * - * 和 {@link CommonResult#getDetailMessage()} 一致的设计 + *
+ * 和 CommonResult#getDetailMessage() 一致的设计
*/
private String detailMessage;
/**
* 空构造方法，避免反序列化问题
*/
- public ServiceException()
- {
+ public ServiceException() {
}
- public ServiceException(String message)
- {
+ public ServiceException(String message) {
this.message = message;
}
- public ServiceException(String message, Integer code)
- {
+ public ServiceException(String message, Integer code) {
this.message = message;
this.code = code;
}
- public String getDetailMessage()
- {
+ public String getDetailMessage() {
return detailMessage;
}
- public String getMessage()
- {
- return message;
+ public ServiceException setDetailMessage(String detailMessage) {
+ this.detailMessage = detailMessage;
+ return this;
}
- public Integer getCode()
- {
- return code;
+ @Override
+ public String getMessage() {
+ return message;
}
- public ServiceException setMessage(String message)
- {
+ public ServiceException setMessage(String message) {
this.message = message;
return this;
}
- public ServiceException setDetailMessage(String detailMessage)
- {
- this.detailMessage = detailMessage;
- return this;
+ public Integer getCode() {
+ return code;
}
}
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java
index a1c16b53..ed5e4e82 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java
@@ -2,25 +2,21 @@ package com.ruoyi.common.core.exception;
/**
* 工具类异常
- *
+ *
* @author ruoyi
*/
-public class UtilException extends RuntimeException
-{
+public class UtilException extends RuntimeException {
private static final long serialVersionUID = 8247610319171014183L;
- public UtilException(Throwable e)
- {
+ public UtilException(Throwable e) {
super(e.getMessage(), e);
}
- public UtilException(String message)
- {
+ public UtilException(String message) {
super(message);
}
- public UtilException(String message, Throwable throwable)
- {
+ public UtilException(String message, Throwable throwable) {
super(message, throwable);
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java
index eb6c3ae9..47ce5aba 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java
@@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception.auth;
/**
* 未能通过的登录认证异常
- *
+ *
* @author ruoyi
*/
-public class NotLoginException extends RuntimeException
-{
+public class NotLoginException extends RuntimeException {
private static final long serialVersionUID = 1L;
- public NotLoginException(String message)
- {
+ public NotLoginException(String message) {
super(message);
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
index a578a42e..82994f02 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java
@@ -4,20 +4,17 @@ import org.apache.commons.lang3.StringUtils;
/**
* 未能通过的权限认证异常
- *
+ *
* @author ruoyi
*/
-public class NotPermissionException extends RuntimeException
-{
+public class NotPermissionException extends RuntimeException {
private static final long serialVersionUID = 1L;
- public NotPermissionException(String permission)
- {
+ public NotPermissionException(String permission) {
super(permission);
}
- public NotPermissionException(String[] permissions)
- {
+ public NotPermissionException(String[] permissions) {
super(StringUtils.join(permissions, ","));
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
index d07118fb..84abe137 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java
@@ -4,20 +4,17 @@ import org.apache.commons.lang3.StringUtils;
/**
* 未能通过的角色认证异常
- *
+ *
* @author ruoyi
*/
-public class NotRoleException extends RuntimeException
-{
+public class NotRoleException extends RuntimeException {
private static final long serialVersionUID = 1L;
- public NotRoleException(String role)
- {
+ public NotRoleException(String role) {
super(role);
}
- public NotRoleException(String[] roles)
- {
+ public NotRoleException(String[] roles) {
super(StringUtils.join(roles, ","));
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java
index 3d2fa105..d37252bb 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java
@@ -2,11 +2,10 @@ package com.ruoyi.common.core.exception.base;
/**
* 基础异常
- *
+ *
* @author ruoyi
*/
-public class BaseException extends RuntimeException
-{
+public class BaseException extends RuntimeException {
private static final long serialVersionUID = 1L;
/**
@@ -29,51 +28,42 @@ public class BaseException extends RuntimeException
*/
private String defaultMessage;
- public BaseException(String module, String code, Object[] args, String defaultMessage)
- {
+ public BaseException(String module, String code, Object[] args, String defaultMessage) {
this.module = module;
this.code = code;
this.args = args;
this.defaultMessage = defaultMessage;
}
- public BaseException(String module, String code, Object[] args)
- {
+ public BaseException(String module, String code, Object[] args) {
this(module, code, args, null);
}
- public BaseException(String module, String defaultMessage)
- {
+ public BaseException(String module, String defaultMessage) {
this(module, null, null, defaultMessage);
}
- public BaseException(String code, Object[] args)
- {
+ public BaseException(String code, Object[] args) {
this(null, code, args, null);
}
- public BaseException(String defaultMessage)
- {
+ public BaseException(String defaultMessage) {
this(null, null, null, defaultMessage);
}
- public String getModule()
- {
+ public String getModule() {
return module;
}
- public String getCode()
- {
+ public String getCode() {
return code;
}
- public Object[] getArgs()
- {
+ public Object[] getArgs() {
return args;
}
- public String getDefaultMessage()
- {
+ public String getDefaultMessage() {
return defaultMessage;
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java
index ae615432..a2766911 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java
@@ -4,15 +4,13 @@ import com.ruoyi.common.core.exception.base.BaseException;
/**
* 文件信息异常类
- *
+ *
* @author ruoyi
*/
-public class FileException extends BaseException
-{
+public class FileException extends BaseException {
private static final long serialVersionUID = 1L;
- public FileException(String code, Object[] args)
- {
+ public FileException(String code, Object[] args) {
super("file", code, args, null);
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
index c425acdf..16a2f773 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java
@@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception.file;
/**
* 文件名称超长限制异常类
- *
+ *
* @author ruoyi
*/
-public class FileNameLengthLimitExceededException extends FileException
-{
+public class FileNameLengthLimitExceededException extends FileException {
private static final long serialVersionUID = 1L;
- public FileNameLengthLimitExceededException(int defaultFileNameLength)
- {
- super("upload.filename.exceed.length", new Object[] { defaultFileNameLength });
+ public FileNameLengthLimitExceededException(int defaultFileNameLength) {
+ super("upload.filename.exceed.length", new Object[]{defaultFileNameLength});
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
index 0426067a..35c85cd2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java
@@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception.file;
/**
* 文件名大小限制异常类
- *
+ *
* @author ruoyi
*/
-public class FileSizeLimitExceededException extends FileException
-{
+public class FileSizeLimitExceededException extends FileException {
private static final long serialVersionUID = 1L;
- public FileSizeLimitExceededException(long defaultMaxSize)
- {
- super("upload.exceed.maxSize", new Object[] { defaultMaxSize });
+ public FileSizeLimitExceededException(long defaultMaxSize) {
+ super("upload.exceed.maxSize", new Object[]{defaultMaxSize});
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
index 33b6912a..7e23a0f1 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java
@@ -1,80 +1,68 @@
package com.ruoyi.common.core.exception.file;
-import java.util.Arrays;
import org.apache.commons.fileupload.FileUploadException;
+import java.util.Arrays;
+
/**
* 文件上传 误异常类
- *
+ *
* @author ruoyi
*/
-public class InvalidExtensionException extends FileUploadException
-{
+public class InvalidExtensionException extends FileUploadException {
private static final long serialVersionUID = 1L;
private String[] allowedExtension;
private String extension;
private String filename;
- public InvalidExtensionException(String[] allowedExtension, String extension, String filename)
- {
+ public InvalidExtensionException(String[] allowedExtension, String extension, String filename) {
super("filename : [" + filename + "], extension : [" + extension + "], allowed extension : [" + Arrays.toString(allowedExtension) + "]");
this.allowedExtension = allowedExtension;
this.extension = extension;
this.filename = filename;
}
- public String[] getAllowedExtension()
- {
+ public String[] getAllowedExtension() {
return allowedExtension;
}
- public String getExtension()
- {
+ public String getExtension() {
return extension;
}
- public String getFilename()
- {
+ public String getFilename() {
return filename;
}
- public static class InvalidImageExtensionException extends InvalidExtensionException
- {
+ public static class InvalidImageExtensionException extends InvalidExtensionException {
private static final long serialVersionUID = 1L;
- public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename)
- {
+ public InvalidImageExtensionException(String[] allowedExtension, String extension, String filename) {
super(allowedExtension, extension, filename);
}
}
- public static class InvalidFlashExtensionException extends InvalidExtensionException
- {
+ public static class InvalidFlashExtensionException extends InvalidExtensionException {
private static final long serialVersionUID = 1L;
- public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename)
- {
+ public InvalidFlashExtensionException(String[] allowedExtension, String extension, String filename) {
super(allowedExtension, extension, filename);
}
}
- public static class InvalidMediaExtensionException extends InvalidExtensionException
- {
+ public static class InvalidMediaExtensionException extends InvalidExtensionException {
private static final long serialVersionUID = 1L;
- public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename)
- {
+ public InvalidMediaExtensionException(String[] allowedExtension, String extension, String filename) {
super(allowedExtension, extension, filename);
}
}
-
- public static class InvalidVideoExtensionException extends InvalidExtensionException
- {
+
+ public static class InvalidVideoExtensionException extends InvalidExtensionException {
private static final long serialVersionUID = 1L;
- public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename)
- {
+ public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename) {
super(allowedExtension, extension, filename);
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java
index c98397c1..069da970 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java
@@ -2,33 +2,47 @@ package com.ruoyi.common.core.exception.job;
/**
* 计划策略异常
- *
+ *
* @author ruoyi
*/
-public class TaskException extends Exception
-{
+public class TaskException extends Exception {
private static final long serialVersionUID = 1L;
private Code code;
- public TaskException(String msg, Code code)
- {
+ public TaskException(String msg, Code code) {
this(msg, code, null);
}
- public TaskException(String msg, Code code, Exception nestedEx)
- {
+ public TaskException(String msg, Code code, Exception nestedEx) {
super(msg, nestedEx);
this.code = code;
}
- public Code getCode()
- {
+ public Code getCode() {
return code;
}
- public enum Code
- {
- TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
+ public enum Code {
+ /**
+ * EXPORT
+ */
+ TASK_EXISTS,
+ /**
+ * EXPORT
+ */
+ NO_TASK_EXISTS,
+ /**
+ * EXPORT
+ */
+ TASK_ALREADY_STARTED,
+ /**
+ * EXPORT
+ */
+ UNKNOWN, CONFIG_ERROR,
+ /**
+ * EXPORT
+ */
+ TASK_NODE_NOT_AVAILABLE
}
}
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
index 6924d7e5..87d5fe3f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java
@@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception.user;
/**
* 验证码失效异常类
- *
+ *
* @author ruoyi
*/
-public class CaptchaExpireException extends UserException
-{
+public class CaptchaExpireException extends UserException {
private static final long serialVersionUID = 1L;
- public CaptchaExpireException()
- {
+ public CaptchaExpireException() {
super("user.jcaptcha.expire", null);
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java
index 5493804c..c7b8aefd 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java
@@ -4,15 +4,13 @@ import com.ruoyi.common.core.exception.base.BaseException;
/**
* 用户信息异常类
- *
+ *
* @author ruoyi
*/
-public class UserException extends BaseException
-{
+public class UserException extends BaseException {
private static final long serialVersionUID = 1L;
- public UserException(String code, Object[] args)
- {
+ public UserException(String code, Object[] args) {
super("user", code, args, null);
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java
index 7f514a60..0a9aa5c2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java
@@ -2,15 +2,13 @@ package com.ruoyi.common.core.exception.user;
/**
* 用户密码不正确或不符合规范异常类
- *
+ *
* @author ruoyi
*/
-public class UserPasswordNotMatchException extends UserException
-{
+public class UserPasswordNotMatchException extends UserException {
private static final long serialVersionUID = 1L;
- public UserPasswordNotMatchException()
- {
+ public UserPasswordNotMatchException() {
super("user.password.not.match", null);
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
index 662f817f..c377f383 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java
@@ -1,76 +1,82 @@
package com.ruoyi.common.core.text;
+import com.ruoyi.common.core.utils.StringUtils;
+
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import com.ruoyi.common.core.utils.StringUtils;
/**
* 字符集工具类
- *
+ *
* @author ruoyi
*/
-public class CharsetKit
-{
- /** ISO-8859-1 */
+public class CharsetKit {
+ /**
+ * ISO-8859-1
+ */
public static final String ISO_8859_1 = "ISO-8859-1";
- /** UTF-8 */
+ /**
+ * UTF-8
+ */
public static final String UTF_8 = "UTF-8";
- /** GBK */
+ /**
+ * GBK
+ */
public static final String GBK = "GBK";
- /** ISO-8859-1 */
+ /**
+ * ISO-8859-1
+ */
public static final Charset CHARSET_ISO_8859_1 = Charset.forName(ISO_8859_1);
- /** UTF-8 */
+ /**
+ * UTF-8
+ */
public static final Charset CHARSET_UTF_8 = Charset.forName(UTF_8);
- /** GBK */
+ /**
+ * GBK
+ */
public static final Charset CHARSET_GBK = Charset.forName(GBK);
/**
* 转换为Charset对象
- *
+ *
* @param charset 字符集，为空则返回默认字符集
* @return Charset
*/
- public static Charset charset(String charset)
- {
+ public static Charset charset(String charset) {
return StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset);
}
/**
* 转换字符串的字符集编码
- *
- * @param source 字符串
- * @param srcCharset 源字符集，默认ISO-8859-1
+ *
+ * @param source 字符串
+ * @param srcCharset 源字符集，默认ISO-8859-1
* @param destCharset 目标字符集，默认UTF-8
* @return 转换后的字符集
*/
- public static String convert(String source, String srcCharset, String destCharset)
- {
+ public static String convert(String source, String srcCharset, String destCharset) {
return convert(source, Charset.forName(srcCharset), Charset.forName(destCharset));
}
/**
* 转换字符串的字符集编码
- *
- * @param source 字符串
- * @param srcCharset 源字符集，默认ISO-8859-1
+ *
+ * @param source 字符串
+ * @param srcCharset 源字符集，默认ISO-8859-1
* @param destCharset 目标字符集，默认UTF-8
* @return 转换后的字符集
*/
- public static String convert(String source, Charset srcCharset, Charset destCharset)
- {
- if (null == srcCharset)
- {
+ public static String convert(String source, Charset srcCharset, Charset destCharset) {
+ if (null == srcCharset) {
srcCharset = StandardCharsets.ISO_8859_1;
}
- if (null == destCharset)
- {
+ if (null == destCharset) {
destCharset = StandardCharsets.UTF_8;
}
- if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset))
- {
+ if (StringUtils.isEmpty(source) || srcCharset.equals(destCharset)) {
return source;
}
return new String(source.getBytes(srcCharset), destCharset);
@@ -79,8 +85,7 @@ public class CharsetKit
/**
* @return 系统字符集编码
*/
- public static String systemCharset()
- {
+ public static String systemCharset() {
return Charset.defaultCharset().name();
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
index 95a00b73..7816cffb 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -1,37 +1,34 @@
package com.ruoyi.common.core.text;
+import com.ruoyi.common.core.utils.StringUtils;
+
import java.math.BigDecimal;
import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.text.NumberFormat;
import java.util.Set;
-import com.ruoyi.common.core.utils.StringUtils;
/**
* 类型转换器
- *
+ *
* @author ruoyi
*/
-public class Convert
-{
+public class Convert {
/**
* 转换为字符串
* 例如: ruoyi.txt, 返回: txt
- *
+ *
* @param file 文件名
* @return 后缀（不含".")
*/
- public static String getFileType(File file)
- {
- if (null == file)
- {
+ public static String getFileType(File file) {
+ if (null == file) {
return StringUtils.EMPTY;
}
return getFileType(file.getName());
@@ -35,11 +33,9 @@ public class FileTypeUtils
* @param fileName 文件名
* @return 后缀（不含".")
*/
- public static String getFileType(String fileName)
- {
+ public static String getFileType(String fileName) {
int separatorIndex = fileName.lastIndexOf(".");
- if (separatorIndex < 0)
- {
+ if (separatorIndex < 0) {
return "";
}
return fileName.substring(separatorIndex + 1).toLowerCase();
@@ -47,30 +43,43 @@ public class FileTypeUtils
/**
* 获取文件类型
- *
+ *
* @param photoByte 文件字节码
* @return 后缀（不含".")
*/
- public static String getFileExtendName(byte[] photoByte)
- {
+ 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))
- {
+ int i71 = 71;
+ int i73 = 73;
+ int i2 = 2;
+ int i70 = 70;
+ int i3 = 3;
+ int i56 = 56;
+ int i5 = 5;
+ int i97 = 97;
+ int i4 = 4;
+ int i55 = 55;
+ int i57 = 57;
+ int i6 = 6;
+ int i74 = 74;
+ int i7 = 7;
+ int i8 = 8;
+ int i9 = 9;
+ int i66 = 66;
+ int i77 = 77;
+ int i80 = 80;
+ int i78 = 78;
+ if ((photoByte[0] == i71) && (photoByte[1] == i73) && (photoByte[i2] == i70) && (photoByte[i3] == i56) && (photoByte[i5] == i97)) {
+ if ((photoByte[i4] == i55) || (photoByte[i4] == i57)) {
+ strFileExtendName = "GIF";
+ }
+ } else if ((photoByte[i6] == i74) && (photoByte[i7] == i70) && (photoByte[i8] == i73) && (photoByte[i9] == i70)) {
strFileExtendName = "JPG";
- }
- else if ((photoByte[0] == 66) && (photoByte[1] == 77))
- {
+ } else if ((photoByte[0] == i66) && (photoByte[1] == i77)) {
strFileExtendName = "BMP";
- }
- else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
- {
+ } else if ((photoByte[1] == i80) && (photoByte[i2] == i78) && (photoByte[i3] == i71)) {
strFileExtendName = "PNG";
}
return strFileExtendName;
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
index f76bb34b..c1c5d40a 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
@@ -1,83 +1,64 @@
package com.ruoyi.common.core.utils.file;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
+import com.ruoyi.common.core.utils.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang3.ArrayUtils;
-import com.ruoyi.common.core.utils.StringUtils;
+import java.io.*;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
/**
* 文件处理工具类
- *
+ *
* @author ruoyi
*/
-public class FileUtils
-{
- /** 字符常量：斜杠 {@code '/'} */
+public class FileUtils {
+ /**
+ * 字符常量：斜杠 {@code '/'}
+ */
public static final char SLASH = '/';
- /** 字符常量：反斜杠 {@code '\\'} */
+ /**
+ * 字符常量：反斜杠 {@code '\\'}
+ */
public static final char BACKSLASH = '\\';
- public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
+ public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-|.\\u4e00-\\u9fa5]+";
/**
* 输出指定文件的byte数组
- *
+ *
* @param filePath 文件路径
- * @param os 输出流
+ * @param os 输出流
* @return
*/
- public static void writeBytes(String filePath, OutputStream os) throws IOException
- {
+ public static void writeBytes(String filePath, OutputStream os) throws IOException {
FileInputStream fis = null;
- try
- {
+ try {
File file = new File(filePath);
- if (!file.exists())
- {
+ if (!file.exists()) {
throw new FileNotFoundException(filePath);
}
fis = new FileInputStream(file);
byte[] b = new byte[1024];
int length;
- while ((length = fis.read(b)) > 0)
- {
+ while ((length = fis.read(b)) > 0) {
os.write(b, 0, length);
}
- }
- catch (IOException e)
- {
- throw e;
- }
- finally
- {
- if (os != null)
- {
- try
- {
+ } finally {
+ if (os != null) {
+ try {
os.close();
- }
- catch (IOException e1)
- {
+ } catch (IOException e1) {
e1.printStackTrace();
}
}
- if (fis != null)
- {
- try
- {
+ if (fis != null) {
+ try {
fis.close();
- }
- catch (IOException e1)
- {
+ } catch (IOException e1) {
e1.printStackTrace();
}
}
@@ -86,17 +67,15 @@ public class FileUtils
/**
* 删除文件
- *
+ *
* @param filePath 文件
* @return
*/
- public static boolean deleteFile(String filePath)
- {
+ public static boolean deleteFile(String filePath) {
boolean flag = false;
File file = new File(filePath);
// 路径为文件且不为空则进行删除
- if (file.isFile() && file.exists())
- {
+ if (file.isFile() && file.exists()) {
file.delete();
flag = true;
}
@@ -105,32 +84,28 @@ public class FileUtils
/**
* 文件名称验证
- *
+ *
* @param filename 文件名称
* @return true 正常 false 非法
*/
- public static boolean isValidFilename(String filename)
- {
+ public static boolean isValidFilename(String filename) {
return filename.matches(FILENAME_PATTERN);
}
/**
* 检查文件是否可下载
- *
+ *
* @param resource 需要下载的文件
* @return true 正常 false 非法
*/
- public static boolean checkAllowDownload(String resource)
- {
+ public static boolean checkAllowDownload(String resource) {
// 禁止目录上跳级别
- if (StringUtils.contains(resource, ".."))
- {
+ if (StringUtils.contains(resource, StringUtils.DOT + StringUtils.DOT)) {
return false;
}
// 检查允许下载的文件规则
- if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource)))
- {
+ if (ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource))) {
return true;
}
@@ -140,33 +115,25 @@ public class FileUtils
/**
* 下载文件名重新编码
- *
- * @param request 请求对象
+ *
+ * @param request 请求对象
* @param fileName 文件名
* @return 编码后的文件名
*/
- public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException
- {
+ public static String setFileDownloadHeader(HttpServletRequest request, String fileName) throws UnsupportedEncodingException {
final String agent = request.getHeader("USER-AGENT");
String filename = fileName;
- if (agent.contains("MSIE"))
- {
+ if (agent.contains(StringUtils.MSIE)) {
// IE浏览器
filename = URLEncoder.encode(filename, "utf-8");
filename = filename.replace("+", " ");
- }
- else if (agent.contains("Firefox"))
- {
+ } else if (agent.contains(StringUtils.FIREFOX)) {
// 火狐浏览器
filename = new String(fileName.getBytes(), "ISO8859-1");
- }
- else if (agent.contains("Chrome"))
- {
+ } else if (agent.contains(StringUtils.CHROME)) {
// google浏览器
filename = URLEncoder.encode(filename, "utf-8");
- }
- else
- {
+ } else {
// 其它浏览器
filename = URLEncoder.encode(filename, "utf-8");
}
@@ -179,30 +146,24 @@ public class FileUtils
* @param filePath 文件
* @return 文件名
*/
- public static String getName(String filePath)
- {
- if (null == filePath)
- {
+ public static String getName(String filePath) {
+ if (null == filePath) {
return null;
}
int len = filePath.length();
- if (0 == len)
- {
+ if (0 == len) {
return filePath;
}
- if (isFileSeparator(filePath.charAt(len - 1)))
- {
+ if (isFileSeparator(filePath.charAt(len - 1))) {
// 以分隔符结尾的去掉结尾分隔符
len--;
}
int begin = 0;
char c;
- for (int i = len - 1; i > -1; i--)
- {
+ for (int i = len - 1; i > -1; i--) {
c = filePath.charAt(i);
- if (isFileSeparator(c))
- {
+ if (isFileSeparator(c)) {
// 查找最后一个路径分隔符（/或者\）
begin = i + 1;
break;
@@ -219,20 +180,18 @@ public class FileUtils
* @param c 字符
* @return 是否为Windows或者Linux（Unix）文件分隔符
*/
- public static boolean isFileSeparator(char c)
- {
+ public static boolean isFileSeparator(char c) {
return SLASH == c || BACKSLASH == c;
}
/**
* 下载文件名重新编码
*
- * @param response 响应对象
+ * @param response 响应对象
* @param realFileName 真实文件名
* @return
*/
- public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException
- {
+ public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) throws UnsupportedEncodingException {
String percentEncodedFileName = percentEncode(realFileName);
StringBuilder contentDispositionValue = new StringBuilder();
@@ -253,8 +212,7 @@ public class FileUtils
* @param s 需要百分号编码的字符串
* @return 百分号编码后的字符串
*/
- public static String percentEncode(String s) throws UnsupportedEncodingException
- {
+ public static String percentEncode(String s) throws UnsupportedEncodingException {
String encode = URLEncoder.encode(s, StandardCharsets.UTF_8.toString());
return encode.replaceAll("\\+", "%20");
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
index c3b19fc4..74ace6f4 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java
@@ -1,67 +1,55 @@
package com.ruoyi.common.core.utils.file;
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.ByteArrayInputStream;
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;
/**
* 图片处理工具类
*
* @author ruoyi
*/
-public class ImageUtils
-{
+public class ImageUtils {
private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);
- public static byte[] getImage(String imagePath)
- {
+ public static byte[] getImage(String imagePath) {
InputStream is = getFile(imagePath);
- try
- {
+ try {
return IOUtils.toByteArray(is);
- }
- catch (Exception e)
- {
- log.error("图片加载异常 {}", e);
+ } catch (Exception e) {
+ log.error("图片加载异常 ", e);
return null;
- }
- finally
- {
+ } finally {
IOUtils.closeQuietly(is);
}
}
- public static InputStream getFile(String imagePath)
- {
- try
- {
+ 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);
+ } catch (Exception e) {
+ log.error("获取图片异常 ", e);
}
return null;
}
/**
* 读取文件为字节数据
- *
+ *
* @param url 地址
* @return 字节数据
*/
- public static byte[] readFile(String url)
- {
+ public static byte[] readFile(String url) {
InputStream in = null;
- try
- {
+ try {
// 网络地址
URL urlObj = new URL(url);
URLConnection urlConnection = urlObj.openConnection();
@@ -70,14 +58,10 @@ public class ImageUtils
urlConnection.setDoInput(true);
in = urlConnection.getInputStream();
return IOUtils.toByteArray(in);
- }
- catch (Exception e)
- {
- log.error("访问文件异常 {}", e);
+ } catch (Exception e) {
+ log.error("访问文件异常 ", e);
return null;
- }
- finally
- {
+ } finally {
IOUtils.closeQuietly(in);
}
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java
index b8a3bc39..d3466cda 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java
@@ -2,11 +2,10 @@ package com.ruoyi.common.core.utils.file;
/**
* 媒体类型工具类
- *
+ *
* @author ruoyi
*/
-public class MimeTypeUtils
-{
+public class MimeTypeUtils {
public static final String IMAGE_PNG = "image/png";
public static final String IMAGE_JPG = "image/jpg";
@@ -17,14 +16,14 @@ public class MimeTypeUtils
public static final String IMAGE_GIF = "image/gif";
- public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
+ public static final String[] IMAGE_EXTENSION = {"bmp", "gif", "jpg", "jpeg", "png"};
- public static final String[] FLASH_EXTENSION = { "swf", "flv" };
+ 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[] 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[] VIDEO_EXTENSION = {"mp4", "avi", "rmvb"};
public static final String[] DEFAULT_ALLOWED_EXTENSION = {
// 图片
@@ -36,12 +35,10 @@ public class MimeTypeUtils
// 视频格式
"mp4", "avi", "rmvb",
// pdf
- "pdf" };
+ "pdf"};
- public static String getExtension(String prefix)
- {
- switch (prefix)
- {
+ public static String getExtension(String prefix) {
+ switch (prefix) {
case IMAGE_PNG:
return "png";
case IMAGE_JPG:
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
index 2f5a8721..e891154d 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java
@@ -4,95 +4,82 @@ import com.ruoyi.common.core.utils.StringUtils;
/**
* 转义和反转义工具类
- *
+ *
* @author ruoyi
*/
-public class EscapeUtil
-{
+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 };
+ static {
+ int baseSize = 64;
+ for (int i = 0; i < baseSize; i++) {
+ TEXT[i] = new char[]{(char) i};
}
// special HTML characters
- TEXT['\''] = "'".toCharArray(); // 单引号
- TEXT['"'] = """.toCharArray(); // 双引号
- TEXT['&'] = "&".toCharArray(); // &符
- TEXT['<'] = "<".toCharArray(); // 小于号
- TEXT['>'] = ">".toCharArray(); // 大于号
+ TEXT['\''] = "'".toCharArray();
+ TEXT['"'] = """.toCharArray();
+ TEXT['&'] = "&".toCharArray();
+ TEXT['<'] = "<".toCharArray();
+ TEXT['>'] = ">".toCharArray();
}
/**
* 转义文本中的HTML字符为安全的字符
- *
+ *
* @param text 被转义的文本
* @return 转义后的文本
*/
- public static String escape(String text)
- {
+ public static String escape(String text) {
return encode(text);
}
/**
* 还原被转义的HTML特殊字符
- *
+ *
* @param content 包含转义符的HTML内容
* @return 转换后的字符串
*/
- public static String unescape(String content)
- {
+ public static String unescape(String content) {
return decode(content);
}
/**
* 清除所有HTML标签，但是不删除标签内的内容
- *
+ *
* @param content 文本
* @return 清除标签后的文本
*/
- public static String clean(String content)
- {
- return new HTMLFilter().filter(content);
+ 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))
- {
+ 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++)
- {
+ for (int i = 0; i < text.length(); i++) {
c = text.charAt(i);
- if (c < 256)
- {
+ if (c < 256) {
tmp.append("%");
- if (c < 16)
- {
+ if (c < 16) {
tmp.append("0");
}
tmp.append(Integer.toString(c, 16));
- }
- else
- {
+ } else {
tmp.append("%u");
- if (c <= 0xfff)
- {
+ if (c <= 0xfff) {
// issue#I49JU8@Gitee
tmp.append("0");
}
@@ -104,48 +91,36 @@ public class EscapeUtil
/**
* Escape解码
- *
+ *
* @param content 被转义的内容
* @return 解码后的字符串
*/
- public static String decode(String content)
- {
- if (StringUtils.isEmpty(content))
- {
+ 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())
- {
+ while (lastPos < content.length()) {
pos = content.indexOf("%", lastPos);
- if (pos == lastPos)
- {
- if (content.charAt(pos + 1) == 'u')
- {
+ 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
- {
+ } else {
ch = (char) Integer.parseInt(content.substring(pos + 1, pos + 3), 16);
tmp.append(ch);
lastPos = pos + 3;
}
- }
- else
- {
- if (pos == -1)
- {
+ } else {
+ if (pos == -1) {
tmp.append(content.substring(lastPos));
lastPos = content.length();
- }
- else
- {
- tmp.append(content.substring(lastPos, pos));
+ } else {
+ tmp.append(content, lastPos, pos);
lastPos = pos;
}
}
@@ -153,8 +128,7 @@ public class EscapeUtil
return tmp.toString();
}
- public static void main(String[] args)
- {
+ public static void main(String[] args) {
String html = "";
String escape = EscapeUtil.escape(html);
// String html = "
* 如果给定的值为null，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static String toStr(Object value, String defaultValue)
- {
- if (null == value)
- {
+ public static String toStr(Object value, String defaultValue) {
+ if (null == value) {
return defaultValue;
}
- if (value instanceof String)
- {
+ if (value instanceof String) {
return (String) value;
}
return value.toString();
@@ -41,12 +38,11 @@ public class Convert
* 转换为字符串
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static String toStr(Object value)
- {
+ public static String toStr(Object value) {
return toStr(value, null);
}
@@ -54,19 +50,16 @@ public class Convert
* 转换为字符
* 如果给定的值为null，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static Character toChar(Object value, Character defaultValue)
- {
- if (null == value)
- {
+ public static Character toChar(Object value, Character defaultValue) {
+ if (null == value) {
return defaultValue;
}
- if (value instanceof Character)
- {
+ if (value instanceof Character) {
return (Character) value;
}
@@ -78,12 +71,11 @@ public class Convert
* 转换为字符
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static Character toChar(Object value)
- {
+ public static Character toChar(Object value) {
return toChar(value, null);
}
@@ -91,36 +83,28 @@ public class Convert
* 转换为byte
* 如果给定的值为null，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static Byte toByte(Object value, Byte defaultValue)
- {
- if (value == null)
- {
+ public static Byte toByte(Object value, Byte defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (value instanceof Byte)
- {
+ if (value instanceof Byte) {
return (Byte) value;
}
- if (value instanceof Number)
- {
+ if (value instanceof Number) {
return ((Number) value).byteValue();
}
final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
- try
- {
+ try {
return Byte.parseByte(valueStr);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return defaultValue;
}
}
@@ -129,12 +113,11 @@ public class Convert
* 转换为byte
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static Byte toByte(Object value)
- {
+ public static Byte toByte(Object value) {
return toByte(value, null);
}
@@ -142,36 +125,28 @@ public class Convert
* 转换为Short
* 如果给定的值为null，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static Short toShort(Object value, Short defaultValue)
- {
- if (value == null)
- {
+ public static Short toShort(Object value, Short defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (value instanceof Short)
- {
+ if (value instanceof Short) {
return (Short) value;
}
- if (value instanceof Number)
- {
+ if (value instanceof Number) {
return ((Number) value).shortValue();
}
final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
- try
- {
+ try {
return Short.parseShort(valueStr.trim());
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return defaultValue;
}
}
@@ -180,12 +155,11 @@ public class Convert
* 转换为Short
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static Short toShort(Object value)
- {
+ public static Short toShort(Object value) {
return toShort(value, null);
}
@@ -193,32 +167,25 @@ public class Convert
* 转换为Number
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static Number toNumber(Object value, Number defaultValue)
- {
- if (value == null)
- {
+ public static Number toNumber(Object value, Number defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (value instanceof Number)
- {
+ if (value instanceof Number) {
return (Number) value;
}
final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
- try
- {
+ try {
return NumberFormat.getInstance().parse(valueStr);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return defaultValue;
}
}
@@ -227,12 +194,11 @@ public class Convert
* 转换为Number
* 如果给定的值为空，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static Number toNumber(Object value)
- {
+ public static Number toNumber(Object value) {
return toNumber(value, null);
}
@@ -240,36 +206,28 @@ public class Convert
* 转换为int
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static Integer toInt(Object value, Integer defaultValue)
- {
- if (value == null)
- {
+ public static Integer toInt(Object value, Integer defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (value instanceof Integer)
- {
+ if (value instanceof Integer) {
return (Integer) value;
}
- if (value instanceof Number)
- {
+ if (value instanceof Number) {
return ((Number) value).intValue();
}
final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
- try
- {
+ try {
return Integer.parseInt(valueStr.trim());
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return defaultValue;
}
}
@@ -278,54 +236,48 @@ public class Convert
* 转换为int
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static Integer toInt(Object value)
- {
+ public static Integer toInt(Object value) {
return toInt(value, null);
}
/**
* 转换为Integer数组
- *
+ *
* @param str 被转换的值
* @return 结果
*/
- public static Integer[] toIntArray(String str)
- {
+ public static Integer[] toIntArray(String str) {
return toIntArray(",", str);
}
/**
* 转换为Long数组
- *
+ *
* @param str 被转换的值
* @return 结果
*/
- public static Long[] toLongArray(String str)
- {
+ public static Long[] toLongArray(String str) {
return toLongArray(",", str);
}
/**
* 转换为Integer数组
- *
+ *
* @param split 分隔符
* @param split 被转换的值
* @return 结果
*/
- public static Integer[] toIntArray(String split, String str)
- {
- if (StringUtils.isEmpty(str))
- {
- return new Integer[] {};
+ public static Integer[] toIntArray(String split, String str) {
+ if (StringUtils.isEmpty(str)) {
+ return new Integer[]{};
}
String[] arr = str.split(split);
final Integer[] ints = new Integer[arr.length];
- for (int i = 0; i < arr.length; i++)
- {
+ for (int i = 0; i < arr.length; i++) {
final Integer v = toInt(arr[i], 0);
ints[i] = v;
}
@@ -334,21 +286,18 @@ public class Convert
/**
* 转换为Long数组
- *
+ *
* @param split 分隔符
- * @param str 被转换的值
+ * @param str 被转换的值
* @return 结果
*/
- public static Long[] toLongArray(String split, String str)
- {
- if (StringUtils.isEmpty(str))
- {
- return new Long[] {};
+ public static Long[] toLongArray(String split, String str) {
+ if (StringUtils.isEmpty(str)) {
+ return new Long[]{};
}
String[] arr = str.split(split);
final Long[] longs = new Long[arr.length];
- for (int i = 0; i < arr.length; i++)
- {
+ for (int i = 0; i < arr.length; i++) {
final Long v = toLong(arr[i], null);
longs[i] = v;
}
@@ -357,24 +306,22 @@ public class Convert
/**
* 转换为String数组
- *
+ *
* @param str 被转换的值
* @return 结果
*/
- public static String[] toStrArray(String str)
- {
+ public static String[] toStrArray(String str) {
return toStrArray(",", str);
}
/**
* 转换为String数组
- *
+ *
* @param split 分隔符
* @param split 被转换的值
* @return 结果
*/
- public static String[] toStrArray(String split, String str)
- {
+ public static String[] toStrArray(String split, String str) {
return str.split(split);
}
@@ -382,37 +329,29 @@ public class Convert
* 转换为long
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static Long toLong(Object value, Long defaultValue)
- {
- if (value == null)
- {
+ public static Long toLong(Object value, Long defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (value instanceof Long)
- {
+ if (value instanceof Long) {
return (Long) value;
}
- if (value instanceof Number)
- {
+ if (value instanceof Number) {
return ((Number) value).longValue();
}
final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
- try
- {
+ try {
// 支持科学计数法
return new BigDecimal(valueStr.trim()).longValue();
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return defaultValue;
}
}
@@ -421,12 +360,11 @@ public class Convert
* 转换为long
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static Long toLong(Object value)
- {
+ public static Long toLong(Object value) {
return toLong(value, null);
}
@@ -434,37 +372,29 @@ public class Convert
* 转换为double
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static Double toDouble(Object value, Double defaultValue)
- {
- if (value == null)
- {
+ public static Double toDouble(Object value, Double defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (value instanceof Double)
- {
+ if (value instanceof Double) {
return (Double) value;
}
- if (value instanceof Number)
- {
+ if (value instanceof Number) {
return ((Number) value).doubleValue();
}
final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
- try
- {
+ try {
// 支持科学计数法
return new BigDecimal(valueStr.trim()).doubleValue();
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return defaultValue;
}
}
@@ -473,12 +403,11 @@ public class Convert
* 转换为double
* 如果给定的值为空，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static Double toDouble(Object value)
- {
+ public static Double toDouble(Object value) {
return toDouble(value, null);
}
@@ -486,36 +415,28 @@ public class Convert
* 转换为Float
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static Float toFloat(Object value, Float defaultValue)
- {
- if (value == null)
- {
+ public static Float toFloat(Object value, Float defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (value instanceof Float)
- {
+ if (value instanceof Float) {
return (Float) value;
}
- if (value instanceof Number)
- {
+ if (value instanceof Number) {
return ((Number) value).floatValue();
}
final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
- try
- {
+ try {
return Float.parseFloat(valueStr.trim());
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return defaultValue;
}
}
@@ -524,12 +445,11 @@ public class Convert
* 转换为Float
* 如果给定的值为空，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static Float toFloat(Object value)
- {
+ public static Float toFloat(Object value) {
return toFloat(value, null);
}
@@ -537,29 +457,24 @@ public class Convert
* 转换为boolean
* String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static Boolean toBool(Object value, Boolean defaultValue)
- {
- if (value == null)
- {
+ public static Boolean toBool(Object value, Boolean defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (value instanceof Boolean)
- {
+ if (value instanceof Boolean) {
return (Boolean) value;
}
String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
valueStr = valueStr.trim().toLowerCase();
- switch (valueStr)
- {
+ switch (valueStr) {
case "true":
return true;
case "false":
@@ -583,47 +498,39 @@ public class Convert
* 转换为boolean
* 如果给定的值为空，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static Boolean toBool(Object value)
- {
+ public static Boolean toBool(Object value) {
return toBool(value, null);
}
/**
* 转换为Enum对象
* 如果给定的值为空，或者转换失败，返回默认值
- *
- * @param clazz Enum的Class
- * @param value 值
+ *
+ * @param clazz Enum的Class
+ * @param value 值
* @param defaultValue 默认值
* @return Enum
*/
- public static
* 如果给定的值为空，或者转换失败，返回默认值null
- *
+ *
* @param clazz Enum的Class
* @param value 值
* @return Enum
*/
- public static
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static BigInteger toBigInteger(Object value, BigInteger defaultValue)
- {
- if (value == null)
- {
+ public static BigInteger toBigInteger(Object value, BigInteger defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (value instanceof BigInteger)
- {
+ if (value instanceof BigInteger) {
return (BigInteger) value;
}
- if (value instanceof Long)
- {
+ if (value instanceof Long) {
return BigInteger.valueOf((Long) value);
}
final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
- try
- {
+ try {
return new BigInteger(valueStr);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return defaultValue;
}
}
@@ -683,12 +581,11 @@ public class Convert
* 转换为BigInteger
* 如果给定的值为空，或者转换失败，返回默认值null
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static BigInteger toBigInteger(Object value)
- {
+ public static BigInteger toBigInteger(Object value) {
return toBigInteger(value, null);
}
@@ -696,44 +593,34 @@ public class Convert
* 转换为BigDecimal
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
- * @param value 被转换的值
+ *
+ * @param value 被转换的值
* @param defaultValue 转换错误时的默认值
* @return 结果
*/
- public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue)
- {
- if (value == null)
- {
+ public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (value instanceof BigDecimal)
- {
+ if (value instanceof BigDecimal) {
return (BigDecimal) value;
}
- if (value instanceof Long)
- {
+ if (value instanceof Long) {
return new BigDecimal((Long) value);
}
- if (value instanceof Double)
- {
- return new BigDecimal((Double) value);
+ if (value instanceof Double) {
+ return BigDecimal.valueOf((Double) value);
}
- if (value instanceof Integer)
- {
+ if (value instanceof Integer) {
return new BigDecimal((Integer) value);
}
final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
- try
- {
+ try {
return new BigDecimal(valueStr);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return defaultValue;
}
}
@@ -742,79 +629,65 @@ public class Convert
* 转换为BigDecimal
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
- *
+ *
* @param value 被转换的值
* @return 结果
*/
- public static BigDecimal toBigDecimal(Object value)
- {
+ public static BigDecimal toBigDecimal(Object value) {
return toBigDecimal(value, null);
}
/**
* 将对象转为字符串
* 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
- *
+ *
* @param obj 对象
* @return 字符串
*/
- public static String utf8Str(Object obj)
- {
+ public static String utf8Str(Object obj) {
return str(obj, CharsetKit.CHARSET_UTF_8);
}
/**
* 将对象转为字符串
* 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
- *
- * @param obj 对象
+ *
+ * @param obj 对象
* @param charsetName 字符集
* @return 字符串
*/
- public static String str(Object obj, String charsetName)
- {
+ public static String str(Object obj, String charsetName) {
return str(obj, Charset.forName(charsetName));
}
/**
* 将对象转为字符串
* 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
- *
- * @param obj 对象
+ *
+ * @param obj 对象
* @param charset 字符集
* @return 字符串
*/
- public static String str(Object obj, Charset charset)
- {
- if (null == obj)
- {
+ public static String str(Object obj, Charset charset) {
+ if (null == obj) {
return null;
}
- if (obj instanceof String)
- {
+ if (obj instanceof String) {
return (String) obj;
- }
- else if (obj instanceof byte[] || obj instanceof Byte[])
- {
- if (obj instanceof byte[])
- {
+ } else if (obj instanceof byte[] || obj instanceof Byte[]) {
+ if (obj instanceof byte[]) {
return str((byte[]) obj, charset);
- }
- else
- {
+ } else {
Byte[] bytes = (Byte[]) obj;
int length = bytes.length;
byte[] dest = new byte[length];
- for (int i = 0; i < length; i++)
- {
+ for (int i = 0; i < length; i++) {
dest[i] = bytes[i];
}
return str(dest, charset);
}
- }
- else if (obj instanceof ByteBuffer)
- {
+ } else if (obj instanceof ByteBuffer) {
return str((ByteBuffer) obj, charset);
}
return obj.toString();
@@ -822,32 +695,28 @@ public class Convert
/**
* 将byte数组转为字符串
- *
- * @param bytes byte数组
+ *
+ * @param bytes byte数组
* @param charset 字符集
* @return 字符串
*/
- public static String str(byte[] bytes, String charset)
- {
+ public static String str(byte[] bytes, String charset) {
return str(bytes, StringUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
}
/**
* 解码字节码
- *
- * @param data 字符串
+ *
+ * @param data 字符串
* @param charset 字符集，如果此字段为空，则解码的结果取决于平台
* @return 解码后的字符串
*/
- public static String str(byte[] data, Charset charset)
- {
- if (data == null)
- {
+ public static String str(byte[] data, Charset charset) {
+ if (data == null) {
return null;
}
- if (null == charset)
- {
+ if (null == charset) {
return new String(data);
}
return new String(data, charset);
@@ -855,15 +724,13 @@ public class Convert
/**
* 将编码的byteBuffer数据转换为字符串
- *
- * @param data 数据
+ *
+ * @param data 数据
* @param charset 字符集，如果为空使用当前系统字符集
* @return 字符串
*/
- public static String str(ByteBuffer data, String charset)
- {
- if (data == null)
- {
+ public static String str(ByteBuffer data, String charset) {
+ if (data == null) {
return null;
}
@@ -872,56 +739,48 @@ public class Convert
/**
* 将编码的byteBuffer数据转换为字符串
- *
- * @param data 数据
+ *
+ * @param data 数据
* @param charset 字符集，如果为空使用当前系统字符集
* @return 字符串
*/
- public static String str(ByteBuffer data, Charset charset)
- {
- if (null == charset)
- {
+ public static String str(ByteBuffer data, Charset charset) {
+ if (null == charset) {
charset = Charset.defaultCharset();
}
return charset.decode(data).toString();
}
// ----------------------------------------------------------------------- 全角半角转换
+
/**
* 半角转全角
- *
+ *
* @param input String.
* @return 全角字符串.
*/
- public static String toSBC(String input)
- {
- return toSBC(input, null);
+ public static String tosbc(String input) {
+ return tosbc(input, null);
}
/**
* 半角转全角
- *
- * @param input String
+ *
+ * @param input String
* @param notConvertSet 不替换的字符集合
* @return 全角字符串.
*/
- public static String toSBC(String input, Set
* 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
* 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
- *
+ *
* @param strPattern 字符串模板
- * @param argArray 参数列表
+ * @param argArray 参数列表
* @return 结果
*/
- public static String format(final String strPattern, final Object... argArray)
- {
- if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray))
- {
+ public static String format(final String strPattern, final Object... argArray) {
+ if (StringUtils.isEmpty(strPattern) || StringUtils.isEmpty(argArray)) {
return strPattern;
}
final int strPatternLength = strPattern.length();
@@ -40,43 +37,30 @@ public class StrFormatter
int handledPosition = 0;
int delimIndex;// 占位符所在位置
- for (int argIndex = 0; argIndex < argArray.length; argIndex++)
- {
+ for (int argIndex = 0; argIndex < argArray.length; argIndex++) {
delimIndex = strPattern.indexOf(EMPTY_JSON, handledPosition);
- if (delimIndex == -1)
- {
- if (handledPosition == 0)
- {
+ if (delimIndex == -1) {
+ if (handledPosition == 0) {
return strPattern;
- }
- else
- { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
+ } else { // 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
sbuf.append(strPattern, handledPosition, strPatternLength);
return sbuf.toString();
}
- }
- else
- {
- if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH)
- {
- if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH)
- {
+ } else {
+ if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) {
+ if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) {
// 转义符之前还有一个转义符，占位符依旧有效
sbuf.append(strPattern, handledPosition, delimIndex - 1);
sbuf.append(Convert.utf8Str(argArray[argIndex]));
handledPosition = delimIndex + 2;
- }
- else
- {
+ } else {
// 占位符被转义
argIndex--;
sbuf.append(strPattern, handledPosition, delimIndex - 1);
sbuf.append(C_DELIM_START);
handledPosition = delimIndex + 1;
}
- }
- else
- {
+ } else {
// 正常占位符
sbuf.append(strPattern, handledPosition, delimIndex);
sbuf.append(Convert.utf8Str(argArray[argIndex]));
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
index 9cbb459b..bec3d5d8 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
@@ -1,23 +1,19 @@
package com.ruoyi.common.core.utils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+
import java.lang.management.ManagementFactory;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
import java.util.Date;
-import org.apache.commons.lang3.time.DateFormatUtils;
/**
* 时间工具类
*
* @author ruoyi
*/
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
-{
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String YYYY = "yyyy";
public static String YYYY_MM = "yyyy-MM";
@@ -38,8 +34,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
*
* @return Date() 当前日期
*/
- public static Date getNowDate()
- {
+ public static Date getNowDate() {
return new Date();
}
@@ -48,44 +43,34 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
*
* @return String
*/
- public static String getDate()
- {
+ public static String getDate() {
return dateTimeNow(YYYY_MM_DD);
}
- public static final String getTime()
- {
+ public static final String getTime() {
return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
}
- public static final String dateTimeNow()
- {
+ public static final String dateTimeNow() {
return dateTimeNow(YYYYMMDDHHMMSS);
}
- public static final String dateTimeNow(final String format)
- {
+ public static final String dateTimeNow(final String format) {
return parseDateToStr(format, new Date());
}
- public static final String dateTime(final Date date)
- {
+ public static final String dateTime(final Date date) {
return parseDateToStr(YYYY_MM_DD, date);
}
- public static final String parseDateToStr(final String format, final Date date)
- {
+ public static final String parseDateToStr(final String format, final Date date) {
return new SimpleDateFormat(format).format(date);
}
- public static final Date dateTime(final String format, final String ts)
- {
- try
- {
+ public static final Date dateTime(final String format, final String ts) {
+ try {
return new SimpleDateFormat(format).parse(ts);
- }
- catch (ParseException e)
- {
+ } catch (ParseException e) {
throw new RuntimeException(e);
}
}
@@ -93,8 +78,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 日期路径 即年/月/日 如2018/08/08
*/
- public static final String datePath()
- {
+ public static final String datePath() {
Date now = new Date();
return DateFormatUtils.format(now, "yyyy/MM/dd");
}
@@ -102,8 +86,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 日期路径 即年/月/日 如20180808
*/
- public static final String dateTime()
- {
+ public static final String dateTime() {
Date now = new Date();
return DateFormatUtils.format(now, "yyyyMMdd");
}
@@ -111,18 +94,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 日期型字符串转化为日期 格式
*/
- public static Date parseDate(Object str)
- {
- if (str == null)
- {
+ public static Date parseDate(Object str) {
+ if (str == null) {
return null;
}
- try
- {
+ try {
return parseDate(str.toString(), parsePatterns);
- }
- catch (ParseException e)
- {
+ } catch (ParseException e) {
return null;
}
}
@@ -130,8 +108,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 获取服务器启动时间
*/
- public static Date getServerStartDate()
- {
+ public static Date getServerStartDate() {
long time = ManagementFactory.getRuntimeMXBean().getStartTime();
return new Date(time);
}
@@ -139,8 +116,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 计算两个时间差
*/
- public static String getDatePoor(Date endDate, Date nowDate)
- {
+ public static String getDatePoor(Date endDate, Date nowDate) {
long nd = 1000 * 24 * 60 * 60;
long nh = 1000 * 60 * 60;
long nm = 1000 * 60;
@@ -161,8 +137,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 增加 LocalDateTime ==> Date
*/
- public static Date toDate(LocalDateTime temporalAccessor)
- {
+ public static Date toDate(LocalDateTime temporalAccessor) {
ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
return Date.from(zdt.toInstant());
}
@@ -170,8 +145,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 增加 LocalDate ==> Date
*/
- public static Date toDate(LocalDate temporalAccessor)
- {
+ public static Date toDate(LocalDate temporalAccessor) {
LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
return Date.from(zdt.toInstant());
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
index f75e5597..44f3f360 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java
@@ -1,37 +1,33 @@
package com.ruoyi.common.core.utils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
import java.io.PrintWriter;
import java.io.StringWriter;
-import org.apache.commons.lang3.exception.ExceptionUtils;
/**
* 错误信息处理类。
*
* @author ruoyi
*/
-public class ExceptionUtil
-{
+public class ExceptionUtil {
/**
* 获取exception的详细错误信息。
*/
- public static String getExceptionMessage(Throwable e)
- {
+ public static String getExceptionMessage(Throwable e) {
StringWriter sw = new StringWriter();
e.printStackTrace(new PrintWriter(sw, true));
return sw.toString();
}
- public static String getRootErrorMessage(Exception e)
- {
+ public static String getRootErrorMessage(Exception e) {
Throwable root = ExceptionUtils.getRootCause(e);
root = (root == null ? e : root);
- if (root == null)
- {
+ if (root == null) {
return "";
}
String msg = root.getMessage();
- if (msg == null)
- {
+ if (msg == null) {
return "null";
}
return StringUtils.defaultString(msg);
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java
index abe93c0c..29d20d8f 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java
@@ -1,6 +1,5 @@
package com.ruoyi.common.core.utils;
-import java.util.Map;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.TokenConstants;
import com.ruoyi.common.core.text.Convert;
@@ -8,13 +7,14 @@ import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
+import java.util.Map;
+
/**
* Jwt工具类
*
* @author ruoyi
*/
-public class JwtUtils
-{
+public class JwtUtils {
public static String secret = TokenConstants.SECRET;
/**
@@ -23,8 +23,7 @@ public class JwtUtils
* @param claims 数据声明
* @return 令牌
*/
- public static String createToken(Map
@@ -33,13 +35,12 @@ public class ReUtil
* 结果：中文(1234)
*
*
- * @param content 文本
- * @param regex 正则
+ * @param content 文本
+ * @param regex 正则
* @param replacementTemplate 替换的文本模板，可以使用$1类似的变量提取正则匹配出的内容
* @return 处理后的文本
*/
- public static String replaceAll(CharSequence content, String regex, String replacementTemplate)
- {
+ public static String replaceAll(CharSequence content, String regex, String replacementTemplate) {
final Pattern pattern = Pattern.compile(regex, Pattern.DOTALL);
return replaceAll(content, pattern, replacementTemplate);
}
@@ -48,30 +49,25 @@ public class ReUtil
* 正则替换指定值
* 通过正则查找到字符串，然后把匹配到的字符串加入到replacementTemplate中，$1表示分组1的字符串
*
- * @param content 文本
- * @param pattern {@link Pattern}
+ * @param content 文本
+ * @param pattern {@link Pattern}
* @param replacementTemplate 替换的文本模板，可以使用$1类似的变量提取正则匹配出的内容
* @return 处理后的文本
* @since 3.0.4
*/
- public static String replaceAll(CharSequence content, Pattern pattern, String replacementTemplate)
- {
- if (StringUtils.isEmpty(content))
- {
+ public static String replaceAll(CharSequence content, Pattern pattern, String replacementTemplate) {
+ if (StringUtils.isEmpty(content)) {
return StringUtils.EMPTY;
}
final Matcher matcher = pattern.matcher(content);
boolean result = matcher.find();
- if (result)
- {
+ if (result) {
final Set
* 转义{}： format("this is \\{} for {}", "a", "b") -> this is \{} for a
* 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b
- *
+ *
* @param template 文本模板，被替换的部分用 {} 表示
- * @param params 参数值
+ * @param params 参数值
* @return 格式化后的文本
*/
- public static String format(String template, Object... params)
- {
- if (isEmpty(params) || isEmpty(template))
- {
+ public static String format(String template, Object... params) {
+ if (isEmpty(params) || isEmpty(template)) {
return template;
}
return StrFormatter.format(template, params);
@@ -285,22 +357,19 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* 是否为http(s)://开头
- *
+ *
* @param link 链接
* @return 结果
*/
- public static boolean ishttp(String link)
- {
+ public static boolean ishttp(String link) {
return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS);
}
/**
* 驼峰转下划线命名
*/
- public static String toUnderScoreCase(String str)
- {
- if (str == null)
- {
+ public static String toUnderScoreCase(String str) {
+ if (str == null) {
return null;
}
StringBuilder sb = new StringBuilder();
@@ -310,31 +379,23 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
boolean curreCharIsUpperCase = true;
// 下一字符是否大写
boolean nexteCharIsUpperCase = true;
- for (int i = 0; i < str.length(); i++)
- {
+ for (int i = 0; i < str.length(); i++) {
char c = str.charAt(i);
- if (i > 0)
- {
+ if (i > 0) {
preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
- }
- else
- {
+ } else {
preCharIsUpperCase = false;
}
curreCharIsUpperCase = Character.isUpperCase(c);
- if (i < (str.length() - 1))
- {
+ if (i < (str.length() - 1)) {
nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
}
- if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase)
- {
+ if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) {
sb.append(SEPARATOR);
- }
- else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase)
- {
+ } else if (i != 0 && !preCharIsUpperCase && curreCharIsUpperCase) {
sb.append(SEPARATOR);
}
sb.append(Character.toLowerCase(c));
@@ -345,19 +406,15 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* 是否包含字符串
- *
- * @param str 验证字符串
+ *
+ * @param str 验证字符串
* @param strs 字符串组
* @return 包含返回true
*/
- public static boolean inStringIgnoreCase(String str, String... strs)
- {
- if (str != null && strs != null)
- {
- for (String s : strs)
- {
- if (str.equalsIgnoreCase(trim(s)))
- {
+ public static boolean inStringIgnoreCase(String str, String... strs) {
+ if (str != null && strs != null) {
+ for (String s : strs) {
+ if (str.equalsIgnoreCase(trim(s))) {
return true;
}
}
@@ -367,31 +424,26 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
- *
+ *
* @param name 转换前的下划线大写方式命名的字符串
* @return 转换后的驼峰式命名的字符串
*/
- public static String convertToCamelCase(String name)
- {
+ public static String convertToCamelCase(String name) {
StringBuilder result = new StringBuilder();
+ String underline = "_";
// 快速检查
- if (name == null || name.isEmpty())
- {
+ if (name == null || name.isEmpty()) {
// 没必要转换
return "";
- }
- else if (!name.contains("_"))
- {
+ } else if (!name.contains(underline)) {
// 不含下划线，仅将首字母大写
return name.substring(0, 1).toUpperCase() + name.substring(1);
}
// 用下划线将原始字符串分割
- String[] camels = name.split("_");
- for (String camel : camels)
- {
+ String[] camels = name.split(underline);
+ for (String camel : camels) {
// 跳过原始字符串中开头、结尾的下换线或双重下划线
- if (camel.isEmpty())
- {
+ if (camel.isEmpty()) {
continue;
}
// 首字母大写
@@ -404,30 +456,22 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* 驼峰式命名法 例如：user_name->userName
*/
- public static String toCamelCase(String s)
- {
- if (s == null)
- {
+ public static String toCamelCase(String s) {
+ if (s == null) {
return null;
}
s = s.toLowerCase();
StringBuilder sb = new StringBuilder(s.length());
boolean upperCase = false;
- for (int i = 0; i < s.length(); i++)
- {
+ for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);
- if (c == SEPARATOR)
- {
+ if (c == SEPARATOR) {
upperCase = true;
- }
- else if (upperCase)
- {
+ } else if (upperCase) {
sb.append(Character.toUpperCase(c));
upperCase = false;
- }
- else
- {
+ } else {
sb.append(c);
}
}
@@ -436,21 +480,17 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
- *
- * @param str 指定字符串
+ *
+ * @param str 指定字符串
* @param strs 需要检查的字符串数组
* @return 是否匹配
*/
- public static boolean matches(String str, List
* 如getName()和setName()属性名一样，getName()和setAge()属性名不一样。
- *
+ *
* @param m1 方法名1
* @param m2 方法名2
* @return 属性名一样返回true，否则返回false
*/
- public static boolean isMethodPropEquals(String m1, String m2)
- {
+ 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/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java
index 75877262..98d30487 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java
@@ -1,23 +1,20 @@
package com.ruoyi.common.core.utils.bean;
-import java.util.Set;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import javax.validation.Validator;
+import java.util.Set;
/**
* bean对象属性验证
- *
+ *
* @author ruoyi
*/
-public class BeanValidators
-{
+public class BeanValidators {
public static void validateWithException(Validator validator, Object object, Class... groups)
- throws ConstraintViolationException
- {
+ throws ConstraintViolationException {
Set