Merge branch 'fix_nft_valid' into pre

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtDigitalGoodsAddParam.java

 package com.liquidnet.service.goblin.dto.manage;
 
+import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
@@ -10,6 +11,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -53,9 +55,10 @@ public class GoblinStoreMgtDigitalGoodsAddParam implements Serializable {
 //    @NotBlank(message = "注意事项不能为空")
     @Size(max = 256, message = "注意事项内容过长")
     private String attention;
-    @ApiModelProperty(position = 20, required = true, value = "创作者[25]", example = "创作者...")
+    @ApiModelProperty(position = 20, required = true, value = "创作者[20]", example = "创作者...")
     @NotBlank(message = "创作者不能为空")
-    @Size(max = 25, message = "创作者内容过长")
+    @Size(max = 20, message = "创作者内容过长")
+    @Pattern(regexp = LnsRegex.Valid.ALPHABET_HANZI_SPACE_DOT, message = "创作者格式有误，仅支持中英文")
     private String author;
     @ApiModelProperty(position = 21, required = true, value = "发行方[25]", example = "发行方...")
     @NotBlank(message = "发行方不能为空")

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtDigitalGoodsAddSkuParam.java

@@ -34,10 +34,12 @@ public class GoblinStoreMgtDigitalGoodsAddSkuParam implements Serializable {
     @ApiModelProperty(position = 13, required = true, value = "藏品名称[36]", example = "藏品名称...")
     @NotBlank(message = "藏品名称不能为空")
     @Size(max = 36, message = "藏品名称内容过长")
+    @Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_HANZI_SPACE_DOT, message = "藏品名称格式有误，仅支持中英文数字")
     private String name;
     @ApiModelProperty(position = 14, required = true, value = "副标题[36]，`unbox=0`时必传", example = "副标题...")
     @NotBlank(message = "副标题不能为空")
     @Size(max = 36, message = "副标题内容过长")
+    @Pattern(regexp = LnsRegex.Valid.ALPHABET_NUMBER_HANZI_SPACE_DOT, message = "副标题格式有误，仅支持中英文数字")
     private String subtitle;
     @ApiModelProperty(position = 15, required = true, value = "藏品封面图片URL[256]", example = "https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.png")
     @NotBlank(message = "藏品封面图片不能为空")

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/constant/LnsRegex.java

@@ -11,9 +11,45 @@ public class LnsRegex {
          */
         public static final String DATETIME_YMD = "^(((((0[48]|[2468][048]|[3579][26])00))|(([0-9]{2})(0[48]|[2468][048]|[13579][26])))[-|.|/| ]0?2[-|.|/| ]29|(((?!0{1,4})[0-9]{1,4})[-|.|/| ](((0[13-9]|1[0-2]|[13-9])[-|.|/| ](29|30))|((0[13578]|(10|12)|[13578])[-|.|/| ]31)|((0(?:[1-9])|1(?:[0-2])|[1-9])[-|.|/| ](0(?:[1-9])|1[0-9]|2[0-8]|[1-9])))))$";
         /**
-         * 字母、数字组合
+         * 大写字母 || 数字
          */
         public static final String LETTER_NUMBER = "^[A-Z0-9]+$";
+        /**
+         * 大小字母 || 数字
+         */
+        public static final String ALPHABET_NUMBER = "^[a-zA-Z0-9]+$";
+        /**
+         * 大小字母 || 汉字
+         */
+        public static final String ALPHABET_HANZI = "^[a-zA-Z\\u4e00-\\u9fa5]+$";
+        /**
+         * (大小字母 || 汉字 || 空格) && 首尾非空字符
+         */
+        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·]+$";
+        /**
+         * 大小字母 || 数字 || 汉字
+         */
+        public static final String ALPHABET_NUMBER_HANZI = "^[a-zA-Z0-9\\u4e00-\\u9fa5]+$";
+        /**
+         * (大小字母 || 数字 || 汉字 || 空格) && 首尾非空字符
+         */
+        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·]+$";
+        /**
+         * 大小字母 || 数字 || 下划线 || 汉字
+         */
+        public static final String ALPHABET_NUMBER_UNDER_HANZI = "^[a-zA-Z0-9_\\u4e00-\\u9fa5]+$";
+        /**
+         * (大小字母 || 数字 || 下划线 || 汉字 || 空格) && 首尾非空字符非下划线
+         */
+        public static final String ALPHABET_NUMBER_UNDER_HANZI_SPACE = "^(?![_\\u0020])(?!.*?[_\\u0020]$)[a-zA-Z0-9_\\u4e00-\\u9fa5\\u0020]+$";
         /**
          * 汉字-姓名（2～20位）
          */

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMgtGoodsServiceImpl.java

@@ -247,8 +247,8 @@ public class GoblinStoreMgtGoodsServiceImpl implements IGoblinstoreMgtGoodsServi
         initGoodsObjs.add(new Object[]{
                 spuId, goodsInfoVo.getSpuNo(), goodsInfoVo.getSpuType(), goodsInfoVo.getName(), goodsInfoVo.getIntro(),
                 goodsInfoVo.getAttention(), goodsInfoVo.getStoreId(), goodsInfoVo.getCateFid(), goodsInfoVo.getCateSid(), goodsInfoVo.getCateTid(),
-                goodsInfoVo.getVirtualFlg(), goodsInfoVo.getStatus(), goodsInfoVo.getShelvesStatus(), goodsInfoVo.getSpuAppear(), goodsInfoVo.getCreatedBy(),
-                goodsInfoVo.getCreatedAt()
+                goodsInfoVo.getVirtualFlg(), goodsInfoVo.getStatus(), goodsInfoVo.getShelvesStatus(), goodsInfoVo.getSpuAppear(), goodsInfoVo.getAuthor(),
+                goodsInfoVo.getPublisher(), goodsInfoVo.getCreatedBy(), goodsInfoVo.getCreatedAt()
         });
         toMqSqls.add(SqlMapping.get("goblin_goods_tag.insert_byreplace"));
         LinkedList<Object[]> initGoodsTagObjs = CollectionUtil.linkedListObjectArr();

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -35,7 +35,7 @@ goblin_goods_sku_spec_value.update_by_edit=UPDATE goblin_goods_sku_spec_value SE
 goblin_goods_sku_spec_value.update_by_del_sku=UPDATE goblin_goods_sku_spec_value SET del_flg='1' WHERE sku_id=? AND del_flg='0' 
 #----                   \u5546\u54C1\u4FE1\u606F
 goblin_goods.insert=INSERT INTO goblin_goods (spu_id,spu_no,name,subtitle,sell_price, price_ge,price_le,intro,details,cover_pic, video,spec_mode,store_id,cate_fid,cate_sid, cate_tid,store_cate_fid,store_cate_sid,store_cate_tid,brand_id, shelves_handle,shelves_time,spu_validity,virtual_flg,status, shelves_status,spu_appear,shelves_at,created_by,created_at, logistics_template)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
-goblin_goods.insert_for_digital=INSERT INTO goblin_goods (spu_id,spu_no,spu_type,name,intro,attention,store_id,cate_fid,cate_sid,cate_tid,virtual_flg,status,shelves_status,spu_appear,created_by,created_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
+goblin_goods.insert_for_digital=INSERT INTO goblin_goods (spu_id,spu_no,spu_type,name,intro,attention,store_id,cate_fid,cate_sid,cate_tid,virtual_flg,status,shelves_status,spu_appear,author,publisher,created_by,created_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) 
 goblin_goods.update_by_edit=UPDATE goblin_goods SET spu_no=?,name=?,subtitle=?,sell_price=?,intro=?,details=?,cover_pic=?,video=?,spec_mode=?,cate_fid=?,cate_sid=?,cate_tid=?,shelves_handle=?,shelves_time=?,spu_validity=?,virtual_flg=?,logistics_template=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0' 
 goblin_goods.update_by_edit_for_digital=UPDATE goblin_goods SET name=?,intro=?,cate_fid=?,cate_sid=?,cate_tid=?,updated_by=?,updated_at=? WHERE spu_id=? AND del_flg='0' 
 goblin_goods.update_by_shelves=UPDATE goblin_goods SET shelves_status=?,shelves_at=?,updated_by=?,updated_at=? WHERE spu_id=? AND store_id=? AND spu_appear='0'