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

Skip to content

L
liquidnet-bus-v1
Commit 38008614 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411

parents c1b35818 986ea1ed
Show whitespace changes
Inline Side-by-side
Showing with 147 additions and 20 deletions
liquidnet-bus-config/liquidnet-config/application-test.yml
View file @ 38008614
......@@ -34,49 +34,57 @@ liquidnet:
kylin:
database: 255
dbs: 0,256
host: r-2zel6os4dzt6anuhybpd.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
slime:
database: 255
dbs: 0,256
host: r-2zel6os4dzt6anuhybpd.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
dragon:
database: 255
dbs: 0,256
host: r-2zel6os4dzt6anuhybpd.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
sweet:
database: 255
dbs: 0,256
host: r-2zel6os4dzt6anuhybpd.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
adam:
database: 255
dbs: 0,256
host: r-2zel6os4dzt6anuhybpd.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
candy:
database: 255
dbs: 0,256
host: r-2zel6os4dzt6anuhybpd.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
goblin:
database: 255
dbs: 0,256
host: r-2zel6os4dzt6anuhybpd.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
smile:
database: 255
dbs: 0,256
host: r-2zel6os4dzt6anuhybpd.redis.rds.aliyuncs.com
host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
port: 6380
password: 7eoK2XehKqF1
mongodb:
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserBusiAcctServiceImpl.java
View file @ 38008614
......@@ -41,6 +41,8 @@ public class AdamUserBusiAcctServiceImpl implements IAdamUserBusiAcctService {
private IAdamUserService adamUserService;
@Value("${liquidnet.service.galaxy.url}")
private String serviceGalaxyUrl;
@Value("${liquidnet.service.goblin.url}")
private String serviceGoblinUrl;
......@@ -118,7 +120,7 @@ public class AdamUserBusiAcctServiceImpl implements IAdamUserBusiAcctService {
postBodyNode.put("userName", name);
postBodyNode.put("mobile", mobile);
postBodyNode.put("userId", uid);
String postUrl = serviceGoblinUrl + "/galaxy/user/register", blockChainAddress;
String postUrl = serviceGalaxyUrl + "/galaxy/user/register", blockChainAddress;
try {
String postRespStr = HttpUtil.postRaw(postUrl, postBodyNode.toString(), null);
JsonNode postRespJNode = JsonUtils.fromJson(postRespStr, JsonNode.class), postRespCode;
......
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/test/java/com/liquidnet/service/galaxy/TestZxlnftSdkUtil.java
View file @ 38008614
......@@ -323,7 +323,8 @@ public class TestZxlnftSdkUtil {
public void nft016IdentityBindQuery(){
Nft016IdentityBindQueryReqDto reqDto = Nft016IdentityBindQueryReqDto.getNew();
// reqDto.setAddressList("ZXa66c8a684727d0f9aaa434044362aa8a18b61bb4");
reqDto.setAddressList("ZXfa63b4ff148dbebb6ed9c185a5f7f8b8fdcf90ad");
// reqDto.setAddressList("ZXfa63b4ff148dbebb6ed9c185a5f7f8b8fdcf90ad");
reqDto.setAddressList("ZX8c695824fd8348f5311c727d914f5d7dcaeed204");
ZxlnftResponseDto<Nft016IdentityBindQueryRespDto> resp = zxlnftSdkUtil.nft016IdentityBindQuery(reqDto);
System.out.println(resp.toJson());
}
......@@ -641,7 +642,8 @@ public class TestZxlnftSdkUtil {
@Test
public void nft036Info(){
Nft036InfoReqDto reqDto = Nft036InfoReqDto.getNew();
reqDto.setNftId("7f73aca56caaf57a20f0afff59318528f0f09ffbf028fe882161d3ce599d2854_1");
reqDto.setNftId("33010f3ad19e1295d2b13f38b60b4fc3286feb5f5f5289e909f77d02c40942d1_2");
reqDto.setNftId("33010f3ad19e1295d2b13f38b60b4fc3286feb5f5f5289e909f77d02c40942d1_1");
ZxlnftResponseDto<Nft036InfoRespDto> resp = zxlnftSdkUtil.nft036Info(reqDto);
System.out.println(resp.toJson());
}
......@@ -684,13 +686,13 @@ public class TestZxlnftSdkUtil {
}
/**
* 查询NFT交易信息列表
* 查询单个NFT交易信息列表
*/
@Test
public void nft039TradeList(){
Nft039TradeListReqDto reqDto = Nft039TradeListReqDto.getNew();
// reqDto.setNftId("08c152e5fa467d28b7add8e408fb3ecd1ed2ff209364adc1e394bde53929df8f_1");
reqDto.setNftId("43c169ae33d2ca5390a49d2319c14223ed5e7447c4b40c0422ef81691ddfee89_4");
reqDto.setNftId("33010f3ad19e1295d2b13f38b60b4fc3286feb5f5f5289e909f77d02c40942d1_2");
// reqDto.setNftId("33010f3ad19e1295d2b13f38b60b4fc3286feb5f5f5289e909f77d02c40942d1_1");
// reqDto.setOffset(0l);
reqDto.setLimit(1000l);
ZxlnftResponseDto<Nft039TradeListRespDto> resp = zxlnftSdkUtil.nft039TradeList(reqDto);
......@@ -703,8 +705,8 @@ public class TestZxlnftSdkUtil {
@Test
public void nft040TradeInList(){
Nft040TradeInListReqDto reqDto = Nft040TradeInListReqDto.getNew();
// reqDto.setAddr(zxlnftConfig.getNftPlatformAddress());
reqDto.setAddr(zhouhuanAddress1);
reqDto.setAddr(zxlnftConfig.getNftPlatformAddress());
// reqDto.setAddr(zhouhuanAddress1);
// reqDto.setOffset(0l);
reqDto.setLimit(1000l);
ZxlnftResponseDto<Nft040TradeInListRespDto> resp = zxlnftSdkUtil.nft040TradeInList(reqDto);
......@@ -731,8 +733,8 @@ public class TestZxlnftSdkUtil {
@Test
public void nft042TradeAllList(){
Nft042TradeAllListReqDto reqDto = Nft042TradeAllListReqDto.getNew();
reqDto.setAddr(zxlnftConfig.getNftPlatformAddress());
// reqDto.setAddr(zhouhuanAddress1);
// reqDto.setAddr(zxlnftConfig.getNftPlatformAddress());
reqDto.setAddr(zhouhuanAddress1);
// reqDto.setAddr(zhouhuanAddress1);
// reqDto.setOffset(0l);
reqDto.setLimit(1000l);
......
liquidnet-bus-service/liquidnet-service-galaxy/liquidnet-service-galaxy-impl/src/test/java/com/liquidnet/service/galaxy/TestZxlnftService.java
View file @ 38008614
......@@ -49,19 +49,134 @@ public class TestZxlnftService {
@Autowired
private ZxlnftConfig zxlnftConfig;
/**
* 1、NFT平台在至信链的注册、审核
* 1、调用下发查询用户信息验证码接口
* 发送查询验证码
*/
@Test
public void platformRegister(){
public void platformRegister_1(){
String shenzongIdCard = "110102196904242477";
// 1.1.2调用下发查询用户信息验证码接口
Nft011UserQueryVerifyCodeReqDto nft011UserQueryVerifyCodeReqDto = Nft011UserQueryVerifyCodeReqDto.getNew();
//查询用户信息 发送手机验证码
nft011UserQueryVerifyCodeReqDto.setType(Integer.valueOf(ZxlnftEnum.RegisterTypeEnum.COMPANY.getCode()));
nft011UserQueryVerifyCodeReqDto.setCardNo(shenzongIdCard);
nft011UserQueryVerifyCodeReqDto.setScene(Integer.valueOf(ZxlnftEnum.UseSceneEnum.QUERY.getCode()));
ZxlnftResponseDto<Nft011UserQueryVerifyCodeRespDto> resp = zxlnftSdkUtil.nft011UserQueryVerifyCode(nft011UserQueryVerifyCodeReqDto);
}
/**
* 2、调用查询用户信息接口
* 获取用户唯一标识码
*/
@Test
public void platformRegister_2(){
String shenzongIdCard = "110102196904242477";
// 1.1.3调用查询用户信息接口
//查询企业 沈总
Nft012UserQueryReqDto nft012UserQueryReqDto = Nft012UserQueryReqDto.getNew();
nft012UserQueryReqDto.setType(Integer.valueOf(ZxlnftEnum.RegisterTypeEnum.COMPANY.getCode()));
nft012UserQueryReqDto.setCardNo(shenzongIdCard);
nft012UserQueryReqDto.setVerifyCode("153428");
ZxlnftResponseDto<Nft012UserQueryRespDto> nft012UserQueryResp = zxlnftSdkUtil.nft012UserQuery(nft012UserQueryReqDto);
if(nft012UserQueryResp.isSuccess()){
Nft012UserQueryRespDto nft012UserQueryRespDto = nft012UserQueryResp.getData();
log.info("userIdentification:{}",nft012UserQueryRespDto.getUserIdentification());
}
}
/**
* 3、调用下发用户信息查询验证码接口
* 发送邮箱验证码
*/
@Test
public void platformRegister_3(){
String shenzongIdCard = "110102196904242477";
// 1.1.4调用下发用户信息查询验证码接口
Nft011UserQueryVerifyCodeReqDto reqBindDto = Nft011UserQueryVerifyCodeReqDto.getNew();
//查询用户信息 发送邮箱验证码
reqBindDto.setType(Integer.valueOf(ZxlnftEnum.RegisterTypeEnum.COMPANY.getCode()));
reqBindDto.setCardNo(shenzongIdCard);
reqBindDto.setScene(Integer.valueOf(ZxlnftEnum.UseSceneEnum.BINDING.getCode()));
ZxlnftResponseDto<Nft011UserQueryVerifyCodeRespDto> nft011UserQueryVerifyCode = zxlnftSdkUtil.nft011UserQueryVerifyCode(reqBindDto);
}
/**
* 4、生成平台助记词和公钥、私钥
* （牢记助记词、公钥和私钥）
*/
@Test
public void platformRegister_4(){
String mnemonic = "stuff name goat health siren dumb gorilla antique board tenant buffalo present"; //安家宾
// String mnemonic = "economy cost balance weapon flight also nut biology very sun slight about"; //周焕
Long index = 0L;
String userPubKey = null;
String userPriKey = null;
try{
//生成助记词
CreateMnemonicReq req = CreateMnemonicReq.getNew();
CreateMnemonicResp createMnemonicResp = zxlWalletSdkUtil.createMnemonic(req);
mnemonic = createMnemonicResp.getMnemonic();
}catch(Exception e){
throw new ZxlNftException(ZxlErrorEnum.FAILURE.getCode(),"生成助记词失败！");
}
log.info("平台助记词:{}",mnemonic);
/**
* todo 把助记词进行redis存储 key=userID mnemonic/index/userIdentification/address
*/
if(StringUtil.isNotEmpty(mnemonic)){
//生成公私钥
DeriveKeyPairReq deriveKeyPairReq = DeriveKeyPairReq.getNew();
deriveKeyPairReq.setMnemonic(mnemonic);
// deriveKeyPairReq.setMnemonic(createMnemonicResp.getMnemonic());
deriveKeyPairReq.setIndex(index);
try{
DeriveKeyPairResp deriveKeyPairResp = zxlWalletSdkUtil.deriveKeyPair(deriveKeyPairReq);
if(!deriveKeyPairResp.getErr().equals("")) throw new Exception("生成公私钥失败！");
userPubKey = BASE64Util.encoded(deriveKeyPairResp.getPubKey());
userPriKey = BASE64Util.encoded(deriveKeyPairResp.getPriKey());
}catch(Exception e){
throw new ZxlNftException(ZxlErrorEnum.FAILURE.getCode(),e.getMessage());
}
}
log.info("平台公钥：{}",userPubKey);
log.info("平台私钥：{}",userPriKey);
}
/**
* 5、调用NFT平台自身地址绑定接口
*/
@Test
public void platformRegister_5(){
String userIdentification = "5ad54233459887b739d50e6aa026ec26fe43ccf24bc3da5865bba22295c8f180";
// 1.1.5调用NFT平台自身地址绑定接口
Nft015IdentityBindPlatformSelfReqDto nft015IdentityBindPlatformSelfReqDto = Nft015IdentityBindPlatformSelfReqDto.getNew();
//从步骤4获取的公钥
nft015IdentityBindPlatformSelfReqDto.setPubKey(zxlnftConfig.getNftPlatformPubKey());
//从步骤2获取的用户唯一标识
nft015IdentityBindPlatformSelfReqDto.setUserIdentification(userIdentification);
//从步骤3获取的邮箱验证码
nft015IdentityBindPlatformSelfReqDto.setVerifyCode("630216");
String signature = zxlnftBiz.createSign(zxlnftConfig.getNftPlatformPriKey(),nft015IdentityBindPlatformSelfReqDto.getUserIdentification());
nft015IdentityBindPlatformSelfReqDto.setSignData(signature);
ZxlnftResponseDto<Nft015IdentityBindPlatformSelfRespDto> resp = zxlnftSdkUtil.nft015IdentityBindPlatformSelf(nft015IdentityBindPlatformSelfReqDto);
System.out.println(resp.toJson());
// 1.1.6调用绑定状态批量查询接口
}
/**
* 2、自然人用户通过NFT平台注册绑定
*/
......
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