优化代码

This commit is contained in:
cjw 2024-04-09 16:58:20 +08:00
parent 51d1dc5373
commit eb8ab41082
12 changed files with 16 additions and 37 deletions

View File

@ -1,12 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="ruoyi-monitor-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-monitor-admin:5.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-extend/ruoyi-monitor-admin/Dockerfile" />
</settings>
</deployment>
<method v="2" />
</configuration>
</component>

View File

@ -1,12 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="ruoyi-powerjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-powerjob-server:5.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-extend/ruoyi-powerjob-server/Dockerfile" />
</settings>
</deployment>
<method v="2" />
</configuration>
</component>

View File

@ -1,12 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="ruoyi-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="ruoyi/ruoyi-server:5.1.2" />
<option name="buildOnly" value="true" />
<option name="sourceFilePath" value="ruoyi-admin/Dockerfile" />
</settings>
</deployment>
<method v="2" />
</configuration>
</component>

View File

@ -2,6 +2,7 @@ package org.dromara.common.mail.config.properties;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/** /**
* JavaMail 配置属性 * JavaMail 配置属性
@ -9,6 +10,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Michelle.Chung * @author Michelle.Chung
*/ */
@Data @Data
@Component
@ConfigurationProperties(prefix = "mail") @ConfigurationProperties(prefix = "mail")
public class MailProperties { public class MailProperties {

View File

@ -4,6 +4,7 @@ import org.dromara.common.web.enums.CaptchaCategory;
import org.dromara.common.web.enums.CaptchaType; import org.dromara.common.web.enums.CaptchaType;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; 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 * @author Lion Li
*/ */
@Data @Data
@Component
@ConfigurationProperties(prefix = "captcha") @ConfigurationProperties(prefix = "captcha")
public class CaptchaProperties { public class CaptchaProperties {

View File

@ -1,5 +1,6 @@
package org.dromara.scale.mapper; package org.dromara.scale.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.scale.domain.SysEvaluationAnswer; import org.dromara.scale.domain.SysEvaluationAnswer;
import org.dromara.scale.domain.vo.SysEvaluationAnswerVo; import org.dromara.scale.domain.vo.SysEvaluationAnswerVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author CJW * @author CJW
* @date 2024-04-07 * @date 2024-04-07
*/ */
@Mapper
public interface SysEvaluationAnswerMapper extends BaseMapperPlus<SysEvaluationAnswer, SysEvaluationAnswerVo> { public interface SysEvaluationAnswerMapper extends BaseMapperPlus<SysEvaluationAnswer, SysEvaluationAnswerVo> {
} }

View File

@ -1,5 +1,6 @@
package org.dromara.scale.mapper; package org.dromara.scale.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.scale.domain.SysEvaluationConclusion; import org.dromara.scale.domain.SysEvaluationConclusion;
import org.dromara.scale.domain.vo.SysEvaluationConclusionVo; import org.dromara.scale.domain.vo.SysEvaluationConclusionVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author CJW * @author CJW
* @date 2024-04-07 * @date 2024-04-07
*/ */
@Mapper
public interface SysEvaluationConclusionMapper extends BaseMapperPlus<SysEvaluationConclusion, SysEvaluationConclusionVo> { public interface SysEvaluationConclusionMapper extends BaseMapperPlus<SysEvaluationConclusion, SysEvaluationConclusionVo> {
} }

View File

@ -1,5 +1,6 @@
package org.dromara.scale.mapper; package org.dromara.scale.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.scale.domain.SysEvaluationRecord; import org.dromara.scale.domain.SysEvaluationRecord;
import org.dromara.scale.domain.vo.SysEvaluationRecordVo; import org.dromara.scale.domain.vo.SysEvaluationRecordVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author CJW * @author CJW
* @date 2024-04-07 * @date 2024-04-07
*/ */
@Mapper
public interface SysEvaluationRecordMapper extends BaseMapperPlus<SysEvaluationRecord, SysEvaluationRecordVo> { public interface SysEvaluationRecordMapper extends BaseMapperPlus<SysEvaluationRecord, SysEvaluationRecordVo> {
} }

View File

@ -1,5 +1,6 @@
package org.dromara.scale.mapper; package org.dromara.scale.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.dromara.scale.domain.SysScalePublish; import org.dromara.scale.domain.SysScalePublish;
import org.dromara.scale.domain.vo.SysScalePublishVo; import org.dromara.scale.domain.vo.SysScalePublishVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
* @author CJW * @author CJW
* @date 2024-04-07 * @date 2024-04-07
*/ */
@Mapper
public interface SysScalePublishMapper extends BaseMapperPlus<SysScalePublish, SysScalePublishVo> { public interface SysScalePublishMapper extends BaseMapperPlus<SysScalePublish, SysScalePublishVo> {
} }

View File

@ -2,6 +2,7 @@ package org.dromara.generator.mapper;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.generator.domain.GenTableColumn; import org.dromara.generator.domain.GenTableColumn;
@ -13,6 +14,7 @@ import java.util.List;
* *
* @author Lion Li * @author Lion Li
*/ */
@Mapper
@InterceptorIgnore(dataPermission = "true", tenantLine = "true") @InterceptorIgnore(dataPermission = "true", tenantLine = "true")
public interface GenTableColumnMapper extends BaseMapperPlus<GenTableColumn, GenTableColumn> { public interface GenTableColumnMapper extends BaseMapperPlus<GenTableColumn, GenTableColumn> {
/** /**

View File

@ -3,6 +3,7 @@ package org.dromara.generator.mapper;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.generator.domain.GenTable; import org.dromara.generator.domain.GenTable;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -14,6 +15,7 @@ import java.util.List;
* *
* @author Lion Li * @author Lion Li
*/ */
@Mapper
@InterceptorIgnore(dataPermission = "true", tenantLine = "true") @InterceptorIgnore(dataPermission = "true", tenantLine = "true")
public interface GenTableMapper extends BaseMapperPlus<GenTable, GenTable> { public interface GenTableMapper extends BaseMapperPlus<GenTable, GenTable> {

View File

@ -27,7 +27,6 @@
<sql id="selectUserVo"> <sql id="selectUserVo">
select u.user_id, select u.user_id,
u.tenant_id,
u.dept_id, u.dept_id,
u.user_name, u.user_name,
u.nick_name, u.nick_name,