[BUG][API] the interface of 'authed project' is missed (#6136)
* fix bug: auth project and auth datasource error. * fix bug: cannot save process definition if environment_code is null;
This commit is contained in:
OS
GitHub
parent
9d7f70bca7
commit
edb8f3c435
|
|
@ -94,7 +94,6 @@ public class DataSourceController extends BaseController {
|
|||
return dataSourceService.createDataSource(loginUser, dataSourceParam);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* updateProcessInstance data source
|
||||
*
|
||||
|
|
@ -277,7 +276,6 @@ public class DataSourceController extends BaseController {
|
|||
return dataSourceService.verifyDataSourceName(name);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* unauthorized datasource
|
||||
*
|
||||
|
|
@ -289,7 +287,7 @@ public class DataSourceController extends BaseController {
|
|||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "userId", value = "USER_ID", required = true, dataType = "Int", example = "100")
|
||||
})
|
||||
@GetMapping(value = "/unauth")
|
||||
@GetMapping(value = "/unauth-datasource")
|
||||
@ResponseStatus(HttpStatus.OK)
|
||||
@ApiException(UNAUTHORIZED_DATASOURCE)
|
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
|
||||
|
|
@ -300,7 +298,6 @@ public class DataSourceController extends BaseController {
|
|||
return returnDataList(result);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* authorized datasource
|
||||
*
|
||||
|
|
@ -312,7 +309,7 @@ public class DataSourceController extends BaseController {
|
|||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "userId", value = "USER_ID", required = true, dataType = "Int", example = "100")
|
||||
})
|
||||
@GetMapping(value = "/authed")
|
||||
@GetMapping(value = "/authed-datasource")
|
||||
@ResponseStatus(HttpStatus.OK)
|
||||
@ApiException(AUTHORIZED_DATA_SOURCE)
|
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ public class ProjectController extends BaseController {
|
|||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "userId", value = "USER_ID", dataType = "Int", example = "100")
|
||||
})
|
||||
@GetMapping(value = "/unauth")
|
||||
@GetMapping(value = "/unauth-project")
|
||||
@ResponseStatus(HttpStatus.OK)
|
||||
@ApiException(QUERY_UNAUTHORIZED_PROJECT_ERROR)
|
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
|
||||
|
|
@ -227,7 +227,7 @@ public class ProjectController extends BaseController {
|
|||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "userId", value = "USER_ID", dataType = "Int", example = "100")
|
||||
})
|
||||
@GetMapping(value = "/authed")
|
||||
@GetMapping(value = "/authed-project")
|
||||
@ResponseStatus(HttpStatus.OK)
|
||||
@ApiException(QUERY_AUTHORIZED_PROJECT)
|
||||
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@ CREATE TABLE `t_ds_command` (
|
|||
`update_time` datetime DEFAULT NULL COMMENT 'update time',
|
||||
`process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority: 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
|
||||
`worker_group` varchar(64) COMMENT 'worker group',
|
||||
`environment_code` bigint(20) NOT NULL COMMENT 'environment code',
|
||||
`environment_code` bigint(20) DEFAULT '-1' COMMENT 'environment code',
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
|
||||
|
||||
|
|
@ -379,7 +379,7 @@ CREATE TABLE `t_ds_error_command` (
|
|||
`update_time` datetime DEFAULT NULL COMMENT 'update time',
|
||||
`process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority, 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
|
||||
`worker_group` varchar(64) COMMENT 'worker group',
|
||||
`environment_code` bigint(20) NOT NULL COMMENT 'environment code',
|
||||
`environment_code` bigint(20) DEFAULT '-1' COMMENT 'environment code',
|
||||
`message` text COMMENT 'message',
|
||||
PRIMARY KEY (`id`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
|
||||
|
|
@ -460,7 +460,7 @@ CREATE TABLE `t_ds_task_definition` (
|
|||
`flag` tinyint(2) DEFAULT NULL COMMENT '0 not available, 1 available',
|
||||
`task_priority` tinyint(4) DEFAULT NULL COMMENT 'job priority',
|
||||
`worker_group` varchar(200) DEFAULT NULL COMMENT 'worker grouping',
|
||||
`environment_code` bigint(20) NOT NULL COMMENT 'environment code',
|
||||
`environment_code` bigint(20) DEFAULT '-1' COMMENT 'environment code',
|
||||
`fail_retry_times` int(11) DEFAULT NULL COMMENT 'number of failed retries',
|
||||
`fail_retry_interval` int(11) DEFAULT NULL COMMENT 'failed retry interval',
|
||||
`timeout_flag` tinyint(2) DEFAULT '0' COMMENT 'timeout flag:0 close, 1 open',
|
||||
|
|
@ -491,7 +491,7 @@ CREATE TABLE `t_ds_task_definition_log` (
|
|||
`flag` tinyint(2) DEFAULT NULL COMMENT '0 not available, 1 available',
|
||||
`task_priority` tinyint(4) DEFAULT NULL COMMENT 'job priority',
|
||||
`worker_group` varchar(200) DEFAULT NULL COMMENT 'worker grouping',
|
||||
`environment_code` bigint(20) NOT NULL COMMENT 'environment code',
|
||||
`environment_code` bigint(20) DEFAULT '-1' COMMENT 'environment code',
|
||||
`fail_retry_times` int(11) DEFAULT NULL COMMENT 'number of failed retries',
|
||||
`fail_retry_interval` int(11) DEFAULT NULL COMMENT 'failed retry interval',
|
||||
`timeout_flag` tinyint(2) DEFAULT '0' COMMENT 'timeout flag:0 close, 1 open',
|
||||
|
|
@ -582,6 +582,7 @@ CREATE TABLE `t_ds_process_instance` (
|
|||
`history_cmd` text COMMENT 'history commands of process instance operation',
|
||||
`process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority. 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
|
||||
`worker_group` varchar(64) DEFAULT NULL COMMENT 'worker group id',
|
||||
`environment_code` bigint(20) DEFAULT '-1' COMMENT 'environment code',
|
||||
`timeout` int(11) DEFAULT '0' COMMENT 'time out',
|
||||
`tenant_id` int(11) NOT NULL DEFAULT '-1' COMMENT 'tenant id',
|
||||
`var_pool` longtext COMMENT 'var_pool',
|
||||
|
|
@ -761,7 +762,7 @@ CREATE TABLE `t_ds_schedules` (
|
|||
`warning_group_id` int(11) DEFAULT NULL COMMENT 'alert group id',
|
||||
`process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority：0 Highest,1 High,2 Medium,3 Low,4 Lowest',
|
||||
`worker_group` varchar(64) DEFAULT '' COMMENT 'worker group id',
|
||||
`environment_code` bigint(20) NOT NULL COMMENT 'environment code',
|
||||
`environment_code` bigint(20) DEFAULT '-1' COMMENT 'environment code',
|
||||
`create_time` datetime NOT NULL COMMENT 'create time',
|
||||
`update_time` datetime NOT NULL COMMENT 'update time',
|
||||
PRIMARY KEY (`id`)
|
||||
|
|
@ -815,7 +816,7 @@ CREATE TABLE `t_ds_task_instance` (
|
|||
`max_retry_times` int(2) DEFAULT NULL COMMENT 'max retry times',
|
||||
`task_instance_priority` int(11) DEFAULT NULL COMMENT 'task instance priority:0 Highest,1 High,2 Medium,3 Low,4 Lowest',
|
||||
`worker_group` varchar(64) DEFAULT NULL COMMENT 'worker group id',
|
||||
`environment_code` bigint(20) NOT NULL COMMENT 'environment code',
|
||||
`environment_code` bigint(20) DEFAULT '-1' COMMENT 'environment code',
|
||||
`environment_config` text DEFAULT '' COMMENT 'this config contains many environment variables config',
|
||||
`executor_id` int(11) DEFAULT NULL,
|
||||
`first_submit_time` datetime DEFAULT NULL COMMENT 'task first submit time',
|
||||
|
|
|
|||
Loading…
Reference in New Issue