修改swagger配置

joying-admin/src/main/resources/application-dev.yml

@@ -67,7 +67,7 @@ spring:
     is-concurrent: false
 
 swagger:
-  title: 乐映影视
+  title: 乐映影视后台管理系统
   description: 乐映影视后台管理系统RESTFUL API
   version: 1.0.0
   base-package: com.fzm.admin.controller

joying-admin/src/main/resources/application-local.yml

@@ -67,7 +67,7 @@ spring:
     is-concurrent: false
 
 swagger:
-  title: 乐映影视
+  title: 乐映影视乐映影视后台管理系统
   description: 乐映影视后台管理系统RESTFUL API
   version: 1.0.0
   base-package: com.fzm.admin.controller

joying-admin/src/main/resources/application-test.yml

@@ -67,7 +67,7 @@ spring:
     is-concurrent: false
 
 swagger:
-  title: 乐映影视
+  title: 乐映影视乐映影视后台管理系统
   description: 乐映影视后台管理系统RESTFUL API
   version: 1.0.0
   base-package: com.fzm.admin.controller

joying-common/src/main/java/com/fzm/common/enums/ResultCode.java

@@ -7,12 +7,13 @@ public enum ResultCode implements IErrorCode {
     UNAUTHORIZED(401, "认证失败"),
     FORBIDDEN(403, "没有相关权限"),
     DATA_ERROR(601, "没找到相关数据"),
-    REGISTER_ERROR(410,"您已注册过"),
-    LOGIN_ERROR(411,"登录失败"),
-    FILE_UPLOAD_ERROR(412,"文件上传失败"),
-    FILE_DOWNLOAD_ERROR(412,"文件下载失败"),
-    TOKEN_VALID_ERROR(413,"token校验失败"),
-    CODE_ERROR(414,"验证码发送失败"),
+    REGISTER_ERROR(410, "注册失败"),
+    LOGIN_ERROR(411, "登录失败"),
+    FILE_UPLOAD_ERROR(412, "文件上传失败"),
+    FILE_DOWNLOAD_ERROR(412, "文件下载失败"),
+    TOKEN_VALID_ERROR(413, "token校验失败"),
+    CODE_ERROR(414, "验证码发送失败"),
+    PUBLISH_ERROR(415, "nft发行失败"),
     ;
 
 

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

@@ -108,12 +108,15 @@ public class NftServiceImpl extends ServiceImpl<NftMapper, Nft> implements NftSe
         String tokenInfo = JsonUtil.toJson(map);
         log.info("加密上链数据: {}", tokenInfo);
         String tradeHash = paraChainClient.evmSetTokenInfo(contractName, tokenId, tokenInfo, wallet, privkey, true);
-        System.out.println(hash.equals(tradeHash));
         if (StringUtils.isBlank(tradeHash)) {
-            throw GlobalException.newException(ResultCode.FAILED, "nft发行失败");
+            throw GlobalException.newException(ResultCode.PUBLISH_ERROR, "nft发行失败");
+        }
+        // 确认交易结果
+        TxResult txResult = paraChainClient.cycleConfirmTxWithHash(hash, true, 1000);
+        if (!TxStatusEnum.SUCCESS.equals(txResult.getStatus())) {
+            throw GlobalException.newException(ResultCode.PUBLISH_ERROR, txResult.getErrMsg().getValue());
         }
-        paraChainClient.cycleConfirmTxWithHash(hash, true, 1200);
-        nft.setNftHash(split[0]);
+        nft.setNftHash(hash);
         nft.setTokenId(tokenId);
         nft.setPublishTime(new Date());
         nft.setNftId(nftDto.getNftId());

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

@@ -5,6 +5,8 @@ import cn.fzm.chain.simplesdk.client.ParaChainClient;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.UUID;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fzm.common.constant.SystemConstant;
@@ -24,6 +26,7 @@ import com.fzm.common.service.UserService;
 import com.fzm.common.utils.RedisUtil;
 import com.fzm.common.utils.SmsUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -82,6 +85,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             // 当前手机号或者邮箱没有注册过,走注册逻辑
             User registerUser = new User();
             BeanUtil.copyProperties(param, registerUser, true);
+            // 生成钱包
+            String wallet = paraClient.walletCreateAccount(IdUtil.simpleUUID());
+            if (StringUtils.isBlank(wallet)) {
+                throw GlobalException.newException(ResultCode.UNAUTHORIZED, "注册失败,生成区块链钱包异常,请稍后再试");
+            }
+            registerUser.setWallet(wallet);
             if (StringUtils.isNotBlank(param.getPassword())) {
                 registerUser.setPassword(passwordEncoder.encode(param.getPassword()));
             } else {
@@ -91,13 +100,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
             }
             save(registerUser);
-            // 生成钱包
-            String wallet = paraClient.walletCreateAccount(registerUser.getId().toString());
-            if (StringUtils.isNotBlank(wallet)) {
-                User u = new User().setId(registerUser.getId()).setWallet(wallet);
-                updateById(u);
-            }
-            // 用户注册后,需要删除用户概览的缓存
             redisUtil.delete("user::statistic");
             return getById(registerUser.getId());
         } else {

joying-portal/src/main/resources/application-dev.yml

@@ -71,7 +71,7 @@ spring:
     is-concurrent: false
 
 swagger:
-  title: 乐映影视
+  title: 乐映影视门户系统
   description: 乐映影视门户系统RESTFUL API
   version: 1.0.0
   base-package: com.fzm.portal.controller

joying-portal/src/main/resources/application-local.yml

@@ -71,7 +71,7 @@ spring:
     is-concurrent: false
 
 swagger:
-  title: 乐映影视
+  title: 乐映影视门户系统
   description: 乐映影视门户系统RESTFUL API
   version: 1.0.0
   base-package: com.fzm.portal.controller

joying-portal/src/main/resources/application-test.yml

@@ -71,7 +71,7 @@ spring:
     is-concurrent: false
 
 swagger:
-  title: 乐映影视
+  title: 乐映影视门户系统
   description: 乐映影视门户系统RESTFUL API
   version: 1.0.0
   base-package: com.fzm.portal.controller