This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new a941d0f3a [ISSUE #5073] Fix eventmesh-admin-server createTask response
error (#5074)
a941d0f3a is described below
commit a941d0f3a24f13034d573191a2cf76e3b39687f2
Author: mike_xwm <[email protected]>
AuthorDate: Thu Aug 8 11:23:21 2024 +0800
[ISSUE #5073] Fix eventmesh-admin-server createTask response error (#5074)
* [ISSUE #5073] Fix eventmesh-admin-server createTask response error
* udpate eventmesh.sql
---
eventmesh-admin-server/conf/eventmesh.sql | 112 ++++++++++-----------
.../eventmesh/admin/server/web/HttpServer.java | 6 +-
.../eventmesh/admin/server/web/Response.java | 7 ++
3 files changed, 66 insertions(+), 59 deletions(-)
diff --git a/eventmesh-admin-server/conf/eventmesh.sql
b/eventmesh-admin-server/conf/eventmesh.sql
index bdad02a8d..986320570 100644
--- a/eventmesh-admin-server/conf/eventmesh.sql
+++ b/eventmesh-admin-server/conf/eventmesh.sql
@@ -17,134 +17,134 @@
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET NAMES utf8 */;
-/*!50503 SET NAMES utf8mb4 */;
+/*!50503 SET NAMES utf8 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS,
FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-- export eventmesh database
-CREATE DATABASE IF NOT EXISTS `eventmesh` /*!40100 DEFAULT CHARACTER SET
utf8mb4 COLLATE utf8mb4_general_ci */ /*!80016 DEFAULT ENCRYPTION='N' */;
+CREATE DATABASE IF NOT EXISTS `eventmesh` /*!40100 DEFAULT CHARACTER SET utf8
COLLATE utf8_bin */ /*!80016 DEFAULT ENCRYPTION='N' */;
USE `eventmesh`;
-- export table eventmesh.event_mesh_data_source structure
CREATE TABLE IF NOT EXISTS `event_mesh_data_source` (
`id` int unsigned NOT NULL AUTO_INCREMENT,
- `dataType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
- `description` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci
DEFAULT NULL,
- `configuration` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
NULL,
- `configurationClass` varchar(200) CHARACTER SET utf8mb4 COLLATE
utf8mb4_general_ci NOT NULL DEFAULT '',
- `region` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `createUid` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
- `updateUid` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+ `dataType` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '',
+ `description` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `configuration` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ `configurationClass` varchar(200) CHARACTER SET utf8 COLLATE utf8_bin NOT
NULL DEFAULT '',
+ `region` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `createUid` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '',
+ `updateUid` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP,
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-- export table eventmesh.event_mesh_job_info structure
CREATE TABLE IF NOT EXISTS `event_mesh_job_info` (
`id` int unsigned NOT NULL AUTO_INCREMENT,
- `jobID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
NULL,
- `jobDesc` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `taskID` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
- `transportType` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+ `jobID` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ `jobDesc` varchar(50) COLLATE utf8_bin NOT NULL,
+ `taskID` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '',
+ `transportType` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '',
`sourceData` int NOT NULL DEFAULT '0',
`targetData` int NOT NULL DEFAULT '0',
- `jobState` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
NULL DEFAULT '',
- `jobType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
NULL DEFAULT '',
- `fromRegion` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `runningRegion` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `createUid` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `updateUid` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `jobState` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT
'',
+ `jobType` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT
'',
+ `fromRegion` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `runningRegion` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `createUid` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `updateUid` varchar(50) COLLATE utf8_bin DEFAULT NULL,
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP,
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `jobID` (`jobID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-- export table eventmesh.event_mesh_mysql_position structure
CREATE TABLE IF NOT EXISTS `event_mesh_mysql_position` (
`id` int unsigned NOT NULL AUTO_INCREMENT,
- `jobID` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
- `serverUUID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci
DEFAULT NULL,
- `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
NULL,
+ `jobID` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '',
+ `serverUUID` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `address` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`position` bigint DEFAULT NULL,
- `gtid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT
NULL,
- `currentGtid` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci
DEFAULT NULL,
+ `gtid` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+ `currentGtid` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`timestamp` bigint DEFAULT NULL,
- `journalName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci
DEFAULT NULL,
+ `journalName` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `jobID` (`jobID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC;
-- export table eventmesh.event_mesh_position_reporter_history structure
CREATE TABLE IF NOT EXISTS `event_mesh_position_reporter_history` (
`id` bigint NOT NULL AUTO_INCREMENT,
- `job` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
- `record` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
- `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
NULL DEFAULT '',
+ `job` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '',
+ `record` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ `address` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT
'',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
KEY `job` (`job`),
KEY `address` (`address`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
COMMENT='record position reporter changes';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='record position
reporter changes';
-- export table eventmesh.event_mesh_runtime_heartbeat structure
CREATE TABLE IF NOT EXISTS `event_mesh_runtime_heartbeat` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
- `adminAddr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
NULL,
- `runtimeAddr` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci
NOT NULL,
- `jobID` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `reportTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci
NOT NULL COMMENT 'runtime local report time',
+ `adminAddr` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ `runtimeAddr` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ `jobID` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `reportTime` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
COMMENT 'runtime local report time',
`updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP,
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
UNIQUE KEY `runtimeAddr` (`runtimeAddr`),
KEY `jobID` (`jobID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-- export table eventmesh.event_mesh_runtime_history structure
CREATE TABLE IF NOT EXISTS `event_mesh_runtime_history` (
`id` bigint NOT NULL AUTO_INCREMENT,
- `job` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
- `address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
NULL DEFAULT '',
+ `job` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '',
+ `address` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT
'',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`),
KEY `address` (`address`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci
ROW_FORMAT=DYNAMIC COMMENT='record runtime task change history';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC
COMMENT='record runtime task change history';
-- export table eventmesh.event_mesh_task_info structure
CREATE TABLE IF NOT EXISTS `event_mesh_task_info` (
`id` int unsigned NOT NULL AUTO_INCREMENT,
- `taskID` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `taskName` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT
NULL,
- `taskDesc` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
- `taskState` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT ''
COMMENT 'taskstate',
- `sourceRegion` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `targetRegion` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `createUid` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
- `updateUid` varchar(50) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '',
+ `taskID` varchar(50) COLLATE utf8_bin NOT NULL,
+ `taskName` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+ `taskDesc` varchar(50) COLLATE utf8_bin NOT NULL,
+ `taskState` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT
'taskstate',
+ `sourceRegion` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `targetRegion` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `createUid` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '',
+ `updateUid` varchar(50) COLLATE utf8_bin NOT NULL DEFAULT '',
`createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`updateTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP,
PRIMARY KEY (`id`) USING BTREE,
UNIQUE KEY `taskID` (`taskID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
-- export table eventmesh.event_mesh_verify structure
CREATE TABLE IF NOT EXISTS `event_mesh_verify` (
`id` int unsigned NOT NULL AUTO_INCREMENT,
- `taskID` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `recordID` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `recordSig` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `connectorName` varchar(200) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `connectorStage` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL,
- `position` text COLLATE utf8mb4_general_ci DEFAULT NULL,
+ `taskID` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `recordID` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `recordSig` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `connectorName` varchar(200) COLLATE utf8_bin DEFAULT NULL,
+ `connectorStage` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+ `position` text COLLATE utf8_bin DEFAULT NULL,
`createTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
/*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
/*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;
diff --git
a/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/HttpServer.java
b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/HttpServer.java
index a5daac881..b79ac5ae8 100644
---
a/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/HttpServer.java
+++
b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/HttpServer.java
@@ -19,6 +19,7 @@ package org.apache.eventmesh.admin.server.web;
import org.apache.eventmesh.admin.server.web.service.task.TaskBizService;
import org.apache.eventmesh.common.remote.request.CreateTaskRequest;
+import org.apache.eventmesh.common.utils.JsonUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -27,18 +28,17 @@ import
org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
-import com.alibaba.druid.support.json.JSONUtils;
-
@RestController
@RequestMapping("/eventmesh/admin")
public class HttpServer {
+
@Autowired
private TaskBizService taskService;
@RequestMapping(value = "/createTask", method = RequestMethod.POST)
public ResponseEntity<Object> createOrUpdateTask(@RequestBody
CreateTaskRequest task) {
String uuid = taskService.createTask(task);
- return
ResponseEntity.ok(JSONUtils.toJSONString(Response.success(uuid)));
+ return
ResponseEntity.ok(JsonUtils.toJSONString(Response.success(uuid)));
}
public boolean deleteTask(Long id) {
diff --git
a/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/Response.java
b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/Response.java
index 329a00baa..d573c3bac 100644
---
a/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/Response.java
+++
b/eventmesh-admin-server/src/main/java/org/apache/eventmesh/admin/server/web/Response.java
@@ -19,8 +19,15 @@ package org.apache.eventmesh.admin.server.web;
import org.apache.eventmesh.common.remote.exception.ErrorCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
public class Response<T> {
+
private int code;
+
private boolean success;
private String desc;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
