From 890afa093c7df3bdfc2fd4dabac36572407b86fc Mon Sep 17 00:00:00 2001 From: lijiahang Date: Mon, 9 Oct 2023 16:25:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=91=BD=E5=90=8D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...olConfig.java => AsyncExecutorConfig.java} | 6 ++-- .../config/OrionCommonAutoConfiguration.java | 4 +-- .../ops/framework/common/utils/Kits.java | 34 ------------------- .../spring-configuration-metadata.json | 14 ++++---- .../security/core/utils/SecurityUtils.java | 12 +++++-- .../websocket/constant/WsCloseCode.java | 8 ++--- .../websocket/constant/WsCloseReason.java | 2 +- .../framework/websocket/utils/WebSockets.java | 2 +- .../src/main/resources/application-prod.yaml | 4 +-- .../src/main/resources/application.yaml | 12 +++---- ...rion-vue-views-components-card-list.vue.vm | 2 +- .../orion-ops-module-asset-service/pom.xml | 2 +- .../impl/AuthenticationServiceImpl.java | 5 ++- 13 files changed, 40 insertions(+), 67 deletions(-) rename orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/{ThreadPoolConfig.java => AsyncExecutorConfig.java} (84%) delete mode 100644 orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/utils/Kits.java diff --git a/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/ThreadPoolConfig.java b/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/AsyncExecutorConfig.java similarity index 84% rename from orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/ThreadPoolConfig.java rename to orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/AsyncExecutorConfig.java index 54db43c5..58f968f3 100644 --- a/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/ThreadPoolConfig.java +++ b/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/AsyncExecutorConfig.java @@ -11,8 +11,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 2023/7/10 15:49 */ @Data -@ConfigurationProperties(prefix = "orion.thread.pool") -public class ThreadPoolConfig { +@ConfigurationProperties(prefix = "orion.async.executor") +public class AsyncExecutorConfig { /** * 核心线程数量 @@ -34,7 +34,7 @@ public class ThreadPoolConfig { */ private int keepAliveSeconds; - public ThreadPoolConfig() { + public AsyncExecutorConfig() { this.corePoolSize = 8; this.maxPoolSize = 16; this.queueCapacity = 200; diff --git a/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/OrionCommonAutoConfiguration.java b/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/OrionCommonAutoConfiguration.java index 34fe7125..de3dddfd 100644 --- a/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/OrionCommonAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/config/OrionCommonAutoConfiguration.java @@ -23,7 +23,7 @@ import java.util.concurrent.ThreadPoolExecutor; @EnableAsync @AutoConfiguration @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_COMMON) -@EnableConfigurationProperties(ThreadPoolConfig.class) +@EnableConfigurationProperties(AsyncExecutorConfig.class) public class OrionCommonAutoConfiguration { /** @@ -43,7 +43,7 @@ public class OrionCommonAutoConfiguration { */ @Primary @Bean(name = "asyncExecutor") - public TaskExecutor asyncExecutor(ThreadPoolConfig config) { + public TaskExecutor asyncExecutor(AsyncExecutorConfig config) { ThreadPoolMdcTaskExecutor executor = new ThreadPoolMdcTaskExecutor(); executor.setCorePoolSize(config.getCorePoolSize()); executor.setMaxPoolSize(config.getMaxPoolSize()); diff --git a/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/utils/Kits.java b/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/utils/Kits.java deleted file mode 100644 index 148af23f..00000000 --- a/orion-ops-framework/orion-ops-common/src/main/java/com/orion/ops/framework/common/utils/Kits.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.orion.ops.framework.common.utils; - -import com.orion.lang.utils.Strings; -import com.orion.ops.framework.common.constant.Const; - -/** - * 工具类 - * - * @author Jiahang Li - * @version 1.0.0 - * @since 2023/7/14 16:34 - */ -public class Kits { - - private Kits() { - } - - /** - * 获取登陆凭证 - * - * @param authorization authorization - * @return token - */ - public static String getAuthorization(String authorization) { - if (Strings.isEmpty(authorization)) { - return null; - } - if (!authorization.contains(Const.BEARER) || authorization.length() <= Const.BEARER_PREFIX_LEN) { - return null; - } - return authorization.substring(Const.BEARER_PREFIX_LEN).trim(); - } - -} diff --git a/orion-ops-framework/orion-ops-common/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-common/src/main/resources/META-INF/spring-configuration-metadata.json index b39e42d7..71a54c1c 100644 --- a/orion-ops-framework/orion-ops-common/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-common/src/main/resources/META-INF/spring-configuration-metadata.json @@ -1,32 +1,32 @@ { "groups": [ { - "name": "orion.thread.pool", - "type": "com.orion.ops.framework.common.config.ThreadPoolConfig", - "sourceType": "com.orion.ops.framework.common.config.ThreadPoolConfig" + "name": "orion.async.executor", + "type": "com.orion.ops.framework.common.config.AsyncExecutorConfig", + "sourceType": "com.orion.ops.framework.common.config.AsyncExecutorConfig" } ], "properties": [ { - "name": "orion.thread.pool.core-pool-size", + "name": "orion.async.executor.core-pool-size", "type": "java.lang.Integer", "description": "核心线程数量", "defaultValue": "8" }, { - "name": "orion.thread.pool.max-pool-size", + "name": "orion.async.executor.max-pool-size", "type": "java.lang.Integer", "description": "最大线程数量.", "defaultValue": "16" }, { - "name": "orion.thread.pool.queue-capacity", + "name": "orion.async.executor.queue-capacity", "type": "java.lang.Integer", "description": "队列容量.", "defaultValue": "200" }, { - "name": "orion.thread.pool.keep-alive-seconds", + "name": "orion.async.executor.keep-alive-seconds", "type": "java.lang.Integer", "description": "活跃时间.", "defaultValue": "300" diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/utils/SecurityUtils.java b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/utils/SecurityUtils.java index 67f99275..7fae4b98 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/utils/SecurityUtils.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/utils/SecurityUtils.java @@ -1,8 +1,9 @@ package com.orion.ops.framework.security.core.utils; import com.orion.lang.constant.StandardHttpHeader; +import com.orion.lang.utils.Strings; +import com.orion.ops.framework.common.constant.Const; import com.orion.ops.framework.common.security.LoginUser; -import com.orion.ops.framework.common.utils.Kits; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; @@ -31,7 +32,14 @@ public class SecurityUtils { * @return token */ public static String obtainAuthorization(HttpServletRequest request) { - return Kits.getAuthorization(request.getHeader(StandardHttpHeader.AUTHORIZATION)); + String authorization = request.getHeader(StandardHttpHeader.AUTHORIZATION); + if (Strings.isEmpty(authorization)) { + return null; + } + if (!authorization.contains(Const.BEARER) || authorization.length() <= Const.BEARER_PREFIX_LEN) { + return null; + } + return authorization.substring(Const.BEARER_PREFIX_LEN).trim(); } /** diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseCode.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseCode.java index d279abd2..f878a56f 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseCode.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseCode.java @@ -45,9 +45,9 @@ public enum WsCloseCode { VALID(4150, WsCloseReason.AUTHENTICATION_FAILURE), /** - * 机器不合法 + * 主机不合法 */ - INVALID_MACHINE(4200, WsCloseReason.CLOSED_CONNECTION), + INVALID_HOST(4200, WsCloseReason.CLOSED_CONNECTION), /** * 连接远程服务器连接超时 @@ -70,9 +70,9 @@ public enum WsCloseCode { CONNECTION_EXCEPTION(4210, WsCloseReason.UNABLE_TO_CONNECT_REMOTE_SERVER), /** - * 机器未启用 + * 主机未启用 */ - MACHINE_DISABLED(4215, WsCloseReason.MACHINE_DISABLED), + HOST_DISABLED(4215, WsCloseReason.HOST_DISABLED), /** * 打开shell出现异常 diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseReason.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseReason.java index 33d4da48..05f9eb53 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseReason.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseReason.java @@ -21,7 +21,7 @@ public interface WsCloseReason { String REMOTE_SERVER_AUTHENTICATION_FAILURE = "remote server authentication failure..."; - String MACHINE_DISABLED = "machine disabled..."; + String HOST_DISABLED = "host disabled..."; String UNABLE_TO_CONNECT_REMOTE_SERVER = "unable to connect remote server..."; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/utils/WebSockets.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/utils/WebSockets.java index 4201ad05..f1709602 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/utils/WebSockets.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/utils/WebSockets.java @@ -101,7 +101,7 @@ public class WebSockets { } else if (Exceptions.isCausedBy(e, AuthenticationException.class)) { close(session, WsCloseCode.CONNECTION_AUTH_FAILURE); } else if (Exceptions.isCausedBy(e, DisabledException.class)) { - close(session, WsCloseCode.MACHINE_DISABLED); + close(session, WsCloseCode.HOST_DISABLED); } else { close(session, WsCloseCode.CONNECTION_EXCEPTION); } diff --git a/orion-ops-launch/src/main/resources/application-prod.yaml b/orion-ops-launch/src/main/resources/application-prod.yaml index c5fb85b4..cd8514ba 100644 --- a/orion-ops-launch/src/main/resources/application-prod.yaml +++ b/orion-ops-launch/src/main/resources/application-prod.yaml @@ -41,8 +41,8 @@ orion: aes: # 加密秘钥 secret-key: uQeacXV8b3isvKLK - thread: - pool: + async: + executor: core-pool-size: 8 max-pool-size: 16 queue-capacity: 200 diff --git a/orion-ops-launch/src/main/resources/application.yaml b/orion-ops-launch/src/main/resources/application.yaml index c8ecebbc..b536d15a 100644 --- a/orion-ops-launch/src/main/resources/application.yaml +++ b/orion-ops-launch/src/main/resources/application.yaml @@ -146,9 +146,9 @@ orion: infra: group: "infra - 基建模块" path: "infra" - machine: - group: "machine - 机器资源模块" - path: "machine" + asset: + group: "asset - 资产模块" + path: "asset" logging: # 全局日志打印 @@ -189,10 +189,10 @@ orion: secret-key: I66AndrKWrwXjtBL use-generator-key: true generator-key-length: 128 - thread: + async: # 线程池配置 - pool: + executor: core-pool-size: 2 max-pool-size: 4 - keep-alive-seconds: 180 queue-capacity: 30 + keep-alive-seconds: 180 diff --git a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm index c7735304..1b57f76f 100644 --- a/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm +++ b/orion-ops-launch/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm @@ -105,7 +105,7 @@ }; -