format

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>
 

src/main/java/com/ruoyi/RuoYiServletInitializer.java

@@ -15,5 +15,4 @@ public class RuoYiServletInitializer extends SpringBootServletInitializer
     {
         return application.sources(RuoYiApplication.class);
     }
-
 }

src/main/java/com/ruoyi/common/constant/Constants.java

@@ -61,5 +61,4 @@ public class Constants
      * 排序的方向 "desc" 或者 "asc".
      */
     public static String IS_ASC = "isAsc";
-
 }

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;
         }
     }
-
 }

src/main/java/com/ruoyi/common/constant/ShiroConstants.java

@@ -61,5 +61,4 @@ public interface ShiroConstants
      * 验证码错误
      */
     public static final String CAPTCHA_ERROR = "captchaError";
-
 }

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])))\\.?";
-
 }

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;
 
     /**

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;
     }
-
 }

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);
         }
     }
-
 }

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
     }
-
 }

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)

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()

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)

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()

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()

src/main/java/com/ruoyi/common/support/CharsetKit.java

@@ -84,5 +84,4 @@ public class CharsetKit
     {
         return Charset.defaultCharset().name();
     }
-
 }

src/main/java/com/ruoyi/common/support/Convert.java

@@ -998,5 +998,4 @@ public class Convert
         return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$",
                 "零元整");
     }
-
 }

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();
     }
-
 }

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");
     }
-
 }

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;
     }
-
 }

src/main/java/com/ruoyi/common/utils/Md5Utils.java

@@ -63,5 +63,4 @@ public class Md5Utils
             return s;
         }
     }
-
 }

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);
     }
-
 }

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获取所有子节点
      * 

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);
         }
     }
-
 }

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;
     }
-
 }

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;
         }
     }
-
 }

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

@@ -480,5 +480,4 @@ public class ExcelUtil<T>
         }
         return downloadPath;
     }
-
 }

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();

src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java

@@ -98,5 +98,4 @@ public final class SpringUtils implements BeanFactoryPostProcessor
     {
         return beanFactory.getAliases(name);
     }
-
 }

src/main/java/com/ruoyi/common/xss/XssFilter.java

@@ -94,5 +94,4 @@ public class XssFilter implements Filter
     {
 
     }
-
 }

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
      */

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 "";
 }

src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java

@@ -30,5 +30,4 @@ public @interface Log
 
     /** 是否保存请求的参数 */
     boolean isSaveRequestData() default true;
-
 }

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()
                 + "]";
     }
-
 }

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()
     {

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();
     }
-
 }

src/main/java/com/ruoyi/framework/config/RuoYiConfig.java

@@ -82,5 +82,4 @@ public class RuoYiConfig
     {
         return profile + "download/";
     }
-
 }

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)
     {

src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java

@@ -23,5 +23,4 @@ public class DynamicDataSource extends AbstractRoutingDataSource
     {
         return DynamicDataSourceContextHolder.getDateSoureType();
     }
-
 }

src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java

@@ -42,5 +42,4 @@ public class DynamicDataSourceContextHolder
     {
         CONTEXT_HOLDER.remove();
     }
-
 }

src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java

@@ -140,5 +140,4 @@ public class UserRealm extends AuthorizingRealm
     {
         this.clearCachedAuthorizationInfo(SecurityUtils.getSubject().getPrincipals());
     }
-
 }

src/main/java/com/ruoyi/framework/shiro/service/LoginService.java

@@ -133,5 +133,4 @@ public class LoginService
         user.setLoginDate(DateUtils.getNowDate());
         userService.updateUserInfo(user);
     }
-
 }

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;
 

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);
     }
-
 }

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
 {
-
     /**
      * 是否开启验证码
      */

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);
     }
-
 }

src/main/java/com/ruoyi/project/common/CommonController.java

@@ -70,6 +70,5 @@ public class CommonController
             filename = URLEncoder.encode(filename, "utf-8");
         }
         return filename;
-
     }
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "Job [jobId=" + jobId + ", jobName=" + jobName + ", jobGroup=" + jobGroup + ", methodName=" + methodName
+            .append("jobId", getJobId())
-                + ", methodParams=" + methodParams + ", cronExpression=" + cronExpression + ", status=" + status + "]";
+            .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();
     }
-
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "JobLog [jobLogId=" + jobLogId + ", jobName=" + jobName + ", jobGroup=" + jobGroup + ", methodName="
+            .append("jobLogId", getJobLogId())
-                + methodName + ", methodParams=" + methodParams + ", jobMessage=" + jobMessage + ", status=" + status
+            .append("jobName", getJobName())
-                + ", exceptionInfo=" + exceptionInfo + "]";
+            .append("jobGroup", getJobGroup())
+            .append("methodName", getMethodName())
+            .append("methodParams", getMethodParams())
+            .append("jobMessage", getJobMessage())
+            .append("status", getStatus())
+            .append("exceptionInfo", getExceptionInfo())
+            .append("createTime", getCreateTime())
+            .toString();
     }
-
 }

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();
-
 }

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);
-
 }

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();
-    
 }

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);
-
 }

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();
     }
-
 }

src/main/java/com/ruoyi/project/monitor/job/service/JobServiceImpl.java

@@ -208,5 +208,4 @@ public class JobServiceImpl implements IJobService
         }
         return rows;
     }
-
 }

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("执行无参方法");
     }
-
 }

src/main/java/com/ruoyi/project/monitor/job/util/ScheduleRunnable.java

@@ -53,5 +53,4 @@ public class ScheduleRunnable implements Runnable
             e.printStackTrace();
         }
     }
-
 }

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()
+                throw new TaskException("The task misfire policy '" + job.getMisfirePolicy() + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR);
-                        + "' cannot be used in cron schedule tasks", Code.CONFIG_ERROR);
         }
     }
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "Logininfor [infoId=" + infoId + ", loginName=" + loginName + ", status=" + status + ", ipaddr=" + ipaddr
+            .append("infoId", getInfoId())
-                + ",loginLocation=" + loginLocation + ", browser=" + browser + ", os=" + os + ", msg=" + msg
+            .append("loginName", getLoginName())
-                + ", loginTime=" + loginTime + "]";
+            .append("ipaddr", getIpaddr())
+            .append("loginLocation", getLoginLocation())
+            .append("browser", getBrowser())
+            .append("os", getOs())
+            .append("status", getStatus())
+            .append("msg", getMsg())
+            .append("loginTime", getLoginTime())
+            .toString();
     }
-
 }

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
 {
-
     /**
      * 新增系统登录日志
      * 

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;
 

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();
     }
-
 }

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;
         }
     }
-
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "UserOnline [sessionId=" + sessionId + ", deptName=" + deptName + ", loginName=" + loginName
+            .append("sessionId", getSessionId())
-                + ", ipaddr=" + ipaddr + ", browser=" + browser + ", os=" + os + ", startTimestamp=" + startTimestamp
+            .append("loginName", getLoginName())
-                + ", lastAccessTime=" + lastAccessTime + ", expireTime=" + expireTime + ", status=" + status
+            .append("deptName", getDeptName())
-                + ", session=" + session + "]";
+            .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();
     }
-
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "OperLog [operId=" + operId + ", title=" + title + ", businessType=" + businessType + ", method="
+            .append("operId", getOperId())
-                + method + ", operatorType=" + operatorType + ", operName=" + operName + ", deptName=" + deptName
+            .append("title", getTitle())
-                + ", operUrl=" + operUrl + ", operIp=" + operIp + ", operLocation=" + operLocation + ", operParam="
+            .append("businessType", getBusinessType())
-                + operParam + ", status=" + status + ", errorMsg=" + errorMsg + ", operTime=" + operTime + "]";
+            .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();
     }
-
 }

src/main/java/com/ruoyi/project/system/config/controller/ConfigController.java

@@ -128,5 +128,4 @@ public class ConfigController extends BaseController
     {
         return configService.checkConfigKeyUnique(config);
     }
-
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "Config [configId=" + configId + ", configName=" + configName + ", configKey=" + configKey
+            .append("configId", getConfigId())
-                + ", configValue=" + configValue + ", configType=" + configType + "]";
+            .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();
     }
-
 }

src/main/java/com/ruoyi/project/system/config/mapper/ConfigMapper.java

@@ -57,5 +57,4 @@ public interface ConfigMapper
      * @return 结果
      */
     public int deleteConfigByIds(String[] configIds);
-
 }

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;
     }
-
 }

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);
-
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "Dept [deptId=" + deptId + ", parentId=" + parentId + ", ancestors=" + ancestors + ", deptName="
+            .append("deptId", getDeptId())
-                + deptName + ", orderNum=" + orderNum + ", leader=" + leader + ", phone=" + phone + ", email=" + email
+            .append("parentId", getParentId())
-                + ", status=" + status + ", parentName=" + parentName + "]";
+            .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();
     }
-
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "DictData [dictCode=" + dictCode + ", dictSort=" + dictSort + ", dictLabel=" + dictLabel + ", dictValue="
+            .append("dictCode", getDictCode())
-                + dictValue + ", dictType=" + dictType + ", cssClass=" + cssClass + ", isDefault=" + isDefault
+            .append("dictSort", getDictSort())
-                + ", status=" + status + "]";
+            .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();
     }
-
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "DictType [dictId=" + dictId + ", dictName=" + dictName + ", dictType=" + dictType + ", status=" + status
+            .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();
     }
-
 }

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);
-
 }

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);
     }
-
 }

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);
-
 }

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

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "Menu [menuId=" + menuId + ", menuName=" + menuName + ", parentName=" + parentName + ", parentId="
+            .append("menuId", getMenuId())
-                + parentId + ", orderNum=" + orderNum + ", url=" + url + ", menuType=" + menuType + ", visible="
+            .append("menuName", getMenuName())
-                + visible + ", perms=" + perms + ", icon=" + icon + ", children=" + children + "]";
+            .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();
     }
-
 }

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);
-
 }

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);
-
 }

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;
     }
-
 }

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));
     }
-
 }

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();
+    }
 }

src/main/java/com/ruoyi/project/system/notice/mapper/NoticeMapper.java

@@ -49,5 +49,4 @@ public interface NoticeMapper
      * @return 结果
      */
     public int deleteNoticeByIds(String[] noticeIds);
-
 }

src/main/java/com/ruoyi/project/system/notice/service/INoticeService.java

@@ -49,5 +49,4 @@ public interface INoticeService
      * @return 结果
      */
     public int deleteNoticeByIds(String ids);
-
 }

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));
     }
-
 }

src/main/java/com/ruoyi/project/system/post/controller/PostController.java

@@ -139,5 +139,4 @@ public class PostController extends BaseController
     {
         return postService.checkPostCodeUnique(post);
     }
-
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "Post [postId=" + postId + ", postCode=" + postCode + ", postName=" + postName + ", postSort=" + postSort
+            .append("postId", getPostId())
-                + ", status=" + status + ", flag=" + flag + "]";
+            .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();
     }
-
 }

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);
-
 }

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;
     }
-
 }

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";
     }
-
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "Role [roleId=" + roleId + ", roleName=" + roleName + ", roleKey=" + roleKey + ", roleSort=" + roleSort
+            .append("roleId", getRoleId())
-                + ", dataScope=" + dataScope + ", status=" + status + ", flag=" + flag + ", menuIds="
+            .append("roleName", getRoleName())
-                + Arrays.toString(menuIds) + ", deptIds=" + Arrays.toString(deptIds) + "]";
+            .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();
     }
-
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "RoleDept [roleId=" + roleId + ", deptId=" + deptId + "]";
+            .append("roleId", getRoleId())
+            .append("deptId", getDeptId())
+            .toString();
     }
 }

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()
+    public String toString() {
-    {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-        return "RoleMenu [roleId=" + roleId + ", menuId=" + menuId + "]";
+            .append("roleId", getRoleId())
+            .append("menuId", getMenuId())
+            .toString();
     }
-
 }

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);
-
 }

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);
-
 }

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);
-
 }

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);
-
 }

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);
     }
-
 }

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;