复制表名

app/routers/dag.py

@@ -11,6 +11,11 @@ from utils.sx_time import sxtimeit
 from utils.sx_web import web_try
 from app.common.hive import hiveDs
 from app import get_db
+from configs.settings import DefaultOption, config
+database_name = config.get('HIVE', 'database_name')
+base_path = config.get('HIVE', 'base_path')
+hdfs_path = config.get('HADOOP_INNER', 'default_fs')
+
 
 router = APIRouter(
     prefix="/jpt/dag",
@@ -80,5 +85,9 @@ def get_dag_debug_status(dag_uuid: str, node_id: str, token_data: schemas.TokenD
 def get_dag_debug_result(dag_uuid: str, node_id: str, out_pin: int , token_data: schemas.TokenData = Depends(verify_users), db: Session = Depends(get_db)):
     table_name = get_tmp_table_name(dag_uuid, node_id, str(out_pin), db)
     result = hiveDs.get_preview_data(table_name,500)
+    result.update({
+        'table_name':f'{database_name}.{table_name}',
+        'table_path':f'{hdfs_path}{base_path}{table_name}'
+        })
     return result
 

data/data.sql

@@ -1,117 +1,88 @@
-
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
 -- ----------------------------
--- Table structure for job_jdbc_datasource
+-- Table structure for airflow_job
 -- ----------------------------
-DROP TABLE IF EXISTS `job_jdbc_datasource`;
-CREATE TABLE `job_jdbc_datasource` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增主键',
-  `datasource_name` varchar(200) NOT NULL COMMENT '数据源名称',
-  `datasource` varchar(45) NOT NULL COMMENT '数据源',
-  `datasource_group` varchar(200) DEFAULT 'Default' COMMENT '数据源分组',
-  `database_name` varchar(45) NOT NULL COMMENT '数据库名',
-  `jdbc_username` varchar(100) DEFAULT NULL COMMENT '用户名',
-  `jdbc_password` varchar(200) DEFAULT NULL COMMENT '密码',
-  `jdbc_url` varchar(500) NOT NULL COMMENT 'jdbc url',
-  `jdbc_driver_class` varchar(200) DEFAULT NULL COMMENT 'jdbc驱动类',
-  `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态：0删除 1启用 2禁用',
-  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人',
-  `create_time` int(20) DEFAULT NULL COMMENT '创建时间',
-  `update_by` varchar(20) DEFAULT NULL COMMENT '更新人',
-  `update_time` int(20) DEFAULT NULL COMMENT '更新时间',
-  `comments` varchar(1000) DEFAULT NULL COMMENT '备注',
-  `tag` varchar(20) DEFAULT NULL COMMENT '标签: 0开发1测试2开发',
-  `kerberos` tinyint(1) NOT NULL COMMENT 'kerberos验证是否开启（0:不开启，1:开启）',
-  `keytab` varchar(200) DEFAULT NULL COMMENT 'keytab文件',
-  `krb5config` varchar(200) DEFAULT NULL COMMENT 'krb5config',
-  `kerberos_service_name` varchar(100) DEFAULT NULL COMMENT 'kerberos_service_name',
-  `principal` varchar(100) DEFAULT NULL COMMENT 'principal',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='jdbc数据源配置';
+DROP TABLE IF EXISTS `airflow_job`;
+CREATE TABLE `airflow_job` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` text CHARACTER SET utf8 COLLATE utf8_unicode_ci,
+  `job_type` int(11) DEFAULT NULL,
+  `tasks` json DEFAULT NULL,
+  `dependence` json DEFAULT NULL,
+  `cron` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  `desc` text CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  `route_strategy` varchar(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+  `block_strategy` varchar(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+  `executor_timeout` int(11) NOT NULL,
+  `executor_fail_retry_count` int(11) NOT NULL,
+  `trigger_status` int(11) NOT NULL,
+  `trigger_last_time` int(11) DEFAULT NULL,
+  `trigger_next_time` int(11) DEFAULT NULL,
+  `create_time` int(11) DEFAULT NULL,
+  `update_time` int(11) DEFAULT NULL,
+  `user_id` int(11) DEFAULT NULL,
+  `job_mode` int(2) DEFAULT '1',
+  PRIMARY KEY (`id`),
+  KEY `ix_airflow_job_id` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of airflow_job
+-- ----------------------------
+BEGIN;
+COMMIT;
 
 -- ----------------------------
--- Table structure for job_info
+-- Table structure for airflow_run
 -- ----------------------------
-DROP TABLE IF EXISTS `job_info`;
-CREATE TABLE `job_info` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `cron_select_type` tinyint(4) NOT NULL COMMENT '周期选择类型',
-  `job_cron` varchar(128) NOT NULL COMMENT '任务执行CRON',
-  `job_desc` varchar(255) NOT NULL,
-  `create_time` int(20) DEFAULT NULL COMMENT '创建时间',
-  `update_time` int(20) DEFAULT NULL COMMENT '更新时间',
-  `user_id` varchar(50) NOT NULL COMMENT '用户ID',
-  `executor_route_strategy` varchar(50) DEFAULT NULL COMMENT '执行器路由策略',
-  `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler',
-  `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数',
-  `executor_block_strategy` varchar(50) DEFAULT NULL COMMENT '阻塞处理策略',
-  `executor_timeout` int(11) NOT NULL DEFAULT '0' COMMENT '任务执行超时时间，单位秒',
-  `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数',
-  `trigger_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '调度状态：0-停止，1-运行',
-  `trigger_last_time` bigint(13) DEFAULT NULL COMMENT '上次调度时间',
-  `trigger_next_time` bigint(13) DEFAULT NULL COMMENT '下次调度时间',
-  `job_json` text CHARACTER SET utf8 COMMENT 'datax运行脚本',
-  `inc_start_time` int(11) DEFAULT NULL COMMENT '增量初始时间',
-  `last_handle_code` int(11) DEFAULT NULL COMMENT '最近一次执行状态',
-  `delete_status` tinyint(4) NOT NULL COMMENT '数据状态：0-无效，1-有效',
-  `replace_param` varchar(50) DEFAULT NULL COMMENT '增量时间',
-  `partition_info` varchar(50) DEFAULT NULL COMMENT '分区信息',
-  `jvm_param` varchar(50) DEFAULT NULL COMMENT 'jvm参数',
-  `last_time` varchar(50) DEFAULT NULL COMMENT '上次时间字段',
-  `current_time` varchar(50) DEFAULT NULL COMMENT '当前时间字段',
-  `project_id` bigint(20) NOT NULL COMMENT '项目id',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+DROP TABLE IF EXISTS `airflow_run`;
+CREATE TABLE `airflow_run` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `start_time` double DEFAULT NULL,
+  `end_time` float DEFAULT NULL,
+  `job_id` int(11) DEFAULT NULL,
+  `af_run_id` varchar(60) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+  `status` int(11) DEFAULT NULL,
+  `details` json DEFAULT NULL,
+  `run_ts` varchar(60) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `ix_airflow_run_id` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Records of airflow_run
+-- ----------------------------
+BEGIN;
+COMMIT;
 
 -- ----------------------------
--- Table structure for job_log
+-- Table structure for airflow_task
 -- ----------------------------
-DROP TABLE IF EXISTS `job_log`;
-CREATE TABLE `job_log` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `job_group` int(11) NOT NULL COMMENT '执行器主键ID',
-  `job_id` int(11) NOT NULL COMMENT '任务，主键ID',
-  `executor_address` varchar(255) DEFAULT NULL COMMENT '执行器地址，本次执行的地址',
-  `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler',
-  `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数',
-  `executor_sharding_param` varchar(20) DEFAULT NULL COMMENT '执行器任务分片参数，格式如 1/2',
-  `executor_fail_retry_count` int(11) DEFAULT '0' COMMENT '失败重试次数',
-  `trigger_time` bigint(13) DEFAULT NULL COMMENT '调度-时间',
-  `trigger_code` int(11) NOT NULL COMMENT '调度-结果 0-失败，1-成功，2-无',
-  `trigger_msg` text COMMENT '调度-日志',
-  `handle_time` bigint(13) DEFAULT NULL COMMENT '执行-时间',
-  `handle_code` int(11) NOT NULL COMMENT '执行-状态 0-失败，1-成功，2-无',
-  `handle_msg` text COMMENT '执行-日志',
-  `alarm_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败',
-  `process_id` varchar(20) DEFAULT NULL COMMENT 'datax进程Id',
-  PRIMARY KEY (`id`) USING BTREE,
-  KEY `I_trigger_time` (`trigger_time`) USING BTREE,
-  KEY `I_handle_code` (`handle_code`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+DROP TABLE IF EXISTS `airflow_task`;
+CREATE TABLE `airflow_task` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` text CHARACTER SET utf8 COLLATE utf8_unicode_ci,
+  `task_type` varchar(16) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+  `file_urls` json DEFAULT NULL,
+  `script` text CHARACTER SET utf8 COLLATE utf8_unicode_ci,
+  `cmd` text CHARACTER SET utf8 COLLATE utf8_unicode_ci,
+  `cmd_parameters` text CHARACTER SET utf8 COLLATE utf8_unicode_ci,
+  `envs` json DEFAULT NULL,
+  `run_image` text CHARACTER SET utf8 COLLATE utf8_unicode_ci,
+  `create_time` int(11) DEFAULT NULL,
+  `update_time` int(11) DEFAULT NULL,
+  `user_id` int(11) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `ix_airflow_task_id` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- ----------------------------
--- Table structure for data_management
+-- Records of airflow_task
 -- ----------------------------
-DROP TABLE IF EXISTS `data_management`;
-CREATE TABLE `data_management` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '数据名称',
-  `data_type` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '数据类型',
-  `data_num` int(20) DEFAULT NULL COMMENT '数据条数',
-  `storage_location` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '存储位置',
-  `storage_usage` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '占用存储',
-  `storage_path` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '存储路径',
-  `integrity` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '完整性',
-  `create_time` bigint(13) NOT NULL COMMENT '创建时间',
-  `user_name` varchar(20) COLLATE utf8_unicode_ci NOT NULL COMMENT '创建人名称',
-  `user_id` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '创建人编号',
-  `project_id` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '项目编号',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4  COMMENT='数据管理';
+BEGIN;
+COMMIT;
 
 -- ----------------------------
 -- Table structure for constant
@@ -119,10 +90,10 @@ CREATE TABLE `data_management` (
 DROP TABLE IF EXISTS `constant`;
 CREATE TABLE `constant` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `type` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '常量类型',
-  `value` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '常量值',
+  `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '常量类型',
+  `value` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '常量值',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4  COMMENT='常量表';
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COMMENT='常量表';
 
 -- ----------------------------
 -- Records of constant
@@ -139,28 +110,79 @@ INSERT INTO `constant` (`id`, `type`, `value`) VALUES (8, '任务标签', '任
 INSERT INTO `constant` (`id`, `type`, `value`) VALUES (9, '任务标签', '人力系统');
 COMMIT;
 
+-- ----------------------------
+-- Table structure for data_management
+-- ----------------------------
+DROP TABLE IF EXISTS `data_management`;
+CREATE TABLE `data_management` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '数据名称',
+  `table_name` varchar(255) DEFAULT NULL COMMENT '表名',
+  `create_time` bigint(13) NOT NULL COMMENT '创建时间',
+  `user_name` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '创建人名称',
+  `user_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '创建人编号',
+  `project_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '项目编号',
+  `af_run_id` varchar(100) NOT NULL COMMENT 'airflow运行id',
+  `status` tinyint(4) NOT NULL COMMENT '状态(1:转存中,2:成功,3:失败)',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='数据管理';
+
+-- ----------------------------
+-- Records of data_management
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for data_table
+-- ----------------------------
+DROP TABLE IF EXISTS `data_table`;
+CREATE TABLE `data_table` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `database_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '库名',
+  `table_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '表名',
+  `source` tinyint(4) NOT NULL COMMENT '源（0:数据湖；1:ailab）',
+  `type` tinyint(4) NOT NULL COMMENT '类型（0:被分享；1:自建；2:导入）',
+  `project_id` varchar(50) NOT NULL COMMENT '项目id',
+  `table_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'hdfs的path',
+  `create_time` bigint(20) NOT NULL COMMENT '创建时间',
+  `user_id` varchar(50) NOT NULL COMMENT '创建人、分享人',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='表';
+
+-- ----------------------------
+-- Records of data_table
+-- ----------------------------
+BEGIN;
+COMMIT;
+
 -- ----------------------------
 -- Table structure for jm_homework
 -- ----------------------------
 DROP TABLE IF EXISTS `jm_homework`;
 CREATE TABLE `jm_homework` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '作业名称',
-  `type` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '作业类型',
-  `tag` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '作业分类',
-  `image_url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '执行镜像',
-  `dag_uuid` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'DAG_ID',
-  `dag_url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'DAG文件地址',
-  `script_file` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '脚本文件',
-  `execute_command` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '执行命令',
+  `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '作业名称',
+  `type` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '作业类型',
+  `tag` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '作业分类',
+  `image_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '执行镜像',
+  `dag_uuid` varchar(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'DAG_ID',
+  `dag_url` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'DAG文件地址',
+  `script_file` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '脚本文件',
+  `execute_command` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '执行命令',
   `update_time` int(13) DEFAULT NULL COMMENT '更新时间',
   `create_time` int(13) NOT NULL COMMENT '创建时间',
-  `user_id` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '用户ID',
-  `project_id` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '项目ID',
+  `user_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '用户ID',
+  `project_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '项目ID',
   `status` tinyint(4) NOT NULL COMMENT '状态（0:已删除，1:未删除）',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4  COMMENT='作业信息';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='作业信息';
 
+-- ----------------------------
+-- Records of jm_homework
+-- ----------------------------
+BEGIN;
+COMMIT;
 
 -- ----------------------------
 -- Table structure for jm_homework_datasource_relation
@@ -168,13 +190,37 @@ CREATE TABLE `jm_homework` (
 DROP TABLE IF EXISTS `jm_homework_datasource_relation`;
 CREATE TABLE `jm_homework_datasource_relation` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `type` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT '类型',
+  `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '类型',
   `datasource_id` bigint(20) NOT NULL COMMENT '数据源ID',
-  `node_uuid` varchar(32) COLLATE utf8_unicode_ci NOT NULL COMMENT '节点uuid',
-  `table` varchar(255) COLLATE utf8_unicode_ci NOT NULL COMMENT '数据源对应数据表',
+  `node_uuid` varchar(32) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '节点uuid',
+  `table` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '数据源对应数据表',
   `homework_id` bigint(20) NOT NULL COMMENT '作业ID',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4  COMMENT='作业与数据源关系表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='作业与数据源关系表';
+
+-- ----------------------------
+-- Records of jm_homework_datasource_relation
+-- ----------------------------
+BEGIN;
+COMMIT;
+
+-- ----------------------------
+-- Table structure for jm_job_edge
+-- ----------------------------
+DROP TABLE IF EXISTS `jm_job_edge`;
+CREATE TABLE `jm_job_edge` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `in_node_id` bigint(20) DEFAULT NULL,
+  `out_node_id` bigint(20) DEFAULT NULL,
+  `job_id` bigint(20) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Job节点关系表';
+
+-- ----------------------------
+-- Records of jm_job_edge
+-- ----------------------------
+BEGIN;
+COMMIT;
 
 -- ----------------------------
 -- Table structure for jm_job_info
@@ -182,22 +228,29 @@ CREATE TABLE `jm_homework_datasource_relation` (
 DROP TABLE IF EXISTS `jm_job_info`;
 CREATE TABLE `jm_job_info` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '任务名称',
-  `type` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '任务类型',
-  `tag` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '任务分类',
+  `name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '任务名称',
+  `type` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '任务类型',
+  `tag` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '任务分类',
   `cron_type` tinyint(4) NOT NULL COMMENT '周期类型(1:单次;2:循环)',
   `cron_select_type` tinyint(4) DEFAULT NULL COMMENT '选择周期类型(0:时,1:日,2:周,3:月,4:cron)',
-  `cron_expression` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '周期表达式',
-  `api` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'api调用',
-  `json_str` varchar(10000) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '图形信息',
+  `cron_expression` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '周期表达式',
+  `api` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'api调用',
+  `json_str` varchar(10000) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT '图形信息',
   `status` tinyint(4) NOT NULL COMMENT '状态(0:停用中;1:启用中)',
   `delete_status` tinyint(4) NOT NULL COMMENT '是否删除(0:已删除;1:未删除)',
-  `user_id` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '用户ID',
-  `user_name` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '用户名称',
-  `project_id` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '项目ID',
+  `user_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '用户ID',
+  `user_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '用户名称',
+  `project_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '项目ID',
+  `create_time` int(20) DEFAULT NULL COMMENT '创建时间',
+  `update_time` int(20) DEFAULT NULL COMMENT '修改时间',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4  COMMENT='定时任务详情';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='定时任务详情';
 
+-- ----------------------------
+-- Records of jm_job_info
+-- ----------------------------
+BEGIN;
+COMMIT;
 
 -- ----------------------------
 -- Table structure for jm_job_node
@@ -207,183 +260,209 @@ CREATE TABLE `jm_job_node` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `job_id` bigint(20) NOT NULL COMMENT '任务ID',
   `homework_id` bigint(20) DEFAULT NULL COMMENT '作业ID',
-  `homework_name` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '作业名称',
+  `homework_name` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '作业名称',
   `start_point` tinyint(4) NOT NULL COMMENT '起始点（0:起始点；1:非起始点）',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4  COMMENT='Job节点表';
-
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Job节点表';
 
 -- ----------------------------
--- Table structure for jm_job_edge
+-- Records of jm_job_node
 -- ----------------------------
-DROP TABLE IF EXISTS `jm_job_edge`;
-CREATE TABLE `jm_job_edge` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `in_node_id` bigint(20) DEFAULT NULL,
-  `out_node_id` bigint(20) DEFAULT NULL,
-  `job_id` bigint(20) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4  COMMENT='Job节点关系表';
-
+BEGIN;
+COMMIT;
 
 -- ----------------------------
--- Table structure for relation
+-- Table structure for job_info
 -- ----------------------------
-DROP TABLE IF EXISTS `relation`;
-CREATE TABLE `relation` (
+DROP TABLE IF EXISTS `job_info`;
+CREATE TABLE `job_info` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `se_id` bigint(20) DEFAULT NULL COMMENT '服务端id（debug时不存在）',
-  `type` varchar(20) COLLATE utf8_unicode_ci NOT NULL COMMENT '（datax,job,task,debug）',
-  `af_id` int(11) NOT NULL COMMENT 'airflow端id',
-  `dag_uuid` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'dag_uuid(仅在debug时存在)',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ;
-
--- ----------------------------
--- Table structure for airflow_job
--- ----------------------------
-DROP TABLE IF EXISTS `airflow_job`;
-CREATE TABLE `airflow_job` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` text COLLATE utf8_unicode_ci,
-  `job_type` int(11) DEFAULT NULL,
-  `tasks` json DEFAULT NULL,
-  `dependence` json DEFAULT NULL,
-  `cron` text COLLATE utf8_unicode_ci NOT NULL,
-  `desc` text COLLATE utf8_unicode_ci NOT NULL,
-  `route_strategy` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `block_strategy` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `executor_timeout` int(11) NOT NULL,
-  `executor_fail_retry_count` int(11) NOT NULL,
-  `trigger_status` int(11) NOT NULL,
-  `trigger_last_time` int(11) DEFAULT NULL,
-  `trigger_next_time` int(11) DEFAULT NULL,
-  `create_time` int(11) DEFAULT NULL,
-  `update_time` int(11) DEFAULT NULL,
-  `user_id` int(11) DEFAULT NULL,
-  `job_mode` int(2) DEFAULT '1',
-  PRIMARY KEY (`id`),
-  KEY `ix_airflow_job_id` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+  `cron_select_type` tinyint(4) NOT NULL COMMENT '周期选择类型',
+  `job_cron` varchar(128) NOT NULL COMMENT '任务执行CRON',
+  `job_desc` varchar(255) NOT NULL,
+  `create_time` int(20) DEFAULT NULL COMMENT '创建时间',
+  `update_time` int(20) DEFAULT NULL COMMENT '更新时间',
+  `user_id` varchar(50) NOT NULL COMMENT '用户ID',
+  `executor_route_strategy` varchar(50) DEFAULT NULL COMMENT '执行器路由策略',
+  `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler',
+  `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数',
+  `executor_block_strategy` varchar(50) DEFAULT NULL COMMENT '阻塞处理策略',
+  `executor_timeout` int(11) NOT NULL DEFAULT '0' COMMENT '任务执行超时时间，单位秒',
+  `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数',
+  `trigger_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '调度状态：0-停止，1-运行',
+  `trigger_last_time` bigint(13) DEFAULT NULL COMMENT '上次调度时间',
+  `trigger_next_time` bigint(13) DEFAULT NULL COMMENT '下次调度时间',
+  `job_json` text CHARACTER SET utf8 COMMENT 'datax运行脚本',
+  `inc_start_time` int(11) DEFAULT NULL COMMENT '增量初始时间',
+  `last_handle_code` int(11) DEFAULT NULL COMMENT '最近一次执行状态',
+  `delete_status` tinyint(4) NOT NULL COMMENT '数据状态：0-无效，1-有效',
+  `replace_param` varchar(50) DEFAULT NULL COMMENT '增量时间',
+  `partition_info` varchar(50) DEFAULT NULL COMMENT '分区信息',
+  `jvm_param` varchar(50) DEFAULT NULL COMMENT 'jvm参数',
+  `last_time` varchar(50) DEFAULT NULL COMMENT '上次时间字段',
+  `current_time` varchar(50) DEFAULT NULL COMMENT '当前时间字段',
+  `project_id` varchar(50) NOT NULL COMMENT '项目id',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
--- Table structure for airflow_run
+-- Records of job_info
 -- ----------------------------
-DROP TABLE IF EXISTS `airflow_run`;
-CREATE TABLE `airflow_run` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `start_time` double DEFAULT NULL,
-  `end_time` float DEFAULT NULL,
-  `job_id` int(11) DEFAULT NULL,
-  `af_run_id` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `status` int(11) DEFAULT NULL,
-  `details` json DEFAULT NULL,
-  `run_ts` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `ix_airflow_run_id` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+BEGIN;
+COMMIT;
 
 -- ----------------------------
--- Table structure for airflow_task
+-- Table structure for job_jdbc_datasource
 -- ----------------------------
-DROP TABLE IF EXISTS `airflow_task`;
-CREATE TABLE `airflow_task` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` text COLLATE utf8_unicode_ci,
-  `task_type` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `file_urls` json DEFAULT NULL,
-  `script` text COLLATE utf8_unicode_ci,
-  `cmd` text COLLATE utf8_unicode_ci,
-  `cmd_parameters` text COLLATE utf8_unicode_ci,
-  `envs` json DEFAULT NULL,
-  `run_image` text COLLATE utf8_unicode_ci,
-  `create_time` int(11) DEFAULT NULL,
-  `update_time` int(11) DEFAULT NULL,
-  `user_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `ix_airflow_task_id` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+DROP TABLE IF EXISTS `job_jdbc_datasource`;
+CREATE TABLE `job_jdbc_datasource` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `datasource_name` varchar(200) NOT NULL COMMENT '数据源名称',
+  `datasource` varchar(45) NOT NULL COMMENT '数据源',
+  `datasource_group` varchar(200) DEFAULT 'Default' COMMENT '数据源分组',
+  `database_name` varchar(45) NOT NULL COMMENT '数据库名',
+  `jdbc_username` varchar(100) DEFAULT NULL COMMENT '用户名',
+  `jdbc_password` varchar(200) DEFAULT NULL COMMENT '密码',
+  `jdbc_url` varchar(500) NOT NULL COMMENT 'jdbc url',
+  `jdbc_driver_class` varchar(200) DEFAULT NULL COMMENT 'jdbc驱动类',
+  `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态：0删除 1启用 2禁用',
+  `create_by` varchar(20) DEFAULT NULL COMMENT '创建人',
+  `create_time` int(20) DEFAULT NULL COMMENT '创建时间',
+  `update_by` varchar(20) DEFAULT NULL COMMENT '更新人',
+  `update_time` int(20) DEFAULT NULL COMMENT '更新时间',
+  `comments` varchar(1000) DEFAULT NULL COMMENT '备注',
+  `tag` varchar(20) DEFAULT NULL COMMENT '标签: 0开发1测试2开发',
+  `kerberos` tinyint(1) NOT NULL COMMENT 'kerberos验证是否开启（0:不开启，1:开启）',
+  `keytab` varchar(200) DEFAULT NULL COMMENT 'keytab文件',
+  `krb5config` varchar(200) DEFAULT NULL COMMENT 'krb5config',
+  `kerberos_service_name` varchar(100) DEFAULT NULL COMMENT 'kerberos_service_name',
+  `principal` varchar(100) DEFAULT NULL COMMENT 'principal',
+  `use_ssl` tinyint(1) DEFAULT NULL COMMENT '是否使用ssl（0:不使用，1:使用）',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='jdbc数据源配置';
 
 -- ----------------------------
--- Alter for data_management
+-- Records of job_jdbc_datasource
 -- ----------------------------
-ALTER TABLE `data_management`
-DROP COLUMN `data_type`,
-DROP COLUMN `data_num`,
-DROP COLUMN `storage_location`,
-DROP COLUMN `storage_usage`,
-DROP COLUMN `storage_path`,
-DROP COLUMN `integrity`,
-ADD COLUMN `table_name` varchar(255) NULL COMMENT '表名' AFTER `name`;
+BEGIN;
+COMMIT;
 
 -- ----------------------------
--- Alter for constant
+-- Table structure for job_log
 -- ----------------------------
-ALTER TABLE `constant`
-MODIFY COLUMN `value` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '常量值' AFTER `type`;
-
+DROP TABLE IF EXISTS `job_log`;
+CREATE TABLE `job_log` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `job_group` int(11) NOT NULL COMMENT '执行器主键ID',
+  `job_id` int(11) NOT NULL COMMENT '任务，主键ID',
+  `executor_address` varchar(255) DEFAULT NULL COMMENT '执行器地址，本次执行的地址',
+  `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler',
+  `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数',
+  `executor_sharding_param` varchar(20) DEFAULT NULL COMMENT '执行器任务分片参数，格式如 1/2',
+  `executor_fail_retry_count` int(11) DEFAULT '0' COMMENT '失败重试次数',
+  `trigger_time` bigint(13) DEFAULT NULL COMMENT '调度-时间',
+  `trigger_code` int(11) NOT NULL COMMENT '调度-结果 0-失败，1-成功，2-无',
+  `trigger_msg` text COMMENT '调度-日志',
+  `handle_time` bigint(13) DEFAULT NULL COMMENT '执行-时间',
+  `handle_code` int(11) NOT NULL COMMENT '执行-状态 0-失败，1-成功，2-无',
+  `handle_msg` text COMMENT '执行-日志',
+  `alarm_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败',
+  `process_id` varchar(20) DEFAULT NULL COMMENT 'datax进程Id',
+  PRIMARY KEY (`id`) USING BTREE,
+  KEY `I_trigger_time` (`trigger_time`) USING BTREE,
+  KEY `I_handle_code` (`handle_code`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
 
 -- ----------------------------
--- Alter for job_jdbc_datasource
+-- Records of job_log
 -- ----------------------------
-ALTER TABLE `job_jdbc_datasource`
-ADD COLUMN `use_ssl` tinyint(1) NULL COMMENT '是否使用ssl（0:不使用，1:使用）' AFTER `principal`;
+BEGIN;
+COMMIT;
 
 -- ----------------------------
--- Alter for jm_job_info
+-- Table structure for programme
 -- ----------------------------
-ALTER TABLE `jm_job_info`
-ADD COLUMN `create_time` int(20) NULL COMMENT '创建时间' AFTER `project_id`,
-ADD COLUMN `update_time` int(20) NULL COMMENT '修改时间' AFTER `create_time`;
+DROP TABLE IF EXISTS `programme`;
+CREATE TABLE `programme` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) NOT NULL COMMENT '名称',
+  `password` varchar(300) NOT NULL COMMENT '密码（暗文）',
+  `workspace` varchar(50) NOT NULL COMMENT '挂载目录',
+  `base_url` varchar(50) NOT NULL COMMENT 'api_url',
+  `image` varchar(100) NOT NULL COMMENT '使用镜像',
+  `path` varchar(50) NOT NULL COMMENT '路径',
+  `release_name` varchar(50) NOT NULL COMMENT '名称',
+  `status` tinyint(4) NOT NULL COMMENT '状态',
+  `create_time` int(11) NOT NULL COMMENT '创建时间',
+  `user_id` varchar(50) NOT NULL COMMENT '用户id',
+  `user_name` varchar(50) NOT NULL COMMENT '用户名称',
+  `project_id` varchar(50) NOT NULL COMMENT '项目id',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ----------------------------
--- Alter for data_management
+-- Records of programme
 -- ----------------------------
-ALTER TABLE `data_management`
-ADD COLUMN `af_run_id` varchar(100) NOT NULL COMMENT 'airflow运行id' AFTER `project_id`,
-ADD COLUMN `status` tinyint(4) NOT NULL COMMENT '状态(1:转存中,2:成功,3:失败)' AFTER `af_run_id`;
+BEGIN;
+COMMIT;
 
 -- ----------------------------
 -- Table structure for project
 -- ----------------------------
 DROP TABLE IF EXISTS `project`;
 CREATE TABLE `project` (
-  `id` bigint NOT NULL AUTO_INCREMENT,
-  `name` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '项目名称',
-  `code` varchar(128) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '项目编码',
-  `type` tinyint NOT NULL COMMENT '项目类型（0:算法组；1:普通项目）',
-  `create_time` int NOT NULL COMMENT '创建时间',
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '项目名称',
+  `code` varchar(128) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '项目编码',
+  `type` tinyint(4) NOT NULL COMMENT '项目类型（0:算法组；1:普通项目）',
+  `create_time` int(11) NOT NULL COMMENT '创建时间',
   `project_token` varchar(1000) DEFAULT NULL COMMENT 'project_token',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='项目';
 
 -- ----------------------------
 -- Records of project
 -- ----------------------------
 BEGIN;
-INSERT INTO `project` (`id`, `name`, `code`, `type`, `create_time`, `project_token`) VALUES (1, '算法组', '7c73048c5b4e11ed89a813eaf8148d45', 0, unix_timestamp(), 'eyJhbGciOiJIUzUxMiJ9.eyJwcm9qZWN0X2lkIjoxLCJ0eXBlIjowfQ.gFpw7Sa4chxVusVclsOA5ZBpbSnE2-GMOF6qL8DzPDP0JQ3b6msaaDZAC6EEoCUsR9kCh847BeorK163M2-fzA');
+INSERT INTO `project` (`id`, `name`, `code`, `type`, `create_time`, `project_token`) VALUES (1, '算法组', '7c73048c5b4e11ed89a813eaf8148d45', 0, 1669109848, 'eyJhbGciOiJIUzUxMiJ9.eyJwcm9qZWN0X2lkIjoxLCJ0eXBlIjowfQ.gFpw7Sa4chxVusVclsOA5ZBpbSnE2-GMOF6qL8DzPDP0JQ3b6msaaDZAC6EEoCUsR9kCh847BeorK163M2-fzA');
 COMMIT;
 
 -- ----------------------------
--- Table structure for users
+-- Table structure for project_user_relation
 -- ----------------------------
-DROP TABLE IF EXISTS `users`;
-CREATE TABLE `users` (
-  `id` bigint NOT NULL AUTO_INCREMENT,
-  `name` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '姓名',
-  `code` varchar(128) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '用户编码',
-  `username` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '用户名',
-  `password` varchar(128) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '密码暗文',
-  `create_time` int NOT NULL COMMENT '创建时间',
-  `user_token` varchar(1000) DEFAULT NULL COMMENT 'user_token',
+DROP TABLE IF EXISTS `project_user_relation`;
+CREATE TABLE `project_user_relation` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `user_id` bigint(20) NOT NULL COMMENT '用户id',
+  `project_id` bigint(20) NOT NULL COMMENT '项目id',
+  `role_id` bigint(20) NOT NULL COMMENT '角色id',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目用户';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='项目用户关系';
 
 -- ----------------------------
--- Records of users
+-- Records of project_user_relation
+-- ----------------------------
+BEGIN;
+INSERT INTO `project_user_relation` (`id`, `user_id`, `project_id`, `role_id`) VALUES (1, 1, 1, 1);
+COMMIT;
+
+-- ----------------------------
+-- Table structure for relation
+-- ----------------------------
+DROP TABLE IF EXISTS `relation`;
+CREATE TABLE `relation` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `se_id` bigint(20) DEFAULT NULL COMMENT '服务端id（debug时不存在）',
+  `type` varchar(20) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '（datax,job,task,debug）',
+  `af_id` int(11) NOT NULL COMMENT 'airflow端id',
+  `dag_uuid` varchar(50) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'dag_uuid(仅在debug时存在)',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ----------------------------
+-- Records of relation
 -- ----------------------------
 BEGIN;
-INSERT INTO `users` (`id`, `name`, `code`, `username`, `password`, `create_time`, `user_token`) VALUES (1, 'admin', '42acda425b4f11ed8c18f346385e9a10', 'admin', 'pbkdf2:sha256:150000$LKBvPzSN$8c14ad943aa4ee6863562f5e2194b379036229bd17d5f592c8b812c07a1ece7f', unix_timestamp(), '');
 COMMIT;
 
 -- ----------------------------
@@ -391,11 +470,11 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `roles`;
 CREATE TABLE `roles` (
-  `id` bigint NOT NULL AUTO_INCREMENT,
-  `name` varchar(30) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '角色名',
-  `code` varchar(128) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '角色编码',
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '角色名',
+  `code` varchar(128) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '角色编码',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色';
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COMMENT='角色';
 
 -- ----------------------------
 -- Records of roles
@@ -409,73 +488,25 @@ INSERT INTO `roles` (`id`, `name`, `code`) VALUES (5, '项目成员', '0ce1f4985
 COMMIT;
 
 -- ----------------------------
--- Table structure for project_user_relation
+-- Table structure for users
 -- ----------------------------
-DROP TABLE IF EXISTS `project_user_relation`;
-CREATE TABLE `project_user_relation` (
-  `id` bigint NOT NULL AUTO_INCREMENT,
-  `user_id` bigint NOT NULL COMMENT '用户id',
-  `project_id` bigint NOT NULL COMMENT '项目id',
-  `role_id` bigint NOT NULL COMMENT '角色id',
+DROP TABLE IF EXISTS `users`;
+CREATE TABLE `users` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `name` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '姓名',
+  `code` varchar(128) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '用户编码',
+  `username` varchar(30) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '用户名',
+  `password` varchar(128) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT '密码暗文',
+  `create_time` int(11) NOT NULL COMMENT '创建时间',
+  `user_token` varchar(1000) DEFAULT NULL COMMENT 'user_token',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目用户关系';
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='项目用户';
 
 -- ----------------------------
--- Records of project_user_relation
+-- Records of users
 -- ----------------------------
 BEGIN;
-INSERT INTO `project_user_relation` (`id`, `user_id`, `project_id`, `role_id`) VALUES (1, 1, 1, 1);
+INSERT INTO `users` (`id`, `name`, `code`, `username`, `password`, `create_time`, `user_token`) VALUES (1, 'admin', '42acda425b4f11ed8c18f346385e9a10', 'admin', 'pbkdf2:sha256:150000$LKBvPzSN$8c14ad943aa4ee6863562f5e2194b379036229bd17d5f592c8b812c07a1ece7f', 1669109848, '');
 COMMIT;
 
--- ----------------------------
--- Table structure for data_table
--- ----------------------------
-DROP TABLE IF EXISTS `data_table`;
-CREATE TABLE `data_table` (
-  `id` bigint NOT NULL AUTO_INCREMENT,
-  `database_name` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT NULL COMMENT '库名',
-  `table_name` varchar(100) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL COMMENT '表名',
-  `source` tinyint NOT NULL COMMENT '源（0:数据湖；1:ailab）',
-  `type` tinyint NOT NULL COMMENT '类型（0:被分享；1:自建；2:导入）',
-  `project_id` bigint NOT NULL COMMENT '项目id',
-  `table_path` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL COMMENT 'hdfs的path',
-  `create_time` bigint NOT NULL COMMENT '创建时间',
-  `user_id` bigint NOT NULL COMMENT '创建人、分享人',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='表';
-
--- ----------------------------
--- Alter for job_info
--- ----------------------------
-ALTER TABLE `job_info`
-MODIFY COLUMN `project_id` varchar(50) NOT NULL COMMENT '项目id' AFTER `current_time`;
-
--- ----------------------------
--- Alter for data_table
--- ----------------------------
-ALTER TABLE `data_table`
-MODIFY COLUMN `project_id` varchar(50) NOT NULL COMMENT '项目id' AFTER `type`,
-MODIFY COLUMN `user_id` varchar(50) NOT NULL COMMENT '创建人、分享人' AFTER `create_time`;
-
--- ----------------------------
--- Table structure for programme
--- ----------------------------
-DROP TABLE IF EXISTS `programme`;
-CREATE TABLE `programme` (
-  `id` bigint NOT NULL AUTO_INCREMENT,
-  `name` varchar(50) NOT NULL COMMENT '名称',
-  `password` varchar(300) NOT NULL COMMENT '密码（暗文）',
-  `workspace` varchar(50) NOT NULL COMMENT '挂载目录',
-  `base_url` varchar(50) NOT NULL COMMENT 'api_url',
-  `image` varchar(100) NOT NULL COMMENT '使用镜像',
-  `path` varchar(50) NOT NULL COMMENT '路径',
-  `release_name` varchar(50) NOT NULL COMMENT '名称',
-  `status` tinyint NOT NULL COMMENT '状态',
-  `create_time` int NOT NULL COMMENT '创建时间',
-  `user_id` varchar(50) NOT NULL COMMENT '用户id',
-  `user_name` varchar(50) NOT NULL COMMENT '用户名称',
-  `project_id` varchar(50) NOT NULL COMMENT '项目id',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
-
-SET FOREIGN_KEY_CHECKS = 1;
+SET FOREIGN_KEY_CHECKS = 1;

development.ini

@@ -42,6 +42,7 @@ username = hive
 password = hive
 database_name = default
 kerberos=0
+base_path = /home/sxkj/bigdata/apache-hive-2.3.9-bin/warehouse/
 
 [HIVE_METASTORE]
 uris=thrift://192.168.199.27:9083

idctest.ini

@@ -43,6 +43,7 @@ keytab = assets/test/user.keytab
 krb5config = assets/test/krb5.conf
 kerberos_service_name = hadoop
 principal = ailab@EMR-5XJSY31F
+base_path = /user/hive/warehouse/
 
 
 [HIVE_METASTORE]

production.ini

@@ -43,6 +43,7 @@ keytab = assets/test/user.keytab
 krb5config = assets/test/krb5.conf
 kerberos_service_name = hadoop
 principal = ailab@EMR-5XJSY31F
+base_path = /usr/hive/warehouse/ailab.db/
 
 
 [HIVE_METASTORE]

txtest.ini

@@ -43,6 +43,7 @@ keytab = assets/test/user.keytab
 krb5config = assets/test/krb5.conf
 kerberos_service_name = hadoop
 principal = ailab@EMR-5XJSY31F
+base_path = /usr/hive/warehouse/ailab.db/
 
 
 [HIVE_METASTORE]