记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit d1d4663a authored by anjiabin's avatar anjiabin
Browse files
Options

修改百度链转让接口

parent 6b4ae519
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 31 deletions
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-xuper/src/main/java/com/liquidnet/common/third/xuper/config/XuperConfig.java
View file @ d1d4663a
......@@ -42,13 +42,13 @@ public class XuperConfig {
@PostConstruct
public void init(){
long _appId = Long.parseLong(appId);
//生产
String ak = accessKeyID;
String sk = secretAccessKey;
//测试环境
// String ak = MD5Utils.md5(accessKeyID);
// String sk = MD5Utils.md5(secretAccessKey);
// //测试环境
// String ak2 = MD5Utils.md5(accessKeyID);
// String sk2 = MD5Utils.md5(secretAccessKey);
// System.out.println("test==ak=="+ak2);
// System.out.println("test==sk=="+sk2);
Config.XassetCliConfig cfg = new Config.XassetCliConfig();
cfg.setCredentials(_appId, ak, sk);
cfg.setEndPoint(nftApiUrl);
......
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-xuper/src/main/java/com/liquidnet/common/third/xuper/util/XuperSdkUtil.java
View file @ d1d4663a
......@@ -68,7 +68,7 @@ public class XuperSdkUtil {
log.debug("xuperUploadFile resp : "+ JsonUtils.toJson(respDto));
}catch(Exception e){
log.error("error msg "+e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -91,7 +91,7 @@ public class XuperSdkUtil {
log.debug("xuper000CreateAccount resp : "+ JsonUtils.toJson(respDto));
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -118,7 +118,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error("error msg "+e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -164,7 +164,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -212,7 +212,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -241,7 +241,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -265,7 +265,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -296,7 +296,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -331,7 +331,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -366,7 +366,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -396,7 +396,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -422,7 +422,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -450,7 +450,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -478,7 +478,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -506,7 +506,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -532,7 +532,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......@@ -556,7 +556,7 @@ public class XuperSdkUtil {
}
}catch(Exception e){
log.error(e.getMessage(),e);
XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
return XuperResponseDto.failure(XuperErrorEnum.SERVER_INNER_ERROR.getCode(),XuperErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return XuperResponseDto.success(respDto);
}
......
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/biz/ZxlnftBiz.java
View file @ d1d4663a
......@@ -90,7 +90,7 @@ public class ZxlnftBiz {
* 构造返回结果
*/
resp = this.buildNftRespObj(response,tClass,true);
log.info(tClass.getName()+"--->>> return result : {} ",resp.toString());
// log.info(tClass.getName()+"--->>> return result : {} ",resp.toString());
} catch (ZxlNftException e){
log.error("buildNftRespObj biz error response: {}", JsonUtils.toJson(response),e);
throw new ZxlNftException(e.getCode(),e.getMsg());
......
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/constant/ZxlnftConstant.java
View file @ d1d4663a
......@@ -212,6 +212,7 @@ public class ZxlnftConstant {
* NFT 转移(方案二)
*/
public static String ZXL_NFT_046_TRANSFER_URL = "/api/v1/nft/transfer";
public static String ZXL_NFT_046_TRANSFER_URL_V2 = "/api/v2/nft/transfer";
/**
* NFT 同名转移(方案一)
*/
......
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/service/ZxlnftSdkService.java
View file @ d1d4663a
......@@ -334,6 +334,13 @@ public interface ZxlnftSdkService {
*/
Nft046TransferResp nft046Transfer(Nft046TransferReq req);
/**
* 46.NFT 转移 v2
* @param req
* @return
*/
Nft046TransferResp nft046TransferV2(Nft046TransferReq req);
/**
* 47.NFT 同名转移
* @param req
......
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/service/impl/WalletSdkServiceImpl.java
View file @ d1d4663a
......@@ -210,7 +210,7 @@ public class WalletSdkServiceImpl implements WalletSdkService {
}catch (Exception e) {
log.error("pubKey2Address error",e);
}
log.debug("pubKey2Address--->>> response : {} ",response);
log.info("pubKey2Address--->>> response : {} ",response);
if (StringUtils.isEmpty(response)) {
return null;
......
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/service/impl/ZxlnftSdkServiceImpl.java
View file @ d1d4663a
......@@ -2,16 +2,12 @@ package com.liquidnet.common.third.zxlnft.service.impl;
import com.liquidnet.common.third.zxlnft.biz.ZxlnftBiz;
import com.liquidnet.common.third.zxlnft.config.ZxlnftConfig;
import com.liquidnet.common.third.zxlnft.constant.ZxlErrorEnum;
import com.liquidnet.common.third.zxlnft.constant.ZxlnftConstant;
import com.liquidnet.common.third.zxlnft.dto.nft.*;
import com.liquidnet.common.third.zxlnft.exception.ZxlNftException;
import com.liquidnet.common.third.zxlnft.service.ZxlnftSdkService;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.LinkedMultiValueMap;
......@@ -1166,14 +1162,14 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
}catch (Exception e) {
log.error("nft037AddressList error",e);
}
log.info("nft037AddressList--->>> response : {} ",response);
log.warn("nft037AddressList--->>> response : {} ",response);
/**
* 构造返回结果
*/
Nft037AddressListResp resp = zxlnftBiz.buildNftRespObj(response,Nft037AddressListResp.class);
log.info("nft037AddressList--->>> return result : {} ",resp.toString());
log.warn("nft037AddressList--->>> return result : {} ",resp.toString());
return resp;
}
......@@ -1452,6 +1448,35 @@ public class ZxlnftSdkServiceImpl implements ZxlnftSdkService
return resp;
}
@Override
public Nft046TransferResp nft046TransferV2(Nft046TransferReq req) {
zxlnftBiz.buildPlatFormHeader(commonHeader);
//构造请求参数
String reqJsonStr = BeanUtil.convertBeanToJsonString(req);
String requestUrl = zxlnftConfig.getNftApiUrl() + ZxlnftConstant.ZXL_NFT_046_TRANSFER_URL_V2;
log.info("nft046TransferV2--->>> request url : {} body : {} ",requestUrl, reqJsonStr);
String response = null;
try {
response = HttpUtil.postJson(requestUrl,reqJsonStr,commonHeader);
} catch(HttpClientErrorException e) {
log.error("nft046TransferV2 error", e);
}catch (Exception e) {
log.error("nft046TransferV2 error",e);
}
log.info("nft046TransferV2--->>> response : {} ",response);
/**
* 构造返回结果
*/
Nft046TransferResp resp = zxlnftBiz.buildNftRespObj(response,Nft046TransferResp.class);
log.info("nft046TransferV2--->>> return result : {} ",resp.toString());
return resp;
}
@Override
public Nft047SelfTransferResp nft047SelfTransfer(Nft047SelfTransferReq req) {
zxlnftBiz.buildPlatFormHeader(commonHeader);
......
liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/util/ZxlnftSdkUtil.java
View file @ d1d4663a
......@@ -8,7 +8,6 @@ import com.liquidnet.common.third.zxlnft.dto.nft.*;
import com.liquidnet.common.third.zxlnft.exception.ZxlNftException;
import com.liquidnet.common.third.zxlnft.service.ZxlnftSdkService;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -1075,6 +1074,25 @@ public class ZxlnftSdkUtil {
return ZxlnftResponseDto.success(respDto);
}
public ZxlnftResponseDto<Nft046TransferRespDto> nft046TransferV2(Nft046TransferReqDto reqDto){
/**
* 构造请求
*/
Nft046TransferReq req = Nft046TransferReq.getNew();
BeanUtil.copy(reqDto,req);
Nft046TransferRespDto respDto = Nft046TransferRespDto.getNew();
try{
Nft046TransferResp resp = zxlnftSdkService.nft046TransferV2(req);
BeanUtil.copy(resp,respDto);
}catch(ZxlNftException e){
return ZxlnftResponseDto.failure(e.getCode()+","+e.getMessage());
}catch(Exception e){
return ZxlnftResponseDto.failure(ZxlErrorEnum.SERVER_INNER_ERROR.getCode(),ZxlErrorEnum.SERVER_INNER_ERROR.getMsg());
}
return ZxlnftResponseDto.success(respDto);
}
public ZxlnftResponseDto<Nft047SelfTransferRespDto> nft047SelfTransfer(Nft047SelfTransferReqDto reqDto){
/**
* 构造请求
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment