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

Skip to content

L
liquidnet-bus-v1
Commit 41e4a1e1 authored by 张国柄's avatar 张国柄
Browse files
Options

~url;

parent 69cef7ca
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 84 deletions
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserBusiAcctServiceImpl.java
View file @ 41e4a1e1
...@@ -41,10 +41,6 @@ public class AdamUserBusiAcctServiceImpl implements IAdamUserBusiAcctService { ...@@ -41,10 +41,6 @@ public class AdamUserBusiAcctServiceImpl implements IAdamUserBusiAcctService {
private IAdamUserService adamUserService; private IAdamUserService adamUserService;
@Autowired
Environment env;
// @Value("${liquidnet.service.galaxy.url}")// TODO: 2022/3/29 ==zhanggb
// private String sevGalaxyUrl;
@Value("${liquidnet.service.goblin.url}") @Value("${liquidnet.service.goblin.url}")
private String serviceGoblinUrl; private String serviceGoblinUrl;
...@@ -119,8 +115,7 @@ public class AdamUserBusiAcctServiceImpl implements IAdamUserBusiAcctService { ...@@ -119,8 +115,7 @@ public class AdamUserBusiAcctServiceImpl implements IAdamUserBusiAcctService {
postBodyNode.put("userName", name); postBodyNode.put("userName", name);
postBodyNode.put("mobile", mobile); postBodyNode.put("mobile", mobile);
postBodyNode.put("userId", uid); postBodyNode.put("userId", uid);
// String postUrl = sevGalaxyUrl + "/user/register", blockChainAddress;// TODO: 2022/3/29 ==zhanggb String postUrl = serviceGoblinUrl + "/galaxy/user/register", blockChainAddress;
String postUrl = "https://ENVgalaxy.zhengzai.tv/galaxy/user/register".replace("ENV", env.getProperty(CurrentUtil.CK_ENV_ACTIVE)), blockChainAddress;
try { try {
String postRespStr = HttpUtil.postRaw(postUrl, postBodyNode.toString(), null); String postRespStr = HttpUtil.postRaw(postUrl, postBodyNode.toString(), null);
JsonNode postRespJNode = JsonUtils.fromJson(postRespStr, JsonNode.class), postRespCode; JsonNode postRespJNode = JsonUtils.fromJson(postRespStr, JsonNode.class), postRespCode;
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerGoblinBizArtworkClqRdsReceiver.java
View file @ 41e4a1e1
...@@ -3,7 +3,6 @@ package com.liquidnet.service.consumer.kylin.receiver; ...@@ -3,7 +3,6 @@ package com.liquidnet.service.consumer.kylin.receiver;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.CollectionUtil; import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.HttpUtil; import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
...@@ -15,7 +14,7 @@ import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo; ...@@ -15,7 +14,7 @@ import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
...@@ -37,10 +36,8 @@ public class ConsumerGoblinBizArtworkClqRdsReceiver extends AbstractBizRedisRece ...@@ -37,10 +36,8 @@ public class ConsumerGoblinBizArtworkClqRdsReceiver extends AbstractBizRedisRece
private MongoTemplate mongoTemplate; private MongoTemplate mongoTemplate;
@Autowired @Value("${liquidnet.service.galaxy.url}")
Environment env; private String serviceGalaxyUrl;
// @Value("${liquidnet.service.galaxy.url}")// TODO: 2022/4/1 ==zhanggb
// private String sevGalaxyUrl;
private static final String SQL_UPDATE_GOODS_SKU_NFT = "UPDATE goblin_goods_sku_nft SET upchain=?,series_id=?,series_hash=?,nft_hash=?,declare_at=?,updated_at=? WHERE sku_id=? "; private static final String SQL_UPDATE_GOODS_SKU_NFT = "UPDATE goblin_goods_sku_nft SET upchain=?,series_id=?,series_hash=?,nft_hash=?,declare_at=?,updated_at=? WHERE sku_id=? ";
...@@ -143,8 +140,7 @@ public class ConsumerGoblinBizArtworkClqRdsReceiver extends AbstractBizRedisRece ...@@ -143,8 +140,7 @@ public class ConsumerGoblinBizArtworkClqRdsReceiver extends AbstractBizRedisRece
artSeriesClaimResultQueryReqDto.setSkuId(skuId); artSeriesClaimResultQueryReqDto.setSkuId(skuId);
artSeriesClaimResultQueryReqDto.setRouterType(routerType); artSeriesClaimResultQueryReqDto.setRouterType(routerType);
// String postUrl = sevGalaxyUrl + "/user/register", blockChainAddress;// TODO: 2022/4/1 ==zhanggb String postUrl = serviceGalaxyUrl + "/galaxy/artwork/seriesClaimResultQuery";
String postUrl = "https://ENVgalaxy.zhengzai.tv/galaxy/artwork/seriesClaimResultQuery".replace("ENV", env.getProperty(CurrentUtil.CK_ENV_ACTIVE));
String postBoby = JsonUtils.toJson(artSeriesClaimResultQueryReqDto); String postBoby = JsonUtils.toJson(artSeriesClaimResultQueryReqDto);
try { try {
String postRespStr = HttpUtil.postRaw(postUrl, postBoby, null); String postRespStr = HttpUtil.postRaw(postUrl, postBoby, null);
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerGoblinBizArtworkUplRdsReceiver.java
View file @ 41e4a1e1
...@@ -3,7 +3,6 @@ package com.liquidnet.service.consumer.kylin.receiver; ...@@ -3,7 +3,6 @@ package com.liquidnet.service.consumer.kylin.receiver;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.CollectionUtil; import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.HttpUtil; import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
...@@ -18,7 +17,7 @@ import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo; ...@@ -18,7 +17,7 @@ import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment; import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Query;
...@@ -40,10 +39,8 @@ public class ConsumerGoblinBizArtworkUplRdsReceiver extends AbstractBizRedisRece ...@@ -40,10 +39,8 @@ public class ConsumerGoblinBizArtworkUplRdsReceiver extends AbstractBizRedisRece
private MongoTemplate mongoTemplate; private MongoTemplate mongoTemplate;
@Autowired @Value("${liquidnet.service.galaxy.url}")
Environment env; private String serviceGalaxyUrl;
// @Value("${liquidnet.service.galaxy.url}")// TODO: 2022/4/1 ==zhanggb
// private String sevGalaxyUrl;
private static final String SQL_UPDATE_GOODS_SKU_NFT = "UPDATE goblin_goods_sku_nft SET upchain=?,display_url=?,nft_url=? WHERE sku_id=? AND upchain=0 "; private static final String SQL_UPDATE_GOODS_SKU_NFT = "UPDATE goblin_goods_sku_nft SET upchain=?,display_url=?,nft_url=? WHERE sku_id=? AND upchain=0 ";
...@@ -163,8 +160,7 @@ public class ConsumerGoblinBizArtworkUplRdsReceiver extends AbstractBizRedisRece ...@@ -163,8 +160,7 @@ public class ConsumerGoblinBizArtworkUplRdsReceiver extends AbstractBizRedisRece
* @return GalaxyNftUploadRespDto * @return GalaxyNftUploadRespDto
*/ */
public GalaxyNftUploadRespDto uploadNftMaterial(GalaxyNftUploadReqDto nftUploadReqDto) { public GalaxyNftUploadRespDto uploadNftMaterial(GalaxyNftUploadReqDto nftUploadReqDto) {
// String postUrl = sevGalaxyUrl + "/user/register", blockChainAddress;// TODO: 2022/3/31 ==zhanggb String postUrl = serviceGalaxyUrl + "/galaxy/artwork/nftUpload";
String postUrl = "https://ENVgalaxy.zhengzai.tv/galaxy/artwork/nftUpload".replace("ENV", env.getProperty(CurrentUtil.CK_ENV_ACTIVE)), blockChainAddress;
String postBody = JsonUtils.toJson(nftUploadReqDto); String postBody = JsonUtils.toJson(nftUploadReqDto);
try { try {
String postRespStr = HttpUtil.postRaw(postUrl, postBody, null); String postRespStr = HttpUtil.postRaw(postUrl, postBody, null);
...@@ -187,8 +183,7 @@ public class ConsumerGoblinBizArtworkUplRdsReceiver extends AbstractBizRedisRece ...@@ -187,8 +183,7 @@ public class ConsumerGoblinBizArtworkUplRdsReceiver extends AbstractBizRedisRece
* @return GalaxyArtSeriesClaimRespDto * @return GalaxyArtSeriesClaimRespDto
*/ */
public GalaxyArtSeriesClaimRespDto claimNftSeries(GalaxyArtSeriesClaimReqDto seriesClaimReqDto) { public GalaxyArtSeriesClaimRespDto claimNftSeries(GalaxyArtSeriesClaimReqDto seriesClaimReqDto) {
// String postUrl = sevGalaxyUrl + "/user/register", blockChainAddress;// TODO: 2022/3/31 ==zhanggb String postUrl = serviceGalaxyUrl + "/galaxy/artwork/seriesClaim";
String postUrl = "https://ENVgalaxy.zhengzai.tv/galaxy/artwork/seriesClaim".replace("ENV", env.getProperty(CurrentUtil.CK_ENV_ACTIVE)), blockChainAddress;
String postBody = JsonUtils.toJson(seriesClaimReqDto); String postBody = JsonUtils.toJson(seriesClaimReqDto);
try { try {
String postRespStr = HttpUtil.postRaw(postUrl, postBody, null); String postRespStr = HttpUtil.postRaw(postUrl, postBody, null);
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/inner/GoblinGalaxyService.java
View file @ 41e4a1e1
...@@ -3,16 +3,10 @@ package com.liquidnet.service.goblin.service.impl.inner; ...@@ -3,16 +3,10 @@ package com.liquidnet.service.goblin.service.impl.inner;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
import com.liquidnet.commons.lang.util.CollectionUtil; import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.HttpUtil; import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.galaxy.dto.param.GalaxyArtSeriesClaimReqDto;
import com.liquidnet.service.galaxy.dto.param.GalaxyArtSeriesClaimRespDto;
import com.liquidnet.service.galaxy.dto.param.GalaxyNftUploadReqDto;
import com.liquidnet.service.galaxy.dto.param.GalaxyNftUploadRespDto;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
...@@ -26,58 +20,54 @@ import java.util.List; ...@@ -26,58 +20,54 @@ import java.util.List;
@Slf4j @Slf4j
@Service @Service
public class GoblinGalaxyService { public class GoblinGalaxyService {
@Autowired @Value("${liquidnet.service.galaxy.url}")
Environment env; private String serviceGalaxyUrl;
// @Value("${liquidnet.service.galaxy.url}")// TODO: 2022/3/31 ==zhanggb
// private String sevGalaxyUrl;
/** // /**
* NFT素材上传 // * NFT素材上传
* // *
* @param nftUploadReqDto GalaxyNftUploadReqDto // * @param nftUploadReqDto GalaxyNftUploadReqDto
* @return GalaxyNftUploadRespDto // * @return GalaxyNftUploadRespDto
*/ // */
public GalaxyNftUploadRespDto uploadNftMaterial(GalaxyNftUploadReqDto nftUploadReqDto) { // public GalaxyNftUploadRespDto uploadNftMaterial(GalaxyNftUploadReqDto nftUploadReqDto) {
// String postUrl = sevGalaxyUrl + "/user/register", blockChainAddress;// TODO: 2022/3/31 ==zhanggb // String postUrl = serviceGalaxyUrl + "/galaxy/artwork/nftUpload";
String postUrl = "https://ENVgalaxy.zhengzai.tv/galaxy/artwork/nftUpload".replace("ENV", env.getProperty(CurrentUtil.CK_ENV_ACTIVE)), blockChainAddress; // String postBody = JsonUtils.toJson(nftUploadReqDto);
String postBody = JsonUtils.toJson(nftUploadReqDto); // try {
try { // String postRespStr = HttpUtil.postRaw(postUrl, postBody, null);
String postRespStr = HttpUtil.postRaw(postUrl, postBody, null); // JsonNode postRespJNode = JsonUtils.fromJson(postRespStr, JsonNode.class), postRespCode;
JsonNode postRespJNode = JsonUtils.fromJson(postRespStr, JsonNode.class), postRespCode; // if (null == postRespJNode || null == (postRespCode = postRespJNode.get("code")) || !postRespCode.asText().equals("0")) {
if (null == postRespJNode || null == (postRespCode = postRespJNode.get("code")) || !postRespCode.asText().equals("0")) { // log.warn("#NFT素材上传:请求失败[paramsStr={},postRespStr={}]", postBody, postRespStr);
log.warn("#NFT素材上传:请求失败[paramsStr={},postRespStr={}]", postBody, postRespStr); // return null;
return null; // }
} // return JsonUtils.OM().convertValue(postRespJNode.get("data"), GalaxyNftUploadRespDto.class);
return JsonUtils.OM().convertValue(postRespJNode.get("data"), GalaxyNftUploadRespDto.class); // } catch (Exception e) {
} catch (Exception e) { // log.error("Ex.NFT素材上传:请求异常[url={},paramsStr={}],ex:{}", postUrl, postBody, e.getMessage());
log.error("Ex.NFT素材上传:请求异常[url={},paramsStr={}],ex:{}", postUrl, postBody, e.getMessage()); // return null;
return null; // }
} // }
} //
// /**
/** // * NFT系列声明
* NFT系列声明 // *
* // * @param seriesClaimReqDto GalaxyArtSeriesClaimReqDto
* @param seriesClaimReqDto GalaxyArtSeriesClaimReqDto // * @return GalaxyArtSeriesClaimRespDto
* @return GalaxyArtSeriesClaimRespDto // */
*/ // public GalaxyArtSeriesClaimRespDto claimNftSeries(GalaxyArtSeriesClaimReqDto seriesClaimReqDto) {
public GalaxyArtSeriesClaimRespDto claimNftSeries(GalaxyArtSeriesClaimReqDto seriesClaimReqDto) { // String postUrl = serviceGalaxyUrl + "/galaxy/artwork/seriesClaim";
// String postUrl = sevGalaxyUrl + "/user/register", blockChainAddress;// TODO: 2022/3/31 ==zhanggb // String postBody = JsonUtils.toJson(seriesClaimReqDto);
String postUrl = "https://ENVgalaxy.zhengzai.tv/galaxy/artwork/nftUpload".replace("ENV", env.getProperty(CurrentUtil.CK_ENV_ACTIVE)), blockChainAddress; // try {
String postBody = JsonUtils.toJson(seriesClaimReqDto); // String postRespStr = HttpUtil.postRaw(postUrl, postBody, null);
try { // JsonNode postRespJNode = JsonUtils.fromJson(postRespStr, JsonNode.class), postRespCode;
String postRespStr = HttpUtil.postRaw(postUrl, postBody, null); // if (null == postRespJNode || null == (postRespCode = postRespJNode.get("code")) || !postRespCode.asText().equals("0")) {
JsonNode postRespJNode = JsonUtils.fromJson(postRespStr, JsonNode.class), postRespCode; // log.warn("#NFT系列声明:请求失败[paramsStr={},postRespStr={}]", postBody, postRespStr);
if (null == postRespJNode || null == (postRespCode = postRespJNode.get("code")) || !postRespCode.asText().equals("0")) { // return null;
log.warn("#NFT系列声明:请求失败[paramsStr={},postRespStr={}]", postBody, postRespStr); // }
return null; // return JsonUtils.OM().convertValue(postRespJNode.get("data"), GalaxyArtSeriesClaimRespDto.class);
} // } catch (Exception e) {
return JsonUtils.OM().convertValue(postRespJNode.get("data"), GalaxyArtSeriesClaimRespDto.class); // log.error("Ex.NFT系列声明:请求异常[url={},paramsStr={}],ex:{}", postUrl, postBody, e.getMessage());
} catch (Exception e) { // return null;
log.error("Ex.NFT系列声明:请求异常[url={},paramsStr={}],ex:{}", postUrl, postBody, e.getMessage()); // }
return null; // }
}
}
/** /**
* NFT发行、购买结果查询 * NFT发行、购买结果查询
...@@ -93,8 +83,7 @@ public class GoblinGalaxyService { ...@@ -93,8 +83,7 @@ public class GoblinGalaxyService {
postBodyNode.put("nftOrderPayId", orderId); postBodyNode.put("nftOrderPayId", orderId);
postBodyNode.put("routerType", routerType); postBodyNode.put("routerType", routerType);
// String postUrl = sevGalaxyUrl + "/user/register", blockChainAddress;// TODO: 2022/3/31 ==zhanggb String postUrl = serviceGalaxyUrl + "/galaxy/nftTrade/nftPublishAndBuyResultQuery";
String postUrl = "https://ENVgalaxy.zhengzai.tv/galaxy/nftTrade/nftPublishAndBuyResultQuery".replace("ENV", env.getProperty(CurrentUtil.CK_ENV_ACTIVE)), blockChainAddress;
try { try {
String postRespStr = HttpUtil.postRaw(postUrl, postBodyNode.toString(), null); String postRespStr = HttpUtil.postRaw(postUrl, postBodyNode.toString(), null);
JsonNode postRespJNode = JsonUtils.fromJson(postRespStr, JsonNode.class), postRespCode; JsonNode postRespJNode = JsonUtils.fromJson(postRespStr, JsonNode.class), postRespCode;
......
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