From 835cc1b4f79039d7e8c10537fa5ba474d6cb105d Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 26 Apr 2021 10:46:05 +0800 Subject: [PATCH] update Former-commit-id: 3b0fe166b2ef7dd238995030e7602ed90b5d04f9 Former-commit-id: 462b03b3aba0535ae308f7677927d90c1039813e --- labs/doris/.env | 3 +- labs/doris/build/0.14.7/docker-compose.yml | 3 +- labs/doris/build/0.14.7/settings.xml | 13 ------ labs/doris/conf/mysql/initdb.d/init.sql | 49 +++++++++++++++++++++- labs/doris/conf/mysql/my.cnf | 2 +- labs/doris/docker-compose.yml | 2 +- labs/doris/init/register-mysql.json | 6 +-- 7 files changed, 57 insertions(+), 21 deletions(-) diff --git a/labs/doris/.env b/labs/doris/.env index fb5c742f..46355f76 100644 --- a/labs/doris/.env +++ b/labs/doris/.env @@ -1 +1,2 @@ -export IP=192.168.100.144 \ No newline at end of file +export IP=192.168.100.144 +export CIDR=192.168.100.0/24 \ No newline at end of file diff --git a/labs/doris/build/0.14.7/docker-compose.yml b/labs/doris/build/0.14.7/docker-compose.yml index 337823cc..fa8b08e2 100644 --- a/labs/doris/build/0.14.7/docker-compose.yml +++ b/labs/doris/build/0.14.7/docker-compose.yml @@ -5,6 +5,7 @@ services: volumes: - ./$SRC.tar.gz:/doris.tar.gz - ./output:/$SRC/output - #- ./settings.xml:/usr/share/maven/conf/settings.xml + - ./settings.xml:/usr/share/maven/conf/settings.xml + - ./.mvn:/$SRC/fe/.mvn command: bash -c "cd / && tar -zxvf doris.tar.gz && cd $SRC && sh build.sh" diff --git a/labs/doris/build/0.14.7/settings.xml b/labs/doris/build/0.14.7/settings.xml index c72976d0..f6716a74 100644 --- a/labs/doris/build/0.14.7/settings.xml +++ b/labs/doris/build/0.14.7/settings.xml @@ -3,18 +3,5 @@ - - aliyunmaven - * - 阿里云公共仓库 - http://mirrors.163.com/maven/repository/maven-public/ - - - maven - * - maven - http://repo1.maven.org/maven2/ - - \ No newline at end of file diff --git a/labs/doris/conf/mysql/initdb.d/init.sql b/labs/doris/conf/mysql/initdb.d/init.sql index 611538be..6ccec089 100644 --- a/labs/doris/conf/mysql/initdb.d/init.sql +++ b/labs/doris/conf/mysql/initdb.d/init.sql @@ -1,4 +1,51 @@ -CREATE DATABASE mydatabase; CREATE USER 'slave'@'%' IDENTIFIED BY 'aA123456!'; GRANT SELECT, RELOAD, SHOW DATABASES, REPLICATION SLAVE, REPLICATION CLIENT ON *.* TO 'slave'@'%'; FLUSH PRIVILEGES; +CREATE DATABASE example; +USE example; + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for User +-- ---------------------------- +DROP TABLE IF EXISTS `User`; +CREATE TABLE `User` ( + `Id` char(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'Id', + `UserName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'UserName', + `SecurityStamp` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT 'SecurityStamp', + `PasswordHash` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT 'PasswordHash', + `PasswordConfirmed` tinyint(1) NOT NULL COMMENT 'PasswordConfirmed', + `Email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'Email', + `EmailConfirmed` tinyint(1) NOT NULL COMMENT 'EmailConfirmed', + `PhoneNumber` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT 'PhoneNumber', + `PhoneNumberConfirmed` tinyint(1) NOT NULL COMMENT 'PhoneNumberConfirmed', + `RealName` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT 'RealName', + `IdentityNumber` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT 'IdentityNumber', + `IdentityConfirmed` tinyint(1) NOT NULL COMMENT 'IdentityConfirmed', + `NickName` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT 'NickName', + `Avatar` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT 'Avatar', + `Sex` int(0) NULL DEFAULT NULL COMMENT 'Sex', + `Birthday` datetime(6) NULL DEFAULT NULL COMMENT 'Birthday', + `LockoutEnabled` tinyint(1) NOT NULL COMMENT 'LockoutEnabled', + `AccessFailedCount` int(0) NOT NULL COMMENT 'AccessFailedCount', + `LockoutEnd` datetime(6) NULL DEFAULT NULL COMMENT 'LockoutEnd', + `RowVersion` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT 'RowVersion', + `Created` datetime(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) COMMENT 'Created', + `Modified` datetime(6) NULL DEFAULT NULL COMMENT 'Modified', + `Deleted` datetime(6) NULL DEFAULT NULL COMMENT 'Deleted', + PRIMARY KEY (`Id`) USING BTREE, + UNIQUE INDEX `IX_User_UserName`(`UserName`) USING BTREE, + UNIQUE INDEX `IX_User_Email`(`Email`) USING BTREE, + UNIQUE INDEX `IX_User_PhoneNumber`(`PhoneNumber`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of User +-- ---------------------------- +INSERT INTO `User` VALUES ('49fa11e7-4404-4fe5-9873-e89a01d8e529', 'super', '123456', '579f889441b4a55d667233941d72a83ed644f7e5', 1, 'super@test.com', 1, NULL, 0, NULL, NULL, 0, '超级管理员', NULL, NULL, NULL, 0, 0, NULL, '1e59e461-af12-446f-b876-eac8f58d3c79', '2021-04-14 05:10:36.611675', NULL, NULL); +INSERT INTO `User` VALUES ('74fab867-a65a-4cda-8b2f-63e12d003b79', 'user', '123456', '71dd07494c5ee54992a27746d547e25dee01bd97', 1, 'user@test.com', 1, NULL, 0, NULL, NULL, 0, '普通用户', NULL, NULL, NULL, 0, 0, NULL, '2b691577-e96c-40fe-897e-3adc9a4488bf', '2021-04-14 05:10:36.611679', NULL, NULL); +INSERT INTO `User` VALUES ('e6a2e59c-a4e1-4ced-856c-036b6e4786d1', 'admin', '123456', '579f889441b4a55d667233941d72a83ed644f7e5', 1, 'admin@test.com', 1, NULL, 0, NULL, NULL, 0, '管理员', NULL, NULL, NULL, 0, 0, NULL, '7d53094e-569d-4689-a6d1-d2c1f99da85b', '2021-04-14 05:10:36.611663', NULL, NULL); + +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file diff --git a/labs/doris/conf/mysql/my.cnf b/labs/doris/conf/mysql/my.cnf index 934745bd..61dfb90b 100644 --- a/labs/doris/conf/mysql/my.cnf +++ b/labs/doris/conf/mysql/my.cnf @@ -11,4 +11,4 @@ server_id=1 log_bin = mysql-bin binlog_format = row binlog_row_image = full -expire_logs_days = 10 +expire_logs_days = 30 diff --git a/labs/doris/docker-compose.yml b/labs/doris/docker-compose.yml index 2ccab6c5..f3a35191 100644 --- a/labs/doris/docker-compose.yml +++ b/labs/doris/docker-compose.yml @@ -90,7 +90,7 @@ services: - 9020:9020 - 9030:9030 environment: - - priority_networks=$IP/28 + - priority_networks=$CIDR volumes: - ./apps/DORIS-0.13.15-release-binary/incubator-doris:/doris - ./conf/fe.conf:/doris/fe/conf/fe.conf diff --git a/labs/doris/init/register-mysql.json b/labs/doris/init/register-mysql.json index b8acc154..8f761115 100644 --- a/labs/doris/init/register-mysql.json +++ b/labs/doris/init/register-mysql.json @@ -8,9 +8,9 @@ "database.user": "slave", "database.password": "aA123456!", "database.server.id": "1", - "database.server.name": "dbserver1", - "database.include": "iotcenter", + "database.server.name": "server1", + "database.include": "example", "database.history.kafka.bootstrap.servers": "kafka:9092", - "database.history.kafka.topic": "schema-changes.iotcenter" + "database.history.kafka.topic": "schema-changes.example" } } \ No newline at end of file