From f79a63d09c431225fd4e9d905746ea5f930fd7e2 Mon Sep 17 00:00:00 2001 From: zengxiaobo Date: Sun, 28 Apr 2024 16:11:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/support/PayloadDifferentiator.java | 3 ++- .../foundation/unittest/support/h2/JsonFunctions.java | 6 +++--- .../unittest/support/h2/StringFunctions.java | 4 ++-- .../web/support/config/DefaultWebMvcConfig.java | 2 +- .../axzo/foundation/web/support/rpc/RequestParams.java | 10 +++------- .../cn/axzo/foundation/web/support/rpc/RpcClient.java | 8 ++++---- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/event-support-lib/src/main/java/cn/axzo/foundation/event/support/PayloadDifferentiator.java b/event-support-lib/src/main/java/cn/axzo/foundation/event/support/PayloadDifferentiator.java index 6f4d1f1..42de47b 100644 --- a/event-support-lib/src/main/java/cn/axzo/foundation/event/support/PayloadDifferentiator.java +++ b/event-support-lib/src/main/java/cn/axzo/foundation/event/support/PayloadDifferentiator.java @@ -1,5 +1,6 @@ package cn.axzo.foundation.event.support; +import cn.axzo.foundation.util.FastjsonUtils; import com.alibaba.fastjson.JSONObject; import lombok.NonNull; @@ -16,7 +17,7 @@ public interface PayloadDifferentiator { * 建议使用 FastjsonUtils.diffJson() 产生 diff 数据 * @param payload * @return diff 文本. - * @see com.fiture.bfs.utils.FastjsonUtils.diffJson() + * @see cn.axzo.foundation.util.FastjsonUtils#diffJson */ String buildDiffText(@NonNull JSONObject payload); } diff --git a/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/h2/JsonFunctions.java b/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/h2/JsonFunctions.java index 07fbae1..a9c7912 100644 --- a/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/h2/JsonFunctions.java +++ b/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/h2/JsonFunctions.java @@ -22,9 +22,9 @@ import java.util.stream.Stream; /** * 用于支持h2兼容mysql中json的函数 * eg: - * CREATE ALIAS `JSON_EXTRACT` FOR "com.fiture.bfs.unittest.h2.JsonFunctions.extract"; - * CREATE ALIAS `JSON_CONTAINS` FOR "com.fiture.bfs.unittest.h2.JsonFunctions.contains"; - * CREATE ALIAS `JSON_LENGTH` FOR "com.fiture.bfs.unittest.h2.JsonFunctions.length"; + * CREATE ALIAS `JSON_EXTRACT` FOR "cn.axzo.foundation.unittest.support.h2.JsonFunctions.extract"; + * CREATE ALIAS `JSON_CONTAINS` FOR "cn.axzo.foundation.unittest.support.h2.JsonFunctions.contains"; + * CREATE ALIAS `JSON_LENGTH` FOR "cn.axzo.foundation.unittest.support.h2.JsonFunctions.length"; * * NOTE: JSON.parse(json, Feature.AutoCloseSource)其中Feature.AutoCloseSource是为了兼容fastjson2. 默认该feature在JSON中已经开启 */ diff --git a/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/h2/StringFunctions.java b/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/h2/StringFunctions.java index 925e36f..2ab82e2 100644 --- a/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/h2/StringFunctions.java +++ b/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/h2/StringFunctions.java @@ -6,12 +6,12 @@ import java.util.Objects; /** * 用于支持h2兼容mysql中string的函数 * eg: - * CREATE ALIAS FIND_IN_SET FOR "com.fiture.bfs.unittest.h2.StringFunctions.findInSet"; + * CREATE ALIAS FIND_IN_SET FOR "cn.axzo.foundation.unittest.support.h2.StringFunctions.findInSet"; */ public class StringFunctions { /** - * CREATE ALIAS FIND_IN_SET FOR "com.fiture.bfs.unittest.h2.StringFunctions.findInSet"; + * CREATE ALIAS FIND_IN_SET FOR "cn.axzo.foundation.unittest.support.h2.StringFunctions.findInSet"; */ public static Integer findInSet(String str, String strList) { if (!Objects.isNull(str) && !Objects.isNull(strList)) { diff --git a/web-support-lib/src/main/java/cn/axzo/foundation/web/support/config/DefaultWebMvcConfig.java b/web-support-lib/src/main/java/cn/axzo/foundation/web/support/config/DefaultWebMvcConfig.java index ae56966..b32768e 100644 --- a/web-support-lib/src/main/java/cn/axzo/foundation/web/support/config/DefaultWebMvcConfig.java +++ b/web-support-lib/src/main/java/cn/axzo/foundation/web/support/config/DefaultWebMvcConfig.java @@ -133,7 +133,7 @@ public class DefaultWebMvcConfig extends DelegatingWebMvcConfiguration implement // https://baijiahao.baidu.com/s?id=1671603044044877345&wfr=spider&for=pc // 使用安全模式，关闭 AutoType - //TODO 为了适配现有的fiture项目. 降低版本不支持该方法 + //TODO 为了适配现有的项目. 降低版本不支持该方法 //ParserConfig.getGlobalInstance().setSafeMode(true); } diff --git a/web-support-lib/src/main/java/cn/axzo/foundation/web/support/rpc/RequestParams.java b/web-support-lib/src/main/java/cn/axzo/foundation/web/support/rpc/RequestParams.java index 44ec34b..b4fca73 100644 --- a/web-support-lib/src/main/java/cn/axzo/foundation/web/support/rpc/RequestParams.java +++ b/web-support-lib/src/main/java/cn/axzo/foundation/web/support/rpc/RequestParams.java @@ -23,14 +23,11 @@ import java.util.stream.Collectors; @AllArgsConstructor public class RequestParams { private static final String AUTHORIZATION_HEADER_TOKEN_PREFIX = "Bearer "; - @Deprecated - private static final String LEGACY_AUTHORIZATION_HEADER_NAME = "Authorization"; - private static final String AUTHORIZATION_HEADER_NAME = "Bfs-Authorization"; + private static final String AUTHORIZATION_HEADER_NAME = "Axzo-Authorization"; private static final int MAX_REQUEST_BODY_LOG_SIZE = 1024; - private static final ImmutableSet PRETTY_PRINT_HEADERS = ImmutableSet.of("fiture-session"); - private static final ImmutableSet IGNORE_PRINT_HEADERS = ImmutableSet.of(LEGACY_AUTHORIZATION_HEADER_NAME, AUTHORIZATION_HEADER_NAME, - "User-Agent", "_HTTP_APP_CLIENT_OBJECT", "_HTTP_SESSION_OBJECT", "_EMPLOYEE_PRINCIPAL"); + private static final ImmutableSet PRETTY_PRINT_HEADERS = ImmutableSet.of("userinfo"); + private static final ImmutableSet IGNORE_PRINT_HEADERS = ImmutableSet.of(AUTHORIZATION_HEADER_NAME, "User-Agent"); @Getter Map headers; @@ -135,7 +132,6 @@ public class RequestParams { public void addAuthorization(String token) { String authToken = AUTHORIZATION_HEADER_TOKEN_PREFIX + token; addHeader(AUTHORIZATION_HEADER_NAME, authToken); - addHeader(LEGACY_AUTHORIZATION_HEADER_NAME, authToken); } public void addHeader(String name, String value) { diff --git a/web-support-lib/src/main/java/cn/axzo/foundation/web/support/rpc/RpcClient.java b/web-support-lib/src/main/java/cn/axzo/foundation/web/support/rpc/RpcClient.java index bb3cba9..d2dda46 100644 --- a/web-support-lib/src/main/java/cn/axzo/foundation/web/support/rpc/RpcClient.java +++ b/web-support-lib/src/main/java/cn/axzo/foundation/web/support/rpc/RpcClient.java @@ -109,14 +109,14 @@ public interface RpcClient { }); } - Set FITURE_HEADERS = ImmutableSet.of(); + Set AXZO_HEADERS = ImmutableSet.of(); // XXX: http/2会把所有Header都转成小写, 历史定义的Header都是大写的，在http/2协议下会透传失败。 - TreeSet CASE_INSENSITIVE_FITURE_HEADERS = FITURE_HEADERS.stream() + TreeSet CASE_INSENSITIVE_AXZO_HEADERS = AXZO_HEADERS.stream() .collect(Collectors.toCollection(() -> new TreeSet<>(String.CASE_INSENSITIVE_ORDER))); - // 将fiture-开头的header复制到请求的下一跳 - String BFS_HEADER_PREFIX = "fiture-"; + // 将axzo-开头的header复制到请求的下一跳 + String AZXO_HEADER_PREFIX = "axzo-"; List>> DEFAULT_HEADER_SUPPLIERS = ImmutableList.of();