Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

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

@@ -7,18 +7,23 @@ import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 
 @ApiModel(value = "GoblinStoreMgtCompleteParam", description = "店铺认证:认证资料入参")
 @Data
 public class GoblinStoreMgtCompleteParam implements java.io.Serializable {
     private static final long serialVersionUID = -5612313562282544613L;
     @ApiModelProperty(position = 11, value = "店铺名称[128]", example = "店铺名称...")
+    @Size(max = 128, message = "店铺名称过长")
     private String storeName;
     @ApiModelProperty(position = 12, value = "店铺LOGO[256]", example = "https://img.zhengzai.tv/files/2020/08/31/5f4c75095e9bc.png")
+    @Size(max = 256, message = "店铺LOGOURL过长")
     private String logoPic;
     @ApiModelProperty(position = 13, value = "店铺背景图[256]", example = "http://pic.zhengzai.tv/202201/CC/BF/1641361220_C8648990308E1C77247CCA0A37B68F07.jpg")
+    @Size(max = 256, message = "店铺背景图URL过长")
     private String backgroundPic;
-    @ApiModelProperty(position = 14, value = "店铺介绍[500]", example = "店铺介绍......")
+    @ApiModelProperty(position = 14, value = "店铺介绍[1000]", example = "店铺介绍......")
+    @Size(max = 2000, message = "店铺介绍内容过长")
     private String introduce;
     @ApiModelProperty(position = 15, value = "店铺类型[1-普通店铺|2-加盟|3-连锁|5-直营]", allowableValues = "1,2,3,5", example = "1")
     @Pattern(regexp = "\\b(1|2|3|5)\\b", message = "店铺类型参数无效")

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-goblin-dev.yml

@@ -9,7 +9,7 @@ liquidnet:
     name: liquidnet-service-consumer-goblin
   logfile:
     path: /data/logs
-    name: service-consumer-candy
+    name: service-consumer-goblin
     config: classpath:logback-spring.xml
     level: debug
   mysql:

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-goblin-test.yml

@@ -9,7 +9,7 @@ liquidnet:
     name: liquidnet-service-consumer-goblin
   logfile:
     path: /data/logs
-    name: service-consumer-candy
+    name: service-consumer-goblin
     config: classpath:logback-spring.xml
     level: info
   mysql: