Merge branch 'dev_1.0.0' into test_v1.0.0

joying-common/src/main/java/com/fzm/common/constant/RedisConstant.java

@@ -29,7 +29,7 @@ public class RedisConstant {
     /**
      * 纪念版nft领取成员列表
      */
-    public static final String COMMEMORATE_NFT_MEMBERS_PREFIX = "commemorate-nft:members:";
+    public static final String COMMEMORATE_NFT_MEMBERS_PREFIX = "commemorateNft:members:";
 
 
 

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

@@ -119,12 +119,9 @@ public class CommemorateNftServiceImpl extends ServiceImpl<CommemorateNftMapper,
             }
 
             // 先判断当前用户有没有领取过此纪念版nft
-            if (redisUtil.zScore(RedisConstant.COMMEMORATE_NFT_MEMBERS_PREFIX + id, user.getId().toString()) != null) {
+            if (redisUtil.sIsMember(RedisConstant.COMMEMORATE_NFT_MEMBERS_PREFIX + id, user.getId().toString())) {
                 throw GlobalException.newException(ResultCode.FAILED, "此纪念版nft每个用户只能领取一次");
             }
-            /*if (redisUtil.sIsMember(RedisConstant.COMMEMORATE_NFT_MEMBERS_PREFIX + id, user.getId().toString())) {
-                throw GlobalException.newException(ResultCode.FAILED, "此纪念版nft每个用户只能领取一次");
-            }*/
             // 获取此纪念版nft发行数的信号量
             RSemaphore semaphore = redisson.getSemaphore(RedisConstant.COMMEMORATE_NFT_PREFIX + id);
             // 判断纪念版nft有没有被领取完
@@ -164,8 +161,7 @@ public class CommemorateNftServiceImpl extends ServiceImpl<CommemorateNftMapper,
             nft.setIsCommemorate(SystemConstant.BOOLEAN_DATA_TRUE);
             nftService.save(nft);
             // 领取完毕,把当前用户id加入到纪念版nft的领取记录中
-            redisUtil.zAdd(RedisConstant.COMMEMORATE_NFT_MEMBERS_PREFIX + id, user.getId().toString(), availablePermits);
-            //redisUtil.sAdd(RedisConstant.COMMEMORATE_NFT_MEMBERS_PREFIX + id, user.getId().toString());
+            redisUtil.sAdd(RedisConstant.COMMEMORATE_NFT_MEMBERS_PREFIX + id, user.getId().toString());
             return true;
         }  finally {
               lock.unlock();

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

@@ -96,7 +96,7 @@ public class CommemorateNftController {
         return ResponseModel.success(result);
     }
 
-    @Authentication
+    //@Authentication
     @GetMapping("/get/{id}")
     @ApiOperation(value = "纪念版nft详情页")
     public ResponseModel<CommemorateNftVo> getById(@PathVariable Integer id, @RequestHeader String Authorization) {