[hotfix] baseapi bug fixed (#673)
* [hotfix] baseapi bug fixed
diff --git a/streamx-console/streamx-console-service/src/assembly/script/final/v1.2.1.sql b/streamx-console/streamx-console-service/src/assembly/script/final/v1.2.1.sql
index 01bc424..520585b 100644
--- a/streamx-console/streamx-console-service/src/assembly/script/final/v1.2.1.sql
+++ b/streamx-console/streamx-console-service/src/assembly/script/final/v1.2.1.sql
@@ -16,7 +16,7 @@
`DESCRIPTION` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
`CREATE_TIME` datetime DEFAULT NULL,
PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_app_backup
@@ -37,7 +37,7 @@
PRIMARY KEY (`ID`) USING BTREE,
KEY `INX_TIME` (`TIMELINE`),
KEY `INX_APPID` (`APP_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_flame_graph
@@ -105,7 +105,7 @@
KEY `INX_STATE` (`STATE`) USING BTREE,
KEY `INX_JOB_TYPE` (`JOB_TYPE`) USING BTREE,
KEY `INX_TRACK` (`TRACKING`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_flink_app
@@ -127,7 +127,7 @@
`CONTENT` text COLLATE utf8mb4_general_ci NOT NULL,
`CREATE_TIME` datetime DEFAULT NULL,
PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_flink_config
@@ -147,13 +147,13 @@
`CREATE_TIME` datetime DEFAULT NULL,
PRIMARY KEY (`ID`) USING BTREE,
UNIQUE KEY `UN_INX` (`APP_ID`,`TARGET_TYPE`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1401710007468171266 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_flink_effective
-- ----------------------------
BEGIN;
-INSERT INTO `t_flink_effective` VALUES (1401710007468171265, 1401710007170375681, 2, 1401710007208124417, NOW());
+INSERT INTO `t_flink_effective` VALUES (1, 1, 2, 1, NOW());
COMMIT;
-- ----------------------------
@@ -172,7 +172,7 @@
`CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
PRIMARY KEY (`ID`) USING BTREE,
UNIQUE KEY `UN_NAME` (`FLINK_NAME`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_flink_env
@@ -192,7 +192,7 @@
`EXCEPTION` text COLLATE utf8mb4_general_ci,
`START_TIME` datetime DEFAULT NULL,
PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_flink_log
@@ -219,7 +219,7 @@
`DESCRIPTION` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
`BUILDSTATE` tinyint DEFAULT '-1',
PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_flink_project
@@ -241,7 +241,7 @@
`TRIGGER_TIME` datetime DEFAULT NULL,
`CREATE_TIME` datetime DEFAULT NULL,
PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_flink_savepoint
@@ -262,13 +262,13 @@
`CANDIDATE` tinyint NOT NULL DEFAULT '0',
`CREATE_TIME` datetime DEFAULT NULL,
PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_flink_sql
-- ----------------------------
BEGIN;
-INSERT INTO `t_flink_sql` VALUES (1401710007208124417, 1401710007170375681, 'eNqlUUtPhDAQvu+vmFs1AYIHT5s94AaVqGxSSPZIKgxrY2mxrdGfb4GS3c0+LnJo6Mz36syapkmZQpk8vKbQMMt2KOFmAe5rK4Nf3yhrhCwvA1/TTDaqO61UxmooSprlT1PDGkgKEKpmwvIOjWVdP3W2zpG+JfQFHjfU46xxrVvYZuWztye1khJrqzSBFRCfjUwSYQiqt1xJJvyPcbWJp9WPCXvUoUEn0ZAVufcs0nIUjYn2L4s++YiY75eBLr+2Dnl3GYKTWRyfQKYRRR2XZxXmNvu9yh9GHAmUO/sxyMRkGNly4c714RZ7zaWtLHsX+N9NjvVrWxm99jmyvEhpOUhujmIYFI5zkCOYzYIj11a7QH7Tyz+nE8bw', NULL, 1, 0, NOW());
+INSERT INTO `t_flink_sql` VALUES (1, 1, 'eNqlUUtPhDAQvu+vmFs1AYIHT5s94AaVqGxSSPZIKgxrY2mxrdGfb4GS3c0+LnJo6Mz36syapkmZQpk8vKbQMMt2KOFmAe5rK4Nf3yhrhCwvA1/TTDaqO61UxmooSprlT1PDGkgKEKpmwvIOjWVdP3W2zpG+JfQFHjfU46xxrVvYZuWztye1khJrqzSBFRCfjUwSYQiqt1xJJvyPcbWJp9WPCXvUoUEn0ZAVufcs0nIUjYn2L4s++YiY75eBLr+2Dnl3GYKTWRyfQKYRRR2XZxXmNvu9yh9GHAmUO/sxyMRkGNly4c714RZ7zaWtLHsX+N9NjvVrWxm99jmyvEhpOUhujmIYFI5zkCOYzYIj11a7QH7Tyz+nE8bw', NULL, 1, 0, NOW());
COMMIT;
-- ----------------------------
@@ -282,7 +282,7 @@
`CONTENT` text COLLATE utf8mb4_general_ci,
`CREATE_TIME` datetime DEFAULT NULL,
PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_flink_tutorial
@@ -309,7 +309,7 @@
`CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
`MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
PRIMARY KEY (`MENU_ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_menu
@@ -369,7 +369,7 @@
`CREATE_TIME` datetime DEFAULT NULL,
PRIMARY KEY (`ID`) USING BTREE,
KEY `INX_USER_ID` (`USER_ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_message
@@ -389,7 +389,7 @@
`MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
`ROLE_CODE` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '角色标识',
PRIMARY KEY (`ROLE_ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_role
@@ -409,7 +409,7 @@
`MENU_ID` bigint NOT NULL,
PRIMARY KEY (`ID`) USING BTREE,
UNIQUE KEY `UN_INX` (`ROLE_ID`,`MENU_ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_role_menu
@@ -484,23 +484,23 @@
`DESCRIPTION` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL,
`TYPE` tinyint NOT NULL COMMENT '1: input 2: boolean 3: number',
PRIMARY KEY (`KEY`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_setting
-- ----------------------------
BEGIN;
-INSERT INTO `t_setting` VALUES (5, 'alert.email.from', NULL, 'Alert Email From', '发送告警的邮箱', 1);
-INSERT INTO `t_setting` VALUES (3, 'alert.email.host', NULL, 'Alert Email Smtp Host', '告警邮箱Smtp Host', 1);
-INSERT INTO `t_setting` VALUES (7, 'alert.email.password', NULL, 'Alert Email Password', '用来发送告警邮箱的认证密码', 1);
-INSERT INTO `t_setting` VALUES (4, 'alert.email.port', NULL, 'Alert Email Smtp Port', '告警邮箱的Smtp Port', 1);
-INSERT INTO `t_setting` VALUES (8, 'alert.email.ssl', 'false', 'Alert Email Is SSL', '发送告警的邮箱是否开启SSL', 2);
-INSERT INTO `t_setting` VALUES (6, 'alert.email.userName', NULL, 'Alert Email User', '用来发送告警邮箱的认证用户名', 1);
-INSERT INTO `t_setting` VALUES (9, 'docker.register.address', NULL, 'Docker Register Address', 'Docker容器服务地址', 1);
-INSERT INTO `t_setting` VALUES (11, 'docker.register.password', NULL, 'Docker Register Password', 'Docker容器服务认证密码', 1);
-INSERT INTO `t_setting` VALUES (10, 'docker.register.user', NULL, 'Docker Register User', 'Docker容器服务认证用户名', 1);
INSERT INTO `t_setting` VALUES (1, 'maven.central.repository', NULL, 'Maven Central Repository', 'Maven 私服地址', 1);
INSERT INTO `t_setting` VALUES (2, 'streamx.console.webapp.address', NULL, 'StreamX Webapp address', 'StreamX Console Web 应用程序HTTP URL', 1);
+INSERT INTO `t_setting` VALUES (3, 'alert.email.host', NULL, 'Alert Email Smtp Host', '告警邮箱Smtp Host', 1);
+INSERT INTO `t_setting` VALUES (4, 'alert.email.port', NULL, 'Alert Email Smtp Port', '告警邮箱的Smtp Port', 1);
+INSERT INTO `t_setting` VALUES (5, 'alert.email.from', NULL, 'Alert Email From', '发送告警的邮箱', 1);
+INSERT INTO `t_setting` VALUES (6, 'alert.email.userName', NULL, 'Alert Email User', '用来发送告警邮箱的认证用户名', 1);
+INSERT INTO `t_setting` VALUES (7, 'alert.email.password', NULL, 'Alert Email Password', '用来发送告警邮箱的认证密码', 1);
+INSERT INTO `t_setting` VALUES (8, 'alert.email.ssl', 'false', 'Alert Email Is SSL', '发送告警的邮箱是否开启SSL', 2);
+INSERT INTO `t_setting` VALUES (9, 'docker.register.address', NULL, 'Docker Register Address', 'Docker容器服务地址', 1);
+INSERT INTO `t_setting` VALUES (10, 'docker.register.user', NULL, 'Docker Register User', 'Docker容器服务认证用户名', 1);
+INSERT INTO `t_setting` VALUES (11, 'docker.register.password', NULL, 'Docker Register Password', 'Docker容器服务认证密码', 1);
COMMIT;
-- ----------------------------
@@ -524,7 +524,7 @@
`DESCRIPTION` varchar(100) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '描述',
PRIMARY KEY (`USER_ID`) USING BTREE,
UNIQUE KEY `UN_USERNAME` (`NICK_NAME`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_user
-- ----------------------------
@@ -542,7 +542,7 @@
`ROLE_ID` bigint DEFAULT NULL COMMENT '角色ID',
PRIMARY KEY (`ID`) USING BTREE,
UNIQUE KEY `UN_INX` (`USER_ID`,`ROLE_ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
-- ----------------------------
-- Records of t_user_role
@@ -567,9 +567,7 @@
`ERROR` TEXT,
`BUILD_RESULT` TEXT,
`UPDATE_TIME` DATETIME
-) ENGINE = InnoDB
- DEFAULT CHARSET = utf8mb4
- COLLATE = utf8mb4_general_ci;
+) ENGINE = InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;
SET FOREIGN_KEY_CHECKS = 1;
diff --git a/streamx-console/streamx-console-service/src/main/resources/application.yml b/streamx-console/streamx-console-service/src/main/resources/application.yml
index 2d655d5..156b84d 100644
--- a/streamx-console/streamx-console-service/src/main/resources/application.yml
+++ b/streamx-console/streamx-console-service/src/main/resources/application.yml
@@ -62,6 +62,8 @@
configuration:
jdbc-type-for-null: null
global-config:
+ db-config:
+ id-type: auto
# 关闭 mybatis-plus的 banner
banner: false
diff --git a/streamx-console/streamx-console-webapp/.env.development b/streamx-console/streamx-console-webapp/.env.development
index a148fd8..cfb9040 100644
--- a/streamx-console/streamx-console-webapp/.env.development
+++ b/streamx-console/streamx-console-webapp/.env.development
@@ -1,2 +1,3 @@
+NODE_ENV = development
VUE_APP_PORT = 10003
VUE_APP_BASE_API = http://localhost:10000
diff --git a/streamx-console/streamx-console-webapp/.env.production b/streamx-console/streamx-console-webapp/.env.production
index 8467104..f0b1008 100644
--- a/streamx-console/streamx-console-webapp/.env.production
+++ b/streamx-console/streamx-console-webapp/.env.production
@@ -1 +1,2 @@
+NODE_ENV = production
VUE_APP_BASE_API = http://localhost:10000
diff --git a/streamx-console/streamx-console-webapp/package.json b/streamx-console/streamx-console-webapp/package.json
index 6b367bd..6996b16 100644
--- a/streamx-console/streamx-console-webapp/package.json
+++ b/streamx-console/streamx-console-webapp/package.json
@@ -3,17 +3,17 @@
"version": "2.0.0",
"private": true,
"scripts": {
- "serve": "vue-cli-service --mode=development serve",
- "build:mix": "vue-cli-service --mode=mixin build",
- "build": "vue-cli-service --mode=production build",
+ "serve": "vue-cli-service serve --mode development",
+ "build:mix": "cross-env VUE_MIXIN=mixin vue-cli-service build",
+ "build": "vue-cli-service build --mode production",
"lint": "vue-cli-service lint",
- "lint:nofix": "vue-cli-service lint --no-fix",
- "postinstall": "opencollective-postinstall"
+ "lint:nofix": "vue-cli-service lint --no-fix"
},
"dependencies": {
"ant-design-vue": "^1.7.8",
"axios": "^0.24.0",
"core-js": "^3.20.0",
+ "cross-env": "^7.0.3",
"dedent": "^0.7.0",
"enquire.js": "^2.1.6",
"github-markdown-css": "^5.1.0",
diff --git a/streamx-console/streamx-console-webapp/src/api/baseUrl.js b/streamx-console/streamx-console-webapp/src/api/baseUrl.js
index c149871..54c60e6 100644
--- a/streamx-console/streamx-console-webapp/src/api/baseUrl.js
+++ b/streamx-console/streamx-console-webapp/src/api/baseUrl.js
@@ -21,11 +21,11 @@
export function baseUrl() {
+ if (process.env.VUE_MIXIN) {
+ return `${location.protocol}//${location.host}`
+ }
let url = ''
switch (process.env.NODE_ENV) {
- case 'mixin':
- url = `'${location.protocol}//${location.host}'`
- break
case 'production':
url = process.env['VUE_APP_BASE_API']
break
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/project/View.vue b/streamx-console/streamx-console-webapp/src/views/flink/project/View.vue
index c4f686e..baad2ec 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/project/View.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/project/View.vue
@@ -489,7 +489,7 @@
}
.operation {
- width: 100px;
+ width: 120px;
}
.ant-tag {
