Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码调整

Browse Source
This commit is contained in:
hongawen
2023-06-26 10:57:42 +08:00
parent b1c9b27083
commit c4324f2496
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-common/common-core/pom.xml
View File

@@ -29,6 +29,12 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-json</artifactId> <artifactId>spring-boot-starter-json</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- Actuator监控当前应用的健康，虚拟机等信息，通过前端以可视化的界面展示出来 --> <!-- Actuator监控当前应用的健康，虚拟机等信息，通过前端以可视化的界面展示出来 -->
<dependency> <dependency>

10
pqs-common/common-oss/pom.xml
View File

@@ -25,6 +25,16 @@
<groupId>com.njcn</groupId> <groupId>com.njcn</groupId>
<artifactId>huawei-obs-springboot-starter</artifactId> <artifactId>huawei-obs-springboot-starter</artifactId>
<version>1.0.0</version> <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>
<dependency> <dependency>

16
pqs-common/common-web/pom.xml
View File

@@ -36,12 +36,12 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<!-- <exclusions>--> <exclusions>
<!-- <exclusion>--> <exclusion>
<!-- <groupId>org.springframework.boot</groupId>--> <groupId>org.apache.logging.log4j</groupId>
<!-- <artifactId>spring-boot-starter-logging</artifactId>--> <artifactId>log4j-to-slf4j</artifactId>
<!-- </exclusion>--> </exclusion>
<!-- </exclusions>--> </exclusions>
</dependency> </dependency>
<!--防止XSS攻击的antiSamy--> <!--防止XSS攻击的antiSamy-->
<dependency> <dependency>
@@ -52,6 +52,10 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId> <artifactId>slf4j-simple</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/net.sf.json-lib/json-lib --> <!-- https://mvnrepository.com/artifact/net.sf.json-lib/json-lib -->

4
pqs-common/common-web/src/main/java/com/njcn/web/utils/RequestUtil.java
View File

@@ -1,6 +1,7 @@
package com.njcn.web.utils; package com.njcn.web.utils;
import cn.hutool.core.text.StrPool;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.nimbusds.jose.JWSObject; import com.nimbusds.jose.JWSObject;
@@ -13,7 +14,6 @@ import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpRequest;
@@ -52,7 +52,7 @@ public class RequestUtil {
// 从请求头获取 * 获取登录认证的客户端ID // 从请求头获取 * 获取登录认证的客户端ID
String basic = request.getHeader(SecurityConstants.AUTHORIZATION_KEY); String basic = request.getHeader(SecurityConstants.AUTHORIZATION_KEY);
if (StrUtil.isNotBlank(basic) && basic.startsWith(SecurityConstants.BASIC_PREFIX)) { 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); String basicPlainText = new String(Base64.getDecoder().decode(basic.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
clientId = basicPlainText.split(":")[0]; //client:secret clientId = basicPlainText.split(":")[0]; //client:secret
} }