From db046647a87d91da9cd122b73a01b8f5d70ce687 Mon Sep 17 00:00:00 2001 From: davidhua Date: Wed, 2 Mar 2022 20:43:47 +0800 Subject: [PATCH 1/4] Resolve job info service and exchangis AppConn problem --- .../service/impl/DefaultJobInfoService.java | 2 +- exchangis-plugins/exchangis-appconn/pom.xml | 17 ++++++----- .../src/main/assembly/distribution.xml | 12 +++++++- .../dss/appconn/constraints/Constraints.java | 4 ++- .../operation/AbstractExchangisOperation.java | 5 ++++ .../src/main/resources/init.sql | 30 +++++++++---------- 6 files changed, 45 insertions(+), 25 deletions(-) diff --git a/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/service/impl/DefaultJobInfoService.java b/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/service/impl/DefaultJobInfoService.java index 71aa872c1..8fcc82225 100644 --- a/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/service/impl/DefaultJobInfoService.java +++ b/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/service/impl/DefaultJobInfoService.java @@ -168,6 +168,7 @@ public ExchangisJobVo updateJobConfig(ExchangisJobVo jobVo) { public ExchangisJobVo updateJobContent(ExchangisJobVo jobVo) throws ExchangisJobServerException, ExchangisDataSourceException { Long jobId = jobVo.getId(); ExchangisJobEntity exchangisJob = this.jobEntityDao.getDetail(jobId); + exchangisJob.setJobContent(jobVo.getContent()); final String engine = exchangisJob.getEngineType(); // 校验是否有重复子任务名 List content = LabelUtils.Jackson.fromJson(exchangisJob.getJobContent(), @@ -193,7 +194,6 @@ public ExchangisJobVo updateJobContent(ExchangisJobVo jobVo) throws ExchangisJob exchangisJob.setModifyUser(jobVo.getModifyUser()); exchangisJob.setLastUpdateTime(jobVo.getModifyTime()); this.exchangisJobDsBindService.updateJobDsBind(jobId, dsBinds); - exchangisJob.setJobContent(jobVo.getContent()); this.jobEntityDao.upgradeContent(exchangisJob); return jobVo; } diff --git a/exchangis-plugins/exchangis-appconn/pom.xml b/exchangis-plugins/exchangis-appconn/pom.xml index e738afdc1..822b4f7e9 100644 --- a/exchangis-plugins/exchangis-appconn/pom.xml +++ b/exchangis-plugins/exchangis-appconn/pom.xml @@ -41,18 +41,15 @@ ${dss.version} - com.webank.wedatasphere.dss - dss-origin-sso-integration-standard - ${dss.version} + org.apache.linkis + linkis-storage + ${linkis.version} + provided linkis-common org.apache.linkis - - json4s-jackson_2.11 - org.json4s - @@ -70,6 +67,12 @@ dss-development-process-standard-execution ${dss.version} + + com.webank.wedatasphere.dss + dss-common + ${dss.version} + provided + diff --git a/exchangis-plugins/exchangis-appconn/src/main/assembly/distribution.xml b/exchangis-plugins/exchangis-appconn/src/main/assembly/distribution.xml index e51825ca8..8383286c3 100644 --- a/exchangis-plugins/exchangis-appconn/src/main/assembly/distribution.xml +++ b/exchangis-plugins/exchangis-appconn/src/main/assembly/distribution.xml @@ -24,7 +24,8 @@ zip - + true + exchangis @@ -59,6 +60,15 @@ conf unix + + ${basedir}/src/main/resources + + init.sql + + 0777 + db + unix + diff --git a/exchangis-plugins/exchangis-appconn/src/main/java/com/webank/wedatasphere/exchangis/dss/appconn/constraints/Constraints.java b/exchangis-plugins/exchangis-appconn/src/main/java/com/webank/wedatasphere/exchangis/dss/appconn/constraints/Constraints.java index b17e6aaf6..a85da4c1d 100644 --- a/exchangis-plugins/exchangis-appconn/src/main/java/com/webank/wedatasphere/exchangis/dss/appconn/constraints/Constraints.java +++ b/exchangis-plugins/exchangis-appconn/src/main/java/com/webank/wedatasphere/exchangis/dss/appconn/constraints/Constraints.java @@ -11,6 +11,8 @@ public class Constraints { // AppConn name public final static String EXCHANGIS_APPCONN_NAME = CommonVars.apply("wds.dss.appconn.exchangis.name", "Exchangis").getValue(); + public final static String API_REQUEST_PREFIX = CommonVars.apply("wds.dss.appconn.exchangis.api.request-prefix", "/api/rest_j/v1/exchangis/dss").getValue(); + public final static String DOMAIN_NAME = CommonVars.apply("wds.dss.appconn.exchangis.domain.name", "DSS").getValue(); // Constraint in Project operation @@ -30,7 +32,7 @@ public class Constraints { // Constraint in Ref operation public final static String REF_JOB_DESC = "desc"; public final static String REF_JOB_ID = "id"; - public final static String REF_JUMP_URL_FORMAT = "dss/exchangis/#/childJobManagement"; + public final static String REF_JUMP_URL_FORMAT = CommonVars.apply("wds.dss.appconn.exchangis.ref.jump","#/childJobManagement").getValue(); } diff --git a/exchangis-plugins/exchangis-appconn/src/main/java/com/webank/wedatasphere/exchangis/dss/appconn/operation/AbstractExchangisOperation.java b/exchangis-plugins/exchangis-appconn/src/main/java/com/webank/wedatasphere/exchangis/dss/appconn/operation/AbstractExchangisOperation.java index ed563608a..40ae4d387 100644 --- a/exchangis-plugins/exchangis-appconn/src/main/java/com/webank/wedatasphere/exchangis/dss/appconn/operation/AbstractExchangisOperation.java +++ b/exchangis-plugins/exchangis-appconn/src/main/java/com/webank/wedatasphere/exchangis/dss/appconn/operation/AbstractExchangisOperation.java @@ -23,6 +23,8 @@ import java.util.function.Function; import java.util.function.Supplier; +import static com.webank.wedatasphere.exchangis.dss.appconn.constraints.Constraints.API_REQUEST_PREFIX; + /** * Abstract implement, contains the method to create sso request */ @@ -63,6 +65,9 @@ protected void setSSORequestService(AppIntegrationService app this.ssoRequestService = appIntegrationService.getSSORequestService(); // Also upgrade the base url this.baseURL = appIntegrationService.getAppInstance().getBaseUrl(); + // Append the api prefix + this.baseURL = this.baseURL.endsWith(IOUtils.DIR_SEPARATOR_UNIX + "")? + baseURL + API_REQUEST_PREFIX: baseURL + IOUtils.DIR_SEPARATOR_UNIX + API_REQUEST_PREFIX; this.redirectUrl = String.valueOf(appIntegrationService.getAppInstance().getConfig().get("redirectUrl")); } } diff --git a/exchangis-plugins/exchangis-appconn/src/main/resources/init.sql b/exchangis-plugins/exchangis-appconn/src/main/resources/init.sql index 5430367d5..db228dcc2 100644 --- a/exchangis-plugins/exchangis-appconn/src/main/resources/init.sql +++ b/exchangis-plugins/exchangis-appconn/src/main/resources/init.sql @@ -3,7 +3,7 @@ delete from `dss_application` WHERE `name` ='exchangis'; INSERT INTO `dss_application`(`name`,`url`,`is_user_need_init`,`level`,`user_init_url`,`exists_project_service`,`project_url`,`enhance_json`,`if_iframe`,`homepage_url`,`redirect_url`) VALUES ('exchangis','',0,1,NULL,0,'','{\"watermark\":false,\"rsDownload\":true}',1,'',NULL); UPDATE `dss_application` SET url = 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT' WHERE `name` ='exchangis'; -UPDATE `dss_application` SET project_url = 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/dss/exchangis/',homepage_url = 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/dss/exchangis/' WHERE `name` in('exchangis'); +UPDATE `dss_application` SET project_url = 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/#/projectManage',homepage_url = 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/#/projectManage' WHERE `name` in('exchangis'); select @dss_exchangis_applicationId:=id from `dss_application` WHERE `name` ='exchangis'; @@ -15,22 +15,22 @@ INSERT INTO `dss_onestop_menu_application` (`application_id`, `onestop_menu_id` delete from `dss_appconn` where `appconn_name`='exchangis'; -INSERT INTO `dss_appconn` (`appconn_name`, `is_user_need_init`, `level`, `if_iframe`, `is_external`, `reference`, `class_name`, `appconn_class_path`, `resource`) VALUES ('exchangis', 0, 1, NULL, 0, NULL, 'com.webank.wedatasphere.exchangis.appconn.ExchangisAppConn', 'DSS_INSTALL_HOME_VAL/dss-appconns/exchangis/lib', ''); +INSERT INTO `dss_appconn` (`appconn_name`, `is_user_need_init`, `level`, `if_iframe`, `is_external`, `reference`, `class_name`, `appconn_class_path`, `resource`) VALUES ('exchangis', 0, 1, NULL, 0, NULL, 'com.webank.wedatasphere.exchangis.dss.appconn.ExchangisAppConn', 'DSS_INSTALL_HOME_VAL/dss-appconns/exchangis/lib', ''); select @dss_appconn_exchangisId:=id from `dss_appconn` where `appconn_name` = 'exchangis'; delete from `dss_appconn_instance` where `homepage_url` like '%exchangis%'; -INSERT INTO `dss_appconn_instance` (`appconn_id`, `label`, `url`, `enhance_json`, `homepage_url`, `redirect_url`) VALUES (@dss_appconn_exchangisId, 'DEV', 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/', '', 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/dss/exchangis/', 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/'); +INSERT INTO `dss_appconn_instance` (`appconn_id`, `label`, `url`, `enhance_json`, `homepage_url`, `redirect_url`) VALUES (@dss_appconn_exchangisId, 'DEV', 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/', '', 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/#/projectManage', 'http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/'); delete from `dss_workflow_node` where `node_type` like '%exchangis%'; -insert into `dss_workflow_node` (`name`, `appconn_name`, `node_type`, `jump_url`, `support_jump`, `submit_to_scheduler`, `enable_copy`, `should_creation_before_node`, `icon`) values('sqoop','exchangis','wds.dss.appconn.exchangis.sqoop','http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/dss/exchangis/#/childJobManagement','1','1','0','1',''); -insert into `dss_workflow_node` (`name`, `appconn_name`, `node_type`, `jump_url`, `support_jump`, `submit_to_scheduler`, `enable_copy`, `should_creation_before_node`, `icon`) values('datax','exchangis','wds.dss.appconn.exchangis.datax','http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/dss/exchangis/#/childJobManagement','1','1','0','1',''); +insert into `dss_workflow_node` (`name`, `appconn_name`, `node_type`, `jump_url`, `support_jump`, `submit_to_scheduler`, `enable_copy`, `should_creation_before_node`, `icon`) values('sqoop','exchangis','linkis.appconn.exchangis.sqoop','http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/#/childJobManagement','1','1','0','1',''); +-- insert into `dss_workflow_node` (`name`, `appconn_name`, `node_type`, `jump_url`, `support_jump`, `submit_to_scheduler`, `enable_copy`, `should_creation_before_node`, `icon`) values('datax','exchangis','linkis.appconn.exchangis.datax','http://APPCONN_INSTALL_IP:APPCONN_INSTALL_PORT/dss/exchangis/#/childJobManagement','1','1','0','1',''); -select @dss_exchangis_sqoopId:=id from `dss_workflow_node` where `node_type` = 'wds.dss.appconn.exchangis.sqoop'; -select @dss_exchangis_dataxId:=id from `dss_workflow_node` where `node_type` = 'wds.dss.appconn.exchangis.datax'; +select @dss_exchangis_sqoopId:=id from `dss_workflow_node` where `node_type` = 'linkis.appconn.exchangis.sqoop'; +-- select @dss_exchangis_dataxId:=id from `dss_workflow_node` where `node_type` = 'linkis.appconn.exchangis.datax'; delete from `dss_workflow_node_to_group` where `node_id`=@dss_exchangis_sqoopId; @@ -41,11 +41,11 @@ delete from `dss_workflow_node_to_ui` where `workflow_node_id`=@dss_exchangis_sq delete from `dss_workflow_node_to_ui` where `workflow_node_id`=@dss_exchangis_dataxId; -select @dss_exchangis_sqoopId:=id from `dss_workflow_node` where `node_type` = 'wds.dss.appconn.exchangis.sqoop'; -select @dss_exchangis_dataxId:=id from `dss_workflow_node` where `node_type` = 'wds.dss.appconn.exchangis.datax'; +select @dss_exchangis_sqoopId:=id from `dss_workflow_node` where `node_type` = 'linkis.appconn.exchangis.sqoop'; +-- select @dss_exchangis_dataxId:=id from `dss_workflow_node` where `node_type` = 'linkis.appconn.exchangis.datax'; INSERT INTO `dss_workflow_node_to_group`(`node_id`,`group_id`) values (@dss_exchangis_sqoopId,1); -INSERT INTO `dss_workflow_node_to_group`(`node_id`,`group_id`) values (@dss_exchangis_dataxId,1); +-- INSERT INTO `dss_workflow_node_to_group`(`node_id`,`group_id`) values (@dss_exchangis_dataxId,1); INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_sqoopId,1); @@ -55,11 +55,11 @@ INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_e INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_sqoopId,5); -INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_dataxId,1); -INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_dataxId,2); -INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_dataxId,3); -INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_dataxId,4); -INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_dataxId,5); +-- INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_dataxId,1); +-- INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_dataxId,2); +-- INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_dataxId,3); +-- INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_dataxId,4); +-- INSERT INTO `dss_workflow_node_to_ui`(`workflow_node_id`,`ui_id`) values (@dss_exchangis_dataxId,5); From bb7c2e48d1e053cfd256e149f740638a33201532 Mon Sep 17 00:00:00 2001 From: davidhua Date: Wed, 2 Mar 2022 21:19:56 +0800 Subject: [PATCH 2/4] Add update/delete rule in ExchangisProjectRestfulApi --- .../server/restful/ExchangisProjectRestfulApi.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/restful/ExchangisProjectRestfulApi.java b/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/restful/ExchangisProjectRestfulApi.java index 088ac426b..98c963487 100644 --- a/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/restful/ExchangisProjectRestfulApi.java +++ b/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/restful/ExchangisProjectRestfulApi.java @@ -3,10 +3,12 @@ import com.webank.wedatasphere.exchangis.common.pager.PageResult; import com.webank.wedatasphere.exchangis.common.validator.groups.UpdateGroup; +import com.webank.wedatasphere.exchangis.project.server.entity.ExchangisProject; import com.webank.wedatasphere.exchangis.project.server.service.ProjectService; import com.webank.wedatasphere.exchangis.project.server.utils.ExchangisProjectRestfulUtils; import com.webank.wedatasphere.exchangis.project.server.vo.ExchangisProjectInfo; import com.webank.wedatasphere.exchangis.project.server.vo.ProjectQueryVo; +import org.apache.commons.lang.StringUtils; import org.apache.commons.math3.util.Pair; import org.apache.linkis.common.utils.JsonUtils; import org.apache.linkis.server.Message; @@ -140,6 +142,11 @@ public Message updateProject(@Validated({UpdateGroup.class, Default.class}) @Req if (!hasAuthority(username, projectStored)){ return Message.error("You have no permission to update (没有项目的更新权限)"); } + String domain = projectStored.getDomain(); + if (StringUtils.isNotBlank(domain) && !ExchangisProject.Domain.STANDALONE.name() + .equalsIgnoreCase(domain)){ + return Message.error("Cannot update the outer project (无法更新来自 " + domain + " 的外部项目)"); + } LOG.info("UpdateProject vo: {}, userName: {}", JsonUtils.jackson().writeValueAsString(projectVo), username); projectService.updateProject(projectVo, username); return ExchangisProjectRestfulUtils.dealOk("更新工程成功", @@ -165,6 +172,11 @@ public Message deleteProject(HttpServletRequest request, @PathVariable("id") Lon if (!hasAuthority(username, projectInfo)){ return Message.error("You have no permission to delete (删除工程失败)"); } + String domain = projectInfo.getDomain(); + if (StringUtils.isNotBlank(domain) && !ExchangisProject.Domain.STANDALONE.name() + .equalsIgnoreCase(domain)){ + return Message.error("Cannot delete the outer project (无法删除来自 " + domain + " 的外部项目)"); + } projectService.deleteProject(id); return ExchangisProjectRestfulUtils.dealOk("删除工程成功"); } catch (Exception t) { From 209011979f0f78da1e7373304f2ab9c5747ffe66 Mon Sep 17 00:00:00 2001 From: davidhua Date: Thu, 3 Mar 2022 14:46:54 +0800 Subject: [PATCH 3/4] Upgrade the properties and xml file --- .../config/exchangis-server.properties | 19 ++++++------------- assembly-package/config/log4j2.xml | 14 +++++++------- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/assembly-package/config/exchangis-server.properties b/assembly-package/config/exchangis-server.properties index e434943f7..07a162edc 100644 --- a/assembly-package/config/exchangis-server.properties +++ b/assembly-package/config/exchangis-server.properties @@ -15,8 +15,6 @@ # # -#wds.linkis.test.mode=false - wds.linkis.server.mybatis.datasource.url=jdbc:mysql://localhost:3306/database?useSSL=false&characterEncoding=UTF-8&allowMultiQueries=true wds.linkis.server.mybatis.datasource.username=username @@ -27,32 +25,27 @@ wds.linkis.log.clear=true wds.linkis.server.version=v1 -## datasource client +# datasource client wds.exchangis.datasource.client.serverurl= wds.exchangis.datasource.client.authtoken.key=DATASOURCE-AUTH wds.exchangis.datasource.client.authtoken.value=DATASOURCE-AUTH wds.exchangis.datasource.client.dws.version=v1 +# launcher client +wds.exchangis.client.linkis.server-url= +wds.exchangis.client.linkis.token.value=DATASOURCE-AUTH wds.exchangis.datasource.extension.dir=exchangis-extds -wds.exchangis.linkis.serverurl= - ##restful wds.linkis.server.restful.scan.packages=com.webank.wedatasphere.exchangis.datasource.server.restful.api,\ com.webank.wedatasphere.exchangis.project.server.restful,\ com.webank.wedatasphere.exchangis.job.server.restful -wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/dss/framework/appconn/dao/impl/*.xml,classpath*:com/webank/wedatasphere/dss/workflow/dao/impl/*.xml\ - ,classpath*:com/webank/wedatasphere/exchangis/job/server/mapper/impl/*.xml:\ +wds.linkis.server.mybatis.mapperLocations=classpath*:com/webank/wedatasphere/exchangis/job/server/mapper/impl/*.xml:\ ,classpath*:com/webank/wedatasphere/exchangis/project/server/mapper/impl/*.xml wds.linkis.server.mybatis.BasePackage=com.webank.wedatasphere.exchangis.dao,\ com.webank.wedatasphere.exchangis.project.server.mapper,\ - com.webank.wedatasphere.linkis.configuration.dao,\ - com.webank.wedatasphere.dss.framework.appconn.dao,\ - com.webank.wedatasphere.dss.workflow.dao,\ - com.webank.wedatasphere.linkis.metadata.dao,\ - com.webank.wedatasphere.exchangis.job.server.mapper,\ - com.webank.wedatasphere.exchangis.job.server.dao + com.webank.wedatasphere.exchangis.job.server.mapper diff --git a/assembly-package/config/log4j2.xml b/assembly-package/config/log4j2.xml index bcda90df7..ef1c6e22d 100644 --- a/assembly-package/config/log4j2.xml +++ b/assembly-package/config/log4j2.xml @@ -25,16 +25,16 @@ - - - - - - + + + + + - + From 488caa66ccd8237e2de79b890311a1c3ab78d8c8 Mon Sep 17 00:00:00 2001 From: davidhua Date: Thu, 3 Mar 2022 23:46:52 +0800 Subject: [PATCH 4/4] DSS restful api problem --- .../restful/external/ExchangisJobDssAppConnRestfulApi.java | 4 ++-- .../exchangis/project/server/domain/ProjectPageQuery.java | 2 +- .../project/server/service/impl/ProjectServiceImpl.java | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/restful/external/ExchangisJobDssAppConnRestfulApi.java b/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/restful/external/ExchangisJobDssAppConnRestfulApi.java index af97beb81..a182a952c 100644 --- a/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/restful/external/ExchangisJobDssAppConnRestfulApi.java +++ b/exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/restful/external/ExchangisJobDssAppConnRestfulApi.java @@ -56,7 +56,7 @@ public Message createJob( exchangisJobVo.setCreateUser(userName); Message response = Message.ok(); try{ - response.data("result", jobInfoService.createJob(exchangisJobVo)); + response.data("id", jobInfoService.createJob(exchangisJobVo).getId()); } catch (Exception e){ String message = "Fail to create dss job: " + exchangisJobVo.getJobName() +" (创建DSS任务失败)"; LOG.error(message, e); @@ -109,7 +109,7 @@ public Message updateJob(@PathVariable("id") Long id, if (!hasAuthority(userName, jobInfoService.getJob(id , true))){ return Message.error("You have no permission to update (没有更新权限)"); } - response.data("result", jobInfoService.updateJob(exchangisJobVo)); + response.data("id", jobInfoService.updateJob(exchangisJobVo).getId()); } catch (Exception e){ String message = "Fail to update dss job: " + exchangisJobVo.getJobName() +" (更新DSS任务失败)"; LOG.error(message, e); diff --git a/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/domain/ProjectPageQuery.java b/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/domain/ProjectPageQuery.java index 2a50fcb5a..9a4a012f3 100644 --- a/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/domain/ProjectPageQuery.java +++ b/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/domain/ProjectPageQuery.java @@ -12,7 +12,7 @@ public class ProjectPageQuery extends PageQuery { */ protected String name; - protected String domain = ExchangisProject.Domain.STANDALONE.name(); + protected String domain; protected String createUser; diff --git a/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/service/impl/ProjectServiceImpl.java b/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/service/impl/ProjectServiceImpl.java index 69c33cdd4..601b21c99 100644 --- a/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/service/impl/ProjectServiceImpl.java +++ b/exchangis-project/exchangis-project-server/src/main/java/com/webank/wedatasphere/exchangis/project/server/service/impl/ProjectServiceImpl.java @@ -54,7 +54,8 @@ public long createProject(ExchangisProjectInfo projectVo, String userName) { project.setExecUsers(projectVo.getExecUsers()); project.setCreateUser(userName); project.setCreateTime(Calendar.getInstance().getTime()); - return this.projectMapper.insertOne(project); + this.projectMapper.insertOne(project); + return project.getId(); } @Override