Merge branch 'opengoofy:develop' into develop

hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java

@@ -74,14 +74,15 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM
                 .set(HisConfigVerifyInfo::getGmtVerify, new Date())
                 .set(HisConfigVerifyInfo::getVerifyUser, UserContext.getUserName());
         hisConfigVerifyMapper.update(null, updateWrapper);
-        Date gmtVerify = hisConfigVerifyMapper.selectById(reqDTO.getId()).getGmtVerify();
+        Date gmtCreate = hisConfigVerifyMapper.selectById(reqDTO.getId()).getGmtCreate();
         LambdaUpdateWrapper<HisConfigVerifyInfo> invalidUpdateWrapper = new LambdaUpdateWrapper<HisConfigVerifyInfo>()
                 .eq(HisConfigVerifyInfo::getType, reqDTO.getType())
                 .eq(reqDTO.getTenantId() != null, HisConfigVerifyInfo::getTenantId, reqDTO.getTenantId())
                 .eq(reqDTO.getItemId() != null, HisConfigVerifyInfo::getItemId, reqDTO.getItemId())
                 .eq(reqDTO.getTpId() != null, HisConfigVerifyInfo::getTpId, reqDTO.getTpId())
                 .and(reqDTO.getIdentify() != null, wrapper -> wrapper.eq(HisConfigVerifyInfo::getIdentify, reqDTO.getIdentify()).or().eq(HisConfigVerifyInfo::getModifyAll, true))
-                .lt(HisConfigVerifyInfo::getGmtVerify, gmtVerify)
+                .lt(HisConfigVerifyInfo::getGmtCreate, gmtCreate)
+                .eq(HisConfigVerifyInfo::getVerifyStatus,VerifyEnum.TO_VERIFY.getVerifyStatus())
                 .set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_INVALID.getVerifyStatus());
         hisConfigVerifyMapper.update(null, invalidUpdateWrapper);
     }

hippo4j-console/src/main/resources/static/static/css/chunk-1c44a627.95ae0d9d.css

@@ -0,0 +1 @@
+.waves-ripple{position:absolute;border-radius:100%;background-color:rgba(0,0,0,.15);background-clip:padding-box;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transform:scale(0);transform:scale(0);opacity:1}.waves-ripple.z-active{opacity:0;-webkit-transform:scale(2);transform:scale(2);-webkit-transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,-webkit-transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out;transition:opacity 1.2s ease-out,transform .6s ease-out,-webkit-transform .6s ease-out}.pagination-container[data-v-df7d1fa0]{background:#fff;padding:32px 16px}.pagination-container.hidden[data-v-df7d1fa0]{display:none}

hippo4j-console/src/main/resources/static/static/css/chunk-6b3c38c4.c8603dfd.css

@@ -1 +1 @@
-.social-signup-container[data-v-7309fbbb]{margin:20px 0}.social-signup-container .sign-btn[data-v-7309fbbb]{display:inline-block;cursor:pointer}.social-signup-container .icon[data-v-7309fbbb]{color:#fff;font-size:24px;margin-top:8px}.social-signup-container .qq-svg-container[data-v-7309fbbb],.social-signup-container .wx-svg-container[data-v-7309fbbb]{display:inline-block;width:40px;height:40px;line-height:40px;text-align:center;padding-top:1px;border-radius:4px;margin-bottom:20px;margin-right:5px}.social-signup-container .wx-svg-container[data-v-7309fbbb]{background-color:#24da70}.social-signup-container .qq-svg-container[data-v-7309fbbb]{background-color:#6ba2d6;margin-left:50px}@supports(-webkit-mask:none) and (not (cater-color:#fff)){.login-container .el-input input{color:#fff}}.login-container .el-input{display:inline-block;height:47px;width:85%}.login-container .el-input input{background:transparent;border:0;-webkit-appearance:none;border-radius:0;padding:12px 5px 12px 15px;color:#fff;height:47px;caret-color:#fff}.login-container .el-input input:-webkit-autofill{-webkit-box-shadow:0 0 0 1000px #283443 inset!important;box-shadow:inset 0 0 0 1000px #283443!important;-webkit-text-fill-color:#fff!important}.login-container .el-form-item{border:1px solid hsla(0,0%,100%,.1);background:rgba(0,0,0,.1);border-radius:5px;color:#454545}.login-container[data-v-3efc76dc]{min-height:100%;width:100%;background-color:#2d3a4b;overflow:hidden}.login-container .login-form[data-v-3efc76dc]{position:relative;width:520px;max-width:100%;padding:160px 35px 0;margin:0 auto;overflow:hidden}.login-container .tips[data-v-3efc76dc]{font-size:14px;color:#fff;margin-bottom:10px}.login-container .tips span[data-v-3efc76dc]:first-of-type{margin-right:16px}.login-container .svg-container[data-v-3efc76dc]{padding:6px 5px 6px 15px;color:#889aa4;vertical-align:middle;width:30px;display:inline-block}.login-container .title-container[data-v-3efc76dc]{position:relative}.login-container .title-container .title[data-v-3efc76dc]{font-size:26px;color:#eee;margin:0 auto 40px auto;text-align:center;font-weight:700}.login-container .show-pwd[data-v-3efc76dc]{position:absolute;right:10px;top:7px;font-size:16px;color:#889aa4;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.login-container .thirdparty-button[data-v-3efc76dc]{position:absolute;right:0;bottom:6px}@media only screen and (max-width:470px){.login-container .thirdparty-button[data-v-3efc76dc]{display:none}}
+.social-signup-container[data-v-7309fbbb]{margin:20px 0}.social-signup-container .sign-btn[data-v-7309fbbb]{display:inline-block;cursor:pointer}.social-signup-container .icon[data-v-7309fbbb]{color:#fff;font-size:24px;margin-top:8px}.social-signup-container .qq-svg-container[data-v-7309fbbb],.social-signup-container .wx-svg-container[data-v-7309fbbb]{display:inline-block;width:40px;height:40px;line-height:40px;text-align:center;padding-top:1px;border-radius:4px;margin-bottom:20px;margin-right:5px}.social-signup-container .wx-svg-container[data-v-7309fbbb]{background-color:#24da70}.social-signup-container .qq-svg-container[data-v-7309fbbb]{background-color:#6ba2d6;margin-left:50px}@supports(-webkit-mask:none) and (not (cater-color:#fff)){.login-container .el-input input{color:#fff}}.login-container .el-input{display:inline-block;height:47px;width:85%}.login-container .el-input input{background:transparent;border:0;-webkit-appearance:none;border-radius:0;padding:12px 5px 12px 15px;color:#fff;height:47px;caret-color:#fff}.login-container .el-input input:-webkit-autofill{-webkit-box-shadow:0 0 0 1000px #283443 inset!important;box-shadow:inset 0 0 0 1000px #283443!important;-webkit-text-fill-color:#fff!important}.login-container .el-form-item{border:1px solid hsla(0,0%,100%,.1);background:rgba(0,0,0,.1);border-radius:5px;color:#454545}.login-container[data-v-13dcd441]{min-height:100%;width:100%;background-color:#2d3a4b;overflow:hidden}.login-container .login-form[data-v-13dcd441]{position:relative;width:520px;max-width:100%;padding:160px 35px 0;margin:0 auto;overflow:hidden}.login-container .tips[data-v-13dcd441]{font-size:14px;color:#fff;margin-bottom:10px}.login-container .tips span[data-v-13dcd441]:first-of-type{margin-right:16px}.login-container .svg-container[data-v-13dcd441]{padding:6px 5px 6px 15px;color:#889aa4;vertical-align:middle;width:30px;display:inline-block}.login-container .title-container[data-v-13dcd441]{position:relative}.login-container .title-container .title[data-v-13dcd441]{font-size:26px;color:#eee;margin:0 auto 40px auto;text-align:center;font-weight:700}.login-container .show-pwd[data-v-13dcd441]{position:absolute;right:10px;top:7px;font-size:16px;color:#889aa4;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.login-container .thirdparty-button[data-v-13dcd441]{position:absolute;right:0;bottom:6px}@media only screen and (max-width:470px){.login-container .thirdparty-button[data-v-13dcd441]{display:none}}

hippo4j-server/conf/hippo4j_manager.sql

@@ -224,7 +224,7 @@ CREATE TABLE `his_config_verify`  (
   `modify_all` tinyint(1) NULL DEFAULT NULL COMMENT '是否全部修改',
   `gmt_create` datetime NULL DEFAULT NULL COMMENT '参数变更时间',
   `modify_user` varchar(128)  DEFAULT NULL COMMENT '修改人',
-  `verify_status` tinyint(1) NULL DEFAULT NULL COMMENT '审核状态 0:待审核 1：审核通过 2：审核拒绝',
+  `verify_status` tinyint(1) NULL DEFAULT NULL COMMENT '审核状态 0：待审核 1：审核通过 2：审核拒绝',
   `gmt_verify` datetime NULL DEFAULT NULL COMMENT '审核时间',
   `verify_user` varchar(128)  DEFAULT NULL COMMENT '审核人',
 PRIMARY KEY (`id`) USING BTREE

hippo4j-server/conf/sql-upgrade/1.4.2_upgrade.sql

@@ -16,7 +16,6 @@ ALTER TABLE his_run_data Modify COLUMN tp_id varchar(256) COMMENT '线程池ID';
 
 ALTER TABLE notify Modify COLUMN tp_id varchar(256) COMMENT '线程池ID';
 
-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 '变更类型',
@@ -29,9 +28,8 @@ CREATE TABLE `his_config_verify`  (
   `modify_all` tinyint(1) NULL DEFAULT NULL COMMENT '是否全部修改',
   `gmt_create` datetime NULL DEFAULT NULL COMMENT '参数变更时间',
   `modify_user` varchar(128)  DEFAULT NULL COMMENT '修改人',
-  `verify_status` tinyint(1) NULL DEFAULT NULL COMMENT '审核状态 0:待审核 1：审核通过 2：审核拒绝',
+  `verify_status` tinyint(1) NULL DEFAULT NULL COMMENT '审核状态 0：待审核 1：审核通过 2：审核拒绝',
   `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 = '参数变更审核记录表';
-

hippo4j-server/src/main/resources/sql-script/h2/hippo4j_manager.sql

@@ -156,7 +156,7 @@ CREATE TABLE IF NOT EXISTS `his_config_verify`  (
    `modify_all` tinyint(1)  COMMENT '是否全部修改',
    `gmt_create` datetime  COMMENT '参数变更时间',
    `modify_user` varchar(128) DEFAULT NULL COMMENT '修改人',
-   `verify_status` tinyint(1)  COMMENT '审核状态 0:待审核 1：审核通过 2：审核拒绝',
+   `verify_status` tinyint(1)  COMMENT '审核状态 0：待审核 1：审核通过 2：审核拒绝',
    `gmt_verify` datetime  COMMENT '审核时间',
    `verify_user` varchar(128) DEFAULT NULL COMMENT '审核人',
     PRIMARY KEY (`id`) USING BTREE

hippo4j-server/src/main/resources/sql-script/mysql/hippo4j_manager.sql

@@ -213,7 +213,7 @@ CREATE TABLE IF NOT EXISTS `his_config_verify`  (
    `modify_all` tinyint(1) NULL DEFAULT NULL COMMENT '是否全部修改',
    `gmt_create` datetime NULL DEFAULT NULL COMMENT '参数变更时间',
    `modify_user` varchar(128)  DEFAULT NULL COMMENT '修改人',
-   `verify_status` tinyint(1) NULL DEFAULT NULL COMMENT '审核状态 0:待审核 1：审核通过 2：审核拒绝',
+   `verify_status` tinyint(1) NULL DEFAULT NULL COMMENT '审核状态 0：待审核 1：审核通过 2：审核拒绝',
    `gmt_verify` datetime NULL DEFAULT NULL COMMENT '审核时间',
    `verify_user` varchar(128)  DEFAULT NULL COMMENT '审核人',
  PRIMARY KEY (`id`) USING BTREE