amypeng
/
microservices
forked from Gitlink/microservices
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix(制品库优化): 修复产品版本标签正则表达式错误的问题' (#833) from otto/microservices:product_refact into product_refact

This commit is contained in:
otto 2025-03-03 10:35:31 +08:00
parent 2a7ab04e08 2e44e2b24e
commit d759a5d913
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/PmsProductLibraryRepositories.java
View File

@ -100,7 +100,7 @@ public class PmsProductLibraryRepositories extends BaseEntity {
private String version;
@ApiModelProperty(value = "产品版本标记")
@ApiModelProperty(value = "产品版本标签")
private String tag;
public RepoAttributesVo getRepoAttributes() {

2
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibraryDataVo.java
View File

@ -58,6 +58,6 @@ public class PmsProductLibraryDataVo {
private String version;
@ApiModelProperty(value = "产品版本标记")
@ApiModelProperty(value = "产品版本标签")
private String tag;
}

2
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/PmsProductLibrarySimpleVo.java
View File

@ -29,6 +29,6 @@ public class PmsProductLibrarySimpleVo extends PmsProductLibraryRepositoriesSimp
private String version;
@ApiModelProperty(value = "产品版本标记")
@ApiModelProperty(value = "产品版本标签")
private String tag;
}

7
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/productLibrary/domain/vo/ProductRepositoriesInputVo.java
View File

@ -17,9 +17,10 @@ import javax.validation.constraints.Pattern;
@Data
@ApiModel("产品库输入对象")
public class ProductRepositoriesInputVo extends ProductRepositoriesOperateVo {
@ApiModelProperty(value = "产品版本标记", required = true)
@NotBlank(message = "产品版本标记不能为空")
@Pattern(regexp = "^[A-Za-z0-9](?!_)(?!\\.)[A-Za-z0-9_\\-.]*$", message = "产品版本标记不符合规范")
// 必填，以字母、数字开头，由字母、数字、下划线(_)、短横线(-)、点(.)组成；
@ApiModelProperty(value = "产品版本标签", required = true)
@NotBlank(message = "产品版本标签不能为空")
@Pattern(regexp = "^[A-Za-z0-9][A-Za-z0-9_\\-.]*$", message = "产品版本标签不符合规范")
private String tag;
@ApiModelProperty(value = "产品库名称", required = true)