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
2025-01-08 10:52:36 +08:00
parent 4119dbad6a
commit 35733e80eb
45 changed files with 377 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/configuration/OrionOperatorLogAutoConfiguration.java
View File

@@ -25,8 +25,8 @@ package org.dromara.visor.framework.biz.operator.log.configuration;
import com.alibaba.fastjson.serializer.SerializeFilter;
import com.alibaba.fastjson.serializer.ValueFilter;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.common.json.filter.FieldDesensitizeFilter;
import org.dromara.visor.common.json.filter.FieldIgnoreFilter;
import org.dromara.visor.common.json.FieldDesensitizeFilter;
import org.dromara.visor.common.json.FieldIgnoreFilter;
import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig;
import org.dromara.visor.framework.biz.operator.log.core.aspect.OperatorLogAspect;
import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService;

2
orion-visor-framework/orion-visor-spring-boot-starter-biz-operator-log/src/main/java/org/dromara/visor/framework/biz/operator/log/core/utils/OperatorLogFiller.java
View File

@@ -31,7 +31,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializeFilter;
import org.dromara.visor.common.entity.RequestIdentity;
import org.dromara.visor.common.enums.BooleanBit;
import org.dromara.visor.common.meta.TraceIdHolder;
import org.dromara.visor.common.trace.TraceIdHolder;
import org.dromara.visor.common.security.LoginUser;
import org.dromara.visor.common.utils.Requests;
import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig;

6
orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/org/dromara/visor/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java
View File

@@ -29,9 +29,9 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.serializer.SerializeFilter;
import com.alibaba.fastjson.serializer.ValueFilter;
import org.aopalliance.intercept.MethodInvocation;
import org.dromara.visor.common.json.filter.FieldDesensitizeFilter;
import org.dromara.visor.common.json.filter.FieldIgnoreFilter;
import org.dromara.visor.common.meta.TraceIdHolder;
import org.dromara.visor.common.json.FieldDesensitizeFilter;
import org.dromara.visor.common.json.FieldIgnoreFilter;
import org.dromara.visor.common.trace.TraceIdHolder;
import org.dromara.visor.common.security.SecurityHolder;
import org.dromara.visor.framework.log.configuration.config.LogPrinterConfig;
import org.dromara.visor.framework.log.core.annotation.IgnoreLog;

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

@@ -23,7 +23,7 @@
package org.dromara.visor.framework.redis.configuration;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.common.lock.Locker;
import org.dromara.visor.common.interfaces.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;

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

@@ -24,7 +24,7 @@ package org.dromara.visor.framework.redis.core.lock;
import cn.orionsec.kit.lang.utils.Exceptions;
import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.common.lock.Locker;
import org.dromara.visor.common.interfaces.Locker;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;

14
orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/configuration/OrionCryptoAutoConfiguration.java
View File

@@ -23,10 +23,10 @@
package org.dromara.visor.framework.security.configuration;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.common.crypto.ValueCrypto;
import org.dromara.visor.common.utils.CryptoUtils;
import org.dromara.visor.common.interfaces.AesEncryptor;
import org.dromara.visor.common.utils.AesEncryptUtils;
import org.dromara.visor.framework.security.configuration.config.AesCryptoConfig;
import org.dromara.visor.framework.security.core.crypto.PrimaryValueCrypto;
import org.dromara.visor.framework.security.core.crypto.PrimaryAesEncryptor;
import org.dromara.visor.framework.security.core.crypto.processor.AesCryptoProcessor;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
@@ -52,11 +52,11 @@ public class OrionCryptoAutoConfiguration {
*/
@Bean(name = "valueCrypto")
@Primary
public ValueCrypto primaryValueCrypto() {
public AesEncryptor primaryValueCrypto() {
// 创建加密器
PrimaryValueCrypto valueCrypto = new PrimaryValueCrypto();
PrimaryAesEncryptor valueCrypto = new PrimaryAesEncryptor();
// 设置工具类
CryptoUtils.setDelegate(valueCrypto);
AesEncryptUtils.setDelegate(valueCrypto);
return valueCrypto;
}
@@ -65,7 +65,7 @@ public class OrionCryptoAutoConfiguration {
*/
@Bean(initMethod = "init")
@ConditionalOnProperty(value = "orion.crypto.aes.enabled", havingValue = "true")
public ValueCrypto aesValueCrypto(AesCryptoConfig config) {
public AesEncryptor aesValueCrypto(AesCryptoConfig config) {
return new AesCryptoProcessor(config);
}

6
orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/CryptoProcessor.java
View File

@@ -22,7 +22,7 @@
*/
package org.dromara.visor.framework.security.core.crypto;
import org.dromara.visor.common.crypto.ValueCrypto;
import org.dromara.visor.common.interfaces.AesEncryptor;
/**
* 数据加密器
@@ -31,7 +31,7 @@ import org.dromara.visor.common.crypto.ValueCrypto;
* @version 1.0.0
* @since 2023/7/7 22:48
*/
public abstract class CryptoProcessor<Config extends CryptoConfig> implements ValueCrypto {
public abstract class CryptoProcessor<Config extends CryptoConfig> implements AesEncryptor {
protected final Config config;
@@ -39,7 +39,7 @@ public abstract class CryptoProcessor<Config extends CryptoConfig> implements Va
this.config = config;
// 设置为默认加密器
if (config.isPrimary()) {
PrimaryValueCrypto.setDelegate(this);
PrimaryAesEncryptor.setDelegate(this);
}
}

12
orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryValueCrypto.java → orion-visor-framework/orion-visor-spring-boot-starter-security/src/main/java/org/dromara/visor/framework/security/core/crypto/PrimaryAesEncryptor.java
View File

@@ -23,7 +23,7 @@
package org.dromara.visor.framework.security.core.crypto;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.common.crypto.ValueCrypto;
import org.dromara.visor.common.interfaces.AesEncryptor;
/**
* 默认加密器
@@ -32,9 +32,9 @@ import org.dromara.visor.common.crypto.ValueCrypto;
* @version 1.0.0
* @since 2023/7/21 12:11
*/
public class PrimaryValueCrypto implements ValueCrypto {
public class PrimaryAesEncryptor implements AesEncryptor {
private static ValueCrypto delegate;
private static AesEncryptor delegate;
@Override
public void init() {
@@ -50,12 +50,12 @@ public class PrimaryValueCrypto implements ValueCrypto {
return delegate.decrypt(text);
}
protected static void setDelegate(ValueCrypto delegate) {
if (PrimaryValueCrypto.delegate != null) {
protected static void setDelegate(AesEncryptor delegate) {
if (PrimaryAesEncryptor.delegate != null) {
// unmodified
throw Exceptions.state();
}
PrimaryValueCrypto.delegate = delegate;
PrimaryAesEncryptor.delegate = delegate;
}
}

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.file.FileClient;
import org.dromara.visor.common.interfaces.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.PrimaryFileClient;

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.file.FileClient;
import org.dromara.visor.common.interfaces.FileClient;
import java.io.InputStream;
import java.io.OutputStream;

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

@@ -23,7 +23,7 @@
package org.dromara.visor.framework.storage.core.client;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.common.interfaces.FileClient;
import java.io.InputStream;
import java.io.OutputStream;

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

@@ -23,7 +23,7 @@
package org.dromara.visor.framework.storage.core.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import org.dromara.visor.common.file.FileClient;
import org.dromara.visor.common.interfaces.FileClient;
import java.io.InputStream;
import java.io.OutputStream;

2
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,7 @@
package org.dromara.visor.framework.test.configuration;
import com.github.fppt.jedismock.RedisServer;
import org.dromara.visor.common.lock.Locker;
import org.dromara.visor.common.interfaces.Locker;
import org.dromara.visor.common.utils.LockerUtils;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

6
orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/configuration/OrionWebAutoConfiguration.java
View File

@@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.dromara.visor.common.constant.AutoConfigureOrderConst;
import org.dromara.visor.common.constant.FilterOrderConst;
import org.dromara.visor.common.web.filter.FilterCreator;
import org.dromara.visor.common.web.WebFilterCreator;
import org.dromara.visor.framework.web.core.aspect.DemoDisableApiAspect;
import org.dromara.visor.framework.web.core.filter.TraceIdFilter;
import org.dromara.visor.framework.web.core.handler.GlobalExceptionHandler;
@@ -151,7 +151,7 @@ public class OrionWebAutoConfiguration implements WebMvcConfigurer {
// 创建 UrlBasedCorsConfigurationSource 对象
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", config);
return FilterCreator.create(new CorsFilter(source), FilterOrderConst.CORS_FILTER);
return WebFilterCreator.create(new CorsFilter(source), FilterOrderConst.CORS_FILTER);
}
/**
@@ -159,7 +159,7 @@ public class OrionWebAutoConfiguration implements WebMvcConfigurer {
*/
@Bean
public FilterRegistrationBean<TraceIdFilter> traceIdFilterBean() {
return FilterCreator.create(new TraceIdFilter(), FilterOrderConst.TRICE_ID_FILTER);
return WebFilterCreator.create(new TraceIdFilter(), FilterOrderConst.TRICE_ID_FILTER);
}
/**

2
orion-visor-framework/orion-visor-spring-boot-starter-web/src/main/java/org/dromara/visor/framework/web/core/filter/TraceIdFilter.java
View File

@@ -22,7 +22,7 @@
*/
package org.dromara.visor.framework.web.core.filter;
import org.dromara.visor.common.meta.TraceIdHolder;
import org.dromara.visor.common.trace.TraceIdHolder;
import org.springframework.web.filter.OncePerRequestFilter;
import javax.servlet.FilterChain;