代码优化

maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/InMemoryCongressService.java

@@ -45,6 +45,7 @@ public class InMemoryCongressService implements CongressService{
 
     @Override
     public AuthJwt remove(String congress) {
+    	logger.debug("remove congress {}",congress);
         AuthJwt authJwt = congressStore.getIfPresent(congress);    
         congressStore.invalidate(congress);
         return authJwt;

maxkey-authentications/maxkey-authentication-core/src/main/java/org/dromara/maxkey/authn/jwt/RedisCongressService.java

@@ -30,7 +30,7 @@ public class RedisCongressService implements CongressService {
     
     RedisConnectionFactory connectionFactory;
     
-    public static final String PREFIX = "REDIS:CONGRESS:";
+    public static final String PREFIX = "redis:congress:";
     /**
      * @param connectionFactory
      */
@@ -60,6 +60,7 @@ public class RedisCongressService implements CongressService {
 
     @Override
     public AuthJwt remove(String congress) {
+    	logger.debug("remove congress {}",congress);
         RedisConnection conn=connectionFactory.getConnection();
         AuthJwt authJwt = conn.getObject(PREFIX + congress);
         conn.delete(PREFIX+congress);

maxkey-entity/src/main/java/org/dromara/maxkey/entity/ChangePassword.java

@@ -24,11 +24,6 @@ import org.dromara.mybatis.jpa.entity.JpaEntity;
 
 public class ChangePassword extends JpaEntity{
 
-    /**
-     * 
-     */
-    private static final long serialVersionUID = -2362608803392892403L;
-
     private String id;
     private String userId;
     private String username;

maxkey-entity/src/main/java/org/dromara/maxkey/entity/ExcelImport.java

@@ -39,11 +39,6 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public class ExcelImport extends JpaEntity {
 
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 4665009770629818479L;
-
     @Id
     @Column
     @GeneratedValue

maxkey-entity/src/main/java/org/dromara/maxkey/entity/xml/UserInfoXML.java

@@ -32,11 +32,6 @@ public class UserInfoXML extends JpaEntity {
     /**
      * 
      */
-    private static final long serialVersionUID = 6942731467730249291L;
-
-    /**
-     * 
-     */
     public UserInfoXML() {
         super();
     }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/AccountsServiceImpl.java

@@ -74,7 +74,6 @@ public class AccountsServiceImpl  extends JpaServiceImpl<AccountsMapper,Accounts
    }
    
    public boolean remove(String id) {
-       Accounts account = this.get(id);
        if (super.delete(id)) {
               return true;
           }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/UserInfoServiceImpl.java

@@ -92,7 +92,6 @@ public class UserInfoServiceImpl extends JpaServiceImpl<UserInfoMapper,UserInfo>
     }
     
     public boolean delete(UserInfo userInfo) {
-        UserInfo loadUserInfo = null;
         if( super.delete(userInfo.getId())){
              return true;
         }

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/UserPasskeyServiceImpl.java

@@ -16,7 +16,6 @@
 
 package org.dromara.maxkey.persistence.service.impl;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;

maxkey-protocols/maxkey-protocol-formbased/src/main/java/org/dromara/maxkey/authz/formbased/endpoint/adapter/FormBasedNeteaseNoteYoudaoAdapter.java

@@ -22,10 +22,12 @@ import java.util.Date;
 import org.dromara.maxkey.authz.endpoint.adapter.AbstractAuthorizeAdapter;
 import org.dromara.maxkey.crypto.DigestUtils;
 import org.dromara.maxkey.entity.apps.AppsFormBasedDetails;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.web.servlet.ModelAndView;
 
 public class FormBasedNeteaseNoteYoudaoAdapter extends AbstractAuthorizeAdapter {
-
+	private static final  Logger logger = LoggerFactory.getLogger(FormBasedNeteaseNoteYoudaoAdapter.class);
     @Override
     public Object generateInfo() {
         return null;
@@ -35,7 +37,8 @@ public class FormBasedNeteaseNoteYoudaoAdapter extends AbstractAuthorizeAdapter
     @Override
     public ModelAndView authorize(ModelAndView modelAndView) {
         modelAndView.setViewName("authorize/formbased_wy_youdao_sso_submint");
-        AppsFormBasedDetails details=(AppsFormBasedDetails)app;
+        AppsFormBasedDetails details = (AppsFormBasedDetails)app;
+        logger.debug("AppsFormBasedDetails {}",details);
         modelAndView.addObject("username", account.getRelatedUsername());
         modelAndView.addObject("password",  DigestUtils.md5Hex(account.getRelatedPassword()));
         modelAndView.addObject("currentTime",  (new Date()).getTime());

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/endpoint/AuthorizationEndpoint.java

@@ -107,15 +107,8 @@ public class AuthorizationEndpoint extends AbstractEndpoint {
 
     private String userApprovalPage = "forward:" + OAuth2Constants.ENDPOINT.ENDPOINT_APPROVAL_CONFIRM;
 
-    private String errorPage = "forward:" + OAuth2Constants.ENDPOINT.ENDPOINT_ERROR;
-    
     private Object implicitLock = new Object();
 
-
-    public void setErrorPage(String errorPage) {
-        this.errorPage = errorPage;
-    }
-
     @Operation(summary = "OAuth 2.0 认证接口", description = "传递参数应用ID，自动完成跳转认证拼接",method="GET")
     @GetMapping(value = {OAuth2Constants.ENDPOINT.ENDPOINT_BASE + "/{id}"})
     public ModelAndView authorize(

maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/autoconfigure/Oauth20AutoConfiguration.java

@@ -335,9 +335,8 @@ public class Oauth20AutoConfiguration implements InitializingBean {
         OAuth2UserDetailsService userDetailsService =new OAuth2UserDetailsService();
         userDetailsService.setLoginRepository(loginRepository);
         
-        DaoAuthenticationProvider daoAuthenticationProvider= new DaoAuthenticationProvider();
+        DaoAuthenticationProvider daoAuthenticationProvider= new DaoAuthenticationProvider(userDetailsService);
         daoAuthenticationProvider.setPasswordEncoder(passwordEncoder);
-        daoAuthenticationProvider.setUserDetailsService(userDetailsService);
         ProviderManager authenticationManager = new ProviderManager(daoAuthenticationProvider);
         _logger.debug("OAuth 2 User Authentication Manager init.");
         return authenticationManager;
@@ -357,9 +356,8 @@ public class Oauth20AutoConfiguration implements InitializingBean {
         ClientDetailsUserDetailsService cientDetailsUserDetailsService = 
                 new ClientDetailsUserDetailsService(oauth20JdbcClientDetailsService);
         
-        DaoAuthenticationProvider daoAuthenticationProvider= new DaoAuthenticationProvider();
+        DaoAuthenticationProvider daoAuthenticationProvider= new DaoAuthenticationProvider(cientDetailsUserDetailsService);
         daoAuthenticationProvider.setPasswordEncoder(passwordReciprocal);
-        daoAuthenticationProvider.setUserDetailsService(cientDetailsUserDetailsService);
         ProviderManager authenticationManager = new ProviderManager(daoAuthenticationProvider);
         _logger.debug("OAuth 2 Client Authentication Manager init.");
         return authenticationManager;

maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/endpoint/PasskeyAuthenticationEndpoint.java

@@ -38,7 +38,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/endpoint/PasskeyRegistrationEndpoint.java

@@ -22,7 +22,6 @@ import org.dromara.maxkey.entity.Message;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

maxkey-starter/maxkey-starter-passkey/src/main/java/org/dromara/maxkey/passkey/service/impl/PasskeyServiceImpl.java

@@ -32,13 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import com.webauthn4j.WebAuthnManager;
 import com.webauthn4j.converter.util.ObjectConverter;
 import com.webauthn4j.data.*;
-import com.webauthn4j.data.client.*;
-import com.webauthn4j.data.attestation.*;
 import com.webauthn4j.server.ServerProperty;
-import com.webauthn4j.data.client.Origin;
-import com.webauthn4j.data.client.challenge.Challenge;
-import com.webauthn4j.data.client.challenge.DefaultChallenge;
-import com.webauthn4j.converter.exception.DataConversionException;
 import com.webauthn4j.data.RegistrationData;
 import com.webauthn4j.data.RegistrationParameters;
 import com.webauthn4j.data.AuthenticationData;
@@ -55,11 +49,8 @@ import org.dromara.maxkey.passkey.util.PasskeyUtils;
 
 import java.util.*;
 import java.security.SecureRandom;
-import java.time.LocalDateTime;
 import java.util.Date;
-import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.codec.binary.Base64;
-import java.util.Objects;
 
 /**
  * Passkey服务实现类 - 重构版本

maxkey-starter/maxkey-starter-web/src/main/java/org/dromara/maxkey/autoconfigure/SwaggerAutoConfiguration.java

@@ -1,11 +1,7 @@
 package org.dromara.maxkey.autoconfigure;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springdoc.core.customizers.GlobalOpenApiCustomizer;
 import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.AutoConfiguration;