From d9603381e038aa13144f5c7d5d5ea12a2f44f18b Mon Sep 17 00:00:00 2001 From: tancong <130981800+tancongsir@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:53:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E7=B1=BB=E5=9E=8B=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=20(#438)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../community/auth/web/UserDetailController.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/web/UserDetailController.java b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/web/UserDetailController.java index 0a971d1c..c82305e6 100755 --- a/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/web/UserDetailController.java +++ b/jetlinks-manager/authentication-manager/src/main/java/org/jetlinks/community/auth/web/UserDetailController.java @@ -12,11 +12,14 @@ import org.hswebframework.web.authorization.annotation.Resource; import org.hswebframework.web.authorization.annotation.SaveAction; import org.hswebframework.web.authorization.exception.UnAuthorizedException; import org.jetlinks.community.auth.entity.UserDetail; +import org.jetlinks.community.auth.enums.UserEntityType; +import org.jetlinks.community.auth.enums.UserEntityTypes; import org.jetlinks.community.auth.service.UserDetailService; import org.jetlinks.community.auth.service.request.SaveUserDetailRequest; import org.jetlinks.community.auth.service.request.SaveUserRequest; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; +import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @RestController @@ -99,4 +102,11 @@ public class UserDetailController { .flatMap(tp2 -> userDetailService.saveUserDetail(tp2.getT1().getUser().getId(), tp2.getT2())); } + @GetMapping("/types") + @Operation(summary = "获取所有用户类型") + @Authorize(merge = false) + public Flux getUserEntityTypes() { + return Flux.fromIterable(UserEntityTypes.getAllType()); + } + }