From eb8ab41082859e7d17a23e44653757d015461252 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 9 Apr 2024 16:58:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .run/ruoyi-monitor-admin.run.xml | 12 ------------ .run/ruoyi-powerjob-server.run.xml | 12 ------------ .run/ruoyi-server.run.xml | 12 ------------ .../mail/config/properties/MailProperties.java | 2 ++ .../web/config/properties/CaptchaProperties.java | 2 ++ .../scale/mapper/SysEvaluationAnswerMapper.java | 2 ++ .../scale/mapper/SysEvaluationConclusionMapper.java | 2 ++ .../scale/mapper/SysEvaluationRecordMapper.java | 2 ++ .../dromara/scale/mapper/SysScalePublishMapper.java | 2 ++ .../generator/mapper/GenTableColumnMapper.java | 2 ++ .../org/dromara/generator/mapper/GenTableMapper.java | 2 ++ .../main/resources/mapper/system/SysUserMapper.xml | 1 - 12 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 .run/ruoyi-monitor-admin.run.xml delete mode 100644 .run/ruoyi-powerjob-server.run.xml delete mode 100644 .run/ruoyi-server.run.xml diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml deleted file mode 100644 index 4837d6a..0000000 --- a/.run/ruoyi-monitor-admin.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/.run/ruoyi-powerjob-server.run.xml b/.run/ruoyi-powerjob-server.run.xml deleted file mode 100644 index 77a4af0..0000000 --- a/.run/ruoyi-powerjob-server.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml deleted file mode 100644 index a29ff2a..0000000 --- a/.run/ruoyi-server.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java index d0e78a2..5be0fae 100644 --- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java +++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java @@ -2,6 +2,7 @@ package org.dromara.common.mail.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; /** * JavaMail 配置属性 @@ -9,6 +10,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Michelle.Chung */ @Data +@Component @ConfigurationProperties(prefix = "mail") public class MailProperties { diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java index bfc52f4..8e6a4fa 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java @@ -4,6 +4,7 @@ import org.dromara.common.web.enums.CaptchaCategory; import org.dromara.common.web.enums.CaptchaType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; /** * 验证码 配置属性 @@ -11,6 +12,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Lion Li */ @Data +@Component @ConfigurationProperties(prefix = "captcha") public class CaptchaProperties { diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java index 033ca39..1ca1d28 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationAnswerMapper.java @@ -1,5 +1,6 @@ package org.dromara.scale.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.scale.domain.SysEvaluationAnswer; import org.dromara.scale.domain.vo.SysEvaluationAnswerVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author CJW * @date 2024-04-07 */ +@Mapper public interface SysEvaluationAnswerMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java index f4c41df..fb8bff1 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationConclusionMapper.java @@ -1,5 +1,6 @@ package org.dromara.scale.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.scale.domain.SysEvaluationConclusion; import org.dromara.scale.domain.vo.SysEvaluationConclusionVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author CJW * @date 2024-04-07 */ +@Mapper public interface SysEvaluationConclusionMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java index 5cc9d39..527ea87 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysEvaluationRecordMapper.java @@ -1,5 +1,6 @@ package org.dromara.scale.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.scale.domain.SysEvaluationRecord; import org.dromara.scale.domain.vo.SysEvaluationRecordVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author CJW * @date 2024-04-07 */ +@Mapper public interface SysEvaluationRecordMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java index ed78666..ed4947e 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/mapper/SysScalePublishMapper.java @@ -1,5 +1,6 @@ package org.dromara.scale.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.scale.domain.SysScalePublish; import org.dromara.scale.domain.vo.SysScalePublishVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author CJW * @date 2024-04-07 */ +@Mapper public interface SysScalePublishMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java index f38d39c..2997370 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java @@ -2,6 +2,7 @@ package org.dromara.generator.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.generator.domain.GenTableColumn; @@ -13,6 +14,7 @@ import java.util.List; * * @author Lion Li */ +@Mapper @InterceptorIgnore(dataPermission = "true", tenantLine = "true") public interface GenTableColumnMapper extends BaseMapperPlus { /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java index c2ff7b6..bcde748 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java @@ -3,6 +3,7 @@ package org.dromara.generator.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.generator.domain.GenTable; import org.apache.ibatis.annotations.Param; @@ -14,6 +15,7 @@ import java.util.List; * * @author Lion Li */ +@Mapper @InterceptorIgnore(dataPermission = "true", tenantLine = "true") public interface GenTableMapper extends BaseMapperPlus { diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index d4a9d7b..595c123 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -27,7 +27,6 @@ select u.user_id, - u.tenant_id, u.dept_id, u.user_name, u.nick_name,