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

🔨 优化锁逻辑.

Browse Source
This commit is contained in:
lijiahangmax
2025-08-23 15:05:03 +08:00
parent 393286d309
commit 3c75aedcec
30 changed files with 443 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/AesEncryptor.java → orion-visor-common/src/main/java/org/dromara/visor/common/cipher/AesEncryptor.java
View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.interfaces;
package org.dromara.visor.common.cipher;
import cn.orionsec.kit.lang.utils.codec.Base62s;
import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricCrypto;

2
orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/RsaDecryptor.java → orion-visor-common/src/main/java/org/dromara/visor/common/cipher/RsaDecryptor.java
View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.interfaces;
package org.dromara.visor.common.cipher;
/**
* rsa 解密器

2
orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/FileClient.java → orion-visor-common/src/main/java/org/dromara/visor/common/file/FileClient.java
View File

@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.interfaces;
package org.dromara.visor.common.file;
import java.io.InputStream;
import java.io.OutputStream;

55
orion-visor-common/src/main/java/org/dromara/visor/common/interfaces/Locker.java
View File

@@ -1,55 +0,0 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.interfaces;
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);
}

80
orion-visor-common/src/main/java/org/dromara/visor/common/lock/EmptyLocker.java Normal file
View File

@@ -0,0 +1,80 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.lock;
import cn.orionsec.kit.lang.able.Executable;
import java.util.function.Supplier;
/**
* 空实现的锁
*
* @author Jiahang Li
* @version 1.0.0
* @since 2025/8/23 13:59
*/
public class EmptyLocker implements Locker {
@Override
public boolean tryLockExecute(String key, Executable executable) {
executable.exec();
return true;
}
@Override
public boolean tryLockExecute(String key, long timeout, Executable executable) {
executable.exec();
return true;
}
@Override
public <T> T tryLockExecute(String key, Supplier<T> callable) {
return callable.get();
}
@Override
public <T> T tryLockExecute(String key, long timeout, Supplier<T> callable) {
return callable.get();
}
@Override
public void lockExecute(String key, Executable executable) {
executable.exec();
}
@Override
public void lockExecute(String key, long timeout, Executable executable) {
executable.exec();
}
@Override
public <T> T lockExecute(String key, Supplier<T> callable) {
return callable.get();
}
@Override
public <T> T lockExecute(String key, long timeout, Supplier<T> callable) {
return callable.get();
}
}

116
orion-visor-common/src/main/java/org/dromara/visor/common/lock/Locker.java Normal file
View File

@@ -0,0 +1,116 @@
/*
* Copyright (c) 2023 - present Dromara, All rights reserved.
*
* https://visor.dromara.org
* https://visor.dromara.org.cn
* https://visor.orionsec.cn
*
* Members:
* Jiahang Li - ljh1553488six@139.com - author
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.dromara.visor.common.lock;
import cn.orionsec.kit.lang.able.Executable;
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 executable exec
* @return 是否获取到锁
*/
boolean tryLockExecute(String key, Executable executable);
/**
* 尝试获取锁并执行
*
* @param key key
* @param timeout timeout
* @param executable exec
* @return 是否获取到锁
*/
boolean tryLockExecute(String key, long timeout, Executable executable);
/**
* 尝试获取锁并执行 未获取到锁则抛出异常
*
* @param key key
* @param callable callable
* @param <T> T
* @return 执行结果
*/
<T> T tryLockExecute(String key, Supplier<T> callable);
/**
* 尝试获取锁并执行 未获取到锁则抛出异常
*
* @param key key
* @param timeout timeout
* @param callable callable
* @param <T> T
* @return 执行结果
*/
<T> T tryLockExecute(String key, long timeout, Supplier<T> callable);
/**
* 阻塞获取锁并执行
*
* @param key key
* @param executable exec
*/
void lockExecute(String key, Executable executable);
/**
* 阻塞获取锁并执行
*
* @param key key
* @param timeout timeout
* @param executable exec
*/
void lockExecute(String key, long timeout, Executable executable);
/**
* 阻塞获取锁并执行
*
* @param key key
* @param callable callable
* @param <T> T
* @return 执行结果
*/
<T> T lockExecute(String key, Supplier<T> callable);
/**
* 阻塞获取锁并执行
*
* @param key key
* @param timeout timeout
* @param callable callable
* @param <T> T
* @return 执行结果
*/
<T> T lockExecute(String key, long timeout, Supplier<T> callable);
}

2
orion-visor-common/src/main/java/org/dromara/visor/common/utils/AesEncryptUtils.java
View File

@@ -23,7 +23,7 @@
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.common.interfaces.AesEncryptor;
import org.dromara.visor.common.cipher.AesEncryptor;
/**
* aes 数据加密工具类

96
orion-visor-common/src/main/java/org/dromara/visor/common/utils/LockerUtils.java
View File

@@ -22,9 +22,10 @@
*/
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.able.Executable;
import cn.orionsec.kit.lang.utils.Exceptions;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.interfaces.Locker;
import org.dromara.visor.common.lock.Locker;
import java.util.function.Supplier;
@@ -44,26 +45,97 @@ public class LockerUtils {
}
/**
* 尝试获取锁
* 尝试获取锁并执行
*
* @param key key
* @param run run
* @param key key
* @param executable exec
* @return 是否获取到锁
*/
public static boolean tryLock(String key, Runnable run) {
return delegate.tryLock(key, run);
public static boolean tryLockExecute(String key, Executable executable) {
return delegate.tryLockExecute(key, executable);
}
/**
* 尝试获取锁
* 尝试获取锁并执行
*
* @param key key
* @param call call
* @param <T> T
* @param key key
* @param timeout timeout
* @param executable exec
* @return 是否获取到锁
*/
public static boolean tryLockExecute(String key, long timeout, Executable executable) {
return delegate.tryLockExecute(key, timeout, executable);
}
/**
* 尝试获取锁并执行 未获取到锁则抛出异常
*
* @param key key
* @param callable callable
* @param <T> T
* @return 执行结果
*/
public static <T> T tryLock(String key, Supplier<T> call) {
return delegate.tryLock(key, call);
public static <T> T tryLockExecute(String key, Supplier<T> callable) {
return delegate.tryLockExecute(key, callable);
}
/**
* 尝试获取锁并执行 未获取到锁则抛出异常
*
* @param key key
* @param timeout timeout
* @param callable callable
* @param <T> T
* @return 执行结果
*/
public static <T> T tryLockExecute(String key, long timeout, Supplier<T> callable) {
return delegate.tryLockExecute(key, timeout, callable);
}
/**
* 阻塞获取锁并执行
*
* @param key key
* @param executable exec
*/
public static void lockExecute(String key, Executable executable) {
delegate.lockExecute(key, executable);
}
/**
* 阻塞获取锁并执行
*
* @param key key
* @param timeout timeout
* @param executable exec
*/
public static void lockExecute(String key, long timeout, Executable executable) {
delegate.lockExecute(key, timeout, executable);
}
/**
* 阻塞获取锁并执行
*
* @param key key
* @param callable callable
* @param <T> T
* @return 执行结果
*/
public static <T> T lockExecute(String key, Supplier<T> callable) {
return delegate.lockExecute(key, callable);
}
/**
* 阻塞获取锁并执行
*
* @param key key
* @param timeout timeout
* @param callable callable
* @param <T> T
* @return 执行结果
*/
public static <T> T lockExecute(String key, long timeout, Supplier<T> callable) {
return delegate.lockExecute(key, timeout, callable);
}
public static void setDelegate(Locker delegate) {

2
orion-visor-common/src/main/java/org/dromara/visor/common/utils/RsaParamDecryptUtils.java
View File

@@ -23,7 +23,7 @@
package org.dromara.visor.common.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.common.interfaces.RsaDecryptor;
import org.dromara.visor.common.cipher.RsaDecryptor;
/**
* rsa 参数解密工具类

4
orion-visor-framework/orion-visor-spring-boot-starter-cipher/src/main/java/org/dromara/visor/framework/encrypt/configuration/OrionEncryptAutoConfiguration.java
View File

@@ -24,8 +24,8 @@ package org.dromara.visor.framework.encrypt.configuration;
import org.dromara.visor.common.config.ConfigStore;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.common.interfaces.AesEncryptor;
import org.dromara.visor.common.interfaces.RsaDecryptor;
import org.dromara.visor.common.cipher.AesEncryptor;
import org.dromara.visor.common.cipher.RsaDecryptor;
import org.dromara.visor.common.utils.AesEncryptUtils;
import org.dromara.visor.common.utils.RsaParamDecryptUtils;
import org.dromara.visor.framework.encrypt.configuration.config.AesEncryptConfig;

2
orion-visor-framework/orion-visor-spring-boot-starter-cipher/src/main/java/org/dromara/visor/framework/encrypt/core/BaseAesEncryptor.java
View File

@@ -22,7 +22,7 @@
*/
package org.dromara.visor.framework.encrypt.core;
import org.dromara.visor.common.interfaces.AesEncryptor;
import org.dromara.visor.common.cipher.AesEncryptor;
/**
* 数据加密器

2
orion-visor-framework/orion-visor-spring-boot-starter-cipher/src/main/java/org/dromara/visor/framework/encrypt/core/impl/RsaDecryptorImpl.java
View File

@@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.crypto.RSA;
import org.dromara.visor.common.config.ConfigRef;
import org.dromara.visor.common.config.ConfigStore;
import org.dromara.visor.common.constant.ConfigKeys;
import org.dromara.visor.common.interfaces.RsaDecryptor;
import org.dromara.visor.common.cipher.RsaDecryptor;
import java.security.interfaces.RSAPrivateKey;
import java.util.Arrays;

17
orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionMockRedisAutoConfiguration.java
View File

@@ -24,7 +24,8 @@ package org.dromara.visor.framework.redis.configuration;
import com.github.fppt.jedismock.RedisServer;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.common.interfaces.Locker;
import org.dromara.visor.common.lock.EmptyLocker;
import org.dromara.visor.common.lock.Locker;
import org.dromara.visor.common.utils.LockerUtils;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
@@ -35,7 +36,6 @@ import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
import java.net.InetAddress;
import java.util.function.Supplier;
/**
* MockRedis
@@ -79,18 +79,7 @@ public class OrionMockRedisAutoConfiguration {
*/
@Bean
public Locker redisLocker() {
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();
}
};
EmptyLocker locker = new EmptyLocker();
LockerUtils.setDelegate(locker);
return locker;
}

2
orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/configuration/OrionRedisAutoConfiguration.java
View File

@@ -24,7 +24,7 @@ package org.dromara.visor.framework.redis.configuration;
import cn.orionsec.kit.lang.define.cache.key.CacheKeyDefine;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.common.interfaces.Locker;
import org.dromara.visor.common.lock.Locker;
import org.dromara.visor.common.utils.LockerUtils;
import org.dromara.visor.framework.redis.configuration.config.RedissonConfig;
import org.dromara.visor.framework.redis.core.lock.RedisLocker;

145
orion-visor-framework/orion-visor-spring-boot-starter-redis/src/main/java/org/dromara/visor/framework/redis/core/lock/RedisLocker.java
View File

@@ -22,12 +22,14 @@
*/
package org.dromara.visor.framework.redis.core.lock;
import cn.orionsec.kit.lang.able.Executable;
import cn.orionsec.kit.lang.utils.Exceptions;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.interfaces.Locker;
import org.dromara.visor.common.lock.Locker;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
/**
@@ -40,6 +42,8 @@ import java.util.function.Supplier;
@Slf4j
public class RedisLocker implements Locker {
private static final String LOCK_KEY_PREFIX = "lock:";
private final RedissonClient redissonClient;
public RedisLocker(RedissonClient redissonClient) {
@@ -47,37 +51,154 @@ public class RedisLocker implements Locker {
}
@Override
public boolean tryLock(String key, Runnable run) {
public boolean tryLockExecute(String key, Executable executable) {
return this.tryLockExecute(key, 0, executable);
}
@Override
public boolean tryLockExecute(String key, long timeout, Executable executable) {
// 获取锁
RLock lock = redissonClient.getLock(key);
RLock lock = this.getLock(key);
// 未获取到直接返回
if (!lock.tryLock()) {
log.info("RedisLocker.tryLock failed {}", key);
if (this.tryLock(lock, timeout)) {
return false;
}
// 执行
try {
run.run();
executable.exec();
} finally {
lock.unlock();
this.unlockSafe(lock);
}
return true;
}
@Override
public <T> T tryLock(String key, Supplier<T> call) {
public <T> T tryLockExecute(String key, Supplier<T> callable) {
return this.tryLockExecute(key, 0, callable);
}
@Override
public <T> T tryLockExecute(String key, long timeout, Supplier<T> callable) {
// 获取锁
RLock lock = redissonClient.getLock(key);
RLock lock = this.getLock(key);
// 未获取到直接返回
if (!lock.tryLock()) {
log.info("RedisLocker.tryLock failed {}", key);
if (this.tryLock(lock, timeout)) {
throw Exceptions.lock();
}
// 执行
try {
return call.get();
return callable.get();
} finally {
this.unlockSafe(lock);
}
}
@Override
public void lockExecute(String key, Executable executable) {
this.lockExecute(key, 0, executable);
}
@Override
public void lockExecute(String key, long timeout, Executable executable) {
// 获取锁
RLock lock = this.getLock(key);
this.lock(lock, timeout);
// 执行
try {
executable.exec();
} finally {
this.unlockSafe(lock);
}
}
@Override
public <T> T lockExecute(String key, Supplier<T> callable) {
return this.lockExecute(key, 0, callable);
}
@Override
public <T> T lockExecute(String key, long timeout, Supplier<T> callable) {
// 获取锁
RLock lock = this.getLock(key);
this.lock(lock, timeout);
// 执行
try {
return callable.get();
} finally {
this.unlockSafe(lock);
}
}
/**
* 获取锁
*
* @param key key
* @return lock
*/
private RLock getLock(String key) {
return redissonClient.getLock(LOCK_KEY_PREFIX + key);
}
/**
* 尝试上锁
*
* @param lock lock
* @param timeout timeout
* @return locked
*/
private boolean tryLock(RLock lock, long timeout) {
boolean result;
try {
if (timeout == 0) {
result = lock.tryLock();
} else {
result = lock.tryLock(timeout, TimeUnit.MILLISECONDS);
}
if (!result) {
log.warn("RedisLocker.tryLock failed {}", lock.getName());
}
} catch (InterruptedException e) {
log.error("RedisLocker.tryLock timed out {}", lock.getName(), e);
throw Exceptions.lock(e);
} catch (Exception e) {
log.error("RedisLocker.tryLock error {}", lock.getName(), e);
throw Exceptions.lock(e);
}
return result;
}
/**
* 上锁
*
* @param lock lock
* @param timeout timeout
*/
private void lock(RLock lock, long timeout) {
try {
if (timeout == 0) {
lock.lock();
} else {
lock.lock(timeout, TimeUnit.MILLISECONDS);
}
} catch (Exception e) {
log.error("RedisLocker.lock lock error {}", lock.getName(), e);
throw Exceptions.lock(e);
}
}
/**
* 安全的释放锁
*
* @param lock lock
*/
private void unlockSafe(RLock lock) {
if (!lock.isHeldByCurrentThread()) {
return;
}
try {
lock.unlock();
} catch (Exception e) {
log.warn("RedisLocker.unlock failed {}", lock.getName(), e);
}
}

2
orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/configuration/OrionStorageAutoConfiguration.java
View File

@@ -23,7 +23,7 @@
package org.dromara.visor.framework.storage.configuration;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.common.interfaces.FileClient;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.framework.storage.configuration.config.LocalStorageConfig;
import org.dromara.visor.framework.storage.configuration.config.LogsStorageConfig;
import org.dromara.visor.framework.storage.core.client.local.LocalFileClient;

2
orion-visor-framework/orion-visor-spring-boot-starter-storage/src/main/java/org/dromara/visor/framework/storage/core/client/AbstractFileClient.java
View File

@@ -26,7 +26,7 @@ import cn.orionsec.kit.lang.utils.io.Files1;
import cn.orionsec.kit.lang.utils.io.Streams;
import cn.orionsec.kit.lang.utils.time.Dates;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.interfaces.FileClient;
import org.dromara.visor.common.file.FileClient;
import java.io.InputStream;
import java.io.OutputStream;

17
orion-visor-framework/orion-visor-spring-boot-starter-test/src/main/java/org/dromara/visor/framework/test/configuration/OrionMockRedisTestConfiguration.java
View File

@@ -23,7 +23,8 @@
package org.dromara.visor.framework.test.configuration;
import com.github.fppt.jedismock.RedisServer;
import org.dromara.visor.common.interfaces.Locker;
import org.dromara.visor.common.lock.EmptyLocker;
import org.dromara.visor.common.lock.Locker;
import org.dromara.visor.common.utils.LockerUtils;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -33,7 +34,6 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.context.annotation.Profile;
import java.net.InetAddress;
import java.util.function.Supplier;
/**
* 单元测试 redis mock server 初始化
@@ -66,18 +66,7 @@ public class OrionMockRedisTestConfiguration {
*/
@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();
}
};
EmptyLocker locker = new EmptyLocker();
LockerUtils.setDelegate(locker);
return locker;
}

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/command/handler/BaseExecCommandHandler.java
View File

@@ -44,7 +44,7 @@ import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.constant.FileConst;
import org.dromara.visor.common.enums.BooleanBit;
import org.dromara.visor.common.enums.EndpointDefine;
import org.dromara.visor.common.interfaces.FileClient;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.common.session.config.SshConnectConfig;
import org.dromara.visor.common.session.ssh.SessionStores;
import org.dromara.visor.common.utils.PathUtils;

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/exec/log/tracker/ExecLogTracker.java
View File

@@ -38,7 +38,7 @@ import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.interfaces.FileClient;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.framework.websocket.core.utils.WebSockets;
import org.dromara.visor.module.common.config.AppLogConfig;

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/handler/upload/uploader/FileUploader.java
View File

@@ -35,7 +35,7 @@ import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.constant.ExtraFieldConst;
import org.dromara.visor.common.enums.EndpointDefine;
import org.dromara.visor.common.interfaces.FileClient;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.common.session.config.SshConnectConfig;
import org.dromara.visor.common.session.ssh.SessionStores;
import org.dromara.visor.common.utils.PathUtils;

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/ExecLogServiceImpl.java
View File

@@ -39,7 +39,7 @@ import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.constant.FileConst;
import org.dromara.visor.common.enums.EndpointDefine;
import org.dromara.visor.common.interfaces.FileClient;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.common.utils.SqlUtils;
import org.dromara.visor.common.utils.Valid;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/service/impl/UploadTaskServiceImpl.java
View File

@@ -35,7 +35,7 @@ import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.constant.ErrorMessage;
import org.dromara.visor.common.enums.EndpointDefine;
import org.dromara.visor.common.interfaces.FileClient;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.common.security.LoginUser;
import org.dromara.visor.common.utils.SqlUtils;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;

2
orion-visor-modules/orion-visor-module-exec/orion-visor-module-exec-service/src/main/java/org/dromara/visor/module/exec/task/ExecLogFileAutoClearTask.java
View File

@@ -70,7 +70,7 @@ public class ExecLogFileAutoClearTask {
return;
}
// 获取锁并执行
LockerUtils.tryLock(LOCK_KEY, this::doClear);
LockerUtils.tryLockExecute(LOCK_KEY, this::doClear);
log.info("ExecLogFileAutoClearTask.clear finish");
}

2
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/FileUploadMessageDispatcher.java
View File

@@ -27,7 +27,7 @@ import cn.orionsec.kit.lang.utils.io.Streams;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.constant.ExtraFieldConst;
import org.dromara.visor.common.interfaces.FileClient;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.framework.websocket.core.utils.WebSockets;
import org.dromara.visor.module.infra.entity.dto.FileUploadTokenDTO;
import org.dromara.visor.module.infra.handler.upload.enums.FileUploadOperatorType;

2
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/handler/upload/handler/FileUploadHandler.java
View File

@@ -25,7 +25,7 @@ package org.dromara.visor.module.infra.handler.upload.handler;
import cn.orionsec.kit.lang.utils.io.Streams;
import com.alibaba.fastjson.JSON;
import org.dromara.visor.common.constant.Const;
import org.dromara.visor.common.interfaces.FileClient;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.framework.websocket.core.utils.WebSockets;
import org.dromara.visor.module.infra.handler.upload.enums.FileUploadReceiverType;
import org.dromara.visor.module.infra.handler.upload.model.FileUploadResponse;

2
orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/task/TagAutoClearTask.java
View File

@@ -56,7 +56,7 @@ public class TagAutoClearTask {
public void clear() {
log.info("TagAutoClearTask.clear start");
// 获取锁并执行
LockerUtils.tryLock(LOCK_KEY, tagService::clearUnusedTag);
LockerUtils.tryLockExecute(LOCK_KEY, tagService::clearUnusedTag);
log.info("TagAutoClearTask.clear finish");
}

2
orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/CommandSnippetGroupAutoClearTask.java
View File

@@ -56,7 +56,7 @@ public class CommandSnippetGroupAutoClearTask {
public void clear() {
log.info("CommandSnippetGroupAutoClearTask.clear start");
// 获取锁并执行
LockerUtils.tryLock(LOCK_KEY, commandSnippetGroupService::clearUnusedGroup);
LockerUtils.tryLockExecute(LOCK_KEY, commandSnippetGroupService::clearUnusedGroup);
log.info("CommandSnippetGroupAutoClearTask.clear finish");
}

2
orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/PathBookmarkGroupAutoClearTask.java
View File

@@ -56,7 +56,7 @@ public class PathBookmarkGroupAutoClearTask {
public void clear() {
log.info("PathBookmarkGroupAutoClearTask.clear start");
// 获取锁并执行
LockerUtils.tryLock(LOCK_KEY, pathBookmarkGroupService::clearUnusedGroup);
LockerUtils.tryLockExecute(LOCK_KEY, pathBookmarkGroupService::clearUnusedGroup);
log.info("PathBookmarkGroupAutoClearTask.clear finish");
}

2
orion-visor-modules/orion-visor-module-terminal/orion-visor-module-terminal-service/src/main/java/org/dromara/visor/module/terminal/task/TerminalConnectLogAutoClearTask.java
View File

@@ -70,7 +70,7 @@ public class TerminalConnectLogAutoClearTask {
return;
}
// 获取锁并执行
LockerUtils.tryLock(LOCK_KEY, this::doClear);
LockerUtils.tryLockExecute(LOCK_KEY, this::doClear);
log.info("TerminalConnectLogAutoClearTask.clear finish");
}