ret) {
return Result.SUCCESS == ret.getCode();
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java
index 585c58a..3cdbb4b 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/enums/UserStatus.java
@@ -5,26 +5,22 @@ package com.muyu.common.core.enums;
*
* @author muyu
*/
-public enum UserStatus
-{
+public enum UserStatus {
OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除");
private final String code;
private final String info;
- UserStatus(String code, String info)
- {
+ UserStatus(String code, String info) {
this.code = code;
this.info = info;
}
- public String getCode()
- {
+ public String getCode() {
return code;
}
- public String getInfo()
- {
+ public String getInfo() {
return info;
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java
index 00d6805..8a060c2 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java
@@ -5,12 +5,10 @@ package com.muyu.common.core.exception;
*
* @author muyu
*/
-public class CaptchaException extends RuntimeException
-{
+public class CaptchaException extends RuntimeException {
private static final long serialVersionUID = 1L;
- public CaptchaException(String msg)
- {
+ public CaptchaException(String msg) {
super(msg);
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java
index dde759c..d3984eb 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java
@@ -5,27 +5,22 @@ package com.muyu.common.core.exception;
*
* @author muyu
*/
-public class CheckedException extends RuntimeException
-{
+public class CheckedException extends RuntimeException {
private static final long serialVersionUID = 1L;
- public CheckedException(String message)
- {
+ public CheckedException(String message) {
super(message);
}
- public CheckedException(Throwable cause)
- {
+ public CheckedException(Throwable cause) {
super(cause);
}
- public CheckedException(String message, Throwable cause)
- {
+ public CheckedException(String message, Throwable cause) {
super(message, cause);
}
- public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace)
- {
+ public CheckedException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
super(message, cause, enableSuppression, writableStackTrace);
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java
index 25d54fb..f661d34 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java
@@ -5,11 +5,9 @@ package com.muyu.common.core.exception;
*
* @author muyu
*/
-public class DemoModeException extends RuntimeException
-{
+public class DemoModeException extends RuntimeException {
private static final long serialVersionUID = 1L;
- public DemoModeException()
- {
+ public DemoModeException() {
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java
index 6eb9984..38395fc 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java
@@ -5,8 +5,7 @@ package com.muyu.common.core.exception;
*
* @author muyu
*/
-public class GlobalException extends RuntimeException
-{
+public class GlobalException extends RuntimeException {
private static final long serialVersionUID = 1L;
/**
@@ -16,7 +15,7 @@ public class GlobalException extends RuntimeException
/**
* 错误明细，内部调试错误
- *
+ *
* 和 {@link CommonResult#getDetailMessage()} 一致的设计
*/
private String detailMessage;
@@ -24,34 +23,28 @@ public class GlobalException extends RuntimeException
/**
* 空构造方法，避免反序列化问题
*/
- 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;
}
@Override
- public String getMessage()
- {
+ public String getMessage() {
return message;
}
- public GlobalException setMessage(String message)
- {
+ public GlobalException setMessage(String message) {
this.message = message;
return this;
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java
index 0b5fc7b..406c5d3 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java
@@ -5,12 +5,10 @@ package com.muyu.common.core.exception;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java
index c10de4f..dad8d44 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java
@@ -5,11 +5,9 @@ package com.muyu.common.core.exception;
*
* @author muyu
*/
-public class PreAuthorizeException extends RuntimeException
-{
+public class PreAuthorizeException extends RuntimeException {
private static final long serialVersionUID = 1L;
- public PreAuthorizeException()
- {
+ public PreAuthorizeException() {
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java
index 3173034..67b0594 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java
@@ -5,8 +5,7 @@ package com.muyu.common.core.exception;
*
* @author muyu
*/
-public final class ServiceException extends RuntimeException
-{
+public final class ServiceException extends RuntimeException {
private static final long serialVersionUID = 1L;
/**
@@ -21,7 +20,7 @@ public final class ServiceException extends RuntimeException
/**
* 错误明细，内部调试错误
- *
+ *
* 和 {@link CommonResult#getDetailMessage()} 一致的设计
*/
private String detailMessage;
@@ -29,45 +28,37 @@ public final class ServiceException extends RuntimeException
/**
* 空构造方法，避免反序列化问题
*/
- 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;
}
@Override
- public String getMessage()
- {
+ public String getMessage() {
return message;
}
- public Integer getCode()
- {
+ public Integer getCode() {
return code;
}
- public ServiceException setMessage(String message)
- {
+ public ServiceException setMessage(String message) {
this.message = message;
return this;
}
- public ServiceException setDetailMessage(String detailMessage)
- {
+ public ServiceException setDetailMessage(String detailMessage) {
this.detailMessage = detailMessage;
return this;
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java
index 0356755..8c6a38b 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java
@@ -5,22 +5,18 @@ package com.muyu.common.core.exception;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java
index 9f470c2..cabc20a 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java
@@ -5,12 +5,10 @@ package com.muyu.common.core.exception.auth;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java
index ee959ba..1b68489 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java
@@ -7,17 +7,14 @@ import org.apache.commons.lang3.StringUtils;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java
index 584cfae..f6284eb 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java
@@ -7,17 +7,14 @@ import org.apache.commons.lang3.StringUtils;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java
index 276140d..c7db900 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java
@@ -5,8 +5,7 @@ package com.muyu.common.core.exception.base;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java
index 19e3404..da82d02 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java
@@ -7,12 +7,10 @@ import com.muyu.common.core.exception.base.BaseException;
*
* @author muyu
*/
-public class FileException extends BaseException
-{
+public class FileException extends BaseException {
private static final long serialVersionUID = 1L;
- public FileException(String code, Object[] args, String msg)
- {
+ public FileException(String code, Object[] args, String msg) {
super("file", code, args, msg);
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java
index 4a4d280..c273276 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java
@@ -5,12 +5,10 @@ package com.muyu.common.core.exception.file;
*
* @author muyu
*/
-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 }, "the filename is too long");
+ public FileNameLengthLimitExceededException(int defaultFileNameLength) {
+ super("upload.filename.exceed.length", new Object[]{defaultFileNameLength}, "the filename is too long");
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java
index 88a71b6..efa37d5 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java
@@ -5,12 +5,10 @@ package com.muyu.common.core.exception.file;
*
* @author muyu
*/
-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 }, "the filesize is too large");
+ public FileSizeLimitExceededException(long defaultMaxSize) {
+ super("upload.exceed.maxSize", new Object[]{defaultMaxSize}, "the filesize is too large");
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java
index 345389b..3be6a6f 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java
@@ -8,54 +8,45 @@ import java.io.PrintWriter;
*
* @author muyu
*/
-public class FileUploadException extends Exception
-{
+public class FileUploadException extends Exception {
private static final long serialVersionUID = 1L;
private final Throwable cause;
- public FileUploadException()
- {
+ public FileUploadException() {
this(null, null);
}
- public FileUploadException(final String msg)
- {
+ public FileUploadException(final String msg) {
this(msg, null);
}
- public FileUploadException(String msg, Throwable cause)
- {
+ public FileUploadException(String msg, Throwable cause) {
super(msg);
this.cause = cause;
}
@Override
- public void printStackTrace(PrintStream stream)
- {
+ public void printStackTrace(PrintStream stream) {
super.printStackTrace(stream);
- if (cause != null)
- {
+ if (cause != null) {
stream.println("Caused by:");
cause.printStackTrace(stream);
}
}
@Override
- public void printStackTrace(PrintWriter writer)
- {
+ public void printStackTrace(PrintWriter writer) {
super.printStackTrace(writer);
- if (cause != null)
- {
+ if (cause != null) {
writer.println("Caused by:");
cause.printStackTrace(writer);
}
}
@Override
- public Throwable getCause()
- {
+ public Throwable getCause() {
return cause;
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java
index 220337d..1d34e50 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java
@@ -7,73 +7,60 @@ import java.util.Arrays;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java
index 0842c17..f4c9624 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java
@@ -5,30 +5,25 @@ package com.muyu.common.core.exception.job;
*
* @author muyu
*/
-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
- {
+ public enum Code {
TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java
index ffcd472..765a950 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java
@@ -5,12 +5,10 @@ package com.muyu.common.core.exception.user;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java
index 3f3d070..0cff607 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java
@@ -4,15 +4,13 @@ import com.muyu.common.core.exception.base.BaseException;
/**
* 用户信息异常类
- *
+ *
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java
index 265ebb2..7a6dde3 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java
@@ -5,12 +5,10 @@ package com.muyu.common.core.exception.user;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java
index c345b26..9939513 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/CharsetKit.java
@@ -10,20 +10,31 @@ import java.nio.charset.StandardCharsets;
*
* @author muyu
*/
-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);
/**
@@ -32,46 +43,40 @@ public class CharsetKit
* @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);
@@ -80,8 +85,7 @@ public class CharsetKit
/**
* @return 系统字符集编码
*/
- public static String systemCharset()
- {
+ public static String systemCharset() {
return Charset.defaultCharset().name();
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java
index b092384..f935611 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/Convert.java
@@ -15,25 +15,21 @@ import java.util.Set;
*
* @author muyu
*/
-public class Convert
-{
+public class Convert {
/**
* 转换为字符串
* 如果给定的值为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();
@@ -47,8 +43,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static String toStr(Object value)
- {
+ public static String toStr(Object value) {
return toStr(value, null);
}
@@ -57,18 +52,15 @@ 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;
}
@@ -84,8 +76,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static Character toChar(Object value)
- {
+ public static Character toChar(Object value) {
return toChar(value, null);
}
@@ -94,35 +85,27 @@ public class Convert
* 如果给定的值为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;
}
}
@@ -135,8 +118,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static Byte toByte(Object value)
- {
+ public static Byte toByte(Object value) {
return toByte(value, null);
}
@@ -145,35 +127,27 @@ public class Convert
* 如果给定的值为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;
}
}
@@ -186,8 +160,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static Short toShort(Object value)
- {
+ public static Short toShort(Object value) {
return toShort(value, null);
}
@@ -196,31 +169,24 @@ public class Convert
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
*
- * @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;
}
}
@@ -233,8 +199,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static Number toNumber(Object value)
- {
+ public static Number toNumber(Object value) {
return toNumber(value, null);
}
@@ -243,35 +208,27 @@ public class Convert
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
*
- * @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;
}
}
@@ -284,8 +241,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static Integer toInt(Object value)
- {
+ public static Integer toInt(Object value) {
return toInt(value, null);
}
@@ -295,8 +251,7 @@ public class Convert
* @param str 被转换的值
* @return 结果
*/
- public static Integer[] toIntArray(String str)
- {
+ public static Integer[] toIntArray(String str) {
return toIntArray(",", str);
}
@@ -306,8 +261,7 @@ public class Convert
* @param str 被转换的值
* @return 结果
*/
- public static Long[] toLongArray(String str)
- {
+ public static Long[] toLongArray(String str) {
return toLongArray(",", str);
}
@@ -315,19 +269,16 @@ public class Convert
* 转换为Integer数组
*
* @param split 分隔符
- * @param str 被转换的值
+ * @param str 被转换的值
* @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;
}
@@ -338,19 +289,16 @@ 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;
}
@@ -363,8 +311,7 @@ public class Convert
* @param str 被转换的值
* @return 结果
*/
- public static String[] toStrArray(String str)
- {
+ public static String[] toStrArray(String str) {
return toStrArray(",", str);
}
@@ -372,11 +319,10 @@ public class Convert
* 转换为String数组
*
* @param split 分隔符
- * @param str 被转换的值
+ * @param str 被转换的值
* @return 结果
*/
- public static String[] toStrArray(String split, String str)
- {
+ public static String[] toStrArray(String split, String str) {
return str.split(split);
}
@@ -385,36 +331,28 @@ public class Convert
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
*
- * @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;
}
}
@@ -427,8 +365,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static Long toLong(Object value)
- {
+ public static Long toLong(Object value) {
return toLong(value, null);
}
@@ -437,36 +374,28 @@ public class Convert
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
*
- * @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;
}
}
@@ -479,8 +408,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static Double toDouble(Object value)
- {
+ public static Double toDouble(Object value) {
return toDouble(value, null);
}
@@ -489,35 +417,27 @@ public class Convert
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
*
- * @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;
}
}
@@ -530,8 +450,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static Float toFloat(Object value)
- {
+ public static Float toFloat(Object value) {
return toFloat(value, null);
}
@@ -540,28 +459,23 @@ public class Convert
* 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":
case "yes":
case "ok":
@@ -584,8 +498,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static Boolean toBool(Object value)
- {
+ public static Boolean toBool(Object value) {
return toBool(value, null);
}
@@ -593,34 +506,27 @@ public class Convert
* 转换为Enum对象
* 如果给定的值为空，或者转换失败，返回默认值
*
- * @param clazz Enum的Class
- * @param value 值
+ * @param clazz Enum的Class
+ * @param value 值
* @param defaultValue 默认值
* @return Enum
*/
- public static > E toEnum(Class clazz, Object value, E defaultValue)
- {
- if (value == null)
- {
+ public static > E toEnum(Class clazz, Object value, E defaultValue) {
+ if (value == null) {
return defaultValue;
}
- if (clazz.isAssignableFrom(value.getClass()))
- {
+ if (clazz.isAssignableFrom(value.getClass())) {
@SuppressWarnings("unchecked")
E myE = (E) value;
return myE;
}
final String valueStr = toStr(value, null);
- if (StringUtils.isEmpty(valueStr))
- {
+ if (StringUtils.isEmpty(valueStr)) {
return defaultValue;
}
- try
- {
+ try {
return Enum.valueOf(clazz, valueStr);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return defaultValue;
}
}
@@ -633,8 +539,7 @@ public class Convert
* @param value 值
* @return Enum
*/
- public static > E toEnum(Class clazz, Object value)
- {
+ public static > E toEnum(Class clazz, Object value) {
return toEnum(clazz, value, null);
}
@@ -643,35 +548,27 @@ public class Convert
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
*
- * @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;
}
}
@@ -684,8 +581,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static BigInteger toBigInteger(Object value)
- {
+ public static BigInteger toBigInteger(Object value) {
return toBigInteger(value, null);
}
@@ -694,43 +590,33 @@ public class Convert
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错
*
- * @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)
- {
+ 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;
}
}
@@ -743,8 +629,7 @@ public class Convert
* @param value 被转换的值
* @return 结果
*/
- public static BigDecimal toBigDecimal(Object value)
- {
+ public static BigDecimal toBigDecimal(Object value) {
return toBigDecimal(value, null);
}
@@ -755,8 +640,7 @@ public class Convert
* @param obj 对象
* @return 字符串
*/
- public static String utf8Str(Object obj)
- {
+ public static String utf8Str(Object obj) {
return str(obj, CharsetKit.CHARSET_UTF_8);
}
@@ -764,12 +648,11 @@ public class Convert
* 将对象转为字符串
* 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));
}
@@ -777,41 +660,30 @@ public class Convert
* 将对象转为字符串
* 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();
@@ -820,31 +692,27 @@ 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);
@@ -853,14 +721,12 @@ 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;
}
@@ -870,55 +736,47 @@ 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)
- {
+ 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 notConvertSet)
- {
+ public static String toSBC(String input, Set notConvertSet) {
char[] c = input.toCharArray();
- for (int i = 0; i < c.length; i++)
- {
- if (null != notConvertSet && notConvertSet.contains(c[i]))
- {
+ for (int i = 0; i < c.length; i++) {
+ if (null != notConvertSet && notConvertSet.contains(c[i])) {
// 跳过不替换的字符
continue;
}
- if (c[i] == ' ')
- {
+ if (c[i] == ' ') {
c[i] = '\u3000';
- }
- else if (c[i] < '\177')
- {
+ } else if (c[i] < '\177') {
c[i] = (char) (c[i] + 65248);
}
@@ -932,35 +790,28 @@ public class Convert
* @param input String.
* @return 半角字符串
*/
- public static String toDBC(String input)
- {
+ public static String toDBC(String input) {
return toDBC(input, null);
}
/**
* 替换全角为半角
*
- * @param text 文本
+ * @param text 文本
* @param notConvertSet 不替换的字符集合
* @return 替换后的字符
*/
- public static String toDBC(String text, Set notConvertSet)
- {
+ public static String toDBC(String text, Set notConvertSet) {
char[] c = text.toCharArray();
- for (int i = 0; i < c.length; i++)
- {
- if (null != notConvertSet && notConvertSet.contains(c[i]))
- {
+ for (int i = 0; i < c.length; i++) {
+ if (null != notConvertSet && notConvertSet.contains(c[i])) {
// 跳过不替换的字符
continue;
}
- if (c[i] == '\u3000')
- {
+ if (c[i] == '\u3000') {
c[i] = ' ';
- }
- else if (c[i] > '\uFF00' && c[i] < '\uFF5F')
- {
+ } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') {
c[i] = (char) (c[i] - 65248);
}
}
@@ -973,18 +824,16 @@ public class Convert
* @param n 数字
* @return 中文大写数字
*/
- public static String digitUppercase(double n)
- {
- String[] fraction = { "角", "分" };
- String[] digit = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" };
- String[][] unit = { { "元", "万", "亿" }, { "", "拾", "佰", "仟" } };
+ public static String digitUppercase(double n) {
+ String[] fraction = {"角", "分"};
+ String[] digit = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
+ String[][] unit = {{"元", "万", "亿"}, {"", "拾", "佰", "仟"}};
String head = n < 0 ? "负" : "";
n = Math.abs(n);
String s = "";
- for (int i = 0; i < fraction.length; i++)
- {
+ for (int i = 0; i < fraction.length; i++) {
// 优化double计算精度丢失问题
BigDecimal nNum = new BigDecimal(n);
BigDecimal decimal = new BigDecimal(10);
@@ -992,17 +841,14 @@ public class Convert
double d = scale.doubleValue();
s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
}
- if (s.length() < 1)
- {
+ if (s.length() < 1) {
s = "整";
}
int integerPart = (int) Math.floor(n);
- for (int i = 0; i < unit[0].length && integerPart > 0; i++)
- {
+ for (int i = 0; i < unit[0].length && integerPart > 0; i++) {
String p = "";
- for (int j = 0; j < unit[1].length && n > 0; j++)
- {
+ for (int j = 0; j < unit[1].length && n > 0; j++) {
p = digit[integerPart % 10] + unit[1][j] + p;
integerPart = integerPart / 10;
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java
index 2721457..329fe4f 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/text/StrFormatter.java
@@ -7,8 +7,7 @@ import com.muyu.common.core.utils.StringUtils;
*
* @author muyu
*/
-public class StrFormatter
-{
+public class StrFormatter {
public static final String EMPTY_JSON = "{}";
public static final char C_BACKSLASH = '\\';
public static final char C_DELIM_START = '{';
@@ -24,13 +23,11 @@ public class StrFormatter
* 转义\： 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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java
index c0ebaf6..b1de1e0 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java
@@ -13,8 +13,7 @@ import java.util.Date;
*
* @author muyu
*/
-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";
@@ -35,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();
}
@@ -45,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);
}
}
@@ -90,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");
}
@@ -99,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");
}
@@ -108,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;
}
}
@@ -127,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);
}
@@ -136,12 +116,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
/**
* 计算时间差
*
- * @param endDate 最后时间
+ * @param endDate 最后时间
* @param startTime 开始时间
* @return 时间差（天/小时/分钟）
*/
- public static String timeDistance(Date endDate, Date startTime)
- {
+ public static String timeDistance(Date endDate, Date startTime) {
long nd = 1000 * 24 * 60 * 60;
long nh = 1000 * 60 * 60;
long nm = 1000 * 60;
@@ -162,8 +141,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());
}
@@ -171,8 +149,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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java
index fac638c..a9a2f04 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ExceptionUtil.java
@@ -10,29 +10,24 @@ import java.io.StringWriter;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java
index 2119731..6580b6f 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java
@@ -14,8 +14,7 @@ import java.util.Map;
*
* @author muyu
*/
-public class JwtUtils
-{
+public class JwtUtils {
public static String secret = TokenConstants.SECRET;
/**
@@ -24,8 +23,7 @@ public class JwtUtils
* @param claims 数据声明
* @return 令牌
*/
- public static String createToken(Map claims)
- {
+ public static String createToken(Map claims) {
String token = Jwts.builder().setClaims(claims).signWith(SignatureAlgorithm.HS512, secret).compact();
return token;
}
@@ -36,8 +34,7 @@ public class JwtUtils
* @param token 令牌
* @return 数据声明
*/
- public static Claims parseToken(String token)
- {
+ public static Claims parseToken(String token) {
return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody();
}
@@ -47,8 +44,7 @@ public class JwtUtils
* @param token 令牌
* @return 用户ID
*/
- public static String getUserKey(String token)
- {
+ public static String getUserKey(String token) {
Claims claims = parseToken(token);
return getValue(claims, SecurityConstants.USER_KEY);
}
@@ -59,8 +55,7 @@ public class JwtUtils
* @param claims 身份信息
* @return 用户ID
*/
- public static String getUserKey(Claims claims)
- {
+ public static String getUserKey(Claims claims) {
return getValue(claims, SecurityConstants.USER_KEY);
}
@@ -70,8 +65,7 @@ public class JwtUtils
* @param token 令牌
* @return 用户ID
*/
- public static String getUserId(String token)
- {
+ public static String getUserId(String token) {
Claims claims = parseToken(token);
return getValue(claims, SecurityConstants.DETAILS_USER_ID);
}
@@ -82,8 +76,7 @@ public class JwtUtils
* @param claims 身份信息
* @return 用户ID
*/
- public static String getUserId(Claims claims)
- {
+ public static String getUserId(Claims claims) {
return getValue(claims, SecurityConstants.DETAILS_USER_ID);
}
@@ -93,8 +86,7 @@ public class JwtUtils
* @param token 令牌
* @return 用户名
*/
- public static String getUserName(String token)
- {
+ public static String getUserName(String token) {
Claims claims = parseToken(token);
return getValue(claims, SecurityConstants.DETAILS_USERNAME);
}
@@ -105,8 +97,7 @@ public class JwtUtils
* @param claims 身份信息
* @return 用户名
*/
- public static String getUserName(Claims claims)
- {
+ public static String getUserName(Claims claims) {
return getValue(claims, SecurityConstants.DETAILS_USERNAME);
}
@@ -114,11 +105,10 @@ public class JwtUtils
* 根据身份信息获取键值
*
* @param claims 身份信息
- * @param key 键
+ * @param key 键
* @return 值
*/
- public static String getValue(Claims claims, String key)
- {
+ public static String getValue(Claims claims, String key) {
return Convert.toStr(claims.get(key), "");
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java
index 689d235..3a6c829 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java
@@ -10,13 +10,11 @@ import com.github.pagehelper.PageHelper;
*
* @author muyu
*/
-public class PageUtils extends PageHelper
-{
+public class PageUtils extends PageHelper {
/**
* 设置请求分页数据
*/
- public static void startPage()
- {
+ public static void startPage() {
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
@@ -28,8 +26,7 @@ public class PageUtils extends PageHelper
/**
* 清理分页的线程变量
*/
- public static void clearPage()
- {
+ public static void clearPage() {
PageHelper.clearPage();
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java
index dfa9188..25e6ad5 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ServletUtils.java
@@ -33,53 +33,46 @@ import java.util.Map;
*
* @author muyu
*/
-public class ServletUtils
-{
+public class ServletUtils {
/**
* 获取String参数
*/
- public static String getParameter(String name)
- {
+ public static String getParameter(String name) {
return getRequest().getParameter(name);
}
/**
* 获取String参数
*/
- public static String getParameter(String name, String defaultValue)
- {
+ public static String getParameter(String name, String defaultValue) {
return Convert.toStr(getRequest().getParameter(name), defaultValue);
}
/**
* 获取Integer参数
*/
- public static Integer getParameterToInt(String name)
- {
+ public static Integer getParameterToInt(String name) {
return Convert.toInt(getRequest().getParameter(name));
}
/**
* 获取Integer参数
*/
- public static Integer getParameterToInt(String name, Integer defaultValue)
- {
+ public static Integer getParameterToInt(String name, Integer defaultValue) {
return Convert.toInt(getRequest().getParameter(name), defaultValue);
}
/**
* 获取Boolean参数
*/
- public static Boolean getParameterToBool(String name)
- {
+ public static Boolean getParameterToBool(String name) {
return Convert.toBool(getRequest().getParameter(name));
}
/**
* 获取Boolean参数
*/
- public static Boolean getParameterToBool(String name, Boolean defaultValue)
- {
+ public static Boolean getParameterToBool(String name, Boolean defaultValue) {
return Convert.toBool(getRequest().getParameter(name), defaultValue);
}
@@ -89,8 +82,7 @@ public class ServletUtils
* @param request 请求对象{@link ServletRequest}
* @return Map
*/
- public static Map getParams(ServletRequest request)
- {
+ public static Map getParams(ServletRequest request) {
final Map map = request.getParameterMap();
return Collections.unmodifiableMap(map);
}
@@ -101,11 +93,9 @@ public class ServletUtils
* @param request 请求对象{@link ServletRequest}
* @return Map
*/
- public static Map getParamMap(ServletRequest request)
- {
+ public static Map getParamMap(ServletRequest request) {
Map params = new HashMap<>();
- for (Map.Entry entry : getParams(request).entrySet())
- {
+ for (Map.Entry entry : getParams(request).entrySet()) {
params.put(entry.getKey(), StringUtils.join(entry.getValue(), ","));
}
return params;
@@ -114,14 +104,10 @@ public class ServletUtils
/**
* 获取request
*/
- public static HttpServletRequest getRequest()
- {
- try
- {
+ public static HttpServletRequest getRequest() {
+ try {
return getRequestAttributes().getRequest();
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return null;
}
}
@@ -129,14 +115,10 @@ public class ServletUtils
/**
* 获取response
*/
- public static HttpServletResponse getResponse()
- {
- try
- {
+ public static HttpServletResponse getResponse() {
+ try {
return getRequestAttributes().getResponse();
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return null;
}
}
@@ -144,42 +126,32 @@ public class ServletUtils
/**
* 获取session
*/
- public static HttpSession getSession()
- {
+ public static HttpSession getSession() {
return getRequest().getSession();
}
- public static ServletRequestAttributes getRequestAttributes()
- {
- try
- {
+ public static ServletRequestAttributes getRequestAttributes() {
+ try {
RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
return (ServletRequestAttributes) attributes;
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return null;
}
}
- public static String getHeader(HttpServletRequest request, String name)
- {
+ public static String getHeader(HttpServletRequest request, String name) {
String value = request.getHeader(name);
- if (StringUtils.isEmpty(value))
- {
+ if (StringUtils.isEmpty(value)) {
return StringUtils.EMPTY;
}
return urlDecode(value);
}
- public static Map getHeaders(HttpServletRequest request)
- {
+ public static Map getHeaders(HttpServletRequest request) {
Map map = new LinkedCaseInsensitiveMap<>();
Enumeration enumeration = request.getHeaderNames();
- if (enumeration != null)
- {
- while (enumeration.hasMoreElements())
- {
+ if (enumeration != null) {
+ while (enumeration.hasMoreElements()) {
String key = enumeration.nextElement();
String value = request.getHeader(key);
map.put(key, value);
@@ -192,19 +164,15 @@ public class ServletUtils
* 将字符串渲染到客户端
*
* @param response 渲染对象
- * @param string 待渲染的字符串
+ * @param string 待渲染的字符串
*/
- public static void renderString(HttpServletResponse response, String string)
- {
- try
- {
+ public static void renderString(HttpServletResponse response, String string) {
+ try {
response.setStatus(200);
response.setContentType("application/json");
response.setCharacterEncoding("utf-8");
response.getWriter().print(string);
- }
- catch (IOException e)
- {
+ } catch (IOException e) {
e.printStackTrace();
}
}
@@ -214,23 +182,19 @@ public class ServletUtils
*
* @param request
*/
- public static boolean isAjaxRequest(HttpServletRequest request)
- {
+ public static boolean isAjaxRequest(HttpServletRequest request) {
String accept = request.getHeader("accept");
- if (accept != null && accept.contains("application/json"))
- {
+ if (accept != null && accept.contains("application/json")) {
return true;
}
String xRequestedWith = request.getHeader("X-Requested-With");
- if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest"))
- {
+ if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
return true;
}
String uri = request.getRequestURI();
- if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml"))
- {
+ if (StringUtils.inStringIgnoreCase(uri, ".json", ".xml")) {
return true;
}
@@ -244,14 +208,10 @@ public class ServletUtils
* @param str 内容
* @return 编码后的内容
*/
- public static String urlEncode(String str)
- {
- try
- {
+ public static String urlEncode(String str) {
+ try {
return URLEncoder.encode(str, Constants.UTF8);
- }
- catch (UnsupportedEncodingException e)
- {
+ } catch (UnsupportedEncodingException e) {
return StringUtils.EMPTY;
}
}
@@ -262,14 +222,10 @@ public class ServletUtils
* @param str 内容
* @return 解码后的内容
*/
- public static String urlDecode(String str)
- {
- try
- {
+ public static String urlDecode(String str) {
+ try {
return URLDecoder.decode(str, Constants.UTF8);
- }
- catch (UnsupportedEncodingException e)
- {
+ } catch (UnsupportedEncodingException e) {
return StringUtils.EMPTY;
}
}
@@ -278,11 +234,10 @@ public class ServletUtils
* 设置webflux模型响应
*
* @param response ServerHttpResponse
- * @param value 响应内容
+ * @param value 响应内容
* @return Mono
*/
- public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value)
- {
+ public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value) {
return webFluxResponseWriter(response, HttpStatus.OK, value, Result.FAIL);
}
@@ -290,12 +245,11 @@ public class ServletUtils
* 设置webflux模型响应
*
* @param response ServerHttpResponse
- * @param code 响应状态码
- * @param value 响应内容
+ * @param code 响应状态码
+ * @param value 响应内容
* @return Mono
*/
- public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value, int code)
- {
+ public static Mono webFluxResponseWriter(ServerHttpResponse response, Object value, int code) {
return webFluxResponseWriter(response, HttpStatus.OK, value, code);
}
@@ -303,28 +257,26 @@ public class ServletUtils
* 设置webflux模型响应
*
* @param response ServerHttpResponse
- * @param status http状态码
- * @param code 响应状态码
- * @param value 响应内容
+ * @param status http状态码
+ * @param code 响应状态码
+ * @param value 响应内容
* @return Mono
*/
- public static Mono webFluxResponseWriter(ServerHttpResponse response, HttpStatus status, Object value, int code)
- {
+ public static Mono webFluxResponseWriter(ServerHttpResponse response, HttpStatus status, Object value, int code) {
return webFluxResponseWriter(response, MediaType.APPLICATION_JSON_VALUE, status, value, code);
}
/**
* 设置webflux模型响应
*
- * @param response ServerHttpResponse
+ * @param response ServerHttpResponse
* @param contentType content-type
- * @param status http状态码
- * @param code 响应状态码
- * @param value 响应内容
+ * @param status http状态码
+ * @param code 响应状态码
+ * @param value 响应内容
* @return Mono
*/
- public static Mono webFluxResponseWriter(ServerHttpResponse response, String contentType, HttpStatus status, Object value, int code)
- {
+ public static Mono webFluxResponseWriter(ServerHttpResponse response, String contentType, HttpStatus status, Object value, int code) {
response.setStatusCode(status);
response.getHeaders().add(HttpHeaders.CONTENT_TYPE, contentType);
Result result = Result.error(code, value.toString());
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java
index 15260a0..17608e1 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java
@@ -13,14 +13,14 @@ import org.springframework.stereotype.Component;
* @author muyu
*/
@Component
-public final class SpringUtils implements BeanFactoryPostProcessor
-{
- /** Spring应用上下文环境 */
+public final class SpringUtils implements BeanFactoryPostProcessor {
+ /**
+ * Spring应用上下文环境
+ */
private static ConfigurableListableBeanFactory beanFactory;
@Override
- public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
- {
+ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
SpringUtils.beanFactory = beanFactory;
}
@@ -30,11 +30,9 @@ public final class SpringUtils implements BeanFactoryPostProcessor
* @param name
* @return Object 一个以所给名字注册的bean的实例
* @throws BeansException
- *
*/
@SuppressWarnings("unchecked")
- public static T getBean(String name) throws BeansException
- {
+ public static T getBean(String name) throws BeansException {
return (T) beanFactory.getBean(name);
}
@@ -44,10 +42,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor
* @param clz
* @return
* @throws BeansException
- *
*/
- public static T getBean(Class clz) throws BeansException
- {
+ public static T getBean(Class clz) throws BeansException {
T result = (T) beanFactory.getBean(clz);
return result;
}
@@ -58,8 +54,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor
* @param name
* @return boolean
*/
- public static boolean containsBean(String name)
- {
+ public static boolean containsBean(String name) {
return beanFactory.containsBean(name);
}
@@ -69,10 +64,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor
* @param name
* @return boolean
* @throws NoSuchBeanDefinitionException
- *
*/
- public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException
- {
+ public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
return beanFactory.isSingleton(name);
}
@@ -80,10 +73,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor
* @param name
* @return Class 注册对象的类型
* @throws NoSuchBeanDefinitionException
- *
*/
- public static Class getType(String name) throws NoSuchBeanDefinitionException
- {
+ public static Class getType(String name) throws NoSuchBeanDefinitionException {
return beanFactory.getType(name);
}
@@ -93,10 +84,8 @@ public final class SpringUtils implements BeanFactoryPostProcessor
* @param name
* @return
* @throws NoSuchBeanDefinitionException
- *
*/
- public static String[] getAliases(String name) throws NoSuchBeanDefinitionException
- {
+ public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
return beanFactory.getAliases(name);
}
@@ -107,8 +96,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor
* @return
*/
@SuppressWarnings("unchecked")
- public static T getAopProxy(T invoker)
- {
+ public static T getAopProxy(T invoker) {
return (T) AopContext.currentProxy();
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java
index 201d6f0..b245382 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/StringUtils.java
@@ -13,12 +13,15 @@ import java.util.Map;
*
* @author muyu
*/
-public class StringUtils extends org.apache.commons.lang3.StringUtils
-{
- /** 空字符串 */
+public class StringUtils extends org.apache.commons.lang3.StringUtils {
+ /**
+ * 空字符串
+ */
private static final String NULLSTR = "";
- /** 下划线 */
+ /**
+ * 下划线
+ */
private static final char SEPARATOR = '_';
/**
@@ -27,8 +30,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param value defaultValue 要判断的value
* @return value 返回值
*/
- public static T nvl(T value, T defaultValue)
- {
+ public static T nvl(T value, T defaultValue) {
return value != null ? value : defaultValue;
}
@@ -38,8 +40,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param coll 要判断的Collection
* @return true：为空 false：非空
*/
- public static boolean isEmpty(Collection coll)
- {
+ public static boolean isEmpty(Collection coll) {
return isNull(coll) || coll.isEmpty();
}
@@ -49,8 +50,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param coll 要判断的Collection
* @return true：非空 false：空
*/
- public static boolean isNotEmpty(Collection coll)
- {
+ public static boolean isNotEmpty(Collection coll) {
return !isEmpty(coll);
}
@@ -58,10 +58,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* * 判断一个对象数组是否为空
*
* @param objects 要判断的对象数组
- ** @return true：为空 false：非空
+ * * @return true：为空 false：非空
*/
- public static boolean isEmpty(Object[] objects)
- {
+ public static boolean isEmpty(Object[] objects) {
return isNull(objects) || (objects.length == 0);
}
@@ -71,8 +70,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param objects 要判断的对象数组
* @return true：非空 false：空
*/
- public static boolean isNotEmpty(Object[] objects)
- {
+ public static boolean isNotEmpty(Object[] objects) {
return !isEmpty(objects);
}
@@ -82,8 +80,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param map 要判断的Map
* @return true：为空 false：非空
*/
- public static boolean isEmpty(Map map)
- {
+ public static boolean isEmpty(Map map) {
return isNull(map) || map.isEmpty();
}
@@ -93,8 +90,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param map 要判断的Map
* @return true：非空 false：空
*/
- public static boolean isNotEmpty(Map map)
- {
+ public static boolean isNotEmpty(Map map) {
return !isEmpty(map);
}
@@ -104,8 +100,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param str String
* @return true：为空 false：非空
*/
- public static boolean isEmpty(String str)
- {
+ public static boolean isEmpty(String str) {
return isNull(str) || NULLSTR.equals(str.trim());
}
@@ -115,8 +110,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param str String
* @return true：非空串 false：空串
*/
- public static boolean isNotEmpty(String str)
- {
+ public static boolean isNotEmpty(String str) {
return !isEmpty(str);
}
@@ -126,8 +120,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param object Object
* @return true：为空 false：非空
*/
- public static boolean isNull(Object object)
- {
+ public static boolean isNull(Object object) {
return object == null;
}
@@ -137,8 +130,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param object Object
* @return true：非空 false：空
*/
- public static boolean isNotNull(Object object)
- {
+ public static boolean isNotNull(Object object) {
return !isNull(object);
}
@@ -148,44 +140,37 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param object 对象
* @return true：是数组 false：不是数组
*/
- public static boolean isArray(Object object)
- {
+ public static boolean isArray(Object object) {
return isNotNull(object) && object.getClass().isArray();
}
/**
* 去空格
*/
- public static String trim(String str)
- {
+ public static String trim(String str) {
return (str == null ? "" : str.trim());
}
/**
* 截取字符串
*
- * @param str 字符串
+ * @param str 字符串
* @param start 开始
* @return 结果
*/
- public static String substring(final String str, int start)
- {
- if (str == null)
- {
+ public static String substring(final String str, int start) {
+ if (str == null) {
return NULLSTR;
}
- if (start < 0)
- {
+ if (start < 0) {
start = str.length() + start;
}
- if (start < 0)
- {
+ if (start < 0) {
start = 0;
}
- if (start > str.length())
- {
+ if (start > str.length()) {
return NULLSTR;
}
@@ -195,43 +180,35 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* 截取字符串
*
- * @param str 字符串
+ * @param str 字符串
* @param start 开始
- * @param end 结束
+ * @param end 结束
* @return 结果
*/
- public static String substring(final String str, int start, int end)
- {
- if (str == null)
- {
+ public static String substring(final String str, int start, int end) {
+ if (str == null) {
return NULLSTR;
}
- if (end < 0)
- {
+ if (end < 0) {
end = str.length() + end;
}
- if (start < 0)
- {
+ if (start < 0) {
start = str.length() + start;
}
- if (end > str.length())
- {
+ if (end > str.length()) {
end = str.length();
}
- if (start > end)
- {
+ if (start > end) {
return NULLSTR;
}
- if (start < 0)
- {
+ if (start < 0) {
start = 0;
}
- if (end < 0)
- {
+ if (end < 0) {
end = 0;
}
@@ -244,18 +221,14 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param str 要判断的value
* @return 结果
*/
- public static boolean hasText(String str)
- {
+ public static boolean hasText(String str) {
return (str != null && !str.isEmpty() && containsText(str));
}
- private static boolean containsText(CharSequence str)
- {
+ private static boolean containsText(CharSequence str) {
int strLen = str.length();
- for (int i = 0; i < strLen; i++)
- {
- if (!Character.isWhitespace(str.charAt(i)))
- {
+ for (int i = 0; i < strLen; i++) {
+ if (!Character.isWhitespace(str.charAt(i))) {
return true;
}
}
@@ -272,13 +245,11 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* 转义\： 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);
@@ -290,8 +261,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param link 链接
* @return 结果
*/
- public static boolean ishttp(String link)
- {
+ public static boolean ishttp(String link) {
return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS);
}
@@ -299,21 +269,15 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
*
* @param collection 给定的集合
- * @param array 给定的数组
+ * @param array 给定的数组
* @return boolean 结果
*/
- public static boolean containsAny(Collection collection, String... array)
- {
- if (isEmpty(collection) || isEmpty(array))
- {
+ public static boolean containsAny(Collection collection, String... array) {
+ if (isEmpty(collection) || isEmpty(array)) {
return false;
- }
- else
- {
- for (String str : array)
- {
- if (collection.contains(str))
- {
+ } else {
+ for (String str : array) {
+ if (collection.contains(str)) {
return true;
}
}
@@ -324,10 +288,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* 驼峰转下划线命名
*/
- public static String toUnderScoreCase(String str)
- {
- if (str == null)
- {
+ public static String toUnderScoreCase(String str) {
+ if (str == null) {
return null;
}
StringBuilder sb = new StringBuilder();
@@ -337,31 +299,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));
@@ -373,18 +327,14 @@ 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;
}
}
@@ -398,27 +348,21 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* @param name 转换前的下划线大写方式命名的字符串
* @return 转换后的驼峰式命名的字符串
*/
- public static String convertToCamelCase(String name)
- {
+ public static String convertToCamelCase(String name) {
StringBuilder result = new StringBuilder();
// 快速检查
- if (name == null || name.isEmpty())
- {
+ if (name == null || name.isEmpty()) {
// 没必要转换
return "";
- }
- else if (!name.contains("_"))
- {
+ } else if (!name.contains("_")) {
// 不含下划线，仅将首字母大写
return name.substring(0, 1).toUpperCase() + name.substring(1);
}
// 用下划线将原始字符串分割
String[] camels = name.split("_");
- for (String camel : camels)
- {
+ for (String camel : camels) {
// 跳过原始字符串中开头、结尾的下换线或双重下划线
- if (camel.isEmpty())
- {
+ if (camel.isEmpty()) {
continue;
}
// 首字母大写
@@ -432,34 +376,25 @@ 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;
}
- if (s.indexOf(SEPARATOR) == -1)
- {
+ if (s.indexOf(SEPARATOR) == -1) {
return s;
}
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);
}
}
@@ -469,20 +404,16 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
/**
* 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
*
- * @param str 指定字符串
+ * @param str 指定字符串
* @param strs 需要检查的字符串数组
* @return 是否匹配
*/
- public static boolean matches(String str, List strs)
- {
- if (isEmpty(str) || isEmpty(strs))
- {
+ public static boolean matches(String str, List strs) {
+ if (isEmpty(str) || isEmpty(strs)) {
return false;
}
- for (String pattern : strs)
- {
- if (isMatch(pattern, str))
- {
+ for (String pattern : strs) {
+ if (isMatch(pattern, str)) {
return true;
}
}
@@ -496,64 +427,52 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
* ** 表示任意层路径;
*
* @param pattern 匹配规则
- * @param url 需要匹配的url
+ * @param url 需要匹配的url
* @return
*/
- public static boolean isMatch(String pattern, String url)
- {
+ public static boolean isMatch(String pattern, String url) {
AntPathMatcher matcher = new AntPathMatcher();
return matcher.match(pattern, url);
}
@SuppressWarnings("unchecked")
- public static T cast(Object obj)
- {
+ public static T cast(Object obj) {
return (T) obj;
}
/**
* 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。
*
- * @param num 数字对象
+ * @param num 数字对象
* @param size 字符串指定长度
* @return 返回数字的字符串格式，该字符串为指定长度。
*/
- public static final String padl(final Number num, final int size)
- {
+ public static final String padl(final Number num, final int size) {
return padl(num.toString(), size, '0');
}
/**
* 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。
*
- * @param s 原始字符串
+ * @param s 原始字符串
* @param size 字符串指定长度
- * @param c 用于补齐的字符
+ * @param c 用于补齐的字符
* @return 返回指定长度的字符串，由原字符串左补齐或截取得到。
*/
- public static final String padl(final String s, final int size, final char c)
- {
+ public static final String padl(final String s, final int size, final char c) {
final StringBuilder sb = new StringBuilder(size);
- if (s != null)
- {
+ if (s != null) {
final int len = s.length();
- if (s.length() <= size)
- {
- for (int i = size - len; i > 0; i--)
- {
+ if (s.length() <= size) {
+ for (int i = size - len; i > 0; i--) {
sb.append(c);
}
sb.append(s);
- }
- else
- {
+ } else {
return s.substring(len - size, len);
}
- }
- else
- {
- for (int i = size; i > 0; i--)
- {
+ } else {
+ for (int i = size; i > 0; i--) {
sb.append(c);
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java
index 6761fde..952a88a 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanUtils.java
@@ -11,31 +11,32 @@ import java.util.regex.Pattern;
*
* @author muyu
*/
-public class BeanUtils extends org.springframework.beans.BeanUtils
-{
- /** Bean方法名中属性名开始的下标 */
+public class BeanUtils extends org.springframework.beans.BeanUtils {
+ /**
+ * Bean方法名中属性名开始的下标
+ */
private static final int BEAN_METHOD_PROP_INDEX = 3;
- /** * 匹配getter方法的正则表达式 */
+ /**
+ * 匹配getter方法的正则表达式
+ */
private static final Pattern GET_PATTERN = Pattern.compile("get(\\p{javaUpperCase}\\w*)");
- /** * 匹配setter方法的正则表达式 */
+ /**
+ * 匹配setter方法的正则表达式
+ */
private static final Pattern SET_PATTERN = Pattern.compile("set(\\p{javaUpperCase}\\w*)");
/**
* Bean属性复制工具方法。
*
* @param dest 目标对象
- * @param src 源对象
+ * @param src 源对象
*/
- public static void copyBeanProp(Object dest, Object src)
- {
- try
- {
+ public static void copyBeanProp(Object dest, Object src) {
+ try {
copyProperties(src, dest);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
e.printStackTrace();
}
}
@@ -46,8 +47,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
* @param obj 对象
* @return 对象的setter方法列表
*/
- public static List getSetterMethods(Object obj)
- {
+ public static List getSetterMethods(Object obj) {
// setter方法列表
List setterMethods = new ArrayList();
@@ -56,11 +56,9 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
// 查找setter方法
- for (Method method : methods)
- {
+ for (Method method : methods) {
Matcher m = SET_PATTERN.matcher(method.getName());
- if (m.matches() && (method.getParameterTypes().length == 1))
- {
+ if (m.matches() && (method.getParameterTypes().length == 1)) {
setterMethods.add(method);
}
}
@@ -75,18 +73,15 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
* @return 对象的getter方法列表
*/
- public static List getGetterMethods(Object obj)
- {
+ public static List getGetterMethods(Object obj) {
// getter方法列表
List getterMethods = new ArrayList();
// 获取所有方法
Method[] methods = obj.getClass().getMethods();
// 查找getter方法
- for (Method method : methods)
- {
+ for (Method method : methods) {
Matcher m = GET_PATTERN.matcher(method.getName());
- if (m.matches() && (method.getParameterTypes().length == 0))
- {
+ if (m.matches() && (method.getParameterTypes().length == 0)) {
getterMethods.add(method);
}
}
@@ -103,8 +98,7 @@ public class BeanUtils extends org.springframework.beans.BeanUtils
* @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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java
index 6f4f840..790ec23 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/bean/BeanValidators.java
@@ -10,14 +10,11 @@ import java.util.Set;
*
* @author muyu
*/
-public class BeanValidators
-{
+public class BeanValidators {
public static void validateWithException(Validator validator, Object object, Class... groups)
- throws ConstraintViolationException
- {
+ throws ConstraintViolationException {
Set> constraintViolations = validator.validate(object, groups);
- if (!constraintViolations.isEmpty())
- {
+ if (!constraintViolations.isEmpty()) {
throw new ConstraintViolationException(constraintViolations);
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java
index 8d9da11..70571ae 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileTypeUtils.java
@@ -12,8 +12,7 @@ import java.util.Objects;
*
* @author muyu
*/
-public class FileTypeUtils
-{
+public class FileTypeUtils {
/**
* 获取文件类型
*
@@ -22,10 +21,8 @@ public class FileTypeUtils
* @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());
@@ -39,11 +36,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();
@@ -55,11 +50,9 @@ public class FileTypeUtils
* @param file 表单文件
* @return 后缀名
*/
- public static final String getExtension(MultipartFile file)
- {
+ public static final String getExtension(MultipartFile file) {
String extension = FilenameUtils.getExtension(file.getOriginalFilename());
- if (StringUtils.isEmpty(extension))
- {
+ if (StringUtils.isEmpty(extension)) {
extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
}
return extension;
@@ -71,24 +64,16 @@ 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))
- {
+ && ((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))
- {
+ } else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) {
strFileExtendName = "JPG";
- }
- else if ((photoByte[0] == 66) && (photoByte[1] == 77))
- {
+ } else if ((photoByte[0] == 66) && (photoByte[1] == 77)) {
strFileExtendName = "BMP";
- }
- else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71))
- {
+ } else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) {
strFileExtendName = "PNG";
}
return strFileExtendName;
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java
index 3625043..4da1cc2 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/FileUtils.java
@@ -14,12 +14,15 @@ import java.nio.charset.StandardCharsets;
*
* @author muyu
*/
-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]+";
@@ -28,52 +31,36 @@ public class FileUtils
* 输出指定文件的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)
- {
+ } 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,13 +73,11 @@ 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()) {
flag = file.delete();
}
return flag;
@@ -104,8 +89,7 @@ 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);
}
@@ -115,11 +99,9 @@ public class FileUtils
* @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, "..")) {
return false;
}
// 判断是否在允许下载的文件规则内
@@ -129,32 +111,24 @@ 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("MSIE")) {
// IE浏览器
filename = URLEncoder.encode(filename, "utf-8");
filename = filename.replace("+", " ");
- }
- else if (agent.contains("Firefox"))
- {
+ } else if (agent.contains("Firefox")) {
// 火狐浏览器
filename = new String(fileName.getBytes(), "ISO8859-1");
- }
- else if (agent.contains("Chrome"))
- {
+ } else if (agent.contains("Chrome")) {
// google浏览器
filename = URLEncoder.encode(filename, "utf-8");
- }
- else
- {
+ } else {
// 其它浏览器
filename = URLEncoder.encode(filename, "utf-8");
}
@@ -167,30 +141,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;
@@ -207,20 +175,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();
@@ -241,8 +207,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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java
index 859f65d..5a2ffb2 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/ImageUtils.java
@@ -15,38 +15,27 @@ import java.util.Arrays;
*
* @author muyu
*/
-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)
- {
+ } 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)
- {
+ } catch (Exception e) {
log.error("获取图片异常 {}", e);
}
return null;
@@ -58,11 +47,9 @@ public class ImageUtils
* @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();
@@ -71,14 +58,10 @@ public class ImageUtils
urlConnection.setDoInput(true);
in = urlConnection.getInputStream();
return IOUtils.toByteArray(in);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("访问文件异常 {}", e);
return null;
- }
- finally
- {
+ } finally {
IOUtils.closeQuietly(in);
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/MimeTypeUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/MimeTypeUtils.java
index 37de4d1..6859277 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/MimeTypeUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/file/MimeTypeUtils.java
@@ -5,8 +5,7 @@ package com.muyu.common.core.utils.file;
*
* @author muyu
*/
-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/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java
index 65c437d..d9bff69 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/EscapeUtil.java
@@ -7,17 +7,14 @@ import com.muyu.common.core.utils.StringUtils;
*
* @author muyu
*/
-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 {
+ for (int i = 0; i < 64; i++) {
+ TEXT[i] = new char[]{(char) i};
}
// special HTML characters
@@ -34,8 +31,7 @@ public class EscapeUtil
* @param text 被转义的文本
* @return 转义后的文本
*/
- public static String escape(String text)
- {
+ public static String escape(String text) {
return encode(text);
}
@@ -45,8 +41,7 @@ public class EscapeUtil
* @param content 包含转义符的HTML内容
* @return 转换后的字符串
*/
- public static String unescape(String content)
- {
+ public static String unescape(String content) {
return decode(content);
}
@@ -56,8 +51,7 @@ public class EscapeUtil
* @param content 文本
* @return 清除标签后的文本
*/
- public static String clean(String content)
- {
+ public static String clean(String content) {
return new HTMLFilter().filter(content);
}
@@ -67,32 +61,24 @@ public class EscapeUtil
* @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");
}
@@ -108,43 +94,31 @@ public class EscapeUtil
* @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
- {
+ } else {
tmp.append(content.substring(lastPos, pos));
lastPos = pos;
}
@@ -153,8 +127,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 = "ipt>alert(\"XSS\")ipt>";
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java
index 9ac19bd..57cede0 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java
@@ -11,8 +11,7 @@ import java.util.regex.Pattern;
*
* @author muyu
*/
-public final class HTMLFilter
-{
+public final class HTMLFilter {
/**
* regex flag union representing /si modifiers in php
**/
@@ -96,8 +95,7 @@ public final class HTMLFilter
/**
* Default constructor.
*/
- public HTMLFilter()
- {
+ public HTMLFilter() {
vAllowed = new HashMap<>();
final ArrayList a_atts = new ArrayList<>();
@@ -118,13 +116,13 @@ public final class HTMLFilter
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" };
+ 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;
@@ -136,8 +134,7 @@ public final class HTMLFilter
* @param conf map containing configuration. keys match field names.
*/
@SuppressWarnings("unchecked")
- public HTMLFilter(final Map conf)
- {
+ public HTMLFilter(final Map conf) {
assert conf.containsKey("vAllowed") : "configuration requires vAllowed";
assert conf.containsKey("vSelfClosingTags") : "configuration requires vSelfClosingTags";
@@ -161,20 +158,17 @@ public final class HTMLFilter
alwaysMakeTags = conf.containsKey("alwaysMakeTags") ? (Boolean) conf.get("alwaysMakeTags") : true;
}
- private void reset()
- {
+ private void reset() {
vTagCounts.clear();
}
// ---------------------------------------------------------------
// my versions of some PHP library functions
- public static String chr(final int decimal)
- {
+ public static String chr(final int decimal) {
return String.valueOf((char) decimal);
}
- public static String htmlSpecialChars(final String s)
- {
+ public static String htmlSpecialChars(final String s) {
String result = s;
result = regexReplace(P_AMP, "&", result);
result = regexReplace(P_QUOTE, """, result);
@@ -191,8 +185,7 @@ public final class HTMLFilter
* @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)
- {
+ public String filter(final String input) {
reset();
String s = input;
@@ -209,22 +202,18 @@ public final class HTMLFilter
return s;
}
- public boolean isAlwaysMakeTags()
- {
+ public boolean isAlwaysMakeTags() {
return alwaysMakeTags;
}
- public boolean isStripComments()
- {
+ public boolean isStripComments() {
return stripComment;
}
- private String escapeComments(final String s)
- {
+ private String escapeComments(final String s) {
final Matcher m = P_COMMENTS.matcher(s);
final StringBuffer buf = new StringBuffer();
- if (m.find())
- {
+ if (m.find()) {
final String match = m.group(1); // (.*?)
m.appendReplacement(buf, Matcher.quoteReplacement(""));
}
@@ -233,10 +222,8 @@ public final class HTMLFilter
return buf.toString();
}
- private String balanceHTML(String s)
- {
- if (alwaysMakeTags)
- {
+ private String balanceHTML(String s) {
+ if (alwaysMakeTags) {
//
// try and form html
//
@@ -245,9 +232,7 @@ public final class HTMLFilter
s = regexReplace(P_BODY_TO_END, "<$1>", s);
s = regexReplace(P_XML_CONTENT, "$1<$2", s);
- }
- else
- {
+ } else {
//
// escape stray brackets
//
@@ -265,13 +250,11 @@ public final class HTMLFilter
return s;
}
- private String checkTags(String s)
- {
+ private String checkTags(String s) {
Matcher m = P_TAGS.matcher(s);
final StringBuffer buf = new StringBuffer();
- while (m.find())
- {
+ while (m.find()) {
String replaceStr = m.group(1);
replaceStr = processTag(replaceStr);
m.appendReplacement(buf, Matcher.quoteReplacement(replaceStr));
@@ -281,10 +264,8 @@ public final class HTMLFilter
// 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++)
- {
+ for (String key : vTagCounts.keySet()) {
+ for (int ii = 0; ii < vTagCounts.get(key); ii++) {
sBuilder.append("");
}
}
@@ -293,18 +274,14 @@ public final class HTMLFilter
return s;
}
- private String processRemoveBlanks(final String s)
- {
+ private String processRemoveBlanks(final String s) {
String result = s;
- for (String tag : vRemoveBlanks)
- {
- if (!P_REMOVE_PAIR_BLANKS.containsKey(tag))
- {
+ 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))
- {
+ 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);
@@ -313,25 +290,19 @@ public final class HTMLFilter
return result;
}
- private static String regexReplace(final Pattern regex_pattern, final String replacement, final String s)
- {
+ 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)
- {
+ private String processTag(final String s) {
// ending tags
Matcher m = P_END_TAG.matcher(s);
- if (m.find())
- {
+ if (m.find()) {
final String name = m.group(1).toLowerCase();
- if (allowed(name))
- {
- if (!inArray(name, vSelfClosingTags))
- {
- if (vTagCounts.containsKey(name))
- {
+ if (allowed(name)) {
+ if (!inArray(name, vSelfClosingTags)) {
+ if (vTagCounts.containsKey(name)) {
vTagCounts.put(name, vTagCounts.get(name) - 1);
return "";
}
@@ -341,35 +312,30 @@ public final class HTMLFilter
// starting tags
m = P_START_TAG.matcher(s);
- if (m.find())
- {
+ 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))
- {
+ 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())
- {
+ while (m2.find()) {
paramNames.add(m2.group(1)); // ([a-z0-9]+)
paramValues.add(m2.group(3)); // (.*?)
}
- while (m3.find())
- {
+ 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++)
- {
+ for (int ii = 0; ii < paramNames.size(); ii++) {
paramName = paramNames.get(ii).toLowerCase();
paramValue = paramValues.get(ii);
@@ -377,72 +343,55 @@ public final class HTMLFilter
// debug( "paramValue='" + paramValue + "'" );
// debug( "allowed? " + vAllowed.get( name ).contains( paramName ) );
- if (allowedAttribute(name, paramName))
- {
- if (inArray(paramName, vProtocolAtts))
- {
+ if (allowedAttribute(name, paramName)) {
+ if (inArray(paramName, vProtocolAtts)) {
paramValue = processParamProtocol(paramValue);
}
params.append(' ').append(paramName).append("=\\\"").append(paramValue).append("\\\"");
}
}
- if (inArray(name, vSelfClosingTags))
- {
+ if (inArray(name, vSelfClosingTags)) {
ending = " /";
}
- if (inArray(name, vNeedClosingTags))
- {
+ if (inArray(name, vNeedClosingTags)) {
ending = "";
}
- if (ending == null || ending.length() < 1)
- {
- if (vTagCounts.containsKey(name))
- {
+ if (ending == null || ending.length() < 1) {
+ if (vTagCounts.containsKey(name)) {
vTagCounts.put(name, vTagCounts.get(name) + 1);
- }
- else
- {
+ } else {
vTagCounts.put(name, 1);
}
- }
- else
- {
+ } else {
ending = " /";
}
return "<" + name + params + ending + ">";
- }
- else
- {
+ } else {
return "";
}
}
// comments
m = P_COMMENT.matcher(s);
- if (!stripComment && m.find())
- {
+ if (!stripComment && m.find()) {
return "<" + m.group() + ">";
}
return "";
}
- private String processParamProtocol(String s)
- {
+ private String processParamProtocol(String s) {
s = decodeEntities(s);
final Matcher m = P_PROTOCOL.matcher(s);
- if (m.find())
- {
+ if (m.find()) {
final String protocol = m.group(1);
- if (!inArray(protocol, vAllowedProtocols))
- {
+ if (!inArray(protocol, vAllowedProtocols)) {
// bad protocol, turn into local anchor link instead
s = "#" + s.substring(protocol.length() + 1);
- if (s.startsWith("#//"))
- {
+ if (s.startsWith("#//")) {
s = "#" + s.substring(3);
}
}
@@ -451,13 +400,11 @@ public final class HTMLFilter
return s;
}
- private String decodeEntities(String s)
- {
+ private String decodeEntities(String s) {
StringBuffer buf = new StringBuffer();
Matcher m = P_ENTITY.matcher(s);
- while (m.find())
- {
+ while (m.find()) {
final String match = m.group(1);
final int decimal = Integer.decode(match).intValue();
m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
@@ -467,8 +414,7 @@ public final class HTMLFilter
buf = new StringBuffer();
m = P_ENTITY_UNICODE.matcher(s);
- while (m.find())
- {
+ while (m.find()) {
final String match = m.group(1);
final int decimal = Integer.valueOf(match, 16).intValue();
m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
@@ -478,8 +424,7 @@ public final class HTMLFilter
buf = new StringBuffer();
m = P_ENCODE.matcher(s);
- while (m.find())
- {
+ while (m.find()) {
final String match = m.group(1);
final int decimal = Integer.valueOf(match, 16).intValue();
m.appendReplacement(buf, Matcher.quoteReplacement(chr(decimal)));
@@ -491,14 +436,12 @@ public final class HTMLFilter
return s;
}
- private String validateEntities(final String 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())
- {
+ while (m.find()) {
final String one = m.group(1); // ([^&;]*)
final String two = m.group(2); // (?=(;|&|$))
m.appendReplacement(buf, Matcher.quoteReplacement(checkEntity(one, two)));
@@ -508,14 +451,11 @@ public final class HTMLFilter
return encodeQuotes(buf.toString());
}
- private String encodeQuotes(final String s)
- {
- if (encodeQuotes)
- {
+ private String encodeQuotes(final String s) {
+ if (encodeQuotes) {
StringBuffer buf = new StringBuffer();
Matcher m = P_VALID_QUOTES.matcher(s);
- while (m.find())
- {
+ while (m.find()) {
final String one = m.group(1); // (>|^)
final String two = m.group(2); // ([^<]+?)
final String three = m.group(3); // (<|$)
@@ -524,43 +464,34 @@ public final class HTMLFilter
}
m.appendTail(buf);
return buf.toString();
- }
- else
- {
+ } else {
return s;
}
}
- private String checkEntity(final String preamble, final String term)
- {
+ private String checkEntity(final String preamble, final String term) {
return ";".equals(term) && isValidEntity(preamble) ? '&' + preamble : "&" + preamble;
}
- private boolean isValidEntity(final String entity)
- {
+ 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))
- {
+ 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)
- {
+ private boolean allowed(final String name) {
return (vAllowed.isEmpty() || vAllowed.containsKey(name)) && !inArray(name, vDisallowed);
}
- private boolean allowedAttribute(final String name, final String paramName)
- {
+ private boolean allowedAttribute(final String name, final String paramName) {
return allowed(name) && (vAllowed.isEmpty() || vAllowed.get(name).contains(paramName));
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java
index 2d57ff3..818dba2 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java
@@ -12,8 +12,7 @@ import java.net.UnknownHostException;
*
* @author muyu
*/
-public class IpUtils
-{
+public class IpUtils {
public final static String REGX_0_255 = "(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]\\d|\\d)";
// 匹配 ip
public final static String REGX_IP = "((" + REGX_0_255 + "\\.){3}" + REGX_0_255 + ")";
@@ -26,8 +25,7 @@ public class IpUtils
*
* @return IP地址
*/
- public static String getIpAddr()
- {
+ public static String getIpAddr() {
return getIpAddr(ServletUtils.getRequest());
}
@@ -37,32 +35,25 @@ public class IpUtils
* @param request 请求对象
* @return IP地址
*/
- public static String getIpAddr(HttpServletRequest request)
- {
- if (request == null)
- {
+ 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))
- {
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(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))
- {
+ 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))
- {
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("X-Real-IP");
}
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip))
- {
+ if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
@@ -75,8 +66,7 @@ public class IpUtils
* @param ip IP地址
* @return 结果
*/
- public static boolean internalIp(String ip)
- {
+ public static boolean internalIp(String ip) {
byte[] addr = textToNumericFormatV4(ip);
return internalIp(addr) || "127.0.0.1".equals(ip);
}
@@ -87,10 +77,8 @@ public class IpUtils
* @param addr byte地址
* @return 结果
*/
- private static boolean internalIp(byte[] addr)
- {
- if (StringUtils.isNull(addr) || addr.length < 2)
- {
+ private static boolean internalIp(byte[] addr) {
+ if (StringUtils.isNull(addr) || addr.length < 2) {
return true;
}
final byte b0 = addr[0];
@@ -104,18 +92,15 @@ public class IpUtils
// 192.168.x.x/16
final byte SECTION_5 = (byte) 0xC0;
final byte SECTION_6 = (byte) 0xA8;
- switch (b0)
- {
+ switch (b0) {
case SECTION_1:
return true;
case SECTION_2:
- if (b1 >= SECTION_3 && b1 <= SECTION_4)
- {
+ if (b1 >= SECTION_3 && b1 <= SECTION_4) {
return true;
}
case SECTION_5:
- switch (b1)
- {
+ switch (b1) {
case SECTION_6:
return true;
}
@@ -130,25 +115,20 @@ public class IpUtils
* @param text IPv4地址
* @return byte 字节
*/
- public static byte[] textToNumericFormatV4(String text)
- {
- if (text.length() == 0)
- {
+ public static byte[] textToNumericFormatV4(String text) {
+ if (text.length() == 0) {
return null;
}
byte[] bytes = new byte[4];
String[] elements = text.split("\\.", -1);
- try
- {
+ try {
long l;
int i;
- switch (elements.length)
- {
+ switch (elements.length) {
case 1:
l = Long.parseLong(elements[0]);
- if ((l < 0L) || (l > 4294967295L))
- {
+ if ((l < 0L) || (l > 4294967295L)) {
return null;
}
bytes[0] = (byte) (int) (l >> 24 & 0xFF);
@@ -158,14 +138,12 @@ public class IpUtils
break;
case 2:
l = Integer.parseInt(elements[0]);
- if ((l < 0L) || (l > 255L))
- {
+ if ((l < 0L) || (l > 255L)) {
return null;
}
bytes[0] = (byte) (int) (l & 0xFF);
l = Integer.parseInt(elements[1]);
- if ((l < 0L) || (l > 16777215L))
- {
+ if ((l < 0L) || (l > 16777215L)) {
return null;
}
bytes[1] = (byte) (int) (l >> 16 & 0xFF);
@@ -173,29 +151,24 @@ public class IpUtils
bytes[3] = (byte) (int) (l & 0xFF);
break;
case 3:
- for (i = 0; i < 2; ++i)
- {
+ for (i = 0; i < 2; ++i) {
l = Integer.parseInt(elements[i]);
- if ((l < 0L) || (l > 255L))
- {
+ if ((l < 0L) || (l > 255L)) {
return null;
}
bytes[i] = (byte) (int) (l & 0xFF);
}
l = Integer.parseInt(elements[2]);
- if ((l < 0L) || (l > 65535L))
- {
+ 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)
- {
+ for (i = 0; i < 4; ++i) {
l = Integer.parseInt(elements[i]);
- if ((l < 0L) || (l > 255L))
- {
+ if ((l < 0L) || (l > 255L)) {
return null;
}
bytes[i] = (byte) (int) (l & 0xFF);
@@ -204,9 +177,7 @@ public class IpUtils
default:
return null;
}
- }
- catch (NumberFormatException e)
- {
+ } catch (NumberFormatException e) {
return null;
}
return bytes;
@@ -217,14 +188,10 @@ public class IpUtils
*
* @return 本地IP地址
*/
- public static String getHostIp()
- {
- try
- {
+ public static String getHostIp() {
+ try {
return InetAddress.getLocalHost().getHostAddress();
- }
- catch (UnknownHostException e)
- {
+ } catch (UnknownHostException e) {
}
return "127.0.0.1";
}
@@ -234,14 +201,10 @@ public class IpUtils
*
* @return 本地主机名
*/
- public static String getHostName()
- {
- try
- {
+ public static String getHostName() {
+ try {
return InetAddress.getLocalHost().getHostName();
- }
- catch (UnknownHostException e)
- {
+ } catch (UnknownHostException e) {
}
return "未知";
}
@@ -252,16 +215,12 @@ public class IpUtils
* @param ip 获得的IP地址
* @return 第一个非unknown IP地址
*/
- public static String getMultistageReverseProxyIp(String ip)
- {
+ public static String getMultistageReverseProxyIp(String ip) {
// 多级反向代理检测
- if (ip != null && ip.indexOf(",") > 0)
- {
+ if (ip != null && ip.indexOf(",") > 0) {
final String[] ips = ip.trim().split(",");
- for (String subIp : ips)
- {
- if (false == isUnknown(subIp))
- {
+ for (String subIp : ips) {
+ if (false == isUnknown(subIp)) {
ip = subIp;
break;
}
@@ -276,39 +235,33 @@ public class IpUtils
* @param checkString 被检测的字符串
* @return 是否未知
*/
- public static boolean isUnknown(String checkString)
- {
+ public static boolean isUnknown(String checkString) {
return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString);
}
/**
* 是否为IP
*/
- public static boolean isIP(String ip)
- {
+ public static boolean isIP(String ip) {
return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP);
}
/**
* 是否为IP，或 *为间隔的通配符地址
*/
- public static boolean isIpWildCard(String ip)
- {
+ public static boolean isIpWildCard(String ip) {
return StringUtils.isNotBlank(ip) && ip.matches(REGX_IP_WILDCARD);
}
/**
* 检测参数是否在ip通配符里
*/
- public static boolean ipIsInWildCardNoCheck(String ipWildCard, String ip)
- {
+ public static boolean ipIsInWildCardNoCheck(String ipWildCard, String ip) {
String[] s1 = ipWildCard.split("\\.");
String[] s2 = ip.split("\\.");
boolean isMatchedSeg = true;
- for (int i = 0; i < s1.length && !s1[i].equals("*"); i++)
- {
- if (!s1[i].equals(s2[i]))
- {
+ for (int i = 0; i < s1.length && !s1[i].equals("*"); i++) {
+ if (!s1[i].equals(s2[i])) {
isMatchedSeg = false;
break;
}
@@ -319,29 +272,25 @@ public class IpUtils
/**
* 是否为特定格式如:“10.10.10.1-10.10.10.99”的ip段字符串
*/
- public static boolean isIPSegment(String ipSeg)
- {
+ public static boolean isIPSegment(String ipSeg) {
return StringUtils.isNotBlank(ipSeg) && ipSeg.matches(REGX_IP_SEG);
}
/**
* 判断ip是否在指定网段中
*/
- public static boolean ipIsInNetNoCheck(String iparea, String ip)
- {
+ public static boolean ipIsInNetNoCheck(String iparea, String ip) {
int idx = iparea.indexOf('-');
String[] sips = iparea.substring(0, idx).split("\\.");
String[] sipe = iparea.substring(idx + 1).split("\\.");
String[] sipt = ip.split("\\.");
long ips = 0L, ipe = 0L, ipt = 0L;
- for (int i = 0; i < 4; ++i)
- {
+ for (int i = 0; i < 4; ++i) {
ips = ips << 8 | Integer.parseInt(sips[i]);
ipe = ipe << 8 | Integer.parseInt(sipe[i]);
ipt = ipt << 8 | Integer.parseInt(sipt[i]);
}
- if (ips > ipe)
- {
+ if (ips > ipe) {
long t = ips;
ips = ipe;
ipe = t;
@@ -353,28 +302,20 @@ public class IpUtils
* 校验ip是否符合过滤串规则
*
* @param filter 过滤IP列表,支持后缀'*'通配,支持网段如:`10.10.10.1-10.10.10.99`
- * @param ip 校验IP地址
+ * @param ip 校验IP地址
* @return boolean 结果
*/
- public static boolean isMatchedIp(String filter, String ip)
- {
- if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip))
- {
+ public static boolean isMatchedIp(String filter, String ip) {
+ if (StringUtils.isEmpty(filter) || StringUtils.isEmpty(ip)) {
return false;
}
String[] ips = filter.split(";");
- for (String iStr : ips)
- {
- if (isIP(iStr) && iStr.equals(ip))
- {
+ for (String iStr : ips) {
+ if (isIP(iStr) && iStr.equals(ip)) {
return true;
- }
- else if (isIpWildCard(iStr) && ipIsInWildCardNoCheck(iStr, ip))
- {
+ } else if (isIpWildCard(iStr) && ipIsInWildCardNoCheck(iStr, ip)) {
return true;
- }
- else if (isIPSegment(iStr) && ipIsInNetNoCheck(iStr, ip))
- {
+ } else if (isIPSegment(iStr) && ipIsInNetNoCheck(iStr, ip)) {
return true;
}
}
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelHandlerAdapter.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelHandlerAdapter.java
index a7074f5..b8ea3fc 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelHandlerAdapter.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelHandlerAdapter.java
@@ -8,16 +8,14 @@ import org.apache.poi.ss.usermodel.Workbook;
*
* @author muyu
*/
-public interface ExcelHandlerAdapter
-{
+public interface ExcelHandlerAdapter {
/**
* 格式化
*
* @param value 单元格数据值
- * @param args excel注解args参数组
- * @param cell 单元格对象
- * @param wb 工作簿对象
- *
+ * @param args excel注解args参数组
+ * @param cell 单元格对象
+ * @param wb 工作簿对象
* @return 处理后的值
*/
Object format(Object value, String[] args, Cell cell, Workbook wb);
diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java
index 62e1ba7..fe6dc21 100644
--- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java
+++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/utils/poi/ExcelUtil.java
@@ -42,13 +42,12 @@ import java.util.stream.Collectors;
*
* @author muyu
*/
-public class ExcelUtil
-{
+public class ExcelUtil {
private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
- public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
+ public static final String[] FORMULA_STR = {"=", "-", "+", "@"};
/**
* Excel sheet最大行数，默认65536
@@ -145,8 +144,7 @@ public class ExcelUtil
*/
public String[] excludeFields;
- public ExcelUtil(Class clazz)
- {
+ public ExcelUtil(Class clazz) {
this.clazz = clazz;
}
@@ -156,15 +154,12 @@ public class ExcelUtil
* @param fields 列属性名 示例[单个"name"/多个"id","name"]
* @throws Exception
*/
- public void hideColumn(String... fields)
- {
+ public void hideColumn(String... fields) {
this.excludeFields = fields;
}
- public void init(List list, String sheetName, String title, Type type)
- {
- if (list == null)
- {
+ public void init(List list, String sheetName, String title, Type type) {
+ if (list == null) {
list = new ArrayList();
}
this.list = list;
@@ -180,15 +175,12 @@ public class ExcelUtil
/**
* 创建excel第一行标题
*/
- public void createTitle()
- {
- if (StringUtils.isNotEmpty(title))
- {
+ public void createTitle() {
+ if (StringUtils.isNotEmpty(title)) {
subMergedFirstRowNum++;
subMergedLastRowNum++;
int titleLastCol = this.fields.size() - 1;
- if (isSubList())
- {
+ if (isSubList()) {
titleLastCol = titleLastCol + subFields.size() - 1;
}
Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
@@ -203,16 +195,13 @@ public class ExcelUtil
/**
* 创建对象的子列表名称
*/
- public void createSubHead()
- {
- if (isSubList())
- {
+ public void createSubHead() {
+ if (isSubList()) {
subMergedFirstRowNum++;
subMergedLastRowNum++;
Row subRow = sheet.createRow(rownum);
int excelNum = 0;
- for (Object[] objects : fields)
- {
+ for (Object[] objects : fields) {
Excel attr = (Excel) objects[1];
Cell headCell1 = subRow.createCell(excelNum);
headCell1.setCellValue(attr.name());
@@ -221,8 +210,7 @@ public class ExcelUtil
}
int headFirstRow = excelNum - 1;
int headLastRow = headFirstRow + subFields.size() - 1;
- if (headLastRow > headFirstRow)
- {
+ if (headLastRow > headFirstRow) {
sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));
}
rownum++;
@@ -235,20 +223,14 @@ public class ExcelUtil
* @param is 输入流
* @return 转换后集合
*/
- public List importExcel(InputStream is)
- {
+ public List importExcel(InputStream is) {
List list = null;
- try
- {
+ try {
list = importExcel(is, 0);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("导入Excel异常{}", e.getMessage());
throw new UtilException(e.getMessage());
- }
- finally
- {
+ } finally {
IOUtils.closeQuietly(is);
}
return list;
@@ -257,12 +239,11 @@ public class ExcelUtil
/**
* 对excel表单默认第一个索引名转换成list
*
- * @param is 输入流
+ * @param is 输入流
* @param titleNum 标题占用行数
* @return 转换后集合
*/
- public List importExcel(InputStream is, int titleNum) throws Exception
- {
+ public List importExcel(InputStream is, int titleNum) throws Exception {
return importExcel(StringUtils.EMPTY, is, titleNum);
}
@@ -270,67 +251,55 @@ public class ExcelUtil
* 对excel表单指定表格索引名转换成list
*
* @param sheetName 表格索引名
- * @param titleNum 标题占用行数
- * @param is 输入流
+ * @param titleNum 标题占用行数
+ * @param is 输入流
* @return 转换后集合
*/
- public List importExcel(String sheetName, InputStream is, int titleNum) throws Exception
- {
+ 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)
- {
+ if (sheet == null) {
throw new IOException("文件sheet不存在");
}
// 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1
int rows = sheet.getLastRowNum();
- if (rows > 0)
- {
+ if (rows > 0) {
// 定义一个map用于存放excel列的序号和field.
Map cellMap = new HashMap();
// 获取表头
Row heard = sheet.getRow(titleNum);
- for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
- {
+ for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
Cell cell = heard.getCell(i);
- if (StringUtils.isNotNull(cell))
- {
+ if (StringUtils.isNotNull(cell)) {
String value = this.getCellValue(heard, i).toString();
cellMap.put(value, i);
- }
- else
- {
+ } else {
cellMap.put(null, i);
}
}
// 有数据时才处理 得到类的所有field.
List fields = this.getFields();
Map fieldsMap = new HashMap();
- for (Object[] objects : fields)
- {
+ for (Object[] objects : fields) {
Excel attr = (Excel) objects[1];
Integer column = cellMap.get(attr.name());
- if (column != null)
- {
+ if (column != null) {
fieldsMap.put(column, objects);
}
}
- for (int i = titleNum + 1; i <= rows; i++)
- {
+ for (int i = titleNum + 1; i <= rows; i++) {
// 从第2行开始取数据,默认第一行是表头.
Row row = sheet.getRow(i);
// 判断当前行是否是空行
- if (isRowEmpty(row))
- {
+ if (isRowEmpty(row)) {
continue;
}
T entity = null;
- for (Map.Entry entry : fieldsMap.entrySet())
- {
+ for (Map.Entry entry : fieldsMap.entrySet()) {
Object val = this.getCellValue(row, entry.getKey());
// 如果不存在实例则新建.
@@ -340,74 +309,45 @@ public class ExcelUtil
Excel attr = (Excel) entry.getValue()[1];
// 取得类型,并根据对象类型设置值.
Class fieldType = field.getType();
- if (String.class == fieldType)
- {
+ if (String.class == fieldType) {
String s = Convert.toStr(val);
- if (StringUtils.endsWith(s, ".0"))
- {
+ if (StringUtils.endsWith(s, ".0")) {
val = StringUtils.substringBefore(s, ".0");
- }
- else
- {
+ } else {
String dateFormat = field.getAnnotation(Excel.class).dateFormat();
- if (StringUtils.isNotEmpty(dateFormat))
- {
+ if (StringUtils.isNotEmpty(dateFormat)) {
val = parseDateToStr(dateFormat, val);
- }
- else
- {
+ } else {
val = Convert.toStr(val);
}
}
- }
- else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(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) && StringUtils.isNumeric(Convert.toStr(val)))
- {
+ } else if ((Long.TYPE == fieldType || Long.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
val = Convert.toLong(val);
- }
- else if (Double.TYPE == fieldType || Double.class == fieldType)
- {
+ } else if (Double.TYPE == fieldType || Double.class == fieldType) {
val = Convert.toDouble(val);
- }
- else if (Float.TYPE == fieldType || Float.class == fieldType)
- {
+ } else if (Float.TYPE == fieldType || Float.class == fieldType) {
val = Convert.toFloat(val);
- }
- else if (BigDecimal.class == fieldType)
- {
+ } else if (BigDecimal.class == fieldType) {
val = Convert.toBigDecimal(val);
- }
- else if (Date.class == fieldType)
- {
- if (val instanceof String)
- {
+ } else if (Date.class == fieldType) {
+ if (val instanceof String) {
val = DateUtils.parseDate(val);
- }
- else if (val instanceof Double)
- {
+ } else if (val instanceof Double) {
val = DateUtil.getJavaDate((Double) val);
}
- }
- else if (Boolean.TYPE == fieldType || Boolean.class == fieldType)
- {
+ } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
val = Convert.toBool(val, false);
}
- if (StringUtils.isNotNull(fieldType))
- {
+ if (StringUtils.isNotNull(fieldType)) {
String propertyName = field.getName();
- if (StringUtils.isNotEmpty(attr.targetAttr()))
- {
+ if (StringUtils.isNotEmpty(attr.targetAttr())) {
propertyName = field.getName() + "." + attr.targetAttr();
}
- if (StringUtils.isNotEmpty(attr.readConverterExp()))
- {
+ if (StringUtils.isNotEmpty(attr.readConverterExp())) {
val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
- }
- else if (!attr.handler().equals(ExcelHandlerAdapter.class))
- {
+ } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
val = dataFormatHandlerAdapter(val, attr, null);
}
ReflectUtils.invokeSetter(entity, propertyName, val);
@@ -422,27 +362,25 @@ public class ExcelUtil
/**
* 对list数据源将其里面的数据导入到excel表单
*
- * @param response 返回数据
- * @param list 导出数据集合
+ * @param response 返回数据
+ * @param list 导出数据集合
* @param sheetName 工作表的名称
* @return 结果
*/
- public void exportExcel(HttpServletResponse response, List list, String sheetName)
- {
+ public void exportExcel(HttpServletResponse response, List list, String sheetName) {
exportExcel(response, list, sheetName, StringUtils.EMPTY);
}
/**
* 对list数据源将其里面的数据导入到excel表单
*
- * @param response 返回数据
- * @param list 导出数据集合
+ * @param response 返回数据
+ * @param list 导出数据集合
* @param sheetName 工作表的名称
- * @param title 标题
+ * @param title 标题
* @return 结果
*/
- public void exportExcel(HttpServletResponse response, List list, String sheetName, String title)
- {
+ 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);
@@ -455,8 +393,7 @@ public class ExcelUtil
* @param sheetName 工作表的名称
* @return 结果
*/
- public void importTemplateExcel(HttpServletResponse response, String sheetName)
- {
+ public void importTemplateExcel(HttpServletResponse response, String sheetName) {
importTemplateExcel(response, sheetName, StringUtils.EMPTY);
}
@@ -464,11 +401,10 @@ public class ExcelUtil
* 对list数据源将其里面的数据导入到excel表单
*
* @param sheetName 工作表的名称
- * @param title 标题
+ * @param title 标题
* @return 结果
*/
- public void importTemplateExcel(HttpServletResponse response, String sheetName, String title)
- {
+ 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);
@@ -480,19 +416,13 @@ public class ExcelUtil
*
* @return 结果
*/
- public void exportExcel(HttpServletResponse response)
- {
- try
- {
+ public void exportExcel(HttpServletResponse response) {
+ try {
writeSheet();
wb.write(response.getOutputStream());
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("导出Excel异常{}", e.getMessage());
- }
- finally
- {
+ } finally {
IOUtils.closeQuietly(wb);
}
}
@@ -500,37 +430,29 @@ public class ExcelUtil
/**
* 创建写入数据到Sheet
*/
- public void writeSheet()
- {
+ public void writeSheet() {
// 取出一共有多少个sheet.
int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize));
- for (int index = 0; index < sheetNo; index++)
- {
+ for (int index = 0; index < sheetNo; index++) {
createSheet(sheetNo, index);
// 产生一行
Row row = sheet.createRow(rownum);
int column = 0;
// 写入各个字段的列头名称
- for (Object[] os : fields)
- {
+ for (Object[] os : fields) {
Field field = (Field) os[0];
Excel excel = (Excel) os[1];
- if (Collection.class.isAssignableFrom(field.getType()))
- {
- for (Field subField : subFields)
- {
+ if (Collection.class.isAssignableFrom(field.getType())) {
+ for (Field subField : subFields) {
Excel subExcel = subField.getAnnotation(Excel.class);
this.createHeadCell(subExcel, row, column++);
}
- }
- else
- {
+ } else {
this.createHeadCell(excel, row, column++);
}
}
- if (Type.EXPORT.equals(type))
- {
+ if (Type.EXPORT.equals(type)) {
fillExcelData(index, row);
addStatisticsRow();
}
@@ -541,55 +463,43 @@ public class ExcelUtil
* 填充excel数据
*
* @param index 序号
- * @param row 单元格行
+ * @param row 单元格行
*/
@SuppressWarnings("unchecked")
- public void fillExcelData(int index, Row row)
- {
+ public void fillExcelData(int index, Row row) {
int startNo = index * sheetSize;
int endNo = Math.min(startNo + sheetSize, list.size());
int rowNo = (1 + rownum) - startNo;
- for (int i = startNo; i < endNo; i++)
- {
+ for (int i = startNo; i < endNo; i++) {
rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
row = sheet.createRow(rowNo);
// 得到导出对象.
T vo = (T) list.get(i);
Collection subList = null;
- if (isSubList())
- {
- if (isSubListValue(vo))
- {
+ if (isSubList()) {
+ if (isSubListValue(vo)) {
subList = getListCellValue(vo);
subMergedLastRowNum = subMergedLastRowNum + subList.size();
- }
- else
- {
+ } else {
subMergedFirstRowNum++;
subMergedLastRowNum++;
}
}
int column = 0;
- for (Object[] os : fields)
- {
+ for (Object[] os : fields) {
Field field = (Field) os[0];
Excel excel = (Excel) os[1];
- if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList))
- {
+ if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList)) {
boolean subFirst = false;
- for (Object obj : subList)
- {
- if (subFirst)
- {
+ for (Object obj : subList) {
+ if (subFirst) {
rowNo++;
row = sheet.createRow(rowNo);
}
List subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class);
int subIndex = 0;
- for (Field subField : subFields)
- {
- if (subField.isAnnotationPresent(Excel.class))
- {
+ for (Field subField : subFields) {
+ if (subField.isAnnotationPresent(Excel.class)) {
subField.setAccessible(true);
Excel attr = subField.getAnnotation(Excel.class);
this.addCell(attr, row, (T) obj, subField, column + subIndex);
@@ -599,9 +509,7 @@ public class ExcelUtil
subFirst = true;
}
this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();
- }
- else
- {
+ } else {
this.addCell(excel, row, vo, field, column++);
}
}
@@ -614,8 +522,7 @@ public class ExcelUtil
* @param wb 工作薄对象
* @return 样式列表
*/
- private Map createStyles(Workbook wb)
- {
+ private Map createStyles(Workbook wb) {
// 写入各条记录,每条记录对应excel表中的一行
Map styles = new HashMap();
CellStyle style = wb.createCellStyle();
@@ -667,15 +574,12 @@ public class ExcelUtil
* @param wb 工作薄对象
* @return 自定义样式列表
*/
- private Map annotationHeaderStyles(Workbook wb, Map styles)
- {
+ private Map annotationHeaderStyles(Workbook wb, Map styles) {
Map headerStyles = new HashMap();
- for (Object[] os : fields)
- {
+ for (Object[] os : fields) {
Excel excel = (Excel) os[1];
String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor());
- if (!headerStyles.containsKey(key))
- {
+ if (!headerStyles.containsKey(key)) {
CellStyle style = wb.createCellStyle();
style.cloneStyleFrom(styles.get("data"));
style.setAlignment(HorizontalAlignment.CENTER);
@@ -700,15 +604,12 @@ public class ExcelUtil
* @param wb 工作薄对象
* @return 自定义样式列表
*/
- private Map annotationDataStyles(Workbook wb)
- {
+ private Map annotationDataStyles(Workbook wb) {
Map styles = new HashMap();
- for (Object[] os : fields)
- {
+ for (Object[] os : fields) {
Excel excel = (Excel) os[1];
String key = StringUtils.format("data_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor());
- if (!styles.containsKey(key))
- {
+ if (!styles.containsKey(key)) {
CellStyle style = wb.createCellStyle();
style.setAlignment(excel.align());
style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -736,20 +637,17 @@ public class ExcelUtil
/**
* 创建单元格
*/
- public Cell createHeadCell(Excel attr, Row row, int column)
- {
+ public Cell createHeadCell(Excel attr, Row row, int column) {
// 创建列
Cell cell = row.createCell(column);
// 写入列信息
cell.setCellValue(attr.name());
setDataValidation(attr, row, column);
cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
- if (isSubList())
- {
+ if (isSubList()) {
// 填充默认样式，防止合并单元格样式失效
sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor())));
- if (attr.needMerge())
- {
+ if (attr.needMerge()) {
sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));
}
}
@@ -760,38 +658,28 @@ public class ExcelUtil
* 设置单元格信息
*
* @param value 单元格值
- * @param attr 注解相关
- * @param cell 单元格信息
+ * @param attr 注解相关
+ * @param cell 单元格信息
*/
- public void setCellVo(Object value, Excel attr, Cell cell)
- {
- if (ColumnType.STRING == attr.cellType())
- {
+ public void setCellVo(Object value, Excel attr, Cell cell) {
+ if (ColumnType.STRING == attr.cellType()) {
String cellValue = Convert.toStr(value);
// 对于任何以表达式触发字符 =-+@开头的单元格，直接使用tab字符作为前缀，防止CSV注入。
- if (StringUtils.startsWithAny(cellValue, FORMULA_STR))
- {
+ if (StringUtils.startsWithAny(cellValue, FORMULA_STR)) {
cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0");
}
- if (value instanceof Collection && StringUtils.equals("[]", cellValue))
- {
+ if (value instanceof Collection && StringUtils.equals("[]", cellValue)) {
cellValue = StringUtils.EMPTY;
}
cell.setCellValue(StringUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix());
- }
- else if (ColumnType.NUMERIC == attr.cellType())
- {
- if (StringUtils.isNotNull(value))
- {
+ } 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())
- {
+ } 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))
- {
+ if (StringUtils.isNotEmpty(imagePath)) {
byte[] data = ImageUtils.getImage(imagePath);
getDrawingPatriarch(cell.getSheet()).createPicture(anchor,
cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
@@ -802,10 +690,8 @@ public class ExcelUtil
/**
* 获取画布
*/
- public static Drawing getDrawingPatriarch(Sheet sheet)
- {
- if (sheet.getDrawingPatriarch() == null)
- {
+ public static Drawing getDrawingPatriarch(Sheet sheet) {
+ if (sheet.getDrawingPatriarch() == null) {
sheet.createDrawingPatriarch();
}
return sheet.getDrawingPatriarch();
@@ -814,15 +700,11 @@ public class ExcelUtil
/**
* 获取图片类型,设置图片插入类型
*/
- public int getImageType(byte[] value)
- {
+ public int getImageType(byte[] value) {
String type = FileTypeUtils.getFileExtendName(value);
- if ("JPG".equalsIgnoreCase(type))
- {
+ if ("JPG".equalsIgnoreCase(type)) {
return Workbook.PICTURE_TYPE_JPEG;
- }
- else if ("PNG".equalsIgnoreCase(type))
- {
+ } else if ("PNG".equalsIgnoreCase(type)) {
return Workbook.PICTURE_TYPE_PNG;
}
return Workbook.PICTURE_TYPE_JPEG;
@@ -831,26 +713,18 @@ public class ExcelUtil
/**
* 创建表格样式
*/
- public void setDataValidation(Excel attr, Row row, int column)
- {
- if (attr.name().indexOf("注：") >= 0)
- {
+ public void setDataValidation(Excel attr, Row row, int column) {
+ if (attr.name().indexOf("注：") >= 0) {
sheet.setColumnWidth(column, 6000);
- }
- else
- {
+ } else {
// 设置列宽
sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
}
- if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)
- {
- if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255)
- {
+ if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0) {
+ if (attr.combo().length > 15 || StringUtils.join(attr.combo()).length() > 255) {
// 如果下拉数大于15或字符串长度大于255，则使用一个新sheet存储，避免生成的模板下拉值获取不到
setXSSFValidationWithHidden(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
- }
- else
- {
+ } else {
// 提示信息或只能选择不能输入的列内容.
setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
}
@@ -860,20 +734,16 @@ public class ExcelUtil
/**
* 添加单元格
*/
- public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
- {
+ public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
Cell cell = null;
- try
- {
+ try {
// 设置行高
row.setHeight(maxHeight);
// 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
- if (attr.isExport())
- {
+ if (attr.isExport()) {
// 创建cell
cell = row.createCell(column);
- if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
- {
+ if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge()) {
CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
sheet.addMergedRegion(cellAddress);
}
@@ -884,32 +754,21 @@ public class ExcelUtil
String dateFormat = attr.dateFormat();
String readConverterExp = attr.readConverterExp();
String separator = attr.separator();
- if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
- {
+ if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value)) {
cell.setCellValue(parseDateToStr(dateFormat, value));
- }
- else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
- {
+ } else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value)) {
cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
- }
- else if (value instanceof BigDecimal && -1 != attr.scale())
- {
+ } else if (value instanceof BigDecimal && -1 != attr.scale()) {
cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).doubleValue());
- }
- else if (!attr.handler().equals(ExcelHandlerAdapter.class))
- {
+ } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
cell.setCellValue(dataFormatHandlerAdapter(value, attr, cell));
- }
- else
- {
+ } else {
// 设置列类型
setCellVo(value, attr, cell);
}
addStatisticsData(column, Convert.toStr(value), attr);
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("导出Excel失败{}", e);
}
return cell;
@@ -918,35 +777,30 @@ public class ExcelUtil
/**
* 设置 POI XSSFSheet 单元格提示或选择框
*
- * @param sheet 表单
- * @param textlist 下拉框显示的内容
+ * @param sheet 表单
+ * @param textlist 下拉框显示的内容
* @param promptContent 提示内容
- * @param firstRow 开始行
- * @param endRow 结束行
- * @param firstCol 开始列
- * @param endCol 结束列
+ * @param firstRow 开始行
+ * @param endRow 结束行
+ * @param firstCol 开始列
+ * @param endCol 结束列
*/
public void setPromptOrValidation(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow,
- int firstCol, int endCol)
- {
+ int firstCol, int endCol) {
DataValidationHelper helper = sheet.getDataValidationHelper();
DataValidationConstraint constraint = textlist.length > 0 ? helper.createExplicitListConstraint(textlist) : helper.createCustomConstraint("DD1");
CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
DataValidation dataValidation = helper.createValidation(constraint, regions);
- if (StringUtils.isNotEmpty(promptContent))
- {
+ if (StringUtils.isNotEmpty(promptContent)) {
// 如果设置了提示信息则鼠标放上去提示
dataValidation.createPromptBox("", promptContent);
dataValidation.setShowPromptBox(true);
}
// 处理Excel兼容性问题
- if (dataValidation instanceof XSSFDataValidation)
- {
+ if (dataValidation instanceof XSSFDataValidation) {
dataValidation.setSuppressDropDownArrow(true);
dataValidation.setShowErrorBox(true);
- }
- else
- {
+ } else {
dataValidation.setSuppressDropDownArrow(false);
}
sheet.addValidationData(dataValidation);
@@ -955,20 +809,18 @@ public class ExcelUtil
/**
* 设置某些列的值只能输入预制的数据,显示下拉框（兼容超出一定数量的下拉框）.
*
- * @param sheet 要设置的sheet.
- * @param textlist 下拉框显示的内容
+ * @param sheet 要设置的sheet.
+ * @param textlist 下拉框显示的内容
* @param promptContent 提示内容
- * @param firstRow 开始行
- * @param endRow 结束行
- * @param firstCol 开始列
- * @param endCol 结束列
+ * @param firstRow 开始行
+ * @param endRow 结束行
+ * @param firstCol 开始列
+ * @param endCol 结束列
*/
- public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol)
- {
+ public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol) {
String hideSheetName = "combo_" + firstCol + "_" + endCol;
Sheet hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据
- for (int i = 0; i < textlist.length; i++)
- {
+ for (int i = 0; i < textlist.length; i++) {
hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);
}
// 创建名称，可被其他单元格引用
@@ -982,20 +834,16 @@ public class ExcelUtil
CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
// 数据有效性对象
DataValidation dataValidation = helper.createValidation(constraint, regions);
- if (StringUtils.isNotEmpty(promptContent))
- {
+ if (StringUtils.isNotEmpty(promptContent)) {
// 如果设置了提示信息则鼠标放上去提示
dataValidation.createPromptBox("", promptContent);
dataValidation.setShowPromptBox(true);
}
// 处理Excel兼容性问题
- if (dataValidation instanceof XSSFDataValidation)
- {
+ if (dataValidation instanceof XSSFDataValidation) {
dataValidation.setSuppressDropDownArrow(true);
dataValidation.setShowErrorBox(true);
- }
- else
- {
+ } else {
dataValidation.setSuppressDropDownArrow(false);
}
@@ -1008,32 +856,24 @@ public class ExcelUtil
* 解析导出值 0=男,1=女,2=未知
*
* @param propertyValue 参数值
- * @param converterExp 翻译注解
- * @param separator 分隔符
+ * @param converterExp 翻译注解
+ * @param separator 分隔符
* @return 解析后值
*/
- public static String convertByExp(String propertyValue, String converterExp, String separator)
- {
+ public static String convertByExp(String propertyValue, String converterExp, String separator) {
StringBuilder propertyString = new StringBuilder();
String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
- {
+ for (String item : convertSource) {
String[] itemArray = item.split("=");
- if (StringUtils.containsAny(propertyValue, separator))
- {
- for (String value : propertyValue.split(separator))
- {
- if (itemArray[0].equals(value))
- {
+ if (StringUtils.containsAny(propertyValue, separator)) {
+ for (String value : propertyValue.split(separator)) {
+ if (itemArray[0].equals(value)) {
propertyString.append(itemArray[1] + separator);
break;
}
}
- }
- else
- {
- if (itemArray[0].equals(propertyValue))
- {
+ } else {
+ if (itemArray[0].equals(propertyValue)) {
return itemArray[1];
}
}
@@ -1045,32 +885,24 @@ public class ExcelUtil
* 反向解析值 男=0,女=1,未知=2
*
* @param propertyValue 参数值
- * @param converterExp 翻译注解
- * @param separator 分隔符
+ * @param converterExp 翻译注解
+ * @param separator 分隔符
* @return 解析后值
*/
- public static String reverseByExp(String propertyValue, String converterExp, String separator)
- {
+ public static String reverseByExp(String propertyValue, String converterExp, String separator) {
StringBuilder propertyString = new StringBuilder();
String[] convertSource = converterExp.split(",");
- for (String item : convertSource)
- {
+ for (String item : convertSource) {
String[] itemArray = item.split("=");
- if (StringUtils.containsAny(propertyValue, separator))
- {
- for (String value : propertyValue.split(separator))
- {
- if (itemArray[1].equals(value))
- {
+ if (StringUtils.containsAny(propertyValue, separator)) {
+ for (String value : propertyValue.split(separator)) {
+ if (itemArray[1].equals(value)) {
propertyString.append(itemArray[0] + separator);
break;
}
}
- }
- else
- {
- if (itemArray[1].equals(propertyValue))
- {
+ } else {
+ if (itemArray[1].equals(propertyValue)) {
return itemArray[0];
}
}
@@ -1085,16 +917,12 @@ public class ExcelUtil
* @param excel 数据注解
* @return
*/
- public String dataFormatHandlerAdapter(Object value, Excel excel, Cell cell)
- {
- try
- {
+ public String dataFormatHandlerAdapter(Object value, Excel excel, Cell cell) {
+ try {
Object instance = excel.handler().newInstance();
- Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class, Cell.class, Workbook.class });
+ Method formatMethod = excel.handler().getMethod("format", new Class[]{Object.class, String[].class, Cell.class, Workbook.class});
value = formatMethod.invoke(instance, value, excel.args(), cell, this.wb);
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("不能格式化数据 " + excel.handler(), e.getMessage());
}
return Convert.toStr(value);
@@ -1103,21 +931,15 @@ public class ExcelUtil
/**
* 合计统计信息
*/
- private void addStatisticsData(Integer index, String text, Excel entity)
- {
- if (entity != null && entity.isStatistics())
- {
+ private void addStatisticsData(Integer index, String text, Excel entity) {
+ if (entity != null && entity.isStatistics()) {
Double temp = 0D;
- if (!statistics.containsKey(index))
- {
+ if (!statistics.containsKey(index)) {
statistics.put(index, temp);
}
- try
- {
+ try {
temp = Double.valueOf(text);
- }
- catch (NumberFormatException e)
- {
+ } catch (NumberFormatException e) {
}
statistics.put(index, statistics.get(index) + temp);
}
@@ -1126,18 +948,15 @@ public class ExcelUtil
/**
* 创建统计行
*/
- public void addStatisticsRow()
- {
- if (statistics.size() > 0)
- {
+ 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)
- {
+ for (Integer key : keys) {
cell = row.createCell(key);
cell.setCellStyle(styles.get("total"));
cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
@@ -1149,28 +968,22 @@ public class ExcelUtil
/**
* 获取bean中的属性值
*
- * @param vo 实体对象
+ * @param vo 实体对象
* @param field 字段
* @param excel 注解
* @return 最终的属性值
* @throws Exception
*/
- private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
- {
+ private Object getTargetValue(T vo, Field field, Excel excel) throws Exception {
Object o = field.get(vo);
- if (StringUtils.isNotEmpty(excel.targetAttr()))
- {
+ if (StringUtils.isNotEmpty(excel.targetAttr())) {
String target = excel.targetAttr();
- if (target.contains("."))
- {
+ if (target.contains(".")) {
String[] targets = target.split("[.]");
- for (String name : targets)
- {
+ for (String name : targets) {
o = getValue(o, name);
}
- }
- else
- {
+ } else {
o = getValue(o, target);
}
}
@@ -1185,10 +998,8 @@ public class ExcelUtil
* @return value
* @throws Exception
*/
- private Object getValue(Object o, String name) throws Exception
- {
- if (StringUtils.isNotNull(o) && StringUtils.isNotEmpty(name))
- {
+ 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);
@@ -1200,8 +1011,7 @@ public class ExcelUtil
/**
* 得到所有定义字段
*/
- private void createExcelField()
- {
+ 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();
@@ -1210,27 +1020,21 @@ public class ExcelUtil
/**
* 获取字段注解信息
*/
- public List getFields()
- {
+ 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 (!ArrayUtils.contains(this.excludeFields, field.getName()))
- {
+ for (Field field : tempFields) {
+ if (!ArrayUtils.contains(this.excludeFields, field.getName())) {
// 单注解
- if (field.isAnnotationPresent(Excel.class))
- {
+ if (field.isAnnotationPresent(Excel.class)) {
Excel attr = field.getAnnotation(Excel.class);
- if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
- {
+ if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
field.setAccessible(true);
- fields.add(new Object[] { field, attr });
+ fields.add(new Object[]{field, attr});
}
- if (Collection.class.isAssignableFrom(field.getType()))
- {
+ if (Collection.class.isAssignableFrom(field.getType())) {
subMethod = getSubMethod(field.getName(), clazz);
ParameterizedType pt = (ParameterizedType) field.getGenericType();
Class subClass = (Class) pt.getActualTypeArguments()[0];
@@ -1239,17 +1043,14 @@ public class ExcelUtil
}
// 多注解
- if (field.isAnnotationPresent(Excels.class))
- {
+ if (field.isAnnotationPresent(Excels.class)) {
Excels attrs = field.getAnnotation(Excels.class);
Excel[] excels = attrs.value();
- for (Excel attr : excels)
- {
+ for (Excel attr : excels) {
if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
- && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
- {
+ && (attr != null && (attr.type() == Type.ALL || attr.type() == type))) {
field.setAccessible(true);
- fields.add(new Object[] { field, attr });
+ fields.add(new Object[]{field, attr});
}
}
}
@@ -1261,11 +1062,9 @@ public class ExcelUtil
/**
* 根据注解获取最大行高
*/
- public short getRowHeight()
- {
+ public short getRowHeight() {
double maxHeight = 0;
- for (Object[] os : this.fields)
- {
+ for (Object[] os : this.fields) {
Excel excel = (Excel) os[1];
maxHeight = Math.max(maxHeight, excel.height());
}
@@ -1275,8 +1074,7 @@ public class ExcelUtil
/**
* 创建一个工作簿
*/
- public void createWorkbook()
- {
+ public void createWorkbook() {
this.wb = new SXSSFWorkbook(500);
this.sheet = wb.createSheet();
wb.setSheetName(0, sheetName);
@@ -1287,13 +1085,11 @@ public class ExcelUtil
* 创建工作表
*
* @param sheetNo sheet数量
- * @param index 序号
+ * @param index 序号
*/
- public void createSheet(int sheetNo, int index)
- {
+ public void createSheet(int sheetNo, int index) {
// 设置工作表的名称.
- if (sheetNo > 1 && index > 0)
- {
+ if (sheetNo > 1 && index > 0) {
this.sheet = wb.createSheet();
this.createTitle();
wb.setSheetName(index, sheetName + index);
@@ -1303,58 +1099,39 @@ public class ExcelUtil
/**
* 获取单元格值
*
- * @param row 获取的行
+ * @param row 获取的行
* @param column 获取单元格列号
* @return 单元格值
*/
- public Object getCellValue(Row row, int column)
- {
- if (row == null)
- {
+ public Object getCellValue(Row row, int column) {
+ if (row == null) {
return row;
}
Object val = "";
- try
- {
+ try {
Cell cell = row.getCell(column);
- if (StringUtils.isNotNull(cell))
- {
- if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA)
- {
+ if (StringUtils.isNotNull(cell)) {
+ if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) {
val = cell.getNumericCellValue();
- if (DateUtil.isCellDateFormatted(cell))
- {
+ if (DateUtil.isCellDateFormatted(cell)) {
val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
- }
- else
- {
- if ((Double) val % 1 != 0)
- {
+ } else {
+ if ((Double) val % 1 != 0) {
val = new BigDecimal(val.toString());
- }
- else
- {
+ } else {
val = new DecimalFormat("0").format(val);
}
}
- }
- else if (cell.getCellType() == CellType.STRING)
- {
+ } else if (cell.getCellType() == CellType.STRING) {
val = cell.getStringCellValue();
- }
- else if (cell.getCellType() == CellType.BOOLEAN)
- {
+ } else if (cell.getCellType() == CellType.BOOLEAN) {
val = cell.getBooleanCellValue();
- }
- else if (cell.getCellType() == CellType.ERROR)
- {
+ } else if (cell.getCellType() == CellType.ERROR) {
val = cell.getErrorCellValue();
}
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
return val;
}
return val;
@@ -1366,17 +1143,13 @@ public class ExcelUtil
* @param row 判断的行
* @return
*/
- private boolean isRowEmpty(Row row)
- {
- if (row == null)
- {
+ private boolean isRowEmpty(Row row) {
+ if (row == null) {
return true;
}
- for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++)
- {
+ for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
Cell cell = row.getCell(i);
- if (cell != null && cell.getCellType() != CellType.BLANK)
- {
+ if (cell != null && cell.getCellType() != CellType.BLANK) {
return false;
}
}
@@ -1387,30 +1160,21 @@ public class ExcelUtil
* 格式化不同类型的日期对象
*
* @param dateFormat 日期格式
- * @param val 被格式化的日期对象
+ * @param val 被格式化的日期对象
* @return 格式化后的日期字符
*/
- public String parseDateToStr(String dateFormat, Object val)
- {
- if (val == null)
- {
+ public String parseDateToStr(String dateFormat, Object val) {
+ if (val == null) {
return "";
}
String str;
- if (val instanceof Date)
- {
+ if (val instanceof Date) {
str = DateUtils.parseDateToStr(dateFormat, (Date) val);
- }
- else if (val instanceof LocalDateTime)
- {
+ } else if (val instanceof LocalDateTime) {
str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val));
- }
- else if (val instanceof LocalDate)
- {
+ } else if (val instanceof LocalDate) {
str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val));
- }
- else
- {
+ } else {
str = val.toString();
}
return str;
@@ -1419,31 +1183,25 @@ public class ExcelUtil
/**
* 是否有对象的子列表
*/
- public boolean isSubList()
- {
+ public boolean isSubList() {
return StringUtils.isNotNull(subFields) && subFields.size() > 0;
}
/**
* 是否有对象的子列表，集合不为空
*/
- public boolean isSubListValue(T vo)
- {
+ public boolean isSubListValue(T vo) {
return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;
}
/**
* 获取集合的值
*/
- public Collection getListCellValue(Object obj)
- {
+ public Collection getListCellValue(Object obj) {
Object value;
- try
- {
- value = subMethod.invoke(obj, new Object[] {});
- }
- catch (Exception e)
- {
+ try {
+ value = subMethod.invoke(obj, new Object[]{});
+ } catch (Exception e) {
return new ArrayList