b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⬆️ live.lingting:virtual-currency 升级 0.2.2 -> 0.3.2

Browse Source
This commit is contained in:
b2baccline
2021-01-22 17:31:03 +08:00
parent e3b7a43bb6
commit 884504dde7
5 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ballcat-dependencies/pom.xml
View File

@@ -62,7 +62,7 @@
<jsoup.version>1.13.1</jsoup.version>
<anji-captcha.version>1.2.5</anji-captcha.version>
<virtual-currency.version>0.2.2</virtual-currency.version>
<virtual-currency.version>0.3.2</virtual-currency.version>
</properties>
<dependencyManagement>

11
ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/virtual/config/OmniConfig.java
View File

@@ -1,11 +1,10 @@
package com.hccake.sample.pay.virtual.config;
import com.hccake.starter.pay.PayProperties;
import live.lingting.virtual.currency.properties.OmniProperties;
import java.util.function.Supplier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.function.Supplier;
import live.lingting.virtual.currency.properties.OmniProperties;
/**
* @author lingting 2021/1/5 16:24
@@ -21,7 +20,11 @@ public class OmniConfig {
return new OmniProperties()
// 节点
.setEndpoints(properties.getBitcoin().getOmni().getEndpoints()).setLock(lock).setUnlock(unlock);
.setOmniEndpoints(properties.getBitcoin().getOmni().getEndpoints())
// 比特节点
.setBitcoinEndpoints(properties.getBitcoin().getEndpoints())
// 请求锁
.setLock(lock).setUnlock(unlock);
}
}

4
ballcat-samples/ballcat-sample-pay/src/main/java/com/hccake/sample/pay/virtual/thread/OmniThread.java
View File

@@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import live.lingting.virtual.currency.Transaction;
import live.lingting.virtual.currency.service.impl.OmniServiceImpl;
import live.lingting.virtual.currency.service.impl.BtcOmniServiceImpl;
/**
* @author lingting 2021/1/5 15:22
@@ -17,7 +17,7 @@ import live.lingting.virtual.currency.service.impl.OmniServiceImpl;
@RequiredArgsConstructor
public class OmniThread extends AbstractThread {
private final OmniServiceImpl service;
private final BtcOmniServiceImpl service;
@Override
public void startLog() {

10
ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/PayAutoConfiguration.java
View File

@@ -8,8 +8,8 @@ import org.springframework.context.annotation.Bean;
import live.lingting.virtual.currency.properties.InfuraProperties;
import live.lingting.virtual.currency.properties.OmniProperties;
import live.lingting.virtual.currency.properties.TronscanProperties;
import live.lingting.virtual.currency.service.impl.BtcOmniServiceImpl;
import live.lingting.virtual.currency.service.impl.InfuraServiceImpl;
import live.lingting.virtual.currency.service.impl.OmniServiceImpl;
import live.lingting.virtual.currency.service.impl.TronscanServiceImpl;
/**
@@ -92,7 +92,9 @@ public class PayAutoConfiguration {
public OmniProperties bitcoinProperties() {
return new OmniProperties()
// 节点
.setEndpoints(properties.getBitcoin().getOmni().getEndpoints());
.setOmniEndpoints(properties.getBitcoin().getOmni().getEndpoints())
// 比特节点
.setBitcoinEndpoints(properties.getBitcoin().getEndpoints());
}
/**
@@ -101,8 +103,8 @@ public class PayAutoConfiguration {
*/
@Bean
@ConditionalOnMissingBean
public OmniServiceImpl bitcoinService(OmniProperties properties) {
return new OmniServiceImpl(properties);
public BtcOmniServiceImpl bitcoinService(OmniProperties properties) {
return new BtcOmniServiceImpl(properties);
}
}

7
ballcat-starters/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/PayProperties.java
View File

@@ -2,6 +2,8 @@ package com.hccake.starter.pay;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import live.lingting.virtual.currency.endpoints.BitcoinEndpoints;
import live.lingting.virtual.currency.endpoints.Endpoints;
import live.lingting.virtual.currency.endpoints.InfuraEndpoints;
import live.lingting.virtual.currency.endpoints.OmniEndpoints;
import live.lingting.virtual.currency.endpoints.TronscanEndpoints;
@@ -76,6 +78,11 @@ public class PayProperties {
*/
private Omni omni;
/**
* 比特节点
*/
private BitcoinEndpoints endpoints;
@Data
public static class Omni {