diff --git a/pom.xml b/pom.xml index 7e69dc6e..edac2333 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,8 @@ 2.2.5.RELEASE 2.3.1 2.1.4 + 3.4.3 + 2.3.0.RELEASE 2.9.2 1.5.24 1.26.5 @@ -36,6 +38,7 @@ 8.0.3 4.1.2 2.6.2 + 1.18.20 @@ -84,10 +87,15 @@ + + + + + - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${spring-boot.mybatis} + com.baomidou + mybatis-plus-boot-starter + ${spring-boot.mybatisplus} @@ -156,6 +164,13 @@ fastjson ${fastjson.version} + + + + org.projectlombok + lombok + ${lombok.version} + @@ -234,7 +249,7 @@ pom - + diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile new file mode 100644 index 00000000..b5d8fe03 --- /dev/null +++ b/ruoyi-auth/Dockerfile @@ -0,0 +1,20 @@ +FROM java:8-jdk + +#作者 +MAINTAINER awg + +#系统编码和时区 +ENV LANG C.UTF-8 +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +# 复制jar文件到镜像内，名字改为app.jar +ADD /target/*.jar app.jar + +ENV JAVA_OPTS="-Xmx32M -Xms32M" + +# 启动容器时的进程 +ENTRYPOINT java ${JAVA_OPTS} -jar /app.jar + +# 暴露接口 +EXPOSE 9200 \ No newline at end of file diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 5c437f09..4af86f44 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -10,30 +10,30 @@ 4.0.0 ruoyi-common-core - + ruoyi-common-core核心模块 - + org.springframework.cloud spring-cloud-starter-openfeign - + - - + + org.springframework spring-context-support - + - - + + org.springframework spring-web - + @@ -65,6 +65,13 @@ fastjson + + + org.projectlombok + lombok + + + org.apache.commons diff --git a/ruoyi-gateway/Dockerfile b/ruoyi-gateway/Dockerfile new file mode 100644 index 00000000..be600fa0 --- /dev/null +++ b/ruoyi-gateway/Dockerfile @@ -0,0 +1,20 @@ +FROM java:8-jdk + +#作者 +MAINTAINER awg + +#系统编码和时区 +ENV LANG C.UTF-8 +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +# 复制jar文件到镜像内，名字改为app.jar +ADD /target/*.jar app.jar + +ENV JAVA_OPTS="-Xmx64M -Xms64M" + +# 启动容器时的进程 +ENTRYPOINT java ${JAVA_OPTS} -jar /app.jar + +# 暴露接口 +EXPOSE 8080 \ No newline at end of file diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index d4432b40..f527aa4a 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -90,6 +90,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring-boot.mavenplugin.version} diff --git a/ruoyi-modules/ruoyi-file/Dockerfile b/ruoyi-modules/ruoyi-file/Dockerfile new file mode 100644 index 00000000..c4238d77 --- /dev/null +++ b/ruoyi-modules/ruoyi-file/Dockerfile @@ -0,0 +1,20 @@ +FROM java:8-jdk + +#作者 +MAINTAINER awg + +#系统编码和时区 +ENV LANG C.UTF-8 +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +# 复制jar文件到镜像内，名字改为app.jar +ADD /target/*.jar app.jar + +ENV JAVA_OPTS="-Xmx32M -Xms32M" + +# 启动容器时的进程 +ENTRYPOINT java ${JAVA_OPTS} -jar /app.jar + +# 暴露接口 +EXPOSE 9300 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index 947a5bf2..6990a1b8 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -74,6 +74,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring-boot.mavenplugin.version} diff --git a/ruoyi-modules/ruoyi-gen/Dockerfile b/ruoyi-modules/ruoyi-gen/Dockerfile new file mode 100644 index 00000000..8efdca44 --- /dev/null +++ b/ruoyi-modules/ruoyi-gen/Dockerfile @@ -0,0 +1,20 @@ +FROM java:8-jdk + +#作者 +MAINTAINER awg + +#系统编码和时区 +ENV LANG C.UTF-8 +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +# 复制jar文件到镜像内，名字改为app.jar +ADD /target/*.jar app.jar + +ENV JAVA_OPTS="-Xmx64M -Xms64M" + +# 启动容器时的进程 +ENTRYPOINT java ${JAVA_OPTS} -jar /app.jar + +# 暴露接口 +EXPOSE 9202 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/Dockerfile b/ruoyi-modules/ruoyi-job/Dockerfile new file mode 100644 index 00000000..b7ae3045 --- /dev/null +++ b/ruoyi-modules/ruoyi-job/Dockerfile @@ -0,0 +1,20 @@ +FROM java:8-jdk + +#作者 +MAINTAINER awg + +#系统编码和时区 +ENV LANG C.UTF-8 +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +# 复制jar文件到镜像内，名字改为app.jar +ADD /target/*.jar app.jar + +ENV JAVA_OPTS="-Xmx64M -Xms64M" + +# 启动容器时的进程 +ENTRYPOINT java ${JAVA_OPTS} -jar /app.jar + +# 暴露接口 +EXPOSE 9203 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 7fd1bed6..2f43109f 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -65,6 +65,12 @@ mysql mysql-connector-java + + + + com.baomidou + mybatis-plus-boot-starter + @@ -86,6 +92,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring-boot.mavenplugin.version} diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java index c8ab47f9..b17ff8f2 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java @@ -2,8 +2,15 @@ package com.ruoyi.job.domain; import java.io.Serializable; import java.util.Date; +import java.util.HashMap; +import java.util.Map; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; @@ -16,157 +23,143 @@ import com.ruoyi.job.util.CronUtils; /** * 定时任务调度表 sys_job - * + * * @author ruoyi */ -public class SysJob extends BaseEntity implements Serializable -{ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_job") +public class SysJob implements Serializable { private static final long serialVersionUID = 1L; - /** 任务ID */ + /** + * 任务ID + */ @Excel(name = "任务序号", cellType = ColumnType.NUMERIC) + @TableId(value = "job_id", type = IdType.AUTO) private Long jobId; - /** 任务名称 */ + /** + * 任务名称 + */ @Excel(name = "任务名称") + @NotBlank(message = "任务名称不能为空") + @Size(min = 0, max = 64, message = "任务名称不能超过64个字符") private String jobName; - /** 任务组名 */ + /** + * 任务组名 + */ @Excel(name = "任务组名") private String jobGroup; - /** 调用目标字符串 */ + /** + * 调用目标字符串 + */ @Excel(name = "调用目标字符串") + @NotBlank(message = "调用目标字符串不能为空") + @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符") private String invokeTarget; - /** cron执行表达式 */ + /** + * cron执行表达式 + */ @Excel(name = "执行表达式 ") + @NotBlank(message = "Cron执行表达式不能为空") + @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符") private String cronExpression; - /** cron计划策略 */ + /** + * cron计划策略 + */ @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行") private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; - /** 是否并发执行（0允许 1禁止） */ + /** + * 是否并发执行（0允许 1禁止） + */ @Excel(name = "并发执行", readConverterExp = "0=允许,1=禁止") private String concurrent; - /** 任务状态（0正常 1暂停） */ + /** + * 任务状态（0正常 1暂停） + */ @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停") private String status; - public Long getJobId() - { - return jobId; - } - - public void setJobId(Long jobId) - { - this.jobId = jobId; - } - - @NotBlank(message = "任务名称不能为空") - @Size(min = 0, max = 64, message = "任务名称不能超过64个字符") - public String getJobName() - { - return jobName; - } - - public void setJobName(String jobName) - { - this.jobName = jobName; - } - - public String getJobGroup() - { - return jobGroup; - } - - public void setJobGroup(String jobGroup) - { - this.jobGroup = jobGroup; - } - - @NotBlank(message = "调用目标字符串不能为空") - @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符") - public String getInvokeTarget() - { - return invokeTarget; - } - - public void setInvokeTarget(String invokeTarget) - { - this.invokeTarget = invokeTarget; - } - - @NotBlank(message = "Cron执行表达式不能为空") - @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符") - public String getCronExpression() - { - return cronExpression; - } - - public void setCronExpression(String cronExpression) - { - this.cronExpression = cronExpression; - } + /** + * 下次执行时间 + */ + private Date nextValidTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - public Date getNextValidTime() - { - if (StringUtils.isNotEmpty(cronExpression)) - { + public Date getNextValidTime() { + if (StringUtils.isNotEmpty(cronExpression)) { return CronUtils.getNextExecution(cronExpression); } return null; } - public String getMisfirePolicy() - { - return misfirePolicy; - } + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; - public void setMisfirePolicy(String misfirePolicy) - { - this.misfirePolicy = misfirePolicy; - } + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public String getConcurrent() - { - return concurrent; - } + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; - public void setConcurrent(String concurrent) - { - this.concurrent = concurrent; - } + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public String getStatus() - { - return status; - } + /** + * 备注 + */ + private String remark; - public void setStatus(String status) - { - this.status = status; - } + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; + + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobId", getJobId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("cronExpression", getCronExpression()) - .append("nextValidTime", getNextValidTime()) - .append("misfirePolicy", getMisfirePolicy()) - .append("concurrent", getConcurrent()) - .append("status", getStatus()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("jobId", getJobId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("cronExpression", getCronExpression()) + .append("nextValidTime", getNextValidTime()) + .append("misfirePolicy", getMisfirePolicy()) + .append("concurrent", getConcurrent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java index ec863c9a..049de02d 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJobLog.java @@ -1,6 +1,15 @@ package com.ruoyi.job.domain; +import java.io.Serializable; import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; @@ -8,148 +17,124 @@ import com.ruoyi.common.core.web.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log - * + * * @author ruoyi */ -public class SysJobLog extends BaseEntity -{ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_job_log") +public class SysJobLog implements Serializable { private static final long serialVersionUID = 1L; - /** ID */ + /** + * ID + */ @Excel(name = "日志序号") + @TableId(value = "job_log_id", type = IdType.AUTO) private Long jobLogId; - /** 任务名称 */ + /** + * 任务名称 + */ @Excel(name = "任务名称") private String jobName; - /** 任务组名 */ + /** + * 任务组名 + */ @Excel(name = "任务组名") private String jobGroup; - /** 调用目标字符串 */ + /** + * 调用目标字符串 + */ @Excel(name = "调用目标字符串") private String invokeTarget; - /** 日志信息 */ + /** + * 日志信息 + */ @Excel(name = "日志信息") private String jobMessage; - /** 执行状态（0正常 1失败） */ + /** + * 执行状态（0正常 1失败） + */ @Excel(name = "执行状态", readConverterExp = "0=正常,1=失败") private String status; - /** 异常信息 */ + /** + * 异常信息 + */ @Excel(name = "异常信息") private String exceptionInfo; - /** 开始时间 */ + /** + * 开始时间 + */ private Date startTime; - /** 停止时间 */ + /** + * 停止时间 + */ private Date stopTime; - public Long getJobLogId() - { - return jobLogId; - } + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; - public void setJobLogId(Long jobLogId) - { - this.jobLogId = jobLogId; - } + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public String getJobName() - { - return jobName; - } + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; - public void setJobName(String jobName) - { - this.jobName = jobName; - } + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public String getJobGroup() - { - return jobGroup; - } + /** + * 备注 + */ + private String remark; - public void setJobGroup(String jobGroup) - { - this.jobGroup = jobGroup; - } + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; - public String getInvokeTarget() - { - return invokeTarget; - } + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); - public void setInvokeTarget(String invokeTarget) - { - this.invokeTarget = invokeTarget; - } - - public String getJobMessage() - { - return jobMessage; - } - - public void setJobMessage(String jobMessage) - { - this.jobMessage = jobMessage; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public String getExceptionInfo() - { - return exceptionInfo; - } - - public void setExceptionInfo(String exceptionInfo) - { - this.exceptionInfo = exceptionInfo; - } - - public Date getStartTime() - { - return startTime; - } - - public void setStartTime(Date startTime) - { - this.startTime = startTime; - } - - public Date getStopTime() - { - return stopTime; - } - - public void setStopTime(Date stopTime) - { - this.stopTime = stopTime; - } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobLogId", getJobLogId()) - .append("jobName", getJobName()) - .append("jobGroup", getJobGroup()) - .append("jobMessage", getJobMessage()) - .append("status", getStatus()) - .append("exceptionInfo", getExceptionInfo()) - .append("startTime", getStartTime()) - .append("stopTime", getStopTime()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("jobLogId", getJobLogId()) + .append("jobName", getJobName()) + .append("jobGroup", getJobGroup()) + .append("jobMessage", getJobMessage()) + .append("status", getStatus()) + .append("exceptionInfo", getExceptionInfo()) + .append("startTime", getStartTime()) + .append("stopTime", getStopTime()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java index 742eba54..0e2949ad 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobLogMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.job.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.job.domain.SysJobLog; /** @@ -8,7 +10,7 @@ import com.ruoyi.job.domain.SysJobLog; * * @author ruoyi */ -public interface SysJobLogMapper +public interface SysJobLogMapper extends BaseMapper { /** * 获取quartz调度器日志的计划任务 @@ -16,14 +18,14 @@ public interface SysJobLogMapper * @param jobLog 调度日志信息 * @return 调度任务日志集合 */ - public List selectJobLogList(SysJobLog jobLog); + List selectJobLogList(SysJobLog jobLog); /** * 查询所有调度任务日志 * * @return 调度任务日志列表 */ - public List selectJobLogAll(); + List selectJobLogAll(); /** * 通过调度任务日志ID查询调度信息 @@ -31,7 +33,7 @@ public interface SysJobLogMapper * @param jobLogId 调度任务日志ID * @return 调度任务日志对象信息 */ - public SysJobLog selectJobLogById(Long jobLogId); + SysJobLog selectJobLogById(Long jobLogId); /** * 新增任务日志 @@ -39,7 +41,7 @@ public interface SysJobLogMapper * @param jobLog 调度日志信息 * @return 结果 */ - public int insertJobLog(SysJobLog jobLog); + int insertJobLog(SysJobLog jobLog); /** * 批量删除调度日志信息 @@ -47,7 +49,7 @@ public interface SysJobLogMapper * @param logIds 需要删除的数据ID * @return 结果 */ - public int deleteJobLogByIds(Long[] logIds); + int deleteJobLogByIds(Long[] logIds); /** * 删除任务日志 @@ -55,10 +57,10 @@ public interface SysJobLogMapper * @param jobId 调度日志ID * @return 结果 */ - public int deleteJobLogById(Long jobId); + int deleteJobLogById(Long jobId); /** * 清空任务日志 */ - public void cleanJobLog(); + void cleanJobLog(); } diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java index 352fa874..2cb0a422 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/mapper/SysJobMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.job.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.job.domain.SysJob; /** @@ -8,7 +10,7 @@ import com.ruoyi.job.domain.SysJob; * * @author ruoyi */ -public interface SysJobMapper +public interface SysJobMapper extends BaseMapper { /** * 查询调度任务日志集合 @@ -16,14 +18,14 @@ public interface SysJobMapper * @param job 调度信息 * @return 操作日志集合 */ - public List selectJobList(SysJob job); + List selectJobList(SysJob job); /** * 查询所有调度任务 * * @return 调度任务列表 */ - public List selectJobAll(); + List selectJobAll(); /** * 通过调度ID查询调度任务信息 @@ -31,7 +33,7 @@ public interface SysJobMapper * @param jobId 调度ID * @return 角色对象信息 */ - public SysJob selectJobById(Long jobId); + SysJob selectJobById(Long jobId); /** * 通过调度ID删除调度任务信息 @@ -39,7 +41,7 @@ public interface SysJobMapper * @param jobId 调度ID * @return 结果 */ - public int deleteJobById(Long jobId); + int deleteJobById(Long jobId); /** * 批量删除调度任务信息 @@ -47,7 +49,7 @@ public interface SysJobMapper * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteJobByIds(Long[] ids); + int deleteJobByIds(Long[] ids); /** * 修改调度任务信息 @@ -55,7 +57,7 @@ public interface SysJobMapper * @param job 调度任务信息 * @return 结果 */ - public int updateJob(SysJob job); + int updateJob(SysJob job); /** * 新增调度任务信息 @@ -63,5 +65,5 @@ public interface SysJobMapper * @param job 调度任务信息 * @return 结果 */ - public int insertJob(SysJob job); + int insertJob(SysJob job); } diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml index 6e4ae7c6..37c022b3 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml @@ -4,23 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time from sys_job_log - @@ -44,11 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - where job_log_id = #{jobLogId} diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml index 0323cf11..83853162 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobMapper.xml @@ -3,29 +3,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark from sys_job - @@ -43,11 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - where job_id = #{jobId} diff --git a/ruoyi-modules/ruoyi-system/Dockerfile b/ruoyi-modules/ruoyi-system/Dockerfile new file mode 100644 index 00000000..332fe4e4 --- /dev/null +++ b/ruoyi-modules/ruoyi-system/Dockerfile @@ -0,0 +1,20 @@ +FROM java:8-jdk + +#作者 +MAINTAINER awg + +#系统编码和时区 +ENV LANG C.UTF-8 +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +# 复制jar文件到镜像内，名字改为app.jar +ADD /target/*.jar app.jar + +ENV JAVA_OPTS="-Xmx64M -Xms64M" + +# 启动容器时的进程 +ENTRYPOINT java ${JAVA_OPTS} -jar /app.jar + +# 暴露接口 +EXPOSE 9201 \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 532260ec..bba73f65 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -8,70 +8,76 @@ 2.5.0 4.0.0 - + ruoyi-modules-system ruoyi-modules-system系统模块 - + - - + + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - - + + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - - + + org.springframework.boot spring-boot-starter-actuator - + io.springfox springfox-swagger-ui ${swagger.fox.version} - + + + + com.baomidou + mybatis-plus-boot-starter + + mysql mysql-connector-java - + com.ruoyi ruoyi-common-datasource - + com.ruoyi ruoyi-common-datascope - + com.ruoyi ruoyi-common-log - + com.ruoyi @@ -86,6 +92,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring-boot.mavenplugin.version} @@ -96,5 +103,5 @@ - + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index 5b3c5408..fb2f40bc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -2,110 +2,128 @@ package com.ruoyi.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * 参数配置表 sys_config - * + * * @author ruoyi */ -public class SysConfig extends BaseEntity -{ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_config") +public class SysConfig implements Serializable { private static final long serialVersionUID = 1L; - /** 参数主键 */ + /** + * 参数主键 + */ @Excel(name = "参数主键", cellType = ColumnType.NUMERIC) + @TableId(value = "config_id", type = IdType.AUTO) private Long configId; - /** 参数名称 */ + /** + * 参数名称 + */ @Excel(name = "参数名称") + @NotBlank(message = "参数名称不能为空") + @Size(min = 0, max = 100, message = "参数名称不能超过100个字符") private String configName; - /** 参数键名 */ + /** + * 参数键名 + */ @Excel(name = "参数键名") + @NotBlank(message = "参数键名长度不能为空") + @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") private String configKey; - /** 参数键值 */ + /** + * 参数键值 + */ @Excel(name = "参数键值") + @NotBlank(message = "参数键值不能为空") + @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符") private String configValue; - /** 系统内置（Y是 N否） */ + /** + * 系统内置（Y是 N否） + */ @Excel(name = "系统内置", readConverterExp = "Y=是,N=否") private String configType; - public Long getConfigId() - { - return configId; - } + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; - public void setConfigId(Long configId) - { - this.configId = configId; - } + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - @NotBlank(message = "参数名称不能为空") - @Size(min = 0, max = 100, message = "参数名称不能超过100个字符") - public String getConfigName() - { - return configName; - } + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; - public void setConfigName(String configName) - { - this.configName = configName; - } + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - @NotBlank(message = "参数键名长度不能为空") - @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") - public String getConfigKey() - { - return configKey; - } + /** + * 备注 + */ + private String remark; - public void setConfigKey(String configKey) - { - this.configKey = configKey; - } + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; - @NotBlank(message = "参数键值不能为空") - @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符") - public String getConfigValue() - { - return configValue; - } + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); - public void setConfigValue(String configValue) - { - this.configValue = configValue; - } - - public String getConfigType() - { - return configType; - } - - public void setConfigType(String configType) - { - this.configType = configType; - } - @Override 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(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("configId", getConfigId()) + .append("configName", getConfigName()) + .append("configKey", getConfigKey()) + .append("configValue", getConfigValue()) + .append("configType", getConfigType()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java index 2d5e17de..1a47e5ff 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java @@ -2,6 +2,12 @@ package com.ruoyi.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; @@ -9,168 +15,143 @@ import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.web.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * 字典数据表 sys_dict_data - * + * * @author ruoyi */ -public class SysDictData extends BaseEntity -{ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_dict_data") +public class SysDictData implements Serializable { private static final long serialVersionUID = 1L; - /** 字典编码 */ + /** + * 字典编码 + */ @Excel(name = "字典编码", cellType = ColumnType.NUMERIC) + @TableId(value = "dict_code", type = IdType.AUTO) private Long dictCode; - /** 字典排序 */ + /** + * 字典排序 + */ @Excel(name = "字典排序", cellType = ColumnType.NUMERIC) private Long dictSort; - /** 字典标签 */ + /** + * 字典标签 + */ @Excel(name = "字典标签") + @NotBlank(message = "字典标签不能为空") + @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") private String dictLabel; - /** 字典键值 */ + /** + * 字典键值 + */ @Excel(name = "字典键值") + @NotBlank(message = "字典键值不能为空") + @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") private String dictValue; - /** 字典类型 */ + /** + * 字典类型 + */ @Excel(name = "字典类型") + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") private String dictType; - /** 样式属性（其他样式扩展） */ + /** + * 样式属性（其他样式扩展） + */ + @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") private String cssClass; - /** 表格字典样式 */ + /** + * 表格字典样式 + */ private String listClass; - /** 是否默认（Y是 N否） */ + /** + * 是否默认（Y是 N否） + */ @Excel(name = "是否默认", readConverterExp = "Y=是,N=否") private String isDefault; - /** 状态（0正常 1停用） */ + /** + * 状态（0正常 1停用） + */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - public Long getDictCode() - { - return dictCode; - } + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; - public void setDictCode(Long dictCode) - { - this.dictCode = dictCode; - } + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public Long getDictSort() - { - return dictSort; - } + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; - public void setDictSort(Long dictSort) - { - this.dictSort = dictSort; - } + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - @NotBlank(message = "字典标签不能为空") - @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") - public String getDictLabel() - { - return dictLabel; - } + /** + * 备注 + */ + private String remark; - public void setDictLabel(String dictLabel) - { - this.dictLabel = dictLabel; - } + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; - @NotBlank(message = "字典键值不能为空") - @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") - public String getDictValue() - { - return dictValue; - } + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); - public void setDictValue(String dictValue) - { - this.dictValue = dictValue; - } - - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") - public String getDictType() - { - return dictType; - } - - public void setDictType(String dictType) - { - this.dictType = dictType; - } - - @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") - public String getCssClass() - { - return cssClass; - } - - public void setCssClass(String cssClass) - { - this.cssClass = cssClass; - } - - public String getListClass() - { - return listClass; - } - - public void setListClass(String listClass) - { - this.listClass = listClass; - } - - public boolean getDefault() - { - return UserConstants.YES.equals(this.isDefault) ? true : false; - } - - public String getIsDefault() - { - return isDefault; - } - - public void setIsDefault(String isDefault) - { - this.isDefault = isDefault; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - @Override 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(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("dictCode", getDictCode()) + .append("dictSort", getDictSort()) + .append("dictLabel", getDictLabel()) + .append("dictValue", getDictValue()) + .append("dictType", getDictType()) + .append("cssClass", getCssClass()) + .append("listClass", getListClass()) + .append("isDefault", getIsDefault()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java index d121388d..ce877e6a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java @@ -2,93 +2,119 @@ package com.ruoyi.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * 字典类型表 sys_dict_type - * + * * @author ruoyi */ -public class SysDictType extends BaseEntity -{ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_dict_type") +public class SysDictType implements Serializable { private static final long serialVersionUID = 1L; - /** 字典主键 */ + /** + * 字典主键 + */ @Excel(name = "字典主键", cellType = ColumnType.NUMERIC) + @TableId(value = "dict_id", type = IdType.AUTO) private Long dictId; - /** 字典名称 */ + /** + * 字典名称 + */ @Excel(name = "字典名称") + @NotBlank(message = "字典名称不能为空") + @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") private String dictName; - /** 字典类型 */ + /** + * 字典类型 + */ @Excel(name = "字典类型") + @NotBlank(message = "字典类型不能为空") + @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") private String dictType; - /** 状态（0正常 1停用） */ + /** + * 状态（0正常 1停用） + */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - public Long getDictId() - { - return dictId; - } + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; - public void setDictId(Long dictId) - { - this.dictId = dictId; - } + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - @NotBlank(message = "字典名称不能为空") - @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") - public String getDictName() - { - return dictName; - } + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; - public void setDictName(String dictName) - { - this.dictName = dictName; - } + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") - public String getDictType() - { - return dictType; - } + /** + * 备注 + */ + private String remark; - public void setDictType(String dictType) - { - this.dictType = dictType; - } + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; - public String getStatus() - { - return status; - } + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); - public void setStatus(String status) - { - this.status = status; - } - @Override 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(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("dictId", getDictId()) + .append("dictName", getDictName()) + .append("dictType", getDictType()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index 32d6f1f6..0ba64edc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -1,102 +1,110 @@ package com.ruoyi.system.domain; +import java.io.Serializable; import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; /** * 系统访问记录表 sys_logininfor - * + * * @author ruoyi */ -public class SysLogininfor extends BaseEntity -{ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_logininfor") +public class SysLogininfor implements Serializable { private static final long serialVersionUID = 1L; - /** ID */ + /** + * ID + */ @Excel(name = "序号", cellType = ColumnType.NUMERIC) + @TableId(value = "info_id", type = IdType.AUTO) private Long infoId; - /** 用户账号 */ + /** + * 用户账号 + */ @Excel(name = "用户账号") private String userName; - /** 状态 0成功 1失败 */ + /** + * 状态 0成功 1失败 + */ @Excel(name = "状态", readConverterExp = "0=成功,1=失败") private String status; - /** 地址 */ + /** + * 地址 + */ @Excel(name = "地址") private String ipaddr; - /** 描述 */ + /** + * 描述 + */ @Excel(name = "描述") private String msg; - /** 访问时间 */ + /** + * 访问时间 + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date accessTime; - public Long getInfoId() - { - return infoId; - } + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; - public void setInfoId(Long infoId) - { - this.infoId = infoId; - } + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public String getUserName() - { - return userName; - } + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; - public void setUserName(String userName) - { - this.userName = userName; - } + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - public String getStatus() - { - return status; - } + /** + * 备注 + */ + private String remark; - public void setStatus(String status) - { - this.status = status; - } + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; - public String getIpaddr() - { - return ipaddr; - } + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); - public void setIpaddr(String ipaddr) - { - this.ipaddr = ipaddr; - } - - public String getMsg() - { - return msg; - } - - public void setMsg(String msg) - { - this.msg = msg; - } - - public Date getAccessTime() - { - return accessTime; - } - - public void setAccessTime(Date accessTime) - { - this.accessTime = accessTime; - } } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index 9dc62dfd..6f04d61c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -1,9 +1,15 @@ package com.ruoyi.system.domain; -import java.util.ArrayList; -import java.util.List; +import java.io.Serializable; +import java.util.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,236 +17,163 @@ import com.ruoyi.common.core.web.domain.BaseEntity; /** * 菜单权限表 sys_menu - * + * * @author ruoyi */ -public class SysMenu extends BaseEntity -{ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_menu") +public class SysMenu implements Serializable { private static final long serialVersionUID = 1L; - /** 菜单ID */ + /** + * 菜单ID + */ + @TableId(value = "menu_id", type = IdType.AUTO) private Long menuId; - /** 菜单名称 */ - private String menuName; - - /** 父菜单名称 */ - private String parentName; - - /** 父菜单ID */ - private Long parentId; - - /** 显示顺序 */ - private String orderNum; - - /** 路由地址 */ - private String path; - - /** 组件路径 */ - private String component; - - /** 是否为外链（0是 1否） */ - private String isFrame; - - /** 是否缓存（0缓存 1不缓存） */ - private String isCache; - - /** 类型（M目录 C菜单 F按钮） */ - private String menuType; - - /** 显示状态（0显示 1隐藏） */ - private String visible; - - /** 菜单状态（0显示 1隐藏） */ - private String status; - - /** 权限字符串 */ - private String perms; - - /** 菜单图标 */ - private String icon; - - /** 子菜单 */ - private List children = new ArrayList(); - - public Long getMenuId() - { - return menuId; - } - - public void setMenuId(Long menuId) - { - this.menuId = menuId; - } - + /** + * 菜单名称 + */ @NotBlank(message = "菜单名称不能为空") @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") - public String getMenuName() - { - return menuName; - } + private String menuName; - public void setMenuName(String menuName) - { - this.menuName = menuName; - } + /** + * 父菜单名称 + */ + private String parentName; - public String getParentName() - { - return parentName; - } - - public void setParentName(String parentName) - { - this.parentName = parentName; - } - - public Long getParentId() - { - return parentId; - } - - public void setParentId(Long parentId) - { - this.parentId = parentId; - } + /** + * 父菜单ID + */ + private Long parentId; + /** + * 显示顺序 + */ @NotBlank(message = "显示顺序不能为空") - public String getOrderNum() - { - return orderNum; - } - - public void setOrderNum(String orderNum) - { - this.orderNum = orderNum; - } + private String orderNum; + /** + * 路由地址 + */ @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") - public String getPath() - { - return path; - } - - public void setPath(String path) - { - this.path = path; - } + private String path; + /** + * 组件路径 + */ @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") - public String getComponent() - { - return component; - } + private String component; - public void setComponent(String component) - { - this.component = component; - } + /** + * 是否为外链（0是 1否） + */ + private String isFrame; - public String getIsFrame() - { - return isFrame; - } - - public void setIsFrame(String isFrame) - { - this.isFrame = isFrame; - } - - public String getIsCache() - { - return isCache; - } - - public void setIsCache(String isCache) - { - this.isCache = isCache; - } + /** + * 是否缓存（0缓存 1不缓存） + */ + private String isCache; + /** + * 类型（M目录 C菜单 F按钮） + */ @NotBlank(message = "菜单类型不能为空") - public String getMenuType() - { - return menuType; - } + private String menuType; - public void setMenuType(String menuType) - { - this.menuType = menuType; - } + /** + * 显示状态（0显示 1隐藏） + */ + private String visible; - public String getVisible() - { - return visible; - } - - public void setVisible(String visible) - { - this.visible = visible; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } + /** + * 菜单状态（0显示 1隐藏） + */ + private String status; + /** + * 权限字符串 + */ @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") - public String getPerms() - { - return perms; - } + private String perms; - public void setPerms(String perms) - { - this.perms = perms; - } + /** + * 菜单图标 + */ + private String icon; - public String getIcon() - { - return icon; - } + /** + * 子菜单 + */ + private List children = new ArrayList(); - public void setIcon(String icon) - { - this.icon = icon; - } + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; - public List getChildren() - { - return children; - } + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; + + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); - public void setChildren(List children) - { - this.children = children; - } - @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("menuId", getMenuId()) - .append("menuName", getMenuName()) - .append("parentId", getParentId()) - .append("orderNum", getOrderNum()) - .append("path", getPath()) - .append("component", getComponent()) - .append("isFrame", getIsFrame()) - .append("IsCache", getIsCache()) - .append("menuType", getMenuType()) - .append("visible", getVisible()) - .append("status ", getStatus()) - .append("perms", getPerms()) - .append("icon", getIcon()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("menuId", getMenuId()) + .append("menuName", getMenuName()) + .append("parentId", getParentId()) + .append("orderNum", getOrderNum()) + .append("path", getPath()) + .append("component", getComponent()) + .append("isFrame", getIsFrame()) + .append("IsCache", getIsCache()) + .append("menuType", getMenuType()) + .append("visible", getVisible()) + .append("status ", getStatus()) + .append("perms", getPerms()) + .append("icon", getIcon()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 4e1c94c2..12bf49df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -2,100 +2,118 @@ package com.ruoyi.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.web.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * 通知公告表 sys_notice - * + * * @author ruoyi */ -public class SysNotice extends BaseEntity -{ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_notice") +public class SysNotice implements Serializable { private static final long serialVersionUID = 1L; - /** 公告ID */ + /** + * 公告ID + */ + @TableId(value = "notice_id", type = IdType.AUTO) private Long noticeId; - /** 公告标题 */ - private String noticeTitle; - - /** 公告类型（1通知 2公告） */ - private String noticeType; - - /** 公告内容 */ - private String noticeContent; - - /** 公告状态（0正常 1关闭） */ - private String status; - - public Long getNoticeId() - { - return noticeId; - } - - public void setNoticeId(Long noticeId) - { - this.noticeId = noticeId; - } - - public void setNoticeTitle(String noticeTitle) - { - this.noticeTitle = noticeTitle; - } - + /** + * 公告标题 + */ @NotBlank(message = "公告标题不能为空") @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") - public String getNoticeTitle() - { - return noticeTitle; - } + private String noticeTitle; - public void setNoticeType(String noticeType) - { - this.noticeType = noticeType; - } + /** + * 公告类型（1通知 2公告） + */ + private String noticeType; - public String getNoticeType() - { - return noticeType; - } + /** + * 公告内容 + */ + private String noticeContent; - public void setNoticeContent(String noticeContent) - { - this.noticeContent = noticeContent; - } + /** + * 公告状态（0正常 1关闭） + */ + private String status; - public String getNoticeContent() - { - return noticeContent; - } + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; - public void setStatus(String status) - { - this.status = status; - } + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - public String getStatus() - { - return status; - } + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 备注 + */ + private String remark; + + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; + + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); @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(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("noticeId", getNoticeId()) + .append("noticeTitle", getNoticeTitle()) + .append("noticeType", getNoticeType()) + .append("noticeContent", getNoticeContent()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index b5a1e9d3..fefd8142 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -2,122 +2,132 @@ package com.ruoyi.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.annotation.Excel.ColumnType; import com.ruoyi.common.core.web.domain.BaseEntity; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * 岗位表 sys_post - * + * * @author ruoyi */ -public class SysPost extends BaseEntity -{ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_notice") +public class SysPost implements Serializable { private static final long serialVersionUID = 1L; - /** 岗位序号 */ + /** + * 岗位序号 + */ @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC) + @TableId(value = "post_id", type = IdType.AUTO) private Long postId; - /** 岗位编码 */ + /** + * 岗位编码 + */ @Excel(name = "岗位编码") + @NotBlank(message = "岗位编码不能为空") + @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") private String postCode; - /** 岗位名称 */ + /** + * 岗位名称 + */ @Excel(name = "岗位名称") + @NotBlank(message = "岗位名称不能为空") + @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") private String postName; - /** 岗位排序 */ + /** + * 岗位排序 + */ @Excel(name = "岗位排序") + @NotBlank(message = "显示顺序不能为空") private String postSort; - /** 状态（0正常 1停用） */ + /** + * 状态（0正常 1停用） + */ @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; - /** 用户是否存在此岗位标识 默认不存在 */ + /** + * 用户是否存在此岗位标识 默认不存在 + */ private boolean flag = false; - public Long getPostId() - { - return postId; - } + /** + * 创建者 + */ + @TableField(fill = FieldFill.INSERT) + private String createBy; - public void setPostId(Long postId) - { - this.postId = postId; - } + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; - @NotBlank(message = "岗位编码不能为空") - @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") - public String getPostCode() - { - return postCode; - } + /** + * 更新者 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateBy; - public void setPostCode(String postCode) - { - this.postCode = postCode; - } + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; - @NotBlank(message = "岗位名称不能为空") - @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") - public String getPostName() - { - return postName; - } + /** + * 备注 + */ + private String remark; - public void setPostName(String postName) - { - this.postName = postName; - } + /** + * 搜索值 + */ + @TableField(exist = false) + private String searchValue; - @NotBlank(message = "显示顺序不能为空") - public String getPostSort() - { - return postSort; - } + /** + * 请求参数 + */ + @TableField(exist = false) + private Map params = new HashMap<>(); - public void setPostSort(String postSort) - { - this.postSort = postSort; - } - - public String getStatus() - { - return status; - } - - public void setStatus(String status) - { - this.status = status; - } - - public boolean isFlag() - { - return flag; - } - - public void setFlag(boolean flag) - { - this.flag = flag; - } - @Override 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(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("postId", getPostId()) + .append("postCode", getPostCode()) + .append("postName", getPostName()) + .append("postSort", getPostSort()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java index 8ed8e473..d64252c6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java @@ -1,46 +1,44 @@ package com.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * 角色和部门关联 sys_role_dept - * + * * @author ruoyi */ -public class SysRoleDept -{ - /** 角色ID */ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_role_dept") +public class SysRoleDept { + /** + * 角色ID + */ private Long roleId; - - /** 部门ID */ + + /** + * 部门ID + */ private Long deptId; - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - - public Long getDeptId() - { - return deptId; - } - - public void setDeptId(Long deptId) - { - this.deptId = deptId; - } - @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("roleId", getRoleId()) - .append("deptId", getDeptId()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("roleId", getRoleId()) + .append("deptId", getDeptId()) + .toString(); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java index 59d28699..99bcbec1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java @@ -1,5 +1,9 @@ package com.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -8,6 +12,10 @@ import org.apache.commons.lang3.builder.ToStringStyle; * * @author ruoyi */ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_role_menu") public class SysRoleMenu { /** 角色ID */ @@ -16,26 +24,6 @@ public class SysRoleMenu /** 菜单ID */ private Long menuId; - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - - public Long getMenuId() - { - return menuId; - } - - public void setMenuId(Long menuId) - { - this.menuId = menuId; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java index d9c8df01..47dc6b9b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java @@ -1,10 +1,17 @@ package com.ruoyi.system.domain; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + /** * 当前在线会话 * * @author ruoyi */ +@Data +@NoArgsConstructor +@Accessors(chain = true) public class SysUserOnline { /** 会话编号 */ @@ -27,74 +34,4 @@ public class SysUserOnline /** 登录时间 */ private Long loginTime; - - public String getTokenId() - { - return tokenId; - } - - public void setTokenId(String tokenId) - { - this.tokenId = tokenId; - } - - public String getUserName() - { - return userName; - } - - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getIpaddr() - { - return ipaddr; - } - - public void setIpaddr(String ipaddr) - { - this.ipaddr = ipaddr; - } - - public String getLoginLocation() - { - return loginLocation; - } - - public void setLoginLocation(String loginLocation) - { - this.loginLocation = loginLocation; - } - - public String getBrowser() - { - return browser; - } - - public void setBrowser(String browser) - { - this.browser = browser; - } - - public String getOs() - { - return os; - } - - public void setOs(String os) - { - this.os = os; - } - - public Long getLoginTime() - { - return loginTime; - } - - public void setLoginTime(Long loginTime) - { - this.loginTime = loginTime; - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java index 07ceb85c..90287bb4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java @@ -1,5 +1,9 @@ package com.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -8,6 +12,10 @@ import org.apache.commons.lang3.builder.ToStringStyle; * * @author ruoyi */ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_user_post") public class SysUserPost { /** 用户ID */ @@ -16,26 +24,6 @@ public class SysUserPost /** 岗位ID */ private Long postId; - public Long getUserId() - { - return userId; - } - - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getPostId() - { - return postId; - } - - public void setPostId(Long postId) - { - this.postId = postId; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java index ce2af2bd..fa00567a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java @@ -1,5 +1,9 @@ package com.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -8,6 +12,10 @@ import org.apache.commons.lang3.builder.ToStringStyle; * * @author ruoyi */ +@Data +@NoArgsConstructor +@Accessors(chain = true) +@TableName("sys_user_role") public class SysUserRole { /** 用户ID */ @@ -16,26 +24,6 @@ public class SysUserRole /** 角色ID */ private Long roleId; - public Long getUserId() - { - return userId; - } - - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getRoleId() - { - return roleId; - } - - public void setRoleId(Long roleId) - { - this.roleId = roleId; - } - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java index ec042087..15344756 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java @@ -1,10 +1,13 @@ package com.ruoyi.system.domain.vo; +import lombok.Data; + /** * 路由显示信息 * * @author ruoyi */ +@Data public class MetaVo { /** @@ -38,34 +41,4 @@ public class MetaVo this.icon = icon; this.noCache = noCache; } - - public boolean isNoCache() - { - return noCache; - } - - public void setNoCache(boolean noCache) - { - this.noCache = noCache; - } - - public String getTitle() - { - return title; - } - - public void setTitle(String title) - { - this.title = title; - } - - public String getIcon() - { - return icon; - } - - public void setIcon(String icon) - { - this.icon = icon; - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java index 21ff6b59..528717fe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java @@ -1,6 +1,8 @@ package com.ruoyi.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; + import java.util.List; /** @@ -8,6 +10,7 @@ import java.util.List; * * @author ruoyi */ +@Data @JsonInclude(JsonInclude.Include.NON_EMPTY) public class RouterVo { @@ -50,84 +53,4 @@ public class RouterVo * 子路由 */ private List children; - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public String getPath() - { - return path; - } - - public void setPath(String path) - { - this.path = path; - } - - public boolean getHidden() - { - return hidden; - } - - public void setHidden(boolean hidden) - { - this.hidden = hidden; - } - - public String getRedirect() - { - return redirect; - } - - public void setRedirect(String redirect) - { - this.redirect = redirect; - } - - public String getComponent() - { - return component; - } - - public void setComponent(String component) - { - this.component = component; - } - - public Boolean getAlwaysShow() - { - return alwaysShow; - } - - public void setAlwaysShow(Boolean alwaysShow) - { - this.alwaysShow = alwaysShow; - } - - public MetaVo getMeta() - { - return meta; - } - - public void setMeta(MetaVo meta) - { - this.meta = meta; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java index 9dc14268..11ac249b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java @@ -6,12 +6,14 @@ import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.system.api.domain.SysDept; import com.ruoyi.system.domain.SysMenu; +import lombok.Data; /** * Treeselect树结构实体类 * * @author ruoyi */ +@Data public class TreeSelect implements Serializable { private static final long serialVersionUID = 1L; @@ -44,34 +46,4 @@ public class TreeSelect implements Serializable this.label = menu.getMenuName(); this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList()); } - - public Long getId() - { - return id; - } - - public void setId(Long id) - { - this.id = id; - } - - public String getLabel() - { - return label; - } - - public void setLabel(String label) - { - this.label = label; - } - - public List getChildren() - { - return children; - } - - public void setChildren(List children) - { - this.children = children; - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java index 2b1219d6..0f920c52 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.domain.SysConfig; /** @@ -9,7 +10,7 @@ import com.ruoyi.system.domain.SysConfig; * * @author ruoyi */ -public interface SysConfigMapper +public interface SysConfigMapper extends BaseMapper { /** * 查询参数配置信息 @@ -17,7 +18,7 @@ public interface SysConfigMapper * @param config 参数配置信息 * @return 参数配置信息 */ - public SysConfig selectConfig(SysConfig config); + SysConfig selectConfig(SysConfig config); /** * 查询参数配置列表 @@ -25,7 +26,7 @@ public interface SysConfigMapper * @param config 参数配置信息 * @return 参数配置集合 */ - public List selectConfigList(SysConfig config); + List selectConfigList(SysConfig config); /** * 根据键名查询参数配置信息 @@ -33,7 +34,7 @@ public interface SysConfigMapper * @param configKey 参数键名 * @return 参数配置信息 */ - public SysConfig checkConfigKeyUnique(String configKey); + SysConfig checkConfigKeyUnique(String configKey); /** * 新增参数配置 @@ -41,7 +42,7 @@ public interface SysConfigMapper * @param config 参数配置信息 * @return 结果 */ - public int insertConfig(SysConfig config); + int insertConfig(SysConfig config); /** * 修改参数配置 @@ -49,7 +50,7 @@ public interface SysConfigMapper * @param config 参数配置信息 * @return 结果 */ - public int updateConfig(SysConfig config); + int updateConfig(SysConfig config); /** * 删除参数配置 @@ -57,7 +58,7 @@ public interface SysConfigMapper * @param configId 参数ID * @return 结果 */ - public int deleteConfigById(Long configId); + int deleteConfigById(Long configId); /** * 批量删除参数信息 @@ -65,5 +66,5 @@ public interface SysConfigMapper * @param configIds 需要删除的参数ID * @return 结果 */ - public int deleteConfigByIds(Long[] configIds); + int deleteConfigByIds(Long[] configIds); } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java index db7cbf8e..91add5fb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.api.domain.SysDept; @@ -11,7 +13,7 @@ import com.ruoyi.system.api.domain.SysDept; * * @author ruoyi */ -public interface SysDeptMapper +public interface SysDeptMapper extends BaseMapper { /** * 查询部门管理数据 @@ -19,7 +21,7 @@ public interface SysDeptMapper * @param dept 部门信息 * @return 部门信息集合 */ - public List selectDeptList(SysDept dept); + List selectDeptList(SysDept dept); /** * 根据角色ID查询部门树信息 @@ -28,7 +30,7 @@ public interface SysDeptMapper * @param deptCheckStrictly 部门树选择项是否关联显示 * @return 选中部门列表 */ - public List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); + List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); /** * 根据部门ID查询信息 @@ -36,7 +38,7 @@ public interface SysDeptMapper * @param deptId 部门ID * @return 部门信息 */ - public SysDept selectDeptById(Long deptId); + SysDept selectDeptById(Long deptId); /** * 根据ID查询所有子部门 @@ -44,7 +46,7 @@ public interface SysDeptMapper * @param deptId 部门ID * @return 部门列表 */ - public List selectChildrenDeptById(Long deptId); + List selectChildrenDeptById(Long deptId); /** * 根据ID查询所有子部门（正常状态） @@ -52,7 +54,7 @@ public interface SysDeptMapper * @param deptId 部门ID * @return 子部门数 */ - public int selectNormalChildrenDeptById(Long deptId); + int selectNormalChildrenDeptById(Long deptId); /** * 是否存在子节点 @@ -60,7 +62,7 @@ public interface SysDeptMapper * @param deptId 部门ID * @return 结果 */ - public int hasChildByDeptId(Long deptId); + int hasChildByDeptId(Long deptId); /** * 查询部门是否存在用户 @@ -68,7 +70,7 @@ public interface SysDeptMapper * @param deptId 部门ID * @return 结果 */ - public int checkDeptExistUser(Long deptId); + int checkDeptExistUser(Long deptId); /** * 校验部门名称是否唯一 @@ -77,7 +79,7 @@ public interface SysDeptMapper * @param parentId 父部门ID * @return 结果 */ - public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); + SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId); /** * 新增部门信息 @@ -85,7 +87,7 @@ public interface SysDeptMapper * @param dept 部门信息 * @return 结果 */ - public int insertDept(SysDept dept); + int insertDept(SysDept dept); /** * 修改部门信息 @@ -93,14 +95,14 @@ public interface SysDeptMapper * @param dept 部门信息 * @return 结果 */ - public int updateDept(SysDept dept); + int updateDept(SysDept dept); /** * 修改所在部门的父级部门状态 * * @param dept 部门 */ - public void updateDeptStatus(SysDept dept); + void updateDeptStatus(SysDept dept); /** * 修改子元素关系 @@ -108,7 +110,7 @@ public interface SysDeptMapper * @param depts 子元素 * @return 结果 */ - public int updateDeptChildren(@Param("depts") List depts); + int updateDeptChildren(@Param("depts") List depts); /** * 删除部门管理信息 @@ -116,5 +118,5 @@ public interface SysDeptMapper * @param deptId 部门ID * @return 结果 */ - public int deleteDeptById(Long deptId); + int deleteDeptById(Long deptId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java index f495adfb..b670fdf3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysDictData; @@ -11,7 +13,7 @@ import com.ruoyi.system.domain.SysDictData; * * @author ruoyi */ -public interface SysDictDataMapper +public interface SysDictDataMapper extends BaseMapper { /** * 根据条件分页查询字典数据 @@ -19,7 +21,7 @@ public interface SysDictDataMapper * @param dictData 字典数据信息 * @return 字典数据集合信息 */ - public List selectDictDataList(SysDictData dictData); + List selectDictDataList(SysDictData dictData); /** * 根据字典类型查询字典数据 @@ -27,7 +29,7 @@ public interface SysDictDataMapper * @param dictType 字典类型 * @return 字典数据集合信息 */ - public List selectDictDataByType(String dictType); + List selectDictDataByType(String dictType); /** * 根据字典类型和字典键值查询字典数据信息 @@ -36,7 +38,7 @@ public interface SysDictDataMapper * @param dictValue 字典键值 * @return 字典标签 */ - public String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); + String selectDictLabel(@Param("dictType") String dictType, @Param("dictValue") String dictValue); /** * 根据字典数据ID查询信息 @@ -44,7 +46,7 @@ public interface SysDictDataMapper * @param dictCode 字典数据ID * @return 字典数据 */ - public SysDictData selectDictDataById(Long dictCode); + SysDictData selectDictDataById(Long dictCode); /** * 查询字典数据 @@ -52,7 +54,7 @@ public interface SysDictDataMapper * @param dictType 字典类型 * @return 字典数据 */ - public int countDictDataByType(String dictType); + int countDictDataByType(String dictType); /** * 通过字典ID删除字典数据信息 @@ -60,7 +62,7 @@ public interface SysDictDataMapper * @param dictCode 字典数据ID * @return 结果 */ - public int deleteDictDataById(Long dictCode); + int deleteDictDataById(Long dictCode); /** * 批量删除字典数据信息 @@ -68,7 +70,7 @@ public interface SysDictDataMapper * @param dictCodes 需要删除的字典数据ID * @return 结果 */ - public int deleteDictDataByIds(Long[] dictCodes); + int deleteDictDataByIds(Long[] dictCodes); /** * 新增字典数据信息 @@ -76,7 +78,7 @@ public interface SysDictDataMapper * @param dictData 字典数据信息 * @return 结果 */ - public int insertDictData(SysDictData dictData); + int insertDictData(SysDictData dictData); /** * 修改字典数据信息 @@ -84,7 +86,7 @@ public interface SysDictDataMapper * @param dictData 字典数据信息 * @return 结果 */ - public int updateDictData(SysDictData dictData); + int updateDictData(SysDictData dictData); /** * 同步修改字典类型 @@ -93,5 +95,5 @@ public interface SysDictDataMapper * @param newDictType 新旧字典类型 * @return 结果 */ - public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); + int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java index 1ee37ea8..c840899d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import org.apache.ibatis.annotations.Mapper; import com.ruoyi.system.domain.SysDictType; @@ -12,76 +14,76 @@ import com.ruoyi.system.domain.SysDictType; * @author ruoyi */ @Mapper -public interface SysDictTypeMapper +public interface SysDictTypeMapper extends BaseMapper { /** * 根据条件分页查询字典类型 - * + * * @param dictType 字典类型信息 * @return 字典类型集合信息 */ - public List selectDictTypeList(SysDictType dictType); + List selectDictTypeList(SysDictType dictType); /** * 根据所有字典类型 - * + * * @return 字典类型集合信息 */ - public List selectDictTypeAll(); + List selectDictTypeAll(); /** * 根据字典类型ID查询信息 - * + * * @param dictId 字典类型ID * @return 字典类型 */ - public SysDictType selectDictTypeById(Long dictId); + SysDictType selectDictTypeById(Long dictId); /** * 根据字典类型查询信息 - * + * * @param dictType 字典类型 * @return 字典类型 */ - public SysDictType selectDictTypeByType(String dictType); + SysDictType selectDictTypeByType(String dictType); /** * 通过字典ID删除字典信息 - * + * * @param dictId 字典ID * @return 结果 */ - public int deleteDictTypeById(Long dictId); + int deleteDictTypeById(Long dictId); /** * 批量删除字典类型信息 - * + * * @param dictIds 需要删除的字典ID * @return 结果 */ - public int deleteDictTypeByIds(Long[] dictIds); + int deleteDictTypeByIds(Long[] dictIds); /** * 新增字典类型信息 - * + * * @param dictType 字典类型信息 * @return 结果 */ - public int insertDictType(SysDictType dictType); + int insertDictType(SysDictType dictType); /** * 修改字典类型信息 - * + * * @param dictType 字典类型信息 * @return 结果 */ - public int updateDictType(SysDictType dictType); + int updateDictType(SysDictType dictType); /** * 校验字典类型称是否唯一 - * + * * @param dictType 字典类型 * @return 结果 */ - public SysDictType checkDictTypeUnique(String dictType); + SysDictType checkDictTypeUnique(String dictType); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java index c1290588..90f1e049 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java @@ -1,6 +1,9 @@ package com.ruoyi.system.mapper; import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysLogininfor; /** @@ -8,14 +11,14 @@ import com.ruoyi.system.domain.SysLogininfor; * * @author ruoyi */ -public interface SysLogininforMapper +public interface SysLogininforMapper extends BaseMapper { /** * 新增系统登录日志 * * @param logininfor 访问日志对象 */ - public int insertLogininfor(SysLogininfor logininfor); + int insertLogininfor(SysLogininfor logininfor); /** * 查询系统登录日志集合 @@ -23,7 +26,7 @@ public interface SysLogininforMapper * @param logininfor 访问日志对象 * @return 登录记录集合 */ - public List selectLogininforList(SysLogininfor logininfor); + List selectLogininforList(SysLogininfor logininfor); /** * 批量删除系统登录日志 @@ -31,12 +34,12 @@ public interface SysLogininforMapper * @param infoIds 需要删除的登录日志ID * @return 结果 */ - public int deleteLogininforByIds(Long[] infoIds); + int deleteLogininforByIds(Long[] infoIds); /** * 清空系统登录日志 * * @return 结果 */ - public int cleanLogininfor(); + int cleanLogininfor(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java index d1ef73e2..85aa9837 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysMenu; @@ -11,7 +13,7 @@ import com.ruoyi.system.domain.SysMenu; * * @author ruoyi */ -public interface SysMenuMapper +public interface SysMenuMapper extends BaseMapper { /** * 查询系统菜单列表 @@ -19,14 +21,14 @@ public interface SysMenuMapper * @param menu 菜单信息 * @return 菜单列表 */ - public List selectMenuList(SysMenu menu); + List selectMenuList(SysMenu menu); /** * 根据用户所有权限 * * @return 权限列表 */ - public List selectMenuPerms(); + List selectMenuPerms(); /** * 根据用户查询系统菜单列表 @@ -34,7 +36,7 @@ public interface SysMenuMapper * @param menu 菜单信息 * @return 菜单列表 */ - public List selectMenuListByUserId(SysMenu menu); + List selectMenuListByUserId(SysMenu menu); /** * 根据用户ID查询权限 @@ -42,14 +44,14 @@ public interface SysMenuMapper * @param userId 用户ID * @return 权限列表 */ - public List selectMenuPermsByUserId(Long userId); + List selectMenuPermsByUserId(Long userId); /** * 根据用户ID查询菜单 * * @return 菜单列表 */ - public List selectMenuTreeAll(); + List selectMenuTreeAll(); /** * 根据用户ID查询菜单 @@ -57,7 +59,7 @@ public interface SysMenuMapper * @param username 用户ID * @return 菜单列表 */ - public List selectMenuTreeByUserId(Long userId); + List selectMenuTreeByUserId(Long userId); /** * 根据角色ID查询菜单树信息 @@ -66,7 +68,7 @@ public interface SysMenuMapper * @param menuCheckStrictly 菜单树选择项是否关联显示 * @return 选中菜单列表 */ - public List selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); + List selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly); /** * 根据菜单ID查询信息 @@ -74,7 +76,7 @@ public interface SysMenuMapper * @param menuId 菜单ID * @return 菜单信息 */ - public SysMenu selectMenuById(Long menuId); + SysMenu selectMenuById(Long menuId); /** * 是否存在菜单子节点 @@ -82,7 +84,7 @@ public interface SysMenuMapper * @param menuId 菜单ID * @return 结果 */ - public int hasChildByMenuId(Long menuId); + int hasChildByMenuId(Long menuId); /** * 新增菜单信息 @@ -90,7 +92,7 @@ public interface SysMenuMapper * @param menu 菜单信息 * @return 结果 */ - public int insertMenu(SysMenu menu); + int insertMenu(SysMenu menu); /** * 修改菜单信息 @@ -98,7 +100,7 @@ public interface SysMenuMapper * @param menu 菜单信息 * @return 结果 */ - public int updateMenu(SysMenu menu); + int updateMenu(SysMenu menu); /** * 删除菜单管理信息 @@ -106,7 +108,7 @@ public interface SysMenuMapper * @param menuId 菜单ID * @return 结果 */ - public int deleteMenuById(Long menuId); + int deleteMenuById(Long menuId); /** * 校验菜单名称是否唯一 @@ -115,5 +117,5 @@ public interface SysMenuMapper * @param parentId 父菜单ID * @return 结果 */ - public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId); + SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java index 5e801ea3..fa6c7f8c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysNotice; /** @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.SysNotice; * * @author ruoyi */ -public interface SysNoticeMapper +public interface SysNoticeMapper extends BaseMapper { /** * 查询公告信息 @@ -17,7 +19,7 @@ public interface SysNoticeMapper * @param noticeId 公告ID * @return 公告信息 */ - public SysNotice selectNoticeById(Long noticeId); + SysNotice selectNoticeById(Long noticeId); /** * 查询公告列表 @@ -25,7 +27,7 @@ public interface SysNoticeMapper * @param notice 公告信息 * @return 公告集合 */ - public List selectNoticeList(SysNotice notice); + List selectNoticeList(SysNotice notice); /** * 新增公告 @@ -33,7 +35,7 @@ public interface SysNoticeMapper * @param notice 公告信息 * @return 结果 */ - public int insertNotice(SysNotice notice); + int insertNotice(SysNotice notice); /** * 修改公告 @@ -41,7 +43,7 @@ public interface SysNoticeMapper * @param notice 公告信息 * @return 结果 */ - public int updateNotice(SysNotice notice); + int updateNotice(SysNotice notice); /** * 批量删除公告 @@ -49,7 +51,7 @@ public interface SysNoticeMapper * @param noticeId 公告ID * @return 结果 */ - public int deleteNoticeById(Long noticeId); + int deleteNoticeById(Long noticeId); /** * 批量删除公告信息 @@ -57,5 +59,5 @@ public interface SysNoticeMapper * @param noticeIds 需要删除的公告ID * @return 结果 */ - public int deleteNoticeByIds(Long[] noticeIds); + int deleteNoticeByIds(Long[] noticeIds); } \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java index 55036321..4a59b17d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -2,21 +2,23 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.api.domain.SysOperLog; +import com.ruoyi.system.domain.SysConfig; /** * 操作日志 数据层 * * @author ruoyi */ -public interface SysOperLogMapper +public interface SysOperLogMapper extends BaseMapper { /** * 新增操作日志 * * @param operLog 操作日志对象 */ - public int insertOperlog(SysOperLog operLog); + int insertOperlog(SysOperLog operLog); /** * 查询系统操作日志集合 @@ -24,7 +26,7 @@ public interface SysOperLogMapper * @param operLog 操作日志对象 * @return 操作日志集合 */ - public List selectOperLogList(SysOperLog operLog); + List selectOperLogList(SysOperLog operLog); /** * 批量删除系统操作日志 @@ -32,7 +34,7 @@ public interface SysOperLogMapper * @param operIds 需要删除的操作日志ID * @return 结果 */ - public int deleteOperLogByIds(Long[] operIds); + int deleteOperLogByIds(Long[] operIds); /** * 查询操作日志详细 @@ -40,10 +42,10 @@ public interface SysOperLogMapper * @param operId 操作ID * @return 操作日志对象 */ - public SysOperLog selectOperLogById(Long operId); + SysOperLog selectOperLogById(Long operId); /** * 清空操作日志 */ - public void cleanOperLog(); + void cleanOperLog(); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java index 81809986..2808fcb0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysPost; /** @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.SysPost; * * @author ruoyi */ -public interface SysPostMapper +public interface SysPostMapper extends BaseMapper { /** * 查询岗位数据集合 @@ -17,14 +19,14 @@ public interface SysPostMapper * @param post 岗位信息 * @return 岗位数据集合 */ - public List selectPostList(SysPost post); + List selectPostList(SysPost post); /** * 查询所有岗位 * * @return 岗位列表 */ - public List selectPostAll(); + List selectPostAll(); /** * 通过岗位ID查询岗位信息 @@ -32,7 +34,7 @@ public interface SysPostMapper * @param postId 岗位ID * @return 角色对象信息 */ - public SysPost selectPostById(Long postId); + SysPost selectPostById(Long postId); /** * 根据用户ID获取岗位选择框列表 @@ -40,7 +42,7 @@ public interface SysPostMapper * @param userId 用户ID * @return 选中岗位ID列表 */ - public List selectPostListByUserId(Long userId); + List selectPostListByUserId(Long userId); /** * 查询用户所属岗位组 @@ -48,7 +50,7 @@ public interface SysPostMapper * @param userName 用户名 * @return 结果 */ - public List selectPostsByUserName(String userName); + List selectPostsByUserName(String userName); /** * 删除岗位信息 @@ -56,7 +58,7 @@ public interface SysPostMapper * @param postId 岗位ID * @return 结果 */ - public int deletePostById(Long postId); + int deletePostById(Long postId); /** * 批量删除岗位信息 @@ -64,7 +66,7 @@ public interface SysPostMapper * @param postIds 需要删除的岗位ID * @return 结果 */ - public int deletePostByIds(Long[] postIds); + int deletePostByIds(Long[] postIds); /** * 修改岗位信息 @@ -72,7 +74,7 @@ public interface SysPostMapper * @param post 岗位信息 * @return 结果 */ - public int updatePost(SysPost post); + int updatePost(SysPost post); /** * 新增岗位信息 @@ -80,7 +82,7 @@ public interface SysPostMapper * @param post 岗位信息 * @return 结果 */ - public int insertPost(SysPost post); + int insertPost(SysPost post); /** * 校验岗位名称 @@ -88,7 +90,7 @@ public interface SysPostMapper * @param postName 岗位名称 * @return 结果 */ - public SysPost checkPostNameUnique(String postName); + SysPost checkPostNameUnique(String postName); /** * 校验岗位编码 @@ -96,5 +98,5 @@ public interface SysPostMapper * @param postCode 岗位编码 * @return 结果 */ - public SysPost checkPostCodeUnique(String postCode); + SysPost checkPostCodeUnique(String postCode); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java index 7946548c..a21e889d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysRoleDept; /** @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.SysRoleDept; * * @author ruoyi */ -public interface SysRoleDeptMapper +public interface SysRoleDeptMapper extends BaseMapper { /** * 通过角色ID删除角色和部门关联 @@ -17,7 +19,7 @@ public interface SysRoleDeptMapper * @param roleId 角色ID * @return 结果 */ - public int deleteRoleDeptByRoleId(Long roleId); + int deleteRoleDeptByRoleId(Long roleId); /** * 批量删除角色部门关联信息 @@ -25,7 +27,7 @@ public interface SysRoleDeptMapper * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteRoleDept(Long[] ids); + int deleteRoleDept(Long[] ids); /** * 查询部门使用数量 @@ -33,7 +35,7 @@ public interface SysRoleDeptMapper * @param deptId 部门ID * @return 结果 */ - public int selectCountRoleDeptByDeptId(Long deptId); + int selectCountRoleDeptByDeptId(Long deptId); /** * 批量新增角色部门信息 @@ -41,5 +43,5 @@ public interface SysRoleDeptMapper * @param roleDeptList 角色部门列表 * @return 结果 */ - public int batchRoleDept(List roleDeptList); + int batchRoleDept(List roleDeptList); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java index 68249f4f..eed3c717 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -2,14 +2,16 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.api.domain.SysRole; +import com.ruoyi.system.domain.SysConfig; /** * 角色表 数据层 * * @author ruoyi */ -public interface SysRoleMapper +public interface SysRoleMapper extends BaseMapper { /** * 根据条件分页查询角色数据 @@ -17,7 +19,7 @@ public interface SysRoleMapper * @param role 角色信息 * @return 角色数据集合信息 */ - public List selectRoleList(SysRole role); + List selectRoleList(SysRole role); /** * 根据用户ID查询角色 @@ -25,14 +27,14 @@ public interface SysRoleMapper * @param userId 用户ID * @return 角色列表 */ - public List selectRolePermissionByUserId(Long userId); + List selectRolePermissionByUserId(Long userId); /** * 查询所有角色 * * @return 角色列表 */ - public List selectRoleAll(); + List selectRoleAll(); /** * 根据用户ID获取角色选择框列表 @@ -40,7 +42,7 @@ public interface SysRoleMapper * @param userId 用户ID * @return 选中角色ID列表 */ - public List selectRoleListByUserId(Long userId); + List selectRoleListByUserId(Long userId); /** * 通过角色ID查询角色 @@ -48,7 +50,7 @@ public interface SysRoleMapper * @param roleId 角色ID * @return 角色对象信息 */ - public SysRole selectRoleById(Long roleId); + SysRole selectRoleById(Long roleId); /** * 根据用户ID查询角色 @@ -56,7 +58,7 @@ public interface SysRoleMapper * @param userName 用户名 * @return 角色列表 */ - public List selectRolesByUserName(String userName); + List selectRolesByUserName(String userName); /** * 校验角色名称是否唯一 @@ -64,7 +66,7 @@ public interface SysRoleMapper * @param roleName 角色名称 * @return 角色信息 */ - public SysRole checkRoleNameUnique(String roleName); + SysRole checkRoleNameUnique(String roleName); /** * 校验角色权限是否唯一 @@ -72,7 +74,7 @@ public interface SysRoleMapper * @param roleKey 角色权限 * @return 角色信息 */ - public SysRole checkRoleKeyUnique(String roleKey); + SysRole checkRoleKeyUnique(String roleKey); /** * 修改角色信息 @@ -80,7 +82,7 @@ public interface SysRoleMapper * @param role 角色信息 * @return 结果 */ - public int updateRole(SysRole role); + int updateRole(SysRole role); /** * 新增角色信息 @@ -88,7 +90,7 @@ public interface SysRoleMapper * @param role 角色信息 * @return 结果 */ - public int insertRole(SysRole role); + int insertRole(SysRole role); /** * 通过角色ID删除角色 @@ -96,7 +98,7 @@ public interface SysRoleMapper * @param roleId 角色ID * @return 结果 */ - public int deleteRoleById(Long roleId); + int deleteRoleById(Long roleId); /** * 批量删除角色信息 @@ -104,5 +106,5 @@ public interface SysRoleMapper * @param roleIds 需要删除的角色ID * @return 结果 */ - public int deleteRoleByIds(Long[] roleIds); + int deleteRoleByIds(Long[] roleIds); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java index e11419f6..1e5449f9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysRoleMenu; /** @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.SysRoleMenu; * * @author ruoyi */ -public interface SysRoleMenuMapper +public interface SysRoleMenuMapper extends BaseMapper { /** * 查询菜单使用数量 @@ -17,7 +19,7 @@ public interface SysRoleMenuMapper * @param menuId 菜单ID * @return 结果 */ - public int checkMenuExistRole(Long menuId); + int checkMenuExistRole(Long menuId); /** * 通过角色ID删除角色和菜单关联 @@ -25,7 +27,7 @@ public interface SysRoleMenuMapper * @param roleId 角色ID * @return 结果 */ - public int deleteRoleMenuByRoleId(Long roleId); + int deleteRoleMenuByRoleId(Long roleId); /** * 批量删除角色菜单关联信息 @@ -33,7 +35,7 @@ public interface SysRoleMenuMapper * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteRoleMenu(Long[] ids); + int deleteRoleMenu(Long[] ids); /** * 批量新增角色菜单信息 @@ -41,5 +43,5 @@ public interface SysRoleMenuMapper * @param roleMenuList 角色菜单列表 * @return 结果 */ - public int batchRoleMenu(List roleMenuList); + int batchRoleMenu(List roleMenuList); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 2df65700..873d19a7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.api.domain.SysUser; @@ -11,7 +13,7 @@ import com.ruoyi.system.api.domain.SysUser; * * @author ruoyi */ -public interface SysUserMapper +public interface SysUserMapper extends BaseMapper { /** * 根据条件分页查询用户列表 @@ -19,7 +21,7 @@ public interface SysUserMapper * @param sysUser 用户信息 * @return 用户信息集合信息 */ - public List selectUserList(SysUser sysUser); + List selectUserList(SysUser sysUser); /** * 通过用户名查询用户 @@ -27,7 +29,7 @@ public interface SysUserMapper * @param userName 用户名 * @return 用户对象信息 */ - public SysUser selectUserByUserName(String userName); + SysUser selectUserByUserName(String userName); /** * 通过用户ID查询用户 @@ -35,7 +37,7 @@ public interface SysUserMapper * @param userId 用户ID * @return 用户对象信息 */ - public SysUser selectUserById(Long userId); + SysUser selectUserById(Long userId); /** * 新增用户信息 @@ -43,7 +45,7 @@ public interface SysUserMapper * @param user 用户信息 * @return 结果 */ - public int insertUser(SysUser user); + int insertUser(SysUser user); /** * 修改用户信息 @@ -51,7 +53,7 @@ public interface SysUserMapper * @param user 用户信息 * @return 结果 */ - public int updateUser(SysUser user); + int updateUser(SysUser user); /** * 修改用户头像 @@ -60,7 +62,7 @@ public interface SysUserMapper * @param avatar 头像地址 * @return 结果 */ - public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); + int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar); /** * 重置用户密码 @@ -69,7 +71,7 @@ public interface SysUserMapper * @param password 密码 * @return 结果 */ - public int resetUserPwd(@Param("userName") String userName, @Param("password") String password); + int resetUserPwd(@Param("userName") String userName, @Param("password") String password); /** * 通过用户ID删除用户 @@ -77,7 +79,7 @@ public interface SysUserMapper * @param userId 用户ID * @return 结果 */ - public int deleteUserById(Long userId); + int deleteUserById(Long userId); /** * 批量删除用户信息 @@ -85,7 +87,7 @@ public interface SysUserMapper * @param userIds 需要删除的用户ID * @return 结果 */ - public int deleteUserByIds(Long[] userIds); + int deleteUserByIds(Long[] userIds); /** * 校验用户名称是否唯一 @@ -93,7 +95,7 @@ public interface SysUserMapper * @param userName 用户名称 * @return 结果 */ - public int checkUserNameUnique(String userName); + int checkUserNameUnique(String userName); /** * 校验手机号码是否唯一 @@ -101,7 +103,7 @@ public interface SysUserMapper * @param phonenumber 手机号码 * @return 结果 */ - public SysUser checkPhoneUnique(String phonenumber); + SysUser checkPhoneUnique(String phonenumber); /** * 校验email是否唯一 @@ -109,5 +111,5 @@ public interface SysUserMapper * @param email 用户邮箱 * @return 结果 */ - public SysUser checkEmailUnique(String email); + SysUser checkEmailUnique(String email); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java index 8d50b04c..dd034971 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.domain.SysUserPost; /** @@ -9,7 +11,7 @@ import com.ruoyi.system.domain.SysUserPost; * * @author ruoyi */ -public interface SysUserPostMapper +public interface SysUserPostMapper extends BaseMapper { /** * 通过用户ID删除用户和岗位关联 @@ -17,7 +19,7 @@ public interface SysUserPostMapper * @param userId 用户ID * @return 结果 */ - public int deleteUserPostByUserId(Long userId); + int deleteUserPostByUserId(Long userId); /** * 通过岗位ID查询岗位使用数量 @@ -25,7 +27,7 @@ public interface SysUserPostMapper * @param postId 岗位ID * @return 结果 */ - public int countUserPostById(Long postId); + int countUserPostById(Long postId); /** * 批量删除用户和岗位关联 @@ -33,7 +35,7 @@ public interface SysUserPostMapper * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteUserPost(Long[] ids); + int deleteUserPost(Long[] ids); /** * 批量新增用户岗位信息 @@ -41,5 +43,5 @@ public interface SysUserPostMapper * @param userPostList 用户角色列表 * @return 结果 */ - public int batchUserPost(List userPostList); + int batchUserPost(List userPostList); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java index 9bce2a07..9af82908 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java @@ -2,6 +2,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.system.domain.SysConfig; import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysUserRole; @@ -11,7 +13,7 @@ import com.ruoyi.system.domain.SysUserRole; * * @author ruoyi */ -public interface SysUserRoleMapper +public interface SysUserRoleMapper extends BaseMapper { /** * 通过用户ID删除用户和角色关联 @@ -19,7 +21,7 @@ public interface SysUserRoleMapper * @param userId 用户ID * @return 结果 */ - public int deleteUserRoleByUserId(Long userId); + int deleteUserRoleByUserId(Long userId); /** * 批量删除用户和角色关联 @@ -27,7 +29,7 @@ public interface SysUserRoleMapper * @param ids 需要删除的数据ID * @return 结果 */ - public int deleteUserRole(Long[] ids); + int deleteUserRole(Long[] ids); /** * 通过角色ID查询角色使用数量 @@ -35,7 +37,7 @@ public interface SysUserRoleMapper * @param roleId 角色ID * @return 结果 */ - public int countUserRoleByRoleId(Long roleId); + int countUserRoleByRoleId(Long roleId); /** * 批量新增用户角色信息 @@ -43,7 +45,7 @@ public interface SysUserRoleMapper * @param userRoleList 用户角色列表 * @return 结果 */ - public int batchUserRole(List userRoleList); + int batchUserRole(List userRoleList); /** * 删除用户和角色关联信息 @@ -51,7 +53,7 @@ public interface SysUserRoleMapper * @param userRole 用户和角色关联信息 * @return 结果 */ - public int deleteUserRoleInfo(SysUserRole userRole); + int deleteUserRoleInfo(SysUserRole userRole); /** * 批量取消授权用户角色 @@ -60,5 +62,5 @@ public interface SysUserRoleMapper * @param userIds 需要删除的用户数据ID * @return 结果 */ - public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds); + int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds); } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml index b1570e28..4e930ab0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -3,19 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - + select config_id, config_name, config_key, config_value, config_type, create_by, create_time, update_by, update_time, remark from sys_config @@ -33,12 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -59,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where config_key = #{configKey} limit 1 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index f8cdf67c..39b1d5e9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -4,30 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time from sys_dept d - where d.del_flag = '0' @@ -55,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by d.parent_id, d.order_num - where dept_id = #{deptId} @@ -69,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where del_flag = '0' and parent_id = #{deptId} - select * from sys_dept where find_in_set(#{deptId}, ancestors) @@ -77,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors) - where dept_name=#{deptName} and parent_id = #{parentId} limit 1 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 75d80a15..1b71d4d8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -3,29 +3,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - + select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark from sys_dict_data - @@ -41,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by dict_sort asc - where status = '0' and dict_type = #{dictType} order by dict_sort asc @@ -51,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dict_type = #{dictType} and dict_value = #{dictValue} - where dict_code = #{dictCode} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 2b44b2ee..912e7428 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -4,23 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - select dict_id, dict_name, dict_type, status, create_by, create_time, remark from sys_dict_type - @@ -41,21 +30,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - where dict_id = #{dictId} - where dict_type = #{dictType} - where dict_type = #{dictType} limit 1 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 4f400694..d6ff3613 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -4,21 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - insert into sys_logininfor (user_name, status, ipaddr, msg, access_time) values (#{userName}, #{status}, #{ipaddr}, #{msg}, sysdate()) - select info_id, user_name, ipaddr, status, msg, access_time from sys_logininfor diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index 9d2cd0ad..a1c55e2a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -4,34 +4,12 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - - - - - select menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time from sys_menu - @@ -47,13 +25,13 @@ order by parent_id, order_num - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 order by m.parent_id, m.order_num - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id @@ -72,7 +50,7 @@ order by m.parent_id, m.order_num - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id @@ -110,7 +88,7 @@ where m.status = '0' and r.status = '0' and ur.user_id = #{userId} - where menu_id = #{menuId} @@ -119,7 +97,7 @@ select count(1) from sys_menu where parent_id = #{menuId} - where menu_name=#{menuName} and parent_id = #{parentId} limit 1 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml index 6915a148..6ad4574a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -3,31 +3,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - + select notice_id, notice_title, notice_type, cast(notice_content as char) as notice_content, status, create_by, create_time, update_by, update_time, remark from sys_notice - where notice_id = #{noticeId} - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 5dd0a472..18d63f5c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -4,24 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - - select oper_id, title, business_type, method, request_method, operator_type, oper_name, dept_name, oper_url, oper_ip, oper_param, json_result, status, error_msg, oper_time from sys_oper_log @@ -32,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" values (#{title}, #{businessType}, #{method}, #{requestMethod}, #{operatorType}, #{operName}, #{deptName}, #{operUrl}, #{operIp}, #{operParam}, #{jsonResult}, #{status}, #{errorMsg}, sysdate()) - @@ -70,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where oper_id = #{operId} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml index 6ac8e7c3..8910ff37 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -3,26 +3,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark from sys_post - @@ -37,11 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - where post_id = #{postId} @@ -54,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.user_id = #{userId} - select p.post_id, p.post_name, p.post_code from sys_post p left join sys_user_post up on up.post_id = p.post_id @@ -62,12 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.user_name = #{userName} - where post_name=#{postName} limit 1 - where post_code=#{postCode} limit 1 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index 700671e1..ca3df9df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -4,11 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - delete from sys_role_dept where role_id=#{roleId} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 7e3ab1ec..ac66252f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -3,23 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, @@ -30,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_dept d on u.dept_id = d.dept_id - where r.del_flag = '0' @@ -53,12 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by r.role_sort - WHERE r.del_flag = '0' and ur.user_id = #{userId} - @@ -70,22 +53,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where u.user_id = #{userId} - where r.role_id = #{roleId} - WHERE r.del_flag = '0' and u.user_name = #{userName} - where r.role_name=#{roleName} limit 1 - where r.role_key=#{roleKey} limit 1 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index e75bb174..88c8f1ab 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -3,11 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - + - where u.user_name = #{userName} - where u.user_id = #{userId} @@ -95,11 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(1) from sys_user where user_name = #{userName} limit 1 - select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1 - select user_id, email from sys_user where email = #{email} limit 1 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 21c40981..169a2b4d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -4,11 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - delete from sys_user_post where user_id=#{userId} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index 95e07adb..6bd566d7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -4,11 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - delete from sys_user_role where user_id=#{userId} diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index ad60e4e7..754c3353 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -48,6 +48,7 @@ "js-beautify": "1.13.0", "js-cookie": "2.2.1", "jsencrypt": "3.0.0-rc.1", + "node-sass": "^4.14.1", "nprogress": "0.2.0", "quill": "1.3.7", "screenfull": "5.0.2", @@ -70,7 +71,6 @@ "eslint-plugin-vue": "7.2.0", "lint-staged": "10.5.3", "runjs": "4.4.2", - "sass": "1.32.0", "sass-loader": "10.1.0", "script-ext-html-webpack-plugin": "2.1.5", "svg-sprite-loader": "5.1.1", diff --git a/ruoyi-visual/ruoyi-monitor/Dockerfile b/ruoyi-visual/ruoyi-monitor/Dockerfile new file mode 100644 index 00000000..f559e4fe --- /dev/null +++ b/ruoyi-visual/ruoyi-monitor/Dockerfile @@ -0,0 +1,20 @@ +FROM java:8-jdk + +#作者 +MAINTAINER awg + +#系统编码和时区 +ENV LANG C.UTF-8 +ENV TZ=Asia/Shanghai +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone + +# 复制jar文件到镜像内，名字改为app.jar +ADD /target/*.jar app.jar + +ENV JAVA_OPTS="-Xmx32M -Xms32M" + +# 启动容器时的进程 +ENTRYPOINT java ${JAVA_OPTS} -jar /app.jar + +# 暴露接口 +EXPOSE 9100 \ No newline at end of file diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index c8c1066d..98e307b1 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -61,6 +61,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring-boot.mavenplugin.version} diff --git a/sql/ry_config_20210228.sql b/sql/ry_config_20210228.sql index f42393f8..ed3eaf20 100644 --- a/sql/ry_config_20210228.sql +++ b/sql/ry_config_20210228.sql @@ -36,7 +36,7 @@ insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_mod (2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','spring:\r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n cloud:\r\n gateway:\r\n discovery:\r\n locator:\r\n lowerCaseServiceId: true\r\n enabled: true\r\n routes:\r\n # 认证中心\r\n - id: ruoyi-auth\r\n uri: lb://ruoyi-auth\r\n predicates:\r\n - Path=/auth/**\r\n filters:\r\n # 验证码处理\r\n - CacheRequestFilter\r\n - ValidateCodeFilter\r\n - StripPrefix=1\r\n # 代码生成\r\n - id: ruoyi-gen\r\n uri: lb://ruoyi-gen\r\n predicates:\r\n - Path=/code/**\r\n filters:\r\n - StripPrefix=1\r\n # 定时任务\r\n - id: ruoyi-job\r\n uri: lb://ruoyi-job\r\n predicates:\r\n - Path=/schedule/**\r\n filters:\r\n - StripPrefix=1\r\n # 系统模块\r\n - id: ruoyi-system\r\n uri: lb://ruoyi-system\r\n predicates:\r\n - Path=/system/**\r\n filters:\r\n - StripPrefix=1\r\n # 文件服务\r\n - id: ruoyi-file\r\n uri: lb://ruoyi-file\r\n predicates:\r\n - Path=/file/**\r\n filters:\r\n - StripPrefix=1\r\n\r\n# 不校验白名单\r\nignore:\r\n whites:\r\n - /auth/logout\r\n - /auth/login\r\n - /*/v2/api-docs\r\n - /csrf\r\n','ef4a58daf989827334b3aac1c9d68392','2020-05-14 14:17:55','2020-11-18 17:53:23',NULL,'0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','null'), (3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','spring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n','b7354e1eb62c2d846d44a796d9ec6930','2020-11-20 00:00:00','2021-02-28 21:06:58',NULL,'0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','null'), (4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# spring\r\nspring: \r\n security:\r\n user:\r\n name: ruoyi\r\n password: 123456\r\n boot:\r\n admin:\r\n ui:\r\n title: 若依服务状态监控\r\n','d8997d0707a2fd5d9fc4e8409da38129','2020-11-20 00:00:00','2020-12-21 16:28:07',NULL,'0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','null'), -(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n druid:\r\n stat-view-servlet:\r\n enabled: true\r\n loginUsername: admin\r\n loginPassword: 123456\r\n dynamic:\r\n druid:\r\n initial-size: 5\r\n min-idle: 5\r\n maxActive: 20\r\n maxWait: 60000\r\n timeBetweenEvictionRunsMillis: 60000\r\n minEvictableIdleTimeMillis: 300000\r\n validationQuery: SELECT 1 FROM DUAL\r\n testWhileIdle: true\r\n testOnBorrow: false\r\n testOnReturn: false\r\n poolPreparedStatements: true\r\n maxPoolPreparedStatementPerConnectionSize: 20\r\n filters: stat,slf4j\r\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n datasource:\r\n # 主库数据源\r\n master:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: password\r\n # 从库数据源\r\n # slave:\r\n # username: \r\n # password: \r\n # url: \r\n # driver-class-name: \r\n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\r\n\r\n# seata配置\r\nseata:\r\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\r\n enabled: false\r\n # Seata 应用编号，默认为 ${spring.application.name}\r\n application-id: ${spring.application.name}\r\n # Seata 事务组编号，用于 TC 集群名\r\n tx-service-group: ${spring.application.name}-group\r\n # 关闭自动代理\r\n enable-auto-data-source-proxy: false\r\n # 服务配置项\r\n service:\r\n # 虚拟组和分组的映射\r\n vgroup-mapping:\r\n ruoyi-system-group: default\r\n config:\r\n type: nacos\r\n nacos:\r\n serverAddr: 127.0.0.1:8848\r\n group: SEATA_GROUP\r\n namespace:\r\n registry:\r\n type: nacos\r\n nacos:\r\n application: seata-server\r\n server-addr: 127.0.0.1:8848\r\n namespace:\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.ruoyi.system\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger配置\r\nswagger:\r\n title: 系统模块接口文档\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip','ac8913dee679e65bb7d482df5f267d4e','2020-11-20 00:00:00','2021-01-27 10:42:25',NULL,'0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','null'), +(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# spring配置\r\nspring:\r\n #排除DruidDataSourceAutoConfigure\r\n autoconfigure:\r\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n druid:\r\n stat-view-servlet:\r\n enabled: true\r\n loginUsername: admin\r\n loginPassword: 123456\r\n dynamic:\r\n druid:\r\n initial-size: 5\r\n min-idle: 5\r\n maxActive: 20\r\n maxWait: 60000\r\n timeBetweenEvictionRunsMillis: 60000\r\n minEvictableIdleTimeMillis: 300000\r\n validationQuery: SELECT 1 FROM DUAL\r\n testWhileIdle: true\r\n testOnBorrow: false\r\n testOnReturn: false\r\n poolPreparedStatements: true\r\n maxPoolPreparedStatementPerConnectionSize: 20\r\n filters: stat,slf4j\r\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\r\n datasource:\r\n # 主库数据源\r\n master:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: password\r\n # 从库数据源\r\n # slave:\r\n # username: \r\n # password: \r\n # url: \r\n # driver-class-name: \r\n # seata: true # 开启seata代理，开启后默认每个数据源都代理，如果某个不需要代理可单独关闭\r\n\r\n# seata配置\r\nseata:\r\n # 默认关闭，如需启用spring.datasource.dynami.seata需要同时开启\r\n enabled: false\r\n # Seata 应用编号，默认为 ${spring.application.name}\r\n application-id: ${spring.application.name}\r\n # Seata 事务组编号，用于 TC 集群名\r\n tx-service-group: ${spring.application.name}-group\r\n # 关闭自动代理\r\n enable-auto-data-source-proxy: false\r\n # 服务配置项\r\n service:\r\n # 虚拟组和分组的映射\r\n vgroup-mapping:\r\n ruoyi-system-group: default\r\n config:\r\n type: nacos\r\n nacos:\r\n serverAddr: 127.0.0.1:8848\r\n group: SEATA_GROUP\r\n namespace:\r\n registry:\r\n type: nacos\r\n nacos:\r\n application: seata-server\r\n server-addr: 127.0.0.1:8848\r\n namespace:\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.ruoyi.system\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger配置\r\nswagger:\r\n title: 系统模块接口文档\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip','ac8913dee679e65bb7d482df5f267d4e','2020-11-20 00:00:00','2021-01-27 10:42:25',NULL,'0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','null'), (6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource: \r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: password\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.ruoyi.gen.domain\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger配置\r\nswagger:\r\n title: 代码生成接口文档\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip\r\n\r\n# 代码生成\r\ngen: \r\n # 作者\r\n author: ruoyi\r\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\r\n packageName: com.ruoyi.system\r\n # 自动去除表前缀，默认是false\r\n autoRemovePre: false\r\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\r\n tablePrefix: sys_\r\n','8c79f64a4cca9b821a03dc8b27a2d8eb','2020-11-20 00:00:00','2021-01-26 10:36:45',NULL,'0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','null'), (7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# spring配置\r\nspring: \r\n redis:\r\n host: localhost\r\n port: 6379\r\n password: \r\n datasource:\r\n driver-class-name: com.mysql.cj.jdbc.Driver\r\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\r\n username: root\r\n password: password\r\n\r\n# mybatis配置\r\nmybatis:\r\n # 搜索指定包别名\r\n typeAliasesPackage: com.ruoyi.job.domain\r\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\r\n mapperLocations: classpath:mapper/**/*.xml\r\n\r\n# swagger配置\r\nswagger:\r\n title: 定时任务接口文档\r\n license: Powered By ruoyi\r\n licenseUrl: https://ruoyi.vip\r\n','d6dfade9a2c93c463ae857cd503cb172','2020-11-20 00:00:00','2021-01-26 10:36:04',NULL,'0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','null'), (8,'ruoyi-file-dev.yml','DEFAULT_GROUP','# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/ruoyi/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test','5382b93f3d8059d6068c0501fdd41195','2020-11-20 00:00:00','2020-12-21 21:01:59',NULL,'0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml','null'),