From 95a35c35b9934f297a378747a0ee10d901e9eda8 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Wed, 8 Dec 2021 11:15:11 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BB=93=E5=BA=93=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/ReactiveUserRepository.java         | 14 --------------
 .../framework/repository/UserRepository.java       | 13 ++++++-------
 .../com/flyfish/framework/service/UserService.java |  4 ++--
 3 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 flyfish-user/src/main/java/com/flyfish/framework/repository/ReactiveUserRepository.java

diff --git a/flyfish-user/src/main/java/com/flyfish/framework/repository/ReactiveUserRepository.java b/flyfish-user/src/main/java/com/flyfish/framework/repository/ReactiveUserRepository.java
deleted file mode 100644
index 92780eb..0000000
--- a/flyfish-user/src/main/java/com/flyfish/framework/repository/ReactiveUserRepository.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.flyfish.framework.repository;
-
-import com.flyfish.framework.domain.po.User;
-import reactor.core.publisher.Mono;
-
-/**
- * 异步用户仓库
- *
- * @author wybab
- */
-public interface ReactiveUserRepository extends DefaultReactiveRepository<User> {
-
-    Mono<User> findByUsername(String username);
-}
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/repository/UserRepository.java b/flyfish-user/src/main/java/com/flyfish/framework/repository/UserRepository.java
index 74d1914..b75fc2b 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/repository/UserRepository.java
+++ b/flyfish-user/src/main/java/com/flyfish/framework/repository/UserRepository.java
@@ -1,15 +1,14 @@
 package com.flyfish.framework.repository;
 
 import com.flyfish.framework.domain.po.User;
-
-import java.util.Optional;
+import reactor.core.publisher.Mono;
 
 /**
- * 用户repo
+ * 异步用户仓库
  *
- * @author wangyu
+ * @author wybab
  */
-public interface UserRepository extends DefaultRepository<User> {
+public interface UserRepository extends DefaultReactiveRepository<User> {
 
     /**
      * 通过用户名密码查询用户
@@ -18,7 +17,7 @@ public interface UserRepository extends DefaultRepository<User> {
      * @param password 密码
      * @return 结果
      */
-    Optional<User> findByUsernameAndPassword(String username, String password);
+    Mono<User> findByUsernameAndPassword(String username, String password);
 
     /**
      * 通过用户名查询
@@ -26,5 +25,5 @@ public interface UserRepository extends DefaultRepository<User> {
      * @param username 用户名
      * @return 结果
      */
-    Optional<User> findByUsername(String username);
+    Mono<User> findByUsername(String username);
 }
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java b/flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java
index ea794f3..8bf5ca2 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java
+++ b/flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java
@@ -1,7 +1,7 @@
 package com.flyfish.framework.service;
 
 import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.repository.ReactiveUserRepository;
+import com.flyfish.framework.repository.UserRepository;
 import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
@@ -22,7 +22,7 @@ public class UserService extends BaseReactiveServiceImpl<User> implements UserFi
      */
     @Override
     public Mono<User> findByUsername(String username) {
-        return ((ReactiveUserRepository) repository).findByUsername(username);
+        return ((UserRepository) repository).findByUsername(username);
     }
 
 }