Merge branch 'hotfix/jira-487-sdk' into 'develop'

add autonode test example

See merge request jd-blockchain/jdchain!16

samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_ActiveParticipant.java

@@ -1,8 +1,7 @@
 package com.jd.blockchain.sdk.samples;
 
-import com.jd.blockchain.ledger.TransactionResponse;
-import com.jd.blockchain.utils.http.ResponseConverter;
-import com.jd.blockchain.utils.web.client.WebResponseConverter;
+import com.jd.blockchain.utils.http.converters.JsonResponseConverter;
+import com.jd.blockchain.utils.web.model.WebResponse;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
@@ -22,8 +21,7 @@ public class SDKDemo_ActiveParticipant {
 
     // 接受激活参与方操作的共识节点Http服务地址， 根据具体环境配置进行修改
     private static String httpIp = "127.0.0.1";
-    private static String httpPort = "7085";
-
+    private static String httpPort = "7080";
 
     public static void main(String[] args) {
 
@@ -36,15 +34,15 @@ public class SDKDemo_ActiveParticipant {
         List<BasicNameValuePair> para=new ArrayList<BasicNameValuePair>();
 
         // 账本值根据具体情况进行修改
-        BasicNameValuePair base58LedgerHash = new BasicNameValuePair("ledgerHash",  "j5n3SmYT3rS5aDgwQbDUxBYUMEP9GvVfMiQK3Tcr3vxz3M");
+        BasicNameValuePair base58LedgerHash = new BasicNameValuePair("ledgerHash",  "j5tuvAR3Q6ATsMNYTwt7SxVeCqd73itQbpmePxzSg6Zsxc");
 
         // 激活的新参与方的共识网络地址
         BasicNameValuePair host = new BasicNameValuePair("consensusHost",  "127.0.0.1");
-        BasicNameValuePair port = new BasicNameValuePair("consensusPort", "20000");
+        BasicNameValuePair port = new BasicNameValuePair("consensusPort", "16000");
 
         // 指定已经启动的其他共识节点的HTTP管理端口
         BasicNameValuePair manageHost = new BasicNameValuePair("remoteManageHost",  "127.0.0.1");
-        BasicNameValuePair managePort = new BasicNameValuePair("remoteManagePort", "12000");
+        BasicNameValuePair managePort = new BasicNameValuePair("remoteManagePort", "7083");
 
         para.add(base58LedgerHash);
         para.add(host);
@@ -57,9 +55,14 @@ public class SDKDemo_ActiveParticipant {
             HttpClient httpClient = HttpClients.createDefault();
 
             HttpResponse response = httpClient.execute(httpPost);
-            ResponseConverter responseConverter = new WebResponseConverter(TransactionResponse.class);
-            Object converterResponse = responseConverter.getResponse(null, response.getEntity().getContent(), null);
-            System.out.println("response result = " + ((TransactionResponse)converterResponse).getExecutionState());
+            JsonResponseConverter jsonConverter = new JsonResponseConverter(WebResponse.class);
+
+            WebResponse webResponse = (WebResponse) jsonConverter.getResponse(null, response.getEntity().getContent(), null);
+            System.out.println("response result = " + webResponse.isSuccess());
+            if (!webResponse.isSuccess()) {
+                System.out.println("error msg = " + webResponse.getError().getErrorMessage());
+            }
+
 
         } catch (Exception e) {
             e.printStackTrace();

samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDKDemo_DeactiveParticipant.java

@@ -0,0 +1,77 @@
+package com.jd.blockchain.sdk.samples;
+
+import com.jd.blockchain.crypto.AddressEncoding;
+import com.jd.blockchain.crypto.KeyGenUtils;
+import com.jd.blockchain.crypto.PubKey;
+import com.jd.blockchain.utils.Bytes;
+import com.jd.blockchain.utils.http.converters.JsonResponseConverter;
+import com.jd.blockchain.utils.web.model.WebResponse;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: zhangshuang
+ * @Date: 2020/5/27 5:18 PM
+ * Version 1.0
+ */
+public class SDKDemo_DeactiveParticipant {
+
+    // 接受去激活参与方操作的共识节点Http服务地址， 根据具体环境配置进行修改
+    private static String httpIp = "127.0.0.1";
+    private static String httpPort = "7080";
+
+    public static void main(String[] args) {
+
+        String url = "http://" + httpIp + ":" + httpPort + "/management/delegate/deactiveparticipant";
+
+        // 即将进行去激活的共识节点公钥信息
+        String PUB = "3snPdw7i7Pf2u9KTNUhxrYxgEymH24zP3NNNauRVwX5yDD6rzu2uBY";
+        PubKey deactivePubKey = KeyGenUtils.decodePubKey(PUB);
+        Bytes address = AddressEncoding.generateAddress(deactivePubKey);
+
+        System.out.println("url = " + url);
+
+        HttpPost httpPost = new HttpPost(url);
+
+        List<BasicNameValuePair> para=new ArrayList<BasicNameValuePair>();
+
+        // 账本值根据具体情况进行修改
+        BasicNameValuePair base58LedgerHash = new BasicNameValuePair("ledgerHash",  "j5tuvAR3Q6ATsMNYTwt7SxVeCqd73itQbpmePxzSg6Zsxc");
+
+        BasicNameValuePair deactiveAddress = new BasicNameValuePair("participantAddress", address.toBase58());
+        // 指定已经启动的其他共识节点的HTTP管理端口
+        BasicNameValuePair manageHost = new BasicNameValuePair("remoteManageHost",  "127.0.0.1");
+        BasicNameValuePair managePort = new BasicNameValuePair("remoteManagePort", "7083");
+
+        para.add(base58LedgerHash);
+        para.add(deactiveAddress);
+        para.add(manageHost);
+        para.add(managePort);
+
+        try {
+            httpPost.setEntity(new UrlEncodedFormEntity(para,"UTF-8"));
+            HttpClient httpClient = HttpClients.createDefault();
+
+            HttpResponse response = httpClient.execute(httpPost);
+            JsonResponseConverter jsonConverter = new JsonResponseConverter(WebResponse.class);
+
+            WebResponse webResponse = (WebResponse) jsonConverter.getResponse(null, response.getEntity().getContent(), null);
+            System.out.println("response result = " + webResponse.isSuccess());
+            if (!webResponse.isSuccess()) {
+                System.out.println("error msg = " + webResponse.getError().getErrorMessage());
+            }
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("Active participant post request error!");
+        }
+    }
+}

samples/sdk-samples/src/main/java/com/jd/blockchain/sdk/samples/SDK_RegistParticipant_Demo.java

@@ -4,7 +4,10 @@ import com.jd.blockchain.crypto.AddressEncoding;
 import com.jd.blockchain.crypto.KeyGenUtils;
 import com.jd.blockchain.crypto.PrivKey;
 import com.jd.blockchain.crypto.PubKey;
-import com.jd.blockchain.ledger.*;
+import com.jd.blockchain.ledger.BlockchainKeypair;
+import com.jd.blockchain.ledger.PreparedTransaction;
+import com.jd.blockchain.ledger.TransactionResponse;
+import com.jd.blockchain.ledger.TransactionTemplate;
 
 public class SDK_RegistParticipant_Demo extends SDK_Base_Demo {
 
@@ -27,7 +30,7 @@ public class SDK_RegistParticipant_Demo extends SDK_Base_Demo {
 		BlockchainKeypair user = new BlockchainKeypair(pubKey, privKey);
 
 		// 定义交易模板
-		TransactionTemplate txTpl = blockchainService.newTransaction(ledgerHash);
+		TransactionTemplate txTpl = blockchainService.newTransaction(blockchainService.getLedgerHashs()[0]);
 
 		// 注册参与方
 		txTpl.participants().register("Peer4", user.getIdentity());