feature: 提供文件源管理、凭据管理相关ESB API TencentBlueKing#92

hLinx · Sep 16, 2021 · ff53958 · ff53958
1 parent 8a9ab22
commit ff53958
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...java/com/tencent/bk/job/manage/model/esb/v3/request/EsbCreateOrUpdateCredentialV3Req.java b/...java/com/tencent/bk/job/manage/model/esb/v3/request/EsbCreateOrUpdateCredentialV3Req.java
@@ -76,10 +76,12 @@ public class EsbCreateOrUpdateCredentialV3Req extends EsbReq {
     /**
      * Username
      */
-    private String username;
+    @JsonProperty("username")
+    private String credentialUsername;
 
     /**
      * Password
      */
-    private String password;
+    @JsonProperty("password")
+    private String credentialPassword;
 }
diff --git a/.../src/main/java/com/tencent/bk/job/manage/api/esb/impl/v3/EsbCredentialResourceV3Impl.java b/.../src/main/java/com/tencent/bk/job/manage/api/esb/impl/v3/EsbCredentialResourceV3Impl.java
@@ -73,7 +73,7 @@ private EsbResp<EsbCredentialSimpleInfoV3DTO> saveCredential(EsbCreateOrUpdateCr
         CredentialCreateUpdateReq createUpdateReq = convertToCreateUpdateReq(req);
         InnerServiceResponse<ServiceBasicCredentialDTO> resp =
             credentialService.createCredential(
-                req.getUsername(),
+                req.getUserName(),
                 req.getAppId(),
                 createUpdateReq
             );
@@ -104,13 +104,13 @@ private CredentialCreateUpdateReq convertToCreateUpdateReq(
         if (SECRET_KEY.name().equals(type)) {
             createUpdateReq.setValue1(req.getSecretKey());
         } else if (PASSWORD.name().equals(type)) {
-            createUpdateReq.setValue1(req.getPassword());
+            createUpdateReq.setValue1(req.getCredentialPassword());
         } else if (APP_ID_SECRET_KEY.name().equals(type)) {
             createUpdateReq.setValue1(req.getAccessKey());
             createUpdateReq.setValue2(req.getSecretKey());
         } else if (USERNAME_PASSWORD.name().equals(type)) {
-            createUpdateReq.setValue1(req.getUsername());
-            createUpdateReq.setValue2(req.getPassword());
+            createUpdateReq.setValue1(req.getCredentialUsername());
+            createUpdateReq.setValue2(req.getCredentialPassword());
         } else {
             throw new InvalidParamException(
                 "type",