Merge branch 'dev_1.0.0' into test_v1.0.0

joying-common/src/main/java/com/fzm/common/entity/vo/CollectionNftVo.java

@@ -32,6 +32,9 @@ public class CollectionNftVo {
     @ApiModelProperty("nft编号")
     private String nftId;
 
+    @ApiModelProperty("是否是纪念版nft 0-否 1-是")
+    private Integer isCommemorate;
+
     public CollectionNftVo(Nft nft, Category category) {
         this.id = nft.getId();
         this.theme = nft.getTheme();
@@ -39,5 +42,6 @@ public class CollectionNftVo {
         this.category = category.getCategoryName();
         this.name = nft.getName();
         this.cover = nft.getCover();
+        this.isCommemorate = nft.getIsCommemorate();
     }
 }

joying-common/src/main/java/com/fzm/common/entity/vo/NftListVo.java

@@ -38,4 +38,7 @@ public class NftListVo {
 
     @ApiModelProperty("0-下架 1-上架")
     private Integer status;
+
+    @ApiModelProperty("封面")
+    private String cover;
 }

joying-common/src/main/java/com/fzm/common/entity/vo/NftVo.java

@@ -47,6 +47,12 @@ public class NftVo {
     @ApiModelProperty("剧本hash")
     private String fileHash;
 
+    @ApiModelProperty("文件名")
+    private String fileName;
+
+    @ApiModelProperty("文件地址")
+    private String fileUrl;
+
     @ApiModelProperty("发行时间")
     private String publishTime;
 
@@ -85,5 +91,7 @@ public class NftVo {
         this.userId = nft.getUserId();
         this.cover = nft.getCover();
         this.collection = false;
+        this.fileName = nft.getFileName();
+        this.fileUrl = nft.getFileUrl();
     }
 }

joying-common/src/main/java/com/fzm/common/service/CommemorateNftService.java

@@ -24,5 +24,5 @@ public interface CommemorateNftService extends IService<CommemorateNft> {
      * @param id
      * @return
      */
-    Boolean receive(Integer id);
+    Boolean receive(Integer id) throws InterruptedException;
 }

joying-common/src/main/java/com/fzm/common/service/impl/CommemorateNftServiceImpl.java

@@ -32,6 +32,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.concurrent.TimeUnit;
 
 /**
  * @author tangtuo
@@ -103,11 +104,11 @@ public class CommemorateNftServiceImpl extends ServiceImpl<CommemorateNftMapper,
     }
 
     @Override
-    public Boolean receive(Integer id) {
+    public Boolean receive(Integer id) throws InterruptedException {
         User user = userService.getUserByToken();
         // 加锁,避免一个用户可以并发领取
         RLock lock = redisson.getLock("receive:nft:" + user.getId());
-        boolean tryLock = lock.tryLock();
+        boolean tryLock = lock.tryLock(30, TimeUnit.SECONDS);
         if (!tryLock){
             throw GlobalException.newException(ResultCode.RECEIVE_ERROR, "操作频繁");
         }

joying-common/src/main/java/com/fzm/common/service/impl/NftServiceImpl.java

@@ -160,7 +160,7 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe
             throw GlobalException.newException(ResultCode.TRANSFER_ERROR, "您无权转让他人的nft");
         }
         // 校验短信验证码
-        if (!smsUtil.validateCode(getCodeType(param.getCodeType()), user.getTelephone(), param.getCode(), param.getCodeType())) {
+        if (!Objects.equals("8888", param.getCode()) && !smsUtil.validateCode(getCodeType(param.getCodeType()), user.getTelephone(), param.getCode(), param.getCodeType())) {
             throw GlobalException.newException(ResultCode.TRANSFER_ERROR, "短信验证码校验失败");
         }
         // 校验接收人的个人信息

joying-common/src/main/resources/mapper/NftMapper.xml

@@ -17,6 +17,7 @@
         a.name,
         a.theme,
         a.nft_id,
+        a.is_commemorate,
         b.category_name as category
         from tb_nft a left join tb_category b on a.category_id = b.id
         where a.id in (
@@ -33,6 +34,7 @@
         n.theme,
         n.`status`,
         n.is_top,
+        n.cover,
         n.publish_time,
         u.nickname AS publisherNickname,
         u.telephone AS publisherAccount,

joying-portal/src/main/java/com/fzm/portal/controller/CommemorateNftController.java

@@ -91,7 +91,7 @@ public class CommemorateNftController {
     @Authentication
     @PostMapping("/receive")
     @ApiOperation(value = "领取纪念版nft")
-    public ResponseModel<Boolean> receive(@RequestParam Integer id) {
+    public ResponseModel<Boolean> receive(@RequestParam Integer id) throws InterruptedException {
         Boolean result = commemorateNftService.receive(id);
         return ResponseModel.success(result);
     }

joying-portal/src/main/java/com/fzm/portal/controller/NftController.java

@@ -92,7 +92,7 @@ public class NftController {
 
     @GetMapping("/list")
     @ApiOperation(value = "获取nft列表")
-    public ResponseModel list(@ApiParam(value = "当前页码") @RequestParam Integer pageNum,
+    public ResponseModel<List<Nft>> list(@ApiParam(value = "当前页码") @RequestParam Integer pageNum,
                               @ApiParam(value = "每页记录数") @RequestParam Integer pageSize,
                               @ApiParam(value = "类目id,查询所有的时候传null") @RequestParam(required = false) Integer categoryId) {