diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java index 1d2ecf05..d8f79afe 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/enums/VerifyEnum.java @@ -17,8 +17,6 @@ package cn.hippo4j.common.enums; -import java.util.Objects; - public enum VerifyEnum { /** @@ -57,5 +55,4 @@ public enum VerifyEnum { public Integer getVerifyStatus() { return this.verifyStatus; } - } diff --git a/hippo4j-config/pom.xml b/hippo4j-config/pom.xml index 93343f26..925e5f71 100644 --- a/hippo4j-config/pom.xml +++ b/hippo4j-config/pom.xml @@ -59,12 +59,6 @@ hippo4j-adapter-base - - cn.hippo4j - hippo4j-adapter-web - ${version} - - cn.hippo4j hippo4j-discovery diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java b/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java index 7d5cf77d..b8ec6643 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/config/CommonConfig.java @@ -17,12 +17,10 @@ package cn.hippo4j.config.config; -import cn.hippo4j.adapter.web.WebThreadPoolHandlerChoose; import cn.hippo4j.common.config.ApplicationContextHolder; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -52,10 +50,4 @@ public class CommonConfig { monitorThreadPool.setAwaitTerminationMillis(5000); return monitorThreadPool; } - - @Bean - public WebThreadPoolHandlerChoose webThreadPoolHandlerChoose() { - return new WebThreadPoolHandlerChoose(); - } - } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java index 93b3b6a1..c60bc43b 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java @@ -37,6 +37,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +/** + * Abstract config modification verify service. + */ public abstract class AbstractConfigModificationVerifyService implements ConfigModificationVerifyService { @Resource diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModificationVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModificationVerifyServiceImpl.java index e5b19e0f..6178da1f 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModificationVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModificationVerifyServiceImpl.java @@ -24,6 +24,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; +/** + * Adapter thread pool config modification verify service impl. + */ @Slf4j @Service public class AdapterThreadPoolConfigModificationVerifyServiceImpl extends AbstractConfigModificationVerifyService { diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigModificationQueryServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigModificationQueryServiceImpl.java index 8279affc..c3cbcd3d 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigModificationQueryServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigModificationQueryServiceImpl.java @@ -33,6 +33,9 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +/** + * Config modification query service impl + */ @Service public class ConfigModificationQueryServiceImpl implements ConfigModificationQueryService { diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModificationVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModificationVerifyServiceImpl.java index 7424c234..085cc70d 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModificationVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModificationVerifyServiceImpl.java @@ -27,6 +27,9 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +/** + * Thread pool instance config modification verify service impl. + */ @Slf4j @Service public class ThreadPoolInstanceConfigModificationVerifyServiceImpl extends AbstractConfigModificationVerifyService { diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolManageConfigModificationVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolManageConfigModificationVerifyServiceImpl.java index 0f111c28..1b569857 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolManageConfigModificationVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolManageConfigModificationVerifyServiceImpl.java @@ -27,6 +27,9 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +/** + * Thread pool manager config modification verify service impl. + */ @Slf4j @Service public class ThreadPoolManageConfigModificationVerifyServiceImpl extends AbstractConfigModificationVerifyService { diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModificationVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModificationVerifyServiceImpl.java index aa03883c..29712765 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModificationVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModificationVerifyServiceImpl.java @@ -24,6 +24,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; +/** + * Web thread pool config modification verify service impl. + */ @Slf4j @Service public class WebThreadPoolConfigModificationVerifyServiceImpl extends AbstractConfigModificationVerifyService { diff --git a/hippo4j-server/conf/hippo4j_manager.sql b/hippo4j-server/conf/hippo4j_manager.sql index 9a406198..5a3df46f 100644 --- a/hippo4j-server/conf/hippo4j_manager.sql +++ b/hippo4j-server/conf/hippo4j_manager.sql @@ -215,18 +215,18 @@ DROP TABLE IF EXISTS `his_config_verify`; CREATE TABLE `his_config_verify` ( `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT, `type` int NULL DEFAULT NULL COMMENT '变更类型', - `mark` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '框架线程池类型', - `tenant_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户ID', - `item_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目ID', - `tp_id` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '线程池ID', - `identify` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '线程池唯一标识', - `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数变更内容', + `mark` varchar(128) DEFAULT NULL COMMENT '框架线程池类型', + `tenant_id` varchar(128) DEFAULT NULL COMMENT '租户ID', + `item_id` varchar(128) DEFAULT NULL COMMENT '项目ID', + `tp_id` varchar(256) DEFAULT NULL COMMENT '线程池ID', + `identify` varchar(64) DEFAULT NULL COMMENT '线程池唯一标识', + `content` longtext NULL COMMENT '参数变更内容', `modify_all` tinyint(1) NULL DEFAULT NULL COMMENT '是否全部修改', `gmt_create` datetime NULL DEFAULT NULL COMMENT '参数变更时间', - `modify_user` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人', + `modify_user` varchar(128) DEFAULT NULL COMMENT '修改人', `verify_status` tinyint(1) NULL DEFAULT NULL COMMENT '审核状态 0:待审核 1：审核通过 2：审核拒绝', `gmt_verify` datetime NULL DEFAULT NULL COMMENT '审核时间', - `verify_user` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', + `verify_user` varchar(128) DEFAULT NULL COMMENT '审核人', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET=utf8mb4 COMMENT = '参数变更审核记录表'; diff --git a/hippo4j-server/conf/sql-upgrade/1.4.2_upgrade.sql b/hippo4j-server/conf/sql-upgrade/1.4.2_upgrade.sql index 2c079115..1ec3ec5b 100644 --- a/hippo4j-server/conf/sql-upgrade/1.4.2_upgrade.sql +++ b/hippo4j-server/conf/sql-upgrade/1.4.2_upgrade.sql @@ -20,18 +20,18 @@ DROP TABLE IF EXISTS `his_config_verify`; CREATE TABLE `his_config_verify` ( `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT, `type` int NULL DEFAULT NULL COMMENT '变更类型', - `mark` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '框架线程池类型', - `tenant_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户ID', - `item_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目ID', - `tp_id` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '线程池ID', - `identify` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '线程池唯一标识', - `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数变更内容', + `mark` varchar(128) DEFAULT NULL COMMENT '框架线程池类型', + `tenant_id` varchar(128) DEFAULT NULL COMMENT '租户ID', + `item_id` varchar(128) DEFAULT NULL COMMENT '项目ID', + `tp_id` varchar(256) DEFAULT NULL COMMENT '线程池ID', + `identify` varchar(64) DEFAULT NULL COMMENT '线程池唯一标识', + `content` longtext DEFAULT NULL COMMENT '参数变更内容', `modify_all` tinyint(1) NULL DEFAULT NULL COMMENT '是否全部修改', `gmt_create` datetime NULL DEFAULT NULL COMMENT '参数变更时间', - `modify_user` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人', + `modify_user` varchar(128) DEFAULT NULL COMMENT '修改人', `verify_status` tinyint(1) NULL DEFAULT NULL COMMENT '审核状态 0:待审核 1：审核通过 2：审核拒绝', - `gmt_verify` datetime NULL DEFAULT NULL COMMENT '审核时间', - `verify_user` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', + `gmt_verify` datetime NULL DEFAULT NULL COMMENT '审核时间', + `verify_user` varchar(128) DEFAULT NULL COMMENT '审核人', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET=utf8mb4 COMMENT = '参数变更审核记录表'; diff --git a/hippo4j-server/src/main/resources/sql-script/h2/hippo4j_manager.sql b/hippo4j-server/src/main/resources/sql-script/h2/hippo4j_manager.sql index 3764ef8e..8e73cee4 100755 --- a/hippo4j-server/src/main/resources/sql-script/h2/hippo4j_manager.sql +++ b/hippo4j-server/src/main/resources/sql-script/h2/hippo4j_manager.sql @@ -144,22 +144,21 @@ CREATE TABLE IF NOT EXISTS `notify` ( PRIMARY KEY (`id`) ); - CREATE TABLE IF NOT EXISTS `his_config_verify` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `type` int NULL DEFAULT NULL COMMENT '变更类型', - `mark` varchar(128) COMMENT '框架线程池类型', - `tenant_id` varchar(128) COMMENT '租户ID', - `item_id` varchar(128) COMMENT '项目ID', - `tp_id` varchar(256) COMMENT '线程池ID', - `identify` varchar(64) COMMENT '线程池唯一标识', + `mark` varchar(128) DEFAULT NULL COMMENT '框架线程池类型', + `tenant_id` varchar(128) DEFAULT NULL COMMENT '租户ID', + `item_id` varchar(128) DEFAULT NULLCOMMENT '项目ID', + `tp_id` varchar(256) DEFAULT NULLCOMMENT '线程池ID', + `identify` varchar(64) DEFAULT NULL COMMENT '线程池唯一标识', `content` longtext COMMENT '参数变更内容', `modify_all` tinyint(1) COMMENT '是否全部修改', `gmt_create` datetime COMMENT '参数变更时间', - `modify_user` varchar(128) COMMENT '修改人', + `modify_user` varchar(128) DEFAULT NULLCOMMENT '修改人', `verify_status` tinyint(1) COMMENT '审核状态 0:待审核 1：审核通过 2：审核拒绝', `gmt_verify` datetime COMMENT '审核时间', - `verify_user` varchar(128) COMMENT '审核人', + `verify_user` varchar(128) DEFAULT NULL COMMENT '审核人', PRIMARY KEY (`id`) USING BTREE ); diff --git a/hippo4j-server/src/main/resources/sql-script/mysql/hippo4j_manager.sql b/hippo4j-server/src/main/resources/sql-script/mysql/hippo4j_manager.sql index 17465fad..64ed9118 100644 --- a/hippo4j-server/src/main/resources/sql-script/mysql/hippo4j_manager.sql +++ b/hippo4j-server/src/main/resources/sql-script/mysql/hippo4j_manager.sql @@ -205,18 +205,18 @@ DROP TABLE IF EXISTS `his_config_verify`; CREATE TABLE `his_config_verify` ( `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT, `type` int NULL DEFAULT NULL COMMENT '变更类型', - `mark` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '框架线程池类型', - `tenant_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '租户ID', - `item_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目ID', - `tp_id` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '线程池ID', - `identify` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '线程池唯一标识', - `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '参数变更内容', + `mark` varchar(128) DEFAULT NULL COMMENT '框架线程池类型', + `tenant_id` varchar(128) DEFAULT NULL COMMENT '租户ID', + `item_id` varchar(128) DEFAULT NULL COMMENT '项目ID', + `tp_id` varchar(256) DEFAULT NULL COMMENT '线程池ID', + `identify` varchar(64) DEFAULT NULL COMMENT '线程池唯一标识', + `content` longtext NULL COMMENT '参数变更内容', `modify_all` tinyint(1) NULL DEFAULT NULL COMMENT '是否全部修改', `gmt_create` datetime NULL DEFAULT NULL COMMENT '参数变更时间', - `modify_user` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人', + `modify_user` varchar(128) DEFAULT NULL COMMENT '修改人', `verify_status` tinyint(1) NULL DEFAULT NULL COMMENT '审核状态 0:待审核 1：审核通过 2：审核拒绝', `gmt_verify` datetime NULL DEFAULT NULL COMMENT '审核时间', - `verify_user` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核人', + `verify_user` varchar(128) DEFAULT NULL COMMENT '审核人', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET=utf8mb4 COMMENT = '参数变更审核记录表';