Browse Source

upgraded modules to rename the importing packages of utils;

tags/1.4.1
huanghaiquan 4 years ago
parent
commit
b8a2cb795f
26 changed files with 75 additions and 44 deletions
  1. +1
    -1
      core
  2. +5
    -5
      deploy/docker/docker-sdk/pom.xml
  3. +10
    -4
      deploy/docker/docker-sdk/src/main/java/com/jd/blockchain/SDK_Base_Demo.java
  4. +5
    -2
      deploy/docker/pom.xml
  5. +1
    -1
      deploy/pom.xml
  6. +1
    -1
      framework
  7. +1
    -1
      libs/binary-proto
  8. +1
    -1
      libs/httpservice
  9. +1
    -1
      libs/kvdb
  10. +1
    -1
      libs/utils
  11. +2
    -1
      samples/contract-samples/src/main/java/com/jdchain/samples/contract/SampleContractImpl.java
  12. +1
    -1
      samples/pom.xml
  13. +1
    -1
      samples/sdk-samples/pom.xml
  14. +5
    -3
      samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java
  15. +6
    -3
      samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/GatewayRunner.java
  16. +4
    -2
      samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/NodeWebContext.java
  17. +2
    -1
      samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/PartNode.java
  18. +3
    -2
      samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/PeerServer.java
  19. +4
    -2
      samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ContractSample.java
  20. +3
    -1
      samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/DataAccountSample.java
  21. +4
    -2
      samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/EventSample.java
  22. +3
    -2
      samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ParticipantSample.java
  23. +4
    -2
      samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/QuerySample.java
  24. +2
    -1
      samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/SampleBase.java
  25. +3
    -1
      samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/UserSample.java
  26. +1
    -1
      test

+ 1
- 1
core

@@ -1 +1 @@
Subproject commit 8edea0b21b4ae263504afc32bf6332256e2906f1
Subproject commit 792b9f13d058760a1a51ac49d3477f061b80e478

+ 5
- 5
deploy/docker/docker-sdk/pom.xml View File

@@ -3,8 +3,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>docker</artifactId>
<groupId>com.jd.blockchain</groupId>
<artifactId>docker</artifactId>
<version>1.4.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -15,22 +15,22 @@
<dependency>
<groupId>com.jd.blockchain</groupId>
<artifactId>crypto-classic</artifactId>
<version>${project.version}</version>
<version>${framework.version}</version>
</dependency>
<dependency>
<groupId>com.jd.blockchain</groupId>
<artifactId>crypto-sm</artifactId>
<version>${project.version}</version>
<version>${framework.version}</version>
</dependency>
<dependency>
<groupId>com.jd.blockchain</groupId>
<artifactId>ledger-model</artifactId>
<version>${project.version}</version>
<version>${framework.version}</version>
</dependency>
<dependency>
<groupId>com.jd.blockchain</groupId>
<artifactId>sdk-client</artifactId>
<version>${project.version}</version>
<version>${framework.version}</version>
</dependency>
</dependencies>



+ 10
- 4
deploy/docker/docker-sdk/src/main/java/com/jd/blockchain/SDK_Base_Demo.java View File

@@ -1,15 +1,21 @@
package com.jd.blockchain;

import static com.jd.blockchain.SDKDemo_Constant.readChainCodes;
import static com.jd.blockchain.transaction.ContractReturnValue.decode;

import com.jd.blockchain.crypto.HashDigest;
import com.jd.blockchain.ledger.*;
import com.jd.blockchain.ledger.BlockchainIdentity;
import com.jd.blockchain.ledger.BlockchainKeyGenerator;
import com.jd.blockchain.ledger.BlockchainKeypair;
import com.jd.blockchain.ledger.PreparedTransaction;
import com.jd.blockchain.ledger.TransactionResponse;
import com.jd.blockchain.ledger.TransactionTemplate;
import com.jd.blockchain.sdk.BlockchainService;
import com.jd.blockchain.sdk.client.GatewayServiceFactory;
import com.jd.blockchain.transaction.GenericValueHolder;
import com.jd.blockchain.utils.Bytes;
import com.jd.chain.contract.TransferContract;

import static com.jd.blockchain.SDKDemo_Constant.readChainCodes;
import static com.jd.blockchain.transaction.ContractReturnValue.decode;
import utils.Bytes;

public abstract class SDK_Base_Demo {
protected BlockchainKeypair adminKey;


+ 5
- 2
deploy/docker/pom.xml View File

@@ -3,15 +3,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>deploy-root</artifactId>
<groupId>com.jd.blockchain</groupId>
<artifactId>deploy-root</artifactId>
<version>1.4.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

<artifactId>docker</artifactId>

<properties>
<framework.version>1.4.1.RELEASE</framework.version>
</properties>

<modules>
<module>docker-sdk</module>


+ 1
- 1
deploy/pom.xml View File

@@ -13,7 +13,7 @@
<packaging>pom</packaging>

<properties>
<core.version>1.4.0.RELEASE</core.version>
<core.version>1.4.1.RELEASE</core.version>
</properties>

<modules>


+ 1
- 1
framework

@@ -1 +1 @@
Subproject commit 778d95f4a7f17fc51e2b5be2f40e804d28dc0dc5
Subproject commit 8b2fb535e2a44468069bfa3e9ff2612e4cc448eb

+ 1
- 1
libs/binary-proto

@@ -1 +1 @@
Subproject commit ea87cb42c8d8421031e5373dbc6abd0502a2ac5f
Subproject commit 6903a439753daa5bde60e622b4fe56708ebf89e1

+ 1
- 1
libs/httpservice

@@ -1 +1 @@
Subproject commit 4e0e558139ca33ca217ae7012ca5e989230d53c3
Subproject commit c5d1f821a665ba5e9a43b21643b2ca0a25ed0d9f

+ 1
- 1
libs/kvdb

@@ -1 +1 @@
Subproject commit 8550d31b1393c8da64e87223aac2d3ae5dfc06ab
Subproject commit fad87245a4a33a9781d8aba1c0aada8c17d264f9

+ 1
- 1
libs/utils

@@ -1 +1 @@
Subproject commit c0ffc460cc6869b646d3f299a0f60819e872eda2
Subproject commit b2f1c9a2f4e28ee2cee2321ad3333ea127fd0604

+ 2
- 1
samples/contract-samples/src/main/java/com/jdchain/samples/contract/SampleContractImpl.java View File

@@ -9,7 +9,8 @@ import com.jd.blockchain.crypto.SignatureFunction;
import com.jd.blockchain.ledger.BlockchainKeypair;
import com.jd.blockchain.ledger.Event;
import com.jd.blockchain.ledger.TypedKVEntry;
import com.jd.blockchain.utils.Bytes;

import utils.Bytes;

/**
* 合约样例实现


+ 1
- 1
samples/pom.xml View File

@@ -8,7 +8,7 @@
<packaging>pom</packaging>

<properties>
<framework.version>1.4.0.RELEASE</framework.version>
<framework.version>1.4.1.RELEASE</framework.version>
</properties>

<modules>


+ 1
- 1
samples/sdk-samples/pom.xml View File

@@ -39,7 +39,7 @@
<dependency>
<groupId>com.jd.blockchain</groupId>
<artifactId>contract-samples</artifactId>
<version>${framework.version}</version>
<version>${project.version}</version>
</dependency>
<!--以下依赖用于 com.jdchain.samples.Network 中四节点网路环境初始化和启动 -->


+ 5
- 3
samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/TestNet.java View File

@@ -19,13 +19,15 @@ import com.jd.blockchain.tools.initializer.DBConnectionConfig;
import com.jd.blockchain.tools.initializer.LedgerBindingConfig;
import com.jd.blockchain.tools.initializer.PresetAnswerPrompter;
import com.jd.blockchain.tools.initializer.Prompter;
import com.jd.blockchain.utils.concurrent.ThreadInvoker;
import com.jd.blockchain.utils.io.FileUtils;
import com.jd.blockchain.utils.net.NetworkAddress;
import com.jdchain.samples.sdk.testnet.GatewayRunner;
import com.jdchain.samples.sdk.testnet.NodeWebContext;
import com.jdchain.samples.sdk.testnet.PartNode;
import com.jdchain.samples.sdk.testnet.PeerServer;

import utils.concurrent.ThreadInvoker;
import utils.io.FileUtils;
import utils.net.NetworkAddress;

import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.Configurator;
import org.junit.Assert;


+ 6
- 3
samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/GatewayRunner.java View File

@@ -2,10 +2,13 @@ package com.jdchain.samples.sdk.testnet;

import com.jd.blockchain.gateway.GatewayConfigProperties;
import com.jd.blockchain.gateway.GatewayConfigProperties.KeyPairConfig;

import utils.concurrent.ThreadInvoker;
import utils.concurrent.ThreadInvoker.AsyncCallback;
import utils.net.NetworkAddress;

import com.jd.blockchain.gateway.GatewayServerBooter;
import com.jd.blockchain.utils.concurrent.ThreadInvoker;
import com.jd.blockchain.utils.concurrent.ThreadInvoker.AsyncCallback;
import com.jd.blockchain.utils.net.NetworkAddress;

import org.springframework.core.io.ClassPathResource;
import org.springframework.util.CollectionUtils;



+ 4
- 2
samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/NodeWebContext.java View File

@@ -14,8 +14,10 @@ import com.jd.blockchain.tools.initializer.DBConnectionConfig;
import com.jd.blockchain.tools.initializer.LedgerInitProcess;
import com.jd.blockchain.tools.initializer.Prompter;
import com.jd.blockchain.tools.initializer.web.LedgerInitializeWebController;
import com.jd.blockchain.utils.concurrent.ThreadInvoker;
import com.jd.blockchain.utils.net.NetworkAddress;

import utils.concurrent.ThreadInvoker;
import utils.net.NetworkAddress;

import org.springframework.boot.SpringApplication;
import org.springframework.context.ConfigurableApplicationContext;



+ 2
- 1
samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/PartNode.java View File

@@ -4,7 +4,8 @@ import com.jd.blockchain.crypto.AddressEncoding;
import com.jd.blockchain.crypto.PubKey;
import com.jd.blockchain.ledger.ParticipantNode;
import com.jd.blockchain.ledger.ParticipantNodeState;
import com.jd.blockchain.utils.Bytes;

import utils.Bytes;

public class PartNode implements ParticipantNode {



+ 3
- 2
samples/sdk-samples/src/main/java/com/jdchain/samples/sdk/testnet/PeerServer.java View File

@@ -4,8 +4,9 @@ import com.jd.blockchain.ledger.core.LedgerManager;
import com.jd.blockchain.peer.PeerServerBooter;
import com.jd.blockchain.storage.service.DbConnectionFactory;
import com.jd.blockchain.tools.initializer.LedgerBindingConfig;
import com.jd.blockchain.utils.concurrent.ThreadInvoker;
import com.jd.blockchain.utils.net.NetworkAddress;

import utils.concurrent.ThreadInvoker;
import utils.net.NetworkAddress;

public class PeerServer {
private NetworkAddress serviceAddress;


+ 4
- 2
samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ContractSample.java View File

@@ -11,9 +11,11 @@ import com.jd.blockchain.ledger.TypedValue;
import com.jd.blockchain.transaction.ContractEventSendOperationBuilder;
import com.jd.blockchain.transaction.ContractReturnValue;
import com.jd.blockchain.transaction.GenericValueHolder;
import com.jd.blockchain.utils.io.BytesUtils;
import com.jd.blockchain.utils.io.FileUtils;
import com.jdchain.samples.contract.SampleContract;

import utils.io.BytesUtils;
import utils.io.FileUtils;

import org.junit.Assert;
import org.junit.Test;



+ 3
- 1
samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/DataAccountSample.java View File

@@ -5,7 +5,9 @@ import com.jd.blockchain.ledger.BlockchainKeypair;
import com.jd.blockchain.ledger.PreparedTransaction;
import com.jd.blockchain.ledger.TransactionResponse;
import com.jd.blockchain.ledger.TransactionTemplate;
import com.jd.blockchain.utils.Bytes;

import utils.Bytes;

import org.junit.Assert;
import org.junit.Test;



+ 4
- 2
samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/EventSample.java View File

@@ -8,8 +8,10 @@ import com.jd.blockchain.ledger.PreparedTransaction;
import com.jd.blockchain.ledger.SystemEvent;
import com.jd.blockchain.ledger.TransactionResponse;
import com.jd.blockchain.ledger.TransactionTemplate;
import com.jd.blockchain.utils.Bytes;
import com.jd.blockchain.utils.io.BytesUtils;

import utils.Bytes;
import utils.io.BytesUtils;

import org.junit.Assert;
import org.junit.Test;



+ 3
- 2
samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/ParticipantSample.java View File

@@ -18,11 +18,12 @@ import com.jd.blockchain.ledger.BlockchainKeypair;
import com.jd.blockchain.ledger.PreparedTransaction;
import com.jd.blockchain.ledger.TransactionResponse;
import com.jd.blockchain.ledger.TransactionTemplate;
import com.jd.blockchain.utils.codec.Base58Utils;
import com.jd.blockchain.utils.security.ShaUtils;
import com.jd.httpservice.converters.JsonResponseConverter;
import com.jd.httpservice.utils.web.WebResponse;

import utils.codec.Base58Utils;
import utils.security.ShaUtils;

/**
* 参与方节点相关操作示例:
* 注册/激活/移除参与方操作


+ 4
- 2
samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/QuerySample.java View File

@@ -22,8 +22,10 @@ import com.jd.blockchain.ledger.TransactionState;
import com.jd.blockchain.ledger.TypedKVEntry;
import com.jd.blockchain.ledger.UserInfo;
import com.jd.blockchain.ledger.UserPrivilegeSet;
import com.jd.blockchain.utils.codec.Base58Utils;
import com.jd.blockchain.utils.io.BytesUtils;

import utils.codec.Base58Utils;
import utils.io.BytesUtils;

import org.junit.Assert;
import org.junit.Test;



+ 2
- 1
samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/SampleBase.java View File

@@ -8,7 +8,8 @@ import com.jd.blockchain.crypto.PubKey;
import com.jd.blockchain.ledger.BlockchainKeypair;
import com.jd.blockchain.sdk.BlockchainService;
import com.jd.blockchain.sdk.client.GatewayServiceFactory;
import com.jd.blockchain.utils.codec.Base58Utils;

import utils.codec.Base58Utils;

import java.util.Properties;



+ 3
- 1
samples/sdk-samples/src/test/java/com/jdchain/samples/sdk/UserSample.java View File

@@ -7,7 +7,9 @@ import com.jd.blockchain.ledger.PreparedTransaction;
import com.jd.blockchain.ledger.TransactionPermission;
import com.jd.blockchain.ledger.TransactionResponse;
import com.jd.blockchain.ledger.TransactionTemplate;
import com.jd.blockchain.utils.Bytes;

import utils.Bytes;

import org.junit.Assert;
import org.junit.Test;



+ 1
- 1
test

@@ -1 +1 @@
Subproject commit f240ea7d1dbe14f7b036fae2a7a9087359296d00
Subproject commit 876ccddf69c432a6b2db1f5cd0a413648a69853a

Loading…
Cancel
Save