From fb3bc21fe32ca0d655c8cd3595fccd6a18e2391f Mon Sep 17 00:00:00 2001 From: wangbing Date: Mon, 16 Mar 2020 14:17:22 +0800 Subject: [PATCH] 111 --- .../module/admin/req/MappingCreateRequest.java | 15 +++++++++------ .../module/admin/req/MappingUpdateRequest.java | 15 ++++++++------- .../main/resources/templates/screen/mapping.ftl | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/admin/src/main/java/com/example/module/admin/req/MappingCreateRequest.java b/admin/src/main/java/com/example/module/admin/req/MappingCreateRequest.java index 9a57587..2f274ad 100644 --- a/admin/src/main/java/com/example/module/admin/req/MappingCreateRequest.java +++ b/admin/src/main/java/com/example/module/admin/req/MappingCreateRequest.java @@ -2,6 +2,7 @@ package com.example.module.admin.req; import com.example.frame.base.BaseRequest; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Pattern; @@ -9,6 +10,8 @@ import javax.validation.constraints.Pattern; import org.hibernate.validator.constraints.Length; import xyz.wbsite.wsqlite.anonation.TableField; +import java.util.regex.Matcher; + /** * MappingCreateRequest - 映射新增 * @@ -18,21 +21,21 @@ import xyz.wbsite.wsqlite.anonation.TableField; */ public class MappingCreateRequest extends BaseRequest { - @NotNull(message = "映射名称不能为空") + @NotBlank(message = "映射名称不能为空") private String name; - @NotNull(message = "服务端口不能为空") + @NotBlank(message = "服务端口不能为空") @Pattern(regexp = "^[0-9]*$", message = "服务端口必须是数字") private String servicePort; - @NotNull(message = "映射路径不能为空") - @Pattern(regexp = "^/([a-zA-Z][a-zA-Z0-9_]*/)*", message = "映射路径须是(/)或(/+字母+字母数字及_") + @NotBlank(message = "映射路径不能为空") + @Pattern(regexp = "/|/[a-zA-Z][a-zA-Z0-9_]*/", message = "映射路径须是/开始结束，中间为字母数字及_组合") private String context; - @NotNull(message = "映射类型不能为空") + @NotBlank(message = "映射类型不能为空") private String type; - @NotNull(message = "映射地址不能为空") + @NotBlank(message = "映射地址不能为空") private String location; private String bz; diff --git a/admin/src/main/java/com/example/module/admin/req/MappingUpdateRequest.java b/admin/src/main/java/com/example/module/admin/req/MappingUpdateRequest.java index 0444836..3862cf7 100644 --- a/admin/src/main/java/com/example/module/admin/req/MappingUpdateRequest.java +++ b/admin/src/main/java/com/example/module/admin/req/MappingUpdateRequest.java @@ -2,6 +2,7 @@ package com.example.module.admin.req; import com.example.frame.base.BaseUpdateRequest; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import org.hibernate.validator.constraints.Length; @@ -19,23 +20,23 @@ import javax.validation.constraints.Pattern; */ public class MappingUpdateRequest extends BaseUpdateRequest { - @NotNull(message = "主键不能为NULL") + @NotBlank(message = "主键不能为NULL") private Long id; - @NotNull(message = "服务端口不能为空") + @NotBlank(message = "服务端口不能为空") private String servicePort; - @NotNull(message = "映射名称不能为空") + @NotBlank(message = "映射名称不能为空") private String name; - @NotNull(message = "映射路径不能为空") - @Pattern(regexp = "^/[a-zA-Z][a-zA-Z0-9_-]*$|^[A-Z]:/.*$|^/$", message = "映射路径须是(/)或(/+字母+字母数字及_") + @NotBlank(message = "映射路径不能为空") + @Pattern(regexp = "/|/[a-zA-Z][a-zA-Z0-9_]*/", message = "映射路径须是/开始结束，中间为字母数字及_组合") private String context; - @NotNull(message = "映射类型不能为空") + @NotBlank(message = "映射类型不能为空") private String type; - @NotNull(message = "映射地址不能为空") + @NotBlank(message = "映射地址不能为空") private String location; private String bz; diff --git a/admin/src/main/resources/templates/screen/mapping.ftl b/admin/src/main/resources/templates/screen/mapping.ftl index a6753ea..310f08a 100644 --- a/admin/src/main/resources/templates/screen/mapping.ftl +++ b/admin/src/main/resources/templates/screen/mapping.ftl @@ -233,7 +233,7 @@ ], context: [ {required: true, message: '映射上下文不能为空', trigger: 'blur'}, - {pattern: "^/([a-zA-Z][a-zA-Z0-9_-]*/)*", message: '上下文须是(/)开始结果，中间为字母、数字、_等组合', trigger: 'blur'}, + {pattern: "/|([a-zA-Z][a-zA-Z0-9_]*/)", message: '上下文须是(/)开始结果，中间为字母、数字、_等组合', trigger: 'blur'}, ], location: [ {required: true, message: '映射地址不能为空', trigger: 'change'},