测试环境区块链改为南京的测试链，用户登录时判断是否有钱包，没有则生成新钱包

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

@@ -88,14 +88,14 @@ debug:
 
 chain:
   para:
-    rpc-url: http://119.8.39.159:8901
-    withhold:
-    withhold-key: a4c49dcb35e0032dc8db5891dc81481943b68fc558ce93ce74d0382c1d104934
-    token-manager:
-    token-manager-key: 4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
-    title: user.p.FILMCHAIN.
-    cName: user.evm.0xa038a372ab27d9038328932c98454e52390b94555a69ab9559e8ab14ff2e540f
-    cAddr: 1Nhju8CgSUmkQQwc7ECk4bFxnv48iRLNRX
+    rpc-url: http://139.9.231.117:12021
+    withhold: 1417K9fd5vt4zYW86xinWiCbAkNP794aNy
+    withhold-key: 19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
+    token-manager: 1KEBcdmMPfUV2suAqgkyDpdm4brZbYmdfF
+    token-manager-key: 5d872407fb2769854dcca6203d70696feced7099c588a6d9146a122025585e41
+    title: user.p.mall.
+    cName: user.evm.0xb3ae98ac253679602d54d1513aa9cad7d1b10d5f5117d5ce999c1bf67906ba99
+    cAddr: 15DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW
 
 
 copyright:

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

@@ -92,6 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 param.getTelephone() :
                 param.getEmail();
         User user = loadUserByUsername(username);
+
         if (user == null) {
             // 当前手机号或者邮箱没有注册过,走注册逻辑
             User registerUser = new User();
@@ -116,7 +117,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             save(registerUser);
             redisUtil.delete("user::statistic");
             return getById(registerUser.getId());
-        } else {
+        }
+
         // 登录逻辑
         if (StringUtils.isNotBlank(param.getPassword())) {
             // 密码登录流程
@@ -129,6 +131,22 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 throw GlobalException.newException(ResultCode.VALIDATE_FAILED, "验证码校验失败");
             }
         }
+
+        String wallet = user.getWallet();
+        if (StringUtils.isBlank(wallet)) {
+            // 生成钱包
+            wallet = paraClient.walletCreateAccount(IdUtil.simpleUUID());
+            if (StringUtils.isBlank(wallet)) {
+                throw GlobalException.newException(ResultCode.UNAUTHORIZED, "登录失败,生成区块链钱包异常,请稍后再试");
+            }
+            user.setWallet(wallet);
+
+            User updateUser = new User();
+            updateUser.setId(user.getId());
+            updateUser.setWallet(wallet);
+            updateById(updateUser);
+        }
+
         // 认证成功的用户需要返回实名认证信息
         if (AuthStatus.SUCCESS.getStatus().equals(user.getAuthStatus())) {
             // 个人认证
@@ -140,7 +158,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }
         return user;
     }
-    }
 
     @Override
     public User getUserByToken() {

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

@@ -357,10 +357,6 @@ public class WxPayServiceImpl implements WxPayService {
 
     /**
      * 解密
-     *
-     * @param resource
-     * @return
-     * @throws GeneralSecurityException
      */
     private String decrypt(JSONObject resource) throws GeneralSecurityException {
         AesUtil aesUtil = new AesUtil(wxPayProperties.getApiV3Key().getBytes(StandardCharsets.UTF_8));
@@ -376,8 +372,6 @@ public class WxPayServiceImpl implements WxPayService {
 
     /**
      * 获取request中body数据
-     *
-     * @throws IOException
      */
     private String getRequestBodyData(HttpServletRequest request) throws IOException {
         BufferedReader bufferReader = new BufferedReader(request.getReader());

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

@@ -109,14 +109,14 @@ sms:
 
 chain:
   para:
-    rpc-url: http://119.8.39.159:8901
-    withhold:
-    withhold-key: a4c49dcb35e0032dc8db5891dc81481943b68fc558ce93ce74d0382c1d104934
-    token-manager:
-    token-manager-key: 4e92bda2477ded0e7c07a9e3acd2370de8d7401c68cc83ee8376806db3121e77
-    title: user.p.FILMCHAIN.
-    cName: user.evm.0xa038a372ab27d9038328932c98454e52390b94555a69ab9559e8ab14ff2e540f
-    cAddr: 1Nhju8CgSUmkQQwc7ECk4bFxnv48iRLNRX
+    rpc-url: http://139.9.231.117:12021
+    withhold: 1417K9fd5vt4zYW86xinWiCbAkNP794aNy
+    withhold-key: 19d78691584930407e63cd35ac6e67fae6113894b41812e65847d4a365a802a0
+    token-manager: 1KEBcdmMPfUV2suAqgkyDpdm4brZbYmdfF
+    token-manager-key: 5d872407fb2769854dcca6203d70696feced7099c588a6d9146a122025585e41
+    title: user.p.mall.
+    cName: user.evm.0xb3ae98ac253679602d54d1513aa9cad7d1b10d5f5117d5ce999c1bf67906ba99
+    cAddr: 15DtbSyS4eVFxdF87jmrcAdXMSAwXEHVLW
 
 
 huaweiyun: