checkstyle

alibaba · Dec 18, 2024 · 4895e94 · 4895e94
1 parent 2838496
commit 4895e94
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/config/src/main/java/com/alibaba/nacos/config/server/controller/v2/HistoryControllerV2.java b/config/src/main/java/com/alibaba/nacos/config/server/controller/v2/HistoryControllerV2.java
@@ -120,7 +120,7 @@ public Result<ConfigHistoryInfo> getConfigHistoryInfo(@RequestParam("dataId") St
      * @param nid    history_config_info nid
      * @param dataId dataId  @since 2.0.3
      * @param group  groupId  @since 2.0.3
-     * @param tenant tenantId  @since 2.0.3
+     * @param namespaceId namespaceId  @since 2.0.3
      * @return history config info
      * @since 2.0.3 add {@link Secured}, dataId, groupId and tenant for history config permission check.
      */

diff --git a/config/src/main/java/com/alibaba/nacos/config/server/service/HistoryService.java b/config/src/main/java/com/alibaba/nacos/config/server/service/HistoryService.java
@@ -151,6 +151,7 @@ public ConfigHistoryInfoDetail getConfigHistoryInfoDetail(String dataId, String
             configHistoryInfoDetail.setOriginalExtInfo(StringUtils.EMPTY);
             configHistoryInfoDetail.setOriginalContent(StringUtils.EMPTY);
             configHistoryInfoDetail.setOriginalMd5(StringUtils.EMPTY);
+            configHistoryInfoDetail.setOriginalEncryptedDataKey(StringUtils.EMPTY);
         }
 
         //update
@@ -185,6 +186,7 @@ public ConfigHistoryInfoDetail getConfigHistoryInfoDetail(String dataId, String
                 configHistoryInfoDetail.setUpdatedContent(currentConfigInfo.getContent());
                 configHistoryInfoDetail.setUpdatedMd5(currentConfigInfo.getMd5());
                 configHistoryInfoDetail.setUpdatedEncryptedDataKey(currentConfigInfo.getEncryptedDataKey());
+
             }
         }