xieyinlu/zhilu-admin
1
0
Fork 0
mirror of https://github.com/ccmjga/zhilu-admin synced 2026-03-28 06:23:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

init minio

Browse Source
This commit is contained in:
Chuck1sn
2025-06-15 15:09:52 +08:00
parent c64f2eb0f6
commit dc7780e0a8
28 changed files with 333 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/com/zl/mjga/component/UserRolePermissionOperatorTool.java
View File

@@ -36,16 +36,9 @@ public class UserRolePermissionOperatorTool {
if (user != null) {
throw new BusinessException("用户已存在");
}
identityAccessService.upsertUser(new UserUpsertDto(null, name, name, true));
identityAccessService.upsertUser(new UserUpsertDto(null, name, name, true, null));
}
// @Tool(value = "查询用户")
// List<User> queryUser(@P(value = "用户名",required = false) String username, @P(value =
// "开始日期",required = false) LocalDateTime startDate, @P(value = "结束日期",required = false)
// LocalDateTime endDate) {
// return userRepository.fetchBy(new UserQueryDto(username, startDate, endDate));
// }
@Tool(value = "删除用户")
void deleteUser(@P(value = "用户名") String username) {
userRepository.deleteByUsername(username);
@@ -56,7 +49,7 @@ public class UserRolePermissionOperatorTool {
@P(value = "用户名") String name,
@P(value = "密码", required = false) String password,
@P(value = "是否开启", required = false) Boolean enable) {
identityAccessService.upsertUser(new UserUpsertDto(null, name, password, enable));
identityAccessService.upsertUser(new UserUpsertDto(null, name, password, enable, null));
}
@Tool(value = {"给用户绑定角色", "给用户分配角色"})

26
backend/src/main/java/com/zl/mjga/config/minio/MinIoConfig.java Normal file
View File

@@ -0,0 +1,26 @@
package com.zl.mjga.config.minio;
import io.minio.MinioClient;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
@Setter
@Getter
@ConfigurationProperties(prefix = "minio")
@Slf4j
public class MinIoConfig {
private String endpoint;
private String accessKey;
private String secretKey;
private String defaultBucket;
@Bean
public MinioClient minioClient() {
return MinioClient.builder().endpoint(endpoint).credentials(accessKey, secretKey).build();
}
}

37
backend/src/main/java/com/zl/mjga/controller/IdentityAccessController.java
View File

@@ -1,5 +1,6 @@
package com.zl.mjga.controller;
import com.zl.mjga.config.minio.MinIoConfig;
import com.zl.mjga.dto.PageRequestDto;
import com.zl.mjga.dto.PageResponseDto;
import com.zl.mjga.dto.department.DepartmentBindDto;
@@ -12,17 +13,23 @@ import com.zl.mjga.repository.PermissionRepository;
import com.zl.mjga.repository.RoleRepository;
import com.zl.mjga.repository.UserRepository;
import com.zl.mjga.service.IdentityAccessService;
import io.minio.MinioClient;
import io.minio.PutObjectArgs;
import io.minio.errors.*;
import jakarta.validation.Valid;
import java.awt.image.BufferedImage;
import java.security.Principal;
import java.util.List;
import javax.imageio.ImageIO;
import lombok.RequiredArgsConstructor;
import org.jooq.generated.mjga.tables.pojos.User;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.authentication.DisabledException;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@SuppressWarnings("PMD.AvoidDuplicateLiterals")
@RestController
@RequestMapping("/iam")
@RequiredArgsConstructor
@@ -32,6 +39,34 @@ public class IdentityAccessController {
private final UserRepository userRepository;
private final RoleRepository roleRepository;
private final PermissionRepository permissionRepository;
private final MinioClient minioClient;
private final MinIoConfig minIoConfig;
@PostMapping(
value = "/avatar/upload",
consumes = MediaType.MULTIPART_FORM_DATA_VALUE,
produces = MediaType.TEXT_PLAIN_VALUE)
public String uploadAvatar(Principal principal, @RequestPart("file") MultipartFile multipartFile)
throws Exception {
String objectName = String.format("avatar/%s/avatar.jpg", principal.getName());
if (multipartFile.isEmpty()) {
throw new BusinessException("上传的文件不能为空");
}
long size = multipartFile.getSize();
if (size > 200 * 1024) {
throw new BusinessException("头像文件大小不能超过200KB");
}
BufferedImage img = ImageIO.read(multipartFile.getInputStream());
if (img == null) {
throw new BusinessException("非法的上传文件");
}
minioClient.putObject(
PutObjectArgs.builder().bucket(minIoConfig.getDefaultBucket()).object(objectName).stream(
multipartFile.getInputStream(), size, -1)
.contentType(multipartFile.getContentType())
.build());
return objectName;
}
@GetMapping("/me")
UserRolePermissionDto currentUser(Principal principal) {

2
backend/src/main/java/com/zl/mjga/dto/urp/UserRolePermissionDto.java
View File

@@ -19,6 +19,8 @@ public class UserRolePermissionDto {
@JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String password;
private String avatar;
private Boolean enable;
@Builder.Default private List<RoleDto> roles = new LinkedList<>();

1
backend/src/main/java/com/zl/mjga/dto/urp/UserUpsertDto.java
View File

@@ -14,4 +14,5 @@ public class UserUpsertDto {
@NotEmpty private String username;
private String password;
@NotNull private Boolean enable;
private String avatar;
}

5
backend/src/main/java/com/zl/mjga/repository/UserRepository.java
View File

@@ -36,6 +36,7 @@ public class UserRepository extends UserDao {
value(user.getId()).as("id"),
value(user.getUsername()).as("username"),
value(user.getPassword()).as("password"),
value(user.getAvatar()).as("avatar"),
value(user.getEnable()).as("enable"))
.asTable("newUser"))
.on(USER.ID.eq(DSL.field(DSL.name("newUser", "id"), Long.class)))
@@ -46,11 +47,13 @@ public class UserRepository extends UserDao {
StringUtils.isNotEmpty(user.getPassword())
? DSL.field(DSL.name("newUser", "password"), String.class)
: USER.PASSWORD)
.set(USER.AVATAR, DSL.field(DSL.name("newUser", "avatar"), String.class))
.set(USER.ENABLE, DSL.field(DSL.name("newUser", "enable"), Boolean.class))
.whenNotMatchedThenInsert(USER.USERNAME, USER.PASSWORD, USER.ENABLE)
.whenNotMatchedThenInsert(USER.USERNAME, USER.PASSWORD, USER.AVATAR, USER.ENABLE)
.values(
DSL.field(DSL.name("newUser", "username"), String.class),
DSL.field(DSL.name("newUser", "password"), String.class),
DSL.field(DSL.name("newUser", "avatar"), String.class),
DSL.field(DSL.name("newUser", "enable"), Boolean.class))
.execute();
}

9
backend/src/main/resources/application.yml
View File

@@ -27,9 +27,18 @@ spring:
enabled: true
locations: classpath:db/migration
default-schema: ${DATABASE_DEFAULT_SCHEMA}
servlet:
multipart:
max-file-size: 1MB
max-request-size: 10MB
springdoc:
swagger-ui:
path: /swagger-ui.html
jwt:
secret: ${JWT_SECRET:secret}
expiration-min: ${JWT_EXPIRATION_MIN:100}
minio:
endpoint: ${MINIO_ENDPOINT}
access-key: ${MINIO_ROOT_USER}
secret-key: ${MINIO_ROOT_PASSWORD}
default-bucket: ${MINIO_DEFAULT_BUCKETS}

1
backend/src/main/resources/db/migration/V1_0_0__init_table.sql
View File

@@ -3,6 +3,7 @@ CREATE SCHEMA IF NOT EXISTS mjga;
CREATE TABLE mjga.user (
id BIGSERIAL PRIMARY KEY,
username VARCHAR NOT NULL UNIQUE,
avatar VARCHAR,
create_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
password VARCHAR NOT NULL,
enable BOOLEAN NOT NULL DEFAULT TRUE

4
backend/src/test/java/com/zl/mjga/integration/mvc/JacksonAnnotationMvcTest.java
View File

@@ -5,6 +5,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.zl.mjga.config.minio.MinIoConfig;
import com.zl.mjga.config.security.HttpFireWallConfig;
import com.zl.mjga.controller.IdentityAccessController;
import com.zl.mjga.dto.PageRequestDto;
@@ -15,6 +16,7 @@ import com.zl.mjga.repository.PermissionRepository;
import com.zl.mjga.repository.RoleRepository;
import com.zl.mjga.repository.UserRepository;
import com.zl.mjga.service.IdentityAccessService;
import io.minio.MinioClient;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +36,8 @@ public class JacksonAnnotationMvcTest {
@MockBean private UserRepository userRepository;
@MockBean private RoleRepository roleRepository;
@MockBean private PermissionRepository permissionRepository;
@MockBean private MinioClient minioClient;
@MockBean private MinIoConfig minIoConfig;
@Test
@WithMockUser

4
backend/src/test/java/com/zl/mjga/integration/mvc/UserRolePermissionMvcTest.java
View File

@@ -7,6 +7,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.zl.mjga.config.minio.MinIoConfig;
import com.zl.mjga.config.security.HttpFireWallConfig;
import com.zl.mjga.controller.IdentityAccessController;
import com.zl.mjga.dto.PageRequestDto;
@@ -16,6 +17,7 @@ import com.zl.mjga.repository.PermissionRepository;
import com.zl.mjga.repository.RoleRepository;
import com.zl.mjga.repository.UserRepository;
import com.zl.mjga.service.IdentityAccessService;
import io.minio.MinioClient;
import java.util.List;
import org.jooq.generated.mjga.tables.pojos.User;
import org.junit.jupiter.api.Test;
@@ -36,6 +38,8 @@ class UserRolePermissionMvcTest {
@MockBean private UserRepository userRepository;
@MockBean private RoleRepository roleRepository;
@MockBean private PermissionRepository permissionRepository;
@MockBean private MinioClient minioClient;
@MockBean private MinIoConfig minIoConfig;
@Test
@WithMockUser

2
backend/src/test/java/com/zl/mjga/integration/persistence/AbstractDataAccessLayerTest.java
View File

@@ -16,7 +16,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
public class AbstractDataAccessLayerTest {
public static PostgreSQLContainer<?> postgres =
new PostgreSQLContainer<>("postgres:17.3-alpine").withDatabaseName("mjga");
new PostgreSQLContainer<>("pgvector/pgvector:pg17").withDatabaseName("mjga");
@DynamicPropertySource
static void postgresProperties(DynamicPropertyRegistry registry) {

4
backend/src/test/java/com/zl/mjga/integration/persistence/SortByDALTest.java
View File

@@ -34,9 +34,9 @@ public class SortByDALTest extends AbstractDataAccessLayerTest {
void userPageFetchWithNoSort() {
UserQueryDto rbacQueryDto = new UserQueryDto("test", null, null);
Result<Record> records = userRepository.pageFetchBy(PageRequestDto.of(1, 10), rbacQueryDto);
assertThat(records.get(0).get(USER.ID)).isEqualTo(1);
assertThat(records.get(2).get(USER.ID)).isEqualTo(1);
assertThat(records.get(1).get(USER.ID)).isEqualTo(2);
assertThat(records.get(2).get(USER.ID)).isEqualTo(3);
assertThat(records.get(0).get(USER.ID)).isEqualTo(3);
}
@Test

8
backend/src/test/java/com/zl/mjga/integration/persistence/UserRolePermissionDALTest.java
View File

@@ -100,8 +100,8 @@ public class UserRolePermissionDALTest extends AbstractDataAccessLayerTest {
Result<Record> records = userRepository.pageFetchBy(PageRequestDto.of(1, 10), rbacQueryDto);
assertThat(records.size()).isEqualTo(2);
assertThat(records.get(0).get(USER.ID)).isEqualTo(1);
assertThat(records.get(1).get(USER.ID)).isEqualTo(2);
assertThat(records.get(1).get(USER.ID)).isEqualTo(1);
assertThat(records.get(0).get(USER.ID)).isEqualTo(2);
}
@Test
@@ -142,8 +142,8 @@ public class UserRolePermissionDALTest extends AbstractDataAccessLayerTest {
roleQueryDto.setBindState(BindState.ALL);
Result<Record> records = roleRepository.pageFetchBy(PageRequestDto.of(1, 10), roleQueryDto);
assertThat(records.get(0).getValue("total_role")).isEqualTo(2);
assertThat(records.get(0).getValue(ROLE.NAME)).isEqualTo("testRoleA");
assertThat(records.get(1).getValue(ROLE.NAME)).isEqualTo("testRoleB");
assertThat(records.get(1).getValue(ROLE.NAME)).isEqualTo("testRoleA");
assertThat(records.get(0).getValue(ROLE.NAME)).isEqualTo("testRoleB");
roleQueryDto = new RoleQueryDto();
roleQueryDto.setRoleCode("testRoleA");

4
backend/src/test/java/com/zl/mjga/security/AuthenticationAndAuthorityTest.java
View File

@@ -6,6 +6,7 @@ import static org.springframework.security.test.web.servlet.request.SecurityMock
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import com.zl.mjga.config.minio.MinIoConfig;
import com.zl.mjga.config.security.HttpFireWallConfig;
import com.zl.mjga.config.security.Jwt;
import com.zl.mjga.config.security.UserDetailsServiceImpl;
@@ -19,6 +20,7 @@ import com.zl.mjga.repository.RoleRepository;
import com.zl.mjga.repository.UserRepository;
import com.zl.mjga.service.IdentityAccessService;
import com.zl.mjga.service.SignService;
import io.minio.MinioClient;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Collections;
import java.util.List;
@@ -49,6 +51,8 @@ public class AuthenticationAndAuthorityTest {
@MockBean private UserRepository userRepository;
@MockBean private RoleRepository roleRepository;
@MockBean private PermissionRepository permissionRepository;
@MockBean private MinioClient minioClient;
@MockBean private MinIoConfig minIoConfig;
@Test
public void givenRequestOnPublicService_shouldSucceedWith200() throws Exception {

3
backend/src/test/resources/db/migration/test/V1_0_0__init_table.sql
View File

@@ -3,7 +3,8 @@ CREATE SCHEMA IF NOT EXISTS mjga;
CREATE TABLE mjga.user (
id BIGSERIAL PRIMARY KEY,
username VARCHAR NOT NULL UNIQUE,
create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
avatar VARCHAR,
create_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
password VARCHAR NOT NULL,
enable BOOLEAN NOT NULL DEFAULT TRUE
);