From 613e4c23043ab100c0b94917a755bfc22117f0da Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 15 Nov 2021 11:16:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E6=B7=B7=E6=B7=86?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4azure=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AzureDevopsWorkItemsBatchResponse.java    | 36 +++++++++++++++++++
 backend/src/main/java/io/metersphere/xpack    |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 backend/src/main/java/io/metersphere/track/issue/domain/azure/AzureDevopsWorkItemsBatchResponse.java

diff --git a/backend/src/main/java/io/metersphere/track/issue/domain/azure/AzureDevopsWorkItemsBatchResponse.java b/backend/src/main/java/io/metersphere/track/issue/domain/azure/AzureDevopsWorkItemsBatchResponse.java
new file mode 100644
index 0000000000..f1ed149436
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/track/issue/domain/azure/AzureDevopsWorkItemsBatchResponse.java
@@ -0,0 +1,36 @@
+package io.metersphere.track.issue.domain.azure;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+@Getter
+@Setter
+// 放xpack，代码混淆会导致 System.WorkItemType， System.Title 反序列化失败
+public class AzureDevopsWorkItemsBatchResponse {
+
+    private int count;
+    private List<Value> value;
+
+    @Getter
+    @Setter
+    public class Value {
+        private int id;
+        private int rev;
+        private Fields fields;
+        private String url;
+
+        @Getter
+        @Setter
+        public class Fields {
+            @JSONField(name = "System.Id")
+            private int systemId;
+            @JSONField(name = "System.WorkItemType")
+            private String systemWorkItemType;
+            @JSONField(name = "System.Title")
+            private String systemTitle;
+        }
+    }
+}
diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 40da0961b8..1eebba8448 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 40da0961b85d049dde0606a8876aaa9ffd3f0691
+Subproject commit 1eebba8448784bcda225edf6c8b0000a52ca1bd5