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

feat: add checkstyle (#22)

Browse Source
This commit is contained in:
vran
2022-02-21 21:55:56 +08:00
committed by GitHub
parent dde3c09e3e
commit cfedddeb9e
47 changed files with 522 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,6 @@ import com.databasir.core.domain.log.annotation.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.ContentDisposition;
import org.springframework.http.HttpHeaders;
@@ -26,6 +25,8 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.UUID;
import static org.springframework.data.domain.Sort.Direction.DESC;
@RequiredArgsConstructor
@Validated
@RestController
@@ -50,7 +51,8 @@ public class DocumentController {
@GetMapping(Routes.Document.LIST_VERSIONS)
public JsonData<Page<DatabaseDocumentVersionResponse>> getVersionsByProjectId(@PathVariable Integer projectId,
@PageableDefault(sort = "id", direction = Sort.Direction.DESC)
@PageableDefault(sort = "id",
direction = DESC)
Pageable page) {
return JsonData.ok(documentService.getVersionsBySchemaSourceId(projectId, page));
}
@@ -60,7 +62,8 @@ public class DocumentController {
@RequestParam(required = false) Long version) {
String data = documentService.toMarkdown(projectId, version).get();
try {
Path path = Files.writeString(Paths.get(UUID.randomUUID().toString() + ".md"), data, StandardCharsets.UTF_8);
Path path = Files.writeString(Paths.get(UUID.randomUUID().toString() + ".md"), data,
StandardCharsets.UTF_8);
HttpHeaders headers = new HttpHeaders();
headers.setContentDisposition(ContentDisposition.attachment()
.filename("demo.md", StandardCharsets.UTF_8)

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

@@ -8,7 +8,6 @@ import com.databasir.core.domain.log.annotation.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -18,6 +17,8 @@ import javax.validation.Valid;
import java.util.Arrays;
import java.util.List;
import static org.springframework.data.domain.Sort.Direction.DESC;
@RestController
@RequiredArgsConstructor
@Validated
@@ -46,7 +47,7 @@ public class GroupController {
}
@GetMapping(Routes.Group.LIST)
public JsonData<Page<GroupPageResponse>> list(@PageableDefault(sort = "id", direction = Sort.Direction.DESC)
public JsonData<Page<GroupPageResponse>> list(@PageableDefault(sort = "id", direction = DESC)
Pageable page,
GroupPageCondition condition) {
return JsonData.ok(groupService.list(page, condition));
@@ -69,7 +70,8 @@ public class GroupController {
@GetMapping(Routes.Group.MEMBERS)
public JsonData<Page<GroupMemberPageResponse>> listGroupMembers(@PathVariable Integer groupId,
@PageableDefault(sort = "user_role.create_at", direction = Sort.Direction.DESC)
@PageableDefault(sort = "user_role.create_at",
direction = DESC)
Pageable pageable,
GroupMemberPageCondition condition) {
return JsonData.ok(groupService.listGroupMembers(groupId, pageable, condition));

5
api/src/main/java/com/databasir/api/LoginController.java
View File

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.Objects;
@@ -40,8 +39,8 @@ public class LoginController {
}
@PostMapping(Routes.Login.REFRESH_ACCESS_TOKEN)
public JsonData<AccessTokenRefreshResponse> refreshAccessTokens(@RequestBody @Valid AccessTokenRefreshRequest request,
HttpServletResponse response) {
public JsonData<AccessTokenRefreshResponse> refreshAccessTokens(@RequestBody @Valid
AccessTokenRefreshRequest request) {
try {
return JsonData.ok(loginService.refreshAccessTokens(request));
} catch (DatabasirException e) {

3
api/src/main/java/com/databasir/api/ProjectController.java
View File

@@ -26,7 +26,8 @@ public class ProjectController {
private final CronExpressionValidator cronExpressionValidator;
@PostMapping(Routes.GroupProject.CREATE)
@PreAuthorize("hasAnyAuthority('SYS_OWNER', 'GROUP_OWNER?groupId='+#request.groupId, 'GROUP_MEMBER?groupId='+#request.groupId)")
@PreAuthorize("hasAnyAuthority('SYS_OWNER', 'GROUP_OWNER?groupId='+#request.groupId, "
+ "'GROUP_MEMBER?groupId='+#request.groupId)")
@Operation(module = Operation.Modules.PROJECT,
name = "创建项目",
involvedGroupId = "#request.groupId")

1
api/src/main/java/com/databasir/api/SettingController.java
View File

@@ -1,6 +1,5 @@
package com.databasir.api;
import com.databasir.common.JsonData;
import com.databasir.core.domain.log.annotation.Operation;
import com.databasir.core.domain.system.data.SystemEmailResponse;

1
api/src/main/java/com/databasir/api/advice/DatabasirExceptionAdvice.java
View File

@@ -1,6 +1,5 @@
package com.databasir.api.advice;
import com.databasir.common.DatabasirException;
import com.databasir.common.JsonData;
import com.databasir.common.SystemException;

1
api/src/main/java/com/databasir/api/config/SecurityConfig.java
View File

@@ -69,6 +69,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
}
@Bean
@SuppressWarnings("checkstyle:all")
public PasswordEncoder bCryptPasswordEncoder() {
return new BCryptPasswordEncoder();
}

19
api/src/main/java/com/databasir/api/config/security/DatabasirAuthenticationSuccessHandler.java
View File

@@ -33,15 +33,6 @@ public class DatabasirAuthenticationSuccessHandler implements AuthenticationSucc
HttpServletResponse response,
Authentication authentication) throws IOException, ServletException {
DatabasirUserDetails user = (DatabasirUserDetails) authentication.getPrincipal();
List<UserLoginResponse.RoleResponse> roles = user.getRoles()
.stream()
.map(ur -> {
UserLoginResponse.RoleResponse data = new UserLoginResponse.RoleResponse();
data.setRole(ur.getRole());
data.setGroupId(ur.getGroupId());
return data;
})
.collect(Collectors.toList());
response.setCharacterEncoding(StandardCharsets.UTF_8.name());
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
UserLoginResponse data = new UserLoginResponse();
@@ -55,6 +46,16 @@ public class DatabasirAuthenticationSuccessHandler implements AuthenticationSucc
long expireAt = loginKey.getAccessTokenExpireAt().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
data.setAccessTokenExpireAt(expireAt);
data.setRefreshToken(loginKey.getRefreshToken());
List<UserLoginResponse.RoleResponse> roles = user.getRoles()
.stream()
.map(ur -> {
UserLoginResponse.RoleResponse roleResponse = new UserLoginResponse.RoleResponse();
roleResponse.setRole(ur.getRole());
roleResponse.setGroupId(ur.getGroupId());
return roleResponse;
})
.collect(Collectors.toList());
data.setRoles(roles);
objectMapper.writeValue(response.getWriter(), JsonData.ok(data));
}

1
api/src/main/java/com/databasir/api/config/security/DatabasirUserDetails.java
View File

@@ -12,7 +12,6 @@ import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
@RequiredArgsConstructor
public class DatabasirUserDetails implements UserDetails {