diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/ItemController.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/ItemController.java index 8e8698018230802e80209a30eee8db4196c2ed40..0384478371ac536a7b2b2b7e145ca8d9914703b3 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/ItemController.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/v1/controller/ItemController.java @@ -52,6 +52,8 @@ public class ItemController { toCreate.setLineNum(0); toCreate.setId(0); toCreate.setDataChangeLastModifiedBy(toCreate.getDataChangeCreatedBy()); + toCreate.setDataChangeLastModifiedTime(null); + toCreate.setDataChangeCreatedTime(null); ItemDTO createdItem = itemService.createItem(appId, Env.fromString(env), clusterName, namespaceName, toCreate); diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java index 66680e1054ea0a3c5e3bbcda39049410a731996b..e5159afa593d8767b178be5962bff334be1bc146 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ItemController.java @@ -58,6 +58,15 @@ public class ItemController { @RequestBody ItemDTO item) { checkModel(isValidItem(item)); + //protect + item.setLineNum(0); + item.setId(0); + String userId = userInfoHolder.getUser().getUserId(); + item.setDataChangeCreatedBy(userId); + item.setDataChangeLastModifiedBy(userId); + item.setDataChangeCreatedTime(null); + item.setDataChangeLastModifiedTime(null); + return configService.createItem(appId, Env.valueOf(env), clusterName, namespaceName, item); } diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ItemService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ItemService.java index 803fb45e6baa3c593c1122cc8465f7bb5d82593e..7800e40c8e2fd874f220979d77ca5aa70fef553d 100644 --- a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ItemService.java +++ b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ItemService.java @@ -91,12 +91,6 @@ public class ItemService { } item.setNamespaceId(namespace.getId()); - if (StringUtils.isEmpty(item.getDataChangeCreatedBy())) { - String username = userInfoHolder.getUser().getUserId(); - item.setDataChangeCreatedBy(username); - item.setDataChangeLastModifiedBy(username); - } - ItemDTO itemDTO = itemAPI.createItem(appId, env, clusterName, namespaceName, item); Cat.logEvent(CatEventType.MODIFY_NAMESPACE, String.format("%s+%s+%s+%s", appId, env, clusterName, namespaceName)); return itemDTO;