diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/config/security/DevSecurityConfig.java b/blog-backend/src/main/java/cn/hamster3/application/blog/config/security/DevSecurityConfig.java index 0f93a74..a382ce3 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/config/security/DevSecurityConfig.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/config/security/DevSecurityConfig.java @@ -18,10 +18,8 @@ public class DevSecurityConfig { .anyRequest().permitAll()) .cors().and() .csrf().disable() - .formLogin() - .and() - .httpBasic() - .and() + .formLogin().and() + .httpBasic().and() .build(); } diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/config/security/SecurityConfig.java b/blog-backend/src/main/java/cn/hamster3/application/blog/config/security/SecurityConfig.java index 096130e..a1d118e 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/config/security/SecurityConfig.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/config/security/SecurityConfig.java @@ -21,10 +21,8 @@ public class SecurityConfig { .anyRequest().authenticated()) .cors().and() .csrf().disable() - .formLogin() - .and() - .httpBasic() - .and() + .formLogin().and() + .httpBasic().and() .build(); } diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/AttachController.java b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/AttachController.java index 191d6cb..2f709fa 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/AttachController.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/AttachController.java @@ -2,12 +2,13 @@ package cn.hamster3.application.blog.controller; import cn.hamster3.application.blog.vo.ResponseVO; import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -@Tag(name = "附件接口", description = "附件相关接口") +@Tag(name = "AttachController", description = "附件相关接口") @RestController -@RequestMapping("/api/v1/attach") +@RequestMapping(value = "/api/v1/attach",produces = MediaType.APPLICATION_JSON_VALUE) public class AttachController { @PostMapping("/") public ResponseVO createAttach(@RequestBody MultipartFile file) { diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/BlogController.java b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/BlogController.java index b61f217..6d8ac7f 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/BlogController.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/BlogController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Tag(name = "博文接口", description = "博文相关接口") +@Tag(name = "BlogController", description = "博文相关接口") @RestController @RequestMapping(value = "/api/v1/blog", produces = MediaType.APPLICATION_JSON_VALUE) public class BlogController { diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/SettingController.java b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/SettingController.java index 9ac87d8..fd64585 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/SettingController.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/SettingController.java @@ -14,7 +14,7 @@ import org.springframework.data.domain.PageRequest; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; -@Tag(name = "网站设置接口", description = "网站设置相关接口") +@Tag(name = "SettingController", description = "网站设置相关接口") @RestController @RequestMapping(value = "/api/v1/settings", produces = MediaType.APPLICATION_JSON_VALUE) public class SettingController { diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/UserController.java b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/UserController.java index 09f1db3..0e65e19 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/controller/UserController.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/controller/UserController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.util.UUID; -@Tag(name = "用户接口", description = "用户相关接口") +@Tag(name = "UserController", description = "用户相关接口") @RestController @RequestMapping(value = "/api/v1/user", produces = MediaType.APPLICATION_JSON_VALUE) public class UserController { @@ -41,7 +41,7 @@ public class UserController { @PostMapping("/") @Operation(summary = "注册用户") - public ResponseVO createUser(@RequestBody @Valid UserCreateRequireVO requireVO) { + public ResponseVO register(@RequestBody @Valid UserCreateRequireVO requireVO) { return userService.createUser(requireVO); } diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/entity/SettingEntity.java b/blog-backend/src/main/java/cn/hamster3/application/blog/entity/SettingEntity.java index 4137d87..45b587c 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/entity/SettingEntity.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/entity/SettingEntity.java @@ -22,7 +22,7 @@ public class SettingEntity { @Column(name = "id", nullable = false, updatable = false, length = 64) @NotBlank(message = "网站设置 ID 不能为空!") @Length(message = "网站设置 ID 长度不能超过 64 字符!", max = 64) - @Pattern(message = "网站设置 ID 只能包含字母、数字和下划线!", regexp = "[a-zA-Z0-9-_]+") + @Pattern(message = "网站设置 ID 只能包含字母、数字、点、横线和下划线!", regexp = "[a-zA-Z0-9-_.]+") private String id; @Setter diff --git a/blog-backend/src/main/java/cn/hamster3/application/blog/entity/repo/SettingRepository.java b/blog-backend/src/main/java/cn/hamster3/application/blog/entity/repo/SettingRepository.java index 79e9151..d676d1d 100644 --- a/blog-backend/src/main/java/cn/hamster3/application/blog/entity/repo/SettingRepository.java +++ b/blog-backend/src/main/java/cn/hamster3/application/blog/entity/repo/SettingRepository.java @@ -15,6 +15,7 @@ public interface SettingRepository extends JpaRepository, SettingEntity findByIdIgnoreCase(String id); + @SuppressWarnings("BooleanMethodIsAlwaysInverted") boolean existsByIdIgnoreCase(String id); @Transactional diff --git a/blog-frontend/src/App.vue b/blog-frontend/src/App.vue index c6ff3c8..e3ab6a1 100644 --- a/blog-frontend/src/App.vue +++ b/blog-frontend/src/App.vue @@ -1,38 +1,70 @@