Merge branch 'hotfix-2.1.1' into 'master'

王灏 · 王灏 · commit daaace87e979 · 2022-07-29T11:22:19.000+08:00
Hotfix 2.1.1

See merge request hand-yanqianyun-yq-devops/choerodon-starters!19
diff --git a/choerodon-gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java b/choerodon-gitlab4j-api/src/main/java/org/gitlab4j/api/RepositoryApi.java
@@ -464,7 +464,7 @@ public InputStream getRawBlobContent(Integer projectId, String sha) throws GitLa
      */
     public InputStream getRepositoryArchive(Integer projectId, String sha) throws GitLabApiException {
         Form formData = new GitLabApiForm().withParam("sha", sha);
-        Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.MEDIA_TYPE_WILDCARD,
+        Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.WILDCARD,
                 "projects", projectId, "repository", "archive");
         return (response.readEntity(InputStream.class));
     }
diff --git a/choerodon-starter-asgard/pom.xml b/choerodon-starter-asgard/pom.xml
@@ -49,4 +49,4 @@
     </dependencies>
 
 
-</project>
+</project>
diff --git a/choerodon-starter-core/pom.xml b/choerodon-starter-core/pom.xml
@@ -25,4 +25,4 @@
     </dependencies>
 
 
-</project>
+</project>
diff --git a/choerodon-starter-fragment/pom.xml b/choerodon-starter-fragment/pom.xml
@@ -23,4 +23,4 @@
             <artifactId>hzero-starter-core</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/choerodon-starter-only-office/pom.xml b/choerodon-starter-only-office/pom.xml
@@ -53,4 +53,4 @@
 
     </dependencies>
 
-</project>
+</project>

Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ public InputStream getRawBlobContent(Integer projectId, String sha) throws GitLa`
`464`	`464`	`*/`
`465`	`465`	`public InputStream getRepositoryArchive(Integer projectId, String sha) throws GitLabApiException {`
`466`	`466`	`Form formData = new GitLabApiForm().withParam("sha", sha);`
`467`		`- Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.MEDIA_TYPE_WILDCARD,`
	`467`	`+ Response response = getWithAccepts(Response.Status.OK, formData.asMap(), MediaType.WILDCARD,`
`468`	`468`	`"projects", projectId, "repository", "archive");`
`469`	`469`	`return (response.readEntity(InputStream.class));`
`470`	`470`	`}`