记得上下班打卡 | git大法好,push需谨慎

Commit a8a398d6 authored by zhanggb's avatar zhanggb

fix:数字藏品创作者~Valid:中英文且允许(首尾不可)包含空格及·;

fix:数字藏品名称及副标题~Valid:中英文且允许(首尾不可)包含空格及·;
parent 3a70b9cb
...@@ -58,7 +58,7 @@ public class GoblinStoreMgtDigitalGoodsAddParam implements Serializable { ...@@ -58,7 +58,7 @@ public class GoblinStoreMgtDigitalGoodsAddParam implements Serializable {
@ApiModelProperty(position = 20, required = true, value = "创作者[20]", example = "创作者...") @ApiModelProperty(position = 20, required = true, value = "创作者[20]", example = "创作者...")
@NotBlank(message = "创作者不能为空") @NotBlank(message = "创作者不能为空")
@Size(max = 20, message = "创作者内容过长") @Size(max = 20, message = "创作者内容过长")
@Pattern(regexp = LnsRegex.Valid.ALPHABET_HANZI_SPACE, message = "创作者格式有误,仅支持中英文") @Pattern(regexp = LnsRegex.Valid.ALPHABET_HANZI_SPACE_DOT, message = "创作者格式有误,仅支持中英文")
private String author; private String author;
@ApiModelProperty(position = 21, required = true, value = "发行方[25]", example = "发行方...") @ApiModelProperty(position = 21, required = true, value = "发行方[25]", example = "发行方...")
@NotBlank(message = "发行方不能为空") @NotBlank(message = "发行方不能为空")
......
...@@ -34,12 +34,12 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable { ...@@ -34,12 +34,12 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
@ApiModelProperty(position = 13, required = true, value = "藏品名称[36]", example = "藏品名称...") @ApiModelProperty(position = 13, required = true, value = "藏品名称[36]", example = "藏品名称...")
@NotBlank(message = "藏品名称不能为空") @NotBlank(message = "藏品名称不能为空")
@Size(max = 36, message = "藏品名称内容过长") @Size(max = 36, message = "藏品名称内容过长")
@Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_HANZI_SPACE, message = "藏品名称格式有误,仅支持中英文数字") @Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_HANZI_SPACE_DOT, message = "藏品名称格式有误,仅支持中英文数字")
private String name; private String name;
@ApiModelProperty(position = 14, required = true, value = "副标题[36],`unbox=0`时必传", example = "副标题...") @ApiModelProperty(position = 14, required = true, value = "副标题[36],`unbox=0`时必传", example = "副标题...")
@NotBlank(message = "副标题不能为空") @NotBlank(message = "副标题不能为空")
@Size(max = 36, message = "副标题内容过长") @Size(max = 36, message = "副标题内容过长")
@Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_HANZI_SPACE, message = "副标题格式有误,仅支持中英文数字") @Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_HANZI_SPACE_DOT, message = "副标题格式有误,仅支持中英文数字")
private String subtitle; private String subtitle;
@ApiModelProperty(position = 15, required = true, value = "藏品封面图片URL[256]", example = "https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.png") @ApiModelProperty(position = 15, required = true, value = "藏品封面图片URL[256]", example = "https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.png")
@NotBlank(message = "藏品封面图片不能为空") @NotBlank(message = "藏品封面图片不能为空")
......
...@@ -26,6 +26,10 @@ public class LnsRegex { ...@@ -26,6 +26,10 @@ public class LnsRegex {
* (大小字母 || 汉字 || 空格) && 首尾非空字符 * (大小字母 || 汉字 || 空格) && 首尾非空字符
*/ */
public static final String ALPHABET_HANZI_SPACE = "^(?!\\u0020)(?!.*?\\u0020$)[a-zA-Z\\u4e00-\\u9fa5\\u0020]+$"; public static final String ALPHABET_HANZI_SPACE = "^(?!\\u0020)(?!.*?\\u0020$)[a-zA-Z\\u4e00-\\u9fa5\\u0020]+$";
/**
* (大小字母 || 汉字 || 空格 || ·) && 首尾非空字符非·
*/
public static final String ALPHABET_HANZI_SPACE_DOT = "^(?![·\\u0020])(?!.*?[·\\u0020]$)[a-zA-Z\\u4e00-\\u9fa5\\u0020·]+$";
/** /**
* 大小字母 || 数字 || 汉字 * 大小字母 || 数字 || 汉字
*/ */
...@@ -34,6 +38,10 @@ public class LnsRegex { ...@@ -34,6 +38,10 @@ public class LnsRegex {
* (大小字母 || 数字 || 汉字 || 空格) && 首尾非空字符 * (大小字母 || 数字 || 汉字 || 空格) && 首尾非空字符
*/ */
public static final String ALPHABET_NUMBER_HANZI_SPACE = "^(?!\\u0020)(?!.*?\\u0020$)[a-zA-Z0-9\\u4e00-\\u9fa5\\u0020]+$"; public static final String ALPHABET_NUMBER_HANZI_SPACE = "^(?!\\u0020)(?!.*?\\u0020$)[a-zA-Z0-9\\u4e00-\\u9fa5\\u0020]+$";
/**
* (大小字母 || 数字 || 汉字 || 空格 || ·) && 首尾非空字符非·
*/
public static final String ALPHABET_NUMBER_HANZI_SPACE_DOT = "^(?![·\\u0020])(?!.*?[·\\u0020]$)[a-zA-Z0-9\\u4e00-\\u9fa5\\u0020·]+$";
/** /**
* 大小字母 || 数字 || 下划线 || 汉字 * 大小字母 || 数字 || 下划线 || 汉字
*/ */
...@@ -41,7 +49,7 @@ public class LnsRegex { ...@@ -41,7 +49,7 @@ public class LnsRegex {
/** /**
* (大小字母 || 数字 || 下划线 || 汉字 || 空格) && 首尾非空字符非下划线 * (大小字母 || 数字 || 下划线 || 汉字 || 空格) && 首尾非空字符非下划线
*/ */
public static final String ALPHABET_NUMBER_UNDER_HANZI_SPACE = "^(?!_)(?!.*?_$)(?!\\u0020)(?!.*?\\u0020$)[a-zA-Z0-9_\\u4e00-\\u9fa5\\u0020]+$"; public static final String ALPHABET_NUMBER_UNDER_HANZI_SPACE = "^(?![_\\u0020])(?!.*?[_\\u0020]$)[a-zA-Z0-9_\\u4e00-\\u9fa5\\u0020]+$";
/** /**
* 汉字-姓名(2~20位) * 汉字-姓名(2~20位)
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment