mirror of https://gitee.com/y_project/RuoYi.git
format
RuoYi
parent
c85f36fa1f
commit
5e5c21e14f
4
pom.xml
4
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>
|
||||
|
||||
|
|
|
|||
|
|
@ -15,5 +15,4 @@ public class RuoYiServletInitializer extends SpringBootServletInitializer
|
|||
{
|
||||
return application.sources(RuoYiApplication.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,5 +61,4 @@ public class Constants
|
|||
* 排序的方向 "desc" 或者 "asc".
|
||||
*/
|
||||
public static String IS_ASC = "isAsc";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,5 +61,4 @@ public interface ShiroConstants
|
|||
* 验证码错误
|
||||
*/
|
||||
public static final String CAPTCHA_ERROR = "captchaError";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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])))\\.?";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import com.ruoyi.common.utils.MessageUtils;
|
|||
*/
|
||||
public class BaseException extends RuntimeException
|
||||
{
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,5 +31,4 @@ public class TaskException extends Exception
|
|||
{
|
||||
TASK_EXISTS, NO_TASK_EXISTS, TASK_ALREADY_STARTED, UNKNOWN, CONFIG_ERROR, TASK_NODE_NOT_AVAILABLE
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ package com.ruoyi.common.exception.user;
|
|||
*/
|
||||
public class UserDeleteException extends UserException
|
||||
{
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public UserDeleteException()
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ package com.ruoyi.common.exception.user;
|
|||
*/
|
||||
public class UserNotExistsException extends UserException
|
||||
{
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public UserNotExistsException()
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ package com.ruoyi.common.exception.user;
|
|||
*/
|
||||
public class UserPasswordNotMatchException extends UserException
|
||||
{
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
public UserPasswordNotMatchException()
|
||||
|
|
|
|||
|
|
@ -84,5 +84,4 @@ public class CharsetKit
|
|||
{
|
||||
return Charset.defaultCharset().name();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -998,5 +998,4 @@ public class Convert
|
|||
return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$",
|
||||
"零元整");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,5 +96,4 @@ public class DateUtils
|
|||
Date now = new Date();
|
||||
return DateFormatUtils.format(now, "yyyyMMdd");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,5 +63,4 @@ public class Md5Utils
|
|||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import com.ruoyi.project.system.menu.domain.Menu;
|
|||
*/
|
||||
public class TreeUtils
|
||||
{
|
||||
|
||||
/**
|
||||
* 根据父节点的ID获取所有子节点
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import java.io.OutputStream;
|
|||
*/
|
||||
public class FileUtils
|
||||
{
|
||||
|
||||
/**
|
||||
* 输出指定文件的byte数组
|
||||
*
|
||||
|
|
@ -87,5 +86,4 @@ public class FileUtils
|
|||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -480,5 +480,4 @@ public class ExcelUtil<T>
|
|||
}
|
||||
return downloadPath;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -18,7 +18,6 @@ import com.ruoyi.project.system.user.domain.User;
|
|||
*/
|
||||
public class ShiroUtils
|
||||
{
|
||||
|
||||
public static Subject getSubjct()
|
||||
{
|
||||
return SecurityUtils.getSubject();
|
||||
|
|
|
|||
|
|
@ -98,5 +98,4 @@ public final class SpringUtils implements BeanFactoryPostProcessor
|
|||
{
|
||||
return beanFactory.getAliases(name);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -94,5 +94,4 @@ public class XssFilter implements Filter
|
|||
{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -12,7 +12,6 @@ import org.jsoup.safety.Whitelist;
|
|||
*/
|
||||
public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
|
||||
{
|
||||
|
||||
/**
|
||||
* @param request
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ import java.lang.annotation.Target;
|
|||
@Documented
|
||||
public @interface DataScope
|
||||
{
|
||||
/** 表的别名 */
|
||||
/**
|
||||
* 表的别名
|
||||
*/
|
||||
String tableAlias() default "";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,5 +30,4 @@ public @interface Log
|
|||
|
||||
/** 是否保存请求的参数 */
|
||||
boolean isSaveRequestData() default true;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,5 +67,4 @@ public class GenConfig
|
|||
return "GenConfig [getClass()=" + getClass() + ", hashCode()=" + hashCode() + ", toString()=" + super.toString()
|
||||
+ "]";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ import org.springframework.web.servlet.i18n.SessionLocaleResolver;
|
|||
@Configuration
|
||||
public class I18nConfig implements WebMvcConfigurer
|
||||
{
|
||||
|
||||
@Bean
|
||||
public LocaleResolver localeResolver()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,5 +82,4 @@ public class RuoYiConfig
|
|||
{
|
||||
return profile + "download/";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import java.util.Properties;
|
|||
@Configuration
|
||||
public class ScheduleConfig
|
||||
{
|
||||
|
||||
@Bean
|
||||
public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,5 +23,4 @@ public class DynamicDataSource extends AbstractRoutingDataSource
|
|||
{
|
||||
return DynamicDataSourceContextHolder.getDateSoureType();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -42,5 +42,4 @@ public class DynamicDataSourceContextHolder
|
|||
{
|
||||
CONTEXT_HOLDER.remove();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -140,5 +140,4 @@ public class UserRealm extends AuthorizingRealm
|
|||
{
|
||||
this.clearCachedAuthorizationInfo(SecurityUtils.getSubject().getPrincipals());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,5 +133,4 @@ public class LoginService
|
|||
user.setLoginDate(DateUtils.getNowDate());
|
||||
userService.updateUserInfo(user);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import com.ruoyi.project.system.user.domain.User;
|
|||
@Component
|
||||
public class PasswordService
|
||||
{
|
||||
|
||||
@Autowired
|
||||
private CacheManager cacheManager;
|
||||
|
||||
|
|
|
|||
|
|
@ -83,5 +83,4 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter
|
|||
}
|
||||
return super.getRedirectUrl(request, response, subject);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ import com.ruoyi.common.utils.security.ShiroUtils;
|
|||
*/
|
||||
public class CaptchaValidateFilter extends AccessControlFilter
|
||||
{
|
||||
|
||||
/**
|
||||
* 是否开启验证码
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,6 +70,5 @@ public class CommonController
|
|||
filename = URLEncoder.encode(filename, "utf-8");
|
||||
}
|
||||
return filename;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -208,5 +208,4 @@ public class JobServiceImpl implements IJobService
|
|||
}
|
||||
return rows;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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("执行无参方法");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,5 +53,4 @@ public class ScheduleRunnable implements Runnable
|
|||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -10,7 +10,6 @@ import com.ruoyi.project.monitor.logininfor.domain.Logininfor;
|
|||
*/
|
||||
public interface ILogininforService
|
||||
{
|
||||
|
||||
/**
|
||||
* 新增系统登录日志
|
||||
*
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ import com.ruoyi.project.monitor.logininfor.mapper.LogininforMapper;
|
|||
@Service
|
||||
public class LogininforServiceImpl implements ILogininforService
|
||||
{
|
||||
|
||||
@Autowired
|
||||
private LogininforMapper logininforMapper;
|
||||
|
||||
|
|
|
|||
|
|
@ -108,5 +108,4 @@ public class UserOnlineController extends BaseController
|
|||
userOnlineService.saveOnline(online);
|
||||
return success();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -128,5 +128,4 @@ public class ConfigController extends BaseController
|
|||
{
|
||||
return configService.checkConfigKeyUnique(config);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,5 +57,4 @@ public interface ConfigMapper
|
|||
* @return 结果
|
||||
*/
|
||||
public int deleteConfigByIds(String[] configIds);
|
||||
|
||||
}
|
||||
|
|
@ -117,5 +117,4 @@ public class ConfigServiceImpl implements IConfigService
|
|||
}
|
||||
return UserConstants.CONFIG_KEY_UNIQUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import java.util.List;
|
|||
*/
|
||||
public interface IConfigService
|
||||
{
|
||||
|
||||
/**
|
||||
* 查询参数配置信息
|
||||
*
|
||||
|
|
@ -66,5 +65,4 @@ public interface IConfigService
|
|||
* @return 结果
|
||||
*/
|
||||
public String checkConfigKeyUnique(Config config);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,5 +117,4 @@ public class DictDataServiceImpl implements IDictDataService
|
|||
dictData.setUpdateBy(ShiroUtils.getLoginName());
|
||||
return dictDataMapper.updateDictData(dictData);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -299,5 +299,4 @@ public class MenuServiceImpl implements IMenuService
|
|||
}
|
||||
return UserConstants.MENU_NAME_UNIQUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,5 +106,4 @@ public class NoticeController extends BaseController
|
|||
{
|
||||
return toAjax(noticeService.deleteNoticeByIds(ids));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,5 +49,4 @@ public interface NoticeMapper
|
|||
* @return 结果
|
||||
*/
|
||||
public int deleteNoticeByIds(String[] noticeIds);
|
||||
|
||||
}
|
||||
|
|
@ -49,5 +49,4 @@ public interface INoticeService
|
|||
* @return 结果
|
||||
*/
|
||||
public int deleteNoticeByIds(String ids);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -82,5 +82,4 @@ public class NoticeServiceImpl implements INoticeService
|
|||
{
|
||||
return noticeMapper.deleteNoticeByIds(Convert.toStrArray(ids));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -139,5 +139,4 @@ public class PostController extends BaseController
|
|||
{
|
||||
return postService.checkPostCodeUnique(post);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -179,5 +179,4 @@ public class PostServiceImpl implements IPostService
|
|||
}
|
||||
return UserConstants.POST_CODE_UNIQUE;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ import com.ruoyi.framework.web.controller.BaseController;
|
|||
@RequestMapping("/captcha")
|
||||
public class CaptchaController extends BaseController
|
||||
{
|
||||
|
||||
@Resource(name = "captchaProducer")
|
||||
private Producer captchaProducer;
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue