重构 item update api

apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/controller/ItemController.java

@@ -74,16 +74,18 @@ public class ItemController {
   }
 
   @PreAcquireNamespaceLock
-  @RequestMapping(path = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items", method = RequestMethod.PUT)
+  @RequestMapping(path = "/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{itemId}", method = RequestMethod.PUT)
   public ItemDTO update(@PathVariable("appId") String appId,
                         @PathVariable("clusterName") String clusterName,
-                        @PathVariable("namespaceName") String namespaceName, @RequestBody ItemDTO itemDTO) {
+                        @PathVariable("namespaceName") String namespaceName,
+                        @PathVariable("itemId") long itemId,
+                        @RequestBody ItemDTO itemDTO) {
 
     Item entity = BeanUtils.transfrom(Item.class, itemDTO);
 
     ConfigChangeContentBuilder builder = new ConfigChangeContentBuilder();
 
-    Item managedEntity = itemService.findOne(appId, clusterName, namespaceName, entity.getKey());
+    Item managedEntity = itemService.findOne(itemId);
     if (managedEntity == null) {
       throw new BadRequestException("item not exist");
     }

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/api/AdminServiceAPI.java

@@ -107,9 +107,9 @@ public class AdminServiceAPI {
                                  changeSets, Void.class, getAdminServiceHost(env), appId, clusterName, namespace);
     }
 
-    public void updateItem(String appId, Env env, String clusterName, String namespace, ItemDTO item) {
-      restTemplate.put("{host}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items",
-                                        item, getAdminServiceHost(env), appId, clusterName, namespace);
+    public void updateItem(String appId, Env env, String clusterName, String namespace, long itemId, ItemDTO item) {
+      restTemplate.put("{host}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items/{itemId}",
+                                        item, getAdminServiceHost(env), appId, clusterName, namespace, itemId);
 
     }
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/ConfigService.java

@@ -100,7 +100,7 @@ public class ConfigService {
   public void updateItem(String appId, Env env, String clusterName, String namespaceName, ItemDTO item) {
     String username = userInfoHolder.getUser().getUserId();
     item.setDataChangeLastModifiedBy(username);
-    itemAPI.updateItem(appId, env, clusterName, namespaceName, item);
+    itemAPI.updateItem(appId, env, clusterName, namespaceName, item.getId(), item);
   }
 
   public void deleteItem(Env env, long itemId) {