diff --git a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java b/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java index b5681aac8b..d9737394d9 100644 --- a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java +++ b/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java @@ -90,7 +90,7 @@ public final class AesUtil { // encode content to byte array byte[] byteAes = cipher.doFinal(byteEncode); // base64 encode content - return new String(Base64.getEncoder().encode(byteAes), StandardCharsets.UTF_8); + return Base64.getEncoder().encodeToString(byteAes); } catch (Exception e) { log.error("aes encode content error: {}", e.getMessage(), e); return content; diff --git a/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/ServiceAccountService.java b/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/ServiceAccountService.java index cc504c1df7..bb0be32315 100644 --- a/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/ServiceAccountService.java +++ b/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/ServiceAccountService.java @@ -194,9 +194,9 @@ public class ServiceAccountService { private HttpHeaders createHeaders() { String auth = username + SignConstants.DOUBLE_MARK + password; - byte[] encodedAuth = Base64.getEncoder().encode(auth.getBytes(StandardCharsets.UTF_8)); + String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes(StandardCharsets.UTF_8)); String authHeader = NetworkConstants.BASIC - + SignConstants.BLANK + new String(encodedAuth); + + SignConstants.BLANK + encodedAuth; HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON);