diff --git a/hera-admin/pom.xml b/hera-admin/pom.xml index 4603e1451..ea4946f21 100755 --- a/hera-admin/pom.xml +++ b/hera-admin/pom.xml @@ -7,14 +7,13 @@ com.dfire.hera hera - 2.4.3 + 2.4.4 hera-admin - ${hera.admin.version} jar - hera-admin - hera任务调度系统 + + UTF-8 @@ -60,15 +59,8 @@ com.github.pagehelper pagehelper - 5.1.2 - + org.projectlombok diff --git a/hera-admin/src/main/resources/banner.txt b/hera-admin/src/main/resources/banner.txt index 72752b509..e07b8eda8 100755 --- a/hera-admin/src/main/resources/banner.txt +++ b/hera-admin/src/main/resources/banner.txt @@ -6,6 +6,6 @@ ${AnsiColor.BRIGHT_CYAN} |_| |_|\___|_| \__,_| create by: 凌霄 小苏打 生煎 火锅 ${AnsiColor.BRIGHT_YELLOW} -::: Spring-Boot ${spring-boot.version} ::: Hera (version:${hera.version}) +::: Spring-Boot ${spring-boot.version} ::: Hera (version:2.4.4) ${AnsiColor.DEFAULT} diff --git a/hera-admin/src/main/resources/config/application.yml b/hera-admin/src/main/resources/config/application.yml index 085cc43ac..1def42592 100755 --- a/hera-admin/src/main/resources/config/application.yml +++ b/hera-admin/src/main/resources/config/application.yml @@ -28,7 +28,7 @@ druid: username: root #数据库用户名 password: moye #数据库密码 driver-class-name: com.mysql.jdbc.Driver #数据库驱动 - url: jdbc:mysql://localhost:3306/hera2.4.2?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=false + url: jdbc:mysql://localhost:3306/hera?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=false initial-size: 5 #初始化连接池数量 min-idle: 1 #最小生存连接数 max-active: 16 #最大连接池数量 @@ -79,7 +79,6 @@ hera: env: ${spring.profiles.active} alarmEnv: daily,dev,pre,publish # 设置允许哪些环境开启告警,多个用,分开,默认全部环境 sudoUser: false #是否要使用sudo -u 切换账号(即启动多租户功能) - version: 2.4.3 kerberos: keytabpath: #kerberos认证keytab文件,如果hadoop 集群无需kerberos授权,则不填 principal: #kerberos认证principal,如果hadoop 集群无需kerberos授权,则不填 diff --git a/hera-admin/src/main/resources/hera.sql b/hera-admin/src/main/resources/hera.sql index fbf4bf3f6..53ae7c23c 100755 --- a/hera-admin/src/main/resources/hera.sql +++ b/hera-admin/src/main/resources/hera.sql @@ -40,10 +40,10 @@ CREATE TABLE IF NOT EXISTS `hera_action` `down_actions` varchar(16) DEFAULT NULL, `batch_id` varchar(50) DEFAULT NULL COMMENT '批次号', PRIMARY KEY (`id`), - KEY `ind_action_groupid` (`group_id`), - KEY `ind_actionjobid` (`job_id`) + KEY `idx_group_id` (`group_id`), + KEY `idx_job_id` (`job_id`) ) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='job版本记录表'; + DEFAULT CHARSET = utf8mb4 COMMENT ='job实例记录表'; CREATE TABLE IF NOT EXISTS `hera_action_history` ( @@ -68,11 +68,11 @@ CREATE TABLE IF NOT EXISTS `hera_action_history` batch_id varchar(50) DEFAULT NULL COMMENT '批次号', biz_label varchar(500) DEFAULT NULL COMMENT '标签', PRIMARY KEY (`id`), - KEY `ind_action_id_job_id` (`action_id`, `job_id`), - KEY `ind_job_id` (`job_id`), - KEY `ind_gmt_create` (`gmt_create`), - KEY `ind_end_time` (`end_time`), - KEY `ind_start_time` (`start_time`) + KEY `idx_action_id_job_id` (`action_id`, `job_id`), + KEY `idx_job_id` (`job_id`), + KEY `idx_gmt_create` (`gmt_create`), + KEY `idx_end_time` (`end_time`), + KEY `idx_start_time` (`start_time`) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='Job运行日志表'; CREATE TABLE IF NOT EXISTS `hera_advice` @@ -150,9 +150,9 @@ CREATE TABLE IF NOT EXISTS `hera_group` `resources` text, `existed` int(11) NOT NULL DEFAULT '1', PRIMARY KEY (`id`), - KEY `ind_heragroupparent` (`parent`) + KEY `idx_parent` (`parent`) ) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; + DEFAULT CHARSET = utf8mb4 COMMENT ='调度中心目录表'; CREATE TABLE IF NOT EXISTS `hera_host_group` ( @@ -219,9 +219,9 @@ CREATE TABLE IF NOT EXISTS `hera_job` biz_label varchar(500) DEFAULT '', `estimated_end_hour` int(4) NOT NULL DEFAULT '0' COMMENT '预计结束结束时间', PRIMARY KEY (`id`), - KEY `ind_zeusjobgroupid` (`group_id`) + KEY `idx_group_id` (`group_id`) ) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='hera的job 记录表'; + DEFAULT CHARSET = utf8mb4 COMMENT ='调度中心任务记录表'; CREATE TABLE IF NOT EXISTS `hera_job_monitor` ( @@ -229,7 +229,7 @@ CREATE TABLE IF NOT EXISTS `hera_job_monitor` `user_ids` varchar(100) NOT NULL, PRIMARY KEY (`job_id`) ) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; + DEFAULT CHARSET = utf8mb4 COMMENT ='任务关注人列表'; CREATE TABLE IF NOT EXISTS `hera_lock` ( @@ -256,16 +256,7 @@ CREATE TABLE IF NOT EXISTS `hera_permission` ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COMMENT ='任务授权记录表'; -CREATE TABLE IF NOT EXISTS `hera_profile` -( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `hadoop_conf` varchar(2024) DEFAULT NULL COMMENT 'hadoop配置信息', - `uid` varchar(32) DEFAULT NULL COMMENT '用户名称', - PRIMARY KEY (`id`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='用户配置表'; + CREATE TABLE IF NOT EXISTS `hera_user` @@ -284,7 +275,7 @@ CREATE TABLE IF NOT EXISTS `hera_user` `description` varchar(256) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4; + DEFAULT CHARSET = utf8mb4 comment ='用户组表'; CREATE TABLE IF NOT EXISTS `hera_sso` @@ -317,7 +308,6 @@ CREATE TABLE IF NOT EXISTS `hera_record` `gId` int(11) NOT NULL DEFAULT '-1' COMMENT '组id', PRIMARY KEY (`id`) ) ENGINE = InnoDB - AUTO_INCREMENT = 37 DEFAULT CHARSET = utf8mb4 COMMENT ='日志记录表'; diff --git a/hera-admin/src/main/resources/static/js/scheduleCenter.js b/hera-admin/src/main/resources/static/js/scheduleCenter.js index defbc075f..8c52fd798 100755 --- a/hera-admin/src/main/resources/static/js/scheduleCenter.js +++ b/hera-admin/src/main/resources/static/js/scheduleCenter.js @@ -1541,7 +1541,7 @@ layui.use(['table'], function () { }, { field: "actionId", title: "版本号", - width: "11%", + width: "14%", halign: 'center', align: 'center', formatter: function (val) { diff --git a/hera-admin/src/main/resources/templates/common/common.macro.ftl b/hera-admin/src/main/resources/templates/common/common.macro.ftl index 42743ec73..4db0e3dbd 100755 --- a/hera-admin/src/main/resources/templates/common/common.macro.ftl +++ b/hera-admin/src/main/resources/templates/common/common.macro.ftl @@ -243,7 +243,7 @@ <#macro commonFooter >