~opt;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -361,7 +361,7 @@ public class GoblinRedisConst {
     public static final String USER_SAFE_CONFIG = PREFIX.concat("u_safe_c:");
 
     /**
-     * NFT转赠约束时间（单位秒）
+     * NFT转赠约束配置
      * {goblin:nft_trans_conf, "${timeLimit},${routeType:1},${routeType:2}..."}
      */
     public static final String NFT_TRANSFER_CONF = PREFIX.concat("nft_trans_conf");

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

@@ -14,7 +14,7 @@ import java.nio.charset.StandardCharsets;
 @JsonIgnoreProperties(value = {"uid"}, ignoreUnknown = true)
 public class GoblinUserSafeConfigDto implements Serializable, Cloneable {
     private static final long serialVersionUID = -141364364882594556L;
-    @ApiModelProperty(position = 11, value = "安全密码[100]")
+    @ApiModelProperty(position = 11, value = "安全密码")
     private String passwd;
 
     private static final GoblinUserSafeConfigDto obj = new GoblinUserSafeConfigDto();

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinUserSafeConfig.java

@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 用户资产设置
+ * 用户安全设置
  * </p>
  *
  * @author liquidnet

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinUserSafeConfigMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 用户资产设置 Mapper 接口
+ * 用户安全设置 Mapper 接口
  * </p>
  *
  * @author liquidnet

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java

@@ -479,11 +479,11 @@ public class AdamUserController {
         AdamUserInfoVo userInfoVo;
         if (uid == null || null == (userInfoVo = adamRdmService.getUserInfoVoByUid(uid))) {
             log.warn("###用户不存在[MOBILE:{},UID:{},TOKEN:{}]", mobile, uid, CurrentUtil.getToken());
-            return ResponseDto.failure("该用户不存在");
+            return ResponseDto.failure(ErrorMapping.get("10114"));
         }
         AdamRealInfoVo realInfoVoByUidPlain = adamRdmService.getRealInfoVoByUidPlain(uid);
         if (null == realInfoVoByUidPlain || 3 != realInfoVoByUidPlain.getNode()) {
-            return ResponseDto.failure("该用户未实名");
+            return ResponseDto.failure(ErrorMapping.get("10115"));
         }
         AdamUserIdentityInfoVo userIdentityInfoVo = AdamUserIdentityInfoVo.getNew();
         userIdentityInfoVo.setUid(uid);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -47,6 +47,8 @@
 10111=\u519B\u5B98\u8BC1\u53F7\u4E0D\u5408\u89C4
 10112=\u8BC1\u4EF6\u4FE1\u606F\u6216\u624B\u673A\u53F7\u4E0D\u4E00\u81F4
 10113=\u5B9E\u540D\u8BA4\u8BC1\u5931\u8D25
+10114=\u8BE5\u7528\u6237\u4E0D\u5B58\u5728
+10115=\u8BE5\u7528\u6237\u672A\u8FDB\u884C\u5B9E\u540D\u8BA4\u8BC1
 
 
 10200=\u4EC5\u9650\u4ECE\u672A\u8D2D\u4E70\u8FC7\u4F1A\u5458\u7684\u7528\u6237\u4F7F\u7528

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinSmsController.java

@@ -20,6 +20,7 @@ import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -30,6 +31,7 @@ import javax.validation.constraints.Pattern;
 @ApiSupport(order = 141000)
 @Api(tags = "商城:短信API")
 @Slf4j
+@Validated
 @RestController
 @RequestMapping("sms")
 public class GoblinSmsController {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinUserSafeController.java

@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -29,6 +30,7 @@ import javax.validation.constraints.Size;
 @ApiSupport(order = 142001)
 @Api(tags = "用户安全设置")
 @Slf4j
+@Validated
 @RestController
 @RequestMapping("user/safe")
 public class GoblinUserSafeController {

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

@@ -161,6 +161,8 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             artworkInfoVo.setCoverPic(goodsSkuInfoVo.getSkuPic());
             artworkInfoVo.setName(goodsSkuInfoVo.getName());
             artworkInfoVo.setSubtitle(goodsSkuInfoVo.getSubtitle());
+//            artworkInfoVo.setAuthor(goodsInfoVo.getAuthor());
+//            artworkInfoVo.setPublisher(goodsInfoVo.getPublisher());
             artworkInfoVo.setEdition(goodsSkuInfoVo.getSkuStock());
             artworkInfoVo.setSkuWatchPic(goodsSkuInfoVo.getSkuWatchPic());
             artworkInfoVo.setRouteType(goodsSkuInfoVo.getRouteType());