增加修改个人信息以及删除用户

zhou-hao · zhou-hao · commit 9a197cd318b7 · 2020-01-03T21:14:34.000+08:00
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/service/reactive/ReactiveUserService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/src/main/java/org/hswebframework/web/system/authorization/api/service/reactive/ReactiveUserService.java
@@ -27,4 +27,6 @@ public interface ReactiveUserService {
 
     Mono<Integer> countUser(QueryParam queryParam);
 
+    Mono<Boolean> deleteUser(String userId);
+
 }
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
@@ -132,7 +132,7 @@ public Mono<Integer> changeState(Publisher<String> userId, byte state) {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class, transactionManager =TransactionManagers.r2dbcTransactionManager)
+    @Transactional(rollbackFor = Exception.class, transactionManager = TransactionManagers.r2dbcTransactionManager)
     public Mono<Boolean> changePassword(String userId, String oldPassword, String newPassword) {
         return findById(userId)
                 .switchIfEmpty(Mono.error(NotFoundException::new))
@@ -162,4 +162,10 @@ public Mono<Integer> countUser(QueryParam queryParam) {
                 .setParam(queryParam)
                 .count();
     }
+
+    @Override
+    public Mono<Boolean> deleteUser(String userId) {
+        return deleteById(Mono.just(userId))
+                .map(integer -> integer > 0);
+    }
 }
diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/webflux/WebFluxUserController.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/webflux/WebFluxUserController.java
@@ -5,6 +5,7 @@
 import org.hswebframework.web.authorization.Authentication;
 import org.hswebframework.web.authorization.User;
 import org.hswebframework.web.authorization.annotation.Authorize;
+import org.hswebframework.web.authorization.annotation.DeleteAction;
 import org.hswebframework.web.authorization.annotation.Resource;
 import org.hswebframework.web.authorization.annotation.SaveAction;
 import org.hswebframework.web.authorization.exception.UnAuthorizedException;
@@ -44,6 +45,12 @@ public Mono<Integer> changeState(@PathVariable String id, @PathVariable Byte sta
         return reactiveUserService.changeState(Mono.just(id), state);
     }
 
+    @DeleteMapping("/{id:.+}")
+    @DeleteAction
+    public Mono<Boolean> deleteUser(@PathVariable String id) {
+        return reactiveUserService.deleteUser(id);
+    }
+
     @PutMapping("/passwd")
     @Authorize(merge = false)
     public Mono<Boolean> changePassword(@RequestBody ChangePasswordRequest request) {
@@ -55,6 +62,17 @@ public Mono<Boolean> changePassword(@RequestBody ChangePasswordRequest request)
                 .flatMap(userId -> reactiveUserService.changePassword(userId, request.getOldPassword(), request.getNewPassword()));
     }
 
+    @PutMapping("/me")
+    @Authorize(merge = false)
+    public Mono<Boolean> updateLoginUserInfo(@RequestBody UserEntity request) {
+        return Authentication
+                .currentReactive()
+                .switchIfEmpty(Mono.error(UnAuthorizedException::new))
+                .map(Authentication::getUser)
+                .map(User::getId)
+                .flatMap(userId -> reactiveUserService.updateById(userId, Mono.just(request)).map(integer -> integer > 0));
+    }
+
     @Override
     public DefaultReactiveUserService getService() {
         return reactiveUserService;

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,6 @@ public interface ReactiveUserService {`
`27`	`27`
`28`	`28`	`Mono<Integer> countUser(QueryParam queryParam);`
`29`	`29`
	`30`	`+ Mono<Boolean> deleteUser(String userId);`
	`31`	`+`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public Mono<Integer> changeState(Publisher<String> userId, byte state) {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`@Override`
`135`		`- @Transactional(rollbackFor = Exception.class, transactionManager =TransactionManagers.r2dbcTransactionManager)`
	`135`	`+ @Transactional(rollbackFor = Exception.class, transactionManager = TransactionManagers.r2dbcTransactionManager)`
`136`	`136`	`public Mono<Boolean> changePassword(String userId, String oldPassword, String newPassword) {`
`137`	`137`	`return findById(userId)`
`138`	`138`	`.switchIfEmpty(Mono.error(NotFoundException::new))`
`@@ -162,4 +162,10 @@ public Mono<Integer> countUser(QueryParam queryParam) {`
`162`	`162`	`.setParam(queryParam)`
`163`	`163`	`.count();`
`164`	`164`	`}`
	`165`	`+`
	`166`	`+ @Override`
	`167`	`+ public Mono<Boolean> deleteUser(String userId) {`
	`168`	`+ return deleteById(Mono.just(userId))`
	`169`	`+ .map(integer -> integer > 0);`
	`170`	`+ }`
`165`	`171`	`}`