From 4832139590d4a9437f7200546b5affed6c54f3d8 Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Thu, 6 Jun 2024 16:28:23 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E8=AF=B8=E5=A4=9A?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98,javax?= =?UTF-8?q?=E6=A1=86=E6=9E=B6=E5=8D=87=E7=BA=A7=E4=B8=BAjakarta?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-common/cloud-common-core/pom.xml | 12 --- .../java/com/muyu/common/core/xss/Xss.java | 5 +- .../muyu/common/core/xss/XssValidator.java | 4 +- .../muyu/common/system/domain/SysDept.java | 10 +-- .../common/system/domain/SysDictData.java | 6 +- .../common/system/domain/SysDictType.java | 8 +- .../muyu/common/system/domain/SysFile.java | 2 - .../muyu/common/system/domain/SysRole.java | 8 +- .../muyu/common/system/domain/SysUser.java | 8 +- cloud-modules/cloud-modules-file/pom.xml | 6 -- .../service/FastDfsSysFileServiceImpl.java | 47 ---------- .../java/com/muyu/gen/domain/GenTable.java | 4 +- .../com/muyu/gen/domain/GenTableColumn.java | 2 +- .../src/main/resources/vm/java/domain.java.vm | 2 - .../main/resources/vm/java/sub-domain.java.vm | 2 - .../main/java/com/muyu/job/domain/SysJob.java | 10 +-- .../java/com/muyu/job/domain/SysJobLog.java | 87 ------------------- .../com/muyu/system/domain/SysConfig.java | 6 +- .../java/com/muyu/system/domain/SysMenu.java | 15 ++-- .../com/muyu/system/domain/SysNotice.java | 6 +- .../java/com/muyu/system/domain/SysPost.java | 17 ++-- .../com/muyu/system/domain/SysRoleDept.java | 2 - .../com/muyu/system/domain/SysRoleMenu.java | 35 ++------ .../com/muyu/system/domain/SysUserPost.java | 2 - .../com/muyu/system/domain/SysUserRole.java | 2 - pom.xml | 17 +--- 26 files changed, 54 insertions(+), 271 deletions(-) delete mode 100644 cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml index f9d00da..5b49ee4 100644 --- a/cloud-common/cloud-common-core/pom.xml +++ b/cloud-common/cloud-common-core/pom.xml @@ -82,12 +82,6 @@ spring-boot-starter-validation - - - javax.validation - validation-api - - com.fasterxml.jackson.core @@ -106,12 +100,6 @@ jjwt - - - org.apache.commons diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/xss/Xss.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/xss/Xss.java index 7eb649b..fa31755 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/xss/Xss.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/xss/Xss.java @@ -1,7 +1,8 @@ package com.muyu.common.core.xss; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/xss/XssValidator.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/xss/XssValidator.java index 5a59932..3a03eab 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/xss/XssValidator.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/xss/XssValidator.java @@ -1,9 +1,9 @@ package com.muyu.common.core.xss; import com.muyu.common.core.utils.StringUtils; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java index cb0d445..65ada9e 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java @@ -1,15 +1,13 @@ package com.muyu.common.system.domain; import com.muyu.common.core.web.domain.BaseEntity; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.*; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; import java.util.ArrayList; import java.util.List; diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java index 843c3b8..5beee3f 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java @@ -6,11 +6,9 @@ import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; /** * 字典数据表 sys_dict_data diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java index 56ba7f4..d623333 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java @@ -5,12 +5,10 @@ import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; /** * 字典类型表 sys_dict_type diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java index ca856c8..ad48a1e 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFile.java @@ -4,8 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * 文件信息 diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java index 1708324..1aab56a 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java @@ -5,12 +5,10 @@ import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.Set; /** diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index fd773f7..999b22c 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -6,17 +6,15 @@ import com.muyu.common.core.annotation.Excel.Type; import com.muyu.common.core.annotation.Excels; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.xss.Xss; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; import java.util.Date; import java.util.List; diff --git a/cloud-modules/cloud-modules-file/pom.xml b/cloud-modules/cloud-modules-file/pom.xml index 8a21adb..11f3860 100644 --- a/cloud-modules/cloud-modules-file/pom.xml +++ b/cloud-modules/cloud-modules-file/pom.xml @@ -41,12 +41,6 @@ spring-boot-starter-actuator - - - io.minio diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java deleted file mode 100644 index 81d9a45..0000000 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -//package com.muyu.file.service; -// -//import com.alibaba.nacos.common.utils.IoUtils; -//import com.github.tobato.fastdfs.domain.fdfs.StorePath; -//import com.github.tobato.fastdfs.service.FastFileStorageClient; -//import com.muyu.common.core.utils.file.FileTypeUtils; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.stereotype.Service; -//import org.springframework.web.multipart.MultipartFile; -// -//import java.io.InputStream; -// -///** -// * FastDFS 文件存储 -// * -// * @author muyu -// */ -//@Service -//public class FastDfsSysFileServiceImpl implements ISysFileService { -// /** -// * 域名或本机访问地址 -// */ -// @Value("${fdfs.domain}") -// public String domain; -// -// @Autowired -// private FastFileStorageClient storageClient; -// -// /** -// * FastDfs文件上传接口 -// * -// * @param file 上传的文件 -// * -// * @return 访问地址 -// * -// * @throws Exception -// */ -// @Override -// public String uploadFile (MultipartFile file) throws Exception { -// InputStream inputStream = file.getInputStream(); -// StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), -// FileTypeUtils.getExtension(file), null); -// IoUtils.closeQuietly(inputStream); -// return domain + "/" + storePath.getFullPath(); -// } -//} diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java index 690d8d0..edb6510 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java @@ -10,8 +10,8 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.ArrayUtils; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import java.util.List; diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java index 638b0ab..98e4c28 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 代码生成业务字段表 gen_table_column diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/domain.java.vm b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/domain.java.vm index 4d0d9a6..1292991 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/domain.java.vm +++ b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/domain.java.vm @@ -3,8 +3,6 @@ package ${packageName}.domain; #foreach ($import in $importList) import ${import}; #end -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.muyu.common.core.annotation.Excel; #if($table.crud || $table.sub) import com.muyu.common.core.web.domain.BaseEntity; diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/sub-domain.java.vm b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/sub-domain.java.vm index df72461..a5c170c 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/sub-domain.java.vm +++ b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/sub-domain.java.vm @@ -3,8 +3,6 @@ package ${packageName}.domain; #foreach ($import in $subImportList) import ${import}; #end -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; diff --git a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/domain/SysJob.java b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/domain/SysJob.java index ec31e58..e68de15 100644 --- a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/domain/SysJob.java +++ b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/domain/SysJob.java @@ -7,16 +7,13 @@ import com.muyu.common.core.constant.ScheduleConstants; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.job.util.CronUtils; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import java.util.Date; /** @@ -65,6 +62,7 @@ public class SysJob extends BaseEntity { /** * cron计划策略 */ + @Builder.Default @Excel(name = "计划策略 ", readConverterExp = "0=默认,1=立即触发执行,2=触发一次执行,3=不触发立即执行") private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT; diff --git a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/domain/SysJobLog.java b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/domain/SysJobLog.java index cb24816..1c25d80 100644 --- a/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/domain/SysJobLog.java +++ b/cloud-modules/cloud-modules-job/src/main/java/com/muyu/job/domain/SysJobLog.java @@ -7,8 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.util.Date; @@ -77,89 +75,4 @@ public class SysJobLog extends BaseEntity { */ private Date stopTime; - public Long getJobLogId () { - return jobLogId; - } - - public void setJobLogId (Long jobLogId) { - this.jobLogId = jobLogId; - } - - 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; - } - - public String getInvokeTarget () { - return invokeTarget; - } - - 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(); - } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java index 86d9f6f..6f7e8bf 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java @@ -11,11 +11,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; /** * 参数配置表 sys_config diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java index 95754ca..e4ad4e4 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java @@ -1,17 +1,12 @@ package com.muyu.system.domain; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.ArrayList; import java.util.List; @@ -106,7 +101,9 @@ public class SysMenu extends BaseEntity { /** * 子菜单 */ + @Builder.Default private List children = new ArrayList(); + @NotBlank(message = "菜单名称不能为空") @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") public String getMenuName () { diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java index 18a4f64..a0c30e0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java @@ -7,11 +7,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; /** * 通知公告表 sys_notice diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java index 1da43ab..326987c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java @@ -3,17 +3,12 @@ package com.muyu.system.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; /** * 岗位表 sys_post @@ -61,8 +56,10 @@ public class SysPost extends BaseEntity { /** * 用户是否存在此岗位标识 默认不存在 */ + @Builder.Default private boolean flag = false; - @NotBlank(message = "岗位编码不能为空") + + @NotBlank(message = "岗位编码不能为空") @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") public String getPostCode () { return postCode; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java index 6ecede9..ef9f13c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java @@ -4,8 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * 角色和部门关联 sys_role_dept diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java index 42148c7..fe4074b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java @@ -1,13 +1,20 @@ package com.muyu.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; /** * 角色和菜单关联 sys_role_menu * * @author muyu */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class SysRoleMenu { /** * 角色ID @@ -18,28 +25,4 @@ 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) - .append("roleId", getRoleId()) - .append("menuId", getMenuId()) - .toString(); - } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java index 28d9e8c..229dc70 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java @@ -4,8 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和岗位关联 sys_user_post diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java index 058f902..ee9c945 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java @@ -4,8 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; /** * 用户和角色关联 sys_user_role diff --git a/pom.xml b/pom.xml index fcc85b7..d891e25 100644 --- a/pom.xml +++ b/pom.xml @@ -32,12 +32,11 @@ 2.3 2.0.41 0.9.1 - 8.2.2 + 8.5.10 4.1.2 2.14.3 9.2.0 9.2.0 - 2.0.1.Final 6.1.0-M2 1.3.2 @@ -86,13 +85,6 @@ ${apm-logback.version} - - - javax.validation - validation-api - ${validation.version} - - jakarta.servlet @@ -107,13 +99,6 @@ ${javax.annotation.version} - - - com.github.tobato - fastdfs-client - ${tobato.version} - - io.swagger