update 2.4.4 version

scxwhite · Aug 18, 2021 · 912c470 · 912c470
1 parent a3f0308
commit 912c470
Show file tree

Hide file tree

Showing 119 changed files with 19,105 additions and 99 deletions.
diff --git a/hera-admin/pom.xml b/hera-admin/pom.xml
@@ -7,14 +7,13 @@
     <parent>
         <groupId>com.dfire.hera</groupId>
         <artifactId>hera</artifactId>
-        <version>2.4.3</version>
+        <version>2.4.4</version>
     </parent>
 
     <artifactId>hera-admin</artifactId>
-    <version>${hera.admin.version}</version>
     <packaging>jar</packaging>
-    <name>hera-admin</name>
-    <description>hera任务调度系统</description>
+
+
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -60,15 +59,8 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
-            <version>5.1.2</version>
         </dependency>
-<!--
-        使用后会影响dubbo的初始化
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional>
-        </dependency>-->
+
 
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git 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
@@ -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
@@ -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,17 +219,17 @@ 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`
 (
   `job_id`   bigint(20)   NOT NULL,
   `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
@@ -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
@@ -243,7 +243,7 @@
 
 <#macro commonFooter >
     <footer class="main-footer">
-        Powered by <b>hera</b> 2.4.3
+        Powered by <b>hera</b> 2.4.4
         <div class="pull-right hidden-xs">
             <strong>Copyright &copy; 2018-${.now?string('yyyy')} &nbsp;
                 <a href="https://github.com/scxwhite/hera" target="_blank">github/scx_white</a>

diff --git a/hera-common/pom.xml b/hera-common/pom.xml
@@ -5,12 +5,13 @@
     <parent>
         <groupId>com.dfire.hera</groupId>
         <artifactId>hera</artifactId>
-        <version>2.4.3</version>
+        <version>2.4.4</version>
     </parent>
 
+
+
     <artifactId>hera-common</artifactId>
     <packaging>jar</packaging>
-    <version>${hera.common.version}</version>
     <name>hera-common</name>
 
     <dependencies>

diff --git a/hera-core/pom.xml b/hera-core/pom.xml
@@ -7,33 +7,16 @@
     <parent>
         <groupId>com.dfire.hera</groupId>
         <artifactId>hera</artifactId>
-        <version>2.4.3</version>
+        <version>2.4.4</version>
     </parent>
 
     <artifactId>hera-core</artifactId>
     <packaging>jar</packaging>
-    <version>${hera.core.version}</version>
     <name>hera-core</name>
-    <description>hera project for Spring Boot</description>
 
-    <properties>
-        <quartz.version>2.2.1</quartz.version>
-        <jwt.version>3.3.0</jwt.version>
-        <lang3.version>3.4</lang3.version>
-    </properties>
+
 
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk-emr -->
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-emr</artifactId>
-            <version>1.11.513</version>
-        </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-core</artifactId>
-            <version>1.11.513</version>
-        </dependency>
 
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
@@ -42,12 +25,18 @@
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-core</artifactId>
-            <version>4.3.9</version>
         </dependency>
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-emr</artifactId>
-            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-emr</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
         </dependency>
 
         <dependency>
@@ -57,9 +46,7 @@
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>${jwt.version}</version>
         </dependency>
-        <!-- redisson-->
 
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -76,7 +63,6 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>3.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -86,7 +72,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${lang3.version}</version>
         </dependency>
 
 
@@ -112,7 +97,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/hera-monitor/pom.xml b/hera-monitor/pom.xml
@@ -5,17 +5,14 @@
     <parent>
         <artifactId>hera</artifactId>
         <groupId>com.dfire.hera</groupId>
-        <version>2.4.3</version>
+        <version>2.4.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>hera-monitor</artifactId>
-    <version>${hera.monitor.version}</version>
     <name>hera-monitor</name>
-    <url>http://www.example.com</url>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <dependencies>
@@ -29,7 +26,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
             <scope>test</scope>
         </dependency>
     </dependencies>