From c4324f249619c43a84c881d842a86ab290e012dc Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Mon, 26 Jun 2023 10:57:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-common/common-core/pom.xml                   |  6 ++++++
 pqs-common/common-oss/pom.xml                    | 10 ++++++++++
 pqs-common/common-web/pom.xml                    | 16 ++++++++++------
 .../java/com/njcn/web/utils/RequestUtil.java     |  4 ++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/pqs-common/common-core/pom.xml b/pqs-common/common-core/pom.xml
index 2ad0cc9c1..8411d6dcc 100644
--- a/pqs-common/common-core/pom.xml
+++ b/pqs-common/common-core/pom.xml
@@ -29,6 +29,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-json</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Actuator监控当前应用的健康，虚拟机等信息，通过前端以可视化的界面展示出来 -->
         <dependency>
diff --git a/pqs-common/common-oss/pom.xml b/pqs-common/common-oss/pom.xml
index 64bb047e2..7ccd85af5 100644
--- a/pqs-common/common-oss/pom.xml
+++ b/pqs-common/common-oss/pom.xml
@@ -25,6 +25,16 @@
             <groupId>com.njcn</groupId>
             <artifactId>huawei-obs-springboot-starter</artifactId>
             <version>1.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/pqs-common/common-web/pom.xml b/pqs-common/common-web/pom.xml
index c6319f124..429062075 100644
--- a/pqs-common/common-web/pom.xml
+++ b/pqs-common/common-web/pom.xml
@@ -36,12 +36,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>org.springframework.boot</groupId>-->
-<!--                    <artifactId>spring-boot-starter-logging</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.logging.log4j</groupId>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--防止XSS攻击的antiSamy-->
         <dependency>
@@ -52,6 +52,10 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-simple</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <!-- https://mvnrepository.com/artifact/net.sf.json-lib/json-lib -->
diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/RequestUtil.java b/pqs-common/common-web/src/main/java/com/njcn/web/utils/RequestUtil.java
index 14144a104..cb811298f 100644
--- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/RequestUtil.java
+++ b/pqs-common/common-web/src/main/java/com/njcn/web/utils/RequestUtil.java
@@ -1,6 +1,7 @@
 package com.njcn.web.utils;
 
 
+import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.nimbusds.jose.JWSObject;
@@ -13,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpRequest;
@@ -52,7 +52,7 @@ public class RequestUtil {
         // 从请求头获取     * 获取登录认证的客户端ID
         String basic = request.getHeader(SecurityConstants.AUTHORIZATION_KEY);
         if (StrUtil.isNotBlank(basic) && basic.startsWith(SecurityConstants.BASIC_PREFIX)) {
-            basic = basic.replace(SecurityConstants.BASIC_PREFIX, Strings.EMPTY);
+            basic = basic.replace(SecurityConstants.BASIC_PREFIX, "");
             String basicPlainText = new String(Base64.getDecoder().decode(basic.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
             clientId = basicPlainText.split(":")[0]; //client:secret
         }