This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 8b9a65c16 fix(linkis-web): fix Engine material management Update
engine plugins (#3786)
8b9a65c16 is described below
commit 8b9a65c161fa5706c5d11b8bff767d376776d14d
Author: jacktao007 <[email protected]>
AuthorDate: Wed Nov 16 22:52:06 2022 +0800
fix(linkis-web): fix Engine material management Update engine plugins
(#3786)
* fix(linkis-web): fix Engine material management Update engine plugins
* fix(linkis-web): adding interface auditing
* fix(linkis-web): fix （Linkis Management Desk issue record）Linkis管理台问题记录
#3751
* fix:add i18n for Engine Plugin Management
Co-authored-by: Casion <[email protected]>
---
.../server/restful/DatasourceAccessRestfulApi.java | 42 ++++++++++++++--------
.../server/restful/DatasourceEnvRestfulApi.java | 32 ++++++++++-------
.../server/restful/DatasourceTypeRestfulApi.java | 32 ++++++++++-------
.../server/restful/ErrorCodeRestfulApi.java | 28 +++++++++------
.../server/restful/GatewayAuthTokenRestfulApi.java | 34 +++++++++++-------
.../RmExternalResourceProviderRestfulApi.java | 28 +++++++++------
.../server/restful/UdfManagerRestfulApi.java | 36 +++++++++++--------
.../server/restful/UdfTreeRestfulApi.java | 36 +++++++++++--------
linkis-web/src/apps/linkis/i18n/common/en.json | 23 ++++++++++++
linkis-web/src/apps/linkis/i18n/common/zh.json | 3 +-
.../linkis/module/EnginePluginManagement/index.vue | 10 ++++++
11 files changed, 204 insertions(+), 100 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
index 5470a6843..ab4306815 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceAccessRestfulApi.java
@@ -24,9 +24,11 @@ import io.swagger.annotations.ApiOperation;
import org.apache.linkis.basedatamanager.server.domain.DatasourceAccessEntity;
import
org.apache.linkis.basedatamanager.server.service.DatasourceAccessService;
import org.apache.linkis.server.Message;
+import org.apache.linkis.server.utils.ModuleUserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.Date;
@Api(tags = "DatasourceAccessRestfulApi")
@@ -38,55 +40,65 @@ public class DatasourceAccessRestfulApi {
DatasourceAccessService datasourceAccessService;
@ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType =
"HttpServletRequest", name = "request", value = ""),
@ApiImplicitParam(paramType = "query", dataType = "string", name =
"searchName", value = ""),
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"currentPage", value = ""),
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"pageSize", value = "")
})
- @ApiOperation(value = "", notes = "", httpMethod = "GET")
+ @ApiOperation(value = "list", notes = "Query list data of Datasource
Access", httpMethod = "GET")
@RequestMapping(path = "", method = RequestMethod.GET)
- public Message list(String searchName,Integer currentPage,Integer
pageSize) {
+ public Message list(HttpServletRequest request, String searchName, Integer
currentPage, Integer pageSize) {
+ ModuleUserUtils.getOperationUser(request,"Query list data of
Datasource Access,search name:"+searchName);
PageInfo pageList =
datasourceAccessService.getListByPage(searchName,currentPage,pageSize);
return Message.ok("").data("list", pageList);
}
@ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType =
"HttpServletRequest", name = "request", value = ""),
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "", notes = "", httpMethod = "GET")
+ @ApiOperation(value = "get", notes = "Get a Datasource Access Record",
httpMethod = "GET")
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
- public Message get(@PathVariable("id") Long id) {
+ public Message get(HttpServletRequest request,@PathVariable("id") Long id)
{
+ ModuleUserUtils.getOperationUser(request, "Get a Datasource Access
Record,id:"+id.toString());
DatasourceAccessEntity datasourceAccess =
datasourceAccessService.getById(id);
return Message.ok("").data("item", datasourceAccess);
}
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "body", dataType =
"DatasourceAccessEntity", name = "errorCode", value = "")
+ @ApiImplicitParam(paramType = "query", dataType =
"HttpServletRequest", name = "request", value = ""),
+ @ApiImplicitParam(paramType = "body", dataType =
"DatasourceAccessEntity", name = "datasourceAccess", value = "")
})
- @ApiOperation(value = "", notes = "", httpMethod = "POST")
+ @ApiOperation(value = "add", notes = "", httpMethod = "POST")
@RequestMapping(path = "", method = RequestMethod.POST)
- public Message add(@RequestBody DatasourceAccessEntity
datasourceAccessEntity) {
- datasourceAccessEntity.setAccessTime(new Date());
- boolean result = datasourceAccessService.save(datasourceAccessEntity);
+ public Message add(HttpServletRequest request,@RequestBody
DatasourceAccessEntity datasourceAccess) {
+ ModuleUserUtils.getOperationUser(request, "Add a Datasource Access
Record,"+datasourceAccess.toString());
+ datasourceAccess.setAccessTime(new Date());
+ boolean result = datasourceAccessService.save(datasourceAccess);
return Message.ok("").data("result", result);
}
@ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType =
"HttpServletRequest", name = "request", value = ""),
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "", notes = "", httpMethod = "DELETE")
+ @ApiOperation(value = "remove", notes = "Remove a Datasource Access
Record", httpMethod = "DELETE")
@RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
- public Message remove(@PathVariable("id") Long id) {
+ public Message remove(HttpServletRequest request,@PathVariable("id") Long
id) {
+ ModuleUserUtils.getOperationUser(request, "Remove a Datasource Access
Record,id:"+id.toString());
boolean result = datasourceAccessService.removeById(id);
return Message.ok("").data("result", result);
}
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "body", dataType =
"DatasourceAccessEntity", name = "errorCode", value = "")
+ @ApiImplicitParam(paramType = "query", dataType =
"HttpServletRequest", name = "request", value = ""),
+ @ApiImplicitParam(paramType = "body", dataType =
"DatasourceAccessEntity", name = "datasourceAccess", value = "")
})
- @ApiOperation(value = "", notes = "", httpMethod = "PUT")
+ @ApiOperation(value = "update", notes = "Update a Datasource Access
Record", httpMethod = "PUT")
@RequestMapping(path = "", method = RequestMethod.PUT)
- public Message update(@RequestBody DatasourceAccessEntity
datasourceAccessEntity) {
- boolean result =
datasourceAccessService.updateById(datasourceAccessEntity);
+ public Message update(HttpServletRequest request,@RequestBody
DatasourceAccessEntity datasourceAccess) {
+ ModuleUserUtils.getOperationUser(request, "Update a Datasource Access
Record,id:"+datasourceAccess.getId().toString());
+ boolean result = datasourceAccessService.updateById(datasourceAccess);
return Message.ok("").data("result", result);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApi.java
index 2260daeb0..22685f961 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceEnvRestfulApi.java
@@ -24,9 +24,12 @@ import io.swagger.annotations.ApiOperation;
import org.apache.linkis.basedatamanager.server.domain.DatasourceEnvEntity;
import org.apache.linkis.basedatamanager.server.service.DatasourceEnvService;
import org.apache.linkis.server.Message;
+import org.apache.linkis.server.utils.ModuleUserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+
@Api(tags = "DatasourceEnvRestfulApi")
@RestController
@RequestMapping(path = "/basedata-manager/datasource-env")
@@ -40,9 +43,10 @@ public class DatasourceEnvRestfulApi {
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"currentPage", value = ""),
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"pageSize", value = "")
})
- @ApiOperation(value = "list", notes = "get list data", httpMethod = "GET")
+ @ApiOperation(value = "list", notes = "Query list data of Datasource Env
by searchName", httpMethod = "GET")
@RequestMapping(path = "", method = RequestMethod.GET)
- public Message list(String searchName,Integer currentPage,Integer
pageSize) {
+ public Message list(HttpServletRequest request, String searchName, Integer
currentPage, Integer pageSize) {
+ ModuleUserUtils.getOperationUser(request, "Query list data of
Datasource Env,search name:"+searchName);
PageInfo pageList =
datasourceEnvService.getListByPage(searchName,currentPage,pageSize);
return Message.ok("").data("list", pageList);
}
@@ -50,9 +54,10 @@ public class DatasourceEnvRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "get", notes = "get data by id", httpMethod = "GET")
+ @ApiOperation(value = "get", notes = "Get a Datasource Env Record by id",
httpMethod = "GET")
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
- public Message get(@PathVariable("id") Long id) {
+ public Message get(HttpServletRequest request,@PathVariable("id") Long id)
{
+ ModuleUserUtils.getOperationUser(request, "Get a Datasource Env
Record,id:"+id.toString());
DatasourceEnvEntity datasourceEnv = datasourceEnvService.getById(id);
return Message.ok("").data("item", datasourceEnv);
}
@@ -60,9 +65,10 @@ public class DatasourceEnvRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "body", dataType =
"DatasourceEnvEntity", name = "datasourceEnv", value = "")
})
- @ApiOperation(value = "add", notes = "add data", httpMethod = "POST")
+ @ApiOperation(value = "add", notes = "Add a Datasource Env Record",
httpMethod = "POST")
@RequestMapping(path = "", method = RequestMethod.POST)
- public Message add(@RequestBody DatasourceEnvEntity datasourceEnv) {
+ public Message add(HttpServletRequest request,@RequestBody
DatasourceEnvEntity datasourceEnv) {
+ ModuleUserUtils.getOperationUser(request, "Add a Datasource Env
Record,"+datasourceEnv.toString());
boolean result = datasourceEnvService.save(datasourceEnv);
return Message.ok("").data("result", result);
}
@@ -70,20 +76,22 @@ public class DatasourceEnvRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "remove", notes = "remove data by id", httpMethod =
"DELETE")
+ @ApiOperation(value = "remove", notes = "Remove a Datasource Env Record by
id", httpMethod = "DELETE")
@RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
- public Message remove(@PathVariable("id") Long id) {
+ public Message remove(HttpServletRequest request,@PathVariable("id") Long
id) {
+ ModuleUserUtils.getOperationUser(request, "Remove a Datasource Env
Record,id:"+id.toString());
boolean result = datasourceEnvService.removeById(id);
return Message.ok("").data("result", result);
}
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "body", dataType =
"DatasourceEnvEntity", name = "errorCode", value = "")
+ @ApiImplicitParam(paramType = "body", dataType =
"DatasourceEnvEntity", name = "datasourceEnv", value = "")
})
- @ApiOperation(value = "update", notes = "update data", httpMethod = "PUT")
+ @ApiOperation(value = "update", notes = "Update a Datasource Env Record",
httpMethod = "PUT")
@RequestMapping(path = "", method = RequestMethod.PUT)
- public Message update(@RequestBody DatasourceEnvEntity errorCode) {
- boolean result = datasourceEnvService.updateById(errorCode);
+ public Message update(HttpServletRequest request,@RequestBody
DatasourceEnvEntity datasourceEnv) {
+ ModuleUserUtils.getOperationUser(request, "Update a Datasource Env
Record,id:"+datasourceEnv.getId().toString());
+ boolean result = datasourceEnvService.updateById(datasourceEnv);
return Message.ok("").data("result", result);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApi.java
index 7e93cb941..d85ed8dba 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/DatasourceTypeRestfulApi.java
@@ -24,9 +24,12 @@ import io.swagger.annotations.ApiOperation;
import org.apache.linkis.basedatamanager.server.domain.DatasourceTypeEntity;
import org.apache.linkis.basedatamanager.server.service.DatasourceTypeService;
import org.apache.linkis.server.Message;
+import org.apache.linkis.server.utils.ModuleUserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+
@Api(tags="DatasourceTypeRestfulApi")
@RestController
@RequestMapping(path = "/basedata-manager/datasource-type")
@@ -40,9 +43,10 @@ public class DatasourceTypeRestfulApi {
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"currentPage", value = ""),
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"pageSize", value = "")
})
- @ApiOperation(value = "list", notes = "get list data", httpMethod = "GET")
+ @ApiOperation(value = "list", notes = "Query list data of Datasource
Type", httpMethod = "GET")
@RequestMapping(path = "", method = RequestMethod.GET)
- public Message list(String searchName,Integer currentPage,Integer
pageSize) {
+ public Message list(HttpServletRequest request, String searchName, Integer
currentPage, Integer pageSize) {
+ ModuleUserUtils.getOperationUser(request, "Query list data of
Datasource Type,search name:"+searchName);
PageInfo pageList =
datasourceTypeService.getListByPage(searchName,currentPage,pageSize);
return Message.ok("").data("list", pageList);
}
@@ -50,9 +54,10 @@ public class DatasourceTypeRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "get", notes = "get data by id", httpMethod = "GET")
+ @ApiOperation(value = "get", notes = "Get a Datasource Type Record by id",
httpMethod = "GET")
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
- public Message get(@PathVariable("id") Long id) {
+ public Message get(HttpServletRequest request,@PathVariable("id") Long id)
{
+ ModuleUserUtils.getOperationUser(request, "Get a Datasource Type
Record,id:"+id.toString());
DatasourceTypeEntity datasourceType =
datasourceTypeService.getById(id);
return Message.ok("").data("item", datasourceType);
}
@@ -60,9 +65,10 @@ public class DatasourceTypeRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "body", dataType =
"DatasourceTypeEntity", name = "datasourceType", value = "")
})
- @ApiOperation(value = "add", notes = "add data", httpMethod = "POST")
+ @ApiOperation(value = "add", notes = "Add a Datasource Type Record",
httpMethod = "POST")
@RequestMapping(path = "", method = RequestMethod.POST)
- public Message add(@RequestBody DatasourceTypeEntity datasourceType) {
+ public Message add(HttpServletRequest request,@RequestBody
DatasourceTypeEntity datasourceType) {
+ ModuleUserUtils.getOperationUser(request, "Add a Datasource Type
Record,"+datasourceType.toString());
boolean result = datasourceTypeService.save(datasourceType);
return Message.ok("").data("result", result);
}
@@ -70,20 +76,22 @@ public class DatasourceTypeRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "remove", notes = "remove data by id", httpMethod =
"DELETE")
+ @ApiOperation(value = "remove", notes = "Remove a Datasource Type Record
by id", httpMethod = "DELETE")
@RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
- public Message remove(@PathVariable("id") Long id) {
+ public Message remove(HttpServletRequest request,@PathVariable("id") Long
id) {
+ ModuleUserUtils.getOperationUser(request, "Remove a Datasource Type
Record,id:"+id.toString());
boolean result = datasourceTypeService.removeById(id);
return Message.ok("").data("result", result);
}
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "body", dataType =
"DatasourceTypeEntity", name = "errorCode", value = "")
+ @ApiImplicitParam(paramType = "body", dataType =
"DatasourceTypeEntity", name = "datasourceType", value = "")
})
- @ApiOperation(value = "update", notes = "update data", httpMethod = "PUT")
+ @ApiOperation(value = "update", notes = "Update a Datasource Type Record",
httpMethod = "PUT")
@RequestMapping(path = "", method = RequestMethod.PUT)
- public Message update(@RequestBody DatasourceTypeEntity errorCode) {
- boolean result = datasourceTypeService.updateById(errorCode);
+ public Message update(HttpServletRequest request,@RequestBody
DatasourceTypeEntity datasourceType) {
+ ModuleUserUtils.getOperationUser(request, "Update a Datasource Type
Record,id:"+datasourceType.getId().toString());
+ boolean result = datasourceTypeService.updateById(datasourceType);
return Message.ok("").data("result", result);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApi.java
index 27ec676a1..1b2543d03 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/ErrorCodeRestfulApi.java
@@ -24,9 +24,12 @@ import io.swagger.annotations.ApiOperation;
import org.apache.linkis.basedatamanager.server.domain.ErrorCodeEntity;
import org.apache.linkis.basedatamanager.server.service.ErrorCodeService;
import org.apache.linkis.server.Message;
+import org.apache.linkis.server.utils.ModuleUserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+
@Api(tags="ErrorCodeRestfulApi")
@RestController
@RequestMapping(path = "/basedata-manager/error-code")
@@ -40,9 +43,10 @@ public class ErrorCodeRestfulApi {
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"currentPage", value = ""),
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"pageSize", value = "")
})
- @ApiOperation(value = "list", notes = "get list data with page",
httpMethod = "GET")
+ @ApiOperation(value = "list", notes = "Query list data with page of Error
Code", httpMethod = "GET")
@RequestMapping(path = "", method = RequestMethod.GET)
- public Message list(String searchName,Integer currentPage,Integer
pageSize) {
+ public Message list(HttpServletRequest request, String searchName, Integer
currentPage, Integer pageSize) {
+ ModuleUserUtils.getOperationUser(request, "Query list data of Error
Code,search name:"+searchName);
PageInfo pageList =
errorCodeService.getListByPage(searchName,currentPage,pageSize);
return Message.ok("").data("list", pageList);
}
@@ -50,9 +54,10 @@ public class ErrorCodeRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "get", notes = "get data by id", httpMethod = "GET")
+ @ApiOperation(value = "get", notes = "Get a Error Code Record by id",
httpMethod = "GET")
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
- public Message get(@PathVariable("id") Long id) {
+ public Message get(HttpServletRequest request,@PathVariable("id") Long id)
{
+ ModuleUserUtils.getOperationUser(request, "Get a Error Code
Record,id:"+id.toString());
ErrorCodeEntity errorCode = errorCodeService.getById(id);
return Message.ok("").data("item", errorCode);
}
@@ -60,9 +65,10 @@ public class ErrorCodeRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "body", dataType =
"ErrorCodeEntity", name = "errorCode", value = "")
})
- @ApiOperation(value = "add", notes = "add data", httpMethod = "POST")
+ @ApiOperation(value = "add", notes = "Add a Datasource Code Record",
httpMethod = "POST")
@RequestMapping(path = "", method = RequestMethod.POST)
- public Message add(@RequestBody ErrorCodeEntity errorCode) {
+ public Message add(HttpServletRequest request,@RequestBody ErrorCodeEntity
errorCode) {
+ ModuleUserUtils.getOperationUser(request, "Add a Datasource Code
Record,"+errorCode.toString());
boolean result = errorCodeService.save(errorCode);
return Message.ok("").data("result", result);
}
@@ -70,9 +76,10 @@ public class ErrorCodeRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "remove", notes = "remove data by id", httpMethod =
"DELETE")
+ @ApiOperation(value = "remove", notes = "Remove a Datasource Code Record
by id", httpMethod = "DELETE")
@RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
- public Message remove(@PathVariable("id") Long id) {
+ public Message remove(HttpServletRequest request,@PathVariable("id") Long
id) {
+ ModuleUserUtils.getOperationUser(request, "Remove a Datasource Code
Record,id:"+id.toString());
boolean result = errorCodeService.removeById(id);
return Message.ok("").data("result", result);
}
@@ -80,9 +87,10 @@ public class ErrorCodeRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "body", dataType =
"ErrorCodeEntity", name = "errorCode", value = "")
})
- @ApiOperation(value = "update", notes = "update data", httpMethod = "PUT")
+ @ApiOperation(value = "update", notes = "Update a Datasource Code Record",
httpMethod = "PUT")
@RequestMapping(path = "", method = RequestMethod.PUT)
- public Message update(@RequestBody ErrorCodeEntity errorCode) {
+ public Message update(HttpServletRequest request,@RequestBody
ErrorCodeEntity errorCode) {
+ ModuleUserUtils.getOperationUser(request, "Update a Datasource Code
Record,id:"+errorCode.getId().toString());
boolean result = errorCodeService.updateById(errorCode);
return Message.ok("").data("result", result);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
index e0bc072d1..afa0c5fda 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/GatewayAuthTokenRestfulApi.java
@@ -24,9 +24,11 @@ import io.swagger.annotations.ApiOperation;
import org.apache.linkis.basedatamanager.server.domain.GatewayAuthTokenEntity;
import
org.apache.linkis.basedatamanager.server.service.GatewayAuthTokenService;
import org.apache.linkis.server.Message;
+import org.apache.linkis.server.utils.ModuleUserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.HashMap;
@@ -43,9 +45,10 @@ public class GatewayAuthTokenRestfulApi {
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"currentPage", value = ""),
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"pageSize", value = "")
})
- @ApiOperation(value = "list", notes = "get list data", httpMethod = "GET")
+ @ApiOperation(value = "list", notes = "Query list data of Gateway Auth
Token", httpMethod = "GET")
@RequestMapping(path = "", method = RequestMethod.GET)
- public Message list(String searchName,Integer currentPage,Integer
pageSize) {
+ public Message list(HttpServletRequest request, String searchName, Integer
currentPage, Integer pageSize) {
+ ModuleUserUtils.getOperationUser(request, "Query list data of Gateway
Auth Token,search name:"+searchName);
PageInfo pageList =
gatewayAuthTokenService.getListByPage(searchName,currentPage,pageSize);
return Message.ok("").data("list", pageList);
}
@@ -53,9 +56,10 @@ public class GatewayAuthTokenRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "get", notes = "get data by id", httpMethod = "GET")
+ @ApiOperation(value = "get", notes = "Get a Gateway Auth Token Record by
id", httpMethod = "GET")
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
- public Message get(@PathVariable("id") Long id) {
+ public Message get(HttpServletRequest request,@PathVariable("id") Long id)
{
+ ModuleUserUtils.getOperationUser(request, "Get a Gateway Auth Token
Record,id:"+id.toString());
GatewayAuthTokenEntity gatewayAuthToken =
gatewayAuthTokenService.getById(id);
return Message.ok("").data("item", gatewayAuthToken);
}
@@ -63,13 +67,16 @@ public class GatewayAuthTokenRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "body", dataType =
"GatewayAuthTokenEntity", name = "gatewayAuthToken", value = "")
})
- @ApiOperation(value = "add", notes = "add data", httpMethod = "POST")
+ @ApiOperation(value = "add", notes = "Add a Gateway Auth Token Record",
httpMethod = "POST")
@RequestMapping(path = "", method = RequestMethod.POST)
- public Message add(@RequestBody GatewayAuthTokenEntity gatewayAuthToken) {
+ public Message add(HttpServletRequest request,@RequestBody
GatewayAuthTokenEntity gatewayAuthToken) {
+ ModuleUserUtils.getOperationUser(request, "Add a Gateway Auth Token
Record,"+gatewayAuthToken.toString());
gatewayAuthToken.setCreateTime(new Date());
gatewayAuthToken.setUpdateTime(new Date());
gatewayAuthToken.setBusinessOwner("BDP");
gatewayAuthToken.setUpdateBy("LINKIS");
+
+ ModuleUserUtils.getOperationUser(request, "Add a Gateway Auth Token
Record,"+gatewayAuthToken.toString());
boolean result = gatewayAuthTokenService.save(gatewayAuthToken);
return Message.ok("").data("result", result);
}
@@ -77,11 +84,13 @@ public class GatewayAuthTokenRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "body", dataType =
"GatewayAuthTokenEntity", name = "token", value = "")
})
- @ApiOperation(value = "update", notes = "remove data by id", httpMethod =
"PUT")
+ @ApiOperation(value = "update", notes = "Update a Gateway Auth Token
Record", httpMethod = "PUT")
@RequestMapping(path = "", method = RequestMethod.PUT)
- public Message update(@RequestBody GatewayAuthTokenEntity token) {
+ public Message update(HttpServletRequest request,@RequestBody
GatewayAuthTokenEntity token) {
+ ModuleUserUtils.getOperationUser(request, "Update a Gateway Auth Token
Record,id:"+token.getId().toString());
token.setUpdateTime(new Date());
token.setUpdateBy("LINKIS");
+
boolean result = gatewayAuthTokenService.updateById(token);
return Message.ok("").data("result", result);
}
@@ -89,10 +98,11 @@ public class GatewayAuthTokenRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "string", name =
"tokenName", value = "")
})
- @ApiOperation(value = "remove", notes = "update data", httpMethod =
"DELETE")
- @RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
- public Message remove(@PathVariable("id") Integer id) {
- boolean result = gatewayAuthTokenService.removeById(id);;
+ @ApiOperation(value = "remove", notes = "Remove a Gateway Auth Token
Record by token name", httpMethod = "DELETE")
+ @RequestMapping(path = "", method = RequestMethod.DELETE)
+ public Message remove(HttpServletRequest request,Long id) {
+ ModuleUserUtils.getOperationUser(request, "Remove a Gateway Auth Token
Record,id:"+id);
+ boolean result = gatewayAuthTokenService.removeById(id);
return Message.ok("").data("result", result);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
index 0fcb3c217..fec1fe833 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/RmExternalResourceProviderRestfulApi.java
@@ -20,6 +20,7 @@ import
org.apache.linkis.basedatamanager.server.domain.RmExternalResourceProvide
import
org.apache.linkis.basedatamanager.server.service.RmExternalResourceProviderService;
import org.apache.linkis.server.Message;
+import org.apache.linkis.server.utils.ModuleUserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,6 +34,8 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletRequest;
+
@Api(tags = "RmExternalResourceProviderRestfulApi")
@RestController
@RequestMapping(path = "/basedata-manager/rm-external-resource-provider")
@@ -46,9 +49,10 @@ public class RmExternalResourceProviderRestfulApi {
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"currentPage", value = ""),
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"pageSize", value = "")
})
- @ApiOperation(value = "list", notes = "get list data", httpMethod = "GET")
+ @ApiOperation(value = "list", notes = "Query list data of Resource manager
External Resource Provider", httpMethod = "GET")
@RequestMapping(path = "", method = RequestMethod.GET)
- public Message list(String searchName,Integer currentPage,Integer
pageSize) {
+ public Message list(HttpServletRequest request, String searchName, Integer
currentPage, Integer pageSize) {
+ ModuleUserUtils.getOperationUser(request, "Query list data of Resource
manager External Resource Provider,search name:"+searchName);
PageInfo pageList =
rmExternalResourceProviderService.getListByPage(searchName,currentPage,pageSize);
return Message.ok("").data("list", pageList);
}
@@ -56,9 +60,10 @@ public class RmExternalResourceProviderRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "get", notes = "get data by id", httpMethod = "GET")
+ @ApiOperation(value = "get", notes = "Get a Resource manager External
Resource Provider Record by id", httpMethod = "GET")
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
- public Message get(@PathVariable("id") Long id) {
+ public Message get(HttpServletRequest request,@PathVariable("id") Long id)
{
+ ModuleUserUtils.getOperationUser(request, "Get a Resource manager
External Resource Provider Record,id:"+id.toString());
RmExternalResourceProviderEntity rmExternalResourceProvider =
rmExternalResourceProviderService.getById(id);
return Message.ok("").data("item", rmExternalResourceProvider);
}
@@ -66,9 +71,10 @@ public class RmExternalResourceProviderRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "body", dataType =
"RmExternalResourceProviderEntity", name = "rmExternalResourceProvider", value
= "")
})
- @ApiOperation(value = "add", notes = "add data", httpMethod = "POST")
+ @ApiOperation(value = "add", notes = "Add a Resource manager External
Resource Provider Record", httpMethod = "POST")
@RequestMapping(path = "", method = RequestMethod.POST)
- public Message add(@RequestBody RmExternalResourceProviderEntity
rmExternalResourceProvider) {
+ public Message add(HttpServletRequest request,@RequestBody
RmExternalResourceProviderEntity rmExternalResourceProvider) {
+ ModuleUserUtils.getOperationUser(request, "Add a Resource manager
External Resource Provider Record,"+rmExternalResourceProvider.toString());
boolean result =
rmExternalResourceProviderService.save(rmExternalResourceProvider);
return Message.ok("").data("result", result);
}
@@ -76,9 +82,10 @@ public class RmExternalResourceProviderRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "remove", notes = "remove data by id", httpMethod =
"DELETE")
+ @ApiOperation(value = "remove", notes = "Remove a Resource manager
External Resource Provider Record by id", httpMethod = "DELETE")
@RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
- public Message remove(@PathVariable("id") Long id) {
+ public Message remove(HttpServletRequest request,@PathVariable("id") Long
id) {
+ ModuleUserUtils.getOperationUser(request, "Remove a Resource manager
External Resource Provider Record,id:"+id.toString());
boolean result = rmExternalResourceProviderService.removeById(id);
return Message.ok("").data("result", result);
}
@@ -86,9 +93,10 @@ public class RmExternalResourceProviderRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "body", dataType =
"RmExternalResourceProviderEntity", name = "rmExternalResourceProvider", value
= "")
})
- @ApiOperation(value = "update", notes = "update data", httpMethod = "PUT")
+ @ApiOperation(value = "update", notes = "Update a Resource manager
External Resource Provider Record", httpMethod = "PUT")
@RequestMapping(path = "", method = RequestMethod.PUT)
- public Message update(@RequestBody RmExternalResourceProviderEntity
rmExternalResourceProvider) {
+ public Message update(HttpServletRequest request,@RequestBody
RmExternalResourceProviderEntity rmExternalResourceProvider) {
+ ModuleUserUtils.getOperationUser(request, "Update a Resource manager
External Resource Provider
Record,id:"+rmExternalResourceProvider.getId().toString());
boolean result =
rmExternalResourceProviderService.updateById(rmExternalResourceProvider);
return Message.ok("").data("result", result);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
index ad7aaa37c..f4cf843f6 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfManagerRestfulApi.java
@@ -24,9 +24,12 @@ import io.swagger.annotations.ApiOperation;
import org.apache.linkis.basedatamanager.server.domain.UdfManagerEntity;
import org.apache.linkis.basedatamanager.server.service.UdfManagerService;
import org.apache.linkis.server.Message;
+import org.apache.linkis.server.utils.ModuleUserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+
@Api(tags="UdfManagerRestfulApi")
@RestController
@RequestMapping(path = "/basedata-manager/udf-manager")
@@ -40,9 +43,10 @@ public class UdfManagerRestfulApi {
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"currentPage", value = ""),
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"pageSize", value = "")
})
- @ApiOperation(value = "list", notes = "get list data", httpMethod = "GET")
+ @ApiOperation(value = "list", notes = "Query list data of UDF Manager",
httpMethod = "GET")
@RequestMapping(path = "", method = RequestMethod.GET)
- public Message list(String searchName,Integer currentPage,Integer
pageSize) {
+ public Message list(HttpServletRequest request, String searchName, Integer
currentPage, Integer pageSize) {
+ ModuleUserUtils.getOperationUser(request, "Query list data of UDF
Manager,search name:"+searchName);
PageInfo pageList =
udfManagerService.getListByPage(searchName,currentPage,pageSize);
return Message.ok("").data("list", pageList);
}
@@ -50,40 +54,44 @@ public class UdfManagerRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "get", notes = "get data by id", httpMethod = "GET")
+ @ApiOperation(value = "Get a Datasource UDF Manager", notes = "get data by
id", httpMethod = "GET")
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
- public Message get(@PathVariable("id") Long id) {
+ public Message get(HttpServletRequest request,@PathVariable("id") Long id)
{
+ ModuleUserUtils.getOperationUser(request, "Get a Datasource UDF
Manager,id:"+id.toString());
UdfManagerEntity errorCode = udfManagerService.getById(id);
return Message.ok("").data("item", errorCode);
}
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "body", dataType =
"UdfManagerEntity", name = "errorCode", value = "")
+ @ApiImplicitParam(paramType = "body", dataType =
"UdfManagerEntity", name = "udfManagerEntity", value = "")
})
- @ApiOperation(value = "add", notes = "add data", httpMethod = "POST")
+ @ApiOperation(value = "add", notes = "Add a UDF Manager Record",
httpMethod = "POST")
@RequestMapping(path = "", method = RequestMethod.POST)
- public Message add(@RequestBody UdfManagerEntity errorCode) {
- boolean result = udfManagerService.save(errorCode);
+ public Message add(HttpServletRequest request,@RequestBody
UdfManagerEntity udfManagerEntity) {
+ ModuleUserUtils.getOperationUser(request, "Add a UDF Manager
Record,"+udfManagerEntity.toString());
+ boolean result = udfManagerService.save(udfManagerEntity);
return Message.ok("").data("result", result);
}
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "remove", notes = "remove data by id", httpMethod =
"DELETE")
+ @ApiOperation(value = "remove", notes = "Remove a UDF Manager Record by
id", httpMethod = "DELETE")
@RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
- public Message remove(@PathVariable("id") Long id) {
+ public Message remove(HttpServletRequest request,@PathVariable("id") Long
id) {
+ ModuleUserUtils.getOperationUser(request, "Remove a UDF Manager
Record,id:"+id.toString());
boolean result = udfManagerService.removeById(id);
return Message.ok("").data("result", result);
}
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "body", dataType =
"UdfManagerEntity", name = "errorCode", value = "")
+ @ApiImplicitParam(paramType = "body", dataType =
"UdfManagerEntity", name = "udfManagerEntity", value = "")
})
- @ApiOperation(value = "update", notes = "update data", httpMethod = "PUT")
+ @ApiOperation(value = "update", notes = "Update a Datasource Access
Record", httpMethod = "PUT")
@RequestMapping(path = "", method = RequestMethod.PUT)
- public Message update(@RequestBody UdfManagerEntity errorCode) {
- boolean result = udfManagerService.updateById(errorCode);
+ public Message update(HttpServletRequest request,@RequestBody
UdfManagerEntity udfManagerEntity) {
+ ModuleUserUtils.getOperationUser(request, "Update a Datasource Access
Record,id:"+udfManagerEntity.getId().toString());
+ boolean result = udfManagerService.updateById(udfManagerEntity);
return Message.ok("").data("result", result);
}
diff --git
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
index d605b3f42..b3a03be3b 100644
---
a/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
+++
b/linkis-public-enhancements/linkis-basedata-manager/src/main/java/org/apache/linkis/basedatamanager/server/restful/UdfTreeRestfulApi.java
@@ -24,9 +24,12 @@ import io.swagger.annotations.ApiOperation;
import org.apache.linkis.basedatamanager.server.domain.UdfTreeEntity;
import org.apache.linkis.basedatamanager.server.service.UdfTreeService;
import org.apache.linkis.server.Message;
+import org.apache.linkis.server.utils.ModuleUserUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+
@Api(tags="UdfTreeRestfulApi")
@RestController
@RequestMapping(path = "/basedata-manager/udf-tree")
@@ -40,9 +43,10 @@ public class UdfTreeRestfulApi {
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"currentPage", value = ""),
@ApiImplicitParam(paramType = "query", dataType = "int", name =
"pageSize", value = "")
})
- @ApiOperation(value = "list", notes = "get list data", httpMethod = "GET")
+ @ApiOperation(value = "list", notes = "Query list data of UDF Tree",
httpMethod = "GET")
@RequestMapping(path = "", method = RequestMethod.GET)
- public Message list(String searchName,Integer currentPage,Integer
pageSize) {
+ public Message list(HttpServletRequest request, String searchName, Integer
currentPage, Integer pageSize) {
+ ModuleUserUtils.getOperationUser(request, "Query list data of UDF
Tree,search name:"+searchName);
PageInfo pageList =
udfTreeService.getListByPage(searchName,currentPage,pageSize);
return Message.ok("").data("list", pageList);
}
@@ -50,40 +54,44 @@ public class UdfTreeRestfulApi {
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "get", notes = "get data by id", httpMethod = "GET")
+ @ApiOperation(value = "get", notes = "Get a UDF Tree Record by id",
httpMethod = "GET")
@RequestMapping(path = "/{id}", method = RequestMethod.GET)
- public Message get(@PathVariable("id") Long id) {
+ public Message get(HttpServletRequest request,@PathVariable("id") Long id)
{
+ ModuleUserUtils.getOperationUser(request, "Get a UDF Tree
Record,id:"+id.toString());
UdfTreeEntity errorCode = udfTreeService.getById(id);
return Message.ok("").data("item", errorCode);
}
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "body", dataType = "UdfTreeEntity",
name = "errorCode", value = "")
+ @ApiImplicitParam(paramType = "body", dataType = "UdfTreeEntity",
name = "udfTreeEntity", value = "")
})
- @ApiOperation(value = "add", notes = "add data", httpMethod = "POST")
+ @ApiOperation(value = "add", notes = "Add a UDF Tree Record", httpMethod =
"POST")
@RequestMapping(path = "", method = RequestMethod.POST)
- public Message add(@RequestBody UdfTreeEntity errorCode) {
- boolean result = udfTreeService.save(errorCode);
+ public Message add(HttpServletRequest request,@RequestBody UdfTreeEntity
udfTreeEntity) {
+ ModuleUserUtils.getOperationUser(request, "Add a UDF Tree
Record,"+udfTreeEntity.toString());
+ boolean result = udfTreeService.save(udfTreeEntity);
return Message.ok("").data("result", result);
}
@ApiImplicitParams({
@ApiImplicitParam(paramType = "path", dataType = "long", name =
"id", value = "")
})
- @ApiOperation(value = "remove", notes = "remove data by id", httpMethod =
"DELETE")
+ @ApiOperation(value = "remove", notes = "Remove a UDF Tree Record by id",
httpMethod = "DELETE")
@RequestMapping(path = "/{id}", method = RequestMethod.DELETE)
- public Message remove(@PathVariable("id") Long id) {
+ public Message remove(HttpServletRequest request,@PathVariable("id") Long
id) {
+ ModuleUserUtils.getOperationUser(request, "Remove a UDF Tree
Record,id:"+id.toString());
boolean result = udfTreeService.removeById(id);
return Message.ok("").data("result", result);
}
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "body", dataType = "UdfTreeEntity",
name = "errorCode", value = "")
+ @ApiImplicitParam(paramType = "body", dataType = "UdfTreeEntity",
name = "udfTreeEntity", value = "")
})
- @ApiOperation(value = "update", notes = "update data", httpMethod = "PUT")
+ @ApiOperation(value = "update", notes = "Update a UDF Tree Record",
httpMethod = "PUT")
@RequestMapping(path = "", method = RequestMethod.PUT)
- public Message update(@RequestBody UdfTreeEntity errorCode) {
- boolean result = udfTreeService.updateById(errorCode);
+ public Message update(HttpServletRequest request,@RequestBody
UdfTreeEntity udfTreeEntity) {
+ ModuleUserUtils.getOperationUser(request, "Update a UDF Tree
Record,id:"+udfTreeEntity.getId().toString());
+ boolean result = udfTreeService.updateById(udfTreeEntity);
return Message.ok("").data("result", result);
}
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json
b/linkis-web/src/apps/linkis/i18n/common/en.json
index a5c5a56be..f5d4009c7 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -405,6 +405,29 @@
"remove": "remove",
"edit": "edit",
"addUDFAdmin": "add UDF administrator"
+ },
+ "EnginePluginManagement": {
+ "engineConnType": "EngineConn Type",
+ "engineConnVersion": "Engine Conn Version",
+ "create": "Create",
+ "fileName": "File Name",
+ "fileSize": "File Size",
+ "lastModified": "Last Modified",
+ "bmlResourceId": "Material Resource Id",
+ "bmlResourceVersion": "Material Resource version",
+ "lastUpdateTime": "Last Update Time",
+ "createTime": "Create Time",
+ "Reset": "Reset",
+ "delete": "Delete",
+ "update": "Update",
+ "updateFileOnly": "Update",
+ "resourceVersion": "Resource Version",
+ "user": "User",
+ "deleteCurrentbml": "Delete",
+ "versionList": "Version List",
+ "rollback": "Rollback",
+ "action": "Operate",
+ "checkEngineConnTypeAndVersion": "Please select the engine type and
version"
}
}
}
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json
b/linkis-web/src/apps/linkis/i18n/common/zh.json
index ed1c982d9..5e6f45b78 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -427,7 +427,8 @@
"deleteCurrentbml": "删除",
"versionList": "版本列表",
"rollback": "回滚",
- "action": "操作"
+ "action": "操作",
+ "checkEngineConnTypeAndVersion": "请选择引擎类型及版本"
}
}
}
diff --git a/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
b/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
index 7cb543a2f..93179ff82 100644
--- a/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/EnginePluginManagement/index.vue
@@ -365,6 +365,10 @@ export default {
reqList.push(it.bmlResourceId);
}
})
+ if(!reqList || reqList.length<1){
+
this.$Message.info(this.$t('message.linkis.EnginePluginManagement.checkEngineConnTypeAndVersion'));
+ return
+ }
api.fetch('/bml/deleteResources', {'resourceIds': reqList},
'post').then(response => {
console.log(response);
api.fetch('/engineplugin/deleteEnginePluginBML', {'ecType': th.ecType,
'version': th.version}, 'get').then(response2 => {
@@ -390,6 +394,12 @@ export default {
// })
},
createOrUpdate(num) {
+
+ if(!this.ecType || !this.version){
+
this.$Message.info(this.$t('message.linkis.EnginePluginManagement.checkEngineConnTypeAndVersion'));
+ return
+ }
+
this.actionNum = num
if(num === 0){
this.actionType=this.$t('message.linkis.EnginePluginManagement.create')
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
