This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new b28827a9c fix - tenant -bug (#3982)
b28827a9c is described below
commit b28827a9cb0967b9ba8b6ac924f08d9df36d0606
Author: huangKai-2323 <[email protected]>
AuthorDate: Tue Dec 20 11:15:00 2022 +0800
fix - tenant -bug (#3982)
---
.../restful/api/TenantConfigrationRestfulApi.java | 10 +++++++---
.../restful/api/UserIpConfigrationRestfulApi.java | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java
b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java
index 5629c28ed..2db570ab8 100644
---
a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java
+++
b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java
@@ -75,6 +75,9 @@ public class TenantConfigrationRestfulApi {
if (!Configuration.isAdmin(userName)) {
return Message.error("Failed to create-tenant,msg: only administrators
can configure");
}
+ if (tenantConfigService.checkUserCteator(tenantVo.getUser(),
tenantVo.getCreator(), null)) {
+ throw new ConfigurationException("User-creator is existed");
+ }
parameterVerification(tenantVo);
tenantConfigService.createTenant(tenantVo);
} catch (DuplicateKeyException e) {
@@ -109,6 +112,10 @@ public class TenantConfigrationRestfulApi {
if (!Configuration.isAdmin(userName)) {
return Message.error("Failed to update-tenant,msg: only administrators
can configure");
}
+ // if (!tenantConfigService.checkUserCteator(tenantVo.getUser(),
tenantVo.getCreator(),
+ // null)) {
+ // throw new ConfigurationException("User-creator is not
existed");
+ // }
parameterVerification(tenantVo);
tenantConfigService.updateTenant(tenantVo);
} catch (ConfigurationException e) {
@@ -260,8 +267,5 @@ public class TenantConfigrationRestfulApi {
if (StringUtils.isBlank(tenantVo.getTenantValue())) {
throw new ConfigurationException("Tenant tag can't be empty ");
}
- if (tenantConfigService.checkUserCteator(tenantVo.getUser(),
tenantVo.getCreator(), null)) {
- throw new ConfigurationException("User-creat is existed");
- }
}
}
diff --git
a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java
b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java
index 71a27751f..470bc3b54 100644
---
a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java
+++
b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java
@@ -71,6 +71,9 @@ public class UserIpConfigrationRestfulApi {
if (!Configuration.isAdmin(userName)) {
return Message.error("Failed to create-user-ip,msg: only
administrators can configure");
}
+ if (userIpConfigService.checkUserCteator(userIpVo.getUser(),
userIpVo.getCreator())) {
+ throw new ConfigurationException("User-creator is existed");
+ }
parameterVerification(userIpVo);
userIpConfigService.createUserIP(userIpVo);
} catch (DuplicateKeyException e) {
@@ -101,6 +104,10 @@ public class UserIpConfigrationRestfulApi {
if (!Configuration.isAdmin(userName)) {
return Message.error("Failed to update-user-ip,msg: only
administrators can configure ");
}
+ // if (!userIpConfigService.checkUserCteator(userIpVo.getUser(),
userIpVo.getCreator()))
+ // {
+ // throw new ConfigurationException("User-creator is not
existed");
+ // }
parameterVerification(userIpVo);
userIpConfigService.updateUserIP(userIpVo);
} catch (ConfigurationException e) {
@@ -219,8 +226,5 @@ public class UserIpConfigrationRestfulApi {
if (StringUtils.isBlank(userIpVo.getDesc())) {
throw new ConfigurationException("Description couldn't be empty ");
}
- if (userIpConfigService.checkUserCteator(userIpVo.getUser(),
userIpVo.getCreator())) {
- throw new ConfigurationException("User-creat is existed");
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
