diff --git a/src/main/java/com/youlai/boot/config/PasswordEncoderConfig.java b/src/main/java/com/youlai/boot/config/PasswordEncoderConfig.java index 2d231ba5..3e6e0e0b 100644 --- a/src/main/java/com/youlai/boot/config/PasswordEncoderConfig.java +++ b/src/main/java/com/youlai/boot/config/PasswordEncoderConfig.java @@ -6,9 +6,9 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; /** + * 密码编码器 * - * - * @author haoxr + * @author Ray.Hao * @since 2024/12/3 */ @Configuration diff --git a/src/main/java/com/youlai/boot/config/SecurityConfig.java b/src/main/java/com/youlai/boot/config/SecurityConfig.java index 75c7ef1b..8fe21434 100644 --- a/src/main/java/com/youlai/boot/config/SecurityConfig.java +++ b/src/main/java/com/youlai/boot/config/SecurityConfig.java @@ -9,7 +9,7 @@ import com.youlai.boot.config.property.SecurityProperties; import com.youlai.boot.core.filter.RateLimiterFilter; import com.youlai.boot.core.security.exception.MyAccessDeniedHandler; import com.youlai.boot.core.security.exception.MyAuthenticationEntryPoint; -import com.youlai.boot.core.security.extension.WeChatAuthenticationProvider; +import com.youlai.boot.core.security.extension.WechatAuthenticationProvider; import com.youlai.boot.core.security.filter.CaptchaValidationFilter; import com.youlai.boot.core.security.filter.JwtValidationFilter; import com.youlai.boot.core.security.service.SysUserDetailsService; @@ -138,8 +138,8 @@ public class SecurityConfig { * 微信认证 Provider */ @Bean - public WeChatAuthenticationProvider weChatAuthenticationProvider() { - return new WeChatAuthenticationProvider(userService, wxMaService); + public WechatAuthenticationProvider weChatAuthenticationProvider() { + return new WechatAuthenticationProvider(userService, wxMaService); } /** diff --git a/src/main/java/com/youlai/boot/config/property/SecurityProperties.java b/src/main/java/com/youlai/boot/config/property/SecurityProperties.java index ed54c98b..ce8b3822 100644 --- a/src/main/java/com/youlai/boot/config/property/SecurityProperties.java +++ b/src/main/java/com/youlai/boot/config/property/SecurityProperties.java @@ -52,12 +52,12 @@ public class SecurityProperties { /** * 访问令牌有效期(单位:秒) */ - private Integer accessTokenExpiration; + private Integer accessTokenTimeToLive; /** * 刷新令牌有效期(单位:秒) */ - private Integer refreshTokenExpiration; + private Integer refreshTokenTimeToLive; } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4c7acd30..badc8126 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -82,9 +82,9 @@ security: # JWT 秘钥 key: SecretKey012345678901234567890123456789012345678901234567890123456789 # 访问令牌 有效期(单位:秒),默认 1 小时 - access-token-expiration: 3600 + access-token-time-to-live: 3600 # 刷新令牌有效期(单位:秒),默认 7 天 - refresh-token-expiration: 604800 + refresh-token-time-to-live: 604800 # 白名单列表 ignore-urls: - /v3/api-docs/** @@ -213,8 +213,8 @@ captcha: # 验证码有效期(秒) expire-seconds: 120 -# 微信小程序 -wechat: +# 微信小程配置 +wx: miniapp: - appId: xxxxxx - appSecret: xxxxxx \ No newline at end of file + app-id: xxxxxx + app-secret: xxxxxx \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 9fe4582b..05995d30 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -81,9 +81,9 @@ security: # JWT 秘钥 key: SecretKey012345678901234567890123456789012345678901234567890123456789 # 访问令牌 有效期(单位:秒),默认 1 小时 - access-token-expiration: 3600 + access-token-time-to-live: 3600 # 刷新令牌有效期(单位:秒),默认 7 天 - refresh-token-expiration: 604800 + refresh-token-time-to-live: 604800 # 白名单列表 ignore-urls: - /v3/api-docs/** @@ -212,8 +212,8 @@ captcha: # 验证码有效期(秒) expire-seconds: 120 -# 微信小程序 -wechat: +# 微信小程配置 +wx: miniapp: - appId: xxxxxx - appSecret: xxxxxx \ No newline at end of file + app-id: xxxxxx + app-secret: xxxxxx \ No newline at end of file