build: config spotless plugin and reformat code

add NodeCenterActions.publishEvent

build.gradle

@@ -3,6 +3,8 @@ plugins {
     id 'application'
 }
 
+apply from: '../spotless.gradle'
+
 mainClassName = 'org.bdware.server.NodeCenterServer'
 
 application {
@@ -58,6 +60,7 @@ task copyScript(type: Copy) {
         include 'ncstop.sh'
         include 'ncconfig.json.template'
         include 'updateCluster.sh'
+        include 'log4j2.properties'
     }
     into "./build/output"
     println("copyScript done !")
@@ -101,7 +104,7 @@ task copyWebContent(type: Copy) {
 task buildBDServerClusterZip(type: Zip, dependsOn: ["copyWebContent", "copyScript", "copyJar"]) {
     from './build/output/'
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
-    archiveFileName = 'bdserver-cluster.zip'
+    archiveFileName = 'bdcluster-all.zip'
     destinationDirectory = file('build/')
 }
 

script/log4j2.properties

@@ -0,0 +1,40 @@
+filter.threshold.type=ThresholdFilter
+filter.threshold.level=debug
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%highlight{[%-5p] %d{HH:mm:ss.SSS} %m (%F:%L)[%M]%n}{FATAL=Bright Red,ERROR=Red,WARN=Yellow,INFO=Green,DEBUG=Blue,TRACE=White}
+
+appender.logrolling.type=RollingFile
+appender.logrolling.name=infoLogFile
+appender.logrolling.append=true
+appender.logrolling.fileName=./log/cm.log
+appender.logrolling.filePattern=./log/cm-%i.log
+appender.logrolling.layout.type=PatternLayout
+appender.logrolling.layout.pattern=[%-5p] %d{HH:mm:ss.SSS} %m (%F:%L)[%M]%n
+appender.logrolling.policies.type = Policies
+appender.logrolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.logrolling.policies.size.size = 100MB
+appender.logrolling.strategy.type = DefaultRolloverStrategy
+appender.logrolling.strategy.max = 5
+
+appender.errrolling.type=RollingFile
+appender.errrolling.name=errorLogFile
+appender.errrolling.append=true
+appender.errrolling.fileName=./log/cm.err
+appender.errrolling.filePattern=./log/cm-%i.err
+appender.errrolling.layout.type=PatternLayout
+appender.errrolling.layout.pattern=[%-5p] %d{HH:mm:ss.SSS} %m (%F:%L)[%M]%n
+appender.errrolling.policies.type = Policies
+appender.errrolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.errrolling.policies.size.size = 100MB
+appender.errrolling.strategy.type = DefaultRolloverStrategy
+appender.errrolling.strategy.max = 5
+
+rootLogger.level=info
+rootLogger.appenderRef.stdout.ref=STDOUT
+rootLogger.appenderRef.errorFile.ref=errorLogFile
+rootLogger.appenderRef.errorFile.level=error
+rootLogger.appenderRef.infoFile.ref=infoLogFile
+rootLogger.appenderRef.infoFile.level=info
+rootLogger.appenderRef.log.ref=log

script/ncstart.sh

@@ -20,7 +20,7 @@ fi
 # ps -ef | grep java | grep bdcluster | grep NodeCenterServer  | awk '{print $2}' |xargs kill -9
 #-Dlog4j.configuration=file:
 
-java -Dfile.encoding=UTF-8 -Dlog4j.configuration=file:./log4j.properties -cp "./libs/*:bdcluster.jar" org.bdware.server.NodeCenterServer 1 >./log/nc.log 2>./log/nc.err &
+java -Dfile.encoding=UTF-8 -Dlog4j.configurationFile=./log4j2.properties -cp "./libs/*:bdcluster.jar" org.bdware.server.NodeCenterServer 1 >./log/nc.log 2>./log/nc.err &
 
 #以下可启用https/wss，其中，./ssl/xxx.pfx为ssl证书的路径，:后面的123456是密码。
 #java -Dfile.encoding=UTF-8 -cp "./libs/*:bdcluster.jar" org.bdware.server.NodeCenterServer -service-port=18002 -enable-ssl=./ssl/xxx.pfx:123456 -do-repo-ip=127.0.0.1 -do-repo-port=18098 1 > ./log/cm.log 2> ./log/cm.err &

src/main/java/org/bdware/sc/udp/UDPMessage.java

@@ -2,7 +2,7 @@ package org.bdware.sc.udp;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
- import java.io.ObjectInputStream;
+import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -18,8 +18,7 @@ public class UDPMessage implements Serializable {
     int requestID;
     byte[] content;
 
-	public UDPMessage() {
+    public UDPMessage() {}
-	}
 
     public void setIsPart(boolean isPart) {
         this.isPart = isPart ? 1 : 0;
@@ -37,7 +36,7 @@ public class UDPMessage implements Serializable {
 
     public List<UDPMessage> split() {
         List<UDPMessage> splited = new ArrayList<>();
-//		System.out.println("[UDPMessage split] content.length" + content.length);
+        // System.out.println("[UDPMessage split] content.length" + content.length);
         if (content.length < Len) {
             splited.add(this);
             return splited;

src/main/java/org/bdware/server/NodeCenterServer.java

@@ -21,18 +21,21 @@ import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.config.Configurator;
-import org.bdware.sc.DoConfig;
 import org.bdware.sc.db.KeyValueDBUtil;
 import org.bdware.sc.db.MultiIndexTimeRocksDBUtil;
 import org.bdware.sc.db.TimeDBUtil;
-import org.bdware.server.irp.LocalLHSProxy;
 import org.bdware.server.nodecenter.*;
+import org.bdware.server.permission.Role;
 import org.bdware.server.ws.DelimiterCodec;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.Date;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -50,29 +53,19 @@ public class NodeCenterServer {
             Executors.newScheduledThreadPool(8);
     static SslContext sslContext = null;
     public static URLClassLoader pluginLoader;
-//    static byte[] delimiter = "wonbifoodie".getBytes();
+    // static byte[] delimiter = "wonbifoodie".getBytes();
 
     static {
         KeyValueDBUtil.setupNC();
-//        TimeDBUtil.setupNC();
+        // TimeDBUtil.setupNC();
         TimeDBUtil.setupNC();
-        Configurator.setLevel(
+        Configurator.setLevel("io.netty.handler.codec.http.websocketx.WebSocket08FrameDecoder",
-                "io.netty.handler.codec.http.websocketx.WebSocket08FrameDecoder",
                 Level.OFF);
-        Configurator.setLevel(
+        Configurator.setLevel("io.netty.handler.codec.http.websocketx.WebSocket08FrameEncoder",
-                "io.netty.handler.codec.http.websocketx.WebSocket08FrameEncoder",
                 Level.OFF);
     }
 
     public static void configServer(CMDConf cmdConf) {
-        LocalLHSProxy.port = cmdConf.doipPort;
-        LocalLHSProxy.enabled = true;
-        if (cmdConf.disableDoRepo) {
-            DoConfig.callContractUsingDOI = false;
-        }
-        if (cmdConf.disableLocalLhs) {
-            LocalLHSProxy.enabled = false;
-        }
         if (!cmdConf.enableSsl.isEmpty()) {
             try {
                 String[] filePaths = cmdConf.enableSsl.split(":");
@@ -107,7 +100,7 @@ public class NodeCenterServer {
 
     private static String[] parseStrAsList(String str) {
         if (str == null) {
-            return new String[]{};
+            return new String[] {};
         }
         return str.split(",");
     }
@@ -125,23 +118,35 @@ public class NodeCenterServer {
         CMDConf cmf = CMDConf.parseFile(CONFIG_PATH).parseArgs(args);
 
         configServer(cmf);
-
+        File keyFile = new File("manager.key");
-        if (LocalLHSProxy.enabled) {
+        if (keyFile.exists()) {
-            threadPool = Executors.newSingleThreadExecutor();
-            threadPool.execute(() -> {
             try {
-                    LocalLHSProxy.start();
+                BufferedReader br = new BufferedReader(new FileReader(keyFile));
-                } catch (Exception e) {
+                String pubKey = br.readLine();
-                    LOGGER.error("local LHS proxy failed: " + e.getMessage());
+                String nowManager = KeyValueDBUtil.instance.getValue(NCTables.ConfigDB.toString(),
+                        NCManagerAction.centerManger);
+                // manager.key is used when node manager isn' set
+                if (null == nowManager || nowManager.isEmpty()) {
+                    KeyValueDBUtil.instance.setValue(NCTables.ConfigDB.toString(),
+                            NCManagerAction.centerManger, pubKey);
+                    KeyValueDBUtil.instance.setValue(NCTables.ConfigDB.toString(),
+                            NCManagerAction.clusterName, "clusterName_" + pubKey.substring(0, 5));
+                    KeyValueDBUtil.instance.setValue(NCTables.NodeUser.toString(), pubKey,
+                            Role.CenterManager.toString());
+                    KeyValueDBUtil.instance.setValue(NCTables.NodeTime.toString(), pubKey,
+                            Long.toString(new Date().getTime()));
+                    LOGGER.info("set node manager from manager.key");
                 }
-            });
+            } catch (IOException ignored) {
             }
+        }
+
 
         listenSocket(cmf.servicePort + 1);
         OtherNCProxy.instance.init();
 
         startHttp(cmf.servicePort);
-        //System.out.println("PORT"+cmf.servicePort);
+        // System.out.println("PORT"+cmf.servicePort);
     }
 
     public static void listenSocket(int port) throws Exception {
@@ -150,16 +155,12 @@ public class NodeCenterServer {
         EventLoopGroup workerGroup = new NioEventLoopGroup();
         ServerBootstrap b = new ServerBootstrap();
         b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
-        b.group(bossGroup, workerGroup)
+        b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class)
-                .channel(NioServerSocketChannel.class)
+                .option(ChannelOption.SO_BACKLOG, 100).localAddress(port)
-                .option(ChannelOption.SO_BACKLOG, 100)
+                .childHandler(new ChannelInitializer<SocketChannel>() {
-                .localAddress(port)
-                .childHandler(
-                        new ChannelInitializer<SocketChannel>() {
                     @Override
                     protected void initChannel(SocketChannel arg0) {
-                                arg0.pipeline()
+                        arg0.pipeline().addLast(new DelimiterCodec())
-                                        .addLast(new DelimiterCodec())
                                 .addLast(new NodeCenterFrameHandler());
                     }
                 });
@@ -167,8 +168,8 @@ public class NodeCenterServer {
     }
 
     public static void startHttp(int port) {
-        File[] pluginJar = new File("./pluginLib/")
+        File[] pluginJar =
-                .listFiles(pathname -> pathname.getName().endsWith(".jar"));
+                new File("./pluginLib/").listFiles(pathname -> pathname.getName().endsWith(".jar"));
         URL[] urls;
         if (pluginJar != null && pluginJar.length > 0) {
             urls = new URL[pluginJar.length];
@@ -181,7 +182,7 @@ public class NodeCenterServer {
                 }
             }
         } else {
-            urls = new URL[]{};
+            urls = new URL[] {};
         }
         pluginLoader = new URLClassLoader(urls, NodeCenterServer.class.getClassLoader());
         LOGGER.info("start at: " + port);
@@ -192,9 +193,7 @@ public class NodeCenterServer {
             ServerBootstrap b = new ServerBootstrap();
             ControlledChannelInitializer initializer = new ControlledChannelInitializer();
             b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
-            b.group(bossGroup, workerGroup)
+            b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class).localAddress(port)
-                    .channel(NioServerSocketChannel.class)
-                    .localAddress(port)
                     .childHandler(initializer);
             final Channel ch = b.bind(port).sync().channel();
             ch.closeFuture().sync();
@@ -226,12 +225,9 @@ public class NodeCenterServer {
             } else {
                 LOGGER.warn("disable ssl");
             }
-            arg0.pipeline()
+            arg0.pipeline().addLast(new HttpServerCodec()).addLast(new HttpObjectAggregator(65536))
-                    .addLast(new HttpServerCodec())
-                    .addLast(new HttpObjectAggregator(65536))
                     .addLast(new WebSocketServerProtocolHandler(PATH, null, true))
-                    .addLast(new ChunkedWriteHandler())
+                    .addLast(new ChunkedWriteHandler()).addLast(handler)
-                    .addLast(handler)
                     .addLast(new NodeCenterWSFrameHandler());
         }
     }

src/main/java/org/bdware/server/action/DistributeCallback.java

@@ -16,15 +16,16 @@ public class DistributeCallback extends ResultCallback {
     private static final Logger LOGGER = LogManager.getLogger(DistributeCallback.class);
     String sponsorPubkey;// 发起节点的
     Map<String, String> nodes;
-    String pubKey; //发起节点的用户公钥
+    String pubKey; // 发起节点的用户公钥
     String signature; // 发起节点的
     int count; // 集群中几个节点已成功启动
     ResultCallback res; // 返回给Node
     String fileName; // ypk的文件名
     int index;
-    String distributeID;  //发起节点的分发id
+    String distributeID; // 发起节点的分发id
 
-    public DistributeCallback(String ss, String sponID, Map<String, String> n, ResultCallback re, String p, String s) {
+    public DistributeCallback(String ss, String sponID, Map<String, String> n, ResultCallback re,
+            String p, String s) {
         distributeID = ss;
         count = 0;
         index = 1;
@@ -67,18 +68,15 @@ public class DistributeCallback extends ResultCallback {
     public void onDistribute(String progress, String nodeIP) {
         Map<String, String> ret2 = new HashMap<>();
         ret2.put("action", "onDistributeContract");
-        ret2.put(
+        ret2.put("progress", "NC is sending ypk to NO." + index + " node in the units,progress is "
-                "progress",
+                + progress + "%.");
-                "NC is sending ypk to NO."
+        if (progress.equals("100.00"))
-                        + index
+            index++;
-                        + " node in the units,progress is "
-                        + progress
-                        + "%.");
-        if (progress.equals("100.00")) index++;
 
         Map<String, String> map = new HashMap<>();
-        map.put("action", "onDistributeYPK");
+        map.put("action", "onDistribute");
         map.put("responseID", distributeID);
+        map.put("distributeID", distributeID);
         map.put("content", JsonUtil.toJson(ret2));
         map.put("nodeIP", nodeIP);
         map.put("progress", progress);
@@ -86,7 +84,7 @@ public class DistributeCallback extends ResultCallback {
     }
 
     public void onReceive(Map<String, String> map) {
-        LOGGER.debug("[DistributeCallback] onReceive :  position----9");
+        LOGGER.info("[DistributeCallback] onReceive :  position----9");
         String progress = map.get("progress");
         String nodeIP = map.get("ipPort");
         if (progress.equals("100")) {
@@ -95,20 +93,22 @@ public class DistributeCallback extends ResultCallback {
             args.put("pubKey", pubKey);
             args.put("signature", signature);
             count++;
-            LOGGER.debug(count + "个节点已收完成" + "   总共有" + nodes.size() + "  个节点");
+            LOGGER.info(count + "个节点已收完成" + "   总共有" + nodes.size() + "  个节点");
-            if (count == nodes.size()) {
+            if (count >= nodes.size() - 1) {
                 // res返回给前端，合约分发完成
+                LOGGER.info("个节点已收完成" + "send on finish!!!!!");
                 Map<String, String> ret2 = new HashMap<>();
                 ret2.put("action", "onDistributeFinish");
                 ret2.put("progress", "100%");
                 Map<String, String> map_send = new HashMap<>();
                 map_send.put("action", "onDistribute");
                 map_send.put("responseID", distributeID);
+                map_send.put("distributeID", distributeID);
                 map_send.put("over", "true");
                 map_send.put("nodeIP", nodeIP);
                 map_send.put("content", JsonUtil.toJson(ret2));
                 res.onResult(JsonUtil.toJson(map_send));
-                //NC delete file
+                // NC delete file
                 File file = new File("./temp/stateFiles/" + fileName);
                 if (file.exists() && file.isFile())
                     file.delete();
@@ -118,25 +118,29 @@ public class DistributeCallback extends ResultCallback {
 
     @Override
     public void onResult(String str) {
-        LOGGER.debug("[DistributeCallback] str=" + str);
+        LOGGER.info("[DistributeCallback] str=" + str);
 
-        Map<String, String> map = JsonUtil.fromJson(str, new TypeToken<Map<String, String>>() {
+        Map<String, String> map =
-        }.getType());
+                JsonUtil.fromJson(str, new TypeToken<Map<String, String>>() {}.getType());
 
         NodeCenterActions.sync.sleepWithTimeout(map.get("requestID"), this, 60);
 
         String operation = map.get("operation");
 
         switch (operation) {
+            // 上传到nodecenter
             case "NCreceive":
                 NCreceive(map.get("progress"));
                 break;
+            // 开始分发给各个节点
             case "distribute":
                 distributeContractProject(map.get("receiveFileName"), map.get("isPrivate"));
                 break;
+            // 分发给各个节点
             case "onDistribute":
                 onDistribute(map.get("progress"), map.get("nodeIP"));
                 break;
+            // 各个节点返回收到
             case "onReceive":
                 onReceive(map);
                 break;

src/main/java/org/bdware/server/action/RequestAllExecutor.java

@@ -25,26 +25,25 @@ public class RequestAllExecutor implements ContractExecutor {
         resultCount = count;
     }
 
-    public ResultCallback createResultCallback(
+    public ResultCallback createResultCallback(final String requestID,
-            final String requestID, final ResultCallback originalCb, int count, String contractID) {
+            final ResultCallback originalCb, int count, String contractID) {
         return new Collector(requestID, originalCb, count, contractID);
     }
 
-    //only for test ADSP
+    // only for test ADSP
-//    public ResultCallback createResultCallback(
+    // public ResultCallback createResultCallback(
-//            final String requestID, final ResultCallback originalCb, int count,String contractID,String seq) {
+    // final String requestID, final ResultCallback originalCb, int count,String contractID,String
-//        ResultCallback collector = new Collector(requestID, originalCb, count,contractID,seq);
+    // seq) {
-//        return collector;
+    // ResultCallback collector = new Collector(requestID, originalCb, count,contractID,seq);
-//    }
+    // return collector;
+    // }
 
     public void sendRequest(String req, ResultCallback collector) {
         List<String> nodes = info.members;
         for (String node : nodes) {
             CMNode cmNode = NodeCenterActions.nodeInfos.get(node);
             if (cmNode == null) {
-                collector.onResult(
+                collector.onResult("{\"status\":\"Error\",\"result\":\"node " + node
-                        "{\"status\":\"Error\",\"result\":\"node "
-                                + node
                         + " offline\",\"action\":\"onExecuteContractTrustfully\"}");
             } else {
                 cmNode.connection.controller.sendMsg(req);
@@ -57,12 +56,13 @@ public class RequestAllExecutor implements ContractExecutor {
         JsonObject jo2 = JsonParser.parseString(req).getAsJsonObject();
         String id = jo2.get("contractID").getAsString();
 
-        //only for test ADSP
+        // only for test ADSP
-//        ResultCallback collector = createResultCallback(requestID, rc, resultCount,id,jo2.get("seq").getAsString());
+        // ResultCallback collector = createResultCallback(requestID, rc,
+        // resultCount,id,jo2.get("seq").getAsString());
 
         ResultCallback collector = createResultCallback(requestID, rc, resultCount, id);
 
-        //TODO NC.sync?有问题？
+        // TODO NC.sync?有问题？
         NodeCenterActions.sync.sleep(requestID, collector);
         sendRequest(req, collector);
     }
@@ -74,20 +74,20 @@ public class RequestAllExecutor implements ContractExecutor {
         AtomicInteger count = new AtomicInteger(0);
 
 
-        //only for testADSP
+        // only for testADSP
-//        boolean flag = true;  //true表示还没在文件中记录这次调用结果
+        // boolean flag = true; //true表示还没在文件中记录这次调用结果
-//        String seq;
+        // String seq;
-//        Map<String,Integer> res = new ConcurrentHashMap<String,Integer>();
+        // Map<String,Integer> res = new ConcurrentHashMap<String,Integer>();
 
 
-        //only for test ADSP
+        // only for test ADSP
-//        public Collector(String reqID, ResultCallback callback, int c,String id,String seq2) {
+        // public Collector(String reqID, ResultCallback callback, int c,String id,String seq2) {
-//            total = c;
+        // total = c;
-//            requestID = reqID;
+        // requestID = reqID;
-//            commiter = callback;
+        // commiter = callback;
-//            contractID = id;
+        // contractID = id;
-//            seq = seq2;
+        // seq = seq2;
-//        }
+        // }
         ResultCallback committer;
 
         public Collector(String reqID, ResultCallback callback, int c, String id) {
@@ -105,7 +105,7 @@ public class RequestAllExecutor implements ContractExecutor {
             obj.addProperty("seqNum", count.getAndIncrement());
             obj.addProperty("total", total);
 
-            //NodeCenterActions.recoverMap.get(nodePubKey).get(contractID).lastExeSeq++;
+            // NodeCenterActions.recoverMap.get(nodePubKey).get(contractID).lastExeSeq++;
 
             if (committer != null)
                 committer.onResult(obj.toString());
@@ -125,47 +125,45 @@ public class RequestAllExecutor implements ContractExecutor {
                 String data = obj.get("data").getAsString();
                 ContractResult cr = JsonUtil.fromJson(data, ContractResult.class);
 
-                //only for testADSP
+                // only for testADSP
-//                if(TestADSP.getFlag()){
+                // if(TestADSP.getFlag()){
-//                    String r = cr.result;
+                // String r = cr.result;
-//                    if(!res.containsKey(r)){
+                // if(!res.containsKey(r)){
-//                        res.put(r,0);
+                // res.put(r,0);
-//                    }
+                // }
-//                    int former = res.get(r);
+                // int former = res.get(r);
-//                    res.put(r,++former);
+                // res.put(r,++former);
-//                    for(String s : res.keySet()){
+                // for(String s : res.keySet()){
-//                        if(res.get(s) > total / 2 && flag){
+                // if(res.get(s) > total / 2 && flag){
-//                            //写入文件
+                // //写入文件
-//                            File file = new File(TestADSP.resultPath);
+                // File file = new File(TestADSP.resultPath);
-//                            synchronized (file){
+                // synchronized (file){
-//                                try {
+                // try {
-//                                    FileWriter fw = new FileWriter(file, true);
+                // FileWriter fw = new FileWriter(file, true);
-//                                    PrintWriter pw = new PrintWriter(fw);
+                // PrintWriter pw = new PrintWriter(fw);
-//                                    pw.println(seq + " " + r);
+                // pw.println(seq + " " + r);
-//                                    pw.flush();
+                // pw.flush();
-//                                    fw.flush();
+                // fw.flush();
-//                                    pw.close();
+                // pw.close();
-//                                    fw.close();
+                // fw.close();
-//                                } catch (IOException e) {
+                // } catch (IOException e) {
-//                                    e.printStackTrace();
+                // e.printStackTrace();
-//                                }
+                // }
-//                            }
+                // }
-//                            flag = false;
+                // flag = false;
-//                        }
+                // }
-//                    }
+                // }
-//                }
+                // }
 
 
-/*                if (cr.status == ContractResult.Status.Error) {   //TODO   规范Status的使用       改成 ==Statuc.Error才恢复
+                /*
-                    String nodePubKey = obj.get("nodeID").getAsString();
+                 * if (cr.status == ContractResult.Status.Error) { //TODO 规范Status的使用 改成
-                    if(NodeCenterActions.recoverMap.containsKey(nodePubKey)){
+                 * ==Statuc.Error才恢复 String nodePubKey = obj.get("nodeID").getAsString();
-                        ContractRecord record = NodeCenterActions.recoverMap.get(nodePubKey).get(contractID);
+                 * if(NodeCenterActions.recoverMap.containsKey(nodePubKey)){ ContractRecord record =
-                        if(record.recoverFlag == RecoverFlag.Fine){
+                 * NodeCenterActions.recoverMap.get(nodePubKey).get(contractID);
-                            record.recoverFlag = RecoverFlag.ToRecover;
+                 * if(record.recoverFlag == RecoverFlag.Fine){ record.recoverFlag =
-                            MasterActions.restartContracts(nodePubKey);
+                 * RecoverFlag.ToRecover; MasterActions.restartContracts(nodePubKey); } } }
-                        }
+                 */
-                    }
-                }*/
             }
         }
     }

src/main/java/org/bdware/server/action/RequestOnceExecutor.java

@@ -26,8 +26,7 @@ public class RequestOnceExecutor implements ContractExecutor {
         JsonObject jo2 = (new JsonParser()).parse(req).getAsJsonObject();
         String contractID = jo2.get("contractID").getAsString();
 
-        ResultCallback cb =
+        ResultCallback cb = new ResultCallback() {
-                new ResultCallback() {
             @Override
             public void onResult(String str) {
                 LOGGER.debug(str);
@@ -49,8 +48,7 @@ public class RequestOnceExecutor implements ContractExecutor {
                 return;
             }
         }
-        rc.onResult(
+        rc.onResult("{\"status\":\"Error\",\"result\":\"all nodes "
-                "{\"status\":\"Error\",\"result\":\"all nodes "
                 + " offline\",\"action\":\"onExecuteContract\"}");
     }
 }

src/main/java/org/bdware/server/action/ResponseOnceExecutor.java

@@ -32,8 +32,7 @@ public class ResponseOnceExecutor implements ContractExecutor {
         JsonObject jo2 = (new JsonParser()).parse(req).getAsJsonObject();
         String contractID = jo2.get("contractID").getAsString();
         // TODO 标注失效节点，是否选择重新迁移？？
-        ResultCallback cb =
+        ResultCallback cb = new ResultCallback() {
-                new ResultCallback() {
             @Override
             public void onResult(String str) {
                 LOGGER.debug(str);

src/main/java/org/bdware/server/irp/LocalLHSProxy.java

@@ -1,123 +0,0 @@
-package org.bdware.server.irp;
-
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import com.sun.net.httpserver.HttpServer;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bdware.sc.util.JsonUtil;
-import org.rocksdb.Options;
-import org.rocksdb.RocksDB;
-import org.rocksdb.RocksDBException;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.InetSocketAddress;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-public class LocalLHSProxy {
-    private static final Logger LOGGER = LogManager.getLogger(LocalLHSProxy.class);
-    public static String PREFIX = "86.5000.470/";
-    public static int port = 18007;
-    public static boolean enabled = false;
-    public static RocksDB db;
-    static RegisterHandler registerHandler;
-
-    static {
-        RocksDB.loadLibrary();
-    }
-
-    public static void main(String[] args) throws Exception {
-        start();
-    }
-
-    public static void start() throws IOException, RocksDBException {
-        String dbPath = "./handleRecords/";
-        Options rockopts = new Options().setCreateIfMissing(true);
-        rockopts.useFixedLengthPrefixExtractor(15);
-        LOGGER.info("actual rocksdb path: " + new File(dbPath).getAbsolutePath());
-        File lock = new File(dbPath, "LOCK");
-        if (lock.exists()) {
-            LOGGER.trace("remove file " + lock.getAbsolutePath() + ": " + lock.delete());
-        }
-        db = RocksDB.open(rockopts, dbPath);
-
-        registerHandler = new RegisterHandler(db);
-
-        LOGGER.info("listen to " + port);
-        HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
-
-        server.createContext("/test", new TestHandler());
-        server.createContext("/resolve", new ResolveHandler());
-        server.createContext("/local/", registerHandler);
-        server.createContext("/view", new ViewHandler(db));
-        server.start();
-    }
-
-    private static Map<String, String> formData2Dic(String formData) {
-        Map<String, String> result = new HashMap<>();
-        if (formData == null || formData.trim().length() == 0) {
-            return result;
-        }
-        final String[] items = formData.split("&");
-        Arrays.stream(items)
-                .forEach(
-                        item -> {
-                            final String[] keyAndVal = item.split("=");
-                            if (keyAndVal.length == 2) {
-                                try {
-                                    final String key = URLDecoder.decode(keyAndVal[0], "utf8");
-                                    final String val = URLDecoder.decode(keyAndVal[1], "utf8");
-                                    result.put(key, val);
-                                } catch (UnsupportedEncodingException e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                        });
-        return result;
-    }
-
-    static class TestHandler implements HttpHandler {
-        @Override
-        public void handle(HttpExchange exchange) {
-            String response = "hello world";
-            try {
-                exchange.sendResponseHeaders(200, 0);
-                OutputStream os = exchange.getResponseBody();
-                os.write(response.getBytes());
-                os.close();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    static class ResolveHandler implements HttpHandler {
-        @Override
-        public void handle(HttpExchange exchange) {
-            try {
-                // 获得查询字符串(get)
-                String queryString = exchange.getRequestURI().getQuery();
-                Map<String, String> queryStringInfo = formData2Dic(queryString);
-                String id = queryStringInfo.get("identifier");
-                Map<String, String> respMap;
-                respMap = registerHandler.handleResolve(queryStringInfo);
-                respMap.forEach((k, v) -> {
-                    LOGGER.debug(k + "->" + v);
-                });
-                exchange.getResponseHeaders().add("Access-Control-Allow-Origin", "*");
-                exchange.sendResponseHeaders(200, 0);
-                OutputStream os = exchange.getResponseBody();
-                os.write(JsonUtil.toJson(respMap).getBytes());
-                os.close();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}

src/main/java/org/bdware/server/irp/RegisterHandler.java

@@ -1,246 +0,0 @@
-package org.bdware.server.irp;
-
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import org.apache.commons.io.IOUtils;
-import org.bdware.sc.util.JsonUtil;
-import org.rocksdb.RocksDB;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
-public class RegisterHandler implements HttpHandler {
-    RocksDB db;
-    String dbPath = "./handleRecords/";
-
-    public RegisterHandler(RocksDB rocksDB) {
-        db = rocksDB;
-    }
-
-    public Map<String, String> HandleRequest(Map<String, String> postInfo) {
-        Map<String, String> respMap = new HashMap<>();
-        String action = postInfo.get("action");
-        switch (action) {
-            case "resolve":
-                respMap = handleResolve(postInfo);
-                break;
-            case "register":
-            case "forceRegister":
-                respMap = handleRegister(postInfo);
-                break;
-            case "unregister":
-            case "forceDelete":
-                respMap = handleUnRegister(postInfo);
-                break;
-            case "reregister":
-                respMap = handleReregister(postInfo);
-                break;
-            default:
-                System.out.println("error response");
-        }
-        return respMap;
-    }
-
-    public Map<String, String> handleRegister(Map<String, String> reqMap) {
-        Map<String, String> respMap = new HashMap<>();
-        String type;
-        switch (reqMap.get("hrType")) {
-            case "do":
-                type = "do.";
-                ViewHandler.handleRecordCount.doCount++;
-                break;
-            case "dou":
-                type = "dou.";
-                ViewHandler.handleRecordCount.userCount++;
-                break;
-            case "doip":
-                type = "doip.";
-                ViewHandler.handleRecordCount.repoCount++;
-                break;
-            default:
-                type = "ukw.";
-                break;
-        }
-        String identifier = LocalLHSProxy.PREFIX + type + geneRandomID() + "_bdw";
-        reqMap.remove("action");
-        reqMap.remove("hrType");
-        reqMap.put("identifier", identifier);
-        String handleRecord = JsonUtil.toJson(reqMap);
-        try {
-            db.put(identifier.getBytes(), handleRecord.getBytes());
-            System.out.println("successful update do, identifier: " + identifier);
-            respMap.put("identifier", identifier);
-            respMap.put("status", "1");
-            respMap.put("response", "register DO success, identifier: " + identifier);
-            ViewHandler.addRegister();
-        } catch (Exception e) {
-            e.printStackTrace();
-            respMap.put("status", "0");
-            respMap.put("response", "respond failed from LHS");
-        }
-        return respMap;
-    }
-
-    public Map<String, String> handleReregister(Map<String, String> reqMap) {
-        Map<String, String> respMap = new HashMap<>();
-        String identifier;
-        if (reqMap.get("identifier") != null) identifier = reqMap.get("identifier");
-        else {
-            respMap.put("status", "0");
-            respMap.put("response", "identifier not found");
-            return respMap;
-        }
-        try {
-            reqMap.remove("action");
-            reqMap.remove("hrType");
-            String handleRecord = JsonUtil.toJson(reqMap);
-            if (db.get(identifier.getBytes()) == null) {
-                String idType;
-                if ((identifier.split("/")).length > 2)
-                    idType = identifier.split("/")[1].split("\\.")[0];
-                else
-                    idType = identifier.split("\\.")[0];
-                switch (idType) {
-                    case "do":
-                        ViewHandler.handleRecordCount.doCount++;
-                        break;
-                    case "dou":
-                        ViewHandler.handleRecordCount.userCount++;
-                        break;
-                    case "doip":
-                        ViewHandler.handleRecordCount.repoCount++;
-                        break;
-                    default:
-                        break;
-                }
-            } else {
-                db.delete(identifier.getBytes());
-            }
-
-            db.put(identifier.getBytes(), handleRecord.getBytes());
-            System.out.println("successful update do, identifier: " + identifier);
-            respMap.put("identifier", identifier);
-            respMap.put("status", "1");
-            respMap.put("response", "reRegister DO success, identifier: " + identifier);
-        } catch (Exception e) {
-            e.printStackTrace();
-            respMap.put("status", "0");
-            respMap.put("response", "unregister failed: " + e.getMessage());
-        }
-        return respMap;
-    }
-
-    public Map<String, String> handleUnRegister(Map<String, String> reqMap) {
-        Map<String, String> respMap = new HashMap<>();
-        String identifier;
-        if (reqMap.get("identifier") != null) identifier = reqMap.get("identifier");
-        else {
-            respMap.put("status", "0");
-            respMap.put("response", "identifier not found");
-            return respMap;
-        }
-        try {
-            switch (identifier.split("\\.")[2]) {
-                case "470/do":
-                    ViewHandler.handleRecordCount.doCount--;
-                    break;
-                case "470/doip":
-                    ViewHandler.handleRecordCount.repoCount--;
-                    break;
-                case "470/dou":
-                    ViewHandler.handleRecordCount.userCount--;
-                    break;
-            }
-            db.delete(identifier.getBytes());
-            respMap.put("status", "1");
-            respMap.put("response", "success delete: " + identifier);
-            ViewHandler.addDelete();
-        } catch (Exception e) {
-            e.printStackTrace();
-            respMap.put("status", "0");
-            respMap.put("response", "unregister failed: " + e.getMessage());
-        }
-        return respMap;
-    }
-
-    public Map<String, String> handleResolve(Map<String, String> reqMap) {
-        Map<String, String> respMap = new HashMap<>();
-        String identifier;
-        if (reqMap.get("identifier") != null) identifier = reqMap.get("identifier");
-        else {
-            respMap.put("status", "0");
-            respMap.put("response", "identifier not found");
-            return respMap;
-        }
-        try {
-            if (db.get(identifier.getBytes()) == null) {
-                respMap.put("status", "0");
-                respMap.put("response", "not exist");
-                return respMap;
-            }
-            String result = new String(db.get(identifier.getBytes()));
-            respMap = JsonUtil.fromJson(result, HashMap.class);
-            ViewHandler.addResolve();
-        } catch (Exception e) {
-            e.printStackTrace();
-            respMap.put("status", "0");
-            respMap.put("response", "resolve failed: " + e.getMessage());
-        }
-        return respMap;
-    }
-
-    public String geneRandomID() {
-        String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-        Random random = new Random();
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < 10; i++) {
-            int number = random.nextInt(62);
-            sb.append(str.charAt(number));
-        }
-        return sb.toString();
-    }
-
-    @Override
-    public void handle(HttpExchange exchange) throws IOException {
-        Map<String, String> respMap;
-        try {
-            //获得表单提交数据(post)
-            String postString = IOUtils.toString(exchange.getRequestBody());
-            Map<String, String> postInfo = formData2Dic(postString);
-            respMap = HandleRequest(postInfo);
-            exchange.sendResponseHeaders(200, 0);
-            OutputStream os = exchange.getResponseBody();
-            os.write(JsonUtil.toJson(respMap).getBytes());
-            os.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public Map<String, String> formData2Dic(String formData) {
-        Map<String, String> result = new HashMap<>();
-        if (formData == null || formData.trim().length() == 0) {
-            return result;
-        }
-        final String[] items = formData.split("&");
-        Arrays.stream(items).forEach(item -> {
-            final String[] keyAndVal = item.split("=");
-            if (keyAndVal.length == 2) {
-                try {
-                    final String key = URLDecoder.decode(keyAndVal[0], "utf8");
-                    final String val = URLDecoder.decode(keyAndVal[1], "utf8");
-                    result.put(key, val);
-                } catch (UnsupportedEncodingException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-        return result;
-    }
-}

src/main/java/org/bdware/server/irp/StatisticsByDay.java

@@ -1,11 +0,0 @@
-package org.bdware.server.irp;
-
-public class StatisticsByDay {
-    int resolveStatics;
-    int deleteStatics;
-    int registerStatics;
-
-    public StatisticsByDay(){
-        registerStatics = resolveStatics = deleteStatics = 0;
-    }
-}

src/main/java/org/bdware/server/irp/ViewHandler.java

@@ -1,257 +0,0 @@
-package org.bdware.server.irp;
-
-import com.google.gson.reflect.TypeToken;
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpHandler;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.bdware.sc.util.JsonUtil;
-import org.bdware.server.NodeCenterServer;
-import org.rocksdb.ReadOptions;
-import org.rocksdb.RocksDB;
-import org.rocksdb.RocksDBException;
-import org.rocksdb.RocksIterator;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-public class ViewHandler implements HttpHandler {
-    public static final String STATISTICS_KEY = "STATISTICS";
-    public static final String COUNT_KEY = "COUNT";
-    private static final Logger LOGGER = LogManager.getLogger(ViewHandler.class);
-    public static HashMap<String, StatisticsByDay> lhsStatics = new HashMap<>();
-    public static HandleRecordCount handleRecordCount;
-    RocksDB db;
-
-    public ViewHandler(RocksDB rocksDB) throws RocksDBException {
-        db = rocksDB;
-        loadFromDB();
-        NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(
-                () -> {
-                    try {
-                        saveToDB();
-                    } catch (RocksDBException e) {
-                        LOGGER.error("saving to DB failed! " + e.getMessage());
-                    }
-                },
-                0,
-                1,
-                TimeUnit.SECONDS);
-    }
-
-    public static String getToday() {
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyyMMdd");
-        Date date = new Date(System.currentTimeMillis());
-        return formatter.format(date);
-    }
-
-    public static void addResolve() {
-        String todayDate = ViewHandler.getToday();
-        if (lhsStatics.get(todayDate) == null) {
-            StatisticsByDay statisticsByDay = new StatisticsByDay();
-            statisticsByDay.resolveStatics++;
-            lhsStatics.put(todayDate, statisticsByDay);
-        } else {
-            lhsStatics.get(todayDate).resolveStatics++;
-        }
-    }
-
-    public static void addRegister() {
-        String todayDate = ViewHandler.getToday();
-        if (lhsStatics.get(todayDate) == null) {
-            StatisticsByDay statisticsByDay = new StatisticsByDay();
-            statisticsByDay.registerStatics++;
-            lhsStatics.put(todayDate, statisticsByDay);
-        } else {
-            lhsStatics.get(todayDate).registerStatics++;
-        }
-    }
-
-    public static void addDelete() {
-        String todayDate = ViewHandler.getToday();
-        if (lhsStatics.get(todayDate) == null) {
-            StatisticsByDay statisticsByDay = new StatisticsByDay();
-            statisticsByDay.deleteStatics++;
-            lhsStatics.put(todayDate, statisticsByDay);
-        } else {
-            lhsStatics.get(todayDate).deleteStatics++;
-        }
-    }
-
-    @Override
-    public void handle(HttpExchange httpExchange) throws IOException {
-        Map<String, Object> respMap;
-        try {
-            //获得表单提交数据(post)
-            String postString = httpExchange.getRequestURI().getQuery();
-            Map<String, String> params = formData2Dic(postString);
-            respMap = HandleRequest(params);
-            httpExchange.getResponseHeaders().add("Access-Control-Allow-Origin", "*");
-            httpExchange.sendResponseHeaders(200, 0);
-            OutputStream os = httpExchange.getResponseBody();
-            os.write(JsonUtil.toJson(respMap).getBytes());
-            os.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private Map<String, Object> HandleRequest(Map<String, String> postInfo) {
-        Map<String, Object> respMap = new HashMap<>();
-        String action = postInfo.get("action");
-        switch (action) {
-            case "count":
-                respMap = getLHSCount();
-                break;
-            case "statistics":
-                respMap = getLHSStatics(postInfo);
-                break;
-            default:
-                System.out.println("error response");
-        }
-        return respMap;
-    }
-
-    private void loadFromDB() throws RocksDBException {
-        byte[] statisticBytes = db.get(STATISTICS_KEY.getBytes());
-        if (statisticBytes == null) {
-            lhsStatics = new HashMap<>();
-        } else {
-            lhsStatics = JsonUtil.fromJson(new String(statisticBytes), new TypeToken<HashMap<String, StatisticsByDay>>() {
-            }.getType());
-        }
-        byte[] countBytes = db.get(COUNT_KEY.getBytes());
-        if (countBytes == null) {
-            handleRecordCount = new HandleRecordCount();
-            handleRecordCount.doCount = handleRecordCount.repoCount = handleRecordCount.userCount = 0;
-        } else {
-            handleRecordCount = JsonUtil.fromJson(new String(countBytes), HandleRecordCount.class);
-        }
-    }
-
-    private void saveToDB() throws RocksDBException {
-        String statisticStr = JsonUtil.toJson(lhsStatics);
-        db.put(STATISTICS_KEY.getBytes(), statisticStr.getBytes());
-        String countStr = JsonUtil.toJson(handleRecordCount);
-        db.put(COUNT_KEY.getBytes(), countStr.getBytes());
-    }
-
-    public Map<String, Object> getLHSStatics(Map<String, String> postInfo) {
-        if (postInfo.containsKey("day")) {
-            return getLHSStaticsWithTime(postInfo);
-        }
-        HashMap<String, Object> respMap = new HashMap<>();
-        for (String key : lhsStatics.keySet()) {
-            respMap.put(key + "", JsonUtil.toJson(lhsStatics.get(key)));
-        }
-        return respMap;
-    }
-
-    public Map<String, Object> getLHSStaticsWithTime(Map<String, String> postInfo) {
-        long day = Long.parseLong(postInfo.get("day"));
-        LOGGER.info(day);
-        List<Integer> resolve = new ArrayList<>();
-        List<Integer> delete = new ArrayList<>();
-        List<Integer> register = new ArrayList<>();
-
-        for (int i = 0; i < day; i++) {
-            resolve.add(0);
-            delete.add(0);
-            register.add(0);
-        }
-
-        long interval = 24 * 60 * 60 * 1000;  //一天
-        long cur = System.currentTimeMillis();
-        long startTime = cur - day * interval;
-        // logger.info(JsonUtil.toJson(lhsStatics));
-        try {
-            for (String k : lhsStatics.keySet()) {
-                long time = new SimpleDateFormat("yyyyMMdd").parse(k).getTime();
-                if (time < startTime || time > cur) {
-                    continue;
-                }
-                int index = (int) ((time - startTime) / interval);
-                //logger.info(index);
-                resolve.set(index, resolve.get(index) + lhsStatics.get(k).resolveStatics);
-                delete.set(index, delete.get(index) + lhsStatics.get(k).deleteStatics);
-                register.set(index, register.get(index) + lhsStatics.get(k).registerStatics);
-            }
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-
-        HashMap<String, Object> respMap = new HashMap<>();
-        respMap.put("resolve", resolve);
-        respMap.put("delete", delete);
-        respMap.put("register", register);
-
-        return respMap;
-    }
-
-    public Map<String, Object> getLHSCount() {
-        HashMap<String, Object> respMap = new HashMap<>();
-        respMap.put("repoCount", String.valueOf(handleRecordCount.repoCount));
-        respMap.put("doCount", String.valueOf(handleRecordCount.doCount));
-
-        ReadOptions readOptions = new ReadOptions().setPrefixSameAsStart(true);
-        RocksIterator it1 = db.newIterator(readOptions);
-
-        ArrayList<String> doIDList = new ArrayList<>();
-        it1.seek("86.5000.470/do.".getBytes());
-        int total = 0;
-        while (it1.isValid() && total < 10) {
-            doIDList.add(new String(it1.key()));
-            total++;
-            it1.next();
-        }
-        it1.close();
-
-        RocksIterator it2 = db.newIterator(readOptions);
-        ArrayList<String> repoIDList = new ArrayList<>();
-        it2.seek("86.5000.470/doip.".getBytes());
-        total = 0;
-        while (it2.isValid() && total < 10) {
-            repoIDList.add(new String(it2.key()));
-            total++;
-            it2.next();
-        }
-
-        respMap.put("repoIDList", repoIDList);
-        respMap.put("doIDList", doIDList);
-        return respMap;
-
-    }
-
-    public Map<String, String> formData2Dic(String formData) {
-        Map<String, String> result = new HashMap<>();
-        if (formData == null || formData.trim().length() == 0) {
-            return result;
-        }
-        final String[] items = formData.split("&");
-        Arrays.stream(items).forEach(item -> {
-            final String[] keyAndVal = item.split("=");
-            if (keyAndVal.length == 2) {
-                try {
-                    final String key = URLDecoder.decode(keyAndVal[0], "utf8");
-                    final String val = URLDecoder.decode(keyAndVal[1], "utf8");
-                    result.put(key, val);
-                } catch (UnsupportedEncodingException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-        return result;
-    }
-
-    static class HandleRecordCount {
-        int repoCount;
-        int doCount;
-        int userCount;
-    }
-}

src/main/java/org/bdware/server/nodecenter/CMNode.java

@@ -32,8 +32,8 @@ public class CMNode {
         contracts = cons;
         contractVersion = version;
         for (ContractDesp desp : cons) {
-            KeyValueDBUtil.instance.setValue(
+            KeyValueDBUtil.instance.setValue(NCTables.ContractMeta.toString(), desp.contractID,
-                    NCTables.ContractMeta.toString(), desp.contractID, desp.contractName);
+                    desp.contractName);
         }
     }
 
@@ -53,7 +53,8 @@ public class CMNode {
         if (null != contracts) {
             for (ContractDesp desp : contracts) {
                 if (desp.contractID.equals(contractIDOrName)
-                        || desp.contractName.equals(contractIDOrName)) return true;
+                        || desp.contractName.equals(contractIDOrName))
+                    return true;
             }
         }
         return false;
@@ -79,14 +80,15 @@ public class CMNode {
         }
         try {
             if (!connection.controller.isOpen()) {
-                LOGGER.info("node " + nodeName + "(" + pubKey.substring(0, 5) + ") may be offline!");
+                LOGGER.info(
-//                System.out.println(
+                        "node " + nodeName + "(" + pubKey.substring(0, 5) + ") may be offline!");
-//                        new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+                // System.out.println(
-//                                .format(new Date(System.currentTimeMillis()))
+                // new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
-//                                + "[ADSP][CMNode] isAlive : "
+                // .format(new Date(System.currentTimeMillis()))
-//                                + nodeName
+                // + "[ADSP][CMNode] isAlive : "
-//                                + "  not open!"
+                // + nodeName
-//                                + "\n");
+                // + " not open!"
+                // + "\n");
                 return doubleCheckAlive();
             } else {
                 return true;
@@ -116,9 +118,7 @@ public class CMNode {
         LOGGER.debug("removeCIManager" + string);
         int start = this.cimanager.indexOf(string);
         if (start > 0) {
-            this.cimanager =
+            this.cimanager = this.cimanager.substring(0, start)
-                    this.cimanager
-                            .substring(0, start)
                     .concat(this.cimanager.substring(start + 130));
         }
     }

src/main/java/org/bdware/server/nodecenter/CheckAgentAliveTimer.java

@@ -0,0 +1,50 @@
+package org.bdware.server.nodecenter;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.bdware.sc.bean.ContractDesp;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TimerTask;
+
+public class CheckAgentAliveTimer extends TimerTask {
+    private final String pubkey;
+    static Logger LOGGER = LogManager.getLogger(CheckAgentAliveTimer.class);
+
+    public CheckAgentAliveTimer(String pubKey) {
+        this.pubkey = pubKey;
+    }
+
+    @Override
+    public void run() {
+        try {
+            checkAlive();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void checkAlive() {
+        Set<String> toRemove = new HashSet<>();
+        CMNode info;
+        info = NodeCenterActions.nodeInfos.get(pubkey);
+        if (!info.checkAlive()) {
+            synchronized (info) {
+                if (null != info.contracts && !info.contracts.isEmpty()) {
+                    for (ContractDesp cd : info.contracts) {
+                        cd.setIsMaster(false);
+                        // 注意 选举不通过NC的机制触发。
+                        LOGGER.info("checkAlive---- 设置节点 " + info.pubKey.substring(0, 5) + " 的合约 "
+                                + cd.contractID + " isMaster=" + false);
+                    }
+                }
+            }
+        }
+        NodeCenterActions.nodeInfos.remove(pubkey);
+        try {
+            info.connection.controller.ctx.close();
+        } catch (Exception ignored) {
+        }
+    }
+}

src/main/java/org/bdware/server/nodecenter/ContractExecutor.java

@@ -1,6 +1,6 @@
 package org.bdware.server.nodecenter;
 
-        import org.bdware.sc.conn.ResultCallback;
+import org.bdware.sc.conn.ResultCallback;
 
 public interface ContractExecutor {
     public void execute(String requestID, ResultCallback rc, String req);

src/main/java/org/bdware/server/nodecenter/ElectMasterTimeRecorder.java

@@ -4,12 +4,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 
-//NC
+// NC
 public class ElectMasterTimeRecorder {
-    public static Long startElect;  //NC开始选举
+    public static Long startElect; // NC开始选举
-    public static Long findNewMaster;  //NC选出新master
+    public static Long findNewMaster; // NC选出新master
     public static String newMaster;
-    public static Long changeMasterFinish;  //新master在NC上更新路由信息
+    public static Long changeMasterFinish; // 新master在NC上更新路由信息
 
-    public static Map nodeFindMasterCrash = new HashMap<String,Long>();   //nodeID,electMaster调用时间
+    public static Map nodeFindMasterCrash = new HashMap<String, Long>(); // nodeID,electMaster调用时间
 }

src/main/java/org/bdware/server/nodecenter/FileActions.java

@@ -49,13 +49,10 @@ public class FileActions {
         return ret != null && ret.equals("locked");
     }
 
-    @URIPath(
+    @URIPath(method = org.bdware.server.http.HttpMethod.POST, value = {"/upload"})
-            method = org.bdware.server.http.HttpMethod.POST,
-            value = {"/upload"})
     public static void handleUploadRequest(ChannelHandlerContext ctx, FullHttpRequest request) {
-        // logger.info("[CMHttpHandler] handleUploadRequest : ");
+        LOGGER.info("[FileActions] handleUploadRequest : ");
         // Upload method is POST
-
         QueryStringDecoder decoderQuery = new QueryStringDecoder(request.uri());
         Map<String, List<String>> params = decoderQuery.parameters();
         Map<String, String> transformedParam = new HashMap<>();
@@ -66,18 +63,12 @@ public class FileActions {
             }
         }
 
-        if (!transformedParam.containsKey("fileName")
+        if (!transformedParam.containsKey("fileName") || !transformedParam.containsKey("order")
-                || !transformedParam.containsKey("order")
+                || !transformedParam.containsKey("count") || !transformedParam.containsKey("pubKey")
-                || !transformedParam.containsKey("count")
-                || !transformedParam.containsKey("pubKey")
                 || !transformedParam.containsKey("sign")) {
-            DefaultFullHttpResponse fullResponse =
+            DefaultFullHttpResponse fullResponse = new DefaultFullHttpResponse(
-                    new DefaultFullHttpResponse(
+                    request.protocolVersion(), OK, Unpooled.wrappedBuffer(
-                            request.protocolVersion(),
+                            "{\"status\":\"false\",\"data\":\"Missing argument!\"}".getBytes()));
-                            OK,
-                            Unpooled.wrappedBuffer(
-                                    "{\"status\":\"false\",\"data\":\"Missing argument!\"}"
-                                            .getBytes()));
 
             ChannelFuture f = ctx.write(fullResponse);
             f.addListener(ChannelFutureListener.CLOSE);
@@ -86,9 +77,7 @@ public class FileActions {
 
         // 验签
         // HttpMethod method = request.method();
-        String uri =
+        String uri = URLDecoder.decode(request.uri()).split("\\?")[1]; // http请求中规定签名必须是最后一个且公钥名必须为pubKey，否则验签失败
-                URLDecoder.decode(request.uri())
-                        .split("\\?")[1]; // http请求中规定签名必须是最后一个且公钥名必须为pubKey，否则验签失败
         int index = uri.lastIndexOf('&');
         String str = uri.substring(0, index);
 
@@ -97,12 +86,11 @@ public class FileActions {
         String sign = transformedParam.get("sign");
         boolean verify = SM2Util.plainStrVerify(pubkey, str, sign);
 
-        LOGGER.info("[CMHttpHandler] upload http请求验签结果 : " + verify);
+        LOGGER.info("[FileAction] upload http请求验签结果 : " + verify);
 
         if (verify) {
             // 查permission
             String ret = KeyValueDBUtil.instance.getValue(NCTables.NodeUser.toString(), pubkey);
-
             if (ret != null && ret.length() > 0) {
                 permission = 0x86000d41L | Role.compoundValue(ret.split(","));
             } else {
@@ -117,9 +105,8 @@ public class FileActions {
         Method mm;
         Action a = null;
         try {
-            mm =
+            mm = FileActions.class.getDeclaredMethod("uploadFile", JsonObject.class,
-                    FileActions.class.getDeclaredMethod(
+                    ResultCallback.class);
-                            "uploadFile", JsonObject.class, ResultCallback.class);
             a = mm.getAnnotation(Action.class);
         } catch (SecurityException | NoSuchMethodException e1) {
             // TODO Auto-generated catch block
@@ -149,28 +136,17 @@ public class FileActions {
             status = "accept";
         }
 
-        TimeDBUtil.instance.put(
+        TimeDBUtil.instance.put(NCTables.NodeHttpLog.toString(),
-                NCTables.NodeHttpLog.toString(),
+                "{\"action\":\"" + action + "\",\"pubKey\":\"" + transformedParam.get("pubKey")
-                "{\"action\":\""
+                        + "\",\"status\":\"" + status + "\",\"date\":" + System.currentTimeMillis()
-                        + action
-                        + "\",\"pubKey\":\""
-                        + transformedParam.get("pubKey")
-                        + "\",\"status\":\""
-                        + status
-                        + "\",\"date\":"
-                        + System.currentTimeMillis()
                         + "}");
 
         // logger.info("[CMHttpHandler] flag = " + flag + " flag2 = " + flag2);
 
         if (!flag || !flag2) {
-            DefaultFullHttpResponse fullResponse =
+            DefaultFullHttpResponse fullResponse = new DefaultFullHttpResponse(
-                    new DefaultFullHttpResponse(
+                    request.protocolVersion(), OK, Unpooled.wrappedBuffer(
-                            request.protocolVersion(),
+                            "{\"status\":\"false\",\"data\":\"Permission denied!\"}".getBytes()));
-                            OK,
-                            Unpooled.wrappedBuffer(
-                                    "{\"status\":\"false\",\"data\":\"Permission denied!\"}"
-                                            .getBytes()));
 
             ChannelFuture f = ctx.write(fullResponse);
             f.addListener(ChannelFutureListener.CLOSE);
@@ -193,13 +169,9 @@ public class FileActions {
         }
         File target = new File(dir, fileName);
         if (fileName.contains("..")) {
-            DefaultFullHttpResponse fullResponse =
+            DefaultFullHttpResponse fullResponse = new DefaultFullHttpResponse(
-                    new DefaultFullHttpResponse(
+                    request.protocolVersion(), OK, Unpooled.wrappedBuffer(
-                            request.protocolVersion(),
+                            "{\"status\":\"false\",\"data\":\"FileName illegal!\"}".getBytes()));
-                            OK,
-                            Unpooled.wrappedBuffer(
-                                    "{\"status\":\"false\",\"data\":\"FileName illegal!\"}"
-                                            .getBytes()));
 
             ChannelFuture f = ctx.write(fullResponse);
             f.addListener(ChannelFutureListener.CLOSE);
@@ -213,7 +185,8 @@ public class FileActions {
         if (order == 0) {
             try {
                 LOGGER.debug("Path:" + target.getAbsolutePath());
-                if (!target.getParentFile().exists()) target.getParentFile().mkdirs();
+                if (!target.getParentFile().exists())
+                    target.getParentFile().mkdirs();
                 fout = new FileOutputStream(target, false);
                 fileMap.put(target.getAbsolutePath(), fout);
             } catch (FileNotFoundException e) {
@@ -234,22 +207,21 @@ public class FileActions {
             }
             fileMap.remove(target.getAbsolutePath());
             updateTime.remove(target.getAbsolutePath());
-//            String doi = unzipIfYpk(target, dir);
+            // String doi = unzipIfYpk(target, dir);
             String doi = null;
             if (null != doi) {
                 retStr = retStr.replaceFirst("null", doi);
             }
         }
-        DefaultFullHttpResponse fullResponse =
+        DefaultFullHttpResponse fullResponse = new DefaultFullHttpResponse(
-                new DefaultFullHttpResponse(
                 request.protocolVersion(), OK, Unpooled.wrappedBuffer(retStr.getBytes()));
         fullResponse.headers().add("Access-Control-Allow-Origin", "*");
         ChannelFuture f = ctx.write(fullResponse);
         f.addListener(ChannelFutureListener.CLOSE);
     }
 
-    private static void writeChunk(
+    private static void writeChunk(ChannelHandlerContext ctx, HttpPostRequestDecoder httpDecoder,
-            ChannelHandlerContext ctx, HttpPostRequestDecoder httpDecoder, File file) {
+            File file) {
         try {
             if (!file.exists()) {
                 file.createNewFile();
@@ -276,19 +248,14 @@ public class FileActions {
 
     @URIPath(method = HttpMethod.OPTIONS)
     public static void crossOrigin(ChannelHandlerContext ctx, FullHttpRequest request) {
-        DefaultFullHttpResponse fullResponse =
+        DefaultFullHttpResponse fullResponse = new DefaultFullHttpResponse(
-                new DefaultFullHttpResponse(
+                request.protocolVersion(), OK, Unpooled.wrappedBuffer("success".getBytes()));
-                        request.protocolVersion(),
-                        OK,
-                        Unpooled.wrappedBuffer("success".getBytes()));
         fullResponse.headers().remove("Access-Control-Allow-Origin");
         fullResponse.headers().remove("Access-Control-Allow-Headers");
         fullResponse.headers().add("Access-Control-Allow-Origin", "*");
-        fullResponse
+        fullResponse.headers().add("Access-Control-Allow-Headers",
-                .headers()
+                "Content-Type, Cookie, Accept-Encoding, User-Agent, Host, Referer, "
-                .add("Access-Control-Allow-Headers",
+                        + "X-Requested-With, Accept, Accept-Language, Cache-Control, Connection");
-                        "Content-Type, Cookie, Accept-Encoding, User-Agent, Host, Referer, " +
-                                "X-Requested-With, Accept, Accept-Language, Cache-Control, Connection");
         ChannelFuture f = ctx.write(fullResponse);
         f.addListener(ChannelFutureListener.CLOSE);
         LOGGER.info("[OOOOOOOOption] received!");
@@ -340,10 +307,8 @@ public class FileActions {
             // 文本文件
             if (!path.contains("..") && isTextFile(path)) {
                 LOGGER.debug("[FileActions] 上传文本文件类型 : ");
-                BufferedWriter bw =
+                BufferedWriter bw = new BufferedWriter(
-                        new BufferedWriter(
+                        new FileWriter(target.getAbsolutePath() + "/" + fileName, isAppend));
-                                new FileWriter(
-                                        target.getAbsolutePath() + "/" + fileName, isAppend));
                 bw.write(content);
                 bw.close();
             } else { // 其他类型文件
@@ -428,10 +393,7 @@ public class FileActions {
             File f = new File(parPath + "/" + oldFile);
             if (!oldFile.contains("..") && f.exists()) {
                 LOGGER.info(
-                        "[FileController] delete:"
+                        "[FileController] delete:" + f.getAbsolutePath() + " exists:" + f.exists());
-                                + f.getAbsolutePath()
-                                + " exists:"
-                                + f.exists());
                 f.delete();
             }
             response.data = "success";

src/main/java/org/bdware/server/nodecenter/LogActions.java

@@ -7,7 +7,6 @@ import org.apache.logging.log4j.Logger;
 import org.bdware.sc.conn.ResultCallback;
 import org.bdware.sc.db.KeyValueDBUtil;
 import org.bdware.sc.db.MultiIndexTimeDBUtilIntf;
-import org.bdware.sc.util.JsonUtil;
 import org.bdware.server.NodeCenterServer;
 import org.bdware.server.action.Action;
 
@@ -33,10 +32,7 @@ public class LogActions {
         resultCallback.onResult(jsonResult);
     }
 
-    private void queryInternal(
+    private void queryInternal(String actResp, MultiIndexTimeDBUtilIntf db, JsonObject json,
-            String actResp,
-            MultiIndexTimeDBUtilIntf db,
-            JsonObject json,
             ResultCallback resultCallback) {
         long start = System.currentTimeMillis();
         if (!json.has("start")) {
@@ -48,26 +44,25 @@ public class LogActions {
         if (json.has("end")) {
             endTime = json.get("end").getAsLong();
         }
-        String[] category = new String[]{null};
+        String[] category = new String[] {null};
         if (json.has("category")) {
             category = json.get("category").getAsString().split(",");
         }
         Map<String, Object> data = new HashMap<>();
         for (String str : category) {
             List<JsonObject> array = db.queryByDateAsJson(str, startTime, endTime);
-            if (str == null) data.put("primary", array);
+            if (str == null)
-            else data.put(str, array);
+                data.put("primary", array);
+            else
+                data.put(str, array);
         }
         simpleReply(resultCallback, actResp, data);
         long end = System.currentTimeMillis();
         LOGGER.debug("[queryInternal:time]" + (end - start));
     }
 
-    private void countLogByCategoryInternal(
+    private void countLogByCategoryInternal(String actResp, MultiIndexTimeDBUtilIntf db,
-            String actResp,
+            JsonObject json, ResultCallback resultCallback) {
-            MultiIndexTimeDBUtilIntf db,
-            JsonObject json,
-            ResultCallback resultCallback) {
         if (!json.has("start")) {
             simpleReply(resultCallback, actResp, new ArrayList<>());
             return;
@@ -78,15 +73,17 @@ public class LogActions {
             endTime = json.get("end").getAsLong();
         }
         long interval = json.get("interval").getAsLong();
-        String[] category = new String[]{null};
+        String[] category = new String[] {null};
         if (json.has("category")) {
             category = json.get("category").getAsString().split(",");
         }
         JsonObject data = new JsonObject();
         for (String str : category) {
             JsonArray array = db.countInInterval(str, startTime, interval, endTime);
-            if (str == null) data.add("primary", array);
+            if (str == null)
-            else data.add(str, array);
+                data.add("primary", array);
+            else
+                data.add(str, array);
         }
         simpleReply(resultCallback, actResp, data);
     }
@@ -98,8 +95,8 @@ public class LogActions {
 
     @Action(userPermission = 1 << 8, async = true)
     public void countActionLogByCategory(JsonObject json, ResultCallback resultCallback) {
-        countLogByCategoryInternal(
+        countLogByCategoryInternal("onCountActionLogByCategory", NodeCenterServer.nodeHttpLogDB,
-                "onCountActionLogByCategory", NodeCenterServer.nodeHttpLogDB, json, resultCallback);
+                json, resultCallback);
     }
 
     @Action(userPermission = 1 << 8, async = true)
@@ -109,8 +106,8 @@ public class LogActions {
 
     @Action(userPermission = 1 << 8, async = true)
     public void countCMLogByCategory(JsonObject json, ResultCallback resultCallback) {
-        countLogByCategoryInternal(
+        countLogByCategoryInternal("onCountCMLogByCategory", NodeCenterServer.nodeTcpLogDB, json,
-                "onCountCMLogByCategory", NodeCenterServer.nodeTcpLogDB, json, resultCallback);
+                resultCallback);
     }
 
     @Action(userPermission = 1 << 9)
@@ -130,7 +127,7 @@ public class LogActions {
     @Action(userPermission = 1 << 9, async = true)
     public void listNodes(JsonObject json, ResultCallback resultCallback) {
         long start = System.currentTimeMillis();
-        final String pubKey = managerAction.pubKey;
+        final String pubKey = managerAction.getPubKey(json);
         LOGGER.debug("[listNodes] managerAction.pubKey " + pubKey);
         Map<String, CMNode> nodeinfos = NodeCenterActions.nodeInfos; // 所有在线节点?
         final Map<String, CMNode> cinodeinfos = new HashMap<>();
@@ -138,8 +135,7 @@ public class LogActions {
         List<CMNode> onlineNodes = new ArrayList<>();
 
         Map<String, Object> ret = new HashMap<>();
-        if (KeyValueDBUtil.instance
+        if (KeyValueDBUtil.instance.getValue(NCTables.ConfigDB.toString(), "__CenterManager__")
-                .getValue(NCTables.ConfigDB.toString(), "__CenterManager__")
                 .contains(pubKey)) {
             LOGGER.debug("is center manager");
             LOGGER.debug("dbnodes " + dbnodes.toString());

src/main/java/org/bdware/server/nodecenter/MasterActions.java

@@ -12,12 +12,15 @@ import java.util.concurrent.TimeUnit;
 public class MasterActions {
     private static final Logger LOGGER = LogManager.getLogger(MasterActions.class);
     // TODO 定期清缓存
-    public static Map<String, RequestCache> requestCache =
+    public static Map<String, RequestCache> requestCache = new ConcurrentHashMap<>(); // key is
-            new ConcurrentHashMap<>(); // key is contractID,only for requestAll type contract
+                                                                                      // contractID,only
+                                                                                      // for
+                                                                                      // requestAll
+                                                                                      // type
+                                                                                      // contract
 
     static {
-        NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(
+        NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(() -> {
-                () -> {
             boolean flag = clearCache();
             if (flag) {
                 try {
@@ -26,10 +29,7 @@ public class MasterActions {
                     LOGGER.error("sleeping is interrupted! " + e.getMessage());
                 }
             }
-                },
+        }, 0, 0, TimeUnit.SECONDS);
-                0,
-                0,
-                TimeUnit.SECONDS);
     }
 
     public NodeCenterFrameHandler controller;
@@ -39,185 +39,156 @@ public class MasterActions {
     }
 
     // judge the just online node whwther need to restart contracts,send the contracts'info
-    /*    public static void restartContracts(String nodePubKey){
+    /*
-        if(!NodeCenterActions.recoverMap.containsKey(nodePubKey)){
+     * public static void restartContracts(String nodePubKey){
-            return;
+     * if(!NodeCenterActions.recoverMap.containsKey(nodePubKey)){ return; }
-        }
+     * 
-
+     * System.out.println("开始恢复节点" + NodeCenterActions.nodeinfos.get(nodePubKey).nodeName);
-        System.out.println("开始恢复节点" + NodeCenterActions.nodeinfos.get(nodePubKey).nodeName);
+     * 
-
+     * 
-
+     * // 恢复该节点的每一个集群运行的合约 for (ContractRecord record :
-        // 恢复该节点的每一个集群运行的合约
+     * NodeCenterActions.recoverMap.get(nodePubKey).values()) { String contractID =
-        for (ContractRecord record : NodeCenterActions.recoverMap.get(nodePubKey).values()) {
+     * record.contractID; if (record.recoverFlag != RecoverFlag.ToRecover) continue;
-            String contractID = record.contractID;
+     * 
-            if (record.recoverFlag != RecoverFlag.ToRecover)
+     * Map<String, String> req = new HashMap<String, String>(); req.put("action",
-                continue;
+     * "queryUnitStatus"); req.put("contractID", contractID); CMNode cmNode =
-
+     * NodeCenterActions.nodeinfos.get(nodePubKey);
-            Map<String, String> req = new HashMap<String, String>();
+     * cmNode.connection.controller.sendMsg(gson.toJson(req)); } }
-            req.put("action", "queryUnitStatus");
+     */
-            req.put("contractID", contractID);
-            CMNode cmNode = NodeCenterActions.nodeinfos.get(nodePubKey);
-            cmNode.connection.controller.sendMsg(gson.toJson(req));
-        }
-    }*/
-
-    /*    @Action(async = true)
-    public void onQueryUnitStatus(Map<String, String> args, final ResultCallback rc) {
-        String mode = args.get("mode");
-        String nodeID = args.get("nodeID");
-        String contractID = args.get("contractID");
-        ContractRecord record = NodeCenterActions.recoverMap.get(nodeID).get(contractID);
-        logger.debug("节点" + NodeCenterActions.nodeinfos.get(args.get("nodeID")).nodeName + "崩溃前模式为" + mode);
-        if(mode.equals(ContractUnitStatus.CommonMode.toString())){
-            restartFromCommonMode(nodeID,record);
-        }else if(mode.equals(ContractUnitStatus.StableMode.toString())){
-            restartFromStableMode(nodeID,record);
-        }
-    }*/
-
-    // 当StableMode的节点的lastExeSeq和集群相差超过10时，通过CommonNode的恢复方式恢复
-    /*     @Action(async = true)
-    public void restartByCommonNode(Map<String, String> args, final ResultCallback rc){
-         String nodeID = args.get("nodeID");
-         String contractID = args.get("contractID");
-         ContractRecord record = NodeCenterActions.recoverMap.get(nodeID).get(contractID);
-         restartFromCommonMode(nodeID,record);
-     }*/
 
     /*
-        public static void restartFromCommonMode(String nodePubKey,ContractRecord record){
+     * @Action(async = true) public void onQueryUnitStatus(Map<String, String> args, final
-            logger.debug("从CommonMode中恢复:");
+     * ResultCallback rc) { String mode = args.get("mode"); String nodeID = args.get("nodeID");
+     * String contractID = args.get("contractID"); ContractRecord record =
+     * NodeCenterActions.recoverMap.get(nodeID).get(contractID); logger.debug("节点" +
+     * NodeCenterActions.nodeinfos.get(args.get("nodeID")).nodeName + "崩溃前模式为" + mode);
+     * if(mode.equals(ContractUnitStatus.CommonMode.toString())){
+     * restartFromCommonMode(nodeID,record); }else
+     * if(mode.equals(ContractUnitStatus.StableMode.toString())){
+     * restartFromStableMode(nodeID,record); } }
+     */
 
-            String contractID = record.contractID;
+    // 当StableMode的节点的lastExeSeq和集群相差超过10时，通过CommonNode的恢复方式恢复
+    /*
+     * @Action(async = true) public void restartByCommonNode(Map<String, String> args, final
+     * ResultCallback rc){ String nodeID = args.get("nodeID"); String contractID =
+     * args.get("contractID"); ContractRecord record =
+     * NodeCenterActions.recoverMap.get(nodeID).get(contractID);
+     * restartFromCommonMode(nodeID,record); }
+     */
 
-            record.recoverFlag = RecoverFlag.Recovering;
+    /*
-            //先发消息，让恢复节点的该合约收到消息后只加入队列不dealRequests
+     * public static void restartFromCommonMode(String nodePubKey,ContractRecord record){
-            Map<String, String> request = new HashMap<>();
+     * logger.debug("从CommonMode中恢复:");
-            request.put("action", "setRecovering");
+     * 
-            request.put("contractID",contractID);
+     * String contractID = record.contractID;
-            CMNode node = NodeCenterActions.nodeinfos.get(nodePubKey);
+     * 
-            node.connection.controller.sendMsg(gson.toJson(request));
+     * record.recoverFlag = RecoverFlag.Recovering; //先发消息，让恢复节点的该合约收到消息后只加入队列不dealRequests
-
+     * Map<String, String> request = new HashMap<>(); request.put("action", "setRecovering");
-            //System.out.println("第一步 : [NodeCeterActions] restartContracts  开始处理合约  contractID=" + contractID);
+     * request.put("contractID",contractID); CMNode node =
-
+     * NodeCenterActions.nodeinfos.get(nodePubKey);
-            if (NodeCenterActions.contractID2Members.containsKey(contractID)) {
+     * node.connection.controller.sendMsg(gson.toJson(request));
-
+     * 
-                // 在nodeinfos中找节点，该节点的pubKey在pubKeys中
+     * //System.out.println("第一步 : [NodeCeterActions] restartContracts  开始处理合约  contractID=" +
-                MultiPointContractInfo info = NodeCenterActions.contractID2Members.get(contractID);
+     * contractID);
-                CMNode cmNode = null;
+     * 
-                for (int i = 0; i < info.members.size(); i++) {
+     * if (NodeCenterActions.contractID2Members.containsKey(contractID)) {
-                    int size = info.members.size();
+     * 
-                    String tempNodeID = info.members.get(record.order.incrementAndGet() % size);
+     * // 在nodeinfos中找节点，该节点的pubKey在pubKeys中 MultiPointContractInfo info =
-
+     * NodeCenterActions.contractID2Members.get(contractID); CMNode cmNode = null; for (int i = 0; i
-                    if(NodeCenterActions.nodeinfos.containsKey(tempNodeID))
+     * < info.members.size(); i++) { int size = info.members.size(); String tempNodeID =
-                        cmNode = NodeCenterActions.nodeinfos.get(tempNodeID);
+     * info.members.get(record.order.incrementAndGet() % size);
-                    else continue;
+     * 
-
+     * if(NodeCenterActions.nodeinfos.containsKey(tempNodeID)) cmNode =
-                    //System.out.println("查询节点  " + cmNode.nodeName);
+     * NodeCenterActions.nodeinfos.get(tempNodeID); else continue;
-
+     * 
-                    if (cmNode != null && !cmNode.pubKey.equals(nodePubKey)) {
+     * //System.out.println("查询节点  " + cmNode.nodeName);
-                        //System.out.println("第二步 : [NodeCenterActions] 找到一个依赖恢复节点，其节点名为 " + cmNode.nodeName);
+     * 
-
+     * if (cmNode != null && !cmNode.pubKey.equals(nodePubKey)) {
-                        Map<String, String> req = new HashMap<String, String>();
+     * //System.out.println("第二步 : [NodeCenterActions] 找到一个依赖恢复节点，其节点名为 " + cmNode.nodeName);
-                        req.put("action", "dumpCurrentState");
+     * 
-                        req.put("contractID", contractID);
+     * Map<String, String> req = new HashMap<String, String>(); req.put("action",
-                        req.put("targetNodePubkey", nodePubKey);
+     * "dumpCurrentState"); req.put("contractID", contractID); req.put("targetNodePubkey",
-
+     * nodePubKey);
-                        // NC向该节点发送请求，让其存储自身当前状态并发给NC
+     * 
-                        cmNode.connection.controller.sendMsg(gson.toJson(req));
+     * // NC向该节点发送请求，让其存储自身当前状态并发给NC cmNode.connection.controller.sendMsg(gson.toJson(req));
-
+     * 
-                        return;
+     * return; } }
-                    }
+     * 
-                }
+     * if(cmNode == null){ logger.debug("[NodeCenterActions] Can't find a recover rely node!"); } }
-
+     * }
-                if(cmNode == null){
-                    logger.debug("[NodeCenterActions] Can't find a recover rely node!");
-                }
-            }
-        }
      */
 
     // TODO
-    /*    public static void restartFromStableMode(String nodePubkey,ContractRecord record){
+    /*
-        logger.debug("从StableMode中恢复:");
+     * public static void restartFromStableMode(String nodePubkey,ContractRecord record){
+     * logger.debug("从StableMode中恢复:");
+     * 
+     * String contractID = record.contractID; record.recoverFlag = RecoverFlag.Recovering;
+     * //先发消息，让恢复节点的该合约收到消息后只加入队列不dealRequests Map<String, String> request = new HashMap<>();
+     * request.put("action", "setRecovering"); request.put("contractID",contractID);
+     * request.put("mode", ContractUnitStatus.StableMode.toString()); int lastExeSeq =
+     * NodeCenterActions.contractID2Members.get(contractID).ai.get() - 1;
+     * request.put("lastExeSeq",lastExeSeq + ""); CMNode node =
+     * NodeCenterActions.nodeinfos.get(nodePubkey);
+     * node.connection.controller.sendMsg(gson.toJson(request)); }
+     */
 
-        String contractID = record.contractID;
+    /*
-        record.recoverFlag = RecoverFlag.Recovering;
+     * public static void unitModeCheck(String contractID){ MultiPointContractInfo mpci =
-        //先发消息，让恢复节点的该合约收到消息后只加入队列不dealRequests
+     * NodeCenterActions.contractID2Members.get(contractID); int total = 0,online = 0; for(String
-        Map<String, String> request = new HashMap<>();
+     * nodeId : mpci.members){ if(NodeCenterActions.nodeinfos.containsKey(nodeId)){ online++; }
-        request.put("action", "setRecovering");
+     * total++; }
-        request.put("contractID",contractID);
+     * 
-        request.put("mode", ContractUnitStatus.StableMode.toString());
+     * logger.debug("合约" + contractID + "的集群,上线节点有" + online + "个,总共节点有" + total +
-        int lastExeSeq = NodeCenterActions.contractID2Members.get(contractID).ai.get() - 1;
+     * "个.  Math.ceil(total / 2)=" + Math.ceil((double)total / 2) +
-        request.put("lastExeSeq",lastExeSeq + "");
+     * "  online > Math.ceil(total / 2)" + (online > Math.ceil(total / 2)) + "  mpci.unitStatus=" +
-        CMNode node = NodeCenterActions.nodeinfos.get(nodePubkey);
+     * mpci.unitStatus); if(online > Math.ceil((double)total / 2) && mpci.unitStatus ==
-        node.connection.controller.sendMsg(gson.toJson(request));
+     * ContractUnitStatus.StableMode){ logger.debug("合约" + contractID + "的集群更改模式为" +
-    }*/
+     * ContractUnitStatus.CommonMode.toString());
+     * 
+     * Map<String, String> req = new HashMap<String, String>(); req.put("action",
+     * "changeUnitStatus"); req.put("contractID", contractID);
+     * req.put("mode",ContractUnitStatus.CommonMode.toString()); for(String nodeId : mpci.members){
+     * if(NodeCenterActions.nodeinfos.containsKey(nodeId)){ CMNode cmNode =
+     * NodeCenterActions.nodeinfos.get(nodeId); logger.debug("发消息给节点 " + cmNode.nodeName + " 设置合约" +
+     * contractID + "的集群模式为CommonMode"); cmNode.connection.controller.sendMsg(gson.toJson(req)); } }
+     * 
+     * mpci.unitStatus = ContractUnitStatus.CommonMode; }else if(online <= Math.ceil((double)total /
+     * 2) && mpci.unitStatus == ContractUnitStatus.CommonMode){ logger.debug("合约" + contractID +
+     * "的集群更改模式为" + ContractUnitStatus.StableMode.toString());
+     * 
+     * Map<String, String> req = new HashMap<String, String>(); req.put("action",
+     * "changeUnitStatus"); req.put("contractID", contractID);
+     * req.put("mode",ContractUnitStatus.StableMode.toString()); for(String nodeId : mpci.members){
+     * if(NodeCenterActions.nodeinfos.containsKey(nodeId)){ CMNode cmNode =
+     * NodeCenterActions.nodeinfos.get(nodeId); Map<String,String> map =
+     * NodeCenterActions.recoverMap.get(nodeId).get(contractID).members;
+     * req.put("membersStr",JsonUtil.toJson(map)); //ContractRecord's members logger.debug("发消息给节点 "
+     * + cmNode.nodeName + " 设置合约" + contractID + "的集群模式为StableMode");
+     * cmNode.connection.controller.sendMsg(gson.toJson(req)); } }
+     * 
+     * mpci.unitStatus = ContractUnitStatus.StableMode;
+     * 
+     * //将ContractRecord中members发给集群中节点
+     * 
+     * } }
+     */
 
-    /*    public static void unitModeCheck(String contractID){
+    /*
-        MultiPointContractInfo mpci = NodeCenterActions.contractID2Members.get(contractID);
+     * @Action(async = true) public void recoverFinish(Map<String, String> args, final
-        int total = 0,online = 0;
+     * ResultCallback rc) { ContractRecord cr =
-        for(String nodeId : mpci.members){
+     * NodeCenterActions.recoverMap.get(args.get("nodeID")).get(args.get("contractID"));
-            if(NodeCenterActions.nodeinfos.containsKey(nodeId)){
+     * logger.debug("节点" + NodeCenterActions.nodeinfos.get(args.get("nodeID")).nodeName + "恢复完成!");
-                online++;
+     * if(cr.recoverFlag == RecoverFlag.Recovering) cr.recoverFlag = RecoverFlag.Fine;
-            }
+     * 
-            total++;
+     * logger.debug("恢复完成，需要检查合约" + args.get("contractID") + "的集群运行模式");
-        }
+     * unitModeCheck(args.get("contractID")); }
-
+     */
-        logger.debug("合约" + contractID + "的集群,上线节点有" + online + "个,总共节点有" + total + "个.  Math.ceil(total / 2)=" + Math.ceil((double)total / 2)  + "  online > Math.ceil(total / 2)" + (online > Math.ceil(total / 2)) + "  mpci.unitStatus=" + mpci.unitStatus);
-        if(online > Math.ceil((double)total / 2) && mpci.unitStatus == ContractUnitStatus.StableMode){
-            logger.debug("合约" + contractID + "的集群更改模式为" + ContractUnitStatus.CommonMode.toString());
-
-            Map<String, String> req = new HashMap<String, String>();
-            req.put("action", "changeUnitStatus");
-            req.put("contractID", contractID);
-            req.put("mode",ContractUnitStatus.CommonMode.toString());
-            for(String nodeId : mpci.members){
-                if(NodeCenterActions.nodeinfos.containsKey(nodeId)){
-                    CMNode cmNode = NodeCenterActions.nodeinfos.get(nodeId);
-                    logger.debug("发消息给节点 " + cmNode.nodeName + " 设置合约" + contractID + "的集群模式为CommonMode");
-                    cmNode.connection.controller.sendMsg(gson.toJson(req));
-                }
-            }
-
-            mpci.unitStatus = ContractUnitStatus.CommonMode;
-        }else if(online <= Math.ceil((double)total / 2) && mpci.unitStatus == ContractUnitStatus.CommonMode){
-            logger.debug("合约" + contractID + "的集群更改模式为" + ContractUnitStatus.StableMode.toString());
-
-            Map<String, String> req = new HashMap<String, String>();
-            req.put("action", "changeUnitStatus");
-            req.put("contractID", contractID);
-            req.put("mode",ContractUnitStatus.StableMode.toString());
-            for(String nodeId : mpci.members){
-                if(NodeCenterActions.nodeinfos.containsKey(nodeId)){
-                    CMNode cmNode = NodeCenterActions.nodeinfos.get(nodeId);
-                    Map<String,String> map = NodeCenterActions.recoverMap.get(nodeId).get(contractID).members;
-                    req.put("membersStr",JsonUtil.toJson(map)); //ContractRecord's members
-                    logger.debug("发消息给节点 " + cmNode.nodeName + " 设置合约" + contractID + "的集群模式为StableMode");
-                    cmNode.connection.controller.sendMsg(gson.toJson(req));
-                }
-            }
-
-            mpci.unitStatus = ContractUnitStatus.StableMode;
-
-            //将ContractRecord中members发给集群中节点
-
-        }
-    }*/
-
-    /*    @Action(async = true)
-    public void recoverFinish(Map<String, String> args, final ResultCallback rc) {
-        ContractRecord cr = NodeCenterActions.recoverMap.get(args.get("nodeID")).get(args.get("contractID"));
-        logger.debug("节点" + NodeCenterActions.nodeinfos.get(args.get("nodeID")).nodeName + "恢复完成!");
-        if(cr.recoverFlag == RecoverFlag.Recovering)
-            cr.recoverFlag = RecoverFlag.Fine;
-
-        logger.debug("恢复完成，需要检查合约" + args.get("contractID") + "的集群运行模式");
-        unitModeCheck(args.get("contractID"));
-    }*/
 
     static boolean clearCache() {
-        if (requestCache.isEmpty()) return true;
+        if (requestCache.isEmpty())
+            return true;
 
         // final long time = System.currentTimeMillis() - 60000L; //60s
         // requestCache.entrySet()
@@ -253,7 +224,8 @@ public class MasterActions {
     static RequestCache getCache(String contractID) {
         if (contractID != null) {
             RequestCache cache = requestCache.get(contractID);
-            if (cache != null) return cache;
+            if (cache != null)
+                return cache;
             else {
                 LOGGER.debug("[NodeCenterActions] create requestcache:" + contractID);
                 RequestCache reqc = new RequestCache();
@@ -264,26 +236,17 @@ public class MasterActions {
         return null;
     }
 
-    /*    @Action(async = true)
+    /*
-    public void sendCachedRequests(Map<String, String> args, final ResultCallback rc) {
+     * @Action(async = true) public void sendCachedRequests(Map<String, String> args, final
-        String contractID = args.get("contractID");
+     * ResultCallback rc) { String contractID = args.get("contractID"); int start =
-        int start = Integer.parseInt(args.get("start"));
+     * Integer.parseInt(args.get("start")); int end = Integer.parseInt(args.get("end"));
-        int end = Integer.parseInt(args.get("end"));
+     * 
-
+     * RequestCache cache = getCache(contractID); for(int i = start + 1;i < end;i++){ if(cache ==
-        RequestCache cache = getCache(contractID);
+     * null || !cache.containsKey(i)){ //this node crash String nodeID = args.get("nodeID");
-        for(int i = start + 1;i < end;i++){
+     * MasterActions.restartContracts(nodeID); } JsonObject jo = cache.get(i); if(jo == null){
-            if(cache == null || !cache.containsKey(i)){
+     * logger.debug("在NC中第 " + i + "个请求已经被清,无法发给恢复节点!"); }else
-                //this node crash
+     * controller.sendMsg(JsonUtil.toJson(jo));
-                String nodeID = args.get("nodeID");
+     * 
-                MasterActions.restartContracts(nodeID);
+     * logger.debug("NC发送第 " + i + "    " + jo.get("seq").getAsString() + " 个请求给Node"); } }
-            }
+     */
-            JsonObject jo = cache.get(i);
-            if(jo == null){
-                logger.debug("在NC中第 " + i + "个请求已经被清,无法发给恢复节点!");
-            }else
-                controller.sendMsg(JsonUtil.toJson(jo));
-
-            logger.debug("NC发送第 " + i + "    " + jo.get("seq").getAsString() + " 个请求给Node");
-        }
-    }*/
 }

src/main/java/org/bdware/server/nodecenter/MetaIndexAction.java

@@ -28,11 +28,7 @@ import org.bdware.server.nodecenter.searchresult.ContractMeta;
 import org.bdware.server.nodecenter.searchresult.ResultModel;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 
-import java.io.ByteArrayOutputStream;
+import java.io.*;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -94,7 +90,8 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
                     Query query = new TermQuery(new Term("contractID", thisDesp.contractID));
                     TopDocs docs = indexSearcher.search(query, 10);
                     LOGGER.debug(docs.scoreDocs);
-                    if (null != thisDesp.contractName && (docs.scoreDocs == null || docs.scoreDocs.length == 0)) {
+                    if (null != thisDesp.contractName
+                            && (docs.scoreDocs == null || docs.scoreDocs.length == 0)) {
                         req.addProperty("action", "requestReadMe");
                         req.addProperty("contractID", thisDesp.contractID);
                         rc.onResult(req);
@@ -105,9 +102,9 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
                     LOGGER.warn("getting index failed! " + e.getMessage());
                 }
             }
-            req.addProperty("action", "requestReadMe");
+            // req.addProperty("action", "requestReadMe");
-            req.addProperty("contractID", thisDesp.contractID);
+            // req.addProperty("contractID", thisDesp.contractID);
-            rc.onResult(req);
+            // rc.onResult(req);
             LOGGER.info("contract " + thisDesp.contractName + " --> actually to index");
         }
         if (null != indexReader) {
@@ -132,7 +129,8 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     public static void delIndexbyCID(JsonObject jo) {
         try {
-            if (!jo.has("contractID")) return;
+            if (!jo.has("contractID"))
+                return;
             String contractID = jo.get("contractID").getAsString();
             LOGGER.info("contractID:" + contractID + "-->actually to delete");
             indexWriter.deleteDocuments(new Term("contractID", contractID));
@@ -144,7 +142,8 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     public static void delIndexbyOwner(JsonObject jo) {
         try {
-            if (!jo.has("owner")) return;
+            if (!jo.has("owner"))
+                return;
             String owner = jo.get("owner").getAsString();
             LOGGER.info("owner:" + owner + "-->actually to delete");
             indexWriter.deleteDocuments(new Term("owner", owner));
@@ -192,12 +191,17 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     public static String getMetabyReadme(JsonObject jo) {
         try {
-            if (!jo.has("keyword")) return "missing arguments: keyword";
+            if (!jo.has("keyword"))
+                return "missing arguments: keyword";
 
-            if (!jo.has("page")) page = 1;
+            if (!jo.has("page"))
-            else page = jo.get("page").getAsInt();
+                page = 1;
-            if (page <= 0) page = 1;
+            else
-            if (jo.has("pageSize")) PAGE_SIZE = jo.get("pageSize").getAsInt();
+                page = jo.get("page").getAsInt();
+            if (page <= 0)
+                page = 1;
+            if (jo.has("pageSize"))
+                PAGE_SIZE = jo.get("pageSize").getAsInt();
             String keyword = jo.get("keyword").getAsString();
             // Analyzer analyzer = new StandardAnalyzer();
             Analyzer analyzer = new IKAnalyzer();
@@ -235,11 +239,15 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     private static String getMetabyPubkey(JsonObject jo) {
         try {
-            if (!jo.has("pubkey")) return "missing arguments: pubkey";
+            if (!jo.has("pubkey"))
+                return "missing arguments: pubkey";
 
-            if (!jo.has("page")) page = 1;
+            if (!jo.has("page"))
-            else page = jo.get("page").getAsInt();
+                page = 1;
-            if (page <= 0) page = 1;
+            else
+                page = jo.get("page").getAsInt();
+            if (page <= 0)
+                page = 1;
 
             String pubkey = jo.get("pubkey").getAsString();
             DirectoryReader indexReader = DirectoryReader.open(indexDir);
@@ -275,11 +283,15 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
     private static String getMetabyCID(JsonObject jo) {
         System.out.println("getMetabyCID" + jo.toString());
         try {
-            if (!jo.has("contractID")) return "missing arguments: contractID";
+            if (!jo.has("contractID"))
+                return "missing arguments: contractID";
 
-            if (!jo.has("page")) page = 1;
+            if (!jo.has("page"))
-            else page = jo.get("page").getAsInt();
+                page = 1;
-            if (page <= 0) page = 1;
+            else
+                page = jo.get("page").getAsInt();
+            if (page <= 0)
+                page = 1;
 
             String contractID = jo.get("contractID").getAsString();
             DirectoryReader indexReader = DirectoryReader.open(indexDir);
@@ -314,12 +326,17 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     private static String getMetabyOwner(JsonObject jo) {
         try {
-            if (!jo.has("owner")) return "missing arguments: owner";
+            if (!jo.has("owner"))
+                return "missing arguments: owner";
 
-            if (!jo.has("page")) page = 1;
+            if (!jo.has("page"))
-            else page = jo.get("page").getAsInt();
+                page = 1;
-            if (page <= 0) page = 1;
+            else
-            if (jo.has("pageSize")) PAGE_SIZE = jo.get("pageSize").getAsInt();
+                page = jo.get("page").getAsInt();
+            if (page <= 0)
+                page = 1;
+            if (jo.has("pageSize"))
+                PAGE_SIZE = jo.get("pageSize").getAsInt();
             String owner = jo.get("owner").getAsString();
             DirectoryReader indexReader = DirectoryReader.open(indexDir);
             IndexSearcher indexSearcher = new IndexSearcher(indexReader);
@@ -354,18 +371,15 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
     public static void reqHandler(JsonObject req, BooleanQuery.Builder query)
             throws ParseException {
         if (req.get("contractID").getAsString() != null) {
-            query.add(
+            query.add(new FuzzyQuery(new Term("contractID", req.get("contractID").getAsString())),
-                    new FuzzyQuery(new Term("contractID", req.get("contractID").getAsString())),
                     BooleanClause.Occur.SHOULD);
         }
         if (req.get("owner").getAsString() != null) {
-            query.add(
+            query.add(new FuzzyQuery(new Term("owner", req.get("owner").getAsString())),
-                    new FuzzyQuery(new Term("owner", req.get("owner").getAsString())),
                     BooleanClause.Occur.SHOULD);
         }
         if (req.get("pubkey").getAsString() != null) {
-            query.add(
+            query.add(new PrefixQuery(new Term("pubkey", req.get("pubkey").getAsString())),
-                    new PrefixQuery(new Term("pubkey", req.get("pubkey").getAsString())),
                     BooleanClause.Occur.SHOULD);
         }
         if (req.get("readmeStr").getAsString() != null) {
@@ -404,8 +418,7 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
         resultModel.setContractMetaList(contractMetaList);
         resultModel.setCurPage(page);
         Long pageCount =
-                docs.totalHits.value % PAGE_SIZE > 0
+                docs.totalHits.value % PAGE_SIZE > 0 ? (docs.totalHits.value) / PAGE_SIZE + 1
-                        ? (docs.totalHits.value) / PAGE_SIZE + 1
                         : (docs.totalHits.value) / PAGE_SIZE;
         resultModel.setPageCount(pageCount);
         return resultModel;
@@ -425,11 +438,7 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
         // /DOIP/Hello1/assets/logo.png
         // String nodeAddr="127.0.0.1:21030";
         String pngUrl = "http://" + nodeAddr + "/DOIP/" + name + "/assets/logo.png";
-        System.out.println(
+        System.out.println("node.masterAddress: " + node.masterAddress + "==========" + "nodeAddr: "
-                "node.masterAddress: "
-                        + node.masterAddress
-                        + "=========="
-                        + "nodeAddr: "
                 + nodeAddr);
         System.out.println("name: " + name + "pngUrl: " + pngUrl);
         String contractID = json.get("contractID").getAsString();
@@ -469,7 +478,8 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
     public void getMetabyReadme(JsonObject json, ResultCallback rc) {
         String result = getMetabyReadme(json);
         JsonObject object = new JsonObject();
-        if (json.has("requestID")) object.add("responseID", json.get("requestID"));
+        if (json.has("requestID"))
+            object.add("responseID", json.get("requestID"));
         System.out.println("zzzResult" + result);
         object.add("result", JsonParser.parseString(result));
         object.addProperty("action", "getMetabyReadme");
@@ -478,15 +488,19 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     @Action(async = true, userPermission = 1L)
     public void segmentWord(JsonObject json, ResultCallback rc) throws IOException {
-        //Analyzer analyzer = new IKAnalyzer(true);
+        // Analyzer analyzer = new IKAnalyzer(true);
-        CharArraySet stopWords = CharArraySet.unmodifiableSet(WordlistLoader.getWordSet(new InputStreamReader(Objects.requireNonNull(MetaIndexAction.class.getClassLoader().getResourceAsStream(
+        CharArraySet stopWords =
-                "org/bdware/server/stopwords.txt")), StandardCharsets.UTF_8)));
+                CharArraySet.unmodifiableSet(WordlistLoader.getWordSet(new InputStreamReader(
+                        Objects.requireNonNull(MetaIndexAction.class.getClassLoader()
+                                .getResourceAsStream("org/bdware/server/stopwords.txt")),
+                        StandardCharsets.UTF_8)));
         Analyzer analyzer = new SmartChineseAnalyzer(stopWords);
         JsonObject object = new JsonObject();
 
         String words = "我喜欢区块链，我想试用一下这个，我是做大数据处理的，我是科技局的管理员"; // 从json拿
         TokenStream stream = null;
-        if (json.has("requestID")) object.add("responseID", json.get("requestID"));
+        if (json.has("requestID"))
+            object.add("responseID", json.get("requestID"));
         try {
             stream = analyzer.tokenStream("myfield", words);
             CharTermAttribute charTermAtt = stream.addAttribute(CharTermAttribute.class);
@@ -515,7 +529,8 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
     public void getMetabyCID(JsonObject json, ResultCallback rc) {
         String result = getMetabyCID(json);
         JsonObject object = new JsonObject();
-        if (json.has("requestID")) object.add("responseID", json.get("requestID"));
+        if (json.has("requestID"))
+            object.add("responseID", json.get("requestID"));
         object.add("result", JsonParser.parseString(result));
         object.addProperty("action", "getMetabyCID");
         rc.onResult(object);
@@ -525,7 +540,8 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
     public void getMetabyOwner(JsonObject json, ResultCallback rc) {
         String result = getMetabyOwner(json);
         JsonObject object = new JsonObject();
-        if (json.has("requestID")) object.add("responseID", json.get("requestID"));
+        if (json.has("requestID"))
+            object.add("responseID", json.get("requestID"));
         object.add("result", JsonParser.parseString(result));
         object.addProperty("action", "getMetabyOwner");
         rc.onResult(object);
@@ -535,7 +551,8 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
     public void getMetabyPubkey(JsonObject json, ResultCallback rc) {
         String result = getMetabyPubkey(json);
         JsonObject object = new JsonObject();
-        if (json.has("requestID")) object.add("responseID", json.get("requestID"));
+        if (json.has("requestID"))
+            object.add("responseID", json.get("requestID"));
         object.add("result", JsonParser.parseString(result));
         object.addProperty("action", "getMetabyPubkey");
         rc.onResult(object);

src/main/java/org/bdware/server/nodecenter/MultiPointContractInfo.java

@@ -6,13 +6,13 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class MultiPointContractInfo {
-    public List<String> members;   //pubKey
+    public List<String> members; // pubKey
     public ContractExecType type;
     AtomicInteger ai = new AtomicInteger();
 
     public transient ContractExecutor rcf;
 
-    public String getNextSeq(){
+    public String getNextSeq() {
         System.out.println("MultiPointContractInfo获得下一个序号" + (ai.get() + 1));
         return ai.getAndIncrement() + "";
     }

src/main/java/org/bdware/server/nodecenter/NCClientActions.java

@@ -35,8 +35,9 @@ public class NCClientActions {
         map.put("id", OtherNCProxy.instance.sm2.getPublicKeyStr());
         byte[] signature = "no signature".getBytes();
         try {
-            signature = SM2Util.sign(OtherNCProxy.instance.sm2.getPrivateKeyParameter(), (OtherNCProxy.instance.sm2.getPublicKeyStr() + json.get("session").getAsString())
+            signature = SM2Util.sign(OtherNCProxy.instance.sm2.getPrivateKeyParameter(),
-                    .getBytes());
+                    (OtherNCProxy.instance.sm2.getPublicKeyStr()
+                            + json.get("session").getAsString()).getBytes());
         } catch (CryptoException e) {
             e.printStackTrace();
         }
@@ -62,8 +63,8 @@ public class NCClientActions {
         if (json.has("empty")) {
             LOGGER.info("receive from NC ,do not have any cp.");
         } else {
-            info = JsonUtil.fromJson(json.get("contracts").getAsString(), new TypeToken<List<OtherNCInfo>>() {
+            info = JsonUtil.fromJson(json.get("contracts").getAsString(),
-            }.getType());
+                    new TypeToken<List<OtherNCInfo>>() {}.getType());
         }
 
         LOGGER.info(JsonUtil.toJson(info));

src/main/java/org/bdware/server/nodecenter/NCClientHandler.java

@@ -23,7 +23,7 @@ import java.util.concurrent.Executors;
 public class NCClientHandler extends SimpleChannelInboundHandler<Object> {
     private static final Logger LOGGER = LogManager.getLogger(NCClientHandler.class);
     static ExecutorService executorService = Executors.newFixedThreadPool(5);
-    public boolean hasPermission;  //是否在目标NC上有权限
+    public boolean hasPermission; // 是否在目标NC上有权限
     public NCClientActions actions;
     Channel channel;
     ActionExecutor<ResultCallback, JsonObject> ae;
@@ -67,16 +67,11 @@ public class NCClientHandler extends SimpleChannelInboundHandler<Object> {
     protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
         ByteBuf bb = (ByteBuf) msg;
         try {
-            final JsonObject arg =
+            final JsonObject arg = new JsonParser()
-                    new JsonParser()
+                    .parse(new InputStreamReader(new ByteBufInputStream(bb))).getAsJsonObject();
-                            .parse(new InputStreamReader(new ByteBufInputStream(bb)))
-                            .getAsJsonObject();
             if (arg.has("action")) {
                 final String action = arg.get("action").getAsString();
-                ae.handle(
+                ae.handle(action, arg, new ResultCallback() {
-                        action,
-                        arg,
-                        new ResultCallback() {
                     @Override
                     public void onResult(String str) {
                         sendMsg(str);
@@ -100,7 +95,8 @@ public class NCClientHandler extends SimpleChannelInboundHandler<Object> {
     public void close() {
         try {
             isConnected = false;
-            if (channel != null) channel.close();
+            if (channel != null)
+                channel.close();
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

src/main/java/org/bdware/server/nodecenter/NCElectMasterUtil.java

@@ -15,7 +15,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class NCElectMasterUtil {
-    public static final Map<String, ElectInfo> electInfos = new ConcurrentHashMap<>();   //key is contractID
+    public static final Map<String, ElectInfo> electInfos = new ConcurrentHashMap<>(); // key is
+                                                                                       // contractID
     private static final Logger LOGGER = LogManager.getLogger(NCElectMasterUtil.class);
 
     public static class ElectInfo {
@@ -24,10 +25,10 @@ public class NCElectMasterUtil {
         String formerMaster;
         String uniNumber;
         long lastTime = System.currentTimeMillis();
-        int onlineNum;  //除旧的master之外的在线节点数
+        int onlineNum; // 除旧的master之外的在线节点数
         String contractID;
-        String mems;  //执行这个合约的所有节点的pubKey
+        String mems; // 执行这个合约的所有节点的pubKey
-        private Map<String, Integer> nodeID2LastExe = new ConcurrentHashMap<>();  //key is nodeID
+        private Map<String, Integer> nodeID2LastExe = new ConcurrentHashMap<>(); // key is nodeID
         private Timer timer;
 
 
@@ -38,11 +39,10 @@ public class NCElectMasterUtil {
             uniNumber = uni;
             String[] mem = members.split(",");
 
-/*            try {
+            /*
-                Thread.sleep(2000);   //让NC发现崩溃节点
+             * try { Thread.sleep(2000); //让NC发现崩溃节点 } catch (InterruptedException e) {
-            } catch (InterruptedException e) {
+             * e.printStackTrace(); }
-                e.printStackTrace();
+             */
-            }*/
 
             for (String memID : mem) {
                 if (memID == null || memID.length() == 0)
@@ -52,8 +52,7 @@ public class NCElectMasterUtil {
                     onlineNum++;
                 }
             }
-            NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(
+            NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(() -> {
-                    () -> {
                 // cancel the election if no nodes find the master's crash in delay + 2 seconds
                 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd.HH:mm:ss.SSS");
                 if (System.currentTimeMillis() - lastTime > (delay + 15000)) {
@@ -61,17 +60,14 @@ public class NCElectMasterUtil {
                     cancel();
                 }
                 // start timeout election
-//                        if (electInfos.containsKey(contractID) && nodeID2LastExe.size() == onlineNum) {
+                // if (electInfos.containsKey(contractID) && nodeID2LastExe.size() == onlineNum) {
-//                            elect();
+                // elect();
-//                        }
+                // }
-                    },
+            }, delay + 1500, delay + 1500, TimeUnit.MILLISECONDS);
-                    delay + 1500,
+            // timer.schedule(task, dealy + 2000);
-                    delay + 1500,
-                    TimeUnit.MILLISECONDS);
-            //timer.schedule(task, dealy + 2000);
 
-            LOGGER.info("new election of contract " + contractID + " is added to electInfos, " +
+            LOGGER.info("new election of contract " + contractID + " is added to electInfos, "
-                    onlineNum + " node is online");
+                    + onlineNum + " node is online");
         }
 
         public void cancel() {
@@ -84,10 +80,11 @@ public class NCElectMasterUtil {
             }
         }
 
-        public synchronized void put(String nodeID, int lastExe, String master, String mem2, String uniNum) {
+        public synchronized void put(String nodeID, int lastExe, String master, String mem2,
+                String uniNum) {
             LOGGER.info("put  nodeID=" + nodeID);
 
-            //确保该合约某时只能有一个选举,其他的选举请求被忽略
+            // 确保该合约某时只能有一个选举,其他的选举请求被忽略
             if (!master.equals(formerMaster)) {
                 LOGGER.debug("[NCElectMasterUtil] master error!");
                 return;
@@ -105,13 +102,14 @@ public class NCElectMasterUtil {
             }
 
             long now = System.currentTimeMillis();
-            //认为是一个新的选举，之前的作废
+            // 认为是一个新的选举，之前的作废
             if (now - lastTime > delay) {
                 LOGGER.info("[NCElectMasterUtil] time error!");
                 cancel();
                 synchronized (electInfos) {
-                    //electInfos.remove(contractID);
+                    // electInfos.remove(contractID);
-                    NCElectMasterUtil.electInfos.put(contractID, new ElectInfo(master, contractID, mem2, uniNum));
+                    NCElectMasterUtil.electInfos.put(contractID,
+                            new ElectInfo(master, contractID, mem2, uniNum));
                     ElectInfo eleInfo = electInfos.get(contractID);
                     eleInfo.put(nodeID, lastExe, master, mem2, uniNum);
                 }
@@ -137,15 +135,17 @@ public class NCElectMasterUtil {
                 startElect.set(true);
             }
 
-            //更新路由信息，这个合约的master暂时为null
+            // 更新路由信息，这个合约的master暂时为null
             if (NodeCenterActions.nodeInfos.containsKey(formerMaster)) {
                 CMNode node = NodeCenterActions.nodeInfos.get(formerMaster);
                 if (node != null) {
                     synchronized (node) {
                         for (ContractDesp cd : node.contracts) {
-                            if (cd.contractID.equals(contractID) || cd.contractName.equals(contractID)) {
+                            if (cd.contractID.equals(contractID)
+                                    || cd.contractName.equals(contractID)) {
                                 cd.setIsMaster(false);
-                                LOGGER.debug("设置节点 " + node.pubKey.substring(0, 5) + " 的合约 " + contractID + " isMaster=" + false);
+                                LOGGER.debug("设置节点 " + node.pubKey.substring(0, 5) + " 的合约 "
+                                        + contractID + " isMaster=" + false);
                                 break;
                             }
                         }
@@ -164,16 +164,16 @@ public class NCElectMasterUtil {
             LOGGER.info("[NCElectMasterUtil] 选举出新的master " + newMaster);
 
             cancel();
-            //electInfos.remove(contractID);
+            // electInfos.remove(contractID);
 
-            //通知新的master让它发起重连操作，并在所有节点重连成功之后开启master的恢复
+            // 通知新的master让它发起重连操作，并在所有节点重连成功之后开启master的恢复
             try {
                 Thread.sleep(1500);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
             LOGGER.info("开始计算需要连接新master的都有哪些节点:");
-            StringBuilder onlineMems = new StringBuilder();  //不包含旧的master
+            StringBuilder onlineMems = new StringBuilder(); // 不包含旧的master
             for (String memID : nodeID2LastExe.keySet()) {
                 if (memID == null || memID.length() == 0)
                     continue;

src/main/java/org/bdware/server/nodecenter/NCHttpHandler.java

@@ -1,10 +1,8 @@
 package org.bdware.server.nodecenter;
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
@@ -22,13 +20,15 @@ import org.bdware.server.NodeCenterServer;
 import org.bdware.server.action.Action;
 import org.bdware.server.action.ActionExecutor;
 import org.bdware.server.action.HttpResultCallback;
-import org.bdware.server.http.HttpFileHandleAdapter;
+import org.bdware.server.http.HttpMethod;
-import org.bdware.server.http.URIHandler;
+import org.bdware.server.http.*;
-import org.bdware.server.http.URIPath;
 import org.bdware.server.permission.Role;
 import org.zz.gmhelper.SM2Util;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.PrintStream;
 import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.List;
@@ -43,9 +43,12 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
     private static final String UNSUPPORTED_HTTP_METHOD = "{\"msg\":\"unsupported http method\"}";
     private static final String UNSUPPORTED_ACTION = "{\"msg\":\"unsupported action\"}";
     private static final Logger LOGGER = LogManager.getLogger(NCHttpHandler.class);
+    static NCManagerAction managerAction = new NCManagerAction(null);
+    static LogActions logActions = new LogActions(managerAction);
+    static UnitActions unitActions = new UnitActions(managerAction);
     private static final ActionExecutor<ResultCallback, JsonObject> actionExecutor =
-            new ActionExecutor<ResultCallback, JsonObject>(
+            new ActionExecutor<ResultCallback, JsonObject>(NodeCenterFrameHandler.executorService,
-                    NodeCenterFrameHandler.executorService, new NodeCenterActions(null)) {
+                    new NodeCenterActions(null), managerAction, logActions, unitActions) {
 
                 @Override
                 public boolean checkPermission(Action a, JsonObject arg, long per) {
@@ -73,15 +76,9 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
                     if (arg.has("pubKey")) {
                         pubkey = arg.get("pubKey").getAsString();
                     }
-                    NodeCenterServer.nodeHttpLogDB.put(
+                    NodeCenterServer.nodeHttpLogDB.put(action,
-                            action,
+                            "{\"action\":\"" + action + "\",\"pubKey\":\"" + pubkey + "\",\"date\":"
-                            "{\"action\":\""
+                                    + System.currentTimeMillis() + "}");
-                                    + action
-                                    + "\",\"pubKey\":\""
-                                    + pubkey
-                                    + "\",\"date\":"
-                                    + System.currentTimeMillis()
-                                    + "}");
                     LOGGER.debug("[NCHttpHandler] flag = " + flag + "  flag2 = " + flag2);
                     return flag && flag2;
                 }
@@ -118,42 +115,57 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
         ctx.flush();
     }
 
-    @URIPath({"/NodeCenter", "/SCIDE/SCExecutor", "/SCIDE/CMManager", "/SCIDE/SCManager"})
+    public static class VerifiyCallback implements ArgParser.VerifiedCallback {
-    public void parseGetAndHandle(ChannelHandlerContext ctx, FullHttpRequest req) {
+
-        QueryStringDecoder decoderQuery = new QueryStringDecoder(req.uri());
+        @Override
-        Map<String, List<String>> params = decoderQuery.parameters();
+        public void onResult(boolean verified, JsonObject transformedParam) {
-        JsonObject map = new JsonObject();
+            LOGGER.info("verify signature: " + verified);
-        for (String key : params.keySet()) {
+            if (verified) {
-            List<String> val = params.get(key);
+                // 查permission
-            if (val != null) map.addProperty(key, val.get(0));
+                String ret = getRole(transformedParam.get("pubKey").getAsString());
+                long permission;
+                if (ret != null && ret.length() > 0) {
+                    permission = 0x86000d41L | Role.compoundValue(ret.split(","));
+                } else {
+                    permission = Role.compoundValue(ret.split(","));
+                }
+                transformedParam.addProperty("permission", permission + "");
+                LOGGER.debug("[CMHttpHandler] http 请求查看用户权限为 : " + permission);
+            } else {
+                transformedParam.remove("pubKey");
+                transformedParam.addProperty("permission", 0 + "");
             }
-        String uri = URLDecoder.decode(req.uri()).split("\\?")[1];
-        int index = uri.lastIndexOf('&');
-        String str = uri;
-        if (index != -1) {
-            str = uri.substring(0, index);
         }
-        injectPermission(map, str);
-        handleReq(map, ctx);
     }
 
-    @URIPath(
+    @URIPath(method = HttpMethod.OPTIONS)
-            method = org.bdware.server.http.HttpMethod.POST,
+    public void crossOrigin(ChannelHandlerContext ctx, FullHttpRequest request) {
+        DefaultFullHttpResponse fullResponse = new DefaultFullHttpResponse(
+                request.protocolVersion(), OK, Unpooled.wrappedBuffer("success".getBytes()));
+        fullResponse.headers().remove("Access-Control-Allow-Origin");
+        fullResponse.headers().remove("Access-Control-Allow-Headers");
+        fullResponse.headers().add("Access-Control-Allow-Origin", "*");
+        fullResponse.headers().add("Access-Control-Allow-Methods", "*");
+        fullResponse.headers().add("Access-Control-Allow-Headers",
+                "Content-Type, Cookie, Accept-Encoding, User-Agent, Host, Referer, "
+                        + "X-Requested-With, Accept, Accept-Language, Cache-Control, Connection");
+        ChannelFuture f = ctx.write(fullResponse);
+        f.addListener(ChannelFutureListener.CLOSE);
+        LOGGER.info("[Option] received!");
+    }
+
+    @URIPath({"/NodeCenter", "/SCIDE/SCExecutor", "/SCIDE/CMManager", "/SCIDE/SCManager"})
+    public void parseGetAndHandle(ChannelHandlerContext ctx, FullHttpRequest req) throws Exception {
+        JsonObject transformedParam = ArgParser.parseGetAndVerify(req, new VerifiyCallback());
+        handleReq(transformedParam, ctx);
+    }
+
+    @URIPath(method = org.bdware.server.http.HttpMethod.POST,
             value = {"/NodeCenter", "/SCIDE/SCExecutor", "/SCIDE/CMManager", "/SCIDE/SCManager"})
     public void parsePostAndHandle(ChannelHandlerContext ctx, FullHttpRequest req)
-            throws UnsupportedEncodingException {
+            throws Exception {
-        ByteBuf content = req.content();
+        JsonObject map = ArgParser.parsePostAndVerify(req, new VerifiyCallback());
-        JsonObject map =
+        // injectPermission(map, str);
-                JsonParser.parseReader(new InputStreamReader(new ByteBufInputStream(content)))
-                        .getAsJsonObject();
-        // FIXME 感觉不太对劲
-        String uri = URLDecoder.decode(req.uri(), "utf-8").split("\\?")[1];
-        int index = uri.lastIndexOf('&');
-        String str = uri;
-        if (index != -1) {
-            str = uri.substring(0, index);
-        }
-        injectPermission(map, str);
         handleReq(map, ctx);
     }
 
@@ -163,14 +175,13 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
         JsonObject transformedParam = new JsonObject();
         for (String key : parameters.keySet()) {
             List<String> val = parameters.get(key);
-            if (val != null) transformedParam.addProperty(key, val.get(0));
+            if (val != null)
+                transformedParam.addProperty(key, val.get(0));
         }
         return transformedParam;
     }
 
-    @URIPath(
+    @URIPath(method = org.bdware.server.http.HttpMethod.GET, value = {"/doip"})
-            method = org.bdware.server.http.HttpMethod.GET,
-            value = {"/doip"})
     public void handleDOIP(ChannelHandlerContext ctx, FullHttpRequest req) {
         ByteBuf content = req.content();
         JsonObject map = parseArgInQuery(req);
@@ -183,11 +194,10 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
         }
         injectPermission(map, str);
 
-        DefaultFullHttpResponse response =
+        DefaultFullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, OK,
-                new DefaultFullHttpResponse(
-                        HttpVersion.HTTP_1_1,
-                        OK,
                 Unpooled.wrappedBuffer(MetaIndexAction.search(map).getBytes()));
+        response.headers().add("Access-Control-Allow-Origin", "*");
+        response.headers().add("Access-Control-Allow-Methods", "*");
         ChannelFuture f = ctx.write(response);
         f.addListener(ChannelFutureListener.CLOSE);
 
@@ -196,19 +206,17 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
 
     @Override
     public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) {
-        //		logger.debug("[NCHttpHandler] TID:" + Thread.currentThread().getId() +
+        LOGGER.debug("[NCHttpHandler] TID:" + Thread.currentThread().getId() + msg.toString());
-        // msg.toString());
         if (msg instanceof FullHttpRequest) {
             FullHttpRequest request = (FullHttpRequest) msg;
             handler.handle(ctx, request);
         }
     }
 
-    public String getRole(String pubKey) {
+    public static String getRole(String pubKey) {
         try {
-            String ret =
+            String ret = KeyValueDBUtil.instance.getValue(NCTables.ConfigDB.toString(),
-                    KeyValueDBUtil.instance.getValue(
+                    "__CenterManager__");
-                            NCTables.ConfigDB.toString(), "__CenterManager__");
             if (ret != null && ret.length() > 0) {
                 boolean isCenterManager = (ret.equals(pubKey)); // 表示此节点是否是平台管理员
                 ret = KeyValueDBUtil.instance.getValue(NCTables.NodeUser.toString(), pubKey);
@@ -238,7 +246,6 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
             String pubkey = map.get("pubKey").getAsString();
             boolean verify = SM2Util.plainStrVerify(pubkey, str, map.get("sign").getAsString());
             LOGGER.debug("[CMHttpHandler] HTTP POST 请求验签为 " + verify);
-
             if (verify) {
                 // 查permission
                 String ret = getRole(pubkey);
@@ -280,30 +287,33 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
                     cb = new HttpResultCallback(ctx, map.get("callback").getAsString());
                     cb.addHeader("charset", "utf-8");
                     cb.addHeader("Content-type", "text/plain");
-
+                    cb.addHeader("Access-Control-Allow-Origin", "*");
+                    cb.addHeader("Access-Control-Allow-Methods", "*");
                 } else {
 
                     if (map.has("callback"))
                         cb = new HttpResultCallback(ctx, map.get("callback").getAsString());
-                    else cb = new HttpResultCallback(ctx, null);
+                    else
-
+                        cb = new HttpResultCallback(ctx, null);
+                    cb.addHeader("Access-Control-Allow-Origin", "*");
+                    cb.addHeader("Access-Control-Allow-Methods", "*");
                     cb.addHeader("charset", "utf-8");
                     cb.addHeader("Content-type", "application/json");
                 }
                 actionExecutor.handle(action, map, cb);
             } else {
-                DefaultFullHttpResponse response =
+                DefaultFullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
-                        new DefaultFullHttpResponse(
+                        OK, Unpooled.wrappedBuffer(ret.getBytes()));
-                                HttpVersion.HTTP_1_1, OK, Unpooled.wrappedBuffer(ret.getBytes()));
+                response.headers().add("Access-Control-Allow-Origin", "*");
+                response.headers().add("Access-Control-Allow-Methods", "*");
                 ChannelFuture f = ctx.write(response);
                 f.addListener(ChannelFutureListener.CLOSE);
             }
         } catch (IllegalArgumentException e) {
-            DefaultFullHttpResponse response =
+            DefaultFullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, OK,
-                    new DefaultFullHttpResponse(
-                            HttpVersion.HTTP_1_1,
-                            OK,
                     Unpooled.wrappedBuffer(e.getMessage().getBytes()));
+            response.headers().add("Access-Control-Allow-Origin", "*");
+            response.headers().add("Access-Control-Allow-Methods", "*");
             ChannelFuture f = ctx.write(response);
             f.addListener(ChannelFutureListener.CLOSE);
 
@@ -312,11 +322,10 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
             ByteArrayOutputStream bo = new ByteArrayOutputStream();
             e.printStackTrace(new PrintStream(bo));
             ret.put("msg", bo.toString());
-            DefaultFullHttpResponse response =
+            DefaultFullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, OK,
-                    new DefaultFullHttpResponse(
-                            HttpVersion.HTTP_1_1,
-                            OK,
                     Unpooled.wrappedBuffer(JsonUtil.toJson(ret).getBytes()));
+            response.headers().add("Access-Control-Allow-Origin", "*");
+            response.headers().add("Access-Control-Allow-Methods", "*");
             ChannelFuture f = ctx.write(response);
             f.addListener(ChannelFutureListener.CLOSE);
         }

src/main/java/org/bdware/server/nodecenter/NCManagerAction.java

@@ -27,27 +27,34 @@ public class NCManagerAction {
     public static final String centerManger = "__CenterManager__";
     public static final String clusterName = "__ClusterName__";
     static final String Licence = "__LICENCE___";
-    static final ECPublicKeyParameters licencePub =
+    static final ECPublicKeyParameters licencePub = BCECUtil.createECPublicKeyFromStrParameters(
-            BCECUtil.createECPublicKeyFromStrParameters(
             "04844412ecb77b07d5ad7097c488ae9dff1013b310d2311f8bd84c491642011e1a6a7041bae8c2ad75da29c27e320bd430abc723cf6bcb0490afc82cc26e6d5637",
-                    SM2Util.CURVE,
+            SM2Util.CURVE, SM2Util.DOMAIN_PARAMS);
-                    SM2Util.DOMAIN_PARAMS);
     private static final Logger LOGGER = LogManager.getLogger(NCManagerAction.class);
     String sessionID = null;
-    String pubKey;
+    private String publicKey;
     Random random = new Random();
     private NodeCenterWSFrameHandler handler;
 
     public NCManagerAction(NodeCenterWSFrameHandler nodeCenterWSFrameHandler) {
         this.handler = nodeCenterWSFrameHandler;
-        pubKey = null;
+        publicKey = null;
+    }
+
+    public String getPubKey(JsonObject jo) {
+        try {
+            if (publicKey != null)
+                return publicKey;
+            return jo.get("pubKey").getAsString();
+        } catch (Exception e) {
+        }
+        return null;
     }
 
     public static boolean isCenterManager(String pubkey) {
         String ret = KeyValueDBUtil.instance.getValue(NCTables.ConfigDB.toString(), centerManger);
         LOGGER.debug("centerManger: " + ret);
-        return !StringUtil.isNullOrEmpty(ret)
+        return !StringUtil.isNullOrEmpty(ret) && !StringUtil.isNullOrEmpty(pubkey)
-                && !StringUtil.isNullOrEmpty(pubkey)
                 && pubkey.equals(ret);
     }
 
@@ -95,8 +102,8 @@ public class NCManagerAction {
     @Action(userPermission = 0)
     public void setClusterName(JsonObject json, ResultCallback resultCallback) {
         if (json.has("name")) {
-            KeyValueDBUtil.instance.setValue(
+            KeyValueDBUtil.instance.setValue(NCTables.ConfigDB.toString(), clusterName,
-                    NCTables.ConfigDB.toString(), clusterName, json.get("name").getAsString());
+                    json.get("name").getAsString());
             simpleReply(resultCallback, "onSetClusterName", "success");
         } else {
             simpleReply(resultCallback, "onSetClusterName", "failed");
@@ -104,6 +111,7 @@ public class NCManagerAction {
     }
 
     public void getRole(JsonObject json, ResultCallback resultCallback) {
+        String pubKey = getPubKey(json);
         if (pubKey == null) {
             simpleReply(resultCallback, "onLogin", Role.Anonymous.name());
             return;
@@ -126,13 +134,14 @@ public class NCManagerAction {
                 } else if (role.isEmpty()) {
                     role = Role.Anonymous.name();
                 }
+                if (handler != null)
                     handler.setPermission(Role.compoundValue(role.split(",")));
                 simpleReply(resultCallback, "onLogin", role);
             } else {
-                KeyValueDBUtil.instance.setValue(
+                KeyValueDBUtil.instance.setValue(NCTables.ConfigDB.toString(), centerManger,
-                        NCTables.ConfigDB.toString(), centerManger, pubKey);
+                        pubKey);
-                KeyValueDBUtil.instance.setValue(
+                KeyValueDBUtil.instance.setValue(NCTables.ConfigDB.toString(), clusterName,
-                        NCTables.ConfigDB.toString(), clusterName, "clusterName_" + pubKey.substring(0, 5));
+                        "clusterName_" + pubKey.substring(0, 5));
                 handler.setPermission(0x30000ffL);
                 simpleReply(resultCallback, "onLogin", "CenterManager");
             }
@@ -156,7 +165,7 @@ public class NCManagerAction {
         boolean result = SM2Util.plainStrVerify(pubKey, sessionID, signature);
         LOGGER.debug("session:" + (sessionID));
         if (result) {
-            this.pubKey = pubKey;
+            this.publicKey = pubKey;
             LOGGER.debug("设置公钥" + pubKey);
             getRole(json, resultCallback);
         } else {
@@ -166,8 +175,40 @@ public class NCManagerAction {
         LOGGER.debug("time:" + (end - start));
     }
 
+    @Action(userPermission = 0)
+    public void resetCenterManager(JsonObject json, ResultCallback resultCallback) {
+        getNodeRole(json, new ResultCallback() {
+            @Override
+            public void onResult(String str) {
+                if (str.contains(Role.CenterManager.toString())) {
+                    if (json.has("newPubKey")) {
+                        String newPubKey = json.get("newPubKey").getAsString();
+                        KeyValueDBUtil.instance.setValue(NCTables.ConfigDB.toString(), centerManger,
+                                newPubKey);
+                        KeyValueDBUtil.instance.setValue(NCTables.NodeUser.toString(), newPubKey,
+                                Role.CenterManager.toString());
+                        resultCallback.onResult(
+                                "{\"action\":\"onResetCenterManager\",\"data\":\"success\",\"pubKey\":\""
+                                        + newPubKey + "\"}");
+                    } else {
+                        // just keep the same
+                        resultCallback.onResult(
+                                "{\"action\":\"onResetCenterManager\",\"data\":\"success\",\"pubKey\":\""
+                                        + getPubKey(json) + "\"}");
+                    }
+                } else {
+                    resultCallback.onResult(
+                            "{\"action\":\"onResetCenterManager\",\"data\":\"failed, no permission\"}");
+                }
+
+            }
+        });
+    }
+
     @Action(userPermission = 0)
     public void applyRole(JsonObject json, ResultCallback resultCallback) {
+        String pubKey = getPubKey(json);
+
         long start = System.currentTimeMillis();
         if (pubKey == null) {
             simpleReply(resultCallback, "onApplyRole", "missing pubKey");
@@ -176,7 +217,7 @@ public class NCManagerAction {
         if (json.has("role")) {
             Role role = Role.parse(json.get("role").getAsString());
             if (role != Role.Anonymous) {
-                applyAtDB(role, resultCallback, start);
+                applyAtDB(role, getPubKey(json), resultCallback, start);
                 return;
             }
         }
@@ -186,14 +227,10 @@ public class NCManagerAction {
     @Action(userPermission = 1 << 6)
     public void addNode(JsonObject json, ResultCallback resultCallback) {
         try {
-            KeyValueDBUtil.instance.setValue(
+            KeyValueDBUtil.instance.setValue(NCTables.NodeUser.toString(),
-                    NCTables.NodeUser.toString(),
+                    json.get("nodePubKey").getAsString(), Role.Node.toString());
-                    json.get("nodePubKey").getAsString(),
+            KeyValueDBUtil.instance.setValue(NCTables.NodeTime.toString(),
-                    Role.Node.toString());
+                    json.get("nodePubKey").getAsString(), Long.toString(new Date().getTime()));
-            KeyValueDBUtil.instance.setValue(
-                    NCTables.NodeTime.toString(),
-                    json.get("nodePubKey").getAsString(),
-                    Long.toString(new Date().getTime()));
             simpleReply(resultCallback, "onAddNodes", "success");
         } catch (Exception e) {
             e.printStackTrace();
@@ -201,7 +238,9 @@ public class NCManagerAction {
         }
     }
 
-    private void applyAtDB(Role role, ResultCallback resultCallback, long start) {
+    private void applyAtDB(Role role, String pubKey, ResultCallback resultCallback, long start) {
+
+
         String str = KeyValueDBUtil.instance.getValue(NCTables.ApplyRole.toString(), pubKey);
         String already = KeyValueDBUtil.instance.getValue(NCTables.NodeUser.toString(), pubKey);
         if (already != null && already.contains(role.toString())) {
@@ -210,14 +249,14 @@ public class NCManagerAction {
         }
         if (str == null || str.length() == 0) {
             KeyValueDBUtil.instance.setValue(NCTables.ApplyRole.toString(), pubKey, role.name());
-            KeyValueDBUtil.instance.setValue(
+            KeyValueDBUtil.instance.setValue(NCTables.ApplyTime.toString(), pubKey,
-                    NCTables.ApplyTime.toString(), pubKey, Long.toString(new Date().getTime()));
+                    Long.toString(new Date().getTime()));
         } else {
             if (!str.contains(role.name())) {
-                KeyValueDBUtil.instance.setValue(
+                KeyValueDBUtil.instance.setValue(NCTables.ApplyRole.toString(), pubKey,
-                        NCTables.ApplyRole.toString(), pubKey, str + "," + role.name());
+                        str + "," + role.name());
-                KeyValueDBUtil.instance.setValue(
+                KeyValueDBUtil.instance.setValue(NCTables.ApplyTime.toString(), pubKey,
-                        NCTables.ApplyTime.toString(), pubKey, Long.toString(new Date().getTime()));
+                        Long.toString(new Date().getTime()));
             }
         }
         simpleReply(resultCallback, "onApplyRole", "success!");
@@ -241,6 +280,9 @@ public class NCManagerAction {
         long start = System.currentTimeMillis();
         String pubKey = json.get("pubKey").getAsString();
         boolean isAccept = json.get("isAccept").getAsBoolean();
+        if (json.has("authorizedPubKey")) {
+            pubKey = json.get("authorizedPubKey").getAsString();
+        }
         LOGGER.debug("[NCManagerAction] " + json.toString());
         if (pubKey == null || pubKey.length() == 0) {
             simpleReply(resultCallback, "onAuthNodeManager", "missing pubKey");
@@ -266,8 +308,8 @@ public class NCManagerAction {
             already = roles;
         }
         KeyValueDBUtil.instance.setValue(NCTables.NodeUser.toString(), pubKey, already);
-        KeyValueDBUtil.instance.setValue(
+        KeyValueDBUtil.instance.setValue(NCTables.NodeTime.toString(), pubKey,
-                NCTables.NodeTime.toString(), pubKey, Long.toString(new Date().getTime()));
+                Long.toString(new Date().getTime()));
         KeyValueDBUtil.instance.delete(NCTables.ApplyRole.toString(), pubKey);
         KeyValueDBUtil.instance.delete(NCTables.ApplyTime.toString(), pubKey);
         simpleReply(resultCallback, "onAuthNodeManager", "success");
@@ -401,13 +443,14 @@ public class NCManagerAction {
                 SM2Util.verify(licencePub, content.getBytes(), ByteUtils.fromHexString(sign));
 
         if (verify) {
-            KeyValueDBUtil.instance.setValue(
+            KeyValueDBUtil.instance.setValue(NCTables.ConfigDB.toString(), Licence,
-                    NCTables.ConfigDB.toString(), Licence, json.toString());
+                    json.toString());
             simpleReply(resultCallback, "onUpdateLicence", "success");
             long end = System.currentTimeMillis();
             LOGGER.debug("[listLicence:time]" + (end - start));
             return;
-        } else simpleReply(resultCallback, "onUpdateLicence", "failed");
+        } else
+            simpleReply(resultCallback, "onUpdateLicence", "failed");
         long end = System.currentTimeMillis();
         LOGGER.debug("[updateLicence:time]" + (end - start));
     }
@@ -491,14 +534,8 @@ public class NCManagerAction {
 
         Map<String, String> result = new HashMap<>();
         result.put("action", "onTransfer");
-        result.put(
+        result.put("data", "now start transfer contract " + contractID + " from node:" + node1ID
-                "data",
+                + " to node:" + node2ID);
-                "now start transfer contract "
-                        + contractID
-                        + " from node:"
-                        + node1ID
-                        + " to node:"
-                        + node2ID);
         resultCallback.onResult(result);
     }
 }

src/main/java/org/bdware/server/nodecenter/NCTables.java

@@ -1,19 +1,7 @@
 package org.bdware.server.nodecenter;
 
 public enum NCTables {
-    NodeUser,
+    NodeUser, NodeTime, ApplyRole, ApplyTime, NodeHttpLog, ContractMeta, ConfigDB, NodeTcpLog, NodesDB, TrustUnitsDB, OtherNCs, NCFile, ApplyNodeManager;
-    NodeTime,
-    ApplyRole,
-    ApplyTime,
-    NodeHttpLog,
-    ContractMeta,
-    ConfigDB,
-    NodeTcpLog,
-    NodesDB,
-    TrustUnitsDB,
-    OtherNCs,
-    NCFile,
-    ApplyNodeManager;
 
     public String toString() {
         return "NC_" + super.toString();

src/main/java/org/bdware/server/nodecenter/NCUDPRunner.java

@@ -82,11 +82,8 @@ public class NCUDPRunner extends Thread {
     private void onUDPMessage(UDPMessage msg, DatagramPacket request) {
         switch (msg.type) {
             case shakeHand:
-                LOGGER.debug(
+                LOGGER.debug("[NCUDPRunner] shakeHand:" + request.getAddress().getHostAddress()
-                        "[NCUDPRunner] shakeHand:"
+                        + ":" + request.getPort());
-                                + request.getAddress().getHostAddress()
-                                + ":"
-                                + request.getPort());
                 id2IP.put(msg.id, new UDPNode(request.getSocketAddress()));
             default:
         }

src/main/java/org/bdware/server/nodecenter/NameAndID.java

@@ -1,5 +1,5 @@
 package org.bdware.server.nodecenter;
 
 public class NameAndID {
-    String name,id;
+    String name, id;
 }

src/main/java/org/bdware/server/nodecenter/NodeCenterFrameHandler.java

@@ -34,12 +34,10 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
         this.actions = new NodeCenterActions(this);
         MetaIndexAction.controller = this;
         // TODO 添加那个UnitAction.
-        ae =
+        ae = new ActionExecutor<ResultCallback, JsonObject>(executorService, actions,
-                new ActionExecutor<ResultCallback, JsonObject>(
+                new MetaIndexAction()) {
-                        executorService, actions, new MetaIndexAction()) {
             @Override
-                    public boolean checkPermission(
+            public boolean checkPermission(Action a, final JsonObject args, long permission) {
-                            Action a, final JsonObject args, long permission) {
                 long val = a.userPermission();
                 boolean flag;
                 String status = "refuse";
@@ -54,17 +52,10 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
                     flag = false;
                 }
                 if (!action.contains("checkAlive"))
-                            NodeCenterServer.nodeTcpLogDB.put(
+                    NodeCenterServer.nodeTcpLogDB.put(action,
-                                    action,
+                            "{\"action\":\"" + action + "\",\"pubKey\":\"" + pubKey
-                                    "{\"action\":\""
+                                    + "\",\"status\":\"" + status + "\",\"date\":"
-                                            + action
+                                    + System.currentTimeMillis() + "}");
-                                            + "\",\"pubKey\":\""
-                                            + pubKey
-                                            + "\",\"status\":\""
-                                            + status
-                                            + "\",\"date\":"
-                                            + System.currentTimeMillis()
-                                            + "}");
                 return flag;
             }
         };
@@ -80,9 +71,8 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
         this.ctx = ctx;
         JsonObject map;
         try {
-            map =
+            map = JsonParser
-                    JsonParser.parseReader(
+                    .parseReader(new InputStreamReader(new ByteBufInputStream((ByteBuf) frame)))
-                                    new InputStreamReader(new ByteBufInputStream((ByteBuf) frame)))
                     .getAsJsonObject();
 
         } catch (Exception e) {
@@ -93,10 +83,7 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
         try {
             final String action = map.get("action").getAsString();
             // System.out.println("[NodeCenterFramHandler] handle:" + action);
-            ae.handle(
+            ae.handle(action, map, new ResultCallback() {
-                    action,
-                    map,
-                    new ResultCallback() {
                 @Override
                 public void onResult(String ret) {
                     sendMsg(ret);
@@ -117,12 +104,9 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
             StringBuilder ret = new StringBuilder();
             int count = 0;
             for (String s : strs) {
-                if (s.contains("sun.reflect")
+                if (s.contains("sun.reflect") || s.contains("java.lang.reflect")
-                        || s.contains("java.lang.reflect")
+                        || s.contains("org.apache") || s.contains("java.util")
-                        || s.contains("org.apache")
+                        || s.contains("java.lang") || s.contains("io.netty")) {
-                        || s.contains("java.util")
-                        || s.contains("java.lang")
-                        || s.contains("io.netty")) {
                     continue;
                 }
                 ret.append(s);
@@ -136,7 +120,7 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
         }
     }
 
-    public void sendMsg(String json) {
+    public synchronized void sendMsg(String json) {
         if (ctx != null) {
             // System.out.println("[NodeCenterFrame send] TID:" + Thread.currentThread().getId() + "
             // isOpen:"

src/main/java/org/bdware/server/nodecenter/NodeCenterWSFrameHandler.java

@@ -39,33 +39,27 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
         logActions = new LogActions(managerAction);
         unitActions = new UnitActions(managerAction);
         fileActions = new FileActions(this);
-        ae =
+        ae = new ActionExecutor<ResultCallback, JsonObject>(executorService, managerAction,
-                new ActionExecutor<ResultCallback, JsonObject>(
+                logActions, unitActions, fileActions, new MetaIndexAction(), new TracingAction()) {
-                        executorService, managerAction, logActions, unitActions, fileActions, new MetaIndexAction(), new TracingAction()) {
             @Override
             public boolean checkPermission(Action a, JsonObject arg, long permission) {
                 // Permission userPermission = a.userPermission();
                 // long val=userPermission.getValue();
                 long val = a.userPermission();
-                        String pubKey = managerAction.pubKey;
+                String pubKey = managerAction.getPubKey(null);
                 String action = arg.get("action").getAsString();
                 LOGGER.debug("permission" + permission);
                 LOGGER.debug("userPermission" + val);
-                        NodeCenterServer.nodeHttpLogDB.put(
+                NodeCenterServer.nodeHttpLogDB.put(action,
-                                action,
+                        "{\"action\":\"" + action + "\",\"pubKey\":\"" + pubKey + "\",\"date\":"
-                                "{\"action\":\""
+                                + System.currentTimeMillis() + "}");
-                                        + action
-                                        + "\",\"pubKey\":\""
-                                        + pubKey
-                                        + "\",\"date\":"
-                                        + System.currentTimeMillis()
-                                        + "}");
 
                 // if (val == 0) return true;
                 // return true;
                 if ((permission & val) == val) {
                     return true;
-                        } else return false;
+                } else
+                    return false;
             }
         };
         for (String str : wsPluginActions) {
@@ -73,6 +67,7 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
             ae.appendHandler(obj);
         }
     }
+
     private Object createInstanceByClzName(String clzName) {
         try {
             Class<?> clz = Class.forName(clzName, true, pluginLoader);
@@ -81,12 +76,13 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
             return null;
         }
     }
+
     public ActionExecutor getAE() {
         return ae;
     }
 
     public String getPubKey() {
-        return managerAction.pubKey;
+        return managerAction.getPubKey(null);
     }
 
     @Override
@@ -112,13 +108,13 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
             response.action = "sendNextSegment";
             try {
                 boolean isSegment = false;
-                if (map.has("isSegment")) isSegment = map.get("isSegment").getAsBoolean();
+                if (map.has("isSegment"))
+                    isSegment = map.get("isSegment").getAsBoolean();
                 if (isSegment) {
                     dataCache.append(map.get("data").getAsString());
                     response = new Response();
                     response.action = "sendNextSegment";
-                    ctx.channel()
+                    ctx.channel().writeAndFlush(new TextWebSocketFrame(JsonUtil.toJson(response)));
-                            .writeAndFlush(new TextWebSocketFrame(JsonUtil.toJson(response)));
                     return;
                 } else {
                     if (dataCache.length() > 0) {
@@ -131,10 +127,7 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
                 }
                 String action = map.get("action").getAsString();
                 final JsonObject jmap = map;
-                ae.handle(
+                ae.handle(action, map, new ResultCallback() {
-                        action,
-                        map,
-                        new ResultCallback() {
                     @Override
                     public void onResult(Map jo) {
                         if (jmap.has("requestID")) {
@@ -173,15 +166,22 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
                 String ret = "";
                 int count = 0;
                 for (String s : strs) {
-                    if (s.contains("sun.reflect")) continue;
+                    if (s.contains("sun.reflect"))
-                    if (s.contains("java.lang.reflect")) continue;
+                        continue;
-                    if (s.contains("org.apache")) continue;
+                    if (s.contains("java.lang.reflect"))
-                    if (s.contains("java.util")) continue;
+                        continue;
-                    if (s.contains("java.lang")) continue;
+                    if (s.contains("org.apache"))
-                    if (s.contains("io.netty")) continue;
+                        continue;
+                    if (s.contains("java.util"))
+                        continue;
+                    if (s.contains("java.lang"))
+                        continue;
+                    if (s.contains("io.netty"))
+                        continue;
                     ret += s;
                     ret += "\n";
-                    if (count++ > 5) break;
+                    if (count++ > 5)
+                        break;
                 }
                 response.data = ret;
                 ctx.channel().writeAndFlush(new TextWebSocketFrame(JsonUtil.toJson(response)));

src/main/java/org/bdware/server/nodecenter/OtherNCProxy.java

@@ -31,13 +31,12 @@ import java.util.concurrent.TimeUnit;
 public class OtherNCProxy {
     private static final Logger LOGGER = LogManager.getLogger(OtherNCProxy.class);
     public static OtherNCProxy instance = new OtherNCProxy();
-    private final TreeMap<String, List<OtherNCInfo>> otherNodeCenterInfos = new TreeMap<>(); //key为NC节点的pubkey(非一致的)
+    private final TreeMap<String, List<OtherNCInfo>> otherNodeCenterInfos = new TreeMap<>(); // key为NC节点的pubkey(非一致的)
-    public Map<String, NCConnector> connList = new ConcurrentHashMap<>();  //连接别的NC key为ip:port
+    public Map<String, NCConnector> connList = new ConcurrentHashMap<>(); // 连接别的NC key为ip:port
-    public Set<String> ncAdds = ConcurrentHashMap.newKeySet();  //其他NC的ip:port
+    public Set<String> ncAdds = ConcurrentHashMap.newKeySet(); // 其他NC的ip:port
-    public SM2KeyPair sm2;  //NC证书
+    public SM2KeyPair sm2; // NC证书
 
-    private OtherNCProxy() {
+    private OtherNCProxy() {}
-    }
 
     // 从DB中加载OtherNC和NCFile的信息
     public void init() {
@@ -56,12 +55,8 @@ public class OtherNCProxy {
     }
 
     public void periodUpdate() {
-        NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(
+        NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(() -> {
-                () -> {
+        }, 0, 30, TimeUnit.SECONDS);
-                },
-                0,
-                30,
-                TimeUnit.SECONDS);
     }
 
     public void loadOtherNCs() {
@@ -134,7 +129,7 @@ public class OtherNCProxy {
         return KeyValueDBUtil.instance.getValue(NCTables.NCFile.toString(), "filePath");
     }
 
-    //配置其他NC
+    // 配置其他NC
     public String setOtherNCs(String add) {
         LOGGER.debug("setOtherNC: " + add);
 
@@ -143,7 +138,7 @@ public class OtherNCProxy {
         return getOtherNCs();
     }
 
-    //配置NC文件
+    // 配置NC文件
     public String setNCFile(String fileName) {
         LOGGER.debug("setNCFIle: " + fileName);
 
@@ -152,17 +147,18 @@ public class OtherNCProxy {
         return getNCFile();
     }
 
-    //本地更新
+    // 本地更新
     public void updateOtherNCInfo(String nodePubkey, List<OtherNCInfo> list) {
         LOGGER.debug("updateOtherNCInfo: ");
 
         synchronized (otherNodeCenterInfos) {
             otherNodeCenterInfos.put(nodePubkey, list);
-            LOGGER.debug("update route  nodePubkey=" + nodePubkey + "  list=" + JsonUtil.toJson(list));
+            LOGGER.debug(
+                    "update route  nodePubkey=" + nodePubkey + "  list=" + JsonUtil.toJson(list));
         }
     }
 
-    //通过合约id或name在别的nc上查询信息
+    // 通过合约id或name在别的nc上查询信息
     public String search(String id) {
         LOGGER.debug("search : " + id);
         synchronized (otherNodeCenterInfos) {
@@ -170,7 +166,8 @@ public class OtherNCProxy {
                 List<OtherNCInfo> list = otherNodeCenterInfos.get(pubKey);
                 for (OtherNCInfo info : list) {
                     if (info.contractID.equals(id) || info.contractName.equals(id)) {
-                        LOGGER.debug("[OtherNCProxy] find contract " + id + "pubKey is " + pubKey + " master is " + info.master + " from other NC route info");
+                        LOGGER.debug("[OtherNCProxy] find contract " + id + "pubKey is " + pubKey
+                                + " master is " + info.master + " from other NC route info");
                         return pubKey + ";" + info.master;
                     }
                 }
@@ -179,7 +176,7 @@ public class OtherNCProxy {
         }
     }
 
-    //向其他NC发起同步
+    // 向其他NC发起同步
     public void requestUpdate() {
         LOGGER.debug("sendUpdate: ");
         for (String add : instance.ncAdds) {
@@ -207,7 +204,8 @@ public class OtherNCProxy {
                 continue;
             for (ContractDesp desp : node.contracts) {
                 if (desp.type == ContractExecType.Sole || desp.getIsMaster()) {
-                    list.add(new OtherNCInfo(desp.contractID, desp.contractName, node.masterAddress));
+                    list.add(new OtherNCInfo(desp.contractID, desp.contractName,
+                            node.masterAddress));
                 }
             }
         }
@@ -227,9 +225,7 @@ public class OtherNCProxy {
         b.group(group);
         NCConnector conn = new NCConnector(target, b, new NCClientHandler());
         connList.put(target, conn);
-        b.channel(NioSocketChannel.class)
+        b.channel(NioSocketChannel.class).handler(new ChannelInitializer<SocketChannel>() {
-                .handler(
-                        new ChannelInitializer<SocketChannel>() {
             @Override
             protected void initChannel(SocketChannel ch) {
                 ChannelPipeline p = ch.pipeline();
@@ -240,9 +236,7 @@ public class OtherNCProxy {
 
         if (!conn.handler.isOpen()) {
             String[] ipAndPort = target.split(":");
-            b.connect(ipAndPort[0], Integer.parseInt(ipAndPort[1]))
+            b.connect(ipAndPort[0], Integer.parseInt(ipAndPort[1])).sync().channel();
-                    .sync()
-                    .channel();
         }
 
         reconnect(target);
@@ -257,10 +251,7 @@ public class OtherNCProxy {
         NCConnector conn = connList.get(target);
         if (!conn.handler.isOpen()) {
             String[] ipAndPort = conn.ipAndPort.split(":");
-            conn.bootstrap
+            conn.bootstrap.connect(ipAndPort[0], Integer.parseInt(ipAndPort[1])).sync().channel();
-                    .connect(ipAndPort[0], Integer.parseInt(ipAndPort[1]))
-                    .sync()
-                    .channel();
         }
     }
 

src/main/java/org/bdware/server/nodecenter/TracingAction.java

@@ -11,7 +11,7 @@ import java.io.PrintStream;
 
 public class TracingAction {
     private static JsonObject getDependentContract(JsonObject jo) {
-        //考虑多层依赖
+        // 考虑多层依赖
         JsonObject result = new JsonObject();
         JsonArray beDependent = new JsonArray();
         String contractName = jo.get("contractName").getAsString();
@@ -29,7 +29,8 @@ public class TracingAction {
                                 dependencies.add(val);
                         }
                     } else {
-                        if (desp.dependentContracts != null && desp.dependentContracts.contains(contractName)) {
+                        if (desp.dependentContracts != null
+                                && desp.dependentContracts.contains(contractName)) {
                             beDependent.add(desp.contractName);
                         }
                     }

src/main/java/org/bdware/server/nodecenter/UnitActions.java

@@ -25,7 +25,8 @@ public class UnitActions {
 
     private static String convertContractName(String contractID) {
         ContractDesp desp = NodeCenterActions.getContractByName(contractID);
-        if (desp != null) return desp.contractID;
+        if (desp != null)
+            return desp.contractID;
         return contractID;
     }
 
@@ -45,12 +46,10 @@ public class UnitActions {
     @Action(userPermission = 1 << 6, async = true)
     public void listTrustUnits(JsonObject json, ResultCallback resultCallback) {
         long start = System.currentTimeMillis();
-        final String pubKey = managerAction.pubKey;
+        final String pubKey = managerAction.getPubKey(json);
         List<KV> allunits = KeyValueDBUtil.instance.getKeyValues(NCTables.TrustUnitsDB.toString());
-        if (pubKey != null
+        if (pubKey != null && KeyValueDBUtil.instance
-                && KeyValueDBUtil.instance
+                .getValue(NCTables.ConfigDB.toString(), "__CenterManager__").contains(pubKey)) {
-                .getValue(NCTables.ConfigDB.toString(), "__CenterManager__")
-                .contains(pubKey)) {
             simpleReply(resultCallback, "onListTrustUnits", allunits);
             LOGGER.debug("is center manager");
             long end = System.currentTimeMillis();
@@ -73,12 +72,10 @@ public class UnitActions {
 
     @Action(userPermission = 1 << 6, async = true)
     public void createTrustUnit(JsonObject json, ResultCallback resultCallback) {
-        final String pubKey = managerAction.pubKey;
+        final String pubKey = managerAction.getPubKey(json);
         LOGGER.debug("[createTrustUnit] " + json.get("data").toString());
-        KeyValueDBUtil.instance.setValue(
+        KeyValueDBUtil.instance.setValue(NCTables.TrustUnitsDB.toString(),
-                NCTables.TrustUnitsDB.toString(),
+                pubKey + "_" + json.get("msg").getAsString(), json.get("data").toString());
-                pubKey + "_" + json.get("msg").getAsString(),
-                json.get("data").toString());
         Map<String, Object> ret = new HashMap<>();
         ret.put("action", "onCreateTrustUnit");
         ret.put("status", "Success");
@@ -88,26 +85,22 @@ public class UnitActions {
     @Action(userPermission = 1 << 6, async = true)
     public void deleteTrustUnit(JsonObject json, ResultCallback resultCallback) {
         // final String pubKey = managerAction.pubKey;
-        LOGGER.debug(
+        LOGGER.debug("[deleteTrustUnit] before" + KeyValueDBUtil.instance
-                "[deleteTrustUnit] before"
+                .getValue(NCTables.TrustUnitsDB.toString(), json.get("data").getAsString()));
-                        + KeyValueDBUtil.instance.getValue(
+        KeyValueDBUtil.instance.delete(NCTables.TrustUnitsDB.toString(),
-                        NCTables.TrustUnitsDB.toString(), json.get("data").getAsString()));
+                json.get("data").getAsString());
-        KeyValueDBUtil.instance.delete(
+        LOGGER.debug("[deleteTrustUnit] after" + KeyValueDBUtil.instance
-                NCTables.TrustUnitsDB.toString(), json.get("data").getAsString());
+                .getValue(NCTables.TrustUnitsDB.toString(), json.get("data").getAsString()));
-        LOGGER.debug(
-                "[deleteTrustUnit] after"
-                        + KeyValueDBUtil.instance.getValue(
-                        NCTables.TrustUnitsDB.toString(), json.get("data").getAsString()));
         Map<String, Object> ret = new HashMap<>();
         ret.put("action", "onDeleteTrustUnit");
         ret.put("status", "Success");
         resultCallback.onResult(ret);
     }
 
-//    @Action(async = true)
+    // @Action(async = true)
-//    public void executeContract(JsonObject args, final ResultCallback rc) {
+    // public void executeContract(JsonObject args, final ResultCallback rc) {
-//        executeContractTrustfully(args, rc);
+    // executeContractTrustfully(args, rc);
-//    }
+    // }
 
     @Action(async = true, userPermission = 1L << 6)
     public void getNodeTrustUnits(JsonObject json, ResultCallback resultCallback) {
@@ -124,89 +117,88 @@ public class UnitActions {
         simpleReply(resultCallback, "onGetNodeTrustUnits", nodeunits);
     }
 
-//    @Action(async = true, userPermission = 0)
+    // @Action(async = true, userPermission = 0)
-//    public void executeContractTrustfully(JsonObject args, final ResultCallback rc) {
+    // public void executeContractTrustfully(JsonObject args, final ResultCallback rc) {
-//        String contractID = args.get("contractID").getAsString();
+    // String contractID = args.get("contractID").getAsString();
-//
+    //
-//        contractID = convertContractName(contractID);
+    // contractID = convertContractName(contractID);
-//
+    //
-//        args.remove("contractID");
+    // args.remove("contractID");
-//        args.addProperty("contractID", contractID);
+    // args.addProperty("contractID", contractID);
-//        String requestID;
+    // String requestID;
-//        if (!args.has("requestID")) {
+    // if (!args.has("requestID")) {
-//            requestID = System.currentTimeMillis() + "_" + (int) (Math.random() * 10000);
+    // requestID = System.currentTimeMillis() + "_" + (int) (Math.random() * 10000);
-//            args.addProperty("requestID", requestID);
+    // args.addProperty("requestID", requestID);
-//        } else requestID = args.get("requestID").getAsString();
+    // } else requestID = args.get("requestID").getAsString();
-//        args.remove("action");
+    // args.remove("action");
-//        args.addProperty("action", "executeContractTrustfully");
+    // args.addProperty("action", "executeContractTrustfully");
-//        MultiPointContractInfo mInfo = NodeCenterActions.contractID2Members.get(contractID);
+    // MultiPointContractInfo mInfo = NodeCenterActions.contractID2Members.get(contractID);
-//        args.addProperty("seq", mInfo.getNextSeq());
+    // args.addProperty("seq", mInfo.getNextSeq());
-//        args.addProperty("needSeq", ContractType.needSeq(mInfo.type));
+    // args.addProperty("needSeq", ContractType.needSeq(mInfo.type));
-//        List<String> nodes = mInfo.members;
+    // List<String> nodes = mInfo.members;
-//        logger.debug("tid:" + Thread.currentThread().getId() + " contractID:" + contractID);
+    // logger.debug("tid:" + Thread.currentThread().getId() + " contractID:" + contractID);
-//        if (nodes == null) {
+    // if (nodes == null) {
-//            rc.onResult(
+    // rc.onResult(
-//                    "{\"status\":\"Error\",\"result\":\"can't locate contract\",\"action\":\"onExecuteContractTrustfully\"}");
+    // "{\"status\":\"Error\",\"result\":\"can't locate
-//        } else {
+    // contract\",\"action\":\"onExecuteContractTrustfully\"}");
-//            mInfo.rcf.execute(requestID, rc, JsonUtil.toJson(args));
+    // } else {
-//        }
+    // mInfo.rcf.execute(requestID, rc, JsonUtil.toJson(args));
-//
+    // }
-//        // add request cache,only for requestAll type contract
+    //
-//        if (ContractType.needSeq(mInfo.type)) {
+    // // add request cache,only for requestAll type contract
-//            RequestCache reqc = NodeCenterActions.getCache(contractID);
+    // if (ContractType.needSeq(mInfo.type)) {
-//            reqc.put(args.get("seq").getAsString(), args);
+    // RequestCache reqc = NodeCenterActions.getCache(contractID);
-//        }
+    // reqc.put(args.get("seq").getAsString(), args);
-//    }
+    // }
+    // }
 
 
-    //only for test ADSP
+    // only for test ADSP
-//    public static void testExecuteContract(JsonObject args, final ResultCallback rc) {
+    // public static void testExecuteContract(JsonObject args, final ResultCallback rc) {
-//        String contractID = args.get("contractID").getAsString();
+    // String contractID = args.get("contractID").getAsString();
-//
+    //
-//        contractID = convertContractName(contractID);
+    // contractID = convertContractName(contractID);
-//
+    //
-//        args.remove("contractID");
+    // args.remove("contractID");
-//        args.addProperty("contractID", contractID);
+    // args.addProperty("contractID", contractID);
-//        String requestID;
+    // String requestID;
-//        if (!args.has("requestID")) {
+    // if (!args.has("requestID")) {
-//            requestID = System.currentTimeMillis() + "_" + (int) (Math.random() * 10000);
+    // requestID = System.currentTimeMillis() + "_" + (int) (Math.random() * 10000);
-//            args.addProperty("requestID", requestID);
+    // args.addProperty("requestID", requestID);
-//        } else requestID = args.get("requestID").getAsString();
+    // } else requestID = args.get("requestID").getAsString();
-//        args.remove("action");
+    // args.remove("action");
-//        args.addProperty("action", "executeContractTrustfully");
+    // args.addProperty("action", "executeContractTrustfully");
-//        MultiPointContractInfo mInfo = NodeCenterActions.contractID2Members.get(contractID);
+    // MultiPointContractInfo mInfo = NodeCenterActions.contractID2Members.get(contractID);
-//        System.out.println("mInfo是空吗？" + mInfo == null);
+    // System.out.println("mInfo是空吗？" + mInfo == null);
-//
+    //
-//        args.addProperty("seq", mInfo.getNextSeq());
+    // args.addProperty("seq", mInfo.getNextSeq());
-//        args.addProperty("needSeq", ContractType.needSeq(mInfo.type));
+    // args.addProperty("needSeq", ContractType.needSeq(mInfo.type));
-//        List<String> nodes = mInfo.members;
+    // List<String> nodes = mInfo.members;
-//        logger.debug("tid:" + Thread.currentThread().getId() + " contractID:" + contractID);
+    // logger.debug("tid:" + Thread.currentThread().getId() + " contractID:" + contractID);
-//        if (nodes == null) {
+    // if (nodes == null) {
-//            rc.onResult(
+    // rc.onResult(
-//                    "{\"status\":\"Error\",\"result\":\"can't locate contract\",\"action\":\"onExecuteContractTrustfully\"}");
+    // "{\"status\":\"Error\",\"result\":\"can't locate
-//        } else {
+    // contract\",\"action\":\"onExecuteContractTrustfully\"}");
-//            mInfo.rcf.execute(requestID, rc, JsonUtil.toJson(args));
+    // } else {
-//        }
+    // mInfo.rcf.execute(requestID, rc, JsonUtil.toJson(args));
-//
+    // }
-//        //add request cache,only for requestAll type contract
+    //
-//        if(ContractType.needSeq(mInfo.type)){
+    // //add request cache,only for requestAll type contract
-//            RequestCache reqc = NodeCenterActions.getCache(contractID);
+    // if(ContractType.needSeq(mInfo.type)){
-//            reqc.put(args.get("seq").getAsString(),args);
+    // RequestCache reqc = NodeCenterActions.getCache(contractID);
-//        }
+    // reqc.put(args.get("seq").getAsString(),args);
-//    }
+    // }
+    // }
 
     @Action(async = true, userPermission = 1L << 6)
     public void listContractProcess(JsonObject args, final ResultCallback rc) {
         List<ContractDesp> info = new ArrayList<>();
-        LOGGER.debug(
+        LOGGER.debug("[contracts] " + JsonUtil.toPrettyJson(NodeCenterActions.nodeInfos));
-                "[contracts] "
+        LOGGER.debug("[cid2Nodes]" + JsonUtil.toPrettyJson(NodeCenterActions.contractID2Members));
-                        + JsonUtil.toPrettyJson(NodeCenterActions.nodeInfos));
-        LOGGER.debug(
-                "[cid2Nodes]"
-                        + JsonUtil.toPrettyJson(NodeCenterActions.contractID2Members));
         for (String key : NodeCenterActions.contractID2Members.keySet()) {
             ContractDesp desp = NodeCenterActions.getContractByID(key);
-            if (desp != null) info.add(desp);
+            if (desp != null)
+                info.add(desp);
         }
         simpleReply(rc, "onListContractProcess", JsonUtil.toJson(info));
     }
@@ -214,15 +206,12 @@ public class UnitActions {
     @Action(userPermission = 1 << 6, async = true)
     public void listMultiPointContractProcess(JsonObject json, ResultCallback resultCallback) {
         List<ContractDesp> info = new ArrayList<>();
-        LOGGER.debug(
+        LOGGER.debug("[contracts] " + JsonUtil.toPrettyJson(NodeCenterActions.nodeInfos));
-                "[contracts] "
+        LOGGER.debug("[cid2Nodes]" + JsonUtil.toPrettyJson(NodeCenterActions.contractID2Members));
-                        + JsonUtil.toPrettyJson(NodeCenterActions.nodeInfos));
-        LOGGER.debug(
-                "[cid2Nodes]"
-                        + JsonUtil.toPrettyJson(NodeCenterActions.contractID2Members));
         for (String key : NodeCenterActions.contractID2Members.keySet()) {
             ContractDesp desp = NodeCenterActions.getContractByID(key);
-            if (desp != null) info.add(desp);
+            if (desp != null)
+                info.add(desp);
         }
         simpleReply(resultCallback, "onListMultiPointContractProcess", JsonUtil.toJson(info));
     }
@@ -251,7 +240,8 @@ public class UnitActions {
         String[] strs = args.get("nodeIDs").getAsString().split(",");
         Set<String> nodePubKeys = new HashSet<>(); // nodes' pubkey
         for (String str : strs) {
-            if (str != null && str.length() > 0) nodePubKeys.add(str);
+            if (str != null && str.length() > 0)
+                nodePubKeys.add(str);
         }
         Map<String, String> nodes = new HashMap<>(); // node's pubKey-node'a name
         for (CMNode node : NodeCenterActions.nodeInfos.values()) {
@@ -264,9 +254,8 @@ public class UnitActions {
             simpleReply(rc, "onDistributeYPK", "empty nodes");
         }
 
-        boolean result =
+        boolean result = SM2Util.plainStrVerify(pubKey,
-                SM2Util.plainStrVerify(
+                "DistributeYPK|" + projectName + "|" + pubKey, signature);
-                        pubKey, "DistributeYPK|" + projectName + "|" + pubKey, signature);
         LOGGER.info("[UnitAcitons] 验签:" + result + " -> projectName:" + projectName);
 
         String ypkType = projectName.split("_")[0];
@@ -292,154 +281,154 @@ public class UnitActions {
         }
     }
 
-//    @Action(async = true, userPermission = 1L << 6)
+    // @Action(async = true, userPermission = 1L << 6)
-//    public void startContractMultiPoint(JsonObject args, final ResultCallback rc) {
+    // public void startContractMultiPoint(JsonObject args, final ResultCallback rc) {
-//        Map<String, String> request = new HashMap<String, String>();
+    // Map<String, String> request = new HashMap<String, String>();
-//        Contract contract = new Contract();
+    // Contract contract = new Contract();
-//        if (args.has("type")) {
+    // if (args.has("type")) {
-//            contract.setType(ContractType.valueOf(args.get("type").getAsString()));
+    // contract.setType(ContractType.valueOf(args.get("type").getAsString()));
-//        }
+    // }
-//
+    //
-//        // this multiPointContractInfo problem
+    // // this multiPointContractInfo problem
-//        MultiPointContractInfo multiPointContractInfo = new MultiPointContractInfo();
+    // MultiPointContractInfo multiPointContractInfo = new MultiPointContractInfo();
-//        multiPointContractInfo.type = contract.getType();
+    // multiPointContractInfo.type = contract.getType();
-//
+    //
-//        logger.debug("startContractMultiPoint:");
+    // logger.debug("startContractMultiPoint:");
-//        logger.debug(JsonUtil.toPrettyJson(args));
+    // logger.debug(JsonUtil.toPrettyJson(args));
-//        if (args.has("script")) contract.setScript(args.get("script").getAsString());
+    // if (args.has("script")) contract.setScript(args.get("script").getAsString());
-//        else if (args.has("path")) contract.setScript(args.get("path").getAsString());
+    // else if (args.has("path")) contract.setScript(args.get("path").getAsString());
-//        else if (args.has("projectName"))
+    // else if (args.has("projectName"))
-//            contract.setScript("/" + args.get("projectName").getAsString());
+    // contract.setScript("/" + args.get("projectName").getAsString());
-//        // contract.setScript("/" + args.get("projectName").getAsString() + "/manifest.json");
+    // // contract.setScript("/" + args.get("projectName").getAsString() + "/manifest.json");
-//
+    //
-//        SM2 sm2 = new SM2();
+    // SM2 sm2 = new SM2();
-//        SM2KeyPair sm2Key = sm2.generateKeyPair();
+    // SM2KeyPair sm2Key = sm2.generateKeyPair();
-//        contract.setID(sm2Key.getPublicKeyStr().hashCode() + "");
+    // contract.setID(sm2Key.getPublicKeyStr().hashCode() + "");
-//        contract.setKey(sm2Key.getPrivateKey().toString(16));
+    // contract.setKey(sm2Key.getPrivateKey().toString(16));
-//        contract.setPublicKey(sm2Key.getPublicKeyStr());
+    // contract.setPublicKey(sm2Key.getPublicKeyStr());
-//
+    //
-//        contract.setNodeCenterRepoDOI(DOIPMainServer4NC.repoIdentifier);
+    // contract.setNodeCenterRepoDOI(DOIPMainServer4NC.repoIdentifier);
-//        // 多点合约部署时，由NC预先注册一个DOI以备使用
+    // // 多点合约部署时，由NC预先注册一个DOI以备使用
-//        if (DoConfig.openContractDORegister) {
+    // if (DoConfig.openContractDORegister) {
-//            try {
+    // try {
-//                HandleService hs = new HandleService(HandleServiceUtils.hrRegister);
+    // HandleService hs = new HandleService(HandleServiceUtils.hrRegister);
-//                String tmpDOI = hs.registerContract(DOIPMainServer4NC.repoIdentifier);
+    // String tmpDOI = hs.registerContract(DOIPMainServer4NC.repoIdentifier);
-//                if (tmpDOI == "" || tmpDOI == null)
+    // if (tmpDOI == "" || tmpDOI == null)
-//                    contract.setDOI("RegisterFailed");
+    // contract.setDOI("RegisterFailed");
-//                else
+    // else
-//                    contract.setDOI(tmpDOI);
+    // contract.setDOI(tmpDOI);
-//            }
+    // }
-//            catch (Exception e) {
+    // catch (Exception e) {
-//                e.printStackTrace();
+    // e.printStackTrace();
-//                contract.setDOI("RegisterFailed");
+    // contract.setDOI("RegisterFailed");
-//            }
+    // }
-//        }
+    // }
-//
+    //
-//        String[] nodeNames =
+    // String[] nodeNames =
-//                args.get("peersID").getAsString().split(","); // all nodes' peerID in the unit
+    // args.get("peersID").getAsString().split(","); // all nodes' peerID in the unit
-//        Set<String> nodeNameSet = new HashSet<>(); // nodes' peerID
+    // Set<String> nodeNameSet = new HashSet<>(); // nodes' peerID
-//        for (String str : nodeNames) {
+    // for (String str : nodeNames) {
-//            if (str != null && str.length() > 0) nodeNameSet.add(str);
+    // if (str != null && str.length() > 0) nodeNameSet.add(str);
-//        }
+    // }
-//
+    //
-//        List<String> udpids = new ArrayList<>(); // nodes' udpID in the unit
+    // List<String> udpids = new ArrayList<>(); // nodes' udpID in the unit
-//
+    //
-//        for (CMNode node : NodeCenterActions.nodeinfos.values()) {
+    // for (CMNode node : NodeCenterActions.nodeinfos.values()) {
-//            if (nodeNameSet.contains(node.nodeName)) {
+    // if (nodeNameSet.contains(node.nodeName)) {
-//                udpids.add(node.udpID);
+    // udpids.add(node.udpID);
-//            }
+    // }
-//        }
+    // }
-//        final long curr = System.currentTimeMillis();
+    // final long curr = System.currentTimeMillis();
-//        String requestID = curr + "_" + (int) (Math.random() * 10000);
+    // String requestID = curr + "_" + (int) (Math.random() * 10000);
-//        NodeCenterActions.ResultCollector collector =
+    // NodeCenterActions.ResultCollector collector =
-//                new NodeCenterActions.ResultCollector(
+    // new NodeCenterActions.ResultCollector(
-//                        requestID,
+    // requestID,
-//                        new ResultCallback() {
+    // new ResultCallback() {
-//                            @Override
+    // @Override
-//                            public void onResult(String str) {
+    // public void onResult(String str) {
-//                                Map<String, String> ret = new HashMap<>();
+    // Map<String, String> ret = new HashMap<>();
-//                                ret.put("action", "onStartContractTrustfullyResult");
+    // ret.put("action", "onStartContractTrustfullyResult");
-//                                ret.put("data", str);
+    // ret.put("data", str);
-//                                ret.put("executionTime", (System.currentTimeMillis() - curr) + "");
+    // ret.put("executionTime", (System.currentTimeMillis() - curr) + "");
-//                                rc.onResult(JsonUtil.toJson(ret));
+    // rc.onResult(JsonUtil.toJson(ret));
-//                            }
+    // }
-//                        },
+    // },
-//                        udpids.size());
+    // udpids.size());
-//        NodeCenterActions.sync.sleepWithTimeout(requestID, collector, 20);
+    // NodeCenterActions.sync.sleepWithTimeout(requestID, collector, 20);
-//
+    //
-//        //		ArrayList<String> udpids=gson.fromJson(args.get("members"),
+    // // ArrayList<String> udpids=gson.fromJson(args.get("members"),
-//        //                new TypeToken<ArrayList<String>>(){}.getType());
+    // // new TypeToken<ArrayList<String>>(){}.getType());
-//        Map<String, String> members = new HashMap<>(); // nodes' <udpID,udpAddress>
+    // Map<String, String> members = new HashMap<>(); // nodes' <udpID,udpAddress>
-//        for (int i = 0; i < udpids.size(); i++) {
+    // for (int i = 0; i < udpids.size(); i++) {
-//            members.put(
+    // members.put(
-//                    udpids.get(i),
+    // udpids.get(i),
-//                    NodeCenterActions.runner.getUDPAddr(Integer.valueOf(udpids.get(i)))
+    // NodeCenterActions.runner.getUDPAddr(Integer.valueOf(udpids.get(i)))
-//                            + ":"
+    // + ":"
-//                            + (i == 0)); // regard the first node as the master in the unit
+    // + (i == 0)); // regard the first node as the master in the unit
-//        }
+    // }
-//
+    //
-//        List<String> nodes = new ArrayList<>(); // nodes' pubKey
+    // List<String> nodes = new ArrayList<>(); // nodes' pubKey
-//        for (CMNode node : NodeCenterActions.nodeinfos.values()) {
+    // for (CMNode node : NodeCenterActions.nodeinfos.values()) {
-//            if (nodeNameSet.contains(node.nodeName)) {
+    // if (nodeNameSet.contains(node.nodeName)) {
-//                nodes.add(node.pubKey);
+    // nodes.add(node.pubKey);
-//            }
+    // }
-//        }
+    // }
-//
+    //
-//        request.put("memberStr", JsonUtil.toJson(members));
+    // request.put("memberStr", JsonUtil.toJson(members));
-//        request.put("isPrivate", args.get("isPrivate").getAsString());
+    // request.put("isPrivate", args.get("isPrivate").getAsString());
-//        request.put("pubKey", managerAction.pubKey);
+    // request.put("pubKey", managerAction.pubKey);
-//        request.put("action", "startContractTrustfully");
+    // request.put("action", "startContractTrustfully");
-//        request.put("requestID", requestID);
+    // request.put("requestID", requestID);
-//        multiPointContractInfo.members = nodes;
+    // multiPointContractInfo.members = nodes;
-//
+    //
-//        contract.setNumOfCopies(1);
+    // contract.setNumOfCopies(1);
-//        switch (multiPointContractInfo.type) {
+    // switch (multiPointContractInfo.type) {
-//            case Sole:
+    // case Sole:
-//                logger.debug("Can't support Solo in multi-point mode");
+    // logger.debug("Can't support Solo in multi-point mode");
-//                return;
+    // return;
-//            case RequestOnce:
+    // case RequestOnce:
-//                multiPointContractInfo.rcf = new RequestOnceExecutor(multiPointContractInfo);
+    // multiPointContractInfo.rcf = new RequestOnceExecutor(multiPointContractInfo);
-//                break;
+    // break;
-//            case ResponseOnce:
+    // case ResponseOnce:
-//                multiPointContractInfo.rcf = new ResponseOnceExecutor(multiPointContractInfo);
+    // multiPointContractInfo.rcf = new ResponseOnceExecutor(multiPointContractInfo);
-//                break;
+    // break;
-//            case RequestAllResponseFirst:
+    // case RequestAllResponseFirst:
-//                multiPointContractInfo.rcf = new RequestAllExecutor(multiPointContractInfo, 1);
+    // multiPointContractInfo.rcf = new RequestAllExecutor(multiPointContractInfo, 1);
-//                contract.setNumOfCopies(nodes.size());
+    // contract.setNumOfCopies(nodes.size());
-//                break;
+    // break;
-//            case RequestAllResponseHalf:
+    // case RequestAllResponseHalf:
-//                multiPointContractInfo.rcf =
+    // multiPointContractInfo.rcf =
-//                        new RequestAllExecutor(multiPointContractInfo, nodes.size() / 2 + 1);
+    // new RequestAllExecutor(multiPointContractInfo, nodes.size() / 2 + 1);
-//                contract.setNumOfCopies(nodes.size());
+    // contract.setNumOfCopies(nodes.size());
-//                break;
+    // break;
-//            case RequestAllResponseAll:
+    // case RequestAllResponseAll:
-//                multiPointContractInfo.rcf =
+    // multiPointContractInfo.rcf =
-//                        new RequestAllExecutor(multiPointContractInfo, nodes.size());
+    // new RequestAllExecutor(multiPointContractInfo, nodes.size());
-//                contract.setNumOfCopies(nodes.size());
+    // contract.setNumOfCopies(nodes.size());
-//                break;
+    // break;
-//        }
+    // }
-//        NodeCenterActions.contractID2Members.put(contract.getID(), multiPointContractInfo);
+    // NodeCenterActions.contractID2Members.put(contract.getID(), multiPointContractInfo);
-//
+    //
-//        request.put("contractStr", JsonUtil.toJson(contract));
+    // request.put("contractStr", JsonUtil.toJson(contract));
-//        String startReq = JsonUtil.toJson(request);
+    // String startReq = JsonUtil.toJson(request);
-//        logger.debug("启动合约:" + startReq);
+    // logger.debug("启动合约:" + startReq);
-//
+    //
-//        for (String nodeID : nodes) {
+    // for (String nodeID : nodes) {
-//            CMNode node;
+    // CMNode node;
-//            node = NodeCenterActions.nodeinfos.get(nodeID);
+    // node = NodeCenterActions.nodeinfos.get(nodeID);
-//            node.connection.controller.sendMsg(startReq);
+    // node.connection.controller.sendMsg(startReq);
-//
+    //
-//            if (!NodeCenterActions.recoverMap.containsKey(nodeID)) {
+    // if (!NodeCenterActions.recoverMap.containsKey(nodeID)) {
-//                NodeCenterActions.recoverMap.put(nodeID, new ConcurrentHashMap<>());
+    // NodeCenterActions.recoverMap.put(nodeID, new ConcurrentHashMap<>());
-//            }
+    // }
-//            ContractRecord record = new ContractRecord(contract.getID());
+    // ContractRecord record = new ContractRecord(contract.getID());
-//            record.members = new HashMap<>(members);
+    // record.members = new HashMap<>(members);
-//            NodeCenterActions.recoverMap.get(nodeID).put(contract.getID(), record);
+    // NodeCenterActions.recoverMap.get(nodeID).put(contract.getID(), record);
-//        }
+    // }
-//
+    //
-//        rc.onResult(
+    // rc.onResult(
-//                "{\"status\":\"Success\",\"result\":\""
+    // "{\"status\":\"Success\",\"result\":\""
-//                        + contract.getID()
+    // + contract.getID()
-//                        + "\",\"action\":\"onStartTrustfulContract\"}");
+    // + "\",\"action\":\"onStartTrustfulContract\"}");
-//    }
+    // }
 }

src/main/resources/log4j2.properties

@@ -4,12 +4,37 @@ appender.console.type=Console
 appender.console.name=STDOUT
 appender.console.layout.type=PatternLayout
 appender.console.layout.pattern=%highlight{[%-5p] %d{HH:mm:ss.SSS} %m (%F:%L)[%M]%n}{FATAL=Bright Red,ERROR=Red,WARN=Yellow,INFO=Green,DEBUG=Blue,TRACE=White}
-appender.rolling.type=File
+
-appender.rolling.name=log
+appender.logrolling.type=RollingFile
-appender.rolling.append=true
+appender.logrolling.name=infoLogFile
-appender.rolling.fileName=./log/nc.log
+appender.logrolling.append=true
-appender.rolling.layout.type=PatternLayout
+appender.logrolling.fileName=./log/cm.log
-appender.rolling.layout.pattern=%d-%m%n
+appender.logrolling.filePattern=./log/cm-%i.log
+appender.logrolling.layout.type=PatternLayout
+appender.logrolling.layout.pattern=[%-5p] %d{HH:mm:ss.SSS} %m (%F:%L)[%M]%n
+appender.logrolling.policies.type = Policies
+appender.logrolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.logrolling.policies.size.size = 100MB
+appender.logrolling.strategy.type = DefaultRolloverStrategy
+appender.logrolling.strategy.max = 5
+
+appender.errrolling.type=RollingFile
+appender.errrolling.name=errorLogFile
+appender.errrolling.append=true
+appender.errrolling.fileName=./log/cm.err
+appender.errrolling.filePattern=./log/cm-%i.err
+appender.errrolling.layout.type=PatternLayout
+appender.errrolling.layout.pattern=[%-5p] %d{HH:mm:ss.SSS} %m (%F:%L)[%M]%n
+appender.errrolling.policies.type = Policies
+appender.errrolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.errrolling.policies.size.size = 100MB
+appender.errrolling.strategy.type = DefaultRolloverStrategy
+appender.errrolling.strategy.max = 5
+
 rootLogger.level=info
 rootLogger.appenderRef.stdout.ref=STDOUT
+rootLogger.appenderRef.errorFile.ref=errorLogFile
+rootLogger.appenderRef.errorFile.level=error
+rootLogger.appenderRef.infoFile.ref=infoLogFile
+rootLogger.appenderRef.infoFile.level=info
 rootLogger.appenderRef.log.ref=log

src/test/java/org/bdware/bdserver/PermissionHelper.java

@@ -44,8 +44,8 @@ public class PermissionHelper {
         printActions(handlers, set);
     }
 
-    private void printActions(
+    private void printActions(Map<String, ActionExecutor.Pair<Method, Object>> handlers,
-            Map<String, ActionExecutor.Pair<Method, Object>> handlers, EnumSet<Role> set) {
+            EnumSet<Role> set) {
         List<Line> lines = new ArrayList<>();
         for (String str : handlers.keySet()) {
             Method m = handlers.get(str).first();
@@ -56,18 +56,18 @@ public class PermissionHelper {
             l.permission = a.userPermission();
             l.roles = "";
             for (Role r : set)
-                if ((r.getValue() & l.permission) == l.permission) l.roles += r.name() + ";";
+                if ((r.getValue() & l.permission) == l.permission)
-            if (l.roles.equals("CenterManager;NodeManager;Node;Anonymous;")) l.roles = "任意角色";
+                    l.roles += r.name() + ";";
+            if (l.roles.equals("CenterManager;NodeManager;Node;Anonymous;"))
+                l.roles = "任意角色";
         }
-        lines.sort(
+        lines.sort(new Comparator<Line>() {
-                new Comparator<Line>() {
             @Override
             public int compare(Line o1, Line o2) {
                 return o1.action.compareTo(o2.action);
             }
         });
-        lines.sort(
+        lines.sort(new Comparator<Line>() {
-                new Comparator<Line>() {
             @Override
             public int compare(Line o1, Line o2) {
                 return o1.roles.compareTo(o2.roles);

src/test/java/org/bdware/bdserver/TestServer.java

@@ -18,8 +18,7 @@ public class TestServer {
         public void channelActive(ChannelHandlerContext ctx) {
             LOGGER.info("active");
             System.out.println("======Active=======");
-            ctx.channel()
+            ctx.channel().writeAndFlush("ACTIVE from Server")
-                    .writeAndFlush("ACTIVE from Server")
                     .addListener(future -> LOGGER.info("Active Send Done!!"));
         }
 

src/test/java/org/bdware/bdserver/test/TestADSP.java

@@ -2,191 +2,200 @@ package org.bdware.bdserver.test;
 
 public class TestADSP {
     // public static Map<String,String> nodes = new HashMap<String,String>();
-//
+    //
-//    private static volatile Boolean flag = false;
+    // private static volatile Boolean flag = false;
-//    private static int totalRequest = 10;
+    // private static int totalRequest = 10;
-//    private static int nodeCount = 5;
+    // private static int nodeCount = 5;
-//
+    //
-//    public static String resultPath = "./testADSP/" + "result.txt";
+    // public static String resultPath = "./testADSP/" + "result.txt";
-//    public static String contractID = "counter";
+    // public static String contractID = "counter";
-//    public static String action = "executeContract";
+    // public static String action = "executeContract";
-//    public static String pubkey = "0480204f4ef341359a5f64fcb11baf9ca2e6706ac20cba36ca83066870cf2c1d5de6df67e24e68dde7934af9b31d94a6084281db3d32d5ce42ab8f75bf799aca05";
+    // public static String pubkey =
-//
+    // "0480204f4ef341359a5f64fcb11baf9ca2e6706ac20cba36ca83066870cf2c1d5de6df67e24e68dde7934af9b31d94a6084281db3d32d5ce42ab8f75bf799aca05";
-//    public static String operation = "count";
+    //
-//    public static String arg = "1";
+    // public static String operation = "count";
-//
+    // public static String arg = "1";
-//    public static String priKey = "63464fa9587bbf2a022b3d655f4ed49c7d9a4249de1079d52bd5a1fec3308719";
+    //
-//    public static String signature = "dfd07c00c5c89fb0f901bed132db4342f49f4560f34c15878636623d2a8716a2c93ad32eeb9ee9c4f1d905df292cb4a1a27aa0171f2856848ce07cfc8022e809";
+    // public static String priKey =
-//
+    // "63464fa9587bbf2a022b3d655f4ed49c7d9a4249de1079d52bd5a1fec3308719";
-//    public static List<String> crashSeries = new ArrayList<String>();
+    // public static String signature =
-//    public static AtomicInteger crashIndex = new AtomicInteger();
+    // "dfd07c00c5c89fb0f901bed132db4342f49f4560f34c15878636623d2a8716a2c93ad32eeb9ee9c4f1d905df292cb4a1a27aa0171f2856848ce07cfc8022e809";
-//
+    //
-//    public static ConcurrentSet<String>  crashSet = new ConcurrentSet<String>();
+    // public static List<String> crashSeries = new ArrayList<String>();
-//    public static ConcurrentSet<String> recover = new ConcurrentSet<String>();
+    // public static AtomicInteger crashIndex = new AtomicInteger();
-//
+    //
-//    public static TestTask tt;
+    // public static ConcurrentSet<String> crashSet = new ConcurrentSet<String>();
-//    public static int period = 3000;
+    // public static ConcurrentSet<String> recover = new ConcurrentSet<String>();
-//
+    //
-//    static{
+    // public static TestTask tt;
-//        getSig();
+    // public static int period = 3000;
-//
+    //
-//        nodes.put("zyx's book","0440023d13facddcefbd87f2bb622b1b2b6ca43eb84c0579b82450814233ce557bd7ad7852cd47f1d6df867c5413ecf3dd1954cdbf5a6da683e3a89095f091d83d");
+    // static{
-//        nodes.put("localNode1","0480f783cf63294224afbd19e175e5c7ea0c5c60ee115ed9e114fe2691eb28cc1680e5fec532d64c80d2f6b737e8b43b94d5a9c73206ac6235c50ff992133e4d38");
+    // getSig();
-//        nodes.put("localNode2","044e0c127e24407ee8a8abd4fe507b32b340ce9775317b8d7b5bb8e182745d6a45c57aaf867d80a5f816a7561564f9294c6aee5916f95e93c0011e16c28b9e849a");
+    //
-//        nodes.put("localNode3","0485040cfd94bec672bb8ba184856188963ee4ad339d247a76e2d9819f20e61bfad24ec763b1371998583f9dc0cf55c4d53cb1a2ec84c67aed1aa5203cc84fc78f");
+    // nodes.put("zyx's
-//        nodes.put("localNode4","");
+    // book","0440023d13facddcefbd87f2bb622b1b2b6ca43eb84c0579b82450814233ce557bd7ad7852cd47f1d6df867c5413ecf3dd1954cdbf5a6da683e3a89095f091d83d");
-//        nodes.put("localNode5","");
+    // nodes.put("localNode1","0480f783cf63294224afbd19e175e5c7ea0c5c60ee115ed9e114fe2691eb28cc1680e5fec532d64c80d2f6b737e8b43b94d5a9c73206ac6235c50ff992133e4d38");
-//
+    // nodes.put("localNode2","044e0c127e24407ee8a8abd4fe507b32b340ce9775317b8d7b5bb8e182745d6a45c57aaf867d80a5f816a7561564f9294c6aee5916f95e93c0011e16c28b9e849a");
-//
+    // nodes.put("localNode3","0485040cfd94bec672bb8ba184856188963ee4ad339d247a76e2d9819f20e61bfad24ec763b1371998583f9dc0cf55c4d53cb1a2ec84c67aed1aa5203cc84fc78f");
-//        //生成崩溃序列
+    // nodes.put("localNode4","");
-//        crashSeries.clear();
+    // nodes.put("localNode5","");
-//        for(int i = 1;i <= totalRequest;i++){
+    //
-//            int temp = i % nodeCount;
+    //
-//            if(temp == 0)
+    // //生成崩溃序列
-//                temp = nodeCount;
+    // crashSeries.clear();
-//            crashSeries.add("crash localNode" + temp);
+    // for(int i = 1;i <= totalRequest;i++){
-//            crashSeries.add("recover localNode" + temp);
+    // int temp = i % nodeCount;
-//        }
+    // if(temp == 0)
-//
+    // temp = nodeCount;
-//        System.out.println("崩溃序列" + crashSeries.size());
+    // crashSeries.add("crash localNode" + temp);
-//
+    // crashSeries.add("recover localNode" + temp);
-//        Timer timer = new Timer();
+    // }
-//        tt = new TestTask();
+    //
-//        timer.schedule(tt, new Date(), period);
+    // System.out.println("崩溃序列" + crashSeries.size());
-//    }
+    //
-//
+    // Timer timer = new Timer();
-//    static class TestTask extends TimerTask {
+    // tt = new TestTask();
-//        @Override
+    // timer.schedule(tt, new Date(), period);
-//        public void run() {
+    // }
-//            if(TestADSP.getFlag()){
+    //
-//                int index = TestADSP.crashIndex.getAndIncrement();
+    // static class TestTask extends TimerTask {
-//                System.out.println("[TestADSP] index=" + TestADSP.crashIndex.get());
+    // @Override
-//
+    // public void run() {
-//                String[] crash = TestADSP.crashSeries.get(index).split(" ");
+    // if(TestADSP.getFlag()){
-//                String pubKey = convertNameToPubkey(crash[1]);
+    // int index = TestADSP.crashIndex.getAndIncrement();
-//                switch (crash[0]){
+    // System.out.println("[TestADSP] index=" + TestADSP.crashIndex.get());
-//                    case "crash":
+    //
-//                        if(pubKey != null){
+    // String[] crash = TestADSP.crashSeries.get(index).split(" ");
-//                            System.out.println("[TestADSP] 令节点 " + crash[1] + "崩溃");
+    // String pubKey = convertNameToPubkey(crash[1]);
-//                            System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis())));
+    // switch (crash[0]){
-//                            crashSet.add(pubKey);
+    // case "crash":
-//                        }
+    // if(pubKey != null){
-//                        break;
+    // System.out.println("[TestADSP] 令节点 " + crash[1] + "崩溃");
-//                    case "recover":
+    // System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new
-//                        if(pubKey != null){
+    // Date(System.currentTimeMillis())));
-//                            if(crashSet.contains(pubKey)){
+    // crashSet.add(pubKey);
-//                                crashSet.remove(pubKey);
+    // }
-//                            }
+    // break;
-//                            recover.add(pubKey);
+    // case "recover":
-//                            System.out.println("[TestADSP] 令节点 " + crash[1] + "上线");
+    // if(pubKey != null){
-//                            System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis())));
+    // if(crashSet.contains(pubKey)){
-//                        }
+    // crashSet.remove(pubKey);
-//                        break;
+    // }
-//                    default:
+    // recover.add(pubKey);
-//                        break;
+    // System.out.println("[TestADSP] 令节点 " + crash[1] + "上线");
-//                }
+    // System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new
-//
+    // Date(System.currentTimeMillis())));
-//
+    // }
-//                try {
+    // break;
-//                    Thread.sleep(period / 2);
+    // default:
-//                } catch (InterruptedException e) {
+    // break;
-//                    e.printStackTrace();
+    // }
-//                }
+    //
-//
+    //
-//
+    // try {
-//
+    // Thread.sleep(period / 2);
-//                System.out.println("[TestADSP]发起请求  " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis())));
+    // } catch (InterruptedException e) {
-//                JsonObject jo = new JsonObject();
+    // e.printStackTrace();
-//                jo.addProperty("action", TestADSP.action);
+    // }
-//                jo.addProperty("contractID", TestADSP.contractID);
+    //
-//                jo.addProperty("operation", TestADSP.operation);
+    //
-//                jo.addProperty("arg", TestADSP.arg);
+    //
-//                jo.addProperty("pubkey",TestADSP.pubkey);
+    // System.out.println("[TestADSP]发起请求 " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new
-//                jo.addProperty("signature",TestADSP.signature);
+    // Date(System.currentTimeMillis())));
-//                UnitActions.testExecuteContract(jo,null);
+    // JsonObject jo = new JsonObject();
-//
+    // jo.addProperty("action", TestADSP.action);
-//                if(index == (TestADSP.crashSeries.size() - 1)){
+    // jo.addProperty("contractID", TestADSP.contractID);
-//                    System.out.println("测试停止!");
+    // jo.addProperty("operation", TestADSP.operation);
-//                    TestADSP.setFlag(false);
+    // jo.addProperty("arg", TestADSP.arg);
-//                    //TestADSP.check();
+    // jo.addProperty("pubkey",TestADSP.pubkey);
-//                }
+    // jo.addProperty("signature",TestADSP.signature);
-//            }//if
+    // UnitActions.testExecuteContract(jo,null);
-//        }
+    //
-//    }
+    // if(index == (TestADSP.crashSeries.size() - 1)){
-//
+    // System.out.println("测试停止!");
-//    public static boolean getFlag(){
+    // TestADSP.setFlag(false);
-//        boolean temp;
+    // //TestADSP.check();
-//        synchronized (flag){
+    // }
-//            temp = flag;
+    // }//if
-//        }
+    // }
-//        return temp;
+    // }
-//    }
+    //
-//
+    // public static boolean getFlag(){
-//    public static void setFlag(boolean temp){
+    // boolean temp;
-//        synchronized (flag){
+    // synchronized (flag){
-//            flag = temp;
+    // temp = flag;
-//            System.out.println("[TestADSP]设置flag为" + flag);
+    // }
-//        }
+    // return temp;
-//    }
+    // }
-//
+    //
-//    public static void getSig(){
+    // public static void setFlag(boolean temp){
-//        String temp = contractID + "|" + operation + "|" + arg + "|" + pubkey;
+    // synchronized (flag){
-//        SM2 sm2 = new SM2();
+    // flag = temp;
-//        signature = sm2.sign(temp.getBytes(),priKey).toString();
+    // System.out.println("[TestADSP]设置flag为" + flag);
-//    }
+    // }
-//
+    // }
-//    //查看结果输出文件
+    //
-//    public static void check() {
+    // public static void getSig(){
-//        tt.cancel();
+    // String temp = contractID + "|" + operation + "|" + arg + "|" + pubkey;
-//
+    // SM2 sm2 = new SM2();
-//        int correct = 0;
+    // signature = sm2.sign(temp.getBytes(),priKey).toString();
-//        int incorrect = 0;
+    // }
-//        int unavailable = 0;
+    //
-//        int fileTotal = 0;
+    // //查看结果输出文件
-//
+    // public static void check() {
-//        File file = new File("./front-cluster/testADSP/result.txt");
+    // tt.cancel();
-//        System.out.println(file.getAbsolutePath());
+    //
-//        StringBuilder result = new StringBuilder();
+    // int correct = 0;
-//        try{
+    // int incorrect = 0;
-//            BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));//构造一个BufferedReader类来读取文件
+    // int unavailable = 0;
-//
+    // int fileTotal = 0;
-//            String s = null;
+    //
-//            while((s = br.readLine())!=null){//使用readLine方法，一次读一行
+    // File file = new File("./front-cluster/testADSP/result.txt");
-//                if(!s.equals("")){
+    // System.out.println(file.getAbsolutePath());
-//                    fileTotal++;
+    // StringBuilder result = new StringBuilder();
-//                    String str[] = s.split(" ");
+    // try{
-//                    if(str[1].equals((Integer.parseInt(str[0]) + 1) + ".0")){
+    // BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),
-//                        correct++;
+    // "UTF-8"));//构造一个BufferedReader类来读取文件
-//                    }else{
+    //
-//                        incorrect++;
+    // String s = null;
-//                    }
+    // while((s = br.readLine())!=null){//使用readLine方法，一次读一行
-//                }
+    // if(!s.equals("")){
-//            }
+    // fileTotal++;
-//            br.close();
+    // String str[] = s.split(" ");
-//
+    // if(str[1].equals((Integer.parseInt(str[0]) + 1) + ".0")){
-//        }catch(Exception e){
+    // correct++;
-//            e.printStackTrace();
+    // }else{
-//        }
+    // incorrect++;
-//
+    // }
-//        unavailable = totalRequest * 2 - fileTotal;
+    // }
-//
+    // }
-//        System.out.println("共有" + totalRequest * 2 + "次请求，其中" + correct + "正确，" + incorrect + "不正确，" + unavailable + "不可用.");
+    // br.close();
-//    }
+    //
-//
+    // }catch(Exception e){
-//    public static String convertNameToPubkey(String nodeName){
+    // e.printStackTrace();
-//        return nodes.get(nodeName);
+    // }
-//    }
+    //
-//
+    // unavailable = totalRequest * 2 - fileTotal;
-//    public static String convertPubKeyToName(String pubkey){
+    //
-//        for(String key : nodes.keySet()){
+    // System.out.println("共有" + totalRequest * 2 + "次请求，其中" + correct + "正确，" + incorrect + "不正确，"
-//            if(nodes.get(key).equals(pubkey)){
+    // + unavailable + "不可用.");
-//                return key;
+    // }
-//            }
+    //
-//        }
+    // public static String convertNameToPubkey(String nodeName){
-//        return null;
+    // return nodes.get(nodeName);
-//    }
+    // }
-//
+    //
-//    public static void main(String[] args){
+    // public static String convertPubKeyToName(String pubkey){
-//        check();
+    // for(String key : nodes.keySet()){
-//    }
+    // if(nodes.get(key).equals(pubkey)){
+    // return key;
+    // }
+    // }
+    // return null;
+    // }
+    //
+    // public static void main(String[] args){
+    // check();
+    // }
 }

src/test/java/org/bdware/bdserver/test/TestSearch.java

@@ -32,44 +32,44 @@ public class TestSearch {
     @Test
     public void testIndexSearch() throws Exception {
 
-        //1. 创建分词器(对搜索的关键词进行分词使用)
+        // 1. 创建分词器(对搜索的关键词进行分词使用)
-        //注意: 分词器要和创建索引的时候使用的分词器一模一样
+        // 注意: 分词器要和创建索引的时候使用的分词器一模一样
         Analyzer analyzer = new StandardAnalyzer();
 
-        //2. 创建查询对象,
+        // 2. 创建查询对象,
-        //第一个参数: 默认查询域, 如果查询的关键字中带搜索的域名, 则从指定域中查询, 如果不带域名则从, 默认搜索域中查询
+        // 第一个参数: 默认查询域, 如果查询的关键字中带搜索的域名, 则从指定域中查询, 如果不带域名则从, 默认搜索域中查询
-        //第二个参数: 使用的分词器
+        // 第二个参数: 使用的分词器
         QueryParser queryParser = new QueryParser("name", analyzer);
 
-        //3. 设置搜索关键词
+        // 3. 设置搜索关键词
-        //华 OR  为   手   机
+        // 华 OR 为 手 机
         Query query = queryParser.parse("华为手机");
 
-        //4. 创建Directory目录对象, 指定索引库的位置
+        // 4. 创建Directory目录对象, 指定索引库的位置
         Directory dir = FSDirectory.open(Paths.get("E:\\dir"));
-        //5. 创建输入流对象
+        // 5. 创建输入流对象
         IndexReader indexReader = DirectoryReader.open(dir);
-        //6. 创建搜索对象
+        // 6. 创建搜索对象
         IndexSearcher indexSearcher = new IndexSearcher(indexReader);
-        //7. 搜索, 并返回结果
+        // 7. 搜索, 并返回结果
-        //第二个参数: 是返回多少条数据用于展示, 分页使用
+        // 第二个参数: 是返回多少条数据用于展示, 分页使用
         TopDocs topDocs = indexSearcher.search(query, 10);
 
-        //获取查询到的结果集的总数, 打印
+        // 获取查询到的结果集的总数, 打印
         System.out.println("=======count=======" + topDocs.totalHits);
 
-        //8. 获取结果集
+        // 8. 获取结果集
         ScoreDoc[] scoreDocs = topDocs.scoreDocs;
 
-        //9. 遍历结果集
+        // 9. 遍历结果集
         if (scoreDocs != null) {
             for (ScoreDoc scoreDoc : scoreDocs) {
-                //获取查询到的文档唯一标识, 文档id, 这个id是lucene在创建文档的时候自动分配的
+                // 获取查询到的文档唯一标识, 文档id, 这个id是lucene在创建文档的时候自动分配的
                 int docID = scoreDoc.doc;
-                //通过文档id, 读取文档
+                // 通过文档id, 读取文档
                 Document doc = indexSearcher.doc(docID);
                 System.out.println("==================================================");
-                //通过域名, 从文档中获取域值
+                // 通过域名, 从文档中获取域值
                 System.out.println("===id==" + doc.get("id"));
                 System.out.println("===name==" + doc.get("name"));
                 System.out.println("===price==" + doc.get("price"));
@@ -79,6 +79,6 @@ public class TestSearch {
 
             }
         }
-        //10. 关闭流
+        // 10. 关闭流
     }
 }