7x31/databasir
1
0
Fork 0
mirror of https://github.com/vran-dev/databasir.git synced 2025-08-08 17:32:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add user/document/discussion event (#59)

Browse Source
This commit is contained in:
vran
2022-03-22 15:00:44 +08:00
committed by GitHub
parent 890414deb1
commit 4deebab2cb
25 changed files with 428 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/main/java/com/databasir/api/DocumentDiscussionController.java
View File

@@ -3,10 +3,10 @@ package com.databasir.api;
import com.databasir.api.config.security.DatabasirUserDetails;
import com.databasir.common.JsonData;
import com.databasir.core.domain.log.annotation.Operation;
import com.databasir.core.domain.remark.data.DiscussionCreateRequest;
import com.databasir.core.domain.remark.data.DiscussionListCondition;
import com.databasir.core.domain.remark.data.DiscussionResponse;
import com.databasir.core.domain.remark.service.DocumentDiscussionService;
import com.databasir.core.domain.discussion.data.DiscussionCreateRequest;
import com.databasir.core.domain.discussion.data.DiscussionListCondition;
import com.databasir.core.domain.discussion.data.DiscussionResponse;
import com.databasir.core.domain.discussion.service.DocumentDiscussionService;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

9
api/src/main/java/com/databasir/api/UserController.java
View File

@@ -1,5 +1,6 @@
package com.databasir.api;
import com.databasir.api.common.LoginUserContext;
import com.databasir.api.validator.UserOperationValidator;
import com.databasir.common.JsonData;
import com.databasir.common.exception.Forbidden;
@@ -7,6 +8,7 @@ import com.databasir.core.domain.DomainErrors;
import com.databasir.core.domain.log.annotation.Operation;
import com.databasir.core.domain.user.data.*;
import com.databasir.core.domain.user.service.UserService;
import com.databasir.core.infrastructure.event.EventPublisher;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -27,6 +29,8 @@ public class UserController {
private final UserOperationValidator userOperationValidator;
private final EventPublisher eventPublisher;
@GetMapping(Routes.User.LIST)
public JsonData<Page<UserPageResponse>> list(@PageableDefault(sort = "id", direction = Sort.Direction.DESC)
Pageable pageable,
@@ -60,7 +64,7 @@ public class UserController {
@PreAuthorize("hasAnyAuthority('SYS_OWNER')")
@Operation(module = Operation.Modules.USER, name = "创建用户")
public JsonData<Void> create(@RequestBody @Valid UserCreateRequest request) {
userService.create(request);
userService.create(request, UserSource.MANUAL);
return JsonData.ok();
}
@@ -73,7 +77,8 @@ public class UserController {
@PreAuthorize("hasAnyAuthority('SYS_OWNER')")
@Operation(module = Operation.Modules.USER, name = "重置用户密码", involvedUserId = "#userId")
public JsonData<Void> renewPassword(@PathVariable Integer userId) {
userService.renewPassword(userId);
Integer operatorUserId = LoginUserContext.getLoginUserId();
userService.renewPassword(operatorUserId, userId);
return JsonData.ok();
}

14
api/src/main/java/com/databasir/api/common/LoginUserContext.java Normal file
View File

@@ -0,0 +1,14 @@
package com.databasir.api.common;
import com.databasir.api.config.security.DatabasirUserDetails;
import org.springframework.security.core.context.SecurityContextHolder;
public class LoginUserContext {
public static Integer getLoginUserId() {
DatabasirUserDetails principal = (DatabasirUserDetails) SecurityContextHolder.getContext()
.getAuthentication()
.getPrincipal();
return principal.getUserPojo().getId();
}
}