From b3427b07140c82c275e0fd84435ab5a5f11a484c Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 24 Dec 2021 14:08:13 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=A6=E6=83=85=E5=8F=98=E6=9B=B4=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=97=A0=E5=8F=98=E6=9B=B4=E8=AF=A6=E6=83=85=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009209 --user=王孝刚 [ github#8776]接口详情-变更历史无变更详情日志
https://www.tapd.cn/55049933/s/1086916
---
 .../log/utils/ApiDefinitionDiffUtil.java      |  5 +++++
 .../log/vo/api/DefinitionReference.java       |  1 +
 .../history/api/ApiDubboParameters.vue        | 21 +++++++++++++++++++
 .../history/api/ApiHistoryDetail.vue          |  4 ++++
 4 files changed, 31 insertions(+)

diff --git a/backend/src/main/java/io/metersphere/log/utils/ApiDefinitionDiffUtil.java b/backend/src/main/java/io/metersphere/log/utils/ApiDefinitionDiffUtil.java
index dabde05fce..1a31005ad9 100644
--- a/backend/src/main/java/io/metersphere/log/utils/ApiDefinitionDiffUtil.java
+++ b/backend/src/main/java/io/metersphere/log/utils/ApiDefinitionDiffUtil.java
@@ -324,6 +324,11 @@ public class ApiDefinitionDiffUtil {
     }
 
     private static void diffDubbo(MsDubboSampler dubboNew, MsDubboSampler dubboOld, JsonDiff jsonDiff, Map<String, String> diffMap) {
+        // Config对比
+        List<DetailColumn> interfaceColumns = getColumn(ReflexObjectUtil.getColumns(dubboNew.get_interface()), ReflexObjectUtil.getColumns(dubboOld.get_interface()));
+        if (CollectionUtils.isNotEmpty(interfaceColumns)) {
+            diffMap.put("interface", JSON.toJSONString(interfaceColumns));
+        }
         // Config对比
         List<DetailColumn> diffColumns = getColumn(ReflexObjectUtil.getColumns(dubboNew.getConfigCenter()), ReflexObjectUtil.getColumns(dubboOld.getConfigCenter()));
         if (CollectionUtils.isNotEmpty(diffColumns)) {
diff --git a/backend/src/main/java/io/metersphere/log/vo/api/DefinitionReference.java b/backend/src/main/java/io/metersphere/log/vo/api/DefinitionReference.java
index 8551b5c841..dbaac0ae2e 100644
--- a/backend/src/main/java/io/metersphere/log/vo/api/DefinitionReference.java
+++ b/backend/src/main/java/io/metersphere/log/vo/api/DefinitionReference.java
@@ -29,6 +29,7 @@ public class DefinitionReference {
         definitionColumns.put("response", "返回参数");
         definitionColumns.put("description", "描述");
         definitionColumns.put("followPeople", "关注人");
+        definitionColumns.put("remark", "备注");
         // 需要深度对比的字段，可以支持多个req1,req2
         definitionColumns.put("ms-dff-col", "request,response,tags");
 
diff --git a/frontend/src/business/components/history/api/ApiDubboParameters.vue b/frontend/src/business/components/history/api/ApiDubboParameters.vue
index 997207e97f..a4641cfc85 100644
--- a/frontend/src/business/components/history/api/ApiDubboParameters.vue
+++ b/frontend/src/business/components/history/api/ApiDubboParameters.vue
@@ -1,6 +1,25 @@
 <template>
   <div>
     <el-tabs v-model="activeName">
+      <el-tab-pane label="Interface" name="interface" v-if="request.interface && request.interface.length > 0">
+        <el-table :data="request.interface">
+          <el-table-column prop="columnTitle" :label="$t('operating_log.change_field')"/>
+          <el-table-column prop="originalValue" :label="$t('operating_log.before_change')">
+            <template v-slot:default="scope">
+              <el-tooltip :content="scope.row.originalValue">
+                <div class="current-value ms-tag-del">{{ scope.row.originalValue }}</div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <el-table-column prop="newValue" :label="$t('operating_log.after_change')">
+            <template v-slot:default="scope">
+              <el-tooltip :content="scope.row.newValue">
+                <div class="current-value ms-tag-add">{{ scope.row.newValue }}</div>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
       <el-tab-pane label="Config Center" name="config" v-if="request.config && request.config.length > 0">
         <el-table :data="request.config">
           <el-table-column prop="columnTitle" :label="$t('operating_log.change_field')"/>
@@ -91,6 +110,8 @@ export default {
       this.activeName = "args";
     } else if (this.request.attachment && this.request.attachment.length > 0) {
       this.activeName = "attachment";
+    } else if (this.request.interface && this.request.interface.length > 0) {
+      this.activeName = "interface";
     }
   },
   watch: {
diff --git a/frontend/src/business/components/history/api/ApiHistoryDetail.vue b/frontend/src/business/components/history/api/ApiHistoryDetail.vue
index dd941631a9..ee9c037071 100644
--- a/frontend/src/business/components/history/api/ApiHistoryDetail.vue
+++ b/frontend/src/business/components/history/api/ApiHistoryDetail.vue
@@ -218,6 +218,10 @@ export default {
       }
     },
     formatDubbo(diffValue) {
+      if (diffValue.interface) {
+        this.detail.interface = JSON.parse(diffValue.interface);
+        this.detail.headerId = getUUID();
+      }
       if (diffValue.config) {
         this.detail.config = JSON.parse(diffValue.config);
         this.detail.headerId = getUUID();