From 33ac4324bce12662a85788d79078b3bd1e69a977 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= Date: Tue, 10 Sep 2019 18:58:53 +0800 Subject: [PATCH] =?utf8?q?refactor:=20=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?utf8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../backend/gateway/Application.java | 3 ++- .../security/core/userdetails/MyUser.java | 7 +++--- gateway/src/main/resources/application.yml | 22 +++++++++---------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/gateway/src/main/java/com/supwisdom/institute/backend/gateway/Application.java b/gateway/src/main/java/com/supwisdom/institute/backend/gateway/Application.java index aea520c..dac40b2 100644 --- a/gateway/src/main/java/com/supwisdom/institute/backend/gateway/Application.java +++ b/gateway/src/main/java/com/supwisdom/institute/backend/gateway/Application.java @@ -16,6 +16,7 @@ import org.springframework.web.server.WebFilterChain; import reactor.core.publisher.Mono; import com.supwisdom.infras.security.reactive.basic.EnableInfrasBasicWebFluxApi; +import com.supwisdom.infras.security.reactive.jwt.EnableInfrasJWTWebFluxApi; import com.supwisdom.institute.backend.common.framework.exception.EnableCustomExceptionHandler; import static org.springframework.web.cors.CorsConfiguration.ALL; @@ -29,7 +30,7 @@ import static org.springframework.web.cors.CorsConfiguration.ALL; //@EnableInfrasCasSecurity //@EnableInfrasBasicApi -//@EnableInfrasJWTApi +@EnableInfrasJWTWebFluxApi @EnableInfrasBasicWebFluxApi public class Application { diff --git a/gateway/src/main/java/com/supwisdom/institute/backend/gateway/security/core/userdetails/MyUser.java b/gateway/src/main/java/com/supwisdom/institute/backend/gateway/security/core/userdetails/MyUser.java index 7148839..9416893 100644 --- a/gateway/src/main/java/com/supwisdom/institute/backend/gateway/security/core/userdetails/MyUser.java +++ b/gateway/src/main/java/com/supwisdom/institute/backend/gateway/security/core/userdetails/MyUser.java @@ -6,9 +6,10 @@ import java.util.List; import java.util.Map; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.User; -public class MyUser extends User { +import com.supwisdom.infras.security.core.userdetails.InfrasUser; + +public class MyUser extends InfrasUser { /** * @@ -25,7 +26,7 @@ public class MyUser extends User { boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked, Collection authorities, Map attributes) { - super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities); + super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities, attributes); this.attributes = attributes; } diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml index e98b431..7e88467 100644 --- a/gateway/src/main/resources/application.yml +++ b/gateway/src/main/resources/application.yml @@ -62,28 +62,28 @@ infras.online-doc.api-docs.staitc.path: /Users/loie/c/work/git/institute/sw-back ## # infras.security basic # -infras.security.basic.enabled: true +infras.security.basic.reactive.enabled: false ## # infras.security jwt # -infras.security.jwt.enabled: false +infras.security.jwt.reactive.enabled: true -#infras.security.jwt.public-key-pem: |- -# -----BEGIN PUBLIC KEY----- -# MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBQw6TmvJ+nOuRaLoHsZJGIBzRg/wbskNv6UevL3/nQioYooptPfdIHVzPiKRVT5+DW5+nqzav3DOxY+HYKjO9nFjYdj0sgvRae6iVpa5Ji1wbDKOvwIDNukgnKbqvFXX2Isfl0RxeN3uEKdjeFGGFdr38I3ADCNKFNxtbmfqvjQIDAQAB -# -----END PUBLIC KEY----- -#infras.security.jwt.private-key-pem-pkcs8: |- -# -----BEGIN PRIVATE KEY----- -# MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMFDDpOa8n6c65FougexkkYgHNGD/BuyQ2/pR68vf+dCKhiiim0990gdXM+IpFVPn4Nbn6erNq/cM7Fj4dgqM72cWNh2PSyC9Fp7qJWlrkmLXBsMo6/AgM26SCcpuq8VdfYix+XRHF43e4Qp2N4UYYV2vfwjcAMI0oU3G1uZ+q+NAgMBAAECgYA7jA7UuhxXmMAYmJ0hO7xnMQPQJouqeP3AYK9+sfMF7WQNHR/r0vj7Vli/dUm1I4hxr+x8fAuomf+ve6gds7sm+v2JHLzEIyPPiogoC7IcBmjJ3yVzW/26cXeOmTiPC/fW2g4BpYxSM8HLDaSkrtqzy8e9ijlzMpHBvvwLikufnQJBAOXaqIPuZ7Vm/JwQHAmX2HV+Qk6GMi/H7mL8X0AaW68w+Iccdbz1hzmMBfdn5NMmx2AOwoBAVivgjt0a1OfksHMCQQDXPtXxwFy4dQ4TbPu8L38P8s/bPo9ib1YkEMp57yBw+IvxB7jnpA9rUYTfZM/HpVP7r9rfVEUylVXXzhz1qx//AkEApWJOTBdW8bQ3YEdLFS/3pJqDNSLjq3OMuBZkpqgQfh6bRAQbRynW8XYpuNk9URye6iPUmRkxp4J86ORseqoWtwJAJb5a/b1hhObhxP5DVkht23oUgLmDoxsq28AmASOxaJ3szCMyhUv7eDIfPp0K4lNXWrcHhkncqHYPS3xVD68mOQJAV4SRDdWpgAbQOUODotohE48RxrabHo0l228CJ/pnm0q7gplPs4iSNJ2eijFuOMXfKkq3z/vxiNSA59FcdoCOHQ== -# -----END PRIVATE KEY----- +infras.security.jwt.public-key-pem: |- + -----BEGIN PUBLIC KEY----- + MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBQw6TmvJ+nOuRaLoHsZJGIBzRg/wbskNv6UevL3/nQioYooptPfdIHVzPiKRVT5+DW5+nqzav3DOxY+HYKjO9nFjYdj0sgvRae6iVpa5Ji1wbDKOvwIDNukgnKbqvFXX2Isfl0RxeN3uEKdjeFGGFdr38I3ADCNKFNxtbmfqvjQIDAQAB + -----END PUBLIC KEY----- +infras.security.jwt.private-key-pem-pkcs8: |- + -----BEGIN PRIVATE KEY----- + MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMFDDpOa8n6c65FougexkkYgHNGD/BuyQ2/pR68vf+dCKhiiim0990gdXM+IpFVPn4Nbn6erNq/cM7Fj4dgqM72cWNh2PSyC9Fp7qJWlrkmLXBsMo6/AgM26SCcpuq8VdfYix+XRHF43e4Qp2N4UYYV2vfwjcAMI0oU3G1uZ+q+NAgMBAAECgYA7jA7UuhxXmMAYmJ0hO7xnMQPQJouqeP3AYK9+sfMF7WQNHR/r0vj7Vli/dUm1I4hxr+x8fAuomf+ve6gds7sm+v2JHLzEIyPPiogoC7IcBmjJ3yVzW/26cXeOmTiPC/fW2g4BpYxSM8HLDaSkrtqzy8e9ijlzMpHBvvwLikufnQJBAOXaqIPuZ7Vm/JwQHAmX2HV+Qk6GMi/H7mL8X0AaW68w+Iccdbz1hzmMBfdn5NMmx2AOwoBAVivgjt0a1OfksHMCQQDXPtXxwFy4dQ4TbPu8L38P8s/bPo9ib1YkEMp57yBw+IvxB7jnpA9rUYTfZM/HpVP7r9rfVEUylVXXzhz1qx//AkEApWJOTBdW8bQ3YEdLFS/3pJqDNSLjq3OMuBZkpqgQfh6bRAQbRynW8XYpuNk9URye6iPUmRkxp4J86ORseqoWtwJAJb5a/b1hhObhxP5DVkht23oUgLmDoxsq28AmASOxaJ3szCMyhUv7eDIfPp0K4lNXWrcHhkncqHYPS3xVD68mOQJAV4SRDdWpgAbQOUODotohE48RxrabHo0l228CJ/pnm0q7gplPs4iSNJ2eijFuOMXfKkq3z/vxiNSA59FcdoCOHQ== + -----END PRIVATE KEY----- ## # infras.security cas # -infras.security.cas.enabled: false +infras.security.reactive.cas.enabled: false #应用访问地址 app.server.host.url: http://localhost:8080 -- 2.17.1