#AI_commit# 添加了针对 MalformedChunkCodingException 的特殊处理

Author: SunPengWan

dss-git/dss-git-common/src/main/java/com.webank.wedatasphere.dss.git.common/protocol/config/GitServerConfig.java

@@ -23,4 +23,6 @@ public class GitServerConfig {
     public static final CommonVars<String> GIT_SEARCH_EXCLUDE_FILE = CommonVars.apply("wds.dss.server.git.search.exclude.file", ".properties,.projectmeta");
 
     public static final CommonVars<String> LINKIS_MYSQL_PRI_KEY = CommonVars.apply("wds.linkis.mysql.pri.key", "abc");
+
+    public static final CommonVars<Boolean> GIT_USE_ENTITY_UTILS_FOR_RESPONSE = CommonVars.apply("wds.dss.git.use.entity.utils", false);
 }

dss-git/dss-git-server/src/main/java/com/webank/wedatasphere/dss/git/utils/DSSGitUtils.java

@@ -449,24 +449,34 @@ public static boolean checkIfProjectExists(String gitToken, String projectPath)
     public static String getUserIdByUsername(String gitUrl, String gitToken, String username) throws GitErrorException, IOException {
         String url = gitUrl + "/api/v4/users?username=" + username;
         BufferedReader in = null;
+        boolean useEntityUtils = GitServerConfig.GIT_USE_ENTITY_UTILS_FOR_RESPONSE.getValue();
+        
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             HttpGet request = new HttpGet(url);
             request.addHeader("PRIVATE-TOKEN", gitToken);
 
             try (CloseableHttpResponse response = httpClient.execute(request)) {
                 int statusCode = response.getStatusLine().getStatusCode();
                 if (statusCode == 200) {
-                    in = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
-                    String inputLine;
-                    StringBuilder content = new StringBuilder();
+                    String responseBody;
+                    
+                    if (useEntityUtils) {
+                        // 使用 EntityUtils.toString() 方式读取响应
+                        responseBody = EntityUtils.toString(response.getEntity());
+                        logger.info("Response Body (using EntityUtils): " + responseBody);
+                    } else {
+                        // 保留原有的手动读取流方式
+                        in = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
+                        String inputLine;
+                        StringBuilder content = new StringBuilder();
 
-                    while ((inputLine = in.readLine()) != null) {
-                        content.append(inputLine);
+                        while ((inputLine = in.readLine()) != null) {
+                            content.append(inputLine);
+                        }
+                        responseBody = content.toString();
+                        logger.info("Response Body (using manual stream reading): " + responseBody);
                     }
 
-                    String responseBody = content.toString();
-                    logger.info("Response Body: " + responseBody);
-
                     JsonArray jsonArray = JsonParser.parseString(responseBody).getAsJsonArray();
 
                     if (jsonArray.size() > 0) {
@@ -479,6 +489,9 @@ public static String getUserIdByUsername(String gitUrl, String gitToken, String
                     throw new GitErrorException(80109, "获取userId失败，请检查编辑用户token是否过期或git服务是否正常");
                 }
             }
+        } catch (org.apache.http.MalformedChunkCodingException e) {
+            logger.error("HTTP chunked transfer encoding error: " + e.getMessage(), e);
+            throw new GitErrorException(80109, "HTTP响应解析错误，服务器返回的分块数据格式不正确", e);
         } catch (Exception e) {
             throw new GitErrorException(80109, "获取该git用户Id失败，原因为", e);
         } finally {