Skip to content

Commit a9121bd

Browse files
juzi214032colorful3
juzi214032
authored and
colorful3
committed
refactor: 重构 ValidationMessages，UploaderAutoConfiguration
1 parent af88a5e commit a9121bd

17 files changed

Lines changed: 83 additions & 90 deletions

‎src/main/java/io/github/talelin/latticy/common/configuration/WebConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ public class WebConfiguration implements WebMvcConfigurer {
4040
@Autowired
4141
private RequestLogInterceptor requestLogInterceptor;
4242

43-
@Value("${lin.cms.file.store-dir:assets/}")
43+
@Value("${lin.file.store-dir:assets/}")
4444
private String dir;
4545

46-
@Value("${lin.cms.file.serve-path:assets/**}")
46+
@Value("${lin.file.serve-path:assets/**}")
4747
private String servePath;
4848

4949
/**

‎src/main/java/io/github/talelin/latticy/common/interceptor/AuthorizeVerifyResolverImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ public class AuthorizeVerifyResolverImpl implements AuthorizeVerifyResolver {
4949
@Autowired
5050
private GroupService groupService;
5151

52-
@Value("${lin.cms.file.domain}")
52+
@Value("${lin.file.domain}")
5353
private String domain;
5454

55-
@Value("${lin.cms.file.serve-path:assets/**}")
55+
@Value("${lin.file.serve-path:assets/**}")
5656
private String servePath;
5757

5858

‎src/main/java/io/github/talelin/latticy/dto/admin/ResetPasswordDTO.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
@Data
1414
public class ResetPasswordDTO {
1515

16-
@NotBlank(message = "{new.password.not-blank}")
17-
@Pattern(regexp = "^[A-Za-z0-9_*&$#@]{6,22}$", message = "{new.password.pattern}")
16+
@NotBlank(message = "{password.new.not-blank}")
17+
@Pattern(regexp = "^[A-Za-z0-9_*&$#@]{6,22}$", message = "{password.new.pattern}")
1818
private String newPassword;
1919

20-
@NotBlank(message = "{confirm.password.not-blank}")
20+
@NotBlank(message = "{password.confirm.not-blank}")
2121
private String confirmPassword;
2222
}

‎src/main/java/io/github/talelin/latticy/dto/book/CreateOrUpdateBookDTO.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import lombok.Data;
44
import lombok.NoArgsConstructor;
5+
import org.hibernate.validator.constraints.Length;
56

67
import javax.validation.constraints.NotEmpty;
7-
import javax.validation.constraints.Size;
88

99
/**
1010
* @author pedro@TaleLin
@@ -15,17 +15,17 @@
1515
public class CreateOrUpdateBookDTO {
1616

1717
@NotEmpty(message = "{book.title.not-empty}")
18-
@Size(max = 50, message = "{book.title.size}")
18+
@Length(max = 50, message = "{book.title.length}")
1919
private String title;
2020

2121
@NotEmpty(message = "{book.author.not-empty}")
22-
@Size(max = 50, message = "{book.author.size}")
22+
@Length(max = 50, message = "{book.author.length}")
2323
private String author;
2424

2525
@NotEmpty(message = "{book.summary.not-empty}")
26-
@Size(max = 1000, message = "{book.summary.size}")
26+
@Length(max = 1000, message = "{book.summary.length}")
2727
private String summary;
2828

29-
@Size(max = 100, message = "{book.image.size}")
29+
@Length(max = 100, message = "{book.image.length}")
3030
private String image;
3131
}

‎src/main/java/io/github/talelin/latticy/dto/user/ChangePasswordDTO.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
@EqualField(srcField = "newPassword", dstField = "confirmPassword", message = "{password.equal-field}")
1717
public class ChangePasswordDTO {
1818

19-
@NotBlank(message = "{new.password.not-blank}")
20-
@Pattern(regexp = "^[A-Za-z0-9_*&$#@]{6,22}$", message = "{new.password.pattern}")
19+
@NotBlank(message = "{password.new.not-blank}")
20+
@Pattern(regexp = "^[A-Za-z0-9_*&$#@]{6,22}$", message = "{password.new.pattern}")
2121
private String newPassword;
2222

23-
@NotBlank(message = "{confirm.password.not-blank}")
23+
@NotBlank(message = "{password.confirm.not-blank}")
2424
private String confirmPassword;
2525

26-
@NotBlank(message = "{old.password.not-blank}")
26+
@NotBlank(message = "{password.old.not-blank}")
2727
private String oldPassword;
2828

2929
}

‎src/main/java/io/github/talelin/latticy/dto/user/LoginDTO.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ public class LoginDTO {
1616
@NotBlank(message = "{username.not-blank}")
1717
private String username;
1818

19-
@NotBlank(message = "{new.password.not-blank}")
19+
@NotBlank(message = "{password.new.not-blank}")
2020
private String password;
2121
}

‎src/main/java/io/github/talelin/latticy/dto/user/RegisterDTO.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import io.github.talelin.autoconfigure.validator.LongList;
55
import lombok.Data;
66
import lombok.NoArgsConstructor;
7+
import org.hibernate.validator.constraints.Length;
78

89
import javax.validation.constraints.Email;
910
import javax.validation.constraints.NotBlank;
1011
import javax.validation.constraints.Pattern;
11-
import javax.validation.constraints.Size;
1212
import java.util.List;
1313

1414
/**
@@ -21,7 +21,7 @@
2121
public class RegisterDTO {
2222

2323
@NotBlank(message = "{username.not-blank}")
24-
@Size(min = 2, max = 10, message = "{username.size}")
24+
@Length(min = 2, max = 10, message = "{username.length}")
2525
private String username;
2626

2727
@LongList(allowBlank = true, message = "{group.ids.long-list}")
@@ -30,10 +30,10 @@ public class RegisterDTO {
3030
@Email(message = "{email}")
3131
private String email;
3232

33-
@NotBlank(message = "{new.password.not-blank}")
34-
@Pattern(regexp = "^[A-Za-z0-9_*&$#@]{6,22}$", message = "{new.password.pattern}")
33+
@NotBlank(message = "{password.new.not-blank}")
34+
@Pattern(regexp = "^[A-Za-z0-9_*&$#@]{6,22}$", message = "{password.new.pattern}")
3535
private String password;
3636

37-
@NotBlank(message = "{confirm.password.not-blank}")
37+
@NotBlank(message = "{password.confirm.not-blank}")
3838
private String confirmPassword;
3939
}

‎src/main/java/io/github/talelin/latticy/dto/user/UpdateInfoDTO.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ public class UpdateInfoDTO {
1515
@Email(message = "{email}")
1616
private String email;
1717

18-
@Length(min = 2, max = 10, message = "{nickname.size}")
18+
@Length(min = 2, max = 10, message = "{nickname.length}")
1919
private String nickname;
2020

21-
@Length(min = 2, max = 10, message = "{username.size}")
21+
@Length(min = 2, max = 10, message = "{username.length}")
2222
private String username;
2323

24-
@Length(max = 500, message = "{avatar.size}")
24+
@Length(max = 500, message = "{avatar.length}")
2525
private String avatar;
2626
}

‎src/main/java/io/github/talelin/latticy/extension/file/QiniuUploader.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ public class QiniuUploader extends AbstractUploader {
2727
@Autowired
2828
private FileProperties fileProperties;
2929

30-
@Value("${lin.cms.file.qiniuyun.access-key}")
30+
@Value("${lin.file.qiniuyun.access-key}")
3131
private String accessKey;
3232

33-
@Value("${lin.cms.file.qiniuyun.secret-key}")
33+
@Value("${lin.file.qiniuyun.secret-key}")
3434
private String secretKey;
3535

36-
@Value("${lin.cms.file.qiniuyun.bucket}")
36+
@Value("${lin.file.qiniuyun.bucket}")
3737
private String bucket;
3838

3939
private UploadManager uploadManager;

‎src/main/java/io/github/talelin/latticy/extension/file/UploaderConfiguration.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package io.github.talelin.latticy.extension.file;
22

3+
import io.github.talelin.latticy.module.file.Uploader;
4+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
5+
import org.springframework.context.annotation.Bean;
36
import org.springframework.context.annotation.Configuration;
7+
import org.springframework.core.annotation.Order;
48

59
/**
610
* 文件上传配置类
@@ -9,4 +13,13 @@
913
*/
1014
@Configuration
1115
public class UploaderConfiguration {
16+
/**
17+
* @return 本地文件上传实现类
18+
*/
19+
@Bean
20+
@Order
21+
@ConditionalOnMissingBean
22+
public Uploader uploader(){
23+
return new LocalUploader();
24+
}
1225
}

0 commit comments

Comments
 (0)