diff --git a/pom.xml b/pom.xml
index 487d7eb8..9610af1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<groupId>com.ruoyi</groupId>
<artifactId>RuoYi</artifactId>
- <version>2.4.0</version>
+ <version>3.0.0</version>
<packaging>jar</packaging>
<name>RuoYi</name>
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.0.4.RELEASE</version>
+ <version>2.0.5.RELEASE</version>
<relativePath />
</parent>
diff --git a/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/src/main/java/com/ruoyi/RuoYiServletInitializer.java
index a06a3077..9d82a237 100644
--- a/src/main/java/com/ruoyi/RuoYiServletInitializer.java
+++ b/src/main/java/com/ruoyi/RuoYiServletInitializer.java
@@ -15,5 +15,4 @@ public class RuoYiServletInitializer extends SpringBootServletInitializer
{
return application.sources(RuoYiApplication.class);
}
-
}
diff --git a/src/main/java/com/ruoyi/common/constant/Constants.java b/src/main/java/com/ruoyi/common/constant/Constants.java
index 3fdf7551..9dd843c3 100644
--- a/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -61,5 +61,4 @@ public class Constants
* 排序的方向 "desc" 或者 "asc".
*/
public static String IS_ASC = "isAsc";
-
}
diff --git a/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
index 6b774ac8..c2701f7d 100644
--- a/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
+++ b/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java
@@ -7,7 +7,6 @@ package com.ruoyi.common.constant;
*/
public interface ScheduleConstants
{
-
public static final String TASK_CLASS_NAME = "__TASK_CLASS_NAME__";
public static final String TASK_PROPERTIES = "__TASK_PROPERTIES__";
@@ -47,5 +46,4 @@ public interface ScheduleConstants
return value;
}
}
-
}
diff --git a/src/main/java/com/ruoyi/common/constant/ShiroConstants.java b/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
index dfce28d3..d8bc2ba1 100644
--- a/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
+++ b/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
@@ -61,5 +61,4 @@ public interface ShiroConstants
* 验证码错误
*/
public static final String CAPTCHA_ERROR = "captchaError";
-
}
diff --git a/src/main/java/com/ruoyi/common/constant/UserConstants.java b/src/main/java/com/ruoyi/common/constant/UserConstants.java
index 40a551b5..e194a6e0 100644
--- a/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -7,7 +7,6 @@ package com.ruoyi.common.constant;
*/
public class UserConstants
{
-
/** 正常状态 */
public static final String NORMAL = "0";
@@ -88,5 +87,4 @@ public class UserConstants
* 邮箱格式限制
*/
public static final String EMAIL_PATTERN = "^((([a-z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])+(\\.([a-z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])+)*)|((\\x22)((((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(([\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]|\\x21|[\\x23-\\x5b]|[\\x5d-\\x7e]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(\\\\([\\x01-\\x09\\x0b\\x0c\\x0d-\\x7f]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]))))*(((\\x20|\\x09)*(\\x0d\\x0a))?(\\x20|\\x09)+)?(\\x22)))@((([a-z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(([a-z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])([a-z]|\\d|-|\\.|_|~|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])*([a-z]|\\d|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])))\\.)+(([a-z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])|(([a-z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])([a-z]|\\d|-|\\.|_|~|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])*([a-z]|[\\u00A0-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF])))\\.?";
-
}
diff --git a/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/src/main/java/com/ruoyi/common/exception/base/BaseException.java
index fb87008c..452a54be 100644
--- a/src/main/java/com/ruoyi/common/exception/base/BaseException.java
+++ b/src/main/java/com/ruoyi/common/exception/base/BaseException.java
@@ -10,7 +10,6 @@ import com.ruoyi.common.utils.MessageUtils;
*/
public class BaseException extends RuntimeException
{
-
private static final long serialVersionUID = 1L;
/**
diff --git a/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
index 10c89698..b59fcbe4 100644
--- a/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
+++ b/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java
@@ -9,7 +9,6 @@ import org.apache.commons.fileupload.FileUploadException;
*/
public class FileNameLengthLimitExceededException extends FileUploadException
{
-
private static final long serialVersionUID = 1L;
private int length;
private int maxLength;
@@ -37,5 +36,4 @@ public class FileNameLengthLimitExceededException extends FileUploadException
{
return maxLength;
}
-
}
diff --git a/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
index 4c99c99c..81cd78b8 100644
--- a/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
+++ b/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
@@ -10,7 +10,6 @@ import org.apache.commons.fileupload.FileUploadException;
*/
public class InvalidExtensionException extends FileUploadException
{
-
private static final long serialVersionUID = 1L;
private String[] allowedExtension;
@@ -69,5 +68,4 @@ public class InvalidExtensionException extends FileUploadException
super(allowedExtension, extension, filename);
}
}
-
}
diff --git a/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/src/main/java/com/ruoyi/common/exception/job/TaskException.java
index 1fa75ddf..a567b408 100644
--- a/src/main/java/com/ruoyi/common/exception/job/TaskException.java
+++ b/src/main/java/com/ruoyi/common/exception/job/TaskException.java
@@ -31,5 +31,4 @@ public class TaskException extends Exception
{
TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
}
-
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java b/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java
index 887a14df..f892957c 100644
--- a/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java
+++ b/src/main/java/com/ruoyi/common/exception/user/RoleBlockedException.java
@@ -7,7 +7,6 @@ package com.ruoyi.common.exception.user;
*/
public class RoleBlockedException extends UserException
{
-
private static final long serialVersionUID = 1L;
public RoleBlockedException(String reason)
diff --git a/src/main/java/com/ruoyi/common/exception/user/UserDeleteException.java b/src/main/java/com/ruoyi/common/exception/user/UserDeleteException.java
index 4421db7e..cf072422 100644
--- a/src/main/java/com/ruoyi/common/exception/user/UserDeleteException.java
+++ b/src/main/java/com/ruoyi/common/exception/user/UserDeleteException.java
@@ -7,7 +7,6 @@ package com.ruoyi.common.exception.user;
*/
public class UserDeleteException extends UserException
{
-
private static final long serialVersionUID = 1L;
public UserDeleteException()
diff --git a/src/main/java/com/ruoyi/common/exception/user/UserException.java b/src/main/java/com/ruoyi/common/exception/user/UserException.java
index d3303da9..bdfec80e 100644
--- a/src/main/java/com/ruoyi/common/exception/user/UserException.java
+++ b/src/main/java/com/ruoyi/common/exception/user/UserException.java
@@ -9,7 +9,6 @@ import com.ruoyi.common.exception.base.BaseException;
*/
public class UserException extends BaseException
{
-
private static final long serialVersionUID = 1L;
public UserException(String code, Object[] args)
diff --git a/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java b/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java
index 2c235741..ed4bea3a 100644
--- a/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java
+++ b/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java
@@ -7,7 +7,6 @@ package com.ruoyi.common.exception.user;
*/
public class UserNotExistsException extends UserException
{
-
private static final long serialVersionUID = 1L;
public UserNotExistsException()
diff --git a/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
index 3b7271f6..71449e29 100644
--- a/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
+++ b/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java
@@ -7,7 +7,6 @@ package com.ruoyi.common.exception.user;
*/
public class UserPasswordNotMatchException extends UserException
{
-
private static final long serialVersionUID = 1L;
public UserPasswordNotMatchException()
diff --git a/src/main/java/com/ruoyi/common/support/CharsetKit.java b/src/main/java/com/ruoyi/common/support/CharsetKit.java
index 622cb52e..26296ef3 100644
--- a/src/main/java/com/ruoyi/common/support/CharsetKit.java
+++ b/src/main/java/com/ruoyi/common/support/CharsetKit.java
@@ -84,5 +84,4 @@ public class CharsetKit
{
return Charset.defaultCharset().name();
}
-
}
diff --git a/src/main/java/com/ruoyi/common/support/Convert.java b/src/main/java/com/ruoyi/common/support/Convert.java
index 4039e3b1..433beb7c 100644
--- a/src/main/java/com/ruoyi/common/support/Convert.java
+++ b/src/main/java/com/ruoyi/common/support/Convert.java
@@ -998,5 +998,4 @@ public class Convert
return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$",
"零元整");
}
-
}
diff --git a/src/main/java/com/ruoyi/common/support/StrFormatter.java b/src/main/java/com/ruoyi/common/support/StrFormatter.java
index 0e47ce7f..427e01b6 100644
--- a/src/main/java/com/ruoyi/common/support/StrFormatter.java
+++ b/src/main/java/com/ruoyi/common/support/StrFormatter.java
@@ -9,7 +9,6 @@ import com.ruoyi.common.utils.StringUtils;
*/
public class StrFormatter
{
-
public static final String EMPTY_JSON = "{}";
public static final char C_BACKSLASH = '\\';
public static final char C_DELIM_START = '{';
@@ -91,5 +90,4 @@ public class StrFormatter
return sbuf.toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/common/utils/DateUtils.java b/src/main/java/com/ruoyi/common/utils/DateUtils.java
index db32fb27..3e4d5f5b 100644
--- a/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -96,5 +96,4 @@ public class DateUtils
Date now = new Date();
return DateFormatUtils.format(now, "yyyyMMdd");
}
-
}
diff --git a/src/main/java/com/ruoyi/common/utils/LogUtils.java b/src/main/java/com/ruoyi/common/utils/LogUtils.java
index ecde4cf5..3648ee3b 100644
--- a/src/main/java/com/ruoyi/common/utils/LogUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/LogUtils.java
@@ -16,7 +16,6 @@ import java.util.Map;
*/
public class LogUtils
{
-
public static final Logger ERROR_LOG = LoggerFactory.getLogger("sys-error");
public static final Logger ACCESS_LOG = LoggerFactory.getLogger("sys-access");
@@ -132,5 +131,4 @@ public class LogUtils
{
return ERROR_LOG;
}
-
}
diff --git a/src/main/java/com/ruoyi/common/utils/Md5Utils.java b/src/main/java/com/ruoyi/common/utils/Md5Utils.java
index 5f1bc0ec..aecbf17f 100644
--- a/src/main/java/com/ruoyi/common/utils/Md5Utils.java
+++ b/src/main/java/com/ruoyi/common/utils/Md5Utils.java
@@ -63,5 +63,4 @@ public class Md5Utils
return s;
}
}
-
}
diff --git a/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/src/main/java/com/ruoyi/common/utils/MessageUtils.java
index 72ff990e..879421ba 100644
--- a/src/main/java/com/ruoyi/common/utils/MessageUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/MessageUtils.java
@@ -10,7 +10,6 @@ import com.ruoyi.common.utils.spring.SpringUtils;
*/
public class MessageUtils
{
-
/**
* 根据消息键和参数 获取消息 委托给spring messageSource
*
@@ -23,5 +22,4 @@ public class MessageUtils
MessageSource messageSource = SpringUtils.getBean(MessageSource.class);
return messageSource.getMessage(code, args, null);
}
-
}
diff --git a/src/main/java/com/ruoyi/common/utils/TreeUtils.java b/src/main/java/com/ruoyi/common/utils/TreeUtils.java
index 35cd493f..fe6c97dd 100644
--- a/src/main/java/com/ruoyi/common/utils/TreeUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/TreeUtils.java
@@ -12,7 +12,6 @@ import com.ruoyi.project.system.menu.domain.Menu;
*/
public class TreeUtils
{
-
/**
* 根据父节点的ID获取所有子节点
*
diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index 3e7ab474..96fd3ee1 100644
--- a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -15,7 +15,6 @@ import com.ruoyi.framework.config.RuoYiConfig;
*/
public class FileUploadUtils
{
-
/**
* 默认大小 50M
*/
@@ -159,5 +158,4 @@ public class FileUploadUtils
throw new FileSizeLimitExceededException("not allowed upload upload", size, DEFAULT_MAX_SIZE);
}
}
-
}
diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
index ef4a225a..f538bee3 100644
--- a/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
@@ -13,7 +13,6 @@ import java.io.OutputStream;
*/
public class FileUtils
{
-
/**
* 输出指定文件的byte数组
*
@@ -87,5 +86,4 @@ public class FileUtils
}
return flag;
}
-
}
diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 2cc9365c..a0275185 100644
--- a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory;
*/
public class HttpUtils
{
-
private static final Logger log = LoggerFactory.getLogger(HttpUtils.class);
/**
@@ -246,5 +245,4 @@ public class HttpUtils
return true;
}
}
-
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 020dde51..b862fd77 100644
--- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -480,5 +480,4 @@ public class ExcelUtil<T>
}
return downloadPath;
}
-
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java b/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java
index 9a7c2626..74a0a99d 100644
--- a/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/security/ShiroUtils.java
@@ -18,7 +18,6 @@ import com.ruoyi.project.system.user.domain.User;
*/
public class ShiroUtils
{
-
public static Subject getSubjct()
{
return SecurityUtils.getSubject();
diff --git a/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
index e943443a..daf253ec 100644
--- a/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java
@@ -98,5 +98,4 @@ public final class SpringUtils implements BeanFactoryPostProcessor
{
return beanFactory.getAliases(name);
}
-
}
diff --git a/src/main/java/com/ruoyi/common/xss/XssFilter.java b/src/main/java/com/ruoyi/common/xss/XssFilter.java
index 4495ca49..d307fbc9 100644
--- a/src/main/java/com/ruoyi/common/xss/XssFilter.java
+++ b/src/main/java/com/ruoyi/common/xss/XssFilter.java
@@ -94,5 +94,4 @@ public class XssFilter implements Filter
{
}
-
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/common/xss/XssHttpServletRequestWrapper.java b/src/main/java/com/ruoyi/common/xss/XssHttpServletRequestWrapper.java
index db39f635..be125f24 100644
--- a/src/main/java/com/ruoyi/common/xss/XssHttpServletRequestWrapper.java
+++ b/src/main/java/com/ruoyi/common/xss/XssHttpServletRequestWrapper.java
@@ -12,7 +12,6 @@ import org.jsoup.safety.Whitelist;
*/
public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
{
-
/**
* @param request
*/
diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java
index 6965e894..07ac5b19 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java
@@ -16,6 +16,8 @@ import java.lang.annotation.Target;
@Documented
public @interface DataScope
{
- /** 表的别名 */
+ /**
+ * 表的别名
+ */
String tableAlias() default "";
}
diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java
index 4437affd..3dc59208 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java
@@ -30,5 +30,4 @@ public @interface Log
/** 是否保存请求的参数 */
boolean isSaveRequestData() default true;
-
}
diff --git a/src/main/java/com/ruoyi/framework/config/GenConfig.java b/src/main/java/com/ruoyi/framework/config/GenConfig.java
index 839909a2..ecd5fcdf 100644
--- a/src/main/java/com/ruoyi/framework/config/GenConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/GenConfig.java
@@ -67,5 +67,4 @@ public class GenConfig
return "GenConfig [getClass()=" + getClass() + ", hashCode()=" + hashCode() + ", toString()=" + super.toString()
+ "]";
}
-
}
diff --git a/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/src/main/java/com/ruoyi/framework/config/I18nConfig.java
index bdba175a..c572e1c5 100644
--- a/src/main/java/com/ruoyi/framework/config/I18nConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/I18nConfig.java
@@ -17,7 +17,6 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver;
@Configuration
public class I18nConfig implements WebMvcConfigurer
{
-
@Bean
public LocaleResolver localeResolver()
{
diff --git a/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
index 73e5a92d..1d0a24c6 100644
--- a/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
+++ b/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
@@ -10,7 +10,6 @@ import com.google.code.kaptcha.text.impl.DefaultTextCreator;
*/
public class KaptchaTextCreator extends DefaultTextCreator
{
-
private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(",");
@Override
@@ -73,5 +72,4 @@ public class KaptchaTextCreator extends DefaultTextCreator
suChinese.append("=?@" + result);
return suChinese.toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java b/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java
index a890ff99..4e1a0c7d 100644
--- a/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java
@@ -82,5 +82,4 @@ public class RuoYiConfig
{
return profile + "download/";
}
-
}
diff --git a/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java b/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java
index 57746331..512ad060 100644
--- a/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java
+++ b/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java
@@ -15,7 +15,6 @@ import java.util.Properties;
@Configuration
public class ScheduleConfig
{
-
@Bean
public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource)
{
diff --git a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
index 29d9578c..d2aab1b4 100644
--- a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
+++ b/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java
@@ -23,5 +23,4 @@ public class DynamicDataSource extends AbstractRoutingDataSource
{
return DynamicDataSourceContextHolder.getDateSoureType();
}
-
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
index 6f701202..3a3904c0 100644
--- a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
+++ b/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java
@@ -42,5 +42,4 @@ public class DynamicDataSourceContextHolder
{
CONTEXT_HOLDER.remove();
}
-
}
diff --git a/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java b/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java
index 7e367ab2..efdc663b 100644
--- a/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java
+++ b/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java
@@ -140,5 +140,4 @@ public class UserRealm extends AuthorizingRealm
{
this.clearCachedAuthorizationInfo(SecurityUtils.getSubject().getPrincipals());
}
-
}
diff --git a/src/main/java/com/ruoyi/framework/shiro/service/LoginService.java b/src/main/java/com/ruoyi/framework/shiro/service/LoginService.java
index ec987dd8..7af45f9b 100644
--- a/src/main/java/com/ruoyi/framework/shiro/service/LoginService.java
+++ b/src/main/java/com/ruoyi/framework/shiro/service/LoginService.java
@@ -133,5 +133,4 @@ public class LoginService
user.setLoginDate(DateUtils.getNowDate());
userService.updateUserInfo(user);
}
-
}
diff --git a/src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java b/src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java
index 4035decc..3e18435e 100644
--- a/src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java
+++ b/src/main/java/com/ruoyi/framework/shiro/service/PasswordService.java
@@ -24,7 +24,6 @@ import com.ruoyi.project.system.user.domain.User;
@Component
public class PasswordService
{
-
@Autowired
private CacheManager cacheManager;
diff --git a/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java b/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java
index 505c6cd8..187f3c84 100644
--- a/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java
+++ b/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java
@@ -83,5 +83,4 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter
}
return super.getRedirectUrl(request, response, subject);
}
-
}
diff --git a/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java b/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java
index efcfc00c..3b4bdbf8 100644
--- a/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java
+++ b/src/main/java/com/ruoyi/framework/shiro/web/filter/captcha/CaptchaValidateFilter.java
@@ -16,7 +16,6 @@ import com.ruoyi.common.utils.security.ShiroUtils;
*/
public class CaptchaValidateFilter extends AccessControlFilter
{
-
/**
* 是否开启验证码
*/
diff --git a/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java b/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java
index 983f836c..dc5a8f6d 100644
--- a/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java
+++ b/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java
@@ -22,7 +22,6 @@ import com.ruoyi.project.system.user.domain.User;
*/
public class OnlineSessionFilter extends AccessControlFilter
{
-
/**
* 强制退出后重定向的地址
*/
@@ -92,5 +91,4 @@ public class OnlineSessionFilter extends AccessControlFilter
{
WebUtils.issueRedirect(request, response, loginUrl);
}
-
}
diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/ruoyi/project/common/CommonController.java
index 1a271a69..8266563f 100644
--- a/src/main/java/com/ruoyi/project/common/CommonController.java
+++ b/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -70,6 +70,5 @@ public class CommonController
filename = URLEncoder.encode(filename, "utf-8");
}
return filename;
-
}
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/domain/Job.java b/src/main/java/com/ruoyi/project/monitor/job/domain/Job.java
index 8cf998ad..bab23fde 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/domain/Job.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/domain/Job.java
@@ -1,5 +1,7 @@
package com.ruoyi.project.monitor.job.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serializable;
import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -127,10 +129,21 @@ public class Job extends BaseEntity implements Serializable
}
@Override
- public String toString()
- {
- return "Job [jobId=" + jobId + ", jobName=" + jobName + ", jobGroup=" + jobGroup + ", methodName=" + methodName
- + ", methodParams=" + methodParams + ", cronExpression=" + cronExpression + ", status=" + status + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("jobId", getJobId())
+ .append("jobName", getJobName())
+ .append("jobGroup", getJobGroup())
+ .append("methodName", getMethodName())
+ .append("methodParams", getMethodParams())
+ .append("cronExpression", getCronExpression())
+ .append("misfirePolicy", getMisfirePolicy())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/domain/JobLog.java b/src/main/java/com/ruoyi/project/monitor/job/domain/JobLog.java
index e7342599..9f27a1a2 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/domain/JobLog.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/domain/JobLog.java
@@ -1,10 +1,12 @@
package com.ruoyi.project.monitor.job.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
- * 定时任务调度日志信息 sys_job_log
+ * 定时任务调度日志表 sys_job_log
*
* @author ruoyi
*/
@@ -125,11 +127,17 @@ public class JobLog extends BaseEntity
}
@Override
- public String toString()
- {
- return "JobLog [jobLogId=" + jobLogId + ", jobName=" + jobName + ", jobGroup=" + jobGroup + ", methodName="
- + methodName + ", methodParams=" + methodParams + ", jobMessage=" + jobMessage + ", status=" + status
- + ", exceptionInfo=" + exceptionInfo + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("jobLogId", getJobLogId())
+ .append("jobName", getJobName())
+ .append("jobGroup", getJobGroup())
+ .append("methodName", getMethodName())
+ .append("methodParams", getMethodParams())
+ .append("jobMessage", getJobMessage())
+ .append("status", getStatus())
+ .append("exceptionInfo", getExceptionInfo())
+ .append("createTime", getCreateTime())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/mapper/JobLogMapper.java b/src/main/java/com/ruoyi/project/monitor/job/mapper/JobLogMapper.java
index 7a3fb4e5..6b1129f8 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/mapper/JobLogMapper.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/mapper/JobLogMapper.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.monitor.job.domain.JobLog;
*/
public interface JobLogMapper
{
-
/**
* 获取quartz调度器日志的计划任务
*
@@ -55,5 +54,4 @@ public interface JobLogMapper
* 清空任务日志
*/
public void cleanJobLog();
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/mapper/JobMapper.java b/src/main/java/com/ruoyi/project/monitor/job/mapper/JobMapper.java
index 250c2df1..7377ec49 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/mapper/JobMapper.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/mapper/JobMapper.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.monitor.job.domain.Job;
*/
public interface JobMapper
{
-
/**
* 查询调度任务日志集合
*
@@ -65,5 +64,4 @@ public interface JobMapper
* @return 结果
*/
public int insertJob(Job job);
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/service/IJobLogService.java b/src/main/java/com/ruoyi/project/monitor/job/service/IJobLogService.java
index 401ae402..84d907cd 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/service/IJobLogService.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/service/IJobLogService.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.monitor.job.domain.JobLog;
*/
public interface IJobLogService
{
-
/**
* 获取quartz调度器日志的计划任务
*
@@ -54,5 +53,4 @@ public interface IJobLogService
* 清空任务日志
*/
public void cleanJobLog();
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/service/IJobService.java b/src/main/java/com/ruoyi/project/monitor/job/service/IJobService.java
index 13e4bec2..f7b7d803 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/service/IJobService.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/service/IJobService.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.monitor.job.domain.Job;
*/
public interface IJobService
{
-
/**
* 获取quartz调度器的计划任务
*
@@ -90,5 +89,4 @@ public interface IJobService
* @return 结果
*/
public int updateJobCron(Job job);
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/service/JobLogServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/job/service/JobLogServiceImpl.java
index 8abd6ed6..9661b6d6 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/service/JobLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/service/JobLogServiceImpl.java
@@ -15,7 +15,6 @@ import com.ruoyi.project.monitor.job.mapper.JobLogMapper;
@Service
public class JobLogServiceImpl implements IJobLogService
{
-
@Autowired
private JobLogMapper jobLogMapper;
@@ -85,5 +84,4 @@ public class JobLogServiceImpl implements IJobLogService
{
jobLogMapper.cleanJobLog();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/service/JobServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/job/service/JobServiceImpl.java
index 32bdf2c6..ac06694e 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/service/JobServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/service/JobServiceImpl.java
@@ -208,5 +208,4 @@ public class JobServiceImpl implements IJobService
}
return rows;
}
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/task/RyTask.java b/src/main/java/com/ruoyi/project/monitor/job/task/RyTask.java
index 20cf58b6..a35c0b0d 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/task/RyTask.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/task/RyTask.java
@@ -10,7 +10,6 @@ import org.springframework.stereotype.Component;
@Component("ryTask")
public class RyTask
{
-
public void ryParams(String params)
{
System.out.println("执行有参方法：" + params);
@@ -20,5 +19,4 @@ public class RyTask
{
System.out.println("执行无参方法");
}
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleRunnable.java b/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleRunnable.java
index 0b98d907..35ab2fc7 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleRunnable.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleRunnable.java
@@ -53,5 +53,4 @@ public class ScheduleRunnable implements Runnable
e.printStackTrace();
}
}
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleUtils.java b/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleUtils.java
index 0a839326..2f3e81af 100644
--- a/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleUtils.java
+++ b/src/main/java/com/ruoyi/project/monitor/job/util/ScheduleUtils.java
@@ -218,8 +218,7 @@ public class ScheduleUtils
case ScheduleConstants.MISFIRE_DO_NOTHING:
return cb.withMisfireHandlingInstructionDoNothing();
default:
- throw new TaskException("The task misfire policy '" + job.getMisfirePolicy()
- + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR);
+ throw new TaskException("The task misfire policy '" + job.getMisfirePolicy() + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR);
}
}
}
diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/domain/Logininfor.java b/src/main/java/com/ruoyi/project/monitor/logininfor/domain/Logininfor.java
index 51bc1550..1f18912f 100644
--- a/src/main/java/com/ruoyi/project/monitor/logininfor/domain/Logininfor.java
+++ b/src/main/java/com/ruoyi/project/monitor/logininfor/domain/Logininfor.java
@@ -1,41 +1,52 @@
package com.ruoyi.project.monitor.logininfor.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import java.util.Date;
/**
- * 系统访问日志情况信息 sys_logininfor
+ * 系统访问记录表 sys_logininfor
*
* @author ruoyi
*/
public class Logininfor extends BaseEntity
{
private static final long serialVersionUID = 1L;
+
/** ID */
@Excel(name = "序号")
private Long infoId;
+
/** 用户账号 */
@Excel(name = "用户账号")
private String loginName;
+
/** 登录状态 0成功 1失败 */
@Excel(name = "登录状态")
private String status;
+
/** 登录IP地址 */
@Excel(name = "登录地址")
private String ipaddr;
+
/** 登录地点 */
@Excel(name = "登录地点")
private String loginLocation;
+
/** 浏览器类型 */
@Excel(name = "浏览器")
private String browser;
+
/** 操作系统 */
@Excel(name = "操作系统 ")
private String os;
+
/** 提示消息 */
@Excel(name = "提示消息")
private String msg;
+
/** 访问时间 */
@Excel(name = "访问时间")
private Date loginTime;
@@ -131,11 +142,17 @@ public class Logininfor extends BaseEntity
}
@Override
- public String toString()
- {
- return "Logininfor [infoId=" + infoId + ", loginName=" + loginName + ", status=" + status + ", ipaddr=" + ipaddr
- + ",loginLocation=" + loginLocation + ", browser=" + browser + ", os=" + os + ", msg=" + msg
- + ", loginTime=" + loginTime + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("infoId", getInfoId())
+ .append("loginName", getLoginName())
+ .append("ipaddr", getIpaddr())
+ .append("loginLocation", getLoginLocation())
+ .append("browser", getBrowser())
+ .append("os", getOs())
+ .append("status", getStatus())
+ .append("msg", getMsg())
+ .append("loginTime", getLoginTime())
+ .toString();
}
-
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java b/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java
index fee7d212..14ccce8f 100644
--- a/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java
+++ b/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.monitor.logininfor.domain.Logininfor;
*/
public interface ILogininforService
{
-
/**
* 新增系统登录日志
*
diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java
index fc1b197b..e34c92ee 100644
--- a/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java
@@ -15,7 +15,6 @@ import com.ruoyi.project.monitor.logininfor.mapper.LogininforMapper;
@Service
public class LogininforServiceImpl implements ILogininforService
{
-
@Autowired
private LogininforMapper logininforMapper;
diff --git a/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java b/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java
index c31c530c..c88f3db1 100644
--- a/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java
+++ b/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java
@@ -108,5 +108,4 @@ public class UserOnlineController extends BaseController
userOnlineService.saveOnline(online);
return success();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java b/src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java
index 02a144ef..6ebe279f 100644
--- a/src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java
+++ b/src/main/java/com/ruoyi/project/monitor/online/domain/OnlineSession.java
@@ -9,7 +9,6 @@ import org.apache.shiro.session.mgt.SimpleSession;
*/
public class OnlineSession extends SimpleSession
{
-
private static final long serialVersionUID = 1L;
/** 用户ID */
@@ -151,5 +150,4 @@ public class OnlineSession extends SimpleSession
return info;
}
}
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java b/src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java
index edf36ff3..1c86fb5f 100644
--- a/src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java
+++ b/src/main/java/com/ruoyi/project/monitor/online/domain/UserOnline.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.monitor.online.domain;
import java.util.Date;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.web.domain.BaseEntity;
import com.ruoyi.project.monitor.online.domain.OnlineSession.OnlineStatus;
@@ -12,6 +14,7 @@ import com.ruoyi.project.monitor.online.domain.OnlineSession.OnlineStatus;
public class UserOnline extends BaseEntity
{
private static final long serialVersionUID = 1L;
+
/** 用户会话id */
private String sessionId;
@@ -169,12 +172,19 @@ public class UserOnline extends BaseEntity
}
@Override
- public String toString()
- {
- return "UserOnline [sessionId=" + sessionId + ", deptName=" + deptName + ", loginName=" + loginName
- + ", ipaddr=" + ipaddr + ", browser=" + browser + ", os=" + os + ", startTimestamp=" + startTimestamp
- + ", lastAccessTime=" + lastAccessTime + ", expireTime=" + expireTime + ", status=" + status
- + ", session=" + session + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("sessionId", getSessionId())
+ .append("loginName", getLoginName())
+ .append("deptName", getDeptName())
+ .append("ipaddr", getIpaddr())
+ .append("loginLocation", getLoginLocation())
+ .append("browser", getBrowser())
+ .append("os", getOs())
+ .append("status", getStatus())
+ .append("startTimestamp", getStartTimestamp())
+ .append("lastAccessTime", getLastAccessTime())
+ .append("expireTime", getExpireTime())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/domain/OperLog.java b/src/main/java/com/ruoyi/project/monitor/operlog/domain/OperLog.java
index 16485848..7b2ddc8d 100644
--- a/src/main/java/com/ruoyi/project/monitor/operlog/domain/OperLog.java
+++ b/src/main/java/com/ruoyi/project/monitor/operlog/domain/OperLog.java
@@ -1,11 +1,13 @@
package com.ruoyi.project.monitor.operlog.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
- * 操作日志记录 oper_log
+ * 操作日志记录表 oper_log
*
* @author ruoyi
*/
@@ -210,12 +212,22 @@ public class OperLog extends BaseEntity
}
@Override
- public String toString()
- {
- return "OperLog [operId=" + operId + ", title=" + title + ", businessType=" + businessType + ", method="
- + method + ", operatorType=" + operatorType + ", operName=" + operName + ", deptName=" + deptName
- + ", operUrl=" + operUrl + ", operIp=" + operIp + ", operLocation=" + operLocation + ", operParam="
- + operParam + ", status=" + status + ", errorMsg=" + errorMsg + ", operTime=" + operTime + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("operId", getOperId())
+ .append("title", getTitle())
+ .append("businessType", getBusinessType())
+ .append("method", getMethod())
+ .append("operatorType", getOperatorType())
+ .append("operName", getOperName())
+ .append("deptName", getDeptName())
+ .append("operUrl", getOperUrl())
+ .append("operIp", getOperIp())
+ .append("operLocation", getOperLocation())
+ .append("operParam", getOperParam())
+ .append("status", getStatus())
+ .append("errorMsg", getErrorMsg())
+ .append("operTime", getOperTime())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/config/controller/ConfigController.java b/src/main/java/com/ruoyi/project/system/config/controller/ConfigController.java
index a9846079..a4db07db 100644
--- a/src/main/java/com/ruoyi/project/system/config/controller/ConfigController.java
+++ b/src/main/java/com/ruoyi/project/system/config/controller/ConfigController.java
@@ -128,5 +128,4 @@ public class ConfigController extends BaseController
{
return configService.checkConfigKeyUnique(config);
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/config/domain/Config.java b/src/main/java/com/ruoyi/project/system/config/domain/Config.java
index c9729dc1..e8d8bb9d 100644
--- a/src/main/java/com/ruoyi/project/system/config/domain/Config.java
+++ b/src/main/java/com/ruoyi/project/system/config/domain/Config.java
@@ -1,5 +1,7 @@
package com.ruoyi.project.system.config.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -83,10 +85,18 @@ public class Config extends BaseEntity
}
@Override
- public String toString()
- {
- return "Config [configId=" + configId + ", configName=" + configName + ", configKey=" + configKey
- + ", configValue=" + configValue + ", configType=" + configType + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("configId", getConfigId())
+ .append("configName", getConfigName())
+ .append("configKey", getConfigKey())
+ .append("configValue", getConfigValue())
+ .append("configType", getConfigType())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/config/mapper/ConfigMapper.java b/src/main/java/com/ruoyi/project/system/config/mapper/ConfigMapper.java
index 9711fd65..4d03ede1 100644
--- a/src/main/java/com/ruoyi/project/system/config/mapper/ConfigMapper.java
+++ b/src/main/java/com/ruoyi/project/system/config/mapper/ConfigMapper.java
@@ -57,5 +57,4 @@ public interface ConfigMapper
* @return 结果
*/
public int deleteConfigByIds(String[] configIds);
-
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/config/service/ConfigServiceImpl.java b/src/main/java/com/ruoyi/project/system/config/service/ConfigServiceImpl.java
index 495e1691..5b48aac2 100644
--- a/src/main/java/com/ruoyi/project/system/config/service/ConfigServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/config/service/ConfigServiceImpl.java
@@ -117,5 +117,4 @@ public class ConfigServiceImpl implements IConfigService
}
return UserConstants.CONFIG_KEY_UNIQUE;
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/config/service/IConfigService.java b/src/main/java/com/ruoyi/project/system/config/service/IConfigService.java
index 8b0c91ab..a2dd3502 100644
--- a/src/main/java/com/ruoyi/project/system/config/service/IConfigService.java
+++ b/src/main/java/com/ruoyi/project/system/config/service/IConfigService.java
@@ -10,7 +10,6 @@ import java.util.List;
*/
public interface IConfigService
{
-
/**
* 查询参数配置信息
*
@@ -66,5 +65,4 @@ public interface IConfigService
* @return 结果
*/
public String checkConfigKeyUnique(Config config);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java b/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java
index 6e5afa5c..acc30bf9 100644
--- a/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java
+++ b/src/main/java/com/ruoyi/project/system/dept/domain/Dept.java
@@ -1,9 +1,11 @@
package com.ruoyi.project.system.dept.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
- * 部门对象 sys_dept
+ * 部门表 sys_dept
*
* @author ruoyi
*/
@@ -154,11 +156,22 @@ public class Dept extends BaseEntity
}
@Override
- public String toString()
- {
- return "Dept [deptId=" + deptId + ", parentId=" + parentId + ", ancestors=" + ancestors + ", deptName="
- + deptName + ", orderNum=" + orderNum + ", leader=" + leader + ", phone=" + phone + ", email=" + email
- + ", status=" + status + ", parentName=" + parentName + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("deptId", getDeptId())
+ .append("parentId", getParentId())
+ .append("ancestors", getAncestors())
+ .append("deptName", getDeptName())
+ .append("orderNum", getOrderNum())
+ .append("leader", getLeader())
+ .append("phone", getPhone())
+ .append("email", getEmail())
+ .append("status", getStatus())
+ .append("delFlag", getDelFlag())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/dict/domain/DictData.java b/src/main/java/com/ruoyi/project/system/dict/domain/DictData.java
index b2351923..e8f69641 100644
--- a/src/main/java/com/ruoyi/project/system/dict/domain/DictData.java
+++ b/src/main/java/com/ruoyi/project/system/dict/domain/DictData.java
@@ -1,5 +1,7 @@
package com.ruoyi.project.system.dict.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -138,11 +140,22 @@ public class DictData extends BaseEntity
}
@Override
- public String toString()
- {
- return "DictData [dictCode=" + dictCode + ", dictSort=" + dictSort + ", dictLabel=" + dictLabel + ", dictValue="
- + dictValue + ", dictType=" + dictType + ", cssClass=" + cssClass + ", isDefault=" + isDefault
- + ", status=" + status + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("dictCode", getDictCode())
+ .append("dictSort", getDictSort())
+ .append("dictLabel", getDictLabel())
+ .append("dictValue", getDictValue())
+ .append("dictType", getDictType())
+ .append("cssClass", getCssClass())
+ .append("listClass", getListClass())
+ .append("isDefault", getIsDefault())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/dict/domain/DictType.java b/src/main/java/com/ruoyi/project/system/dict/domain/DictType.java
index ed7caaa0..ad65e0d0 100644
--- a/src/main/java/com/ruoyi/project/system/dict/domain/DictType.java
+++ b/src/main/java/com/ruoyi/project/system/dict/domain/DictType.java
@@ -1,5 +1,7 @@
package com.ruoyi.project.system.dict.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -69,10 +71,17 @@ public class DictType extends BaseEntity
}
@Override
- public String toString()
- {
- return "DictType [dictId=" + dictId + ", dictName=" + dictName + ", dictType=" + dictType + ", status=" + status
- + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("dictId", getDictId())
+ .append("dictName", getDictName())
+ .append("dictType", getDictType())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/dict/mapper/DictDataMapper.java b/src/main/java/com/ruoyi/project/system/dict/mapper/DictDataMapper.java
index b75b811f..b21c4b1e 100644
--- a/src/main/java/com/ruoyi/project/system/dict/mapper/DictDataMapper.java
+++ b/src/main/java/com/ruoyi/project/system/dict/mapper/DictDataMapper.java
@@ -11,7 +11,6 @@ import com.ruoyi.project.system.dict.domain.DictData;
*/
public interface DictDataMapper
{
-
/**
* 根据条件分页查询字典数据
*
@@ -93,5 +92,4 @@ public interface DictDataMapper
* @return 结果
*/
public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java b/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java
index 1265c45e..0be11bb3 100644
--- a/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/dict/service/DictDataServiceImpl.java
@@ -117,5 +117,4 @@ public class DictDataServiceImpl implements IDictDataService
dictData.setUpdateBy(ShiroUtils.getLoginName());
return dictDataMapper.updateDictData(dictData);
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java b/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java
index f5648631..1ef4ff0c 100644
--- a/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java
+++ b/src/main/java/com/ruoyi/project/system/dict/service/IDictDataService.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.system.dict.domain.DictData;
*/
public interface IDictDataService
{
-
/**
* 根据条件分页查询字典数据
*
@@ -75,5 +74,4 @@ public interface IDictDataService
* @return 结果
*/
public int updateDictData(DictData dictData);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java b/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java
index bf69afc1..e512141b 100644
--- a/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java
+++ b/src/main/java/com/ruoyi/project/system/menu/controller/MenuController.java
@@ -28,7 +28,6 @@ import com.ruoyi.project.system.role.domain.Role;
@RequestMapping("/system/menu")
public class MenuController extends BaseController
{
-
private String prefix = "system/menu";
@Autowired
diff --git a/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java b/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java
index d410f736..fffd5652 100644
--- a/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java
+++ b/src/main/java/com/ruoyi/project/system/menu/domain/Menu.java
@@ -1,5 +1,7 @@
package com.ruoyi.project.system.menu.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.ArrayList;
import java.util.List;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -12,26 +14,37 @@ import com.ruoyi.framework.web.domain.BaseEntity;
public class Menu extends BaseEntity
{
private static final long serialVersionUID = 1L;
+
/** 菜单ID */
private Long menuId;
+
/** 菜单名称 */
private String menuName;
+
/** 父菜单名称 */
private String parentName;
+
/** 父菜单ID */
private Long parentId;
+
/** 显示顺序 */
private String orderNum;
+
/** 菜单URL */
private String url;
+
/** 类型:0目录,1菜单,2按钮 */
private String menuType;
+
/** 菜单状态:0显示,1隐藏 */
private String visible;
+
/** 权限字符串 */
private String perms;
+
/** 菜单图标 */
private String icon;
+
/** 子菜单 */
private List<Menu> children = new ArrayList<Menu>();
@@ -146,11 +159,22 @@ public class Menu extends BaseEntity
}
@Override
- public String toString()
- {
- return "Menu [menuId=" + menuId + ", menuName=" + menuName + ", parentName=" + parentName + ", parentId="
- + parentId + ", orderNum=" + orderNum + ", url=" + url + ", menuType=" + menuType + ", visible="
- + visible + ", perms=" + perms + ", icon=" + icon + ", children=" + children + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("menuId", getMenuId())
+ .append("menuName", getMenuName())
+ .append("parentId", getParentId())
+ .append("orderNum", getOrderNum())
+ .append("url", getUrl())
+ .append("menuType", getMenuType())
+ .append("visible", getVisible())
+ .append("perms", getPerms())
+ .append("icon", getIcon())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/menu/mapper/MenuMapper.java b/src/main/java/com/ruoyi/project/system/menu/mapper/MenuMapper.java
index 00be8986..acdfe7ed 100644
--- a/src/main/java/com/ruoyi/project/system/menu/mapper/MenuMapper.java
+++ b/src/main/java/com/ruoyi/project/system/menu/mapper/MenuMapper.java
@@ -11,7 +11,6 @@ import com.ruoyi.project.system.menu.domain.Menu;
*/
public interface MenuMapper
{
-
/**
* 查询系统所有菜单（含按钮）
*
@@ -106,5 +105,4 @@ public interface MenuMapper
* @return 结果
*/
public Menu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java b/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java
index 7e9fdc7e..bfd498a5 100644
--- a/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java
+++ b/src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java
@@ -14,7 +14,6 @@ import com.ruoyi.project.system.user.domain.User;
*/
public interface IMenuService
{
-
/**
* 根据用户ID查询菜单
*
@@ -123,5 +122,4 @@ public interface IMenuService
* @return 结果
*/
public String checkMenuNameUnique(Menu menu);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java b/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java
index 7459bdd1..023e3d85 100644
--- a/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/menu/service/MenuServiceImpl.java
@@ -299,5 +299,4 @@ public class MenuServiceImpl implements IMenuService
}
return UserConstants.MENU_NAME_UNIQUE;
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/notice/controller/NoticeController.java b/src/main/java/com/ruoyi/project/system/notice/controller/NoticeController.java
index 987f5a8d..574bcc23 100644
--- a/src/main/java/com/ruoyi/project/system/notice/controller/NoticeController.java
+++ b/src/main/java/com/ruoyi/project/system/notice/controller/NoticeController.java
@@ -106,5 +106,4 @@ public class NoticeController extends BaseController
{
return toAjax(noticeService.deleteNoticeByIds(ids));
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/notice/domain/Notice.java b/src/main/java/com/ruoyi/project/system/notice/domain/Notice.java
index 1fe8a29c..e07513f7 100644
--- a/src/main/java/com/ruoyi/project/system/notice/domain/Notice.java
+++ b/src/main/java/com/ruoyi/project/system/notice/domain/Notice.java
@@ -1,9 +1,11 @@
package com.ruoyi.project.system.notice.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
- * 公告表 sys_notice
+ * 通知公告表 sys_notice
*
* @author ruoyi
*/
@@ -71,5 +73,20 @@ public class Notice extends BaseEntity
{
return status;
}
-
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("noticeId", getNoticeId())
+ .append("noticeTitle", getNoticeTitle())
+ .append("noticeType", getNoticeType())
+ .append("noticeContent", getNoticeContent())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
}
diff --git a/src/main/java/com/ruoyi/project/system/notice/mapper/NoticeMapper.java b/src/main/java/com/ruoyi/project/system/notice/mapper/NoticeMapper.java
index 9b676c55..f6f498f7 100644
--- a/src/main/java/com/ruoyi/project/system/notice/mapper/NoticeMapper.java
+++ b/src/main/java/com/ruoyi/project/system/notice/mapper/NoticeMapper.java
@@ -49,5 +49,4 @@ public interface NoticeMapper
* @return 结果
*/
public int deleteNoticeByIds(String[] noticeIds);
-
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/notice/service/INoticeService.java b/src/main/java/com/ruoyi/project/system/notice/service/INoticeService.java
index bd6f3f88..96276bc8 100644
--- a/src/main/java/com/ruoyi/project/system/notice/service/INoticeService.java
+++ b/src/main/java/com/ruoyi/project/system/notice/service/INoticeService.java
@@ -49,5 +49,4 @@ public interface INoticeService
* @return 结果
*/
public int deleteNoticeByIds(String ids);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/notice/service/NoticeServiceImpl.java b/src/main/java/com/ruoyi/project/system/notice/service/NoticeServiceImpl.java
index 25ade139..ff01f3c6 100644
--- a/src/main/java/com/ruoyi/project/system/notice/service/NoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/notice/service/NoticeServiceImpl.java
@@ -82,5 +82,4 @@ public class NoticeServiceImpl implements INoticeService
{
return noticeMapper.deleteNoticeByIds(Convert.toStrArray(ids));
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/post/controller/PostController.java b/src/main/java/com/ruoyi/project/system/post/controller/PostController.java
index 02db5e15..6bf7a185 100644
--- a/src/main/java/com/ruoyi/project/system/post/controller/PostController.java
+++ b/src/main/java/com/ruoyi/project/system/post/controller/PostController.java
@@ -139,5 +139,4 @@ public class PostController extends BaseController
{
return postService.checkPostCodeUnique(post);
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/post/domain/Post.java b/src/main/java/com/ruoyi/project/system/post/domain/Post.java
index a38d5544..b0df6d69 100644
--- a/src/main/java/com/ruoyi/project/system/post/domain/Post.java
+++ b/src/main/java/com/ruoyi/project/system/post/domain/Post.java
@@ -1,10 +1,12 @@
package com.ruoyi.project.system.post.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
- * 岗位对象 sys_post
+ * 岗位表 sys_post
*
* @author ruoyi
*/
@@ -96,10 +98,18 @@ public class Post extends BaseEntity
}
@Override
- public String toString()
- {
- return "Post [postId=" + postId + ", postCode=" + postCode + ", postName=" + postName + ", postSort=" + postSort
- + ", status=" + status + ", flag=" + flag + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("postId", getPostId())
+ .append("postCode", getPostCode())
+ .append("postName", getPostName())
+ .append("postSort", getPostSort())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/post/mapper/PostMapper.java b/src/main/java/com/ruoyi/project/system/post/mapper/PostMapper.java
index 08c07e89..f2de38e5 100644
--- a/src/main/java/com/ruoyi/project/system/post/mapper/PostMapper.java
+++ b/src/main/java/com/ruoyi/project/system/post/mapper/PostMapper.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.system.post.domain.Post;
*/
public interface PostMapper
{
-
/**
* 查询岗位数据集合
*
@@ -81,5 +80,4 @@ public interface PostMapper
* @return 结果
*/
public Post checkPostCodeUnique(String postCode);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java b/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java
index 9f1c868d..a9900fcc 100644
--- a/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/post/service/PostServiceImpl.java
@@ -179,5 +179,4 @@ public class PostServiceImpl implements IPostService
}
return UserConstants.POST_CODE_UNIQUE;
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java b/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java
index 53211b81..5dfb4bff 100644
--- a/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java
+++ b/src/main/java/com/ruoyi/project/system/role/controller/RoleController.java
@@ -29,7 +29,6 @@ import com.ruoyi.project.system.role.service.IRoleService;
@RequestMapping("/system/role")
public class RoleController extends BaseController
{
-
private String prefix = "system/role";
@Autowired
@@ -176,5 +175,4 @@ public class RoleController extends BaseController
{
return prefix + "/tree";
}
-
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/role/domain/Role.java b/src/main/java/com/ruoyi/project/system/role/domain/Role.java
index d8f0c5ef..559af982 100644
--- a/src/main/java/com/ruoyi/project/system/role/domain/Role.java
+++ b/src/main/java/com/ruoyi/project/system/role/domain/Role.java
@@ -1,11 +1,12 @@
package com.ruoyi.project.system.role.domain;
-import java.util.Arrays;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
- * 角色对象 sys_role
+ * 角色表 sys_role
*
* @author ruoyi
*/
@@ -150,11 +151,20 @@ public class Role extends BaseEntity
}
@Override
- public String toString()
- {
- return "Role [roleId=" + roleId + ", roleName=" + roleName + ", roleKey=" + roleKey + ", roleSort=" + roleSort
- + ", dataScope=" + dataScope + ", status=" + status + ", flag=" + flag + ", menuIds="
- + Arrays.toString(menuIds) + ", deptIds=" + Arrays.toString(deptIds) + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("roleId", getRoleId())
+ .append("roleName", getRoleName())
+ .append("roleKey", getRoleKey())
+ .append("roleSort", getRoleSort())
+ .append("dataScope", getDataScope())
+ .append("status", getStatus())
+ .append("delFlag", getDelFlag())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/role/domain/RoleDept.java b/src/main/java/com/ruoyi/project/system/role/domain/RoleDept.java
index b98776b3..18d32461 100644
--- a/src/main/java/com/ruoyi/project/system/role/domain/RoleDept.java
+++ b/src/main/java/com/ruoyi/project/system/role/domain/RoleDept.java
@@ -1,5 +1,8 @@
package com.ruoyi.project.system.role.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
/**
* 角色和部门关联 sys_role_dept
*
@@ -9,6 +12,7 @@ public class RoleDept
{
/** 角色ID */
private Long roleId;
+
/** 部门ID */
private Long deptId;
@@ -33,8 +37,10 @@ public class RoleDept
}
@Override
- public String toString()
- {
- return "RoleDept [roleId=" + roleId + ", deptId=" + deptId + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("roleId", getRoleId())
+ .append("deptId", getDeptId())
+ .toString();
}
}
diff --git a/src/main/java/com/ruoyi/project/system/role/domain/RoleMenu.java b/src/main/java/com/ruoyi/project/system/role/domain/RoleMenu.java
index 20d831e3..00b14273 100644
--- a/src/main/java/com/ruoyi/project/system/role/domain/RoleMenu.java
+++ b/src/main/java/com/ruoyi/project/system/role/domain/RoleMenu.java
@@ -1,5 +1,8 @@
package com.ruoyi.project.system.role.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
/**
* 角色和菜单关联 sys_role_menu
*
@@ -9,6 +12,7 @@ public class RoleMenu
{
/** 角色ID */
private Long roleId;
+
/** 菜单ID */
private Long menuId;
@@ -33,9 +37,10 @@ public class RoleMenu
}
@Override
- public String toString()
- {
- return "RoleMenu [roleId=" + roleId + ", menuId=" + menuId + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("roleId", getRoleId())
+ .append("menuId", getMenuId())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/role/mapper/RoleDeptMapper.java b/src/main/java/com/ruoyi/project/system/role/mapper/RoleDeptMapper.java
index bed46b5e..66dba3cb 100644
--- a/src/main/java/com/ruoyi/project/system/role/mapper/RoleDeptMapper.java
+++ b/src/main/java/com/ruoyi/project/system/role/mapper/RoleDeptMapper.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.system.role.domain.RoleDept;
*/
public interface RoleDeptMapper
{
-
/**
* 通过角色ID删除角色和部门关联
*
@@ -42,5 +41,4 @@ public interface RoleDeptMapper
* @return 结果
*/
public int batchRoleDept(List<RoleDept> roleDeptList);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/role/mapper/RoleMapper.java b/src/main/java/com/ruoyi/project/system/role/mapper/RoleMapper.java
index 4cc83809..0cfff131 100644
--- a/src/main/java/com/ruoyi/project/system/role/mapper/RoleMapper.java
+++ b/src/main/java/com/ruoyi/project/system/role/mapper/RoleMapper.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.system.role.domain.Role;
*/
public interface RoleMapper
{
-
/**
* 根据条件分页查询角色数据
*
@@ -82,5 +81,4 @@ public interface RoleMapper
* @return 角色信息
*/
public Role checkRoleKeyUnique(String roleKey);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/role/mapper/RoleMenuMapper.java b/src/main/java/com/ruoyi/project/system/role/mapper/RoleMenuMapper.java
index 56e7cd49..6d05898c 100644
--- a/src/main/java/com/ruoyi/project/system/role/mapper/RoleMenuMapper.java
+++ b/src/main/java/com/ruoyi/project/system/role/mapper/RoleMenuMapper.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.system.role.domain.RoleMenu;
*/
public interface RoleMenuMapper
{
-
/**
* 通过角色ID删除角色和菜单关联
*
@@ -42,5 +41,4 @@ public interface RoleMenuMapper
* @return 结果
*/
public int batchRoleMenu(List<RoleMenu> roleMenuList);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java b/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java
index 422607f6..383e086f 100644
--- a/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java
+++ b/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java
@@ -11,7 +11,6 @@ import com.ruoyi.project.system.role.domain.Role;
*/
public interface IRoleService
{
-
/**
* 根据条件分页查询角色数据
*
@@ -115,5 +114,4 @@ public interface IRoleService
* @return 结果
*/
public int countUserRoleByRoleId(Long roleId);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java
index f1c833e3..2a2ed206 100644
--- a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java
@@ -28,7 +28,6 @@ import com.ruoyi.project.system.user.mapper.UserRoleMapper;
@Service
public class RoleServiceImpl implements IRoleService
{
-
@Autowired
private RoleMapper roleMapper;
@@ -303,5 +302,4 @@ public class RoleServiceImpl implements IRoleService
{
return userRoleMapper.countUserRoleByRoleId(roleId);
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/user/controller/CaptchaController.java b/src/main/java/com/ruoyi/project/system/user/controller/CaptchaController.java
index 7b416ac4..6555a436 100644
--- a/src/main/java/com/ruoyi/project/system/user/controller/CaptchaController.java
+++ b/src/main/java/com/ruoyi/project/system/user/controller/CaptchaController.java
@@ -25,7 +25,6 @@ import com.ruoyi.framework.web.controller.BaseController;
@RequestMapping("/captcha")
public class CaptchaController extends BaseController
{
-
@Resource(name = "captchaProducer")
private Producer captchaProducer;
diff --git a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java
index 276157ca..35999895 100644
--- a/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java
+++ b/src/main/java/com/ruoyi/project/system/user/controller/IndexController.java
@@ -46,5 +46,4 @@ public class IndexController extends BaseController
mmap.put("version", ruoYiConfig.getVersion());
return "main";
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
index 8afa8b79..4667d574 100644
--- a/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
+++ b/src/main/java/com/ruoyi/project/system/user/controller/LoginController.java
@@ -23,7 +23,6 @@ import com.ruoyi.framework.web.domain.AjaxResult;
@Controller
public class LoginController extends BaseController
{
-
@GetMapping("/login")
public String login(HttpServletRequest request, HttpServletResponse response)
{
diff --git a/src/main/java/com/ruoyi/project/system/user/domain/User.java b/src/main/java/com/ruoyi/project/system/user/domain/User.java
index 26603f91..c54628c8 100644
--- a/src/main/java/com/ruoyi/project/system/user/domain/User.java
+++ b/src/main/java/com/ruoyi/project/system/user/domain/User.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.system.user.domain;
-import java.util.Arrays;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
import java.util.List;
import org.apache.shiro.crypto.SecureRandomNumberGenerator;
@@ -296,14 +297,27 @@ public class User extends BaseEntity
}
@Override
- public String toString()
- {
- return "User [userId=" + userId + ", deptId=" + deptId + ", parentId=" + parentId + ", loginName=" + loginName
- + ", userName=" + userName + ", email=" + email + ", phonenumber=" + phonenumber + ", sex=" + sex
- + ", avatar=" + avatar + ", password=" + password + ", salt=" + salt + ", status=" + status
- + ", delFlag=" + delFlag + ", loginIp=" + loginIp + ", loginDate=" + loginDate + ", dept=" + dept
- + ", roles=" + roles + ", roleIds=" + Arrays.toString(roleIds) + ", postIds=" + Arrays.toString(postIds)
- + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("userId", getUserId())
+ .append("deptId", getDeptId())
+ .append("loginName", getLoginName())
+ .append("userName", getUserName())
+ .append("email", getEmail())
+ .append("phonenumber", getPhonenumber())
+ .append("sex", getSex())
+ .append("avatar", getAvatar())
+ .append("password", getPassword())
+ .append("salt", getSalt())
+ .append("status", getStatus())
+ .append("delFlag", getDelFlag())
+ .append("loginIp", getLoginIp())
+ .append("loginDate", getLoginDate())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/user/domain/UserPost.java b/src/main/java/com/ruoyi/project/system/user/domain/UserPost.java
index 89cabb4a..b27cb667 100644
--- a/src/main/java/com/ruoyi/project/system/user/domain/UserPost.java
+++ b/src/main/java/com/ruoyi/project/system/user/domain/UserPost.java
@@ -1,5 +1,8 @@
package com.ruoyi.project.system.user.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
/**
* 用户和岗位关联 sys_user_post
*
@@ -33,9 +36,10 @@ public class UserPost
}
@Override
- public String toString()
- {
- return "UserPost [userId=" + userId + ", postId=" + postId + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("userId", getUserId())
+ .append("postId", getPostId())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/user/domain/UserRole.java b/src/main/java/com/ruoyi/project/system/user/domain/UserRole.java
index 314a2df7..e03990f6 100644
--- a/src/main/java/com/ruoyi/project/system/user/domain/UserRole.java
+++ b/src/main/java/com/ruoyi/project/system/user/domain/UserRole.java
@@ -1,5 +1,8 @@
package com.ruoyi.project.system.user.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
/**
* 用户和角色关联 sys_user_role
*
@@ -9,6 +12,7 @@ public class UserRole
{
/** 用户ID */
private Long userId;
+
/** 角色ID */
private Long roleId;
@@ -33,9 +37,10 @@ public class UserRole
}
@Override
- public String toString()
- {
- return "UserRole [userId=" + userId + ", roleId=" + roleId + "]";
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("userId", getUserId())
+ .append("roleId", getRoleId())
+ .toString();
}
-
}
diff --git a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
index cd2e5188..184c3839 100644
--- a/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
+++ b/src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java
@@ -10,7 +10,6 @@ import java.util.List;
*/
public interface UserMapper
{
-
/**
* 根据条件分页查询用户对象
*
diff --git a/src/main/java/com/ruoyi/project/system/user/mapper/UserPostMapper.java b/src/main/java/com/ruoyi/project/system/user/mapper/UserPostMapper.java
index ca17cb6a..4ecd6682 100644
--- a/src/main/java/com/ruoyi/project/system/user/mapper/UserPostMapper.java
+++ b/src/main/java/com/ruoyi/project/system/user/mapper/UserPostMapper.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.system.user.domain.UserPost;
*/
public interface UserPostMapper
{
-
/**
* 通过用户ID删除用户和岗位关联
*
@@ -42,5 +41,4 @@ public interface UserPostMapper
* @return 结果
*/
public int batchUserPost(List<UserPost> userPostList);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/user/mapper/UserRoleMapper.java b/src/main/java/com/ruoyi/project/system/user/mapper/UserRoleMapper.java
index 148b1eed..b9805a43 100644
--- a/src/main/java/com/ruoyi/project/system/user/mapper/UserRoleMapper.java
+++ b/src/main/java/com/ruoyi/project/system/user/mapper/UserRoleMapper.java
@@ -10,7 +10,6 @@ import com.ruoyi.project.system.user.domain.UserRole;
*/
public interface UserRoleMapper
{
-
/**
* 通过用户ID删除用户和角色关联
*
@@ -42,5 +41,4 @@ public interface UserRoleMapper
* @return 结果
*/
public int batchUserRole(List<UserRole> userRoleList);
-
}
diff --git a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
index 4ae763f8..9200dd51 100644
--- a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
+++ b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java
@@ -10,7 +10,6 @@ import java.util.List;
*/
public interface IUserService
{
-
/**
* 根据条件分页查询用户对象
*
diff --git a/src/main/java/com/ruoyi/project/tool/gen/domain/ColumnInfo.java b/src/main/java/com/ruoyi/project/tool/gen/domain/ColumnInfo.java
index 142ba302..9537360f 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/domain/ColumnInfo.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/domain/ColumnInfo.java
@@ -84,5 +84,4 @@ public class ColumnInfo
{
this.attrType = attrType;
}
-
}
diff --git a/src/main/java/com/ruoyi/project/tool/gen/domain/TableInfo.java b/src/main/java/com/ruoyi/project/tool/gen/domain/TableInfo.java
index fd3edcb3..aa5c9dab 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/domain/TableInfo.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/domain/TableInfo.java
@@ -107,5 +107,4 @@ public class TableInfo extends BaseEntity
return "TableInfo [tableName=" + tableName + ", tableComment=" + tableComment + ", primaryKey=" + primaryKey
+ ", columns=" + columns + ", className=" + className + ", classname=" + classname + "]";
}
-
}
diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/IGenService.java b/src/main/java/com/ruoyi/project/tool/gen/service/IGenService.java
index 4939f21e..53bed04f 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/service/IGenService.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/service/IGenService.java
@@ -33,5 +33,4 @@ public interface IGenService
* @return 数据
*/
public byte[] generatorCode(String[] tableNames);
-
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c2c2535a..07f4dafc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -3,7 +3,7 @@ ruoyi:
# 名称
name: RuoYi
# 版本
- version: 2.4.0
+ version: 3.0.0
# 版权年份
copyrightYear: 2018
# 文件上传路径
diff --git a/src/main/resources/static/ruoyi/js/ry-ui.js b/src/main/resources/static/ruoyi/js/ry-ui.js
index 90db6beb..8ad92031 100644
--- a/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -519,11 +519,9 @@
return false;
},
// 表单验证
- form: function (id) {
- if ($.common.isEmpty(id)) {
- return false;
- }
- return $(id).validate().form();
+ form: function (formId) {
+ var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
+ return $("#" + currentId).validate().form();
}
},
// 树插件封装处理
diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
index daec243e..7c108dbb 100644
--- a/src/main/resources/templates/main.html
+++ b/src/main/resources/templates/main.html
@@ -115,6 +115,7 @@
<li>新增数据权限过滤注解</li>
<li>新增表格检索折叠按钮</li>
<li>新增清空（登录、操作、调度）日志</li>
+ <li>固定按钮位置（提交/关闭）</li>
<li>部分细节调整优化</li>
<li>项目采用分模块</li>
</ol>
diff --git a/src/main/resources/templates/monitor/job/add.html b/src/main/resources/templates/monitor/job/add.html
index 1411ee77..f4194693 100644
--- a/src/main/resources/templates/monitor/job/add.html
+++ b/src/main/resources/templates/monitor/job/add.html
@@ -82,7 +82,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-job-add")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-job-add').serialize());
}
}
diff --git a/src/main/resources/templates/monitor/job/edit.html b/src/main/resources/templates/monitor/job/edit.html
index faa986ac..2ed46693 100644
--- a/src/main/resources/templates/monitor/job/edit.html
+++ b/src/main/resources/templates/monitor/job/edit.html
@@ -80,7 +80,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-job-edit")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-job-edit').serialize());
}
}
diff --git a/src/main/resources/templates/system/config/add.html b/src/main/resources/templates/system/config/add.html
index 99cb1903..2b3a920e 100644
--- a/src/main/resources/templates/system/config/add.html
+++ b/src/main/resources/templates/system/config/add.html
@@ -77,7 +77,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-config-add")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-config-add').serialize());
}
}
diff --git a/src/main/resources/templates/system/config/edit.html b/src/main/resources/templates/system/config/edit.html
index df769230..eab14694 100644
--- a/src/main/resources/templates/system/config/edit.html
+++ b/src/main/resources/templates/system/config/edit.html
@@ -81,7 +81,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-config-edit")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-config-edit').serialize());
}
}
diff --git a/src/main/resources/templates/system/dept/add.html b/src/main/resources/templates/system/dept/add.html
index c3807093..c61873cf 100644
--- a/src/main/resources/templates/system/dept/add.html
+++ b/src/main/resources/templates/system/dept/add.html
@@ -97,7 +97,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-dept-add")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-dept-add').serialize());
}
}
diff --git a/src/main/resources/templates/system/dept/edit.html b/src/main/resources/templates/system/dept/edit.html
index b6e92944..c9ec775c 100644
--- a/src/main/resources/templates/system/dept/edit.html
+++ b/src/main/resources/templates/system/dept/edit.html
@@ -101,7 +101,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-dept-edit")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-dept-edit').serialize());
}
}
diff --git a/src/main/resources/templates/system/dict/data/add.html b/src/main/resources/templates/system/dict/data/add.html
index eb6637f5..722ea38e 100644
--- a/src/main/resources/templates/system/dict/data/add.html
+++ b/src/main/resources/templates/system/dict/data/add.html
@@ -96,7 +96,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-dict-add")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-dict-add').serialize());
}
}
diff --git a/src/main/resources/templates/system/dict/data/edit.html b/src/main/resources/templates/system/dict/data/edit.html
index a334566e..11b85d6a 100644
--- a/src/main/resources/templates/system/dict/data/edit.html
+++ b/src/main/resources/templates/system/dict/data/edit.html
@@ -97,7 +97,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-dict-edit")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-dict-edit').serialize());
}
}
diff --git a/src/main/resources/templates/system/dict/type/add.html b/src/main/resources/templates/system/dict/type/add.html
index eafe55cc..d51790e2 100644
--- a/src/main/resources/templates/system/dict/type/add.html
+++ b/src/main/resources/templates/system/dict/type/add.html
@@ -69,7 +69,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-dict-add")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-dict-add').serialize());
}
}
diff --git a/src/main/resources/templates/system/dict/type/edit.html b/src/main/resources/templates/system/dict/type/edit.html
index 27480ec3..17481b53 100644
--- a/src/main/resources/templates/system/dict/type/edit.html
+++ b/src/main/resources/templates/system/dict/type/edit.html
@@ -73,7 +73,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-dict-edit")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-dict-edit').serialize());
}
}
diff --git a/src/main/resources/templates/system/menu/add.html b/src/main/resources/templates/system/menu/add.html
index affa4f24..84f73677 100644
--- a/src/main/resources/templates/system/menu/add.html
+++ b/src/main/resources/templates/system/menu/add.html
@@ -106,7 +106,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-menu-add")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-menu-add').serialize());
}
}
diff --git a/src/main/resources/templates/system/menu/edit.html b/src/main/resources/templates/system/menu/edit.html
index 8a82a4b0..27d843e5 100644
--- a/src/main/resources/templates/system/menu/edit.html
+++ b/src/main/resources/templates/system/menu/edit.html
@@ -116,7 +116,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-menu-edit")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-menu-edit').serialize());
}
}
diff --git a/src/main/resources/templates/system/post/add.html b/src/main/resources/templates/system/post/add.html
index 0483bec0..a9c95bc9 100644
--- a/src/main/resources/templates/system/post/add.html
+++ b/src/main/resources/templates/system/post/add.html
@@ -94,7 +94,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-post-add")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-post-add').serialize());
}
}
diff --git a/src/main/resources/templates/system/post/edit.html b/src/main/resources/templates/system/post/edit.html
index 97696d23..5bcba24a 100644
--- a/src/main/resources/templates/system/post/edit.html
+++ b/src/main/resources/templates/system/post/edit.html
@@ -101,7 +101,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-post-edit")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-post-edit').serialize());
}
}
diff --git a/src/main/resources/templates/system/role/add.html b/src/main/resources/templates/system/role/add.html
index ea0bcf62..91d05865 100644
--- a/src/main/resources/templates/system/role/add.html
+++ b/src/main/resources/templates/system/role/add.html
@@ -114,7 +114,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-role-add")) {
+ if ($.validate.form()) {
add();
}
}
diff --git a/src/main/resources/templates/system/role/edit.html b/src/main/resources/templates/system/role/edit.html
index 07c5e286..b4f4de9c 100644
--- a/src/main/resources/templates/system/role/edit.html
+++ b/src/main/resources/templates/system/role/edit.html
@@ -152,7 +152,7 @@
}
function submitHandler() {
- if ($.validate.form("#form-role-edit")) {
+ if ($.validate.form()) {
edit();
}
}
diff --git a/src/main/resources/templates/system/role/rule.html b/src/main/resources/templates/system/role/rule.html
index 218618b3..745f7f2c 100644
--- a/src/main/resources/templates/system/role/rule.html
+++ b/src/main/resources/templates/system/role/rule.html
@@ -54,7 +54,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-role-edit")) {
+ if ($.validate.form()) {
edit();
}
}
diff --git a/src/main/resources/templates/system/user/add.html b/src/main/resources/templates/system/user/add.html
index 9e05c494..3205d732 100644
--- a/src/main/resources/templates/system/user/add.html
+++ b/src/main/resources/templates/system/user/add.html
@@ -164,7 +164,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-user-add")) {
+ if ($.validate.form()) {
add();
}
}
diff --git a/src/main/resources/templates/system/user/edit.html b/src/main/resources/templates/system/user/edit.html
index 97ab7d95..d62a6b47 100644
--- a/src/main/resources/templates/system/user/edit.html
+++ b/src/main/resources/templates/system/user/edit.html
@@ -142,7 +142,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-user-edit")) {
+ if ($.validate.form()) {
edit();
}
}
diff --git a/src/main/resources/templates/system/user/profile/edit.html b/src/main/resources/templates/system/user/profile/edit.html
index 30475345..d15fc700 100644
--- a/src/main/resources/templates/system/user/profile/edit.html
+++ b/src/main/resources/templates/system/user/profile/edit.html
@@ -111,7 +111,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-user-edit")) {
+ if ($.validate.form()) {
$.operate.save(ctx + "system/user/profile/update", $('#form-user-edit').serialize());
}
}
diff --git a/src/main/resources/templates/system/user/profile/resetPwd.html b/src/main/resources/templates/system/user/profile/resetPwd.html
index 20d1f98f..ecb0758e 100644
--- a/src/main/resources/templates/system/user/profile/resetPwd.html
+++ b/src/main/resources/templates/system/user/profile/resetPwd.html
@@ -80,7 +80,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-user-resetPwd")) {
+ if ($.validate.form()) {
$.operate.save(ctx + "system/user/profile/resetPwd", $('#form-user-resetPwd').serialize());
}
}
diff --git a/src/main/resources/templates/system/user/resetPwd.html b/src/main/resources/templates/system/user/resetPwd.html
index 8f4db9cc..77c4e644 100644
--- a/src/main/resources/templates/system/user/resetPwd.html
+++ b/src/main/resources/templates/system/user/resetPwd.html
@@ -33,7 +33,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-user-resetPwd")) {
+ if ($.validate.form()) {
$.operate.save(ctx + "system/user/resetPwd", $('#form-user-resetPwd').serialize());
}
}
diff --git a/src/main/resources/templates/vm/html/add.html.vm b/src/main/resources/templates/vm/html/add.html.vm
index 130de149..7e29b0ec 100644
--- a/src/main/resources/templates/vm/html/add.html.vm
+++ b/src/main/resources/templates/vm/html/add.html.vm
@@ -29,7 +29,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-${classname}-add")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-${classname}-add').serialize());
}
}
diff --git a/src/main/resources/templates/vm/html/edit.html.vm b/src/main/resources/templates/vm/html/edit.html.vm
index 4f6d6743..e72b9388 100644
--- a/src/main/resources/templates/vm/html/edit.html.vm
+++ b/src/main/resources/templates/vm/html/edit.html.vm
@@ -30,7 +30,7 @@
});
function submitHandler() {
- if ($.validate.form("#form-${classname}-edit")) {
+ if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-${classname}-edit').serialize());
}
}