Merge pull request #2333 from jsonwan/github_master

Merge: 3.7.x->master

src/backend/job-analysis/service-job-analysis/src/main/java/com/tencent/bk/job/analysis/service/remote/TaskPlanServiceImpl.java

@@ -50,6 +50,6 @@ public List<Long> listTaskPlanIds(Long templateId) {
 
     @Override
     public ServiceTaskPlanDTO getTaskPlanById(Long appId, Long planId) {
-        return taskPlanResourceClient.getPlanById(appId, planId, true).getData();
+        return taskPlanResourceClient.getPlanById(appId, planId, false).getData();
     }
 }

src/backend/job-file-gateway/boot-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/config/FilterConfig.java

@@ -0,0 +1,49 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
+ *
+ * License for BK-JOB蓝鲸智云作业平台:
+ * --------------------------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+package com.tencent.bk.job.file_gateway.config;
+
+import com.tencent.bk.job.common.web.filter.RepeatableReadWriteServletRequestResponseFilter;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FilterConfig {
+    @Bean
+    public FilterRegistrationBean repeatableRSRRFilterRegister() {
+        FilterRegistrationBean<RepeatableReadWriteServletRequestResponseFilter> registration =
+            new FilterRegistrationBean<>();
+        registration.setFilter(repeatableRRRFilter());
+        registration.addUrlPatterns("/esb/api/*");
+        registration.setName("repeatableReadRequestResponseFilter");
+        registration.setOrder(0);
+        return registration;
+    }
+
+    @Bean(name = "repeatableReadRequestResponseFilter")
+    public RepeatableReadWriteServletRequestResponseFilter repeatableRRRFilter() {
+        return new RepeatableReadWriteServletRequestResponseFilter();
+    }
+}