Browse Source

update readme.md

Zhang Li 2 years ago
parent
commit
99804158b2
3 changed files with 71 additions and 2 deletions
  1. 4 2
      Makefile
  2. 13 0
      README.md
  3. 54 0
      data/data.sql

+ 4 - 2
Makefile

@@ -4,6 +4,8 @@ BUILD_TIME      := $(shell date "+%F %T")
 COMMIT_SHA1     := $(shell git rev-parse HEAD)
 AUTHOR          := $(shell git show -s --format='%an')
 REMOTE_WORKSPACE=/home/sxwl1070/zhangli/bigdata/datax-admin
+USER=sxwl1070
+HOST=192.168.199.107
 
 .PHONY: image publish
 
@@ -17,8 +19,8 @@ publish:
 pull:
 	@docker pull registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):$(VERSION)
 
-deploy: pull
+deploy: image
 	@docker-compose down  && docker-compose up -d
 
 remote:
-	@ssh -t sxwl1070@192.168.199.107 "cd $(REMOTE_WORKSPACE); make deploy"
+	@ssh -t $(USER)@$(HOST) "cd $(REMOTE_WORKSPACE); make deploy"

+ 13 - 0
README.md

@@ -14,3 +14,16 @@ conda env create environment.yml
 conda activate py38
 python run.py
 ```
+
+## 部署
+
+```shell
+# 打包镜像
+make image
+
+# 打包镜像 + 用docker-compose启动容器
+make deploy
+
+# 在远程服务器的 REMOTE_WORKSPACE 下部署
+make remote
+```

+ 54 - 0
data/data.sql

@@ -0,0 +1,54 @@
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for job_jdbc_datasource
+-- ----------------------------
+DROP TABLE IF EXISTS `job_jdbc_datasource`;
+CREATE TABLE `job_jdbc_datasource`  (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '自增主键',
+  `datasource_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据源名称',
+	`datasource` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据源',
+  `datasource_group` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'Default' COMMENT '数据源分组',
+	`database_name` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '数据库名',
+  `jdbc_username` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  COMMENT '用户名',
+  `jdbc_password` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '密码',
+  `jdbc_url` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'jdbc url',
+  `jdbc_driver_class` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'jdbc驱动类',
+  `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态:0删除 1启用 2禁用',
+  `create_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` int(20) NULL COMMENT '创建时间',
+  `update_by` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人',
+  `update_time` int(20) NULL COMMENT '更新时间',
+  `comments` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'jdbc数据源配置' ROW_FORMAT = Dynamic;
+
+
+
+-- ----------------------------
+-- Table structure for job_info
+-- ----------------------------
+DROP TABLE IF EXISTS `job_info`;
+CREATE TABLE `job_info`  (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `job_cron` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '任务执行CRON',
+  `job_desc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `create_time` int(20) NULL COMMENT '创建时间',
+  `update_time` int(20) NULL COMMENT '更新时间',
+  `user_id` int(10) NULL  DEFAULT NULL COMMENT '用户ID',
+  `executor_route_strategy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行器路由策略',
+  `executor_handler` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行器任务handler',
+  `executor_param` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行器任务参数',
+  `executor_block_strategy` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL 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) NULL  COMMENT '上次调度时间',
+  `trigger_next_time` bigint(13) NULL  COMMENT '下次调度时间',
+  `job_json` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'datax运行脚本',
+  `inc_start_time` int(11) NULL COMMENT '增量初始时间',
+  `last_handle_code` int(11) NULL COMMENT '最近一次执行状态',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;