From dcb038f331b48e278a7680092898ba3d1106a39c Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Fri, 26 Aug 2022 18:51:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86oauth2=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E6=97=A0=E6=B3=95=E7=99=BB=E5=BD=95=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ink/wgink/login/base/security/WebSecurityConfig.java   | 1 +
 .../wgink/login/oauth2/server/service/IOAuth2ClientService.java | 2 ++
 .../server/service/impl/OAuth2ClientDetailsServiceImpl.java     | 2 +-
 .../oauth2/server/service/impl/OAuth2ClientServiceImpl.java     | 2 +-
 pom.xml                                                         | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java b/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
index b582216e..068eb39d 100644
--- a/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
+++ b/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
@@ -55,6 +55,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 baseProperties.getLoginFailure(),
                 "/oauth/**",
                 "/oauth2_client/**",
+                "/error"
         };
         LoginFailureHandler loginFailureHandler = new LoginFailureHandler(baseProperties.getLoginFailure());
         http
diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/IOAuth2ClientService.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/IOAuth2ClientService.java
index e0bd610c..eb524d41 100644
--- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/IOAuth2ClientService.java
+++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/IOAuth2ClientService.java
@@ -19,6 +19,8 @@ import java.util.Map;
  **/
 public interface IOAuth2ClientService {
 
+    String BCRYPT_PREFIX = "{bcrypt}";
+
     /**
      * 客户端加密规则
      */
diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientDetailsServiceImpl.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientDetailsServiceImpl.java
index f2566f76..69f6ff52 100644
--- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientDetailsServiceImpl.java
+++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientDetailsServiceImpl.java
@@ -72,7 +72,7 @@ public class OAuth2ClientDetailsServiceImpl implements ClientDetailsService {
                 oAuth2ClientPO.getAuthorizedGrantTypes(),
                 oAuth2ClientPO.getAuthorities());
         clientDetails.setAutoApproveScopes(Arrays.asList(oAuth2ClientPO.getAutoapprove().split(",")));
-        clientDetails.setClientSecret(oAuth2ClientPO.getClientSecret());
+        clientDetails.setClientSecret(oAuth2ClientPO.getClientSecret().replace(IOAuth2ClientService.BCRYPT_PREFIX, ""));
         clientDetails.setAccessTokenValiditySeconds(oAuth2ClientPO.getAccessTokenValidity());
         clientDetails.setRefreshTokenValiditySeconds(oAuth2ClientPO.getRefreshTokenValidity());
         // 设置附加信息，json格式
diff --git a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientServiceImpl.java b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientServiceImpl.java
index 96686ce8..1eecddfc 100644
--- a/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientServiceImpl.java
+++ b/login-oauth2-server/src/main/java/ink/wgink/login/oauth2/server/service/impl/OAuth2ClientServiceImpl.java
@@ -48,7 +48,7 @@ public class OAuth2ClientServiceImpl extends DefaultBaseService implements IOAut
 
     @Override
     public void save(OAuth2ClientVO oauth2ClientVO) throws SaveException {
-        oauth2ClientVO.setClientSecret("{bcrypt}" + passwordEncoder.encode(oauth2ClientVO.getClientSecret()));
+        oauth2ClientVO.setClientSecret(BCRYPT_PREFIX + passwordEncoder.encode(oauth2ClientVO.getClientSecret()));
         Map<String, Object> params = HashMapUtil.beanToMap(oauth2ClientVO);
         setSaveInfo(params);
         oauth2ClientDao.save(params);
diff --git a/pom.xml b/pom.xml
index 093abc2c..4f4ef9ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
         <module>module-wechat-pay</module>
         <module>module-attn</module>
         <module>service-core</module>
+        <module>docs</module>
     </modules>
     <packaging>pom</packaging>