dromara/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2025-09-04 19:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 替换过期方法

Browse Source
This commit is contained in:
疯狂的狮子Li
2024-01-14 22:45:33 +08:00
parent d3878d03db
commit ecca4bb5f6
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java
View File

@@ -158,7 +158,7 @@ public class SysLoginService {
* @param uuid 唯一标识 * @param uuid 唯一标识
*/ */
public void validateCaptcha(String tenantId, String username, String code, String uuid) { public void validateCaptcha(String tenantId, String username, String code, String uuid) {
String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, ""); String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
String captcha = RedisUtils.getCacheObject(verifyKey); String captcha = RedisUtils.getCacheObject(verifyKey);
RedisUtils.deleteObject(verifyKey); RedisUtils.deleteObject(verifyKey);
if (captcha == null) { if (captcha == null) {

2
ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java
View File

@@ -88,7 +88,7 @@ public class PasswordAuthStrategy implements IAuthStrategy {
* @param uuid 唯一标识 * @param uuid 唯一标识
*/ */
private void validateCaptcha(String tenantId, String username, String code, String uuid) { private void validateCaptcha(String tenantId, String username, String code, String uuid) {
String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, ""); String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
String captcha = RedisUtils.getCacheObject(verifyKey); String captcha = RedisUtils.getCacheObject(verifyKey);
RedisUtils.deleteObject(verifyKey); RedisUtils.deleteObject(verifyKey);
if (captcha == null) { if (captcha == null) {

2
ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/PowerJobConfig.java
View File

@@ -61,7 +61,7 @@ public class PowerJobConfig{
if (worker.getPort() != null) { if (worker.getPort() != null) {
config.setPort(worker.getPort()); config.setPort(worker.getPort());
} else { } else {
int port = worker.getAkkaPort(); int port = worker.getPort();
if (port <= 0) { if (port <= 0) {
port = NetUtils.getRandomPort(); port = NetUtils.getRandomPort();
} }

16
ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java
View File

@@ -41,7 +41,7 @@ public class GenTableColumn extends BaseEntity {
/** /**
* 列描述 * 列描述
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR) @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String columnComment; private String columnComment;
/** /**
@@ -63,43 +63,43 @@ public class GenTableColumn extends BaseEntity {
/** /**
* 是否主键（1是） * 是否主键（1是）
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR) @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isPk; private String isPk;
/** /**
* 是否自增（1是） * 是否自增（1是）
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR) @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isIncrement; private String isIncrement;
/** /**
* 是否必填（1是） * 是否必填（1是）
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR) @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isRequired; private String isRequired;
/** /**
* 是否为插入字段（1是） * 是否为插入字段（1是）
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR) @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isInsert; private String isInsert;
/** /**
* 是否编辑字段（1是） * 是否编辑字段（1是）
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR) @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isEdit; private String isEdit;
/** /**
* 是否列表字段（1是） * 是否列表字段（1是）
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR) @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isList; private String isList;
/** /**
* 是否查询字段（1是） * 是否查询字段（1是）
*/ */
@TableField(updateStrategy = FieldStrategy.IGNORED, jdbcType = JdbcType.VARCHAR) @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
private String isQuery; private String isQuery;
/** /**

4
ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/AdminServerConfig.java
View File

@@ -3,7 +3,7 @@ package org.dromara.modules.monitor.config;
import de.codecentric.boot.admin.server.config.EnableAdminServer; import de.codecentric.boot.admin.server.config.EnableAdminServer;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration; import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
import org.springframework.boot.task.TaskExecutorBuilder; import org.springframework.boot.task.ThreadPoolTaskExecutorBuilder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
@@ -23,7 +23,7 @@ public class AdminServerConfig {
@Lazy @Lazy
@Bean(name = TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME) @Bean(name = TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME)
@ConditionalOnMissingBean(Executor.class) @ConditionalOnMissingBean(Executor.class)
public ThreadPoolTaskExecutor applicationTaskExecutor(TaskExecutorBuilder builder) { public ThreadPoolTaskExecutor applicationTaskExecutor(ThreadPoolTaskExecutorBuilder builder) {
return builder.build(); return builder.build();
} }