Merge branch 'datavane:dev' into dev

datavane · Nov 8, 2023 · c26deea · c26deea
2 parents 82f6348 + 5e1ab3e
commit c26deea
Show file tree

Hide file tree

Showing 83 changed files with 6,256 additions and 1,390 deletions.
diff --git a/datasophon-api/src/main/java/com/datasophon/api/controller/HostInstallController.java b/datasophon-api/src/main/java/com/datasophon/api/controller/HostInstallController.java
@@ -132,7 +132,7 @@ public Result generateHostAgentCommand(
     }
 
     /**
-     * 启动 主机上服务启动
+     * 启动/停止 主机上服务启动
      * @param clusterHostIds
      * @param commandType
      * @return

diff --git a/datasophon-api/src/main/resources/assembly.xml b/datasophon-api/src/main/resources/assembly.xml
@@ -175,5 +175,14 @@
             <directoryMode>0755</directoryMode>
             <fileMode>0755</fileMode>
         </fileSet>
+        <fileSet>
+            <directory>${basedir}/../datasophon-init/</directory>
+            <includes>
+                <include>**/*.*</include>
+            </includes>
+            <outputDirectory>datasophon-init</outputDirectory>
+            <fileMode>0755</fileMode>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
     </fileSets>
 </assembly>
diff --git a/datasophon-api/src/main/resources/db/migration/1.1.0/R1.1.0.sql b/datasophon-api/src/main/resources/db/migration/1.1.0/R1.1.0.sql
@@ -1,40 +0,0 @@
-DROP TABLE IF EXISTS `migration_history`;
-DROP TABLE IF EXISTS `t_ddh_access_token`;
-DROP TABLE IF EXISTS `t_ddh_alert_group`;
-DROP TABLE IF EXISTS `t_ddh_cluster_alert_expression`;
-DROP TABLE IF EXISTS `t_ddh_cluster_alert_group_map`;
-DROP TABLE IF EXISTS `t_ddh_cluster_alert_history`;
-DROP TABLE IF EXISTS `t_ddh_cluster_alert_quota`;
-DROP TABLE IF EXISTS `t_ddh_cluster_alert_rule`;
-DROP TABLE IF EXISTS `t_ddh_cluster_group`;
-DROP TABLE IF EXISTS `t_ddh_cluster_host`;
-DROP TABLE IF EXISTS `t_ddh_cluster_info`;
-DROP TABLE IF EXISTS `t_ddh_cluster_node_label`;
-DROP TABLE IF EXISTS `t_ddh_cluster_queue_capacity`;
-DROP TABLE IF EXISTS `t_ddh_cluster_rack`;
-DROP TABLE IF EXISTS `t_ddh_cluster_role_user`;
-DROP TABLE IF EXISTS `t_ddh_cluster_service_command`;
-DROP TABLE IF EXISTS `t_ddh_cluster_service_command_host`;
-DROP TABLE IF EXISTS `t_ddh_cluster_service_command_host_command`;
-DROP TABLE IF EXISTS `t_ddh_cluster_service_dashboard`;
-DROP TABLE IF EXISTS `t_ddh_cluster_service_instance`;
-DROP TABLE IF EXISTS `t_ddh_cluster_service_instance_role_group`;
-DROP TABLE IF EXISTS `t_ddh_cluster_service_role_group_config`;
-DROP TABLE IF EXISTS `t_ddh_cluster_service_role_instance`;
-DROP TABLE IF EXISTS `t_ddh_cluster_service_role_instance_webuis`;
-DROP TABLE IF EXISTS `t_ddh_cluster_user`;
-DROP TABLE IF EXISTS `t_ddh_cluster_user_group`;
-DROP TABLE IF EXISTS `t_ddh_cluster_variable`;
-DROP TABLE IF EXISTS `t_ddh_cluster_yarn_queue`;
-DROP TABLE IF EXISTS `t_ddh_cluster_yarn_scheduler`;
-DROP TABLE IF EXISTS `t_ddh_cluster_zk`;
-DROP TABLE IF EXISTS `t_ddh_command`;
-DROP TABLE IF EXISTS `t_ddh_frame_info`;
-DROP TABLE IF EXISTS `t_ddh_frame_service`;
-DROP TABLE IF EXISTS `t_ddh_frame_service_role`;
-DROP TABLE IF EXISTS `t_ddh_install_step`;
-DROP TABLE IF EXISTS `t_ddh_notice_group`;
-DROP TABLE IF EXISTS `t_ddh_notice_group_user`;
-DROP TABLE IF EXISTS `t_ddh_role_info`;
-DROP TABLE IF EXISTS `t_ddh_session`;
-DROP TABLE IF EXISTS `t_ddh_user_info`;