build.gradle

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

script/log4j2.properties

@@ -1,40 +0,0 @@
-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.configurationFile=./log4j2.properties -cp "./libs/*:bdcluster.jar" org.bdware.server.NodeCenterServer 1 >./log/nc.log 2>./log/nc.err &
+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 &
 
 #以下可启用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

@@ -18,7 +18,8 @@ public class UDPMessage implements Serializable {
 	int requestID;
 	byte[] content;
 
-    public UDPMessage() {}
+	public UDPMessage() {
+	}
 
 	public void setIsPart(boolean isPart) {
 		this.isPart = isPart ? 1 : 0;

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

@@ -21,21 +21,18 @@ 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;
@@ -59,13 +56,23 @@ public class NodeCenterServer {
         KeyValueDBUtil.setupNC();
 //        TimeDBUtil.setupNC();
         TimeDBUtil.setupNC();
-        Configurator.setLevel("io.netty.handler.codec.http.websocketx.WebSocket08FrameDecoder",
+        Configurator.setLevel(
+                "io.netty.handler.codec.http.websocketx.WebSocket08FrameDecoder",
                 Level.OFF);
-        Configurator.setLevel("io.netty.handler.codec.http.websocketx.WebSocket08FrameEncoder",
+        Configurator.setLevel(
+                "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(":");
@@ -118,29 +125,17 @@ public class NodeCenterServer {
         CMDConf cmf = CMDConf.parseFile(CONFIG_PATH).parseArgs(args);
 
         configServer(cmf);
-        File keyFile = new File("manager.key");
-        if (keyFile.exists()) {
-            try {
-                BufferedReader br = new BufferedReader(new FileReader(keyFile));
-                String pubKey = br.readLine();
-                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) {
-            }
-        }
 
+        if (LocalLHSProxy.enabled) {
+            threadPool = Executors.newSingleThreadExecutor();
+            threadPool.execute(() -> {
+                try {
+                    LocalLHSProxy.start();
+                } catch (Exception e) {
+                    LOGGER.error("local LHS proxy failed: " + e.getMessage());
+                }
+            });
+        }
 
         listenSocket(cmf.servicePort + 1);
         OtherNCProxy.instance.init();
@@ -155,12 +150,16 @@ public class NodeCenterServer {
         EventLoopGroup workerGroup = new NioEventLoopGroup();
         ServerBootstrap b = new ServerBootstrap();
         b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
-        b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class)
+        b.group(bossGroup, workerGroup)
-                .option(ChannelOption.SO_BACKLOG, 100).localAddress(port)
+                .channel(NioServerSocketChannel.class)
-                .childHandler(new ChannelInitializer<SocketChannel>() {
+                .option(ChannelOption.SO_BACKLOG, 100)
+                .localAddress(port)
+                .childHandler(
+                        new ChannelInitializer<SocketChannel>() {
                             @Override
                             protected void initChannel(SocketChannel arg0) {
-                        arg0.pipeline().addLast(new DelimiterCodec())
+                                arg0.pipeline()
+                                        .addLast(new DelimiterCodec())
                                         .addLast(new NodeCenterFrameHandler());
                             }
                         });
@@ -168,8 +167,8 @@ public class NodeCenterServer {
     }
 
     public static void startHttp(int port) {
-        File[] pluginJar =
+        File[] pluginJar = new File("./pluginLib/")
-                new File("./pluginLib/").listFiles(pathname -> pathname.getName().endsWith(".jar"));
+                .listFiles(pathname -> pathname.getName().endsWith(".jar"));
         URL[] urls;
         if (pluginJar != null && pluginJar.length > 0) {
             urls = new URL[pluginJar.length];
@@ -193,7 +192,9 @@ public class NodeCenterServer {
             ServerBootstrap b = new ServerBootstrap();
             ControlledChannelInitializer initializer = new ControlledChannelInitializer();
             b.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
-            b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class).localAddress(port)
+            b.group(bossGroup, workerGroup)
+                    .channel(NioServerSocketChannel.class)
+                    .localAddress(port)
                     .childHandler(initializer);
             final Channel ch = b.bind(port).sync().channel();
             ch.closeFuture().sync();
@@ -225,9 +226,12 @@ public class NodeCenterServer {
             } else {
                 LOGGER.warn("disable ssl");
             }
-            arg0.pipeline().addLast(new HttpServerCodec()).addLast(new HttpObjectAggregator(65536))
+            arg0.pipeline()
+                    .addLast(new HttpServerCodec())
+                    .addLast(new HttpObjectAggregator(65536))
                     .addLast(new WebSocketServerProtocolHandler(PATH, null, true))
-                    .addLast(new ChunkedWriteHandler()).addLast(handler)
+                    .addLast(new ChunkedWriteHandler())
+                    .addLast(handler)
                     .addLast(new NodeCenterWSFrameHandler());
         }
     }

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

@@ -24,8 +24,7 @@ public class DistributeCallback extends ResultCallback {
     int index;
     String distributeID;  //发起节点的分发id
 
-    public DistributeCallback(String ss, String sponID, Map<String, String> n, ResultCallback re,
+    public DistributeCallback(String ss, String sponID, Map<String, String> n, ResultCallback re, String p, String s) {
-            String p, String s) {
         distributeID = ss;
         count = 0;
         index = 1;
@@ -68,15 +67,18 @@ public class DistributeCallback extends ResultCallback {
     public void onDistribute(String progress, String nodeIP) {
         Map<String, String> ret2 = new HashMap<>();
         ret2.put("action", "onDistributeContract");
-        ret2.put("progress", "NC is sending ypk to NO." + index + " node in the units,progress is "
+        ret2.put(
-                + progress + "%.");
+                "progress",
-        if (progress.equals("100.00"))
+                "NC is sending ypk to NO."
-            index++;
+                        + index
+                        + " node in the units,progress is "
+                        + progress
+                        + "%.");
+        if (progress.equals("100.00")) index++;
 
         Map<String, String> map = new HashMap<>();
-        map.put("action", "onDistribute");
+        map.put("action", "onDistributeYPK");
         map.put("responseID", distributeID);
-        map.put("distributeID", distributeID);
         map.put("content", JsonUtil.toJson(ret2));
         map.put("nodeIP", nodeIP);
         map.put("progress", progress);
@@ -84,7 +86,7 @@ public class DistributeCallback extends ResultCallback {
     }
 
     public void onReceive(Map<String, String> map) {
-        LOGGER.info("[DistributeCallback] onReceive :  position----9");
+        LOGGER.debug("[DistributeCallback] onReceive :  position----9");
         String progress = map.get("progress");
         String nodeIP = map.get("ipPort");
         if (progress.equals("100")) {
@@ -93,17 +95,15 @@ public class DistributeCallback extends ResultCallback {
             args.put("pubKey", pubKey);
             args.put("signature", signature);
             count++;
-            LOGGER.info(count + "个节点已收完成" + "   总共有" + nodes.size() + "  个节点");
+            LOGGER.debug(count + "个节点已收完成" + "   总共有" + nodes.size() + "  个节点");
-            if (count >= nodes.size() - 1) {
+            if (count == nodes.size()) {
                 // 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));
@@ -118,29 +118,25 @@ public class DistributeCallback extends ResultCallback {
 
     @Override
     public void onResult(String str) {
-        LOGGER.info("[DistributeCallback] str=" + str);
+        LOGGER.debug("[DistributeCallback] str=" + str);
 
-        Map<String, String> map =
+        Map<String, String> map = JsonUtil.fromJson(str, new TypeToken<Map<String, String>>() {
-                JsonUtil.fromJson(str, new TypeToken<Map<String, String>>() {}.getType());
+        }.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,15 +25,14 @@ public class RequestAllExecutor implements ContractExecutor {
         resultCount = count;
     }
 
-    public ResultCallback createResultCallback(final String requestID,
+    public ResultCallback createResultCallback(
-            final ResultCallback originalCb, int count, String contractID) {
+            final String requestID, final ResultCallback originalCb, int count, String contractID) {
         return new Collector(requestID, originalCb, count, contractID);
     }
 
     //only for test ADSP
 //    public ResultCallback createResultCallback(
-    // final String requestID, final ResultCallback originalCb, int count,String contractID,String
+//            final String requestID, final ResultCallback originalCb, int count,String contractID,String seq) {
-    // seq) {
 //        ResultCallback collector = new Collector(requestID, originalCb, count,contractID,seq);
 //        return collector;
 //    }
@@ -43,7 +42,9 @@ public class RequestAllExecutor implements ContractExecutor {
         for (String node : nodes) {
             CMNode cmNode = NodeCenterActions.nodeInfos.get(node);
             if (cmNode == null) {
-                collector.onResult("{\"status\":\"Error\",\"result\":\"node " + node
+                collector.onResult(
+                        "{\"status\":\"Error\",\"result\":\"node "
+                                + node
                                 + " offline\",\"action\":\"onExecuteContractTrustfully\"}");
             } else {
                 cmNode.connection.controller.sendMsg(req);
@@ -57,8 +58,7 @@ public class RequestAllExecutor implements ContractExecutor {
         String id = jo2.get("contractID").getAsString();
 
         //only for test ADSP
-        // ResultCallback collector = createResultCallback(requestID, rc,
+//        ResultCallback collector = createResultCallback(requestID, rc, resultCount,id,jo2.get("seq").getAsString());
-        // resultCount,id,jo2.get("seq").getAsString());
 
         ResultCallback collector = createResultCallback(requestID, rc, resultCount, id);
 
@@ -156,14 +156,16 @@ public class RequestAllExecutor implements ContractExecutor {
 //                }
 
 
-                /*
+/*                if (cr.status == ContractResult.Status.Error) {   //TODO   规范Status的使用       改成 ==Statuc.Error才恢复
-                 * if (cr.status == ContractResult.Status.Error) { //TODO 规范Status的使用 改成
+                    String nodePubKey = obj.get("nodeID").getAsString();
-                 * ==Statuc.Error才恢复 String nodePubKey = obj.get("nodeID").getAsString();
+                    if(NodeCenterActions.recoverMap.containsKey(nodePubKey)){
-                 * if(NodeCenterActions.recoverMap.containsKey(nodePubKey)){ ContractRecord record =
+                        ContractRecord record = NodeCenterActions.recoverMap.get(nodePubKey).get(contractID);
-                 * NodeCenterActions.recoverMap.get(nodePubKey).get(contractID);
+                        if(record.recoverFlag == RecoverFlag.Fine){
-                 * if(record.recoverFlag == RecoverFlag.Fine){ record.recoverFlag =
+                            record.recoverFlag = RecoverFlag.ToRecover;
-                 * RecoverFlag.ToRecover; MasterActions.restartContracts(nodePubKey); } } }
+                            MasterActions.restartContracts(nodePubKey);
-                 */
+                        }
+                    }
+                }*/
             }
         }
     }

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

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

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

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

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

@@ -0,0 +1,123 @@
+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

@@ -0,0 +1,246 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,257 @@
+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(NCTables.ContractMeta.toString(), desp.contractID,
+            KeyValueDBUtil.instance.setValue(
-                    desp.contractName);
+                    NCTables.ContractMeta.toString(), desp.contractID, desp.contractName);
         }
     }
 
@@ -53,8 +53,7 @@ public class CMNode {
         if (null != contracts) {
             for (ContractDesp desp : contracts) {
                 if (desp.contractID.equals(contractIDOrName)
-                        || desp.contractName.equals(contractIDOrName))
+                        || desp.contractName.equals(contractIDOrName)) return true;
-                    return true;
             }
         }
         return false;
@@ -80,8 +79,7 @@ public class CMNode {
         }
         try {
             if (!connection.controller.isOpen()) {
-                LOGGER.info(
+                LOGGER.info("node " + nodeName + "(" + pubKey.substring(0, 5) + ") may be offline!");
-                        "node " + nodeName + "(" + pubKey.substring(0, 5) + ") may be offline!");
 //                System.out.println(
 //                        new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
 //                                .format(new Date(System.currentTimeMillis()))
@@ -118,7 +116,9 @@ public class CMNode {
         LOGGER.debug("removeCIManager" + string);
         int start = this.cimanager.indexOf(string);
         if (start > 0) {
-            this.cimanager = this.cimanager.substring(0, start)
+            this.cimanager =
+                    this.cimanager
+                            .substring(0, start)
                             .concat(this.cimanager.substring(start + 130));
         }
     }

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

@@ -1,50 +0,0 @@
-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/FileActions.java

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

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

@@ -7,6 +7,7 @@ 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;
 
@@ -32,7 +33,10 @@ public class LogActions {
         resultCallback.onResult(jsonResult);
     }
 
-    private void queryInternal(String actResp, MultiIndexTimeDBUtilIntf db, JsonObject json,
+    private void queryInternal(
+            String actResp,
+            MultiIndexTimeDBUtilIntf db,
+            JsonObject json,
             ResultCallback resultCallback) {
         long start = System.currentTimeMillis();
         if (!json.has("start")) {
@@ -51,18 +55,19 @@ public class LogActions {
         Map<String, Object> data = new HashMap<>();
         for (String str : category) {
             List<JsonObject> array = db.queryByDateAsJson(str, startTime, endTime);
-            if (str == null)
+            if (str == null) data.put("primary", array);
-                data.put("primary", array);
+            else data.put(str, array);
-            else
-                data.put(str, array);
         }
         simpleReply(resultCallback, actResp, data);
         long end = System.currentTimeMillis();
         LOGGER.debug("[queryInternal:time]" + (end - start));
     }
 
-    private void countLogByCategoryInternal(String actResp, MultiIndexTimeDBUtilIntf db,
+    private void countLogByCategoryInternal(
-            JsonObject json, ResultCallback resultCallback) {
+            String actResp,
+            MultiIndexTimeDBUtilIntf db,
+            JsonObject json,
+            ResultCallback resultCallback) {
         if (!json.has("start")) {
             simpleReply(resultCallback, actResp, new ArrayList<>());
             return;
@@ -80,10 +85,8 @@ public class LogActions {
         JsonObject data = new JsonObject();
         for (String str : category) {
             JsonArray array = db.countInInterval(str, startTime, interval, endTime);
-            if (str == null)
+            if (str == null) data.add("primary", array);
-                data.add("primary", array);
+            else data.add(str, array);
-            else
-                data.add(str, array);
         }
         simpleReply(resultCallback, actResp, data);
     }
@@ -95,8 +98,8 @@ public class LogActions {
 
     @Action(userPermission = 1 << 8, async = true)
     public void countActionLogByCategory(JsonObject json, ResultCallback resultCallback) {
-        countLogByCategoryInternal("onCountActionLogByCategory", NodeCenterServer.nodeHttpLogDB,
+        countLogByCategoryInternal(
-                json, resultCallback);
+                "onCountActionLogByCategory", NodeCenterServer.nodeHttpLogDB, json, resultCallback);
     }
 
     @Action(userPermission = 1 << 8, async = true)
@@ -106,8 +109,8 @@ public class LogActions {
 
     @Action(userPermission = 1 << 8, async = true)
     public void countCMLogByCategory(JsonObject json, ResultCallback resultCallback) {
-        countLogByCategoryInternal("onCountCMLogByCategory", NodeCenterServer.nodeTcpLogDB, json,
+        countLogByCategoryInternal(
-                resultCallback);
+                "onCountCMLogByCategory", NodeCenterServer.nodeTcpLogDB, json, resultCallback);
     }
 
     @Action(userPermission = 1 << 9)
@@ -127,7 +130,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.getPubKey(json);
+        final String pubKey = managerAction.pubKey;
         LOGGER.debug("[listNodes] managerAction.pubKey " + pubKey);
         Map<String, CMNode> nodeinfos = NodeCenterActions.nodeInfos; // 所有在线节点?
         final Map<String, CMNode> cinodeinfos = new HashMap<>();
@@ -135,7 +138,8 @@ public class LogActions {
         List<CMNode> onlineNodes = new ArrayList<>();
 
         Map<String, Object> ret = new HashMap<>();
-        if (KeyValueDBUtil.instance.getValue(NCTables.ConfigDB.toString(), "__CenterManager__")
+        if (KeyValueDBUtil.instance
+                .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,15 +12,12 @@ import java.util.concurrent.TimeUnit;
 public class MasterActions {
     private static final Logger LOGGER = LogManager.getLogger(MasterActions.class);
     // TODO  定期清缓存
-    public static Map<String, RequestCache> requestCache = new ConcurrentHashMap<>(); // key is
+    public static Map<String, RequestCache> requestCache =
-                                                                                      // contractID,only
+            new ConcurrentHashMap<>(); // key is contractID,only for requestAll type contract
-                                                                                      // for
-                                                                                      // requestAll
-                                                                                      // type
-                                                                                      // contract
 
     static {
-        NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(() -> {
+        NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(
+                () -> {
                     boolean flag = clearCache();
                     if (flag) {
                         try {
@@ -29,7 +26,10 @@ public class MasterActions {
                             LOGGER.error("sleeping is interrupted! " + e.getMessage());
                         }
                     }
-        }, 0, 0, TimeUnit.SECONDS);
+                },
+                0,
+                0,
+                TimeUnit.SECONDS);
     }
 
     public NodeCenterFrameHandler controller;
@@ -39,156 +39,185 @@ public class MasterActions {
     }
 
     // judge the just online node whwther need to restart contracts,send the contracts'info
-    /*
+    /*    public static void restartContracts(String nodePubKey){
-     * public static void restartContracts(String nodePubKey){
+        if(!NodeCenterActions.recoverMap.containsKey(nodePubKey)){
-     * if(!NodeCenterActions.recoverMap.containsKey(nodePubKey)){ return; }
+            return;
-     * 
+        }
-     * System.out.println("开始恢复节点" + NodeCenterActions.nodeinfos.get(nodePubKey).nodeName);
-     * 
-     * 
-     * // 恢复该节点的每一个集群运行的合约 for (ContractRecord record :
-     * NodeCenterActions.recoverMap.get(nodePubKey).values()) { String contractID =
-     * record.contractID; if (record.recoverFlag != RecoverFlag.ToRecover) continue;
-     * 
-     * Map<String, String> req = new HashMap<String, String>(); req.put("action",
-     * "queryUnitStatus"); req.put("contractID", contractID); CMNode cmNode =
-     * NodeCenterActions.nodeinfos.get(nodePubKey);
-     * cmNode.connection.controller.sendMsg(gson.toJson(req)); } }
-     */
 
-    /*
+        System.out.println("开始恢复节点" + NodeCenterActions.nodeinfos.get(nodePubKey).nodeName);
-     * @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("节点" +
+        for (ContractRecord record : NodeCenterActions.recoverMap.get(nodePubKey).values()) {
-     * NodeCenterActions.nodeinfos.get(args.get("nodeID")).nodeName + "崩溃前模式为" + mode);
+            String contractID = record.contractID;
-     * if(mode.equals(ContractUnitStatus.CommonMode.toString())){
+            if (record.recoverFlag != RecoverFlag.ToRecover)
-     * restartFromCommonMode(nodeID,record); }else
+                continue;
-     * if(mode.equals(ContractUnitStatus.StableMode.toString())){
+
-     * restartFromStableMode(nodeID,record); } }
+            Map<String, String> req = new HashMap<String, String>();
-     */
+            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)
-     * @Action(async = true) public void restartByCommonNode(Map<String, String> args, final
+    public void restartByCommonNode(Map<String, String> args, final ResultCallback rc){
-     * ResultCallback rc){ String nodeID = args.get("nodeID"); String contractID =
+         String nodeID = args.get("nodeID");
-     * args.get("contractID"); ContractRecord record =
+         String contractID = args.get("contractID");
-     * NodeCenterActions.recoverMap.get(nodeID).get(contractID);
+         ContractRecord record = NodeCenterActions.recoverMap.get(nodeID).get(contractID);
-     * restartFromCommonMode(nodeID,record); }
+         restartFromCommonMode(nodeID,record);
-     */
+     }*/
 
     /*
-     * public static void restartFromCommonMode(String nodePubKey,ContractRecord record){
+        public static void restartFromCommonMode(String nodePubKey,ContractRecord record){
-     * logger.debug("从CommonMode中恢复:");
+            logger.debug("从CommonMode中恢复:");
-     * 
+
-     * String contractID = record.contractID;
+            String contractID = record.contractID;
-     * 
+
-     * record.recoverFlag = RecoverFlag.Recovering; //先发消息，让恢复节点的该合约收到消息后只加入队列不dealRequests
+            record.recoverFlag = RecoverFlag.Recovering;
-     * Map<String, String> request = new HashMap<>(); request.put("action", "setRecovering");
+            //先发消息，让恢复节点的该合约收到消息后只加入队列不dealRequests
-     * request.put("contractID",contractID); CMNode node =
+            Map<String, String> request = new HashMap<>();
-     * NodeCenterActions.nodeinfos.get(nodePubKey);
+            request.put("action", "setRecovering");
-     * node.connection.controller.sendMsg(gson.toJson(request));
+            request.put("contractID",contractID);
-     * 
+            CMNode node = NodeCenterActions.nodeinfos.get(nodePubKey);
-     * //System.out.println("第一步 : [NodeCeterActions] restartContracts  开始处理合约  contractID=" +
+            node.connection.controller.sendMsg(gson.toJson(request));
-     * contractID);
+
-     * 
+            //System.out.println("第一步 : [NodeCeterActions] restartContracts  开始处理合约  contractID=" + contractID);
-     * if (NodeCenterActions.contractID2Members.containsKey(contractID)) {
+
-     * 
+            if (NodeCenterActions.contractID2Members.containsKey(contractID)) {
-     * // 在nodeinfos中找节点，该节点的pubKey在pubKeys中 MultiPointContractInfo info =
+
-     * NodeCenterActions.contractID2Members.get(contractID); CMNode cmNode = null; for (int i = 0; i
+                // 在nodeinfos中找节点，该节点的pubKey在pubKeys中
-     * < info.members.size(); i++) { int size = info.members.size(); String tempNodeID =
+                MultiPointContractInfo info = NodeCenterActions.contractID2Members.get(contractID);
-     * info.members.get(record.order.incrementAndGet() % size);
+                CMNode cmNode = null;
-     * 
+                for (int i = 0; i < info.members.size(); i++) {
-     * if(NodeCenterActions.nodeinfos.containsKey(tempNodeID)) cmNode =
+                    int size = info.members.size();
-     * NodeCenterActions.nodeinfos.get(tempNodeID); else continue;
+                    String tempNodeID = info.members.get(record.order.incrementAndGet() % size);
-     * 
+
-     * //System.out.println("查询节点  " + cmNode.nodeName);
+                    if(NodeCenterActions.nodeinfos.containsKey(tempNodeID))
-     * 
+                        cmNode = NodeCenterActions.nodeinfos.get(tempNodeID);
-     * if (cmNode != null && !cmNode.pubKey.equals(nodePubKey)) {
+                    else continue;
-     * //System.out.println("第二步 : [NodeCenterActions] 找到一个依赖恢复节点，其节点名为 " + cmNode.nodeName);
+
-     * 
+                    //System.out.println("查询节点  " + cmNode.nodeName);
-     * Map<String, String> req = new HashMap<String, String>(); req.put("action",
+
-     * "dumpCurrentState"); req.put("contractID", contractID); req.put("targetNodePubkey",
+                    if (cmNode != null && !cmNode.pubKey.equals(nodePubKey)) {
-     * nodePubKey);
+                        //System.out.println("第二步 : [NodeCenterActions] 找到一个依赖恢复节点，其节点名为 " + cmNode.nodeName);
-     * 
+
-     * // NC向该节点发送请求，让其存储自身当前状态并发给NC cmNode.connection.controller.sendMsg(gson.toJson(req));
+                        Map<String, String> req = new HashMap<String, String>();
-     * 
+                        req.put("action", "dumpCurrentState");
-     * return; } }
+                        req.put("contractID", contractID);
-     * 
+                        req.put("targetNodePubkey", nodePubKey);
-     * if(cmNode == null){ logger.debug("[NodeCenterActions] Can't find a recover rely node!"); } }
+
-     * }
+                        // NC向该节点发送请求，让其存储自身当前状态并发给NC
+                        cmNode.connection.controller.sendMsg(gson.toJson(req));
+
+                        return;
+                    }
+                }
+
+                if(cmNode == null){
+                    logger.debug("[NodeCenterActions] Can't find a recover rely node!");
+                }
+            }
+        }
     */
 
     // TODO
-    /*
+    /*    public static void restartFromStableMode(String nodePubkey,ContractRecord record){
-     * public static void restartFromStableMode(String nodePubkey,ContractRecord record){
+        logger.debug("从StableMode中恢复:");
-     * 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;
-     * public static void unitModeCheck(String contractID){ MultiPointContractInfo mpci =
+        record.recoverFlag = RecoverFlag.Recovering;
-     * NodeCenterActions.contractID2Members.get(contractID); int total = 0,online = 0; for(String
+        //先发消息，让恢复节点的该合约收到消息后只加入队列不dealRequests
-     * nodeId : mpci.members){ if(NodeCenterActions.nodeinfos.containsKey(nodeId)){ online++; }
+        Map<String, String> request = new HashMap<>();
-     * total++; }
+        request.put("action", "setRecovering");
-     * 
+        request.put("contractID",contractID);
-     * logger.debug("合约" + contractID + "的集群,上线节点有" + online + "个,总共节点有" + total +
+        request.put("mode", ContractUnitStatus.StableMode.toString());
-     * "个.  Math.ceil(total / 2)=" + Math.ceil((double)total / 2) +
+        int lastExeSeq = NodeCenterActions.contractID2Members.get(contractID).ai.get() - 1;
-     * "  online > Math.ceil(total / 2)" + (online > Math.ceil(total / 2)) + "  mpci.unitStatus=" +
+        request.put("lastExeSeq",lastExeSeq + "");
-     * mpci.unitStatus); if(online > Math.ceil((double)total / 2) && mpci.unitStatus ==
+        CMNode node = NodeCenterActions.nodeinfos.get(nodePubkey);
-     * ContractUnitStatus.StableMode){ logger.debug("合约" + contractID + "的集群更改模式为" +
+        node.connection.controller.sendMsg(gson.toJson(request));
-     * 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){
-     * @Action(async = true) public void recoverFinish(Map<String, String> args, final
+        MultiPointContractInfo mpci = NodeCenterActions.contractID2Members.get(contractID);
-     * ResultCallback rc) { ContractRecord cr =
+        int total = 0,online = 0;
-     * NodeCenterActions.recoverMap.get(args.get("nodeID")).get(args.get("contractID"));
+        for(String nodeId : mpci.members){
-     * logger.debug("节点" + NodeCenterActions.nodeinfos.get(args.get("nodeID")).nodeName + "恢复完成!");
+            if(NodeCenterActions.nodeinfos.containsKey(nodeId)){
-     * if(cr.recoverFlag == RecoverFlag.Recovering) cr.recoverFlag = RecoverFlag.Fine;
+                online++;
-     * 
+            }
-     * logger.debug("恢复完成，需要检查合约" + args.get("contractID") + "的集群运行模式");
+            total++;
-     * 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())
+        if (requestCache.isEmpty()) return true;
-            return true;
 
         //        final long time = System.currentTimeMillis() - 60000L;   //60s
         //        requestCache.entrySet()
@@ -224,8 +253,7 @@ public class MasterActions {
     static RequestCache getCache(String contractID) {
         if (contractID != null) {
             RequestCache cache = requestCache.get(contractID);
-            if (cache != null)
+            if (cache != null) return cache;
-                return cache;
             else {
                 LOGGER.debug("[NodeCenterActions] create requestcache:" + contractID);
                 RequestCache reqc = new RequestCache();
@@ -236,17 +264,26 @@ public class MasterActions {
         return null;
     }
 
-    /*
+    /*    @Action(async = true)
-     * @Action(async = true) public void sendCachedRequests(Map<String, String> args, final
+    public void sendCachedRequests(Map<String, String> args, final ResultCallback rc) {
-     * ResultCallback rc) { String contractID = args.get("contractID"); int start =
+        String contractID = args.get("contractID");
-     * Integer.parseInt(args.get("start")); int end = Integer.parseInt(args.get("end"));
+        int start = Integer.parseInt(args.get("start"));
-     * 
+        int end = Integer.parseInt(args.get("end"));
-     * RequestCache cache = getCache(contractID); for(int i = start + 1;i < end;i++){ if(cache ==
+
-     * null || !cache.containsKey(i)){ //this node crash String nodeID = args.get("nodeID");
+        RequestCache cache = getCache(contractID);
-     * MasterActions.restartContracts(nodeID); } JsonObject jo = cache.get(i); if(jo == null){
+        for(int i = start + 1;i < end;i++){
-     * logger.debug("在NC中第 " + i + "个请求已经被清,无法发给恢复节点!"); }else
+            if(cache == null || !cache.containsKey(i)){
-     * controller.sendMsg(JsonUtil.toJson(jo));
+                //this node crash
-     * 
+                String nodeID = args.get("nodeID");
-     * logger.debug("NC发送第 " + i + "    " + jo.get("seq").getAsString() + " 个请求给Node"); } }
+                MasterActions.restartContracts(nodeID);
-     */
+            }
+            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,7 +28,11 @@ import org.bdware.server.nodecenter.searchresult.ContractMeta;
 import org.bdware.server.nodecenter.searchresult.ResultModel;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+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;
@@ -90,8 +94,7 @@ 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
+                    if (null != thisDesp.contractName && (docs.scoreDocs == null || docs.scoreDocs.length == 0)) {
-                            && (docs.scoreDocs == null || docs.scoreDocs.length == 0)) {
                         req.addProperty("action", "requestReadMe");
                         req.addProperty("contractID", thisDesp.contractID);
                         rc.onResult(req);
@@ -102,9 +105,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) {
@@ -129,8 +132,7 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     public static void delIndexbyCID(JsonObject jo) {
         try {
-            if (!jo.has("contractID"))
+            if (!jo.has("contractID")) return;
-                return;
             String contractID = jo.get("contractID").getAsString();
             LOGGER.info("contractID:" + contractID + "-->actually to delete");
             indexWriter.deleteDocuments(new Term("contractID", contractID));
@@ -142,8 +144,7 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     public static void delIndexbyOwner(JsonObject jo) {
         try {
-            if (!jo.has("owner"))
+            if (!jo.has("owner")) return;
-                return;
             String owner = jo.get("owner").getAsString();
             LOGGER.info("owner:" + owner + "-->actually to delete");
             indexWriter.deleteDocuments(new Term("owner", owner));
@@ -191,17 +192,12 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     public static String getMetabyReadme(JsonObject jo) {
         try {
-            if (!jo.has("keyword"))
+            if (!jo.has("keyword")) return "missing arguments: keyword";
-                return "missing arguments: keyword";
 
-            if (!jo.has("page"))
+            if (!jo.has("page")) page = 1;
-                page = 1;
+            else page = jo.get("page").getAsInt();
-            else
+            if (page <= 0) page = 1;
-                page = jo.get("page").getAsInt();
+            if (jo.has("pageSize")) PAGE_SIZE = jo.get("pageSize").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();
@@ -239,15 +235,11 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     private static String getMetabyPubkey(JsonObject jo) {
         try {
-            if (!jo.has("pubkey"))
+            if (!jo.has("pubkey")) return "missing arguments: pubkey";
-                return "missing arguments: pubkey";
 
-            if (!jo.has("page"))
+            if (!jo.has("page")) page = 1;
-                page = 1;
+            else page = jo.get("page").getAsInt();
-            else
+            if (page <= 0) page = 1;
-                page = jo.get("page").getAsInt();
-            if (page <= 0)
-                page = 1;
 
             String pubkey = jo.get("pubkey").getAsString();
             DirectoryReader indexReader = DirectoryReader.open(indexDir);
@@ -283,15 +275,11 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
     private static String getMetabyCID(JsonObject jo) {
         System.out.println("getMetabyCID" + jo.toString());
         try {
-            if (!jo.has("contractID"))
+            if (!jo.has("contractID")) return "missing arguments: contractID";
-                return "missing arguments: contractID";
 
-            if (!jo.has("page"))
+            if (!jo.has("page")) page = 1;
-                page = 1;
+            else page = jo.get("page").getAsInt();
-            else
+            if (page <= 0) page = 1;
-                page = jo.get("page").getAsInt();
-            if (page <= 0)
-                page = 1;
 
             String contractID = jo.get("contractID").getAsString();
             DirectoryReader indexReader = DirectoryReader.open(indexDir);
@@ -326,17 +314,12 @@ public class MetaIndexAction { // public static IndexWriter indexWriter;
 
     private static String getMetabyOwner(JsonObject jo) {
         try {
-            if (!jo.has("owner"))
+            if (!jo.has("owner")) return "missing arguments: owner";
-                return "missing arguments: owner";
 
-            if (!jo.has("page"))
+            if (!jo.has("page")) page = 1;
-                page = 1;
+            else page = jo.get("page").getAsInt();
-            else
+            if (page <= 0) page = 1;
-                page = jo.get("page").getAsInt();
+            if (jo.has("pageSize")) PAGE_SIZE = jo.get("pageSize").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);
@@ -371,15 +354,18 @@ 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(new FuzzyQuery(new Term("contractID", req.get("contractID").getAsString())),
+            query.add(
+                    new FuzzyQuery(new Term("contractID", req.get("contractID").getAsString())),
                     BooleanClause.Occur.SHOULD);
         }
         if (req.get("owner").getAsString() != null) {
-            query.add(new FuzzyQuery(new Term("owner", req.get("owner").getAsString())),
+            query.add(
+                    new FuzzyQuery(new Term("owner", req.get("owner").getAsString())),
                     BooleanClause.Occur.SHOULD);
         }
         if (req.get("pubkey").getAsString() != null) {
-            query.add(new PrefixQuery(new Term("pubkey", req.get("pubkey").getAsString())),
+            query.add(
+                    new PrefixQuery(new Term("pubkey", req.get("pubkey").getAsString())),
                     BooleanClause.Occur.SHOULD);
         }
         if (req.get("readmeStr").getAsString() != null) {
@@ -418,7 +404,8 @@ 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 + 1
+                docs.totalHits.value % PAGE_SIZE > 0
+                        ? (docs.totalHits.value) / PAGE_SIZE + 1
                         : (docs.totalHits.value) / PAGE_SIZE;
         resultModel.setPageCount(pageCount);
         return resultModel;
@@ -438,7 +425,11 @@ 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("node.masterAddress: " + node.masterAddress + "==========" + "nodeAddr: "
+        System.out.println(
+                "node.masterAddress: "
+                        + node.masterAddress
+                        + "=========="
+                        + "nodeAddr: "
                         + nodeAddr);
         System.out.println("name: " + name + "pngUrl: " + pngUrl);
         String contractID = json.get("contractID").getAsString();
@@ -478,8 +469,7 @@ 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"))
+        if (json.has("requestID")) object.add("responseID", json.get("requestID"));
-            object.add("responseID", json.get("requestID"));
         System.out.println("zzzResult" + result);
         object.add("result", JsonParser.parseString(result));
         object.addProperty("action", "getMetabyReadme");
@@ -489,18 +479,14 @@ 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);
-        CharArraySet stopWords =
+        CharArraySet stopWords = CharArraySet.unmodifiableSet(WordlistLoader.getWordSet(new InputStreamReader(Objects.requireNonNull(MetaIndexAction.class.getClassLoader().getResourceAsStream(
-                CharArraySet.unmodifiableSet(WordlistLoader.getWordSet(new InputStreamReader(
+                "org/bdware/server/stopwords.txt")), StandardCharsets.UTF_8)));
-                        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"))
+        if (json.has("requestID")) object.add("responseID", json.get("requestID"));
-            object.add("responseID", json.get("requestID"));
         try {
             stream = analyzer.tokenStream("myfield", words);
             CharTermAttribute charTermAtt = stream.addAttribute(CharTermAttribute.class);
@@ -529,8 +515,7 @@ 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"))
+        if (json.has("requestID")) object.add("responseID", json.get("requestID"));
-            object.add("responseID", json.get("requestID"));
         object.add("result", JsonParser.parseString(result));
         object.addProperty("action", "getMetabyCID");
         rc.onResult(object);
@@ -540,8 +525,7 @@ 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"))
+        if (json.has("requestID")) object.add("responseID", json.get("requestID"));
-            object.add("responseID", json.get("requestID"));
         object.add("result", JsonParser.parseString(result));
         object.addProperty("action", "getMetabyOwner");
         rc.onResult(object);
@@ -551,8 +535,7 @@ 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"))
+        if (json.has("requestID")) object.add("responseID", json.get("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/NCClientActions.java

@@ -35,9 +35,8 @@ public class NCClientActions {
         map.put("id", OtherNCProxy.instance.sm2.getPublicKeyStr());
         byte[] signature = "no signature".getBytes();
         try {
-            signature = SM2Util.sign(OtherNCProxy.instance.sm2.getPrivateKeyParameter(),
+            signature = SM2Util.sign(OtherNCProxy.instance.sm2.getPrivateKeyParameter(), (OtherNCProxy.instance.sm2.getPublicKeyStr() + json.get("session").getAsString())
-                    (OtherNCProxy.instance.sm2.getPublicKeyStr()
+                    .getBytes());
-                            + json.get("session").getAsString()).getBytes());
         } catch (CryptoException e) {
             e.printStackTrace();
         }
@@ -63,8 +62,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(),
+            info = JsonUtil.fromJson(json.get("contracts").getAsString(), new TypeToken<List<OtherNCInfo>>() {
-                    new TypeToken<List<OtherNCInfo>>() {}.getType());
+            }.getType());
         }
 
         LOGGER.info(JsonUtil.toJson(info));

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

@@ -67,11 +67,16 @@ public class NCClientHandler extends SimpleChannelInboundHandler<Object> {
     protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
         ByteBuf bb = (ByteBuf) msg;
         try {
-            final JsonObject arg = new JsonParser()
+            final JsonObject arg =
-                    .parse(new InputStreamReader(new ByteBufInputStream(bb))).getAsJsonObject();
+                    new JsonParser()
+                            .parse(new InputStreamReader(new ByteBufInputStream(bb)))
+                            .getAsJsonObject();
             if (arg.has("action")) {
                 final String action = arg.get("action").getAsString();
-                ae.handle(action, arg, new ResultCallback() {
+                ae.handle(
+                        action,
+                        arg,
+                        new ResultCallback() {
                             @Override
                             public void onResult(String str) {
                                 sendMsg(str);
@@ -95,8 +100,7 @@ public class NCClientHandler extends SimpleChannelInboundHandler<Object> {
     public void close() {
         try {
             isConnected = false;
-            if (channel != null)
+            if (channel != null) channel.close();
-                channel.close();
         } catch (Exception e) {
             e.printStackTrace();
         } finally {

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

@@ -15,8 +15,7 @@ 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
+    public static final Map<String, ElectInfo> electInfos = new ConcurrentHashMap<>();   //key is contractID
-                                                                                       // contractID
     private static final Logger LOGGER = LogManager.getLogger(NCElectMasterUtil.class);
 
     public static class ElectInfo {
@@ -39,10 +38,11 @@ public class NCElectMasterUtil {
             uniNumber = uni;
             String[] mem = members.split(",");
 
-            /*
+/*            try {
-             * try { Thread.sleep(2000); //让NC发现崩溃节点 } catch (InterruptedException e) {
+                Thread.sleep(2000);   //让NC发现崩溃节点
-             * e.printStackTrace(); }
+            } catch (InterruptedException e) {
-             */
+                e.printStackTrace();
+            }*/
 
             for (String memID : mem) {
                 if (memID == null || memID.length() == 0)
@@ -52,7 +52,8 @@ 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)) {
@@ -63,11 +64,14 @@ public class NCElectMasterUtil {
 //                        if (electInfos.containsKey(contractID) && nodeID2LastExe.size() == onlineNum) {
 //                            elect();
 //                        }
-            }, delay + 1500, delay + 1500, TimeUnit.MILLISECONDS);
+                    },
+                    delay + 1500,
+                    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() {
@@ -80,8 +84,7 @@ public class NCElectMasterUtil {
             }
         }
 
-        public synchronized void put(String nodeID, int lastExe, String master, String mem2,
+        public synchronized void put(String nodeID, int lastExe, String master, String mem2, String uniNum) {
-                String uniNum) {
             LOGGER.info("put  nodeID=" + nodeID);
 
             //确保该合约某时只能有一个选举,其他的选举请求被忽略
@@ -108,8 +111,7 @@ public class NCElectMasterUtil {
                 cancel();
                 synchronized (electInfos) {
                     //electInfos.remove(contractID);
-                    NCElectMasterUtil.electInfos.put(contractID,
+                    NCElectMasterUtil.electInfos.put(contractID, new ElectInfo(master, contractID, mem2, uniNum));
-                            new ElectInfo(master, contractID, mem2, uniNum));
                     ElectInfo eleInfo = electInfos.get(contractID);
                     eleInfo.put(nodeID, lastExe, master, mem2, uniNum);
                 }
@@ -141,11 +143,9 @@ public class NCElectMasterUtil {
                 if (node != null) {
                     synchronized (node) {
                         for (ContractDesp cd : node.contracts) {
-                            if (cd.contractID.equals(contractID)
+                            if (cd.contractID.equals(contractID) || cd.contractName.equals(contractID)) {
-                                    || cd.contractName.equals(contractID)) {
                                 cd.setIsMaster(false);
-                                LOGGER.debug("设置节点 " + node.pubKey.substring(0, 5) + " 的合约 "
+                                LOGGER.debug("设置节点 " + node.pubKey.substring(0, 5) + " 的合约 " + contractID + " isMaster=" + false);
-                                        + contractID + " isMaster=" + false);
                                 break;
                             }
                         }

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

@@ -1,8 +1,10 @@
 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;
@@ -20,15 +22,13 @@ 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.HttpMethod;
+import org.bdware.server.http.HttpFileHandleAdapter;
-import org.bdware.server.http.*;
+import org.bdware.server.http.URIHandler;
+import org.bdware.server.http.URIPath;
 import org.bdware.server.permission.Role;
 import org.zz.gmhelper.SM2Util;
 
-import java.io.ByteArrayOutputStream;
+import java.io.*;
-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,12 +43,9 @@ 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>(NodeCenterFrameHandler.executorService,
+            new ActionExecutor<ResultCallback, JsonObject>(
-                    new NodeCenterActions(null), managerAction, logActions, unitActions) {
+                    NodeCenterFrameHandler.executorService, new NodeCenterActions(null)) {
 
                 @Override
                 public boolean checkPermission(Action a, JsonObject arg, long per) {
@@ -76,9 +73,15 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
                     if (arg.has("pubKey")) {
                         pubkey = arg.get("pubKey").getAsString();
                     }
-                    NodeCenterServer.nodeHttpLogDB.put(action,
+                    NodeCenterServer.nodeHttpLogDB.put(
-                            "{\"action\":\"" + action + "\",\"pubKey\":\"" + pubkey + "\",\"date\":"
+                            action,
-                                    + System.currentTimeMillis() + "}");
+                            "{\"action\":\""
+                                    + action
+                                    + "\",\"pubKey\":\""
+                                    + pubkey
+                                    + "\",\"date\":"
+                                    + System.currentTimeMillis()
+                                    + "}");
                     LOGGER.debug("[NCHttpHandler] flag = " + flag + "  flag2 = " + flag2);
                     return flag && flag2;
                 }
@@ -115,57 +118,42 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
         ctx.flush();
     }
 
-    public static class VerifiyCallback implements ArgParser.VerifiedCallback {
-
-        @Override
-        public void onResult(boolean verified, JsonObject transformedParam) {
-            LOGGER.info("verify signature: " + verified);
-            if (verified) {
-                // 查permission
-                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 + "");
-            }
-        }
-    }
-
-    @URIPath(method = HttpMethod.OPTIONS)
-    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 {
+    public void parseGetAndHandle(ChannelHandlerContext ctx, FullHttpRequest req) {
-        JsonObject transformedParam = ArgParser.parseGetAndVerify(req, new VerifiyCallback());
+        QueryStringDecoder decoderQuery = new QueryStringDecoder(req.uri());
-        handleReq(transformedParam, ctx);
+        Map<String, List<String>> params = decoderQuery.parameters();
+        JsonObject map = new JsonObject();
+        for (String key : params.keySet()) {
+            List<String> val = params.get(key);
+            if (val != null) map.addProperty(key, val.get(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(method = org.bdware.server.http.HttpMethod.POST,
+    @URIPath(
+            method = org.bdware.server.http.HttpMethod.POST,
             value = {"/NodeCenter", "/SCIDE/SCExecutor", "/SCIDE/CMManager", "/SCIDE/SCManager"})
     public void parsePostAndHandle(ChannelHandlerContext ctx, FullHttpRequest req)
-            throws Exception {
+            throws UnsupportedEncodingException {
-        JsonObject map = ArgParser.parsePostAndVerify(req, new VerifiyCallback());
+        ByteBuf content = req.content();
-        // injectPermission(map, str);
+        JsonObject map =
+                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);
     }
 
@@ -175,13 +163,14 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
         JsonObject transformedParam = new JsonObject();
         for (String key : parameters.keySet()) {
             List<String> val = parameters.get(key);
-            if (val != null)
+            if (val != null) transformedParam.addProperty(key, val.get(0));
-                transformedParam.addProperty(key, val.get(0));
         }
         return transformedParam;
     }
 
-    @URIPath(method = org.bdware.server.http.HttpMethod.GET, value = {"/doip"})
+    @URIPath(
+            method = org.bdware.server.http.HttpMethod.GET,
+            value = {"/doip"})
     public void handleDOIP(ChannelHandlerContext ctx, FullHttpRequest req) {
         ByteBuf content = req.content();
         JsonObject map = parseArgInQuery(req);
@@ -194,10 +183,11 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
         }
         injectPermission(map, str);
 
-        DefaultFullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, OK,
+        DefaultFullHttpResponse response =
+                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);
 
@@ -206,17 +196,19 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
 
     @Override
     public void channelRead0(ChannelHandlerContext ctx, HttpObject msg) {
-        LOGGER.debug("[NCHttpHandler] TID:" + Thread.currentThread().getId() + msg.toString());
+        //		logger.debug("[NCHttpHandler] TID:" + Thread.currentThread().getId() +
+        // msg.toString());
         if (msg instanceof FullHttpRequest) {
             FullHttpRequest request = (FullHttpRequest) msg;
             handler.handle(ctx, request);
         }
     }
 
-    public static String getRole(String pubKey) {
+    public String getRole(String pubKey) {
         try {
-            String ret = KeyValueDBUtil.instance.getValue(NCTables.ConfigDB.toString(),
+            String ret =
-                    "__CenterManager__");
+                    KeyValueDBUtil.instance.getValue(
+                            NCTables.ConfigDB.toString(), "__CenterManager__");
             if (ret != null && ret.length() > 0) {
                 boolean isCenterManager = (ret.equals(pubKey)); // 表示此节点是否是平台管理员
                 ret = KeyValueDBUtil.instance.getValue(NCTables.NodeUser.toString(), pubKey);
@@ -246,6 +238,7 @@ 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);
@@ -287,33 +280,30 @@ 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
+                    else cb = new HttpResultCallback(ctx, null);
-                        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 = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
+                DefaultFullHttpResponse response =
-                        OK, Unpooled.wrappedBuffer(ret.getBytes()));
+                        new DefaultFullHttpResponse(
-                response.headers().add("Access-Control-Allow-Origin", "*");
+                                HttpVersion.HTTP_1_1, OK, Unpooled.wrappedBuffer(ret.getBytes()));
-                response.headers().add("Access-Control-Allow-Methods", "*");
                 ChannelFuture f = ctx.write(response);
                 f.addListener(ChannelFutureListener.CLOSE);
             }
         } catch (IllegalArgumentException e) {
-            DefaultFullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, OK,
+            DefaultFullHttpResponse response =
+                    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);
 
@@ -322,10 +312,11 @@ public class NCHttpHandler extends SimpleChannelInboundHandler<HttpObject> {
             ByteArrayOutputStream bo = new ByteArrayOutputStream();
             e.printStackTrace(new PrintStream(bo));
             ret.put("msg", bo.toString());
-            DefaultFullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, OK,
+            DefaultFullHttpResponse response =
+                    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,34 +27,27 @@ public class NCManagerAction {
     public static final String centerManger = "__CenterManager__";
     public static final String clusterName = "__ClusterName__";
     static final String Licence = "__LICENCE___";
-    static final ECPublicKeyParameters licencePub = BCECUtil.createECPublicKeyFromStrParameters(
+    static final ECPublicKeyParameters licencePub =
+            BCECUtil.createECPublicKeyFromStrParameters(
                     "04844412ecb77b07d5ad7097c488ae9dff1013b310d2311f8bd84c491642011e1a6a7041bae8c2ad75da29c27e320bd430abc723cf6bcb0490afc82cc26e6d5637",
-            SM2Util.CURVE, SM2Util.DOMAIN_PARAMS);
+                    SM2Util.CURVE,
+                    SM2Util.DOMAIN_PARAMS);
     private static final Logger LOGGER = LogManager.getLogger(NCManagerAction.class);
     String sessionID = null;
-    private String publicKey;
+    String pubKey;
     Random random = new Random();
     private NodeCenterWSFrameHandler handler;
 
     public NCManagerAction(NodeCenterWSFrameHandler nodeCenterWSFrameHandler) {
         this.handler = nodeCenterWSFrameHandler;
-        publicKey = null;
+        pubKey = 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) && !StringUtil.isNullOrEmpty(pubkey)
+        return !StringUtil.isNullOrEmpty(ret)
+                && !StringUtil.isNullOrEmpty(pubkey)
                 && pubkey.equals(ret);
     }
 
@@ -102,8 +95,8 @@ public class NCManagerAction {
     @Action(userPermission = 0)
     public void setClusterName(JsonObject json, ResultCallback resultCallback) {
         if (json.has("name")) {
-            KeyValueDBUtil.instance.setValue(NCTables.ConfigDB.toString(), clusterName,
+            KeyValueDBUtil.instance.setValue(
-                    json.get("name").getAsString());
+                    NCTables.ConfigDB.toString(), clusterName, json.get("name").getAsString());
             simpleReply(resultCallback, "onSetClusterName", "success");
         } else {
             simpleReply(resultCallback, "onSetClusterName", "failed");
@@ -111,7 +104,6 @@ public class NCManagerAction {
     }
 
     public void getRole(JsonObject json, ResultCallback resultCallback) {
-        String pubKey = getPubKey(json);
         if (pubKey == null) {
             simpleReply(resultCallback, "onLogin", Role.Anonymous.name());
             return;
@@ -134,14 +126,13 @@ 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(NCTables.ConfigDB.toString(), centerManger,
+                KeyValueDBUtil.instance.setValue(
-                        pubKey);
+                        NCTables.ConfigDB.toString(), centerManger, pubKey);
-                KeyValueDBUtil.instance.setValue(NCTables.ConfigDB.toString(), clusterName,
+                KeyValueDBUtil.instance.setValue(
-                        "clusterName_" + pubKey.substring(0, 5));
+                        NCTables.ConfigDB.toString(), clusterName, "clusterName_" + pubKey.substring(0, 5));
                 handler.setPermission(0x30000ffL);
                 simpleReply(resultCallback, "onLogin", "CenterManager");
             }
@@ -165,7 +156,7 @@ public class NCManagerAction {
         boolean result = SM2Util.plainStrVerify(pubKey, sessionID, signature);
         LOGGER.debug("session:" + (sessionID));
         if (result) {
-            this.publicKey = pubKey;
+            this.pubKey = pubKey;
             LOGGER.debug("设置公钥" + pubKey);
             getRole(json, resultCallback);
         } else {
@@ -175,40 +166,8 @@ 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");
@@ -217,7 +176,7 @@ public class NCManagerAction {
         if (json.has("role")) {
             Role role = Role.parse(json.get("role").getAsString());
             if (role != Role.Anonymous) {
-                applyAtDB(role, getPubKey(json), resultCallback, start);
+                applyAtDB(role, resultCallback, start);
                 return;
             }
         }
@@ -227,10 +186,14 @@ public class NCManagerAction {
     @Action(userPermission = 1 << 6)
     public void addNode(JsonObject json, ResultCallback resultCallback) {
         try {
-            KeyValueDBUtil.instance.setValue(NCTables.NodeUser.toString(),
+            KeyValueDBUtil.instance.setValue(
-                    json.get("nodePubKey").getAsString(), Role.Node.toString());
+                    NCTables.NodeUser.toString(),
-            KeyValueDBUtil.instance.setValue(NCTables.NodeTime.toString(),
+                    json.get("nodePubKey").getAsString(),
-                    json.get("nodePubKey").getAsString(), Long.toString(new Date().getTime()));
+                    Role.Node.toString());
+            KeyValueDBUtil.instance.setValue(
+                    NCTables.NodeTime.toString(),
+                    json.get("nodePubKey").getAsString(),
+                    Long.toString(new Date().getTime()));
             simpleReply(resultCallback, "onAddNodes", "success");
         } catch (Exception e) {
             e.printStackTrace();
@@ -238,9 +201,7 @@ public class NCManagerAction {
         }
     }
 
-    private void applyAtDB(Role role, String pubKey, ResultCallback resultCallback, long start) {
+    private void applyAtDB(Role role, 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())) {
@@ -249,14 +210,14 @@ public class NCManagerAction {
         }
         if (str == null || str.length() == 0) {
             KeyValueDBUtil.instance.setValue(NCTables.ApplyRole.toString(), pubKey, role.name());
-            KeyValueDBUtil.instance.setValue(NCTables.ApplyTime.toString(), pubKey,
+            KeyValueDBUtil.instance.setValue(
-                    Long.toString(new Date().getTime()));
+                    NCTables.ApplyTime.toString(), pubKey, Long.toString(new Date().getTime()));
         } else {
             if (!str.contains(role.name())) {
-                KeyValueDBUtil.instance.setValue(NCTables.ApplyRole.toString(), pubKey,
+                KeyValueDBUtil.instance.setValue(
-                        str + "," + role.name());
+                        NCTables.ApplyRole.toString(), pubKey, str + "," + role.name());
-                KeyValueDBUtil.instance.setValue(NCTables.ApplyTime.toString(), pubKey,
+                KeyValueDBUtil.instance.setValue(
-                        Long.toString(new Date().getTime()));
+                        NCTables.ApplyTime.toString(), pubKey, Long.toString(new Date().getTime()));
             }
         }
         simpleReply(resultCallback, "onApplyRole", "success!");
@@ -280,9 +241,6 @@ 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");
@@ -308,8 +266,8 @@ public class NCManagerAction {
             already = roles;
         }
         KeyValueDBUtil.instance.setValue(NCTables.NodeUser.toString(), pubKey, already);
-        KeyValueDBUtil.instance.setValue(NCTables.NodeTime.toString(), pubKey,
+        KeyValueDBUtil.instance.setValue(
-                Long.toString(new Date().getTime()));
+                NCTables.NodeTime.toString(), pubKey, Long.toString(new Date().getTime()));
         KeyValueDBUtil.instance.delete(NCTables.ApplyRole.toString(), pubKey);
         KeyValueDBUtil.instance.delete(NCTables.ApplyTime.toString(), pubKey);
         simpleReply(resultCallback, "onAuthNodeManager", "success");
@@ -443,14 +401,13 @@ public class NCManagerAction {
                 SM2Util.verify(licencePub, content.getBytes(), ByteUtils.fromHexString(sign));
 
         if (verify) {
-            KeyValueDBUtil.instance.setValue(NCTables.ConfigDB.toString(), Licence,
+            KeyValueDBUtil.instance.setValue(
-                    json.toString());
+                    NCTables.ConfigDB.toString(), Licence, json.toString());
             simpleReply(resultCallback, "onUpdateLicence", "success");
             long end = System.currentTimeMillis();
             LOGGER.debug("[listLicence:time]" + (end - start));
             return;
-        } else
+        } else simpleReply(resultCallback, "onUpdateLicence", "failed");
-            simpleReply(resultCallback, "onUpdateLicence", "failed");
         long end = System.currentTimeMillis();
         LOGGER.debug("[updateLicence:time]" + (end - start));
     }
@@ -534,8 +491,14 @@ public class NCManagerAction {
 
         Map<String, String> result = new HashMap<>();
         result.put("action", "onTransfer");
-        result.put("data", "now start transfer contract " + contractID + " from node:" + node1ID
+        result.put(
-                + " to node:" + node2ID);
+                "data",
+                "now start transfer contract "
+                        + contractID
+                        + " from node:"
+                        + node1ID
+                        + " to node:"
+                        + node2ID);
         resultCallback.onResult(result);
     }
 }

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

@@ -1,7 +1,19 @@
 package org.bdware.server.nodecenter;
 
 public enum NCTables {
-    NodeUser, NodeTime, ApplyRole, ApplyTime, NodeHttpLog, ContractMeta, ConfigDB, NodeTcpLog, NodesDB, TrustUnitsDB, OtherNCs, NCFile, ApplyNodeManager;
+    NodeUser,
+    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,8 +82,11 @@ public class NCUDPRunner extends Thread {
     private void onUDPMessage(UDPMessage msg, DatagramPacket request) {
         switch (msg.type) {
             case shakeHand:
-                LOGGER.debug("[NCUDPRunner] shakeHand:" + request.getAddress().getHostAddress()
+                LOGGER.debug(
-                        + ":" + request.getPort());
+                        "[NCUDPRunner] shakeHand:"
+                                + request.getAddress().getHostAddress()
+                                + ":"
+                                + request.getPort());
                 id2IP.put(msg.id, new UDPNode(request.getSocketAddress()));
             default:
         }

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

@@ -34,10 +34,12 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
         this.actions = new NodeCenterActions(this);
         MetaIndexAction.controller = this;
         // TODO 添加那个UnitAction.
-        ae = new ActionExecutor<ResultCallback, JsonObject>(executorService, actions,
+        ae =
-                new MetaIndexAction()) {
+                new ActionExecutor<ResultCallback, JsonObject>(
+                        executorService, actions, new MetaIndexAction()) {
                     @Override
-            public boolean checkPermission(Action a, final JsonObject args, long permission) {
+                    public boolean checkPermission(
+                            Action a, final JsonObject args, long permission) {
                         long val = a.userPermission();
                         boolean flag;
                         String status = "refuse";
@@ -52,10 +54,17 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
                             flag = false;
                         }
                         if (!action.contains("checkAlive"))
-                    NodeCenterServer.nodeTcpLogDB.put(action,
+                            NodeCenterServer.nodeTcpLogDB.put(
-                            "{\"action\":\"" + action + "\",\"pubKey\":\"" + pubKey
+                                    action,
-                                    + "\",\"status\":\"" + status + "\",\"date\":"
+                                    "{\"action\":\""
-                                    + System.currentTimeMillis() + "}");
+                                            + action
+                                            + "\",\"pubKey\":\""
+                                            + pubKey
+                                            + "\",\"status\":\""
+                                            + status
+                                            + "\",\"date\":"
+                                            + System.currentTimeMillis()
+                                            + "}");
                         return flag;
                     }
                 };
@@ -71,8 +80,9 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
         this.ctx = ctx;
         JsonObject map;
         try {
-            map = JsonParser
+            map =
-                    .parseReader(new InputStreamReader(new ByteBufInputStream((ByteBuf) frame)))
+                    JsonParser.parseReader(
+                                    new InputStreamReader(new ByteBufInputStream((ByteBuf) frame)))
                             .getAsJsonObject();
 
         } catch (Exception e) {
@@ -83,7 +93,10 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
         try {
             final String action = map.get("action").getAsString();
             // System.out.println("[NodeCenterFramHandler] handle:" + action);
-            ae.handle(action, map, new ResultCallback() {
+            ae.handle(
+                    action,
+                    map,
+                    new ResultCallback() {
                         @Override
                         public void onResult(String ret) {
                             sendMsg(ret);
@@ -104,9 +117,12 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
             StringBuilder ret = new StringBuilder();
             int count = 0;
             for (String s : strs) {
-                if (s.contains("sun.reflect") || s.contains("java.lang.reflect")
+                if (s.contains("sun.reflect")
-                        || s.contains("org.apache") || s.contains("java.util")
+                        || s.contains("java.lang.reflect")
-                        || s.contains("java.lang") || s.contains("io.netty")) {
+                        || s.contains("org.apache")
+                        || s.contains("java.util")
+                        || s.contains("java.lang")
+                        || s.contains("io.netty")) {
                     continue;
                 }
                 ret.append(s);
@@ -120,7 +136,7 @@ public class NodeCenterFrameHandler extends SimpleChannelInboundHandler<Object>
         }
     }
 
-    public synchronized void sendMsg(String json) {
+    public 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,27 +39,33 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
         logActions = new LogActions(managerAction);
         unitActions = new UnitActions(managerAction);
         fileActions = new FileActions(this);
-        ae = new ActionExecutor<ResultCallback, JsonObject>(executorService, managerAction,
+        ae =
-                logActions, unitActions, fileActions, new MetaIndexAction(), new TracingAction()) {
+                new ActionExecutor<ResultCallback, JsonObject>(
+                        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.getPubKey(null);
+                        String pubKey = managerAction.pubKey;
                         String action = arg.get("action").getAsString();
                         LOGGER.debug("permission" + permission);
                         LOGGER.debug("userPermission" + val);
-                NodeCenterServer.nodeHttpLogDB.put(action,
+                        NodeCenterServer.nodeHttpLogDB.put(
-                        "{\"action\":\"" + action + "\",\"pubKey\":\"" + pubKey + "\",\"date\":"
+                                action,
-                                + System.currentTimeMillis() + "}");
+                                "{\"action\":\""
+                                        + action
+                                        + "\",\"pubKey\":\""
+                                        + pubKey
+                                        + "\",\"date\":"
+                                        + System.currentTimeMillis()
+                                        + "}");
 
                         //                        if (val == 0) return true;
                         //                        return true;
                         if ((permission & val) == val) {
                             return true;
-                } else
+                        } else return false;
-                    return false;
                     }
                 };
         for (String str : wsPluginActions) {
@@ -67,7 +73,6 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
             ae.appendHandler(obj);
         }
     }
-
     private Object createInstanceByClzName(String clzName) {
         try {
             Class<?> clz = Class.forName(clzName, true, pluginLoader);
@@ -76,13 +81,12 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
             return null;
         }
     }
-
     public ActionExecutor getAE() {
         return ae;
     }
 
     public String getPubKey() {
-        return managerAction.getPubKey(null);
+        return managerAction.pubKey;
     }
 
     @Override
@@ -108,13 +112,13 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
             response.action = "sendNextSegment";
             try {
                 boolean isSegment = false;
-                if (map.has("isSegment"))
+                if (map.has("isSegment")) isSegment = map.get("isSegment").getAsBoolean();
-                    isSegment = map.get("isSegment").getAsBoolean();
                 if (isSegment) {
                     dataCache.append(map.get("data").getAsString());
                     response = new Response();
                     response.action = "sendNextSegment";
-                    ctx.channel().writeAndFlush(new TextWebSocketFrame(JsonUtil.toJson(response)));
+                    ctx.channel()
+                            .writeAndFlush(new TextWebSocketFrame(JsonUtil.toJson(response)));
                     return;
                 } else {
                     if (dataCache.length() > 0) {
@@ -127,7 +131,10 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
                 }
                 String action = map.get("action").getAsString();
                 final JsonObject jmap = map;
-                ae.handle(action, map, new ResultCallback() {
+                ae.handle(
+                        action,
+                        map,
+                        new ResultCallback() {
                             @Override
                             public void onResult(Map jo) {
                                 if (jmap.has("requestID")) {
@@ -166,22 +173,15 @@ public class NodeCenterWSFrameHandler extends SimpleChannelInboundHandler<WebSoc
                 String ret = "";
                 int count = 0;
                 for (String s : strs) {
-                    if (s.contains("sun.reflect"))
+                    if (s.contains("sun.reflect")) continue;
-                        continue;
+                    if (s.contains("java.lang.reflect")) continue;
-                    if (s.contains("java.lang.reflect"))
+                    if (s.contains("org.apache")) continue;
-                        continue;
+                    if (s.contains("java.util")) continue;
-                    if (s.contains("org.apache"))
+                    if (s.contains("java.lang")) continue;
-                        continue;
+                    if (s.contains("io.netty")) 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)
+                    if (count++ > 5) break;
-                        break;
                 }
                 response.data = ret;
                 ctx.channel().writeAndFlush(new TextWebSocketFrame(JsonUtil.toJson(response)));

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

@@ -36,7 +36,8 @@ public class OtherNCProxy {
     public Set<String> ncAdds = ConcurrentHashMap.newKeySet();  //其他NC的ip:port
     public SM2KeyPair sm2;  //NC证书
 
-    private OtherNCProxy() {}
+    private OtherNCProxy() {
+    }
 
     // 从DB中加载OtherNC和NCFile的信息
     public void init() {
@@ -55,8 +56,12 @@ public class OtherNCProxy {
     }
 
     public void periodUpdate() {
-        NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(() -> {
+        NodeCenterServer.scheduledThreadPool.scheduleWithFixedDelay(
-        }, 0, 30, TimeUnit.SECONDS);
+                () -> {
+                },
+                0,
+                30,
+                TimeUnit.SECONDS);
     }
 
     public void loadOtherNCs() {
@@ -153,8 +158,7 @@ public class OtherNCProxy {
 
         synchronized (otherNodeCenterInfos) {
             otherNodeCenterInfos.put(nodePubkey, list);
-            LOGGER.debug(
+            LOGGER.debug("update route  nodePubkey=" + nodePubkey + "  list=" + JsonUtil.toJson(list));
-                    "update route  nodePubkey=" + nodePubkey + "  list=" + JsonUtil.toJson(list));
         }
     }
 
@@ -166,8 +170,7 @@ 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
+                        LOGGER.debug("[OtherNCProxy] find contract " + id + "pubKey is " + pubKey + " master is " + info.master + " from other NC route info");
-                                + " master is " + info.master + " from other NC route info");
                         return pubKey + ";" + info.master;
                     }
                 }
@@ -204,8 +207,7 @@ public class OtherNCProxy {
                 continue;
             for (ContractDesp desp : node.contracts) {
                 if (desp.type == ContractExecType.Sole || desp.getIsMaster()) {
-                    list.add(new OtherNCInfo(desp.contractID, desp.contractName,
+                    list.add(new OtherNCInfo(desp.contractID, desp.contractName, node.masterAddress));
-                            node.masterAddress));
                 }
             }
         }
@@ -225,7 +227,9 @@ public class OtherNCProxy {
         b.group(group);
         NCConnector conn = new NCConnector(target, b, new NCClientHandler());
         connList.put(target, conn);
-        b.channel(NioSocketChannel.class).handler(new ChannelInitializer<SocketChannel>() {
+        b.channel(NioSocketChannel.class)
+                .handler(
+                        new ChannelInitializer<SocketChannel>() {
                             @Override
                             protected void initChannel(SocketChannel ch) {
                                 ChannelPipeline p = ch.pipeline();
@@ -236,7 +240,9 @@ public class OtherNCProxy {
 
         if (!conn.handler.isOpen()) {
             String[] ipAndPort = target.split(":");
-            b.connect(ipAndPort[0], Integer.parseInt(ipAndPort[1])).sync().channel();
+            b.connect(ipAndPort[0], Integer.parseInt(ipAndPort[1]))
+                    .sync()
+                    .channel();
         }
 
         reconnect(target);
@@ -251,7 +257,10 @@ public class OtherNCProxy {
         NCConnector conn = connList.get(target);
         if (!conn.handler.isOpen()) {
             String[] ipAndPort = conn.ipAndPort.split(":");
-            conn.bootstrap.connect(ipAndPort[0], Integer.parseInt(ipAndPort[1])).sync().channel();
+            conn.bootstrap
+                    .connect(ipAndPort[0], Integer.parseInt(ipAndPort[1]))
+                    .sync()
+                    .channel();
         }
     }
 

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

@@ -29,8 +29,7 @@ public class TracingAction {
                                 dependencies.add(val);
                         }
                     } else {
-                        if (desp.dependentContracts != null
+                        if (desp.dependentContracts != null && desp.dependentContracts.contains(contractName)) {
-                                && desp.dependentContracts.contains(contractName)) {
                             beDependent.add(desp.contractName);
                         }
                     }

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

@@ -25,8 +25,7 @@ public class UnitActions {
 
     private static String convertContractName(String contractID) {
         ContractDesp desp = NodeCenterActions.getContractByName(contractID);
-        if (desp != null)
+        if (desp != null) return desp.contractID;
-            return desp.contractID;
         return contractID;
     }
 
@@ -46,10 +45,12 @@ public class UnitActions {
     @Action(userPermission = 1 << 6, async = true)
     public void listTrustUnits(JsonObject json, ResultCallback resultCallback) {
         long start = System.currentTimeMillis();
-        final String pubKey = managerAction.getPubKey(json);
+        final String pubKey = managerAction.pubKey;
         List<KV> allunits = KeyValueDBUtil.instance.getKeyValues(NCTables.TrustUnitsDB.toString());
-        if (pubKey != null && KeyValueDBUtil.instance
+        if (pubKey != null
-                .getValue(NCTables.ConfigDB.toString(), "__CenterManager__").contains(pubKey)) {
+                && KeyValueDBUtil.instance
+                .getValue(NCTables.ConfigDB.toString(), "__CenterManager__")
+                .contains(pubKey)) {
             simpleReply(resultCallback, "onListTrustUnits", allunits);
             LOGGER.debug("is center manager");
             long end = System.currentTimeMillis();
@@ -72,10 +73,12 @@ public class UnitActions {
 
     @Action(userPermission = 1 << 6, async = true)
     public void createTrustUnit(JsonObject json, ResultCallback resultCallback) {
-        final String pubKey = managerAction.getPubKey(json);
+        final String pubKey = managerAction.pubKey;
         LOGGER.debug("[createTrustUnit] " + json.get("data").toString());
-        KeyValueDBUtil.instance.setValue(NCTables.TrustUnitsDB.toString(),
+        KeyValueDBUtil.instance.setValue(
-                pubKey + "_" + json.get("msg").getAsString(), json.get("data").toString());
+                NCTables.TrustUnitsDB.toString(),
+                pubKey + "_" + json.get("msg").getAsString(),
+                json.get("data").toString());
         Map<String, Object> ret = new HashMap<>();
         ret.put("action", "onCreateTrustUnit");
         ret.put("status", "Success");
@@ -85,12 +88,16 @@ public class UnitActions {
     @Action(userPermission = 1 << 6, async = true)
     public void deleteTrustUnit(JsonObject json, ResultCallback resultCallback) {
         //		final String pubKey = managerAction.pubKey;
-        LOGGER.debug("[deleteTrustUnit] before" + KeyValueDBUtil.instance
+        LOGGER.debug(
-                .getValue(NCTables.TrustUnitsDB.toString(), json.get("data").getAsString()));
+                "[deleteTrustUnit] before"
-        KeyValueDBUtil.instance.delete(NCTables.TrustUnitsDB.toString(),
+                        + KeyValueDBUtil.instance.getValue(
-                json.get("data").getAsString());
+                        NCTables.TrustUnitsDB.toString(), json.get("data").getAsString()));
-        LOGGER.debug("[deleteTrustUnit] after" + KeyValueDBUtil.instance
+        KeyValueDBUtil.instance.delete(
-                .getValue(NCTables.TrustUnitsDB.toString(), json.get("data").getAsString()));
+                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");
@@ -139,8 +146,7 @@ public class UnitActions {
 //        logger.debug("tid:" + Thread.currentThread().getId() + " contractID:" + contractID);
 //        if (nodes == null) {
 //            rc.onResult(
-    // "{\"status\":\"Error\",\"result\":\"can't locate
+//                    "{\"status\":\"Error\",\"result\":\"can't locate contract\",\"action\":\"onExecuteContractTrustfully\"}");
-    // contract\",\"action\":\"onExecuteContractTrustfully\"}");
 //        } else {
 //            mInfo.rcf.execute(requestID, rc, JsonUtil.toJson(args));
 //        }
@@ -177,8 +183,7 @@ public class UnitActions {
 //        logger.debug("tid:" + Thread.currentThread().getId() + " contractID:" + contractID);
 //        if (nodes == null) {
 //            rc.onResult(
-    // "{\"status\":\"Error\",\"result\":\"can't locate
+//                    "{\"status\":\"Error\",\"result\":\"can't locate contract\",\"action\":\"onExecuteContractTrustfully\"}");
-    // contract\",\"action\":\"onExecuteContractTrustfully\"}");
 //        } else {
 //            mInfo.rcf.execute(requestID, rc, JsonUtil.toJson(args));
 //        }
@@ -193,12 +198,15 @@ public class UnitActions {
     @Action(async = true, userPermission = 1L << 6)
     public void listContractProcess(JsonObject args, final ResultCallback rc) {
         List<ContractDesp> info = new ArrayList<>();
-        LOGGER.debug("[contracts] " + JsonUtil.toPrettyJson(NodeCenterActions.nodeInfos));
+        LOGGER.debug(
-        LOGGER.debug("[cid2Nodes]" + JsonUtil.toPrettyJson(NodeCenterActions.contractID2Members));
+                "[contracts] "
+                        + 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)
+            if (desp != null) info.add(desp);
-                info.add(desp);
         }
         simpleReply(rc, "onListContractProcess", JsonUtil.toJson(info));
     }
@@ -206,12 +214,15 @@ public class UnitActions {
     @Action(userPermission = 1 << 6, async = true)
     public void listMultiPointContractProcess(JsonObject json, ResultCallback resultCallback) {
         List<ContractDesp> info = new ArrayList<>();
-        LOGGER.debug("[contracts] " + JsonUtil.toPrettyJson(NodeCenterActions.nodeInfos));
+        LOGGER.debug(
-        LOGGER.debug("[cid2Nodes]" + JsonUtil.toPrettyJson(NodeCenterActions.contractID2Members));
+                "[contracts] "
+                        + 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)
+            if (desp != null) info.add(desp);
-                info.add(desp);
         }
         simpleReply(resultCallback, "onListMultiPointContractProcess", JsonUtil.toJson(info));
     }
@@ -240,8 +251,7 @@ 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)
+            if (str != null && str.length() > 0) nodePubKeys.add(str);
-                nodePubKeys.add(str);
         }
         Map<String, String> nodes = new HashMap<>(); // node's pubKey-node'a name
         for (CMNode node : NodeCenterActions.nodeInfos.values()) {
@@ -254,8 +264,9 @@ public class UnitActions {
             simpleReply(rc, "onDistributeYPK", "empty nodes");
         }
 
-        boolean result = SM2Util.plainStrVerify(pubKey,
+        boolean result =
-                "DistributeYPK|" + projectName + "|" + pubKey, signature);
+                SM2Util.plainStrVerify(
+                        pubKey, "DistributeYPK|" + projectName + "|" + pubKey, signature);
         LOGGER.info("[UnitAcitons] 验签:" + result + " -> projectName:" + projectName);
 
         String ypkType = projectName.split("_")[0];

src/main/resources/log4j2.properties

@@ -4,37 +4,12 @@ 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.logrolling.type=RollingFile
+appender.rolling.name=log
-appender.logrolling.name=infoLogFile
+appender.rolling.append=true
-appender.logrolling.append=true
+appender.rolling.fileName=./log/nc.log
-appender.logrolling.fileName=./log/cm.log
+appender.rolling.layout.type=PatternLayout
-appender.logrolling.filePattern=./log/cm-%i.log
+appender.rolling.layout.pattern=%d-%m%n
-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(Map<String, ActionExecutor.Pair<Method, Object>> handlers,
+    private void printActions(
-            EnumSet<Role> set) {
+            Map<String, ActionExecutor.Pair<Method, Object>> handlers, 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)
+                if ((r.getValue() & l.permission) == l.permission) l.roles += r.name() + ";";
-                    l.roles += r.name() + ";";
+            if (l.roles.equals("CenterManager;NodeManager;Node;Anonymous;")) l.roles = "任意角色";
-            if (l.roles.equals("CenterManager;NodeManager;Node;Anonymous;"))
-                l.roles = "任意角色";
         }
-        lines.sort(new Comparator<Line>() {
+        lines.sort(
+                new Comparator<Line>() {
                     @Override
                     public int compare(Line o1, Line o2) {
                         return o1.action.compareTo(o2.action);
                     }
                 });
-        lines.sort(new Comparator<Line>() {
+        lines.sort(
+                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,7 +18,8 @@ public class TestServer {
         public void channelActive(ChannelHandlerContext ctx) {
             LOGGER.info("active");
             System.out.println("======Active=======");
-            ctx.channel().writeAndFlush("ACTIVE from Server")
+            ctx.channel()
+                    .writeAndFlush("ACTIVE from Server")
                     .addListener(future -> LOGGER.info("Active Send Done!!"));
         }
 

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

@@ -10,16 +10,13 @@ public class TestADSP {
 //    public static String resultPath = "./testADSP/" + "result.txt";
 //    public static String contractID = "counter";
 //    public static String action = "executeContract";
-    // public static String pubkey =
+//    public static String pubkey = "0480204f4ef341359a5f64fcb11baf9ca2e6706ac20cba36ca83066870cf2c1d5de6df67e24e68dde7934af9b31d94a6084281db3d32d5ce42ab8f75bf799aca05";
-    // "0480204f4ef341359a5f64fcb11baf9ca2e6706ac20cba36ca83066870cf2c1d5de6df67e24e68dde7934af9b31d94a6084281db3d32d5ce42ab8f75bf799aca05";
 //
 //    public static String operation = "count";
 //    public static String arg = "1";
 //
-    // public static String priKey =
+//    public static String priKey = "63464fa9587bbf2a022b3d655f4ed49c7d9a4249de1079d52bd5a1fec3308719";
-    // "63464fa9587bbf2a022b3d655f4ed49c7d9a4249de1079d52bd5a1fec3308719";
+//    public static String signature = "dfd07c00c5c89fb0f901bed132db4342f49f4560f34c15878636623d2a8716a2c93ad32eeb9ee9c4f1d905df292cb4a1a27aa0171f2856848ce07cfc8022e809";
-    // public static String signature =
-    // "dfd07c00c5c89fb0f901bed132db4342f49f4560f34c15878636623d2a8716a2c93ad32eeb9ee9c4f1d905df292cb4a1a27aa0171f2856848ce07cfc8022e809";
 //
 //    public static List<String> crashSeries = new ArrayList<String>();
 //    public static AtomicInteger crashIndex = new AtomicInteger();
@@ -33,8 +30,7 @@ public class TestADSP {
 //    static{
 //        getSig();
 //
-    // nodes.put("zyx's
+//        nodes.put("zyx's book","0440023d13facddcefbd87f2bb622b1b2b6ca43eb84c0579b82450814233ce557bd7ad7852cd47f1d6df867c5413ecf3dd1954cdbf5a6da683e3a89095f091d83d");
-    // book","0440023d13facddcefbd87f2bb622b1b2b6ca43eb84c0579b82450814233ce557bd7ad7852cd47f1d6df867c5413ecf3dd1954cdbf5a6da683e3a89095f091d83d");
 //        nodes.put("localNode1","0480f783cf63294224afbd19e175e5c7ea0c5c60ee115ed9e114fe2691eb28cc1680e5fec532d64c80d2f6b737e8b43b94d5a9c73206ac6235c50ff992133e4d38");
 //        nodes.put("localNode2","044e0c127e24407ee8a8abd4fe507b32b340ce9775317b8d7b5bb8e182745d6a45c57aaf867d80a5f816a7561564f9294c6aee5916f95e93c0011e16c28b9e849a");
 //        nodes.put("localNode3","0485040cfd94bec672bb8ba184856188963ee4ad339d247a76e2d9819f20e61bfad24ec763b1371998583f9dc0cf55c4d53cb1a2ec84c67aed1aa5203cc84fc78f");
@@ -72,8 +68,7 @@ public class TestADSP {
 //                    case "crash":
 //                        if(pubKey != null){
 //                            System.out.println("[TestADSP] 令节点 " + crash[1] + "崩溃");
-    // System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new
+//                            System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis())));
-    // Date(System.currentTimeMillis())));
 //                            crashSet.add(pubKey);
 //                        }
 //                        break;
@@ -84,8 +79,7 @@ public class TestADSP {
 //                            }
 //                            recover.add(pubKey);
 //                            System.out.println("[TestADSP] 令节点 " + crash[1] + "上线");
-    // System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new
+//                            System.out.println(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis())));
-    // Date(System.currentTimeMillis())));
 //                        }
 //                        break;
 //                    default:
@@ -101,8 +95,7 @@ public class TestADSP {
 //
 //
 //
-    // System.out.println("[TestADSP]发起请求 " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new
+//                System.out.println("[TestADSP]发起请求  " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(System.currentTimeMillis())));
-    // Date(System.currentTimeMillis())));
 //                JsonObject jo = new JsonObject();
 //                jo.addProperty("action", TestADSP.action);
 //                jo.addProperty("contractID", TestADSP.contractID);
@@ -155,8 +148,7 @@ public class TestADSP {
 //        System.out.println(file.getAbsolutePath());
 //        StringBuilder result = new StringBuilder();
 //        try{
-    // BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),
+//            BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));//构造一个BufferedReader类来读取文件
-    // "UTF-8"));//构造一个BufferedReader类来读取文件
 //
 //            String s = null;
 //            while((s = br.readLine())!=null){//使用readLine方法，一次读一行
@@ -178,8 +170,7 @@ public class TestADSP {
 //
 //        unavailable = totalRequest * 2 - fileTotal;
 //
-    // System.out.println("共有" + totalRequest * 2 + "次请求，其中" + correct + "正确，" + incorrect + "不正确，"
+//        System.out.println("共有" + totalRequest * 2 + "次请求，其中" + correct + "正确，" + incorrect + "不正确，" + unavailable + "不可用.");
-    // + unavailable + "不可用.");
 //    }
 //
 //    public static String convertNameToPubkey(String nodeName){