Merge branch 'feature/1.0.0' into develop

fuhouyu · Oct 28, 2024 · c6a9a8c · c6a9a8c
2 parents 9d58ca4 + 07824c9
commit c6a9a8c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/base-framework-common/src/main/java/com/fuhouyu/framework/common/utils/LoggerUtil.java b/base-framework-common/src/main/java/com/fuhouyu/framework/common/utils/LoggerUtil.java
@@ -69,7 +69,7 @@ public static void error(Logger logger, String msg, Object... args) {
      */
     public static void debug(Logger logger, String msg, Object... args) {
         if (logger.isDebugEnabled()) {
-            logger.error(msg, args);
+            logger.debug(msg, args);
         }
     }
 

diff --git a/...ork-security-starter/src/main/java/com/fuhouyu/framework/security/entity/TokenEntity.java b/...ork-security-starter/src/main/java/com/fuhouyu/framework/security/entity/TokenEntity.java
@@ -36,7 +36,7 @@
 @Getter
 @Setter
 @ToString
-public class TokenEntity implements Entity<TokenEntity> {
+public class TokenEntity implements Entity<OAuth2AccessToken> {
 
     @Serial
     private static final long serialVersionUID = 1897123986123785612L;
@@ -55,7 +55,7 @@ public TokenEntity(OAuth2AccessToken accessToken, OAuth2RefreshToken refreshToke
     }
 
     @Override
-    public boolean sameIdentityAs(TokenEntity other) {
+    public boolean sameIdentityAs(OAuth2AccessToken other) {
         return EqualsBuilder.reflectionEquals(this, other);
     }
 }