zhuyijun/zyjblogs-parent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、去掉冗余配置

Browse Source
This commit is contained in:
朱毅骏 2023-04-07 14:51:57 +08:00
parent c17cc727e7
commit 33f2205f8e
7 changed files with 10 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/zyjblogs-gateway/src/main/java/cn/zyjblogs/filter/WhiteListProperties.java
View File

@ -3,6 +3,7 @@ package cn.zyjblogs.filter;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import java.util.LinkedList;
import java.util.List;
/**
@ -14,5 +15,5 @@ import java.util.List;
@ConfigurationProperties(prefix = "zyjblogs.whilelist")
public class WhiteListProperties {
private List<String> allowPaths;
private List<String> allowPaths = new LinkedList<>();
}

6
server/zyjblogs-oauth/src/main/java/cn/zyjblogs/config/security/OauthUserAuthenticationConverter.java
View File

@ -28,9 +28,9 @@ public class OauthUserAuthenticationConverter extends DefaultUserAuthenticationC
@Override
public Authentication extractAuthentication(Map<String, ?> map) {
OauthUserDetails oauthUserDetails = new OauthUserDetails();
Object user_name = map.get(ContextKeyConstant.USERNAME_KEY);
if (user_name != null) {
oauthUserDetails.setUsername(user_name.toString());
Object userName = map.get(ContextKeyConstant.USERNAME_KEY);
if (userName != null) {
oauthUserDetails.setUsername(userName.toString());
if (map.containsKey(ContextKeyConstant.USER_ID_KEY)) {
oauthUserDetails.setId((String) map.get(ContextKeyConstant.USER_ID_KEY));
}

4
stater/zyjblogs-common-spring-boot-starter/src/main/java/cn/zyjblogs/starter/common/autoconfigure/rsa/OauthAutoConfiguration.java → stater/zyjblogs-common-spring-boot-starter/src/main/java/cn/zyjblogs/starter/common/autoconfigure/rsa/RsaAutoConfiguration.java
View File

@ -7,6 +7,6 @@ import org.springframework.context.annotation.Configuration;
* @author zhuyijun
*/
@Configuration
@EnableConfigurationProperties(RsaKeyProperties.class)
public class OauthAutoConfiguration {
@EnableConfigurationProperties({RsaKeyProperties.class})
public class RsaAutoConfiguration {
}

2
stater/zyjblogs-common-spring-boot-starter/src/main/java/cn/zyjblogs/starter/common/autoconfigure/rsa/RsaKeyProperties.java
View File

@ -17,7 +17,7 @@ public class RsaKeyProperties {
/**
* 启用rsa对token进行加密
*/
private Boolean enable;
private Boolean enable = true;
/**
* 公钥地址

2
stater/zyjblogs-common-spring-boot-starter/src/main/resources/META-INF/spring.factories
View File

@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
cn.zyjblogs.starter.common.autoconfigure.rsa.OauthAutoConfiguration
cn.zyjblogs.starter.common.autoconfigure.rsa.RsaAutoConfiguration

2
stater/zyjblogs-oauth-spring-boot-starter/src/main/java/cn/zyjblogs/starter/oauth/autoconfigure/OauthAutoConfiguration.java
View File

@ -7,6 +7,6 @@ import org.springframework.context.annotation.Configuration;
* @author zhuyijun
*/
@Configuration
@EnableConfigurationProperties({RsaKeyProperties.class, WhiteListProperties.class})
@EnableConfigurationProperties({WhiteListProperties.class})
public class OauthAutoConfiguration {
}

33
stater/zyjblogs-oauth-spring-boot-starter/src/main/java/cn/zyjblogs/starter/oauth/autoconfigure/RsaKeyProperties.java
View File

@ -1,33 +0,0 @@
package cn.zyjblogs.starter.oauth.autoconfigure;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.context.config.annotation.RefreshScope;
/**
* rsa 路径配置文件
*
* @author zhuyijun
*/
@Getter
@Setter
@ConfigurationProperties(prefix = "rsa.key")
@RefreshScope
public class RsaKeyProperties {
/**
* 启用rsa对token进行加密
*/
private Boolean enable = true;
/**
* 公钥地址
*/
private String pubKeyPath;
/**
* 私钥地址
*/
private String priKeyPath;
}