From 5fec89ef9212b32dd252d6b0097af5cc698dac55 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 27 Oct 2022 15:36:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE-?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=96=AD=E8=A8=80=E4=B8=ADjson=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E6=96=AD=E8=A8=80=E6=B7=BB=E5=8A=A0=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1019018 --user=宋天阳 [项目设置]项目环境-编辑项目环境-全局断言添加文档结果校验json格式失败
https://www.tapd.cn/55049933/s/1280284
---
 .../components/environment/EnvironmentEdit.vue    | 12 ++++++------
 .../assertion/ApiAssertionDuration.vue            | 10 ++++++----
 .../assertion/ApiAssertionJsonPath.vue            | 10 ++++++----
 .../environment/assertion/ApiAssertionRegex.vue   |  2 +-
 .../environment/assertion/ApiAssertionXPath2.vue  | 10 ++++++----
 .../environment/assertion/ApiAssertionsEdit.vue   |  6 +++---
 .../environment/assertion/GlobalAssertionText.vue |  4 ++--
 .../assertion/document/DocumentHeader.vue         |  6 +++---
 .../dialog/ErrorReportLibraryMaintainDialog.vue   |  6 ++----
 .../controller/HistoryReportController.java       |  2 +-
 .../controller/ReportStatShareController.java     |  2 +-
 .../service/EnterpriseTestReportService.java      |  2 +-
 .../service/ReportStatisticsService.java          | 15 ++++++++++-----
 13 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue b/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue
index c1faf88ffb..6ac53a5b60 100644
--- a/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/EnvironmentEdit.vue
@@ -246,14 +246,14 @@ export default {
       this.environment.config.authManager.hashTree = [];
     }
     if (!this.environment.config.assertions) {
-      this.environment.config.assertions = {
+      this.$set(this.environment.config, 'assertions', {
         duration: {duration: 0},
         regex: [],
         jsonPath: [],
         xpath2: [],
         jsr223: [],
-        document: {type: "json", data: {json: [], xml: []}},
-      };
+        document: {type: "JSON", data: {json: [], xml: []}},
+      });
     }
   },
 
@@ -295,14 +295,14 @@ export default {
         this.environment.config.authManager.hashTree = [];
       }
       if (!this.environment.config.assertions) {
-        this.environment.config.assertions = {
+        this.$set(this.environment.config, 'assertions', {
           duration: {duration: 0},
           regex: [],
           jsonPath: [],
           xpath2: [],
           jsr223: [],
-          document: {type: "json", data: {json: [], xml: []}},
-        };
+          document: {type: "JSON", data: {json: [], xml: []}},
+        });
       }
 
       this.isRefresh = false;
diff --git a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionDuration.vue b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionDuration.vue
index 7bb9996f06..97cc89b1ba 100644
--- a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionDuration.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionDuration.vue
@@ -10,9 +10,11 @@
       </el-col>
       <el-col class="assertion-btn">
         <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top" v-if="edit">
-          <el-switch v-model="duration.enable" class="enable-switch" size="mini" :disabled="isReadOnly" style="width: 30px;margin-right: 10px"/>
+          <el-switch v-model="duration.enable" class="enable-switch" size="mini" :disabled="isReadOnly"
+                     style="width: 30px;margin-right: 10px"/>
         </el-tooltip>
-        <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove" v-if="edit"/>
+        <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove"
+                   v-if="edit"/>
         <el-button :disabled="isReadOnly" type="primary" size="mini" @click="add" v-else>
           {{ $t('api_test.request.assertions.add') }}
         </el-button>
@@ -71,7 +73,7 @@ export default {
 <style scoped>
 
 .assertion-btn {
-  text-align: center;
-  width: 80px;
+  text-align: right;
+  width: 180px;
 }
 </style>
diff --git a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionJsonPath.vue b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionJsonPath.vue
index 62532a8415..91a4400b91 100644
--- a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionJsonPath.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionJsonPath.vue
@@ -27,9 +27,11 @@
       </el-col>
       <el-col class="assertion-btn">
         <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top" v-if="edit">
-          <el-switch v-model="jsonPath.enable" class="enable-switch" size="mini" :disabled="isReadOnly" style="width: 30px;margin-right: 10px"/>
+          <el-switch v-model="jsonPath.enable" class="enable-switch" size="mini" :disabled="isReadOnly"
+                     style="width: 30px;margin-right: 10px"/>
         </el-tooltip>
-        <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove" v-if="edit"/>
+        <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove"
+                   v-if="edit"/>
         <el-button :disabled="isReadOnly" type="primary" size="mini" @click="add" v-else>
           {{ $t('api_test.request.assertions.add') }}
         </el-button>
@@ -124,7 +126,7 @@ export default {
 }
 
 .assertion-btn {
-  text-align: center;
-  width: 80px;
+  text-align: right;
+  width: 180px;
 }
 </style>
diff --git a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionRegex.vue b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionRegex.vue
index 33daa97cad..bf9c0e9f31 100644
--- a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionRegex.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionRegex.vue
@@ -116,7 +116,7 @@ export default {
 }
 
 .assertion-btn {
-  text-align: center;
+  text-align: right;
   width: 180px;
 }
 </style>
diff --git a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionXPath2.vue b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionXPath2.vue
index ffa73eb815..6c1997d8eb 100644
--- a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionXPath2.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionXPath2.vue
@@ -7,9 +7,11 @@
       </el-col>
       <el-col class="assertion-btn">
         <el-tooltip :content="$t('test_resource_pool.enable_disable')" placement="top" v-if="edit">
-          <el-switch v-model="xPath2.enable" class="enable-switch" size="mini" :disabled="isReadOnly" style="width: 30px;margin-right:10px"/>
+          <el-switch v-model="xPath2.enable" class="enable-switch" size="mini" :disabled="isReadOnly"
+                     style="width: 30px;margin-right:10px"/>
         </el-tooltip>
-        <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove" v-if="edit"/>
+        <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove"
+                   v-if="edit"/>
         <el-button :disabled="isReadOnly" type="primary" size="mini" @click="add" v-else>
           {{ $t('api_test.request.assertions.add') }}
         </el-button>
@@ -60,7 +62,7 @@ export default {
 
 <style scoped>
 .assertion-btn {
-  text-align: center;
-  width: 80px;
+  text-align: right;
+  width: 180px;
 }
 </style>
diff --git a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionsEdit.vue b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionsEdit.vue
index d6eee4c8d1..028abfb801 100644
--- a/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionsEdit.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/assertion/ApiAssertionsEdit.vue
@@ -116,7 +116,7 @@ export default {
   computed: {
     isShow() {
       let rt = this.assertions.duration;
-      return rt.value  && rt.value !== 0;
+      return rt.value && rt.value !== 0;
     },
     isDocument() {
       return this.assertions.document && this.assertions.document.data && (this.assertions.document.data.json.length > 0 || this.assertions.document.data.xml.length > 0);
@@ -176,7 +176,7 @@ export default {
 }
 
 .assertion-remove-btn {
-  text-align: center;
-  width: 80px;
+  text-align: right;
+  width: 180px;
 }
 </style>
diff --git a/framework/sdk-parent/frontend/src/components/environment/assertion/GlobalAssertionText.vue b/framework/sdk-parent/frontend/src/components/environment/assertion/GlobalAssertionText.vue
index 29424b307e..c3aa8cb2d1 100644
--- a/framework/sdk-parent/frontend/src/components/environment/assertion/GlobalAssertionText.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/assertion/GlobalAssertionText.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import {Regex, ASSERTION_REGEX_SUBJECT} from "../../../model/ApiTestModel";
+import {ASSERTION_REGEX_SUBJECT, Regex} from "../../../model/ApiTestModel";
 
 export default {
   name: "MsApiAssertionText",
@@ -123,6 +123,6 @@ export default {
 }
 
 .assertion-btn {
-  width: 60px;
+  width: 180px;
 }
 </style>
diff --git a/framework/sdk-parent/frontend/src/components/environment/assertion/document/DocumentHeader.vue b/framework/sdk-parent/frontend/src/components/environment/assertion/document/DocumentHeader.vue
index cf62c1cc92..7e94feeb71 100644
--- a/framework/sdk-parent/frontend/src/components/environment/assertion/document/DocumentHeader.vue
+++ b/framework/sdk-parent/frontend/src/components/environment/assertion/document/DocumentHeader.vue
@@ -37,7 +37,7 @@ export default {
   methods: {
     add() {
       let obj = new AssertionDocument({id: "root"});
-      if (this.document.type === "JSON" && this.document.data.json.length === 0) {
+      if (this.document.type === "JSON" || this.document.type === "json" && this.document.data.json.length === 0) {
         this.document.data.json.push(obj);
       }
       if (this.document.type === "XML" && this.document.data.xml.length === 0) {
@@ -62,7 +62,7 @@ export default {
 
 <style scoped>
 .assertion-btn {
-  text-align: center;
-  width: 60px;
+  text-align: right;
+  width: 180px;
 }
 </style>
diff --git a/project-management/frontend/src/business/menu/errorreportlibrary/components/dialog/ErrorReportLibraryMaintainDialog.vue b/project-management/frontend/src/business/menu/errorreportlibrary/components/dialog/ErrorReportLibraryMaintainDialog.vue
index 33d670c4d0..0aae2323ce 100644
--- a/project-management/frontend/src/business/menu/errorreportlibrary/components/dialog/ErrorReportLibraryMaintainDialog.vue
+++ b/project-management/frontend/src/business/menu/errorreportlibrary/components/dialog/ErrorReportLibraryMaintainDialog.vue
@@ -112,9 +112,7 @@
 
 <script>
 
-import {
-  getCurrentProjectID, getCurrentUserId
-} from "metersphere-frontend/src/utils/token";
+import {getCurrentProjectID, getCurrentUserId} from "metersphere-frontend/src/utils/token";
 import {listenGoBack, removeGoBackListener} from "metersphere-frontend/src/utils";
 import MsFormDivider from "metersphere-frontend/src/components/MsFormDivider";
 import {ASSERTION_REGEX_SUBJECT, ASSERTION_TYPE, Regex} from "metersphere-frontend/src/model/ApiTestModel";
@@ -154,7 +152,7 @@ export default {
           jsonPath: [],
           xpath2: [],
           jsr223: [],
-          document: {type: "json", data: {json: [], xml: []}},
+          document: {type: "JSON", data: {json: [], xml: []}},
         },
       },
       rules: {
diff --git a/report-stat/backend/src/main/java/io/metersphere/reportstatistics/controller/HistoryReportController.java b/report-stat/backend/src/main/java/io/metersphere/reportstatistics/controller/HistoryReportController.java
index 7dab9fb61e..f690546f22 100644
--- a/report-stat/backend/src/main/java/io/metersphere/reportstatistics/controller/HistoryReportController.java
+++ b/report-stat/backend/src/main/java/io/metersphere/reportstatistics/controller/HistoryReportController.java
@@ -54,6 +54,6 @@ public class HistoryReportController {
 
     @PostMapping("/selectById")
     public ReportStatisticsWithBLOBs selectById(@RequestBody ReportStatisticsSaveRequest request) {
-        return reportStatisticsService.selectById(request.getId());
+        return reportStatisticsService.selectById(request.getId(), false);
     }
 }
diff --git a/report-stat/backend/src/main/java/io/metersphere/reportstatistics/controller/ReportStatShareController.java b/report-stat/backend/src/main/java/io/metersphere/reportstatistics/controller/ReportStatShareController.java
index 876a4344ce..832746cdc2 100644
--- a/report-stat/backend/src/main/java/io/metersphere/reportstatistics/controller/ReportStatShareController.java
+++ b/report-stat/backend/src/main/java/io/metersphere/reportstatistics/controller/ReportStatShareController.java
@@ -18,6 +18,6 @@ public class ReportStatShareController {
 
     @PostMapping("/select/report/by/id")
     public ReportStatisticsWithBLOBs selectById(@RequestBody ReportStatisticsSaveRequest request) {
-        return reportStatisticsService.selectById(request.getId());
+        return reportStatisticsService.selectById(request.getId(), true);
     }
 }
\ No newline at end of file
diff --git a/report-stat/backend/src/main/java/io/metersphere/reportstatistics/service/EnterpriseTestReportService.java b/report-stat/backend/src/main/java/io/metersphere/reportstatistics/service/EnterpriseTestReportService.java
index e845e66ab8..4243621165 100644
--- a/report-stat/backend/src/main/java/io/metersphere/reportstatistics/service/EnterpriseTestReportService.java
+++ b/report-stat/backend/src/main/java/io/metersphere/reportstatistics/service/EnterpriseTestReportService.java
@@ -476,7 +476,7 @@ public class EnterpriseTestReportService {
             List<ReportStatisticsWithBLOBs> bloBsList = new ArrayList<>();
             for (EnterpriseReportContentStep step : stepList) {
                 //定时任务触发的数据，需要检查图片是否需要重新生成
-                ReportStatisticsWithBLOBs reportStatisticsWithBLOBs = reportStatisticsService.selectById(step.getReportRecordId());
+                ReportStatisticsWithBLOBs reportStatisticsWithBLOBs = reportStatisticsService.selectById(step.getReportRecordId(), false);
                 if (reportStatisticsWithBLOBs != null) {
                     boolean needSyncImage = reportStatisticsService.isReportNeedUpdate(reportStatisticsWithBLOBs);
                     if (needSyncImage) {
diff --git a/report-stat/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java b/report-stat/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
index 885808dda0..2abd1b4e76 100644
--- a/report-stat/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
+++ b/report-stat/backend/src/main/java/io/metersphere/reportstatistics/service/ReportStatisticsService.java
@@ -4,10 +4,7 @@ import io.metersphere.base.domain.ReportStatistics;
 import io.metersphere.base.domain.ReportStatisticsExample;
 import io.metersphere.base.domain.ReportStatisticsWithBLOBs;
 import io.metersphere.base.mapper.ReportStatisticsMapper;
-import io.metersphere.commons.utils.CommonBeanFactory;
-import io.metersphere.commons.utils.JSON;
-import io.metersphere.commons.utils.LogUtil;
-import io.metersphere.commons.utils.SessionUtils;
+import io.metersphere.commons.utils.*;
 import io.metersphere.dto.BaseSystemConfigDTO;
 import io.metersphere.reportstatistics.dto.*;
 import io.metersphere.reportstatistics.dto.charts.Series;
@@ -74,11 +71,16 @@ public class ReportStatisticsService {
         return reportStatisticsMapper.deleteByPrimaryKey(id);
     }
 
-    public ReportStatisticsWithBLOBs selectById(String id) {
+    public ReportStatisticsWithBLOBs selectById(String id, boolean isRemoteRequest) {
         ReportStatisticsWithBLOBs blob = reportStatisticsMapper.selectByPrimaryKey(id);
         if (blob == null) {
             return null;
         }
+        if (isRemoteRequest) {
+            //通过接口进行的请求时没有session的
+            HttpHeaderUtils.runAsUser(blob.getCreateUser());
+        }
+
         Map<String, Object> selectOption = JSON.parseObject(blob.getSelectOption(), Map.class);
         Map<String, Object> dataOption = JSON.parseObject(blob.getDataOption(), Map.class);
         boolean isReportNeedUpdate = this.isReportNeedUpdate(blob);
@@ -90,6 +92,9 @@ public class ReportStatisticsService {
             }
         }
 
+        if (isRemoteRequest) {
+            HttpHeaderUtils.clearUser();
+        }
         if (!dataOption.containsKey("showTable")) {
             if (dataOption.get("tableData") != null) {
                 String tableDataJsonStr = JSON.toJSONString(dataOption.get("tableData"));