From c07c4b1e061830ccdd447347e13436138fb14608 Mon Sep 17 00:00:00 2001
From: zhou-hao <admin@hsweb.me>
Date: Mon, 9 Mar 2020 09:55:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=A0=E9=99=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3,=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../authorization/api/entity/UserEntity.java    |  1 +
 .../api/event/UserDeletedEvent.java             | 17 +++++++++++++++++
 .../service/DefaultReactiveUserService.java     |  8 ++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/event/UserDeletedEvent.java

diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/entity/UserEntity.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/entity/UserEntity.java
index a7968c649..32e520699 100644
--- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/entity/UserEntity.java
+++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/entity/UserEntity.java
@@ -45,6 +45,7 @@ public class UserEntity extends GenericEntity<String> implements RecordCreationE
     private String type;
 
     @Column
+    @DefaultValue("1")
     private Byte status;
 
     @Column(name = "creator_id", updatable = false)
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/event/UserDeletedEvent.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/event/UserDeletedEvent.java
new file mode 100644
index 000000000..ab15377a5
--- /dev/null
+++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/event/UserDeletedEvent.java
@@ -0,0 +1,17 @@
+package org.hswebframework.web.system.authorization.api.event;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hswebframework.web.system.authorization.api.entity.UserEntity;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserDeletedEvent {
+
+    private UserEntity user;
+
+}
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultReactiveUserService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultReactiveUserService.java
index 23a004fac..e283760ae 100644
--- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultReactiveUserService.java
+++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultReactiveUserService.java
@@ -10,6 +10,7 @@ import org.hswebframework.web.id.IDGenerator;
 import org.hswebframework.web.system.authorization.api.PasswordEncoder;
 import org.hswebframework.web.system.authorization.api.entity.UserEntity;
 import org.hswebframework.web.system.authorization.api.event.UserCreatedEvent;
+import org.hswebframework.web.system.authorization.api.event.UserDeletedEvent;
 import org.hswebframework.web.system.authorization.api.event.UserModifiedEvent;
 import org.hswebframework.web.system.authorization.api.service.reactive.ReactiveUserService;
 import org.hswebframework.web.validator.CreateGroup;
@@ -165,7 +166,10 @@ public class DefaultReactiveUserService extends GenericReactiveCrudService<UserE
 
     @Override
     public Mono<Boolean> deleteUser(String userId) {
-        return deleteById(Mono.just(userId))
-                .map(integer -> integer > 0);
+        return this.findById(userId)
+                .flatMap(user -> this
+                .deleteById(Mono.just(userId))
+                .doOnNext(i -> eventPublisher.publishEvent(new UserDeletedEvent(user)))
+                .thenReturn(true));
     }
 }