Merge pull request #32 from hejieehe/bug_31

bug: 修复sdk方法传参异常 #31

Author: mingshewhe

buildSrc/src/main/kotlin/Versions.kt

@@ -1,6 +1,6 @@
 object Release {
     const val Group = "com.tencent.bk.devops.scm"
-    const val Version = "1.1.0"
+    const val Version = "1.1.1"
 }
 
 object Versions {

devops-scm-api/src/main/kotlin/com/tencent/devops/scm/api/pojo/HookEvents.kt

@@ -1,5 +1,6 @@
 package com.tencent.devops.scm.api.pojo
 
+import com.fasterxml.jackson.annotation.JsonIgnore
 import com.tencent.devops.scm.api.enums.ScmEventType
 
 data class HookEvents(
@@ -31,6 +32,7 @@ data class HookEvents(
     /**
      * 获取启用的事件类型
      */
+    @JsonIgnore
     fun getEnabledEvents(): List<String> = mutableListOf<String>().apply {
         if (issue == true) add(ScmEventType.ISSUE.value)
         if (issueComment == true) add(ScmEventType.ISSUE_COMMENT.value)

devops-scm-sdk/devops-scm-sdk-tgit/src/main/java/com/tencent/devops/scm/sdk/tgit/TGitMergeRequestApi.java

@@ -170,7 +170,7 @@ public TGitMergeRequest getMergeRequestChanges(Object projectIdOrPath, Long merg
                                 .add("merge_request_id", mergeRequestId.toString())
                                 .build()
                 )
-                .with(repoId)
+                .withRepoId(repoId)
                 .fetch(TGitMergeRequest.class);
     }
 

devops-scm-sdk/devops-scm-sdk-tgit/src/main/java/com/tencent/devops/scm/sdk/tgit/TGitProjectApi.java

@@ -292,7 +292,7 @@ public List<TGitMember> getProjectMembers(Object projectIdOrPath, String query,
                 .withRepoId(repoId)
                 .with(PAGE_PARAM, page)
                 .with(PER_PAGE_PARAM, perPage)
-                .with(query, query)
+                .with("query", query)
                 .fetch(TGitMember[].class);
         return Arrays.asList(data);
     }
@@ -310,7 +310,7 @@ public List<TGitMember> getAllMembers(Object projectIdOrPath, String query, Inte
                 .withRepoId(repoId)
                 .with(PAGE_PARAM, page)
                 .with(PER_PAGE_PARAM, perPage)
-                .with(query, query)
+                .with("query", query)
                 .fetch(TGitMember[].class);
         return Arrays.asList(data);
     }