manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⚡ 单元测试添加锁.

Browse Source
This commit is contained in:
lijiahang
2024-05-16 13:36:57 +08:00
parent 77cf635eea
commit 9a7437e8db
19 changed files with 122 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/lock/Locker.java Normal file
View File

@@ -0,0 +1,33 @@
package com.orion.visor.framework.common.lock;
import java.util.function.Supplier;
/**
* 分布式锁
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/5/16 12:24
*/
public interface Locker {
/**
* 尝试获取锁
*
* @param key key
* @param run run
* @return 是否获取到锁
*/
boolean tryLock(String key, Runnable run);
/**
* 尝试获取锁
*
* @param key key
* @param call call
* @param <T> T
* @return 执行结果
*/
<T> T tryLock(String key, Supplier<T> call);
}

22
orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/utils/RedisLocks.java → orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/LockerUtils.java
View File

@@ -1,24 +1,24 @@
package com.orion.visor.framework.redis.core.utils;
package com.orion.visor.framework.common.utils;
import com.orion.lang.utils.Exceptions;
import com.orion.visor.framework.redis.core.lock.RedisLocker;
import com.orion.visor.framework.common.lock.Locker;
import lombok.extern.slf4j.Slf4j;
import java.util.function.Supplier;
/**
* redis 分布式锁工具类
* 分布式锁工具类
*
* @author Jiahang Li
* @version 1.0.0
* @since 2024/4/25 16:42
*/
@Slf4j
public class RedisLocks {
public class LockerUtils {
private static RedisLocker redisLocker;
private static Locker delegate;
private RedisLocks() {
private LockerUtils() {
}
/**
@@ -29,7 +29,7 @@ public class RedisLocks {
* @return 是否获取到锁
*/
public static boolean tryLock(String key, Runnable run) {
return redisLocker.tryLock(key, run);
return delegate.tryLock(key, run);
}
/**
@@ -41,15 +41,15 @@ public class RedisLocks {
* @return 执行结果
*/
public static <T> T tryLock(String key, Supplier<T> call) {
return redisLocker.tryLock(key, call);
return delegate.tryLock(key, call);
}
public static void setRedisLocker(RedisLocker redisLocker) {
if (RedisLocks.redisLocker != null) {
public static void setDelegate(Locker delegate) {
if (LockerUtils.delegate != null) {
// unmodified
throw Exceptions.state();
}
RedisLocks.redisLocker = redisLocker;
LockerUtils.delegate = delegate;
}
}

7
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-cache-dto.java.vm
View File

@@ -2,9 +2,12 @@ package ${currentPackage};
import com.orion.lang.define.cache.key.model.LongCacheIdModel;
import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.*;
import java.math.*;

5
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-entity-vo.java.vm
View File

@@ -1,7 +1,10 @@
package ${currentPackage};
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.*;

7
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-provider-entity-dto.java.vm
View File

@@ -1,9 +1,12 @@
package ${currentPackage};
import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
import lombok.*;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.*;
import java.math.*;

2
orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
View File

@@ -60,7 +60,7 @@
#if(${dictMap.containsKey(${field.propertyName})})
<!-- $field.comment -->
<template #${field.propertyName}="{ record }">
{{ getDictValue($dictMap.get(${field.propertyName}).keyField, record.${field.propertyName}}) }}
{{ getDictValue($dictMap.get(${field.propertyName}).keyField, record.${field.propertyName}) }}
</template>
#end
#end

11
orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java
View File

@@ -1,14 +1,16 @@
package com.orion.visor.framework.redis.configuration;
import com.orion.visor.framework.common.constant.AutoConfigureOrderConst;
import com.orion.visor.framework.common.lock.Locker;
import com.orion.visor.framework.common.utils.LockerUtils;
import com.orion.visor.framework.redis.configuration.config.RedissonConfig;
import com.orion.visor.framework.redis.core.lock.RedisLocker;
import com.orion.visor.framework.redis.core.utils.RedisLocks;
import com.orion.visor.framework.redis.core.utils.RedisUtils;
import org.redisson.api.RedissonClient;
import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Lazy;
@@ -23,7 +25,7 @@ import org.springframework.data.redis.serializer.RedisSerializer;
* @version 1.0.0
* @since 2023/6/28 14:44
*/
@Lazy(value = false)
@Lazy(false)
@AutoConfiguration
@AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_REDIS)
@EnableConfigurationProperties(RedissonConfig.class)
@@ -64,9 +66,10 @@ public class OrionRedisAutoConfiguration {
* @return redis 分布式锁
*/
@Bean
public RedisLocker redisLocker(RedissonClient redissonClient) {
@ConditionalOnMissingBean
public Locker redisLocker(RedissonClient redissonClient) {
RedisLocker redisLocker = new RedisLocker(redissonClient);
RedisLocks.setRedisLocker(redisLocker);
LockerUtils.setDelegate(redisLocker);
return redisLocker;
}

5
orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/configuration/config/RedissonConfig.java
View File

@@ -24,4 +24,9 @@ public class RedissonConfig {
*/
private Integer nettyThreads;
public RedissonConfig() {
this.threads = 16;
this.nettyThreads = 16;
}
}

24
orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/com/orion/visor/framework/redis/core/lock/RedisLocker.java
View File

@@ -1,6 +1,7 @@
package com.orion.visor.framework.redis.core.lock;
import com.orion.lang.utils.Exceptions;
import com.orion.visor.framework.common.lock.Locker;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
@@ -15,7 +16,7 @@ import java.util.function.Supplier;
* @since 2024/4/25 16:42
*/
@Slf4j
public class RedisLocker {
public class RedisLocker implements Locker {
private final RedissonClient redissonClient;
@@ -23,19 +24,13 @@ public class RedisLocker {
this.redissonClient = redissonClient;
}
/**
* 尝试获取锁
*
* @param key key
* @param run run
* @return 是否获取到锁
*/
@Override
public boolean tryLock(String key, Runnable run) {
// 获取锁
RLock lock = redissonClient.getLock(key);
// 未获取到直接返回
if (!lock.tryLock()) {
log.info("RedisLocks.tryLock failed {}", key);
log.info("RedisLocker.tryLock failed {}", key);
return false;
}
// 执行
@@ -47,20 +42,13 @@ public class RedisLocker {
return true;
}
/**
* 尝试获取锁
*
* @param key key
* @param call call
* @param <T> T
* @return 执行结果
*/
@Override
public <T> T tryLock(String key, Supplier<T> call) {
// 获取锁
RLock lock = redissonClient.getLock(key);
// 未获取到直接返回
if (!lock.tryLock()) {
log.info("RedisLocks.tryLock failed {}", key);
log.info("RedisLocker.tryLock failed {}", key);
throw Exceptions.lock();
}
// 执行

6
orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/resources/META-INF/spring-configuration-metadata.json
View File

@@ -10,12 +10,14 @@
{
"name": "spring.redisson.threads",
"type": "java.lang.Integer",
"description": "任务线程数."
"description": "任务线程数.",
"defaultValue": "16"
},
{
"name": "spring.redisson.netty-threads",
"type": "java.lang.Integer",
"description": "netty 线程数."
"description": "netty 线程数.",
"defaultValue": "16"
}
]
}

2
orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionH2SqlInitializationTestConfiguration.java
View File

@@ -22,8 +22,8 @@ import javax.sql.DataSource;
* @version 1.0.0
* @since 2023/8/23 17:17
*/
@Lazy(false)
@Profile("unit-test")
@Lazy(value = false)
@Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean(AbstractScriptDatabaseInitializer.class)
@ConditionalOnSingleCandidate(DataSource.class)

25
orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/com/orion/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java
View File

@@ -1,6 +1,8 @@
package com.orion.visor.framework.test.configuration;
import com.github.fppt.jedismock.RedisServer;
import com.orion.visor.framework.common.lock.Locker;
import com.orion.visor.framework.common.utils.LockerUtils;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
@@ -8,6 +10,8 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import org.springframework.context.annotation.Profile;
import java.util.function.Supplier;
/**
* 单元测试 redis mock server 初始化
*
@@ -34,4 +38,25 @@ public class OrionMockRedisTestConfiguration {
return server;
}
/**
* @return 单元测试分布式锁
*/
@Bean
public Locker unitTestLocker() {
Locker locker = new Locker() {
@Override
public boolean tryLock(String key, Runnable run) {
run.run();
return true;
}
@Override
public <T> T tryLock(String key, Supplier<T> call) {
return call.get();
}
};
LockerUtils.setDelegate(locker);
return locker;
}
}

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/CommandSnippetGroupAutoClearTask.java
View File

@@ -1,6 +1,6 @@
package com.orion.visor.module.asset.task;
import com.orion.visor.framework.redis.core.utils.RedisLocks;
import com.orion.visor.framework.common.utils.LockerUtils;
import com.orion.visor.module.asset.service.CommandSnippetGroupService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
@@ -34,7 +34,7 @@ public class CommandSnippetGroupAutoClearTask {
public void clear() {
log.info("CommandSnippetGroupAutoClearTask.clear start");
// 获取锁并清理
RedisLocks.tryLock(LOCK_KEY, commandSnippetGroupService::clearUnusedGroup);
LockerUtils.tryLock(LOCK_KEY, commandSnippetGroupService::clearUnusedGroup);
log.info("CommandSnippetGroupAutoClearTask.clear finish");
}

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/ExecLogFileAutoClearTask.java
View File

@@ -4,7 +4,7 @@ import com.orion.lang.utils.Strings;
import com.orion.lang.utils.io.Files1;
import com.orion.lang.utils.time.Dates;
import com.orion.visor.framework.common.file.FileClient;
import com.orion.visor.framework.redis.core.utils.RedisLocks;
import com.orion.visor.framework.common.utils.LockerUtils;
import com.orion.visor.module.asset.dao.ExecHostLogDAO;
import com.orion.visor.module.asset.define.config.AppExecLogConfig;
import com.orion.visor.module.asset.entity.domain.ExecHostLogDO;
@@ -50,7 +50,7 @@ public class ExecLogFileAutoClearTask {
public void clear() {
log.info("ExecLogFileAutoClearTask.clear start");
// 获取锁并且执行
RedisLocks.tryLock(LOCK_KEY, this::doClearFile);
LockerUtils.tryLock(LOCK_KEY, this::doClearFile);
log.info("ExecLogFileAutoClearTask.clear finish");
}

4
orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/task/PathBookmarkGroupAutoClearTask.java
View File

@@ -1,6 +1,6 @@
package com.orion.visor.module.asset.task;
import com.orion.visor.framework.redis.core.utils.RedisLocks;
import com.orion.visor.framework.common.utils.LockerUtils;
import com.orion.visor.module.asset.service.PathBookmarkGroupService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
@@ -34,7 +34,7 @@ public class PathBookmarkGroupAutoClearTask {
public void clear() {
log.info("PathBookmarkGroupAutoClearTask.clear start");
// 获取锁并清理
RedisLocks.tryLock(LOCK_KEY, pathBookmarkGroupService::clearUnusedGroup);
LockerUtils.tryLock(LOCK_KEY, pathBookmarkGroupService::clearUnusedGroup);
log.info("PathBookmarkGroupAutoClearTask.clear finish");
}

3
orion-visor-module-asset/orion-visor-module-asset-service/src/test/resources/application-unit-test.yaml
View File

@@ -21,6 +21,9 @@ spring:
host: 127.0.0.1
port: 16379
database: 0
redisson:
threads: 2
netty-threads: 2
mybatis-plus:
lazy-initialization: true

4
orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/task/TagAutoClearTask.java
View File

@@ -1,6 +1,6 @@
package com.orion.visor.module.infra.task;
import com.orion.visor.framework.redis.core.utils.RedisLocks;
import com.orion.visor.framework.common.utils.LockerUtils;
import com.orion.visor.module.infra.service.TagService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
@@ -34,7 +34,7 @@ public class TagAutoClearTask {
public void clear() {
log.info("TagAutoClearTask.clear start");
// 获取锁并清理
RedisLocks.tryLock(LOCK_KEY, tagService::clearUnusedTag);
LockerUtils.tryLock(LOCK_KEY, tagService::clearUnusedTag);
log.info("TagAutoClearTask.clear finish");
}

3
orion-visor-module-infra/orion-visor-module-infra-service/src/test/resources/application-unit-test.yaml
View File

@@ -21,6 +21,9 @@ spring:
host: 127.0.0.1
port: 16379
database: 0
redisson:
threads: 2
netty-threads: 2
mybatis-plus:
lazy-initialization: true

2
orion-visor-ui/src/views/host/terminal/components/layout/layout-header.vue
View File

@@ -69,7 +69,7 @@
</script>
<style lang="less" scoped>
@logo-width: 152px;
@logo-width: 148px;
.terminal-header {
height: 100%;