From bbe67403061ccf5c894df8e59e4503f2c788fe5c Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 28 Apr 2020 16:01:10 +0800
Subject: [PATCH 001/131] fix double alert of same group

---
 .../webase/node/mgr/alert/task/AuditMonitorTask.java     | 9 +++++----
 .../node/mgr/alert/task/NodeStatusMonitorTask.java       | 9 ++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/alert/task/AuditMonitorTask.java b/src/main/java/com/webank/webase/node/mgr/alert/task/AuditMonitorTask.java
index 49b1d8441..ed3642413 100644
--- a/src/main/java/com/webank/webase/node/mgr/alert/task/AuditMonitorTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/alert/task/AuditMonitorTask.java
@@ -20,10 +20,11 @@
 import com.webank.webase.node.mgr.alert.rule.AlertRuleService;
 import com.webank.webase.node.mgr.alert.rule.entity.TbAlertRule;
 import com.webank.webase.node.mgr.base.enums.AlertRuleType;
+import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
 import com.webank.webase.node.mgr.base.tools.AlertRuleTools;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroup;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroupMapCache;
+import com.webank.webase.node.mgr.group.GroupService;
+import com.webank.webase.node.mgr.group.entity.TbGroup;
 import com.webank.webase.node.mgr.monitor.MonitorService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,7 +48,7 @@ public class AuditMonitorTask {
     @Autowired
     private ConstantProperties cProperties;
     @Autowired
-    private FrontGroupMapCache frontGroupMapCache;
+    private GroupService groupService;
     @Autowired
     private MailService alertMailService;
     @Autowired
@@ -74,7 +75,7 @@ public synchronized void checkUserAndContractForAlert() {
                     " for beyond alert interval:{}", alertRule);
             return;
         }
-        List<FrontGroup> groupList = frontGroupMapCache.getAllMap();
+        List<TbGroup> groupList = groupService.getGroupList(DataStatus.NORMAL.getValue());
         if (groupList == null || groupList.size() == 0) {
             log.warn("checkUserAndContractForAlert jump over: not found any group");
             return;
diff --git a/src/main/java/com/webank/webase/node/mgr/alert/task/NodeStatusMonitorTask.java b/src/main/java/com/webank/webase/node/mgr/alert/task/NodeStatusMonitorTask.java
index d0db1672a..04082d656 100644
--- a/src/main/java/com/webank/webase/node/mgr/alert/task/NodeStatusMonitorTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/alert/task/NodeStatusMonitorTask.java
@@ -23,8 +23,8 @@
 import com.webank.webase.node.mgr.base.enums.AlertRuleType;
 import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.tools.AlertRuleTools;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroup;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroupMapCache;
+import com.webank.webase.node.mgr.group.GroupService;
+import com.webank.webase.node.mgr.group.entity.TbGroup;
 import com.webank.webase.node.mgr.node.Node;
 import com.webank.webase.node.mgr.node.NodeService;
 import com.webank.webase.node.mgr.node.TbNode;
@@ -39,7 +39,6 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.concurrent.CountDownLatch;
 
 /**
  * cannot connect to node triggers alert mail
@@ -51,7 +50,7 @@ public class NodeStatusMonitorTask {
     @Autowired
     private NodeService nodeService;
     @Autowired
-    private FrontGroupMapCache frontGroupMapCache;
+    private GroupService groupService;
     @Autowired
     private PrecompiledService precompiledService;
     @Autowired
@@ -78,7 +77,7 @@ public synchronized void checkAllNodeStatusForAlert() {
             return;
         }
 
-        List<FrontGroup> groupList = frontGroupMapCache.getAllMap();
+        List<TbGroup> groupList = groupService.getGroupList(DataStatus.NORMAL.getValue());
         if (groupList == null || groupList.size() == 0) {
             log.warn("checkNodeStatusForAlert jump over: not found any group");
             return;

From 6e364ab6f53d687e533ccfcf6de3064e48853d47 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 28 Apr 2020 16:37:55 +0800
Subject: [PATCH 002/131] fix cert alert repeat

---
 .../com/webank/webase/node/mgr/alert/task/CertMonitorTask.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/alert/task/CertMonitorTask.java b/src/main/java/com/webank/webase/node/mgr/alert/task/CertMonitorTask.java
index 8bbf4ff92..9cfa74628 100644
--- a/src/main/java/com/webank/webase/node/mgr/alert/task/CertMonitorTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/alert/task/CertMonitorTask.java
@@ -77,9 +77,9 @@ public synchronized void checkCertValidityForAlert() {
             return;
         }
         List<X509Certificate> certList = certService.loadAllX509Certs();
-        List<String> alertContentList = new ArrayList<>();
         certList.stream()
             .forEach(cert -> {
+                List<String> alertContentList = new ArrayList<>();
                 Date certNotAfter = cert.getNotAfter();
                 if(checkWithin7days(certNotAfter)){
                     log.warn("cert validity alert. certNotAfter:{}",

From 0413d2559f076fd1c0480efd565ee6450b37934f Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 30 Apr 2020 14:13:31 +0800
Subject: [PATCH 003/131] update log warn

---
 .../webase/node/mgr/node/NodeService.java     |   2 +-
 .../node/mgr/scheduler/PullKeyStoreTask.java  | 206 ------------------
 2 files changed, 1 insertion(+), 207 deletions(-)
 delete mode 100644 src/main/java/com/webank/webase/node/mgr/scheduler/PullKeyStoreTask.java

diff --git a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
index fd31e7fb5..9e926e635 100644
--- a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
+++ b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
@@ -215,7 +215,7 @@ public void checkAndUpdateNodeStatus(int groupId) {
             Duration duration = Duration.between(modifyTime, LocalDateTime.now());
             Long subTime = duration.toMillis();
             if (subTime < CHECK_NODE_WAIT_MIN_MILLIS && createTime.isBefore(modifyTime)) {
-                log.info("checkNodeStatus jump over. subTime:{}", subTime);
+                log.warn("checkNodeStatus jump over. subTime:{}", subTime);
                 return;
             }
             
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/PullKeyStoreTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/PullKeyStoreTask.java
deleted file mode 100644
index b3b2960b5..000000000
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/PullKeyStoreTask.java
+++ /dev/null
@@ -1,206 +0,0 @@
-///**
-// * Copyright 2014-2019 the original author or authors.
-// * <p>
-// * Licensed under the Apache License, Version 2.0 (the "License");
-// * you may not use this file except in compliance with the License.
-// * You may obtain a copy of the License at
-// * <p>
-// * http://www.apache.org/licenses/LICENSE-2.0
-// * <p>
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
-// * limitations under the License.
-// */
-//
-//package com.webank.webase.node.mgr.scheduler;
-//
-//import com.webank.webase.node.mgr.base.enums.HasPk;
-//import com.webank.webase.node.mgr.base.enums.UserType;
-//import com.webank.webase.node.mgr.front.FrontService;
-//import com.webank.webase.node.mgr.front.entity.FrontParam;
-//import com.webank.webase.node.mgr.front.entity.TbFront;
-//import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
-//import com.webank.webase.node.mgr.group.GroupService;
-//import com.webank.webase.node.mgr.group.entity.TbGroup;
-//import com.webank.webase.node.mgr.user.UserMapper;
-//import com.webank.webase.node.mgr.user.UserService;
-//import com.webank.webase.node.mgr.user.entity.KeyPair;
-//import com.webank.webase.node.mgr.user.entity.TbUser;
-//import com.webank.webase.node.mgr.user.entity.UserParam;
-//import lombok.extern.log4j.Log4j2;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.scheduling.annotation.Scheduled;
-//import org.springframework.stereotype.Component;
-//
-//import java.time.Duration;
-//import java.time.Instant;
-//import java.util.*;
-//
-///**
-// * pull key store from different front and refresh local users
-// * @author marsli
-// */
-//@Log4j2
-//@Component
-//public class PullKeyStoreTask {
-//
-//	@Autowired
-//	private UserService userService;
-//	@Autowired
-//	private UserMapper userMapper;
-//	@Autowired
-//	private FrontInterfaceService frontInterfaceService;
-//	@Autowired
-//	private FrontService frontService;
-//	@Autowired
-//	private GroupService groupService;
-//
-//	@Scheduled(fixedDelayString = "${constant.pullKeyStoreTaskFixedDelay}")
-//	public void taskStart() {
-//		refreshLocalUser();
-//	}
-//
-//	public synchronized void refreshLocalUser() {
-//		Instant startTime = Instant.now();
-//		log.info("start refreshLocalUser startTime:{}", startTime.toEpochMilli());
-//		List<TbFront> frontList = frontService.getFrontList(new FrontParam());
-//		if (frontList == null || frontList.size() == 0) {
-//			log.warn("refreshLocalUser jump over: not found any front");
-//			return;
-//		}
-//		List<Integer> groupIdList = getGroupIdList();
-//
-//		// <groupId, list of KeyPair>
-//		Map<Integer, List<KeyPair>> pullAddressMap = pullAddressListFromFront(frontList, groupIdList);
-//		for(Integer groupId : groupIdList) {
-//			// // <groupId, list of address>
-//			Map<Integer, List<String>> localAddressMap = getLocalUserAddressList();
-//			// group's list of address
-//			List<String> localAddressList = localAddressMap.get(groupId);
-//			// all keypair from front
-//			final List<KeyPair> pullAddressList = pullAddressMap.get(groupId);
-//			if (localAddressList.isEmpty()) {
-//				continue;
-//			}
-//
-//			// delete user in db that in localList but not in pullList
-//			localAddressList.forEach(address -> {
-//				// judge contain
-//				long equalCount = 0;
-//				equalCount = pullAddressList.stream().filter(keyPair ->
-//						address.equals(keyPair.getAddress())).count();
-//				// if pull list not have local user's address, remove it
-//				log.debug("refreshLocalUser localAddressList groupId:{}, address:{}, equalCount:{}",
-//						groupId, address, equalCount);
-//				if (equalCount == 0 ) {
-//					userService.deleteByAddress(address);
-//				}
-//			});
-//			// add user in db that in pullList but not in localList
-//			pullAddressList.forEach(keyPair -> {
-//				// if local list don't have key pair, add it in db
-//				log.debug("refreshLocalUser pullAddressList groupId:{}, address:{}",
-//						groupId, keyPair.getAddress());
-//				if (!localAddressList.contains(keyPair.getAddress())) {
-//					addUserInfo(groupId, keyPair);
-//				}
-//			});
-//		}
-//		log.info("end refreshLocalUser useTime:{} ",
-//				Duration.between(startTime, Instant.now()).toMillis());
-//	}
-//
-//	/**
-//	 * get local user list of address
-//	 * @return list sorted by groupId
-//	 */
-//	private Map<Integer, List<String>> getLocalUserAddressList() {
-//		log.debug("start getLocalUserAddressList.");
-//		Map<Integer, List<String>> localGroupIdAddressMap = new HashMap<>();
-//		// get group id list
-//		List<Integer> groupIdList = getGroupIdList();
-//		for (Integer groupId: groupIdList) {
-//			// init address list of groupId in map
-//			localGroupIdAddressMap.put(groupId, new ArrayList<>());
-//			// get user address list by group id
-//			List<String> addressList = new ArrayList<>();
-//			UserParam userParam = new UserParam();
-//			userParam.setGroupId(groupId);
-//			List<TbUser> localUserList = userService.qureyUserList(userParam);
-//			localUserList.forEach(user -> addressList.add(user.getAddress()));
-//			// set map's address list
-//			localGroupIdAddressMap.get(groupId).addAll(addressList);
-//		}
-//		log.debug("end getLocalUserAddressList. localGroupIdAddressMap:{}", localGroupIdAddressMap);
-//		return localGroupIdAddressMap;
-//	}
-//
-//	/**
-//	 * pull key store list from all front
-//	 * @param frontList
-//	 * @param groupIdList
-//	 * @return list sorted by groupId
-//	 */
-//	private Map<Integer, List<KeyPair>> pullAddressListFromFront(List<TbFront> frontList, List<Integer> groupIdList) {
-//		log.debug("start pullAddressListFromFront.");
-//		Map<Integer, List<KeyPair>> groupKeyPairListMap = new HashMap<>();
-//		// init map with empty list by groupId
-//		groupIdList.forEach(groupId -> groupKeyPairListMap.put(groupId, new ArrayList<>()));
-//		// set map
-//		for (TbFront front : frontList) {
-//			String frontIp = front.getFrontIp();
-//			int frontPort = front.getFrontPort();
-//			// group id useless in getting keyStore list
-//			List<KeyPair> keyPairList = frontInterfaceService.getKeyStoreList(1, frontIp, frontPort);
-//			keyPairList.forEach(keyPair -> {
-//				String userName = keyPair.getUserName() + "_" + front.getFrontId();
-//				keyPair.setUserName(userName);
-//			});
-//			// fill each group with the same key pair list
-//			groupIdList.forEach(groupId ->
-//					groupKeyPairListMap
-//							.get(groupId)
-//							.addAll(keyPairList));
-//		}
-//		log.debug("end getLocalUserAddressList. groupKeyPairListMap:{}", groupKeyPairListMap);
-//		return groupKeyPairListMap;
-//	}
-//
-//	/**
-//	 * getGroupIdList
-//	 * @return list of group id int
-//	 */
-//	private List<Integer> getGroupIdList() {
-//		// get all group id
-//		List<TbGroup> allGroup = groupService.getGroupList(null);
-//		List<Integer> resList = new ArrayList<>();
-//		allGroup.forEach(tbGroup -> resList.add(tbGroup.getGroupId()));
-//		return resList;
-//	}
-//
-//	/**
-//	 *  add user by group id
-//	 * @param keyPair
-//	 */
-//	private void addUserInfo(int groupId, KeyPair keyPair) {
-//		String address = keyPair.getAddress();
-//		String publicKey = keyPair.getPublicKey();
-//		String[] nameAndDesc = keyPair.getUserName().split("_");
-//		String userName = nameAndDesc[0] + "_" + address.substring(0, 5);
-//		String descPrefix = "from front: ";
-//		String description = descPrefix + nameAndDesc[1];
-//		// add row in all group
-//		TbUser newUserRow = new TbUser(HasPk.HAS.getValue(), UserType.GENERALUSER.getValue(),
-//				userName,
-//				groupId, address, publicKey,
-//				description);
-//		Integer affectRow = userMapper.addUserRow(newUserRow);
-//		if (affectRow == 0) {
-//			log.warn("pull user save: affect 0 rows of tb_user");
-//		}
-//
-//	}
-//
-//}

From ed1998caa5a1c11f1250c481f5cbfa4097bb2194 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 30 Apr 2020 18:08:10 +0800
Subject: [PATCH 004/131] update mapper

---
 src/main/resources/mapper/FrontMapper.xml | 5 +++++
 src/main/resources/mapper/GroupMapper.xml | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/FrontMapper.xml b/src/main/resources/mapper/FrontMapper.xml
index fe7195d8c..8fc7024cc 100644
--- a/src/main/resources/mapper/FrontMapper.xml
+++ b/src/main/resources/mapper/FrontMapper.xml
@@ -71,4 +71,9 @@
      select * from tb_front where front_id = #{frontId}
   </select>
 
+  <select id="getByNodeId" resultMap="frontMap" parameterType="java.lang.String">
+    select * from tb_front where node_id = #{nodeId}
+    limit 1
+  </select>
+
 </mapper>
diff --git a/src/main/resources/mapper/GroupMapper.xml b/src/main/resources/mapper/GroupMapper.xml
index c2deb3b2f..be23a7b97 100644
--- a/src/main/resources/mapper/GroupMapper.xml
+++ b/src/main/resources/mapper/GroupMapper.xml
@@ -12,6 +12,10 @@
       property="groupStatus"/>
     <result column="node_count" javaType="java.lang.Integer" jdbcType="INTEGER"
       property="nodeCount"/>
+    <result column="description" javaType="java.lang.String" jdbcType="VARCHAR"
+      property="description"/>
+    <result column="group_type" javaType="java.lang.Integer" jdbcType="INTEGER"
+      property="groupType"/>
     <result column="create_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP"
       property="createTime"/>
     <result column="modify_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP"
@@ -36,8 +40,8 @@
 
   <insert id="save" parameterType="com.webank.webase.node.mgr.group.entity.TbGroup">
 		insert into tb_group
-		(group_id,group_name,node_count,create_time)
-		values(#{groupId},#{groupName},#{nodeCount},NOW())
+		(group_id,group_name,node_count,description,group_type,create_time)
+		values(#{groupId},#{groupName},#{nodeCount},#{description},#{groupType},NOW())
 		ON DUPLICATE KEY UPDATE node_count=#{nodeCount},modify_time=NOW()
 	</insert>
 

From 5d2777d40ac5c4627b43ffafa803c83834a08490 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 30 Apr 2020 18:08:38 +0800
Subject: [PATCH 005/131] support dynamic group

---
 script/webase-ddl.sql                         |  19 +-
 .../node/mgr/base/code/ConstantCode.java      |   3 +
 .../webase/node/mgr/base/enums/GroupType.java |  43 ++++
 .../webase/node/mgr/front/FrontMapper.java    |   2 +
 .../webase/node/mgr/front/FrontService.java   |  16 +-
 .../webase/node/mgr/front/entity/TbFront.java |   4 +-
 .../frontinterface/FrontInterfaceService.java |  18 +-
 .../mgr/frontinterface/FrontRestTools.java    |   2 +-
 .../node/mgr/group/GroupController.java       | 130 +++++++---
 .../webase/node/mgr/group/GroupService.java   | 225 +++++++++++++-----
 .../mgr/group/entity/ReqBatchStartGroup.java  |  37 +++
 .../mgr/group/entity/ReqGenerateGroup.java    |  41 ++++
 .../mgr/group/entity/ReqOperateGroup.java     |  34 +++
 .../webase/node/mgr/group/entity/TbGroup.java |   9 +-
 14 files changed, 464 insertions(+), 119 deletions(-)
 create mode 100644 src/main/java/com/webank/webase/node/mgr/base/enums/GroupType.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/group/entity/ReqBatchStartGroup.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/group/entity/ReqGenerateGroup.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/group/entity/ReqOperateGroup.java

diff --git a/script/webase-ddl.sql b/script/webase-ddl.sql
index 946eab5cd..b05ba0ef0 100644
--- a/script/webase-ddl.sql
+++ b/script/webase-ddl.sql
@@ -3,15 +3,16 @@
 -- Table structure for tb_group
 -- ----------------------------
 CREATE TABLE IF NOT EXISTS tb_group (
-        group_id int(11) NOT NULL COMMENT '群组ID',
-        group_name varchar(64) NOT NULL COMMENT '群组名字',
-        group_status int(1) DEFAULT '1' COMMENT '状态（1-正常 2-异常）',
-        node_count int DEFAULT '0' COMMENT '群组下节点数',
-        group_desc varchar(1024) COMMENT '群组描述',
-        create_time datetime DEFAULT NULL COMMENT '创建时间',
-        modify_time datetime DEFAULT NULL COMMENT '修改时间',
-        PRIMARY KEY (group_id)
-    ) COMMENT='群组信息表' ENGINE=InnoDB CHARSET=utf8;
+    group_id int(11) NOT NULL COMMENT '群组ID',
+    group_name varchar(64) NOT NULL COMMENT '群组名字',
+    group_status int(1) DEFAULT '1' COMMENT '状态（1-正常 2-异常）',
+    node_count int DEFAULT '0' COMMENT '群组下节点数',
+    description varchar(1024) COMMENT '群组描述',
+    group_type int COMMENT '群组类型（1-拉取，2-动态创建）',
+    create_time datetime DEFAULT NULL COMMENT '创建时间',
+    modify_time datetime DEFAULT NULL COMMENT '修改时间',
+    PRIMARY KEY (group_id)
+) COMMENT='群组信息表' ENGINE=InnoDB CHARSET=utf8;
 
 
 -- ----------------------------
diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index f9585d1ac..7d5007cc0 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -143,6 +143,9 @@ public class ConstantCode {
     public static final RetCode ENCRYPT_TYPE_NOT_MATCH = RetCode.mark(202091,
             "Front's encrypt type not matches with nodemgr");
 
+    /* dynamic group manage */
+    public static final RetCode GROUP_ID_EXISTS = RetCode.mark(202300, "group id already exists");
+    public static final RetCode NODE_NOT_EXISTS = RetCode.mark(202301, "node front not exists");
 
     /* auth */
     public static final RetCode USER_NOT_LOGGED_IN = RetCode.mark(302000, "user not logged in");
diff --git a/src/main/java/com/webank/webase/node/mgr/base/enums/GroupType.java b/src/main/java/com/webank/webase/node/mgr/base/enums/GroupType.java
new file mode 100644
index 000000000..a09b97fa4
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/base/enums/GroupType.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.base.enums;
+
+/**
+ * Enumeration of group type.
+ * @author marsli
+ */
+public enum GroupType {
+	/**
+	 * sync from node
+	 */
+	SYNC(1),
+	/**
+	 * manual generated
+	 */
+	MANUAL(2);
+
+	private int value;
+
+	GroupType(Integer groupType) {
+		this.value = groupType;
+	}
+
+	public int getValue() {
+		return this.value;
+	}
+}
+
diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontMapper.java b/src/main/java/com/webank/webase/node/mgr/front/FrontMapper.java
index ee1cdd0f9..4e8b17c05 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontMapper.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontMapper.java
@@ -31,4 +31,6 @@ public interface FrontMapper {
     List<TbFront> getList(FrontParam param);
 
     TbFront getById(@Param("frontId") int frontId);
+
+    TbFront getByNodeId(@Param("nodeId") String nodeId);
 }
\ No newline at end of file
diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index 6742c8770..ed857cf31 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -15,6 +15,7 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
 import com.webank.webase.node.mgr.base.tools.CertTools;
@@ -128,8 +129,9 @@ public TbFront newFront(FrontInfo frontInfo) {
             PeerInfo[] peerArr = frontInterface
                 .getPeersFromSpecificFront(frontIp, frontPort, group);
             List<PeerInfo> peerList = Arrays.asList(peerArr);
-            //add groupId
-            groupService.saveGroupId(group, groupPeerList.size());
+            //add group
+            groupService.saveGroup(group, groupPeerList.size(), "synchronous",
+                    GroupType.SYNC.getValue());
             //save front group map
             frontGroupMapService.newFrontGroup(tbFront.getFrontId(), group);
             //save nodes
@@ -236,6 +238,16 @@ public TbFront getById(int frontId) {
         return frontMapper.getById(frontId);
     }
 
+    /**
+     * query front by nodeId.
+     */
+    public TbFront getByNodeId(String nodeId) {
+        if (StringUtils.isBlank(nodeId)) {
+            return null;
+        }
+        return frontMapper.getByNodeId(nodeId);
+    }
+
     /**
      * remove front
      */
diff --git a/src/main/java/com/webank/webase/node/mgr/front/entity/TbFront.java b/src/main/java/com/webank/webase/node/mgr/front/entity/TbFront.java
index d876cb956..67537c9ba 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/entity/TbFront.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/entity/TbFront.java
@@ -25,7 +25,9 @@ public class TbFront {
     private String frontIp;
     private Integer frontPort;
     private String agency;
-    // node version
+    /**
+     * node version
+     */
     private String clientVersion;
     private LocalDateTime createTime;
     private LocalDateTime modifyTime;
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
index 90f5e4354..a79abf555 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
@@ -446,16 +446,14 @@ public GroupHandleResult generateGroup(String frontIp, Integer frontPort,
     /**
      * start group.
      */
-    public GroupHandleResult startGroup(String frontIp, Integer frontPort, Integer startGroupId) {
-        log.debug("start startGroup frontIp:{} frontPort:{} startGroupId:{}",
-                frontIp, frontPort, startGroupId);
-
-        Integer groupId = Integer.MAX_VALUE;
-        String uri = String.format(FrontRestTools.URI_START_GROUP, startGroupId);
-        GroupHandleResult groupHandleResult =
-                getFromSpecificFront(groupId, frontIp, frontPort, uri, GroupHandleResult.class);
-
-        log.debug("end startGroup");
+    public Object operateGroup(String frontIp, Integer frontPort, Integer groupId, String type) {
+        log.debug("start operateGroup frontIp:{} frontPort:{} groupId:{}", frontIp, frontPort,
+                groupId);
+        String uri = String.format(FrontRestTools.URI_OPERATE_GROUP, type);
+        Object groupHandleResult =
+                getFromSpecificFront(groupId, frontIp, frontPort, uri, Object.class);
+
+        log.debug("end operateGroup");
         return groupHandleResult;
     }
     
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index 43f1826c7..e167dc479 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -72,7 +72,7 @@ public class FrontRestTools {
     public static final String URI_GET_OBSERVER_LIST = "web3/observerList";
     public static final String URI_GET_CLIENT_VERSION = "web3/clientVersion";
     public static final String URI_GENERATE_GROUP = "web3/generateGroup";
-    public static final String URI_START_GROUP = "web3/startGroup/%1s";
+    public static final String URI_OPERATE_GROUP = "web3/operateGroup/%1s";
     public static final String URI_REFRESH_FRONT = "web3/refresh";
     public static final String FRONT_PERFORMANCE_RATIO = "performance";
     public static final String FRONT_PERFORMANCE_CONFIG = "performance/config";
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 24cbdeacd..28f51f567 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -21,8 +21,7 @@
 import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.frontinterface.entity.GenerateGroupInfo;
-import com.webank.webase.node.mgr.group.entity.GroupGeneral;
-import com.webank.webase.node.mgr.group.entity.TbGroup;
+import com.webank.webase.node.mgr.group.entity.*;
 import com.webank.webase.node.mgr.scheduler.ResetGroupListTask;
 import com.webank.webase.node.mgr.scheduler.StatisticsTransdailyTask;
 import com.webank.webase.node.mgr.transdaily.SeventDaysTrans;
@@ -58,43 +57,7 @@ public class GroupController extends BaseController {
     private StatisticsTransdailyTask statisticsTask;
     @Autowired
     private ResetGroupListTask resetGroupListTask;
-
-    /**
-     * generate group.
-     */
-    @PostMapping("/generate/{frontIp}/{frontPort}")
-    public BaseResponse generateGroup(@RequestBody @Valid GenerateGroupInfo req,
-            @PathVariable("frontIp") String frontIp, @PathVariable("frontPort") Integer frontPort,
-            BindingResult result) throws NodeMgrException {
-        checkBindResult(result);
-        Instant startTime = Instant.now();
-        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
-        log.info("start generateGroup startTime:{} groupId:{}", startTime.toEpochMilli(),
-                req.getGenerateGroupId());
-        groupService.generateGroup(req, frontIp, frontPort);
-        log.info("end getGroupGeneral useTime:{} result:{}",
-                Duration.between(startTime, Instant.now()).toMillis(),
-                JSON.toJSONString(baseResponse));
-        return baseResponse;
-    }
-
-    /**
-     * start group.
-     */
-    @GetMapping("/start/{startGroupId}/{frontIp}/{frontPort}")
-    public BaseResponse startGroup(@PathVariable("startGroupId") Integer startGroupId,
-            @PathVariable("frontIp") String frontIp, @PathVariable("frontPort") Integer frontPort)
-            throws NodeMgrException {
-        Instant startTime = Instant.now();
-        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
-        log.info("start startGroup startTime:{} groupId:{}", startTime.toEpochMilli(),
-                startGroupId);
-        groupService.startGroup(startGroupId, frontIp, frontPort);
-        log.info("end startGroup useTime:{} result:{}",
-                Duration.between(startTime, Instant.now()).toMillis(),
-                JSON.toJSONString(baseResponse));
-        return baseResponse;
-    }
+    
 
     /**
      * get group general.
@@ -173,4 +136,93 @@ public BaseResponse getTransDaily(@PathVariable("groupId") Integer groupId) thro
                 JSON.toJSONString(pagesponse));
         return pagesponse;
     }
+
+    /**
+     * generate group to single node.
+     */
+    @PostMapping("/generate/{nodeId}")
+    public BaseResponse generateToSingleNode(@PathVariable("nodeId") String nodeId,
+                                             @RequestBody @Valid ReqGenerateGroup req,
+                                             BindingResult result) throws NodeMgrException {
+        checkBindResult(result);
+        Instant startTime = Instant.now();
+        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
+        log.info("start generateToSingleNode startTime:{} nodeId:{}", startTime.toEpochMilli(),
+                nodeId);
+        TbGroup tbGroup = groupService.generateToSingleNode(nodeId, req);
+        baseResponse.setData(tbGroup);
+        log.info("end generateToSingleNode useTime:{}",
+                Duration.between(startTime, Instant.now()).toMillis());
+        return baseResponse;
+    }
+
+    /**
+     * generate group.
+     */
+    @PostMapping("/generate")
+    public BaseResponse generateGroup(@RequestBody @Valid ReqGenerateGroup req,
+                                      BindingResult result) throws NodeMgrException {
+        checkBindResult(result);
+        Instant startTime = Instant.now();
+        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
+        log.info("start generateGroup startTime:{} groupId:{}", startTime.toEpochMilli(),
+                req.getGenerateGroupId());
+        TbGroup tbGroup = groupService.generateGroup(req);
+        baseResponse.setData(tbGroup);
+        log.info("end generateGroup useTime:{}",
+                Duration.between(startTime, Instant.now()).toMillis());
+        return baseResponse;
+    }
+
+    /**
+     * operate group.
+     */
+    @PostMapping("/operate/{nodeId}")
+    public Object operateGroup(@PathVariable("nodeId") String nodeId, @RequestBody @Valid ReqOperateGroup req,
+                               BindingResult result) throws NodeMgrException {
+        checkBindResult(result);
+        Instant startTime = Instant.now();
+        Integer groupId = req.getGenerateGroupId();
+        String type = req.getType();
+        log.info("start operateGroup startTime:{} groupId:{}", startTime.toEpochMilli(), groupId);
+
+        Object groupHandleResult = groupService.operateGroup(nodeId, groupId, type);
+        log.info("end operateGroup useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(),
+                JSON.toJSONString(groupHandleResult));
+        return groupHandleResult;
+    }
+
+    /**
+     * batch start group.
+     */
+    @PostMapping("/batchStart")
+    public BaseResponse batchStartGroup(@RequestBody @Valid ReqBatchStartGroup req, BindingResult result)
+            throws NodeMgrException {
+        checkBindResult(result);
+        Instant startTime = Instant.now();
+        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
+        log.info("start batchStartGroup startTime:{} groupId:{}", startTime.toEpochMilli(),
+                req.getGenerateGroupId());
+        groupService.batchStartGroup(req);
+        log.info("end batchStartGroup useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(),
+                JSON.toJSONString(baseResponse));
+        return baseResponse;
+    }
+
+    /**
+     * update group.
+     */
+    @GetMapping("/update")
+    public BaseResponse updateGroup() throws NodeMgrException {
+        Instant startTime = Instant.now();
+        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
+        log.info("start updateGroup startTime:{}", startTime.toEpochMilli());
+        groupService.resetGroupList();
+        log.info("end updateGroup useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(),
+                JSON.toJSONString(baseResponse));
+        return baseResponse;
+    }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index dd2122e22..7b554b82d 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -16,6 +16,7 @@
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
 import com.webank.webase.node.mgr.base.enums.DataStatus;
+import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
 import com.webank.webase.node.mgr.base.tools.NodeMgrTools;
@@ -29,9 +30,7 @@
 import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
 import com.webank.webase.node.mgr.frontinterface.entity.GenerateGroupInfo;
 import com.webank.webase.node.mgr.frontinterface.entity.GroupHandleResult;
-import com.webank.webase.node.mgr.group.entity.GroupGeneral;
-import com.webank.webase.node.mgr.group.entity.StatisticalGroupTransInfo;
-import com.webank.webase.node.mgr.group.entity.TbGroup;
+import com.webank.webase.node.mgr.group.entity.*;
 import com.webank.webase.node.mgr.method.MethodService;
 import com.webank.webase.node.mgr.node.NodeService;
 import com.webank.webase.node.mgr.node.TbNode;
@@ -40,6 +39,7 @@
 import com.webank.webase.node.mgr.transdaily.TransDailyService;
 import com.webank.webase.node.mgr.user.UserService;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -82,57 +82,6 @@ public class GroupService {
     @Autowired
     private ConstantProperties constants;
 
-    /**
-     * generate group.
-     *
-     * @return
-     */
-    public void generateGroup(GenerateGroupInfo generateGroupInfo, String frontIp, Integer frontPort) {
-        // request front to generate
-        GroupHandleResult groupHandleResult = frontInterface.generateGroup(frontIp,
-                frontPort, generateGroupInfo);
-        // check result
-        int code = NodeMgrTools.parseHexStr2Int(groupHandleResult.getCode());
-        if (code != 0) {
-            log.error("fail generateGroupId:{} code:{}", generateGroupInfo.getGenerateGroupId(), code);
-            throw new NodeMgrException(code, groupHandleResult.getMessage());
-        }
-    }
-
-    /**
-     * start group.
-     *
-     * @param startGroupId
-     */
-    public void startGroup(Integer startGroupId, String frontIp, Integer frontPort) {
-        // request front to start
-        GroupHandleResult groupHandleResult = frontInterface.startGroup(frontIp,
-                frontPort, startGroupId);
-        // check result
-        int code = NodeMgrTools.parseHexStr2Int(groupHandleResult.getCode());
-        if (code != 0) {
-            log.error("fail startGroup startGroupId:{} code:{}", startGroupId, code);
-            throw new NodeMgrException(code, groupHandleResult.getMessage());
-        }
-        // @Deprecated: already refresh in front when start a group
-        // frontInterface.refreshFront(frontIp, frontPort);
-    }
-
-    /**
-     * save group id
-     */
-    public void saveGroupId(int groupId, int nodeCount) {
-        if (groupId == 0) {
-            return;
-        }
-        //save group id
-        String groupName = "group" + groupId;
-        TbGroup tbGroup = new TbGroup(groupId, groupName, nodeCount);
-        groupMapper.save(tbGroup);
-
-        //create table by group id
-        tableService.newTableByGroupId(groupId);
-    }
 
     /**
      * query count of group.
@@ -264,8 +213,9 @@ public void resetGroupList() {
                 allGroupSet.add(gId);
                 //peer in group
                 List<String> groupPeerList = frontInterface.getNodeIDListFromSpecificFront(frontIp, frontPort, gId);
-                //save groupId
-                saveGroupId(gId, groupPeerList.size());
+                // save group
+                saveGroup(gId, groupPeerList.size(), "synchronous",
+                        GroupType.SYNC.getValue());
                 frontGroupMapService.newFrontGroup(front.getFrontId(), gId);
                 //save new peers
                 savePeerList(frontIp, frontPort, gId, groupPeerList);
@@ -429,4 +379,167 @@ private void removeByGroupId(int groupId) {
         //drop table.
         tableService.dropTableByGroupId(groupId);
     }
+
+    /**
+     * generate group to single node.
+     *
+     * @param req info
+     * @return
+     */
+    public TbGroup generateToSingleNode(String nodeId, ReqGenerateGroup req) {
+        Integer generateGroupId = req.getGenerateGroupId();
+
+        TbFront tbFront = frontService.getByNodeId(nodeId);
+        if (tbFront == null) {
+            log.error("fail generateToSingleNode node front not exists.");
+            throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
+        }
+        // request front to generate
+        GenerateGroupInfo generateGroupInfo = new GenerateGroupInfo();
+        BeanUtils.copyProperties(req, generateGroupInfo);
+        frontInterface.generateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(),
+                generateGroupInfo);
+        // save group
+        TbGroup tbGroup = saveGroup(generateGroupId, req.getNodeList().size(),
+                req.getDescription(), GroupType.MANUAL.getValue());
+        return tbGroup;
+    }
+
+    /**
+     * generate group.
+     *
+     * @param req info
+     * @return
+     */
+    public TbGroup generateGroup(ReqGenerateGroup req) {
+        Integer generateGroupId = req.getGenerateGroupId();
+        checkGroupIdExisted(generateGroupId);
+
+        for (String nodeId : req.getNodeList()) {
+            // get front
+            TbFront tbFront = frontService.getByNodeId(nodeId);
+            if (tbFront == null) {
+                log.error("fail generateGroup node front not exists.");
+                throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
+            }
+            // request front to generate
+            GenerateGroupInfo generateGroupInfo = new GenerateGroupInfo();
+            BeanUtils.copyProperties(req, generateGroupInfo);
+            frontInterface.generateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(),
+                    generateGroupInfo);
+        }
+        // save group
+        TbGroup tbGroup = saveGroup(generateGroupId, req.getNodeList().size(),
+                req.getDescription(), GroupType.MANUAL.getValue());
+        return tbGroup;
+    }
+
+    /**
+     * operate group.
+     *
+     * @param nodeId
+     * @param groupId
+     * @param type
+     * @return
+     */
+    public Object operateGroup(String nodeId, Integer groupId, String type) {
+        // get front
+        TbFront tbFront = frontService.getByNodeId(nodeId);
+        if (tbFront == null) {
+            log.error("fail operateGroup node front not exists.");
+            throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
+        }
+        // request front to operate
+        Object groupHandleResult = frontInterface.operateGroup(tbFront.getFrontIp(),
+                tbFront.getFrontPort(), groupId, type);
+
+        // refresh
+        resetGroupList();
+
+        // return
+        return groupHandleResult;
+    }
+
+    /**
+     * batch start group.
+     *
+     * @param req
+     */
+    public void batchStartGroup(ReqBatchStartGroup req) {
+        Integer groupId = req.getGenerateGroupId();
+        // check id
+        checkGroupIdValid(groupId);
+        for (String nodeId : req.getNodeList()) {
+            // get front
+            TbFront tbFront = frontService.getByNodeId(nodeId);
+            if (tbFront == null) {
+                log.error("fail batchStartGroup node not exists.");
+                throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
+            }
+            // request front to start
+            frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
+                    "start");
+        }
+        // refresh
+        resetGroupList();
+    }
+
+
+    /**
+     * save group id
+     */
+    @Transactional
+    public TbGroup saveGroup(int groupId, int nodeCount, String description,
+                             int groupType) {
+        if (groupId == 0) {
+            return null;
+        }
+        // save group id
+        String groupName = "group" + groupId;
+        TbGroup tbGroup =
+                new TbGroup(groupId, groupName, nodeCount, description, groupType);
+        groupMapper.save(tbGroup);
+        // create table by group id
+        tableService.newTableByGroupId(groupId);
+        return tbGroup;
+    }
+
+    /**
+     * Check the validity of the groupId.
+     */
+    public void checkGroupIdExisted(Integer groupId) throws NodeMgrException {
+        log.debug("start checkGroupIdExisted groupId:{}", groupId);
+
+        if (groupId == null) {
+            log.error("fail checkGroupIdExisted groupId is null");
+            throw new NodeMgrException(ConstantCode.GROUP_ID_NULL);
+        }
+
+        Integer groupCount = countOfGroup(groupId, null);
+        log.debug("checkGroupIdExisted groupId:{} groupCount:{}", groupId, groupCount);
+        if (groupCount != null && groupCount > 0) {
+            throw new NodeMgrException(ConstantCode.GROUP_ID_EXISTS);
+        }
+        log.debug("end checkGroupIdExisted");
+    }
+
+    /**
+     * Check the validity of the groupId.
+     */
+    public void checkGroupIdValid(Integer groupId) throws NodeMgrException {
+        log.debug("start checkGroupIdValid groupId:{}", groupId);
+
+        if (groupId == null) {
+            log.error("fail checkGroupIdValid groupId is null");
+            throw new NodeMgrException(ConstantCode.GROUP_ID_NULL);
+        }
+
+        Integer groupCount = countOfGroup(groupId, null);
+        log.debug("checkGroupIdValid groupId:{} groupCount:{}", groupId, groupCount);
+        if (groupCount == null || groupCount == 0) {
+            throw new NodeMgrException(ConstantCode.INVALID_GROUP_ID);
+        }
+        log.debug("end checkGroupIdValid");
+    }
+
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/ReqBatchStartGroup.java b/src/main/java/com/webank/webase/node/mgr/group/entity/ReqBatchStartGroup.java
new file mode 100644
index 000000000..996f7e1ee
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/ReqBatchStartGroup.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.group.entity;
+
+import java.util.List;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author marsli
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReqBatchStartGroup {
+	@NotNull
+	private Integer generateGroupId;
+	@NotEmpty
+	private List<String> nodeList;
+}
\ No newline at end of file
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/ReqGenerateGroup.java b/src/main/java/com/webank/webase/node/mgr/group/entity/ReqGenerateGroup.java
new file mode 100644
index 000000000..b9e3c5eb3
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/ReqGenerateGroup.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.group.entity;
+
+import java.math.BigInteger;
+import java.util.List;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author marsli
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReqGenerateGroup {
+	@NotNull
+	private Integer generateGroupId;
+	@NotNull
+	private BigInteger timestamp;
+	@NotEmpty
+	private List<String> nodeList;
+	private String description;
+}
\ No newline at end of file
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/ReqOperateGroup.java b/src/main/java/com/webank/webase/node/mgr/group/entity/ReqOperateGroup.java
new file mode 100644
index 000000000..6dff79242
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/ReqOperateGroup.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.group.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReqOperateGroup {
+	@NotNull
+	private Integer generateGroupId;
+	@NotBlank
+	private String type;
+}
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java b/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
index be6558431..2b77fb9af 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
@@ -35,10 +35,17 @@ public class TbGroup {
     private BigInteger transCount = BigInteger.ZERO;
     private LocalDateTime createTime;
     private LocalDateTime modifyTime;
+    private String description;
+    private Integer groupType;
 
-    public TbGroup(Integer groupId, String groupName,Integer nodeCount){
+    public TbGroup(Integer groupId, String groupName, Integer nodeCount,
+                   String description, Integer groupType) {
         this.groupId = groupId;
         this.groupName = groupName;
         this.nodeCount = nodeCount;
+        this.description = description;
+        this.groupType = groupType;
     }
+
+
 }
\ No newline at end of file

From 680c301263e75e4a550048339d31d313ebd12435 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 30 Apr 2020 18:08:56 +0800
Subject: [PATCH 006/131] update web3sdk 2.4.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0b018dfad..bb7186aec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ List jaxb = [
 ]
 
 List web3jsdk = [
-    "org.fisco-bcos:web3sdk:2.2.0"
+    "org.fisco-bcos:web3sdk:2.4.0"
 ]
 
 List lombok = [

From d590915d2d02c0e10509bcffd3a21ab553cb74d3 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 6 May 2020 17:03:06 +0800
Subject: [PATCH 007/131] add abi module

---
 script/webase-ddl.sql                         |  19 +-
 .../webase/node/mgr/abi/AbiController.java    | 117 ++++++++++++
 .../webank/webase/node/mgr/abi/AbiMapper.java |  45 +++++
 .../webase/node/mgr/abi/AbiService.java       | 174 ++++++++++++++++++
 .../webase/node/mgr/abi/entity/AbiInfo.java   |  45 +++++
 .../node/mgr/abi/entity/ReqAbiListParam.java  |  36 ++++
 .../webase/node/mgr/abi/entity/ReqDelAbi.java |  17 ++
 .../node/mgr/abi/entity/ReqImportAbi.java     |  41 +++++
 .../node/mgr/base/code/ConstantCode.java      |   7 +
 .../node/mgr/base/tools/NodeMgrTools.java     |  27 +++
 src/main/resources/mapper/AbiMapper.xml       |  89 +++++++++
 11 files changed, 616 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/abi/AbiMapper.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/abi/AbiService.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/abi/entity/AbiInfo.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/abi/entity/ReqAbiListParam.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/abi/entity/ReqImportAbi.java
 create mode 100644 src/main/resources/mapper/AbiMapper.xml

diff --git a/script/webase-ddl.sql b/script/webase-ddl.sql
index b05ba0ef0..278fb65a1 100644
--- a/script/webase-ddl.sql
+++ b/script/webase-ddl.sql
@@ -106,7 +106,7 @@ CREATE TABLE IF NOT EXISTS tb_method(
   create_time datetime DEFAULT NULL COMMENT '创建时间',
   modify_time datetime DEFAULT NULL COMMENT '修改时间',
   PRIMARY KEY (method_id,group_id)
-) COMMENT='方法解析信息表' ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='方法解析信息表';
 
 
 
@@ -302,3 +302,20 @@ CREATE TABLE IF NOT EXISTS tb_alert_log (
   PRIMARY KEY (log_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='告警日志表';
 
+-- ----------------------------
+-- Table structure for tb_abi, unrelated with tb_contract
+-- ----------------------------
+CREATE TABLE IF NOT EXISTS tb_abi (
+  abi_id int(11) NOT NULL AUTO_INCREMENT COMMENT '合约ABI的编号',
+  group_id int(11) NOT NULL COMMENT '合约ABI所属群组的编号',
+  contract_name varchar(120) NOT NULL COMMENT '合约ABI的合约名',
+  contract_address varchar(64) NOT NULL COMMENT '合约ABI的合约地址',
+  contract_abi text NOT NULL COMMENT '合约ABI的内容',
+  contract_bin text NOT NULL COMMENT '合约ABI的runtime-bin',
+  create_time datetime DEFAULT NULL COMMENT '合约ABI的创建时间',
+  modify_time datetime DEFAULT NULL COMMENT '合约ABI的修改时间'
+  PRIMARY KEY (abi_id),
+  UNIQUE KEY unique_address (group_id,contract_address)
+  UNIQUE KEY unique_name (group_id,contract_name)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='合约ABI表';
+
diff --git a/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java b/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
new file mode 100644
index 000000000..fcb39e019
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.abi;
+
+import com.alibaba.fastjson.JSON;
+import com.webank.webase.node.mgr.abi.entity.AbiInfo;
+import com.webank.webase.node.mgr.abi.entity.ReqAbiListParam;
+import com.webank.webase.node.mgr.abi.entity.ReqImportAbi;
+import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.controller.BaseController;
+import com.webank.webase.node.mgr.base.entity.BasePageResponse;
+import com.webank.webase.node.mgr.base.entity.BaseResponse;
+import com.webank.webase.node.mgr.base.enums.SqlSortType;
+import com.webank.webase.node.mgr.base.properties.ConstantProperties;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
+
+@Log4j2
+@RestController
+@RequestMapping("abi")
+public class AbiController extends BaseController {
+	@Autowired
+	AbiService abiService;
+
+	@GetMapping("/list/{pageNumber}/{pageSize}")
+	public Object listAbi(@PathVariable("pageNumber") Integer pageNumber,
+						   @PathVariable("pageSize") Integer pageSize) {
+		Instant startTime = Instant.now();
+		if (pageNumber < 1 || pageSize <= 0) {
+			return new BaseResponse(ConstantCode.PARAM_EXCEPTION);
+		}
+		log.info("start listAbi. startTime:{},pageNumber:{},pageSize:{}",
+				startTime.toEpochMilli(), pageNumber, pageSize);
+
+		Integer start = Optional.ofNullable(pageNumber).map(page -> (page - 1) * pageSize)
+				.orElse(0);
+		ReqAbiListParam param = new ReqAbiListParam(start, pageSize,
+				SqlSortType.DESC.getValue());
+		List<AbiInfo> resList = abiService.getListByGroupId(param);
+		// total count
+		int count = abiService.countOfAbi();
+
+		log.info("end listAbi. useTime:{}, resList:{}",
+				Duration.between(startTime, Instant.now()).toMillis(), resList);
+		return new BasePageResponse(ConstantCode.SUCCESS, resList, count);
+	}
+
+	@GetMapping("/{abiId}")
+	public Object getAbiById(@PathVariable("abiId") Integer abiId) {
+		Instant startTime = Instant.now();
+		log.info("start getAbiById. startTime:{} abiId:{}",
+				startTime.toEpochMilli(), abiId);
+		AbiInfo res = abiService.getAbiById(abiId);
+		log.info("end getAbiById. useTime:{}, res:{}",
+				Duration.between(startTime, Instant.now()).toMillis(), res);
+		return new BaseResponse(ConstantCode.SUCCESS, res);
+	}
+
+	@PostMapping("")
+	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+	public Object saveAbi(@Valid @RequestBody ReqImportAbi param, BindingResult result) {
+		checkBindResult(result);
+		Instant startTime = Instant.now();
+		log.info("start saveAbi. startTime:{} ReqImportAbi:{}",
+				startTime.toEpochMilli(), JSON.toJSONString(param));
+		abiService.saveAbi(param);
+		log.info("end saveAbi. useTime:{}",
+				Duration.between(startTime, Instant.now()).toMillis());
+		return new BaseResponse(ConstantCode.SUCCESS);
+	}
+
+	/**
+	 * @param param abiId is not empty to update
+	 * @return
+	 */
+	@PutMapping("")
+	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+	public Object updateAbi(@RequestBody ReqImportAbi param, BindingResult result) {
+		checkBindResult(result);
+		Instant startTime = Instant.now();
+		log.info("start updateAbi. startTime:{} ReqImportAbi:{}",
+				startTime.toEpochMilli(), JSON.toJSONString(param));
+		if(param.getAbiId() == null) {
+			return new BaseResponse(ConstantCode.PARAM_FAIL_ABI_ID_EMPTY);
+		}
+		abiService.saveAbi(param);
+		AbiInfo res = abiService.getAbiById(param.getAbiId());
+		log.info("end updateAbi. useTime:{}, res:{}",
+				Duration.between(startTime, Instant.now()).toMillis(), res);
+		return new BaseResponse(ConstantCode.SUCCESS, res);
+	}
+
+
+}
diff --git a/src/main/java/com/webank/webase/node/mgr/abi/AbiMapper.java b/src/main/java/com/webank/webase/node/mgr/abi/AbiMapper.java
new file mode 100644
index 000000000..9e8f76a9b
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/abi/AbiMapper.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.abi;
+
+import com.webank.webase.node.mgr.abi.entity.AbiInfo;
+import com.webank.webase.node.mgr.abi.entity.ReqAbiListParam;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface AbiMapper {
+
+	List<AbiInfo> listOfAbi(@Param("param") ReqAbiListParam param);
+
+	Integer countOfAbi();
+
+	AbiInfo queryByAbiId(@Param("abiId") int abiId);
+
+	AbiInfo queryByGroupIdAndAddress(@Param("groupId") int groupId,
+									 @Param("contractAddress") String contractAddress);
+
+	AbiInfo queryByGroupIdAndContractName(@Param("groupId") int groupId,
+									 @Param("contractName") String contractName);
+	void add(AbiInfo abiInfo);
+
+	void update(AbiInfo abiInfo);
+
+	void deleteByAbiId(@Param("abiId") int abiId);
+}
diff --git a/src/main/java/com/webank/webase/node/mgr/abi/AbiService.java b/src/main/java/com/webank/webase/node/mgr/abi/AbiService.java
new file mode 100644
index 000000000..a9be1351f
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/abi/AbiService.java
@@ -0,0 +1,174 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.abi;
+
+import com.alibaba.fastjson.JSON;
+import com.webank.webase.node.mgr.abi.entity.AbiInfo;
+import com.webank.webase.node.mgr.abi.entity.ReqAbiListParam;
+import com.webank.webase.node.mgr.abi.entity.ReqImportAbi;
+import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.exception.NodeMgrException;
+import com.webank.webase.node.mgr.base.tools.NodeMgrTools;
+import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
+import lombok.extern.log4j.Log4j2;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Objects;
+
+@Log4j2
+@Service
+public class AbiService {
+
+	@Autowired
+	AbiMapper abiMapper;
+	@Autowired
+	FrontInterfaceService frontInterfaceService;
+
+
+	public List<AbiInfo> getListByGroupId(ReqAbiListParam param) {
+		List<AbiInfo> abiList = abiMapper.listOfAbi(param);
+		return abiList;
+	}
+
+	public void saveAbi(ReqImportAbi param) {
+		if (Objects.isNull(param.getAbiId())) {
+			insertAbiInfo(param);
+		} else {
+			updateAbiInfo(param);
+		}
+	}
+
+	@Transactional
+	public void insertAbiInfo(ReqImportAbi param) {
+		int groupId = param.getGroupId();
+		String contractName = param.getContractName();
+		String contractAddress = param.getContractAddress();
+		String contractAbiStr;
+		try {
+			contractAbiStr = JSON.toJSONString(param.getContractAbi());
+		} catch (Exception e) {
+			log.warn("abi parse string error:{}", param.getContractAbi());
+			throw new NodeMgrException(ConstantCode.PARAM_FAIL_ABI_INVALID);
+		}
+		// check address
+		String contractBin = getAddressRuntimeBin(groupId, contractAddress);
+		// check name and address of abi not exist
+		checkAbiExist(groupId, contractName, contractAddress);
+
+		AbiInfo saveAbi = new AbiInfo();
+		BeanUtils.copyProperties(param, saveAbi);
+		saveAbi.setContractAbi(contractAbiStr);
+		saveAbi.setContractBin(contractBin);
+		saveAbi.setCreateTime(LocalDateTime.now());
+		saveAbi.setModifyTime(LocalDateTime.now());
+		abiMapper.add(saveAbi);
+	}
+
+	@Transactional
+	public void updateAbiInfo(ReqImportAbi param) {
+		Integer abiId = param.getAbiId();
+		// check id exists
+		checkAbiIdExist(abiId);
+		// update
+		AbiInfo updateAbi = new AbiInfo();
+		BeanUtils.copyProperties(param, updateAbi);
+		String contractAbiStr;
+		try {
+			contractAbiStr = JSON.toJSONString(param.getContractAbi());
+		} catch (Exception e) {
+			log.warn("abi parse string error:{}", param.getContractAbi());
+			throw new NodeMgrException(ConstantCode.PARAM_FAIL_ABI_INVALID);
+		}
+		// check address
+		String contractBin = getAddressRuntimeBin(param.getGroupId(), param.getContractAddress());
+		updateAbi.setContractAbi(contractAbiStr);
+		updateAbi.setContractBin(contractBin);
+		updateAbi.setModifyTime(LocalDateTime.now());
+		abiMapper.update(updateAbi);
+	}
+
+	public void delete(Integer id) {
+		checkAbiIdExist(id);
+		abiMapper.deleteByAbiId(id);
+	}
+
+	private void checkAbiExist(int groupId, String contractName, String address) {
+		AbiInfo checkAbiName = abiMapper.queryByGroupIdAndContractName(groupId, contractName);
+		if (Objects.nonNull(checkAbiName)) {
+			throw new NodeMgrException(ConstantCode.CONTRACT_NAME_REPEAT);
+		}
+		AbiInfo checkAbiAddressExist = abiMapper.queryByGroupIdAndAddress(groupId, address);
+		if (Objects.nonNull(checkAbiAddressExist)) {
+			throw new NodeMgrException(ConstantCode.CONTRACT_ADDRESS_ALREADY_EXISTS);
+		}
+	}
+
+	public AbiInfo getAbiById(Integer abiId) {
+		return abiMapper.queryByAbiId(abiId);
+	}
+
+	private void checkAbiIdExist(Integer abiId) {
+		AbiInfo checkAbiId = getAbiById(abiId);
+		if (Objects.isNull(checkAbiId)) {
+			throw new NodeMgrException(ConstantCode.ABI_INFO_NOT_EXISTS);
+		}
+	}
+
+	/**
+	 * check address is valid.
+	 * @return address's runtime bin
+	 */
+	private String getAddressRuntimeBin(int groupId, String contractAddress) {
+		if (StringUtils.isBlank(contractAddress)) {
+			log.error("fail getAddressRuntimeBin. contractAddress is empty");
+			throw new NodeMgrException(ConstantCode.CONTRACT_ADDRESS_NULL);
+		}
+		String binOnChain;
+		try {
+			binOnChain = frontInterfaceService.getCodeFromFront(groupId, contractAddress, BigInteger.ZERO);
+		} catch (Exception e) {
+			log.error("fail getAddressRuntimeBin.", e);
+			throw new NodeMgrException(ConstantCode.CONTRACT_ADDRESS_INVALID);
+		}
+		log.info("getAddressRuntimeBin address:{} binOnChain:{}", contractAddress, binOnChain);
+		String runtimeBin = NodeMgrTools.removeFirstStr(binOnChain, "0x");
+		if (StringUtils.isBlank(runtimeBin)) {
+			log.error("fail getAddressRuntimeBin. runtimeBin is null, address:{}", contractAddress);
+			throw new NodeMgrException(ConstantCode.CONTRACT_NOT_DEPLOY);
+		}
+		return runtimeBin;
+	}
+
+	public int countOfAbi() {
+		log.debug("start countOfAbi ");
+		try {
+			int count = abiMapper.countOfAbi();
+			log.debug("end countOfAbi count:{}", count);
+			return count;
+		}catch (Exception e) {
+			log.error("countOfAbi error exception:[]", e);
+			throw new NodeMgrException(ConstantCode.DB_EXCEPTION.getCode(),
+					e.getMessage());
+		}
+	}}
diff --git a/src/main/java/com/webank/webase/node/mgr/abi/entity/AbiInfo.java b/src/main/java/com/webank/webase/node/mgr/abi/entity/AbiInfo.java
new file mode 100644
index 000000000..16b361e63
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/abi/entity/AbiInfo.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.abi.entity;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * entity for table tb_abi to store raw contract abi
+ */
+@Data
+public class AbiInfo {
+	private Integer abiId;
+	private Integer groupId;
+	private String contractName;
+	private String contractAddress;
+	private String contractAbi;
+	/**
+	 * runtime bin
+	 */
+	private String contractBin;
+	/**
+	 * 1-normal, 2-invalid
+	 */
+	// private Integer contractStatus;
+	private LocalDateTime createTime;
+	private LocalDateTime modifyTime;
+
+}
+
diff --git a/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqAbiListParam.java b/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqAbiListParam.java
new file mode 100644
index 000000000..8476df99e
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqAbiListParam.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.abi.entity;
+
+import com.webank.webase.node.mgr.base.entity.BaseQueryParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
+public class ReqAbiListParam extends BaseQueryParam {
+
+	private Integer groupId;
+	public ReqAbiListParam(Integer start, Integer pageSize,
+						   String flagSortedByTime) {
+		super(start, pageSize, flagSortedByTime);
+	}
+}
diff --git a/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java b/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java
new file mode 100644
index 000000000..c6e25371f
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java
@@ -0,0 +1,17 @@
+package com.webank.webase.node.mgr.abi.entity;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * entity to delete abi info by id
+ * @author marsli
+ */
+@Data
+@NoArgsConstructor
+public class ReqDelAbi {
+	@NotNull
+	private Long abiId;
+}
\ No newline at end of file
diff --git a/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqImportAbi.java b/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqImportAbi.java
new file mode 100644
index 000000000..a803e471b
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqImportAbi.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.abi.entity;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * entity to import/update abi info
+ */
+@Data
+@NoArgsConstructor
+public class ReqImportAbi {
+	private Integer abiId;
+	@NotNull
+	private Integer groupId;
+	@NotBlank
+	private String contractName;
+	@NotBlank
+	private String contractAddress;
+	@NotNull
+	private List<Object> contractAbi;
+}
diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index 7d5007cc0..8546a60af 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -143,6 +143,13 @@ public class ConstantCode {
     public static final RetCode ENCRYPT_TYPE_NOT_MATCH = RetCode.mark(202091,
             "Front's encrypt type not matches with nodemgr");
 
+    // abi import
+    public static final RetCode CONTRACT_ADDRESS_ALREADY_EXISTS = RetCode.mark(202096, "contract address already exists");
+    public static final RetCode ABI_INFO_NOT_EXISTS = RetCode.mark(202097, "abi info of this id not exists");
+    public static final RetCode PARAM_FAIL_ABI_INVALID = RetCode.mark(202098, "Contract abi invalid, please check abi");
+    public static final RetCode PARAM_FAIL_ABI_ID_EMPTY = RetCode.mark(202099, "Abi Id cannot be empty");
+    public static final RetCode CONTRACT_ADDRESS_NULL = RetCode.mark(202100, "contractAddress is null");
+
     /* dynamic group manage */
     public static final RetCode GROUP_ID_EXISTS = RetCode.mark(202300, "group id already exists");
     public static final RetCode NODE_NOT_EXISTS = RetCode.mark(202301, "node front not exists");
diff --git a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
index 4c5de9f3e..51ba993ec 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
@@ -485,4 +485,31 @@ public static int parseHexStr2Int(String str) {
         }
         return Integer.parseInt(str.substring(2), 16);
     }
+
+    /**
+     * remove "0x" and last character.
+     */
+    public static String removeBinFirstAndLast(String contractBin, int removaLastLength) {
+        if (StringUtils.isBlank(contractBin)) {
+            return null;
+        }
+        contractBin = removeFirstStr(contractBin, "0x");
+        if (contractBin.length() > removaLastLength) {
+            contractBin = contractBin.substring(0, contractBin.length() - removaLastLength);
+        }
+        return contractBin;
+    }
+
+    /**
+     * remove fist string.
+     */
+    public static String removeFirstStr(String constant, String target) {
+        if (StringUtils.isBlank(constant) || StringUtils.isBlank(target)) {
+            return constant;
+        }
+        if (constant.startsWith(target)) {
+            constant = StringUtils.removeStart(constant, target);
+        }
+        return constant;
+    }
 }
diff --git a/src/main/resources/mapper/AbiMapper.xml b/src/main/resources/mapper/AbiMapper.xml
new file mode 100644
index 000000000..f42f09b15
--- /dev/null
+++ b/src/main/resources/mapper/AbiMapper.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.webank.webase.node.mgr.abi.AbiMapper">
+    <resultMap id="abiMap"
+               type="com.webank.webase.node.mgr.abi.entity.AbiInfo">
+        <id column="abi_id" javaType="java.lang.Integer" jdbcType="INTEGER"
+            property="abiId" />
+        <result column="group_id" javaType="java.lang.Integer" jdbcType="INTEGER"
+                property="groupId" />
+        <result column="contract_name" javaType="java.lang.String" jdbcType="VARCHAR"
+                property="contractName" />
+        <result column="contract_address" javaType="java.lang.String" jdbcType="VARCHAR"
+                property="contractAddress" />
+        <result column="contract_abi" javaType="java.lang.String" jdbcType="VARCHAR"
+                property="contractAbi" />
+        <result column="contract_bin" javaType="java.lang.String" jdbcType="VARCHAR"
+                property="contractBin" />
+        <result column="create_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP"
+                property="createTime" />
+        <result column="modify_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP"
+                property="modifyTime" />
+    </resultMap>
+
+
+    <insert id="add" parameterType="com.webank.webase.node.mgr.abi.entity.ReqImportAbi">
+        REPLACE INTO tb_abi(group_id,contract_name,contract_address,contract_abi,contract_bin,
+        create_time,modify_time)
+        VALUES (#{groupId},#{contractName},#{contractAddress},#{contractAbi},#{contractBin}, now(), now())
+    </insert>
+
+    <delete id="deleteByAbiId" parameterType="java.lang.Integer">
+        delete from tb_abi
+        where abi_id = #{abiId}
+    </delete>
+
+    <update id="update" parameterType="com.webank.webase.node.mgr.abi.entity.ReqImportAbi">
+        update tb_abi set modify_time = now()
+        <if test="contractName != null and contractName != ''">
+            ,contract_name = #{contractName}
+        </if>
+        <if test="contractAddress != null and contractAddress != ''">
+            ,contract_address = #{contractAddress}
+        </if>
+        <if test="contractAbi != null and contractAbi != ''">
+            ,contract_abi = #{contractAbi}
+        </if>
+        <if test="contractBin != null and contractBin != ''">
+            ,contract_bin = #{contractBin}
+        </if>
+        where abi_id = #{abiId}
+    </update>
+
+    <select id="listOfAbi" parameterType="com.webank.webase.node.mgr.abi.entity.ReqAbiListParam"
+            resultMap="abiMap">
+        select a.* from tb_abi a
+        where 1=1
+        ,group_id = #{groupId}
+        <if test="param.flagSortedByTime != null and param.flagSortedByTime != ''">
+            order by a.create_time ${param.flagSortedByTime}
+        </if>
+        <if test="param.start != null and param.pageSize != null">
+            limit #{param.start},#{param.pageSize}
+        </if>
+    </select>
+
+    <select id="countOfAbi" resultType="java.lang.Integer">
+        select count(1) from tb_abi where 1=1
+    </select>
+
+    <select id="queryByAbiId" parameterType="java.lang.Integer"
+            resultMap="abiMap">
+        SELECT a.* FROM tb_abi a
+        WHERE abi_id = #{abiId}
+    </select>
+
+    <select id="queryByGroupIdAndAddress" resultMap="abiMap">
+        SELECT a.* FROM tb_abi a
+        WHERE group_id = #{groupId}
+        and contract_address = #{contractAddress}
+        limit 1
+    </select>
+    <select id="queryByGroupIdAndContractName" resultMap="abiMap">
+        SELECT a.* FROM tb_abi a
+        WHERE group_id = #{groupId}
+        and contract_name = #{contractName}
+        limit 1
+    </select>
+</mapper>
\ No newline at end of file

From 9b013d58b28c806614b4eacacb51e2a86ddc4416 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 6 May 2020 17:10:04 +0800
Subject: [PATCH 008/131] optimize alert code

---
 .../node/mgr/alert/log/AlertLogController.java   |  6 ++----
 .../node/mgr/alert/mail/MailController.java      |  6 +++---
 .../webase/node/mgr/alert/mail/MailService.java  | 16 +++++-----------
 .../node/mgr/alert/rule/AlertRuleController.java |  6 +++---
 .../webase/node/mgr/base/code/ConstantCode.java  |  2 +-
 5 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/alert/log/AlertLogController.java b/src/main/java/com/webank/webase/node/mgr/alert/log/AlertLogController.java
index b934dfb59..b0e70aa80 100644
--- a/src/main/java/com/webank/webase/node/mgr/alert/log/AlertLogController.java
+++ b/src/main/java/com/webank/webase/node/mgr/alert/log/AlertLogController.java
@@ -63,7 +63,7 @@ public Object listAlertLog(@PathVariable("pageNumber") Integer pageNumber,
                     Duration.between(startTime, Instant.now()).toMillis(), resList);
             return new BasePageResponse(ConstantCode.SUCCESS, resList, count);
         }catch (NodeMgrException e) {
-            log.debug("listAlertLog, error, exception:[] ", e);
+            log.error("listAlertLog, error, exception:[] ", e);
             return new BaseResponse(ConstantCode.ALERT_LOG_ERROR, e.getMessage());
         }
     }
@@ -80,14 +80,12 @@ public Object updateAlertLog(@RequestBody ReqLogParam param) {
         log.info("start updateAlertLog. startTime:{} ReqAlertLogParam:{}",
                 startTime.toEpochMilli(), JSON.toJSONString(param));
         if(param.getStatus() == null || param.getLogId() == null) {
-            log.debug("updateAlertLog, error:{} ",
-                    ConstantCode.ALERT_LOG_PARAM_EMPTY);
             return new BaseResponse(ConstantCode.ALERT_LOG_PARAM_EMPTY);
         }
         try{
             alertLogService.updateAlertLog(param);
         }catch (NodeMgrException e) {
-            log.debug("updateAlertLog, error, exception:[] ", e);
+            log.error("updateAlertLog, error, exception:[] ", e);
             return new BaseResponse(ConstantCode.ALERT_LOG_ERROR, e.getMessage());
         }
         AlertLog res = alertLogService.queryByLogId(param.getLogId());
diff --git a/src/main/java/com/webank/webase/node/mgr/alert/mail/MailController.java b/src/main/java/com/webank/webase/node/mgr/alert/mail/MailController.java
index 06524bc31..629cfc36c 100644
--- a/src/main/java/com/webank/webase/node/mgr/alert/mail/MailController.java
+++ b/src/main/java/com/webank/webase/node/mgr/alert/mail/MailController.java
@@ -71,7 +71,7 @@ public Object sendTestMail(@PathVariable("toMailAddress")String toMailAddress,
         try{
             checkParamEmpty(reqMailServerConfigParam);
         }catch (NodeMgrException e){
-            return new BaseResponse(ConstantCode.MAIL_SERVER_CONFIG__PARAM_EMPTY);
+            return new BaseResponse(ConstantCode.MAIL_SERVER_CONFIG_PARAM_EMPTY);
         }
         // get configuration from web and refresh JavaMailSender
         mailService.refreshJavaMailSenderConfigFromWeb(reqMailServerConfigParam);
@@ -101,13 +101,13 @@ public void checkParamEmpty(ReqMailServerConfigParam reqMailServerConfigParam) {
         reqMailServerConfigParam.getAuthentication() == null ||
                 StringUtils.isEmpty(reqMailServerConfigParam.getHost())) {
             log.error("error checkParamEmpty reqMailServerConfigParam:{}", reqMailServerConfigParam);
-            throw new NodeMgrException(ConstantCode.MAIL_SERVER_CONFIG__PARAM_EMPTY);
+            throw new NodeMgrException(ConstantCode.MAIL_SERVER_CONFIG_PARAM_EMPTY);
         }
         if(reqMailServerConfigParam.getAuthentication() == EnableStatus.ON.getValue()) {
             if(StringUtils.isEmpty(reqMailServerConfigParam.getUsername()) ||
                     StringUtils.isEmpty(reqMailServerConfigParam.getPassword())) {
                 log.error("error checkParamEmpty in auth reqMailServerConfigParam:{}", reqMailServerConfigParam);
-                throw new NodeMgrException(ConstantCode.MAIL_SERVER_CONFIG__PARAM_EMPTY);
+                throw new NodeMgrException(ConstantCode.MAIL_SERVER_CONFIG_PARAM_EMPTY);
             }
         }
         log.debug("end checkParamEmpty reqMailServerConfigParam:{}", reqMailServerConfigParam);
diff --git a/src/main/java/com/webank/webase/node/mgr/alert/mail/MailService.java b/src/main/java/com/webank/webase/node/mgr/alert/mail/MailService.java
index 116413a5e..5f9395e67 100644
--- a/src/main/java/com/webank/webase/node/mgr/alert/mail/MailService.java
+++ b/src/main/java/com/webank/webase/node/mgr/alert/mail/MailService.java
@@ -180,21 +180,15 @@ public void sendMailByRule(int ruleId, String replacementText) {
         TbMailServerConfig latestMailServerConfig = mailServerConfigService.getLatestMailServerConfig();
         // if mail server not turn ON
         if(latestMailServerConfig.getEnable() == EnableStatus.OFF.getValue()) {
-            log.error("end sendMailByRule for server config not enable:{}", latestMailServerConfig);
+            log.warn("end sendMailByRule for server config not enable:{}", latestMailServerConfig);
             return;
         }
         TbAlertRule alertRule = alertRuleMapper.queryByRuleId(ruleId);
         // if alert not activated
         if(alertRule.getEnable() == EnableStatus.OFF.getValue()) {
-            log.debug("end sendMailByRule non-sending mail for alertRule not enabled:{}", alertRule);
+            log.warn("end sendMailByRule non-sending mail for alertRule not enabled:{}", alertRule);
             return;
         }
-        // last time alert by now, if within interval, not send
-        // 告警间隔时间的刷新放到遍历group异常的for循环外面
-//        if(isWithinAlertIntervalByNow(alertRule)) {
-//            log.debug("end sendMailByRule non-sending mail for beyond alert interval:{}", alertRule);
-//            return;
-//        }
         // if userList is empty or default email
         if(StringUtils.isEmpty(alertRule.getUserList())) {
             log.error("end sendMailByRule for no receive mail address:{}", alertRule);
@@ -246,13 +240,13 @@ public void sendMailByRule(int ruleId, List<String> replacementTextList) {
         TbMailServerConfig latestMailServerConfig = mailServerConfigService.getLatestMailServerConfig();
         // if mail server not turn ON
         if(latestMailServerConfig.getEnable() == EnableStatus.OFF.getValue()) {
-            log.error("end sendMailByRule for server config not enable:{}", latestMailServerConfig);
+            log.warn("end sendMailByRule for server config not enable:{}", latestMailServerConfig);
             return;
         }
         TbAlertRule alertRule = alertRuleMapper.queryByRuleId(ruleId);
         // if alert not activated
         if(alertRule.getEnable() == EnableStatus.OFF.getValue()) {
-            log.debug("end sendMailByRule non-sending mail for alertRule not enabled:{}", alertRule);
+            log.warn("end sendMailByRule non-sending mail for alertRule not enabled:{}", alertRule);
             return;
         }
         // last time alert by now, if within interval, not send
@@ -329,7 +323,7 @@ public void handleAllUserEmail(TbAlertRule alertRule, String emailTitle, String
             try {
                 userList = (List<String>) JSON.parse(alertRule.getUserList());
             }catch (Exception e) {
-                log.error("handleAllUserEmail parse error: e:[], getUserList{}",
+                log.error("handleAllUserEmail parse error: e:{}, getUserList{}",
                         e, alertRule.getUserList());
             }
             for(String userMailAddress: userList) {
diff --git a/src/main/java/com/webank/webase/node/mgr/alert/rule/AlertRuleController.java b/src/main/java/com/webank/webase/node/mgr/alert/rule/AlertRuleController.java
index 7c33355af..267d5f228 100644
--- a/src/main/java/com/webank/webase/node/mgr/alert/rule/AlertRuleController.java
+++ b/src/main/java/com/webank/webase/node/mgr/alert/rule/AlertRuleController.java
@@ -69,7 +69,7 @@ public Object listAlertRules() {
                     Duration.between(startTime, Instant.now()).toMillis(), resList);
             return new BaseResponse(ConstantCode.SUCCESS, resList);
         }catch (NodeMgrException e) {
-            log.debug("listAlertRules, error, exception:[] ", e);
+            log.error("listAlertRules, error, exception:[] ", e);
             return new BaseResponse(ConstantCode.ALERT_RULE_ERROR, e.getMessage());
         }
     }
@@ -103,7 +103,7 @@ public Object updateAlertRule(@RequestBody ReqAlertRuleParam param) {
         try{
             alertRuleService.updateAlertRule(param);
         }catch (NodeMgrException e) {
-            log.debug("updateAlertRule, error, exception:[] ", e);
+            log.error("updateAlertRule, error, exception:[] ", e);
             return new BaseResponse(ConstantCode.ALERT_RULE_ERROR, e.getMessage());
         }
         TbAlertRule res = alertRuleService.queryByRuleId(param.getRuleId());
@@ -131,7 +131,7 @@ public Object toggleAlertRule(@RequestBody ReqAlertRuleParam param) {
         try{
             alertRuleService.updateAlertRule(param);
         }catch (NodeMgrException e) {
-            log.debug("toggleAlertRule error, exception:[] ", e);
+            log.error("toggleAlertRule error, exception:[] ", e);
             return new BaseResponse(ConstantCode.ALERT_RULE_ERROR, e.getMessage());
         }
         TbAlertRule res = alertRuleService.queryByRuleId(param.getRuleId());
diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index 8546a60af..98b7cd7c4 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -124,7 +124,7 @@ public class ConstantCode {
 
     // 邮件告警错误
     public static final RetCode MAIL_SERVER_CONFIG_ERROR = RetCode.mark(202070, "Mail server config error.");
-    public static final RetCode MAIL_SERVER_CONFIG__PARAM_EMPTY = RetCode.mark(202071,
+    public static final RetCode MAIL_SERVER_CONFIG_PARAM_EMPTY = RetCode.mark(202071,
             "Mail server config param empty/not match.");
     public static final RetCode MAIL_SERVER_CONFIG_ERROR_NO_DATA_IN_DB = RetCode.mark(202072,
             "Mail server config error, db's server config is empty");

From 4c56f8c9145d12e78ba38a50ebe6eba7d5815e6e Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 6 May 2020 17:55:32 +0800
Subject: [PATCH 009/131] fix alert error code

---
 .../alert/mail/server/config/MailServerConfigController.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/alert/mail/server/config/MailServerConfigController.java b/src/main/java/com/webank/webase/node/mgr/alert/mail/server/config/MailServerConfigController.java
index ce6a2b5f4..587af27c1 100644
--- a/src/main/java/com/webank/webase/node/mgr/alert/mail/server/config/MailServerConfigController.java
+++ b/src/main/java/com/webank/webase/node/mgr/alert/mail/server/config/MailServerConfigController.java
@@ -86,8 +86,8 @@ public Object updateMailServerConfig(@RequestBody ReqMailServerConfigParam param
                 startTime.toEpochMilli(), JSON.toJSONString(param));
         if(param.getServerId() == null) {
             log.debug("updateMailServerConfig, error:{} ",
-                    ConstantCode.MAIL_SERVER_CONFIG__PARAM_EMPTY);
-            return new BaseResponse(ConstantCode.MAIL_SERVER_CONFIG__PARAM_EMPTY);
+                    ConstantCode.MAIL_SERVER_CONFIG_PARAM_EMPTY);
+            return new BaseResponse(ConstantCode.MAIL_SERVER_CONFIG_PARAM_EMPTY);
         }
         try{
             mailServerConfigService.updateMailServerConfig(param);

From 7c396d5f241b42f124b0c12cfb39d210548f1518 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 6 May 2020 18:00:24 +0800
Subject: [PATCH 010/131] fix sql syntax

---
 script/webase-ddl.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/webase-ddl.sql b/script/webase-ddl.sql
index 278fb65a1..688a4aa57 100644
--- a/script/webase-ddl.sql
+++ b/script/webase-ddl.sql
@@ -313,9 +313,9 @@ CREATE TABLE IF NOT EXISTS tb_abi (
   contract_abi text NOT NULL COMMENT '合约ABI的内容',
   contract_bin text NOT NULL COMMENT '合约ABI的runtime-bin',
   create_time datetime DEFAULT NULL COMMENT '合约ABI的创建时间',
-  modify_time datetime DEFAULT NULL COMMENT '合约ABI的修改时间'
+  modify_time datetime DEFAULT NULL COMMENT '合约ABI的修改时间',
   PRIMARY KEY (abi_id),
-  UNIQUE KEY unique_address (group_id,contract_address)
+  UNIQUE KEY unique_address (group_id,contract_address),
   UNIQUE KEY unique_name (group_id,contract_name)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='合约ABI表';
 

From 82d8aab5bad224cb2b8edefbac1233c88a63ecc7 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 6 May 2020 19:47:26 +0800
Subject: [PATCH 011/131] fix abi mapper & add abi test

---
 .../webase/node/mgr/abi/AbiController.java    |  29 ++--
 .../webase/node/mgr/abi/entity/AbiInfo.java   |   2 +
 .../webase/node/mgr/abi/entity/ReqDelAbi.java |   4 +-
 src/main/resources/mapper/AbiMapper.xml       |   7 +-
 .../node/mgr/test/abi/AbiControllerTest.java  | 136 ++++++++++++++++++
 .../node/mgr/test/abi/AbiServiceTest.java     |  73 ++++++++++
 6 files changed, 238 insertions(+), 13 deletions(-)
 create mode 100644 src/test/java/node/mgr/test/abi/AbiControllerTest.java
 create mode 100644 src/test/java/node/mgr/test/abi/AbiServiceTest.java

diff --git a/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java b/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
index fcb39e019..7c51d5aab 100644
--- a/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
+++ b/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
@@ -19,6 +19,7 @@
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.abi.entity.AbiInfo;
 import com.webank.webase.node.mgr.abi.entity.ReqAbiListParam;
+import com.webank.webase.node.mgr.abi.entity.ReqDelAbi;
 import com.webank.webase.node.mgr.abi.entity.ReqImportAbi;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
 import com.webank.webase.node.mgr.base.controller.BaseController;
@@ -45,20 +46,23 @@ public class AbiController extends BaseController {
 	@Autowired
 	AbiService abiService;
 
-	@GetMapping("/list/{pageNumber}/{pageSize}")
-	public Object listAbi(@PathVariable("pageNumber") Integer pageNumber,
-						   @PathVariable("pageSize") Integer pageSize) {
+	@GetMapping("/list/{groupId}/{pageNumber}/{pageSize}")
+	public Object listAbi(
+			@PathVariable("groupId") Integer groupId,
+			@PathVariable("pageNumber") Integer pageNumber,
+			@PathVariable("pageSize") Integer pageSize) {
 		Instant startTime = Instant.now();
 		if (pageNumber < 1 || pageSize <= 0) {
 			return new BaseResponse(ConstantCode.PARAM_EXCEPTION);
 		}
-		log.info("start listAbi. startTime:{},pageNumber:{},pageSize:{}",
-				startTime.toEpochMilli(), pageNumber, pageSize);
+		log.info("start listAbi. startTime:{},groupId:{},pageNumber:{},pageSize:{}",
+				startTime.toEpochMilli(), groupId, pageNumber, pageSize);
 
 		Integer start = Optional.ofNullable(pageNumber).map(page -> (page - 1) * pageSize)
 				.orElse(0);
 		ReqAbiListParam param = new ReqAbiListParam(start, pageSize,
 				SqlSortType.DESC.getValue());
+		param.setGroupId(groupId);
 		List<AbiInfo> resList = abiService.getListByGroupId(param);
 		// total count
 		int count = abiService.countOfAbi();
@@ -80,7 +84,7 @@ public Object getAbiById(@PathVariable("abiId") Integer abiId) {
 	}
 
 	@PostMapping("")
-	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+//	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
 	public Object saveAbi(@Valid @RequestBody ReqImportAbi param, BindingResult result) {
 		checkBindResult(result);
 		Instant startTime = Instant.now();
@@ -97,7 +101,7 @@ public Object saveAbi(@Valid @RequestBody ReqImportAbi param, BindingResult resu
 	 * @return
 	 */
 	@PutMapping("")
-	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+//	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
 	public Object updateAbi(@RequestBody ReqImportAbi param, BindingResult result) {
 		checkBindResult(result);
 		Instant startTime = Instant.now();
@@ -113,5 +117,14 @@ public Object updateAbi(@RequestBody ReqImportAbi param, BindingResult result) {
 		return new BaseResponse(ConstantCode.SUCCESS, res);
 	}
 
-
+	@DeleteMapping("")
+	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+	public BaseResponse deleteAbi(@Valid @RequestBody ReqDelAbi param, BindingResult result) {
+		checkBindResult(result);
+		Integer abiId = param.getAbiId();
+		log.debug("start deleteAbi. abiId:{}", abiId);
+		abiService.delete(abiId);
+		log.debug("end deleteAbi");
+		return new BaseResponse(ConstantCode.SUCCESS);
+	}
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/abi/entity/AbiInfo.java b/src/main/java/com/webank/webase/node/mgr/abi/entity/AbiInfo.java
index 16b361e63..4e718b93b 100644
--- a/src/main/java/com/webank/webase/node/mgr/abi/entity/AbiInfo.java
+++ b/src/main/java/com/webank/webase/node/mgr/abi/entity/AbiInfo.java
@@ -17,6 +17,7 @@
 package com.webank.webase.node.mgr.abi.entity;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
 
@@ -24,6 +25,7 @@
  * entity for table tb_abi to store raw contract abi
  */
 @Data
+@NoArgsConstructor
 public class AbiInfo {
 	private Integer abiId;
 	private Integer groupId;
diff --git a/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java b/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java
index c6e25371f..a59dd5252 100644
--- a/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java
+++ b/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java
@@ -1,5 +1,6 @@
 package com.webank.webase.node.mgr.abi.entity;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -11,7 +12,8 @@
  */
 @Data
 @NoArgsConstructor
+@AllArgsConstructor
 public class ReqDelAbi {
 	@NotNull
-	private Long abiId;
+	private Integer abiId;
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/AbiMapper.xml b/src/main/resources/mapper/AbiMapper.xml
index f42f09b15..17386bacb 100644
--- a/src/main/resources/mapper/AbiMapper.xml
+++ b/src/main/resources/mapper/AbiMapper.xml
@@ -23,7 +23,7 @@
     </resultMap>
 
 
-    <insert id="add" parameterType="com.webank.webase.node.mgr.abi.entity.ReqImportAbi">
+    <insert id="add" parameterType="com.webank.webase.node.mgr.abi.entity.AbiInfo">
         REPLACE INTO tb_abi(group_id,contract_name,contract_address,contract_abi,contract_bin,
         create_time,modify_time)
         VALUES (#{groupId},#{contractName},#{contractAddress},#{contractAbi},#{contractBin}, now(), now())
@@ -34,7 +34,7 @@
         where abi_id = #{abiId}
     </delete>
 
-    <update id="update" parameterType="com.webank.webase.node.mgr.abi.entity.ReqImportAbi">
+    <update id="update" parameterType="com.webank.webase.node.mgr.abi.entity.AbiInfo">
         update tb_abi set modify_time = now()
         <if test="contractName != null and contractName != ''">
             ,contract_name = #{contractName}
@@ -54,8 +54,7 @@
     <select id="listOfAbi" parameterType="com.webank.webase.node.mgr.abi.entity.ReqAbiListParam"
             resultMap="abiMap">
         select a.* from tb_abi a
-        where 1=1
-        ,group_id = #{groupId}
+        where 1=1 and group_id = #{param.groupId}
         <if test="param.flagSortedByTime != null and param.flagSortedByTime != ''">
             order by a.create_time ${param.flagSortedByTime}
         </if>
diff --git a/src/test/java/node/mgr/test/abi/AbiControllerTest.java b/src/test/java/node/mgr/test/abi/AbiControllerTest.java
new file mode 100644
index 000000000..e491b55fa
--- /dev/null
+++ b/src/test/java/node/mgr/test/abi/AbiControllerTest.java
@@ -0,0 +1,136 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package node.mgr.test.abi;
+
+
+import com.alibaba.fastjson.JSON;
+import com.webank.webase.node.mgr.Application;
+import com.webank.webase.node.mgr.abi.entity.ReqImportAbi;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+@WebAppConfiguration
+public class AbiControllerTest {
+	private MockMvc mockMvc;
+	private Integer groupId = 1;
+	private Integer pageNumber = 1;
+	private Integer pageSize = 5;
+
+	@Autowired
+	private WebApplicationContext webApplicationContext;
+
+	@Before
+	public void setUp() throws Exception {
+		mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
+	}
+
+	@Test
+	public void testInserAbi() throws Exception {
+		// test insert
+		ReqImportAbi abiInsert = new ReqImportAbi();
+		abiInsert.setGroupId(1);
+		abiInsert.setContractAddress("0xd8e1e0834b38081982f4a080aeae350a6d422915");
+		abiInsert.setContractName("Hello");
+		String abiStr = "[{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_ua\",\"type\":\"uint256[]\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]";
+		abiInsert.setContractAbi(JSON.parseArray(abiStr));
+
+		// post action
+		ResultActions resultActions = mockMvc.perform(
+				MockMvcRequestBuilders.post("/abi")
+						.content(JSON.toJSONString(abiInsert))
+						.contentType(MediaType.APPLICATION_JSON)
+		);
+		resultActions
+				.andExpect(MockMvcResultMatchers.status().isOk())
+				.andDo(MockMvcResultHandlers.print());
+		System.out
+				.println("response:" + resultActions.andReturn().getResponse().getContentAsString());
+
+	}
+
+	@Test
+	public void testGetAbiById() throws Exception {
+		Integer abiId = 1;
+		// post action
+		String url = String.format("/abi/%1s", abiId);
+		ResultActions resultActions = mockMvc.perform(
+				MockMvcRequestBuilders.get(url)
+						.contentType(MediaType.APPLICATION_JSON)
+		);
+		resultActions.
+				andExpect(MockMvcResultMatchers.status().isOk()).
+				andDo(MockMvcResultHandlers.print());
+		System.out
+				.println("response:" + resultActions.andReturn().getResponse().getContentAsString());
+	}
+
+	@Test
+	public void testGetAbi() throws Exception {
+		// post action
+		String url = String.format("/abi/list/%1s/%2s/%3s", groupId, pageNumber, pageSize);
+		ResultActions resultActions = mockMvc.perform(
+				MockMvcRequestBuilders.get(url)
+						.contentType(MediaType.APPLICATION_JSON)
+		);
+		resultActions.
+				andExpect(MockMvcResultMatchers.status().isOk()).
+				andDo(MockMvcResultHandlers.print());
+		System.out
+				.println("response:" + resultActions.andReturn().getResponse().getContentAsString());
+	}
+
+	@Test
+	public void testUpdateAbi() throws Exception {
+		// test insert
+		ReqImportAbi abiUpdate = new ReqImportAbi();
+		// abi id needed in update
+		abiUpdate.setAbiId(1);
+		abiUpdate.setGroupId(groupId);
+		abiUpdate.setContractAddress("0xd8e1e0834b38081982f4a080aeae350a6d422915");
+		abiUpdate.setContractName("Hello_222");
+		String abiStr = "[{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_ua\",\"type\":\"uint256[]\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]";
+		abiUpdate.setContractAbi(JSON.parseArray(abiStr));
+
+		// post action
+		ResultActions resultActions = mockMvc.perform(
+				MockMvcRequestBuilders.put("/abi")
+						.content(JSON.toJSONString(abiUpdate))
+						.contentType(MediaType.APPLICATION_JSON)
+		);
+		resultActions.
+				andExpect(MockMvcResultMatchers.status().isOk()).
+				andDo(MockMvcResultHandlers.print());
+		System.out
+				.println("response:" + resultActions.andReturn().getResponse().getContentAsString());
+	}
+}
+
diff --git a/src/test/java/node/mgr/test/abi/AbiServiceTest.java b/src/test/java/node/mgr/test/abi/AbiServiceTest.java
new file mode 100644
index 000000000..70d3a3ca0
--- /dev/null
+++ b/src/test/java/node/mgr/test/abi/AbiServiceTest.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package node.mgr.test.abi;
+
+import com.alibaba.fastjson.JSON;
+import com.webank.webase.node.mgr.Application;
+import com.webank.webase.node.mgr.abi.AbiService;
+import com.webank.webase.node.mgr.abi.entity.AbiInfo;
+import com.webank.webase.node.mgr.abi.entity.ReqAbiListParam;
+import com.webank.webase.node.mgr.abi.entity.ReqDelAbi;
+import com.webank.webase.node.mgr.abi.entity.ReqImportAbi;
+import com.webank.webase.node.mgr.base.enums.SqlSortType;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.List;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class AbiServiceTest {
+	@Autowired
+	AbiService abiService;
+
+	@Test
+	public void testInsert() {
+		int count = abiService.countOfAbi();
+		ReqImportAbi abiInsert = new ReqImportAbi();
+		abiInsert.setGroupId(1);
+		abiInsert.setContractAddress("0xd8e1e0834b38081982f4a080aeae350a6d422915");
+		abiInsert.setContractName("Hello");
+		String abiStr = "[{\"constant\":true,\"inputs\":[],\"name\":\"get\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256[]\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"_ua\",\"type\":\"uint256[]\"}],\"name\":\"set\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]";
+		abiInsert.setContractAbi(JSON.parseArray(abiStr));
+		abiService.saveAbi(abiInsert);
+		int afterCount = abiService.countOfAbi();
+		Assert.assertTrue("insert failed", afterCount > count);
+	}
+
+	@Test
+	public void testListAbi() {
+		ReqAbiListParam param = new ReqAbiListParam(0, 5,
+				SqlSortType.DESC.getValue());
+		param.setGroupId(1);
+		List<AbiInfo> resList = abiService.getListByGroupId(param);
+		System.out.println(resList);
+		Assert.assertTrue("res is empty", !resList.isEmpty());
+	}
+
+	@Test
+	public void testDeleteAbi() {
+		int count = abiService.countOfAbi();
+		abiService.delete(1);
+		int afterCount = abiService.countOfAbi();
+		Assert.assertTrue("insert failed", afterCount < count);
+	}
+}

From 43d30a0082167b33a6b6ab9e21995f89def5d0ae Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 7 May 2020 09:59:16 +0800
Subject: [PATCH 012/131] add authorize to controller

---
 .../webank/webase/node/mgr/abi/AbiController.java  |  4 ++--
 .../webase/node/mgr/group/GroupController.java     | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java b/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
index 7c51d5aab..f933caf88 100644
--- a/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
+++ b/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
@@ -84,7 +84,7 @@ public Object getAbiById(@PathVariable("abiId") Integer abiId) {
 	}
 
 	@PostMapping("")
-//	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
 	public Object saveAbi(@Valid @RequestBody ReqImportAbi param, BindingResult result) {
 		checkBindResult(result);
 		Instant startTime = Instant.now();
@@ -101,7 +101,7 @@ public Object saveAbi(@Valid @RequestBody ReqImportAbi param, BindingResult resu
 	 * @return
 	 */
 	@PutMapping("")
-//	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
 	public Object updateAbi(@RequestBody ReqImportAbi param, BindingResult result) {
 		checkBindResult(result);
 		Instant startTime = Instant.now();
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 28f51f567..69e736f32 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -20,6 +20,7 @@
 import com.webank.webase.node.mgr.base.entity.BaseResponse;
 import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
+import com.webank.webase.node.mgr.base.properties.ConstantProperties;
 import com.webank.webase.node.mgr.frontinterface.entity.GenerateGroupInfo;
 import com.webank.webase.node.mgr.group.entity.*;
 import com.webank.webase.node.mgr.scheduler.ResetGroupListTask;
@@ -33,6 +34,7 @@
 import javax.validation.Valid;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -138,9 +140,10 @@ public BaseResponse getTransDaily(@PathVariable("groupId") Integer groupId) thro
     }
 
     /**
-     * generate group to single node.
+     * generate group to single node(single front)
      */
     @PostMapping("/generate/{nodeId}")
+    @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
     public BaseResponse generateToSingleNode(@PathVariable("nodeId") String nodeId,
                                              @RequestBody @Valid ReqGenerateGroup req,
                                              BindingResult result) throws NodeMgrException {
@@ -157,9 +160,10 @@ public BaseResponse generateToSingleNode(@PathVariable("nodeId") String nodeId,
     }
 
     /**
-     * generate group.
+     * generate group to all front(all node)
      */
     @PostMapping("/generate")
+    @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
     public BaseResponse generateGroup(@RequestBody @Valid ReqGenerateGroup req,
                                       BindingResult result) throws NodeMgrException {
         checkBindResult(result);
@@ -175,9 +179,11 @@ public BaseResponse generateGroup(@RequestBody @Valid ReqGenerateGroup req,
     }
 
     /**
-     * operate group.
+     * operate group to single front.
+     * (start, stop, remove, recover, getStatus)
      */
     @PostMapping("/operate/{nodeId}")
+    @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
     public Object operateGroup(@PathVariable("nodeId") String nodeId, @RequestBody @Valid ReqOperateGroup req,
                                BindingResult result) throws NodeMgrException {
         checkBindResult(result);
@@ -194,7 +200,7 @@ public Object operateGroup(@PathVariable("nodeId") String nodeId, @RequestBody @
     }
 
     /**
-     * batch start group.
+     * batch start group.(start group to all front
      */
     @PostMapping("/batchStart")
     public BaseResponse batchStartGroup(@RequestBody @Valid ReqBatchStartGroup req, BindingResult result)

From 7e10274de60e2e0721f266e9a3a53b0913cc7213 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 7 May 2020 17:43:08 +0800
Subject: [PATCH 013/131] optimize group api

---
 .../java/com/webank/webase/node/mgr/base/code/ConstantCode.java | 2 +-
 .../java/com/webank/webase/node/mgr/group/GroupController.java  | 1 +
 .../java/com/webank/webase/node/mgr/group/GroupService.java     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index 98b7cd7c4..764718ab3 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -152,7 +152,7 @@ public class ConstantCode {
 
     /* dynamic group manage */
     public static final RetCode GROUP_ID_EXISTS = RetCode.mark(202300, "group id already exists");
-    public static final RetCode NODE_NOT_EXISTS = RetCode.mark(202301, "node front not exists");
+    public static final RetCode NODE_NOT_EXISTS = RetCode.mark(202301, "node's front not exists");
 
     /* auth */
     public static final RetCode USER_NOT_LOGGED_IN = RetCode.mark(302000, "user not logged in");
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 69e736f32..1f7939062 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -203,6 +203,7 @@ public Object operateGroup(@PathVariable("nodeId") String nodeId, @RequestBody @
      * batch start group.(start group to all front
      */
     @PostMapping("/batchStart")
+    @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
     public BaseResponse batchStartGroup(@RequestBody @Valid ReqBatchStartGroup req, BindingResult result)
             throws NodeMgrException {
         checkBindResult(result);
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 7b554b82d..a7aaef44a 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -466,6 +466,7 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
      * @param req
      */
     public void batchStartGroup(ReqBatchStartGroup req) {
+        log.debug("start batchStartGroup:{}", req);
         Integer groupId = req.getGenerateGroupId();
         // check id
         checkGroupIdValid(groupId);
@@ -482,6 +483,7 @@ public void batchStartGroup(ReqBatchStartGroup req) {
         }
         // refresh
         resetGroupList();
+        log.debug("end batchStartGroup.");
     }
 
 

From dec99c4f7062d3ccfb225974d16767d84afd9775 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 7 May 2020 17:43:57 +0800
Subject: [PATCH 014/131] add dynamic group test

---
 .../mgr/test/group/GroupControllerTest.java   | 84 +++++++++++++++++++
 .../mgr/test/user/UserControllerTest.java     |  6 +-
 2 files changed, 87 insertions(+), 3 deletions(-)

diff --git a/src/test/java/node/mgr/test/group/GroupControllerTest.java b/src/test/java/node/mgr/test/group/GroupControllerTest.java
index df6a302c7..49d587f92 100644
--- a/src/test/java/node/mgr/test/group/GroupControllerTest.java
+++ b/src/test/java/node/mgr/test/group/GroupControllerTest.java
@@ -15,12 +15,16 @@
  */
 package node.mgr.test.group;
 
+import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.Application;
+import com.webank.webase.node.mgr.group.entity.ReqGenerateGroup;
+import com.webank.webase.node.mgr.group.entity.ReqOperateGroup;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
@@ -31,11 +35,18 @@
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 @WebAppConfiguration
 public class GroupControllerTest {
     private MockMvc mockMvc;
+    private String targetNodeId = "dd7a2964007d583b719412d86dab9dcf773c61bccab18cb646cd480973de0827cc94fa84f33982285701c8b7a7f465a69e980126a77e8353981049831b550f5c";
+    private Integer newGroupId = 2022;
 
     @Autowired
     private WebApplicationContext webApplicationContext;
@@ -64,4 +75,77 @@ public void testGetAll() throws Exception {
         System.out.println("=================================response:"+resultActions.andReturn().getResponse().getContentAsString());
     }
 
+    /**
+     * dynamic group manage
+     */
+    @Test
+    public void testGenerateSingle() throws Exception {
+        List<String> nodeList = new ArrayList<>();
+        nodeList.add(targetNodeId);
+
+        ReqGenerateGroup param = new ReqGenerateGroup();
+        param.setGenerateGroupId(newGroupId);
+        param.setTimestamp(BigInteger.valueOf(new Date().getTime()));
+        param.setNodeList(nodeList);
+        param.setDescription("test");
+
+        ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.post("/group/generate/" + targetNodeId).
+                content(JSON.toJSONString(param)).
+                contentType(MediaType.APPLICATION_JSON_UTF8)
+        );
+        resultActions.
+                andExpect(MockMvcResultMatchers.status().isOk()).
+                andDo(MockMvcResultHandlers.print());
+        System.out.println("response:"+resultActions.andReturn().getResponse().getContentAsString());
+    }
+
+    @Test
+    public void testGenerate() throws Exception {
+        List<String> nodeList = new ArrayList<>();
+        nodeList.add(targetNodeId);
+
+        ReqGenerateGroup param = new ReqGenerateGroup();
+        param.setGenerateGroupId(newGroupId);
+        param.setTimestamp(BigInteger.valueOf(new Date().getTime()));
+        param.setNodeList(nodeList);
+        param.setDescription("test");
+
+        ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.post( "/group/generate").
+                content(JSON.toJSONString(param)).
+                contentType(MediaType.APPLICATION_JSON_UTF8)
+        );
+        resultActions.
+                andExpect(MockMvcResultMatchers.status().isOk()).
+                andDo(MockMvcResultHandlers.print());
+        System.out.println("response:"+resultActions.andReturn().getResponse().getContentAsString());
+    }
+
+    @Test
+    public void testOperate() throws Exception {
+        ReqOperateGroup param = new ReqOperateGroup();
+        param.setGenerateGroupId(newGroupId);
+        param.setType("start");
+//        param.setType("getStatus");
+//        param.setType("stop");
+//        param.setType("recover");
+        ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders
+                .post("/group/operate/" + targetNodeId).
+                content(JSON.toJSONString(param)).
+                contentType(MediaType.APPLICATION_JSON_UTF8)
+        );
+        resultActions.
+                andExpect(MockMvcResultMatchers.status().isOk()).
+                andDo(MockMvcResultHandlers.print());
+        System.out.println("=================================response:"+resultActions.andReturn().getResponse().getContentAsString());
+    }
+
+    @Test
+    public void testUpdate() throws Exception {
+        ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.get("/group/update"));
+        resultActions.
+                andExpect(MockMvcResultMatchers.status().isOk()).
+                andDo(MockMvcResultHandlers.print());
+        System.out.println("=================================response:"+resultActions.andReturn().getResponse().getContentAsString());
+    }
+
 }
diff --git a/src/test/java/node/mgr/test/user/UserControllerTest.java b/src/test/java/node/mgr/test/user/UserControllerTest.java
index e845df1cb..acde55cc5 100644
--- a/src/test/java/node/mgr/test/user/UserControllerTest.java
+++ b/src/test/java/node/mgr/test/user/UserControllerTest.java
@@ -63,7 +63,7 @@ public void testNewUser() throws Exception {
 
         ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.post("/user/userInfo").
             content(JSON.toJSONString(newUser)).
-            contentType(MediaType.APPLICATION_JSON)
+            contentType(MediaType.APPLICATION_JSON_UTF8)
         );
         resultActions.
             andExpect(MockMvcResultMatchers.status().isOk()).
@@ -80,7 +80,7 @@ public void testUpdateUser() throws Exception {
 
         ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.put("/user/userInfo").
             content(JSON.toJSONString(updateUser)).
-            contentType(MediaType.APPLICATION_JSON)
+            contentType(MediaType.APPLICATION_JSON_UTF8)
         );
         resultActions.
             andExpect(MockMvcResultMatchers.status().isOk()).
@@ -100,7 +100,7 @@ public void testBindUser() throws Exception {
 
         ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.post("/user/bind").
             content(JSON.toJSONString(newUser)).
-            contentType(MediaType.APPLICATION_JSON)
+            contentType(MediaType.APPLICATION_JSON_UTF8)
         );
         resultActions.
             andExpect(MockMvcResultMatchers.status().isOk()).

From 5313ce7be84a1ff1c3480c752b8abbd092f9bee4 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 7 May 2020 17:44:16 +0800
Subject: [PATCH 015/131] update contentType to json-utf8

---
 src/test/java/node/mgr/test/abi/AbiControllerTest.java |  8 ++++----
 .../node/mgr/test/contract/ContractControllerTest.java | 10 +++++-----
 .../java/node/mgr/test/front/FrontControllerTest.java  |  2 +-
 .../node/mgr/test/method/MethodControllerTest.java     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/test/java/node/mgr/test/abi/AbiControllerTest.java b/src/test/java/node/mgr/test/abi/AbiControllerTest.java
index e491b55fa..d84f8a782 100644
--- a/src/test/java/node/mgr/test/abi/AbiControllerTest.java
+++ b/src/test/java/node/mgr/test/abi/AbiControllerTest.java
@@ -67,7 +67,7 @@ public void testInserAbi() throws Exception {
 		ResultActions resultActions = mockMvc.perform(
 				MockMvcRequestBuilders.post("/abi")
 						.content(JSON.toJSONString(abiInsert))
-						.contentType(MediaType.APPLICATION_JSON)
+						.contentType(MediaType.APPLICATION_JSON_UTF8)
 		);
 		resultActions
 				.andExpect(MockMvcResultMatchers.status().isOk())
@@ -84,7 +84,7 @@ public void testGetAbiById() throws Exception {
 		String url = String.format("/abi/%1s", abiId);
 		ResultActions resultActions = mockMvc.perform(
 				MockMvcRequestBuilders.get(url)
-						.contentType(MediaType.APPLICATION_JSON)
+						.contentType(MediaType.APPLICATION_JSON_UTF8)
 		);
 		resultActions.
 				andExpect(MockMvcResultMatchers.status().isOk()).
@@ -99,7 +99,7 @@ public void testGetAbi() throws Exception {
 		String url = String.format("/abi/list/%1s/%2s/%3s", groupId, pageNumber, pageSize);
 		ResultActions resultActions = mockMvc.perform(
 				MockMvcRequestBuilders.get(url)
-						.contentType(MediaType.APPLICATION_JSON)
+						.contentType(MediaType.APPLICATION_JSON_UTF8)
 		);
 		resultActions.
 				andExpect(MockMvcResultMatchers.status().isOk()).
@@ -124,7 +124,7 @@ public void testUpdateAbi() throws Exception {
 		ResultActions resultActions = mockMvc.perform(
 				MockMvcRequestBuilders.put("/abi")
 						.content(JSON.toJSONString(abiUpdate))
-						.contentType(MediaType.APPLICATION_JSON)
+						.contentType(MediaType.APPLICATION_JSON_UTF8)
 		);
 		resultActions.
 				andExpect(MockMvcResultMatchers.status().isOk()).
diff --git a/src/test/java/node/mgr/test/contract/ContractControllerTest.java b/src/test/java/node/mgr/test/contract/ContractControllerTest.java
index dee58882f..dc92a5985 100644
--- a/src/test/java/node/mgr/test/contract/ContractControllerTest.java
+++ b/src/test/java/node/mgr/test/contract/ContractControllerTest.java
@@ -92,7 +92,7 @@ public void testSaveContract() throws Exception {
 
         ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.post("/contract/save").
             content(JSON.toJSONString(testUpdate)).
-            contentType(MediaType.APPLICATION_JSON)
+            contentType(MediaType.APPLICATION_JSON_UTF8)
         );
         resultActions.
             andExpect(MockMvcResultMatchers.status().isOk()).
@@ -123,7 +123,7 @@ public void testDeploy() throws Exception {
         ResultActions resultActions = mockMvc
             .perform(MockMvcRequestBuilders.post("/contract/deploy").
                 content(JSON.toJSONString(deployInputParam)).
-                contentType(MediaType.APPLICATION_JSON)
+                contentType(MediaType.APPLICATION_JSON_UTF8)
             );
         resultActions.
             andExpect(MockMvcResultMatchers.status().isOk()).
@@ -147,7 +147,7 @@ public void testQueryContractList() throws Exception {
         ResultActions resultActions = mockMvc
             .perform(MockMvcRequestBuilders.post("/contract/contractList").
                 content(JSON.toJSONString(param)).
-                contentType(MediaType.APPLICATION_JSON)
+                contentType(MediaType.APPLICATION_JSON_UTF8)
             );
         resultActions.
             andExpect(MockMvcResultMatchers.status().isOk()).
@@ -167,7 +167,7 @@ public void testFindByPartOfBytecodeBin() throws Exception {
         ResultActions resultActions = mockMvc
             .perform(MockMvcRequestBuilders.post("/contract/findByPartOfBytecodeBin").
                 content(JSON.toJSONString(param)).
-                contentType(MediaType.APPLICATION_JSON)
+                contentType(MediaType.APPLICATION_JSON_UTF8)
             );
         resultActions.
             andExpect(MockMvcResultMatchers.status().isOk()).
@@ -199,7 +199,7 @@ public void tesSendTransaction() throws Exception {
         ResultActions resultActions = mockMvc
             .perform(MockMvcRequestBuilders.post("/contract/transaction").
                 content(JSON.toJSONString(param)).
-                contentType(MediaType.APPLICATION_JSON)
+                contentType(MediaType.APPLICATION_JSON_UTF8)
             );
         resultActions.
             andExpect(MockMvcResultMatchers.status().isOk()).
diff --git a/src/test/java/node/mgr/test/front/FrontControllerTest.java b/src/test/java/node/mgr/test/front/FrontControllerTest.java
index dd164bc30..f24803abb 100644
--- a/src/test/java/node/mgr/test/front/FrontControllerTest.java
+++ b/src/test/java/node/mgr/test/front/FrontControllerTest.java
@@ -58,7 +58,7 @@ public void testNewFront() throws Exception {
 
         ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.post( "/front/new").
             content(JSON.toJSONString(param)).
-            contentType(MediaType.APPLICATION_JSON)
+            contentType(MediaType.APPLICATION_JSON_UTF8)
         );
         resultActions.
             andExpect(MockMvcResultMatchers.status().isOk()).
diff --git a/src/test/java/node/mgr/test/method/MethodControllerTest.java b/src/test/java/node/mgr/test/method/MethodControllerTest.java
index 5025daf98..f78de4107 100644
--- a/src/test/java/node/mgr/test/method/MethodControllerTest.java
+++ b/src/test/java/node/mgr/test/method/MethodControllerTest.java
@@ -64,7 +64,7 @@ public void testAddMethod() throws Exception {
 
         ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.post( "/method/add").
             content(JSON.toJSONString(param)).
-            contentType(MediaType.APPLICATION_JSON)
+            contentType(MediaType.APPLICATION_JSON_UTF8)
         );
         resultActions.
             andExpect(MockMvcResultMatchers.status().isOk()).

From c8a964e50d42d2fa54fa512ffbfeded5fbfa9051 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 7 May 2020 18:03:52 +0800
Subject: [PATCH 016/131] fix generate bug

---
 .../webase/node/mgr/group/GroupService.java   | 19 ++++++++++---------
 .../webase/node/mgr/group/entity/TbGroup.java | 13 ++++++++++++-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index a7aaef44a..b1923eec9 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -215,7 +215,7 @@ public void resetGroupList() {
                 List<String> groupPeerList = frontInterface.getNodeIDListFromSpecificFront(frontIp, frontPort, gId);
                 // save group
                 saveGroup(gId, groupPeerList.size(), "synchronous",
-                        GroupType.SYNC.getValue());
+                        GroupType.SYNC.getValue(), DataStatus.NORMAL.getValue());
                 frontGroupMapService.newFrontGroup(front.getFrontId(), gId);
                 //save new peers
                 savePeerList(frontIp, frontPort, gId, groupPeerList);
@@ -399,9 +399,9 @@ public TbGroup generateToSingleNode(String nodeId, ReqGenerateGroup req) {
         BeanUtils.copyProperties(req, generateGroupInfo);
         frontInterface.generateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(),
                 generateGroupInfo);
-        // save group
+        // save group, saved as invalid status until start
         TbGroup tbGroup = saveGroup(generateGroupId, req.getNodeList().size(),
-                req.getDescription(), GroupType.MANUAL.getValue());
+                req.getDescription(), GroupType.MANUAL.getValue(), DataStatus.INVALID.getValue());
         return tbGroup;
     }
 
@@ -428,9 +428,9 @@ public TbGroup generateGroup(ReqGenerateGroup req) {
             frontInterface.generateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(),
                     generateGroupInfo);
         }
-        // save group
+        // save group, saved as invalid status until start
         TbGroup tbGroup = saveGroup(generateGroupId, req.getNodeList().size(),
-                req.getDescription(), GroupType.MANUAL.getValue());
+                req.getDescription(), GroupType.MANUAL.getValue(), DataStatus.INVALID.getValue());
         return tbGroup;
     }
 
@@ -453,7 +453,7 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
         Object groupHandleResult = frontInterface.operateGroup(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), groupId, type);
 
-        // refresh
+        // refresh group status
         resetGroupList();
 
         // return
@@ -481,7 +481,7 @@ public void batchStartGroup(ReqBatchStartGroup req) {
             frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
                     "start");
         }
-        // refresh
+        // refresh group status
         resetGroupList();
         log.debug("end batchStartGroup.");
     }
@@ -492,14 +492,15 @@ public void batchStartGroup(ReqBatchStartGroup req) {
      */
     @Transactional
     public TbGroup saveGroup(int groupId, int nodeCount, String description,
-                             int groupType) {
+                             int groupType, int groupStatus) {
         if (groupId == 0) {
             return null;
         }
         // save group id
         String groupName = "group" + groupId;
         TbGroup tbGroup =
-                new TbGroup(groupId, groupName, nodeCount, description, groupType);
+                new TbGroup(groupId, groupName, nodeCount, description,
+                        groupType, groupStatus);
         groupMapper.save(tbGroup);
         // create table by group id
         tableService.newTableByGroupId(groupId);
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java b/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
index 2b77fb9af..038c75125 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
@@ -29,6 +29,9 @@ public class TbGroup {
 
     private Integer groupId;
     private String groupName;
+    /**
+     * 1-normal, 2-invalid
+     */
     private Integer groupStatus;
     private Integer nodeCount;
     private BigInteger latestBlock = BigInteger.ZERO;
@@ -47,5 +50,13 @@ public TbGroup(Integer groupId, String groupName, Integer nodeCount,
         this.groupType = groupType;
     }
 
-
+    public TbGroup(Integer groupId, String groupName, Integer nodeCount,
+                   String description, Integer groupType, Integer groupStatus) {
+        this.groupId = groupId;
+        this.groupName = groupName;
+        this.nodeCount = nodeCount;
+        this.description = description;
+        this.groupType = groupType;
+        this.groupStatus = groupStatus;
+    }
 }
\ No newline at end of file

From 883c01b171772c2569001f0e673ca0e0e37abc54 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 7 May 2020 18:10:05 +0800
Subject: [PATCH 017/131] fix generate bug

---
 .../java/com/webank/webase/node/mgr/front/FrontService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index ed857cf31..2bf457c0d 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -15,6 +15,7 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
@@ -131,7 +132,7 @@ public TbFront newFront(FrontInfo frontInfo) {
             List<PeerInfo> peerList = Arrays.asList(peerArr);
             //add group
             groupService.saveGroup(group, groupPeerList.size(), "synchronous",
-                    GroupType.SYNC.getValue());
+                    GroupType.SYNC.getValue(), DataStatus.NORMAL.getValue());
             //save front group map
             frontGroupMapService.newFrontGroup(tbFront.getFrontId(), group);
             //save nodes

From 445a60c3f3a716a827efe7986db275b6107a2828 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 8 May 2020 11:12:42 +0800
Subject: [PATCH 018/131] add task thread pool

---
 .../node/mgr/base/config/BeanConfig.java      | 19 ------
 .../mgr/base/config/ThreadPoolConfig.java     | 66 +++++++++++++++++++
 .../base/properties/SchedulerProperties.java  | 34 ++++++++++
 .../node/mgr/scheduler/DeleteInfoTask.java    |  1 +
 .../mgr/scheduler/ResetGroupListTask.java     |  1 +
 5 files changed, 102 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/com/webank/webase/node/mgr/base/config/ThreadPoolConfig.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/base/properties/SchedulerProperties.java

diff --git a/src/main/java/com/webank/webase/node/mgr/base/config/BeanConfig.java b/src/main/java/com/webank/webase/node/mgr/base/config/BeanConfig.java
index e904c1a3a..c298e899b 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/config/BeanConfig.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/config/BeanConfig.java
@@ -38,8 +38,6 @@ public class BeanConfig {
 
     @Autowired
     private ConstantProperties constantProperties;
-    @Autowired
-    private ExecutorProperties executorProperties;
 
     @Bean
     public RestTemplate restTemplate(ClientHttpRequestFactory factory) {
@@ -78,23 +76,6 @@ public SimpleClientHttpRequestFactory getHttpFactoryForDeploy() {
         return factory;
     }
 
-    /**
-     * pull block and trans from chain
-     * @return
-     */
-    @Bean
-    public ThreadPoolTaskExecutor mgrAsyncExecutor() {
-        log.info("start mgrAsyncExecutor init..");
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(executorProperties.getCorePoolSize());
-        executor.setMaxPoolSize(executorProperties.getMaxPoolSize());
-        executor.setQueueCapacity(executorProperties.getQueueSize());
-        executor.setThreadNamePrefix(executorProperties.getThreadNamePrefix());
-        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-        // init executor
-        executor.initialize();
-        return executor;
-    }
 
     /**
      * mail sender for alert mail in node\mgr\alert\mail\MailService.java
diff --git a/src/main/java/com/webank/webase/node/mgr/base/config/ThreadPoolConfig.java b/src/main/java/com/webank/webase/node/mgr/base/config/ThreadPoolConfig.java
new file mode 100644
index 000000000..7048cd595
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/base/config/ThreadPoolConfig.java
@@ -0,0 +1,66 @@
+package com.webank.webase.node.mgr.base.config;
+
+import com.webank.webase.node.mgr.base.properties.ExecutorProperties;
+import com.webank.webase.node.mgr.base.properties.SchedulerProperties;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * 定时任务并行执行
+ **/
+@Configuration
+@EnableScheduling
+@Log4j2
+public class ThreadPoolConfig {
+
+    @Autowired
+    private ExecutorProperties executorProperties;
+    @Autowired
+    private SchedulerProperties schedulerProperties;
+
+    /**
+     * pull block and trans from chain async
+     * @return ThreadPoolTaskExecutor
+     */
+    @Bean
+    public ThreadPoolTaskExecutor mgrAsyncExecutor() {
+        log.info("start mgrAsyncExecutor init..");
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(executorProperties.getCorePoolSize());
+        executor.setMaxPoolSize(executorProperties.getMaxPoolSize());
+        executor.setQueueCapacity(executorProperties.getQueueSize());
+        executor.setThreadNamePrefix(executorProperties.getThreadNamePrefix());
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        // init executor
+        executor.initialize();
+        return executor;
+    }
+
+
+    /**
+     * thread pool for scheduler parallel task (not async):
+     * pull block, trans monitor, statistic trans, delete info, reset groupList
+     * @return ThreadPoolTaskScheduler
+     */
+    @Bean(destroyMethod = "shutdown")
+    public ThreadPoolTaskScheduler mgrTaskScheduler() {
+        log.info("start mgrTaskScheduler init..");
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(schedulerProperties.getPoolSize());
+        scheduler.setThreadNamePrefix(schedulerProperties.getThreadNamePrefix());
+        scheduler.setAwaitTerminationSeconds(schedulerProperties.getAwaitTerminationSeconds());
+        scheduler.setWaitForTasksToCompleteOnShutdown(
+                schedulerProperties.getWaitForTasksToCompleteOnShutdown());
+        return scheduler;
+    }
+}
diff --git a/src/main/java/com/webank/webase/node/mgr/base/properties/SchedulerProperties.java b/src/main/java/com/webank/webase/node/mgr/base/properties/SchedulerProperties.java
new file mode 100644
index 000000000..f5199a1d6
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/base/properties/SchedulerProperties.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.base.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = SchedulerProperties.SCHEDULER_PREFIX)
+public class SchedulerProperties {
+	public static final String SCHEDULER_PREFIX = "scheduler";
+
+	private Integer poolSize = 5;
+	private String threadNamePrefix = "node-mgr-task-";
+	private Integer awaitTerminationSeconds = 60;
+	private Boolean waitForTasksToCompleteOnShutdown = true;
+
+}
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java
index ffe582ec4..f513f8fd3 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java
@@ -34,6 +34,7 @@
 
 /**
  * delete block/trans/monitorTrans data task
+ * not synchronized cause deleting is rapid and cycle is long
  */
 @Log4j2
 @Component
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
index 4b38fa50a..66d98a9df 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
@@ -23,6 +23,7 @@
 
 /**
  * refresh group list
+ * not synchronized cause resetting is rapid and cycle is long
  */
 @Log4j2
 @Component

From e94b00387aa5ccd905127dc9e5309affa72dacc2 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 8 May 2020 11:12:59 +0800
Subject: [PATCH 019/131] update comment

---
 .../java/com/webank/webase/node/mgr/group/GroupController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 1f7939062..52ee76aee 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -95,7 +95,7 @@ public BaseResponse getGroupGeneral(@PathVariable("groupId") Integer groupId)
     }
 
     /**
-     * query all group.
+     * query all normal group.
      */
     @GetMapping("/all")
     public BasePageResponse getAllGroup() throws NodeMgrException {

From ffacc1d1ee6d8311ef0ec26b9d171803ff1d018c Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 8 May 2020 11:14:21 +0800
Subject: [PATCH 020/131] add scheduler config

---
 src/main/resources/application.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b022fccf9..81f9a5216 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -67,13 +67,20 @@ constant:
   nodeStatusMonitorTaskFixedDelay: 60000  #must larger than @pullBlockTaskFixedDelay
   certMonitorTaskFixedDelay: 300000
 
-# executor config for pulling data from chain
+# executor config for async pulling data from chain
 executor:
   corePoolSize: 3
   maxPoolSize: 10
   queueSize: 50
   threadNamePrefix: "node-mgr-async-"
 
+# scheduler config for sync scheduled task
+scheduler:
+  poolSize: 5
+  threadNamePrefix: "node-mgr-task-"
+  awaitTerminationSeconds: 60
+  waitForTasksToCompleteOnShutdown: true
+
 sdk:
   encryptType: 0 # 1:guomi, 0:standard
 

From 137dd3ba0ef1addd37e3532bd7f8840f4bc1285d Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Sat, 9 May 2020 10:21:42 +0800
Subject: [PATCH 021/131] add exception msg in response

---
 .../webase/node/mgr/base/exception/ExceptionsHandler.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/exception/ExceptionsHandler.java b/src/main/java/com/webank/webase/node/mgr/base/exception/ExceptionsHandler.java
index b9cdeb864..25dfb34a5 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/exception/ExceptionsHandler.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/exception/ExceptionsHandler.java
@@ -106,7 +106,8 @@ public BaseResponse exceptionHandler(RuntimeException exc) {
         log.warn("catch RuntimeException", exc);
         // 默认系统异常
         RetCode retCode = ConstantCode.SYSTEM_EXCEPTION;
-
+        // v1.3.1 增加异常细节
+        retCode.setMessage(exc.getMessage());
         BaseResponse bre = new BaseResponse(retCode);
         log.warn("system RuntimeException return:{}", JSON.toJSONString(bre));
         return bre;

From 69b266283035de428e682a5dbfcb652451c33fa3 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Sat, 9 May 2020 15:56:33 +0800
Subject: [PATCH 022/131] add comments of task

---
 .../com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java  | 2 +-
 .../webank/webase/node/mgr/scheduler/PullBlockTransTask.java  | 4 ++--
 .../webank/webase/node/mgr/scheduler/ResetGroupListTask.java  | 1 -
 .../webank/webase/node/mgr/scheduler/TransMonitorTask.java    | 3 ++-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java
index f513f8fd3..6b667a038 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java
@@ -34,7 +34,7 @@
 
 /**
  * delete block/trans/monitorTrans data task
- * not synchronized cause deleting is rapid and cycle is long
+ * related: yml-constant-transRetainMax
  */
 @Log4j2
 @Component
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java
index 4ea4de5e1..521b224dd 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java
@@ -27,7 +27,7 @@
 import java.util.concurrent.CountDownLatch;
 
 /**
- * get block info from chain.
+ * get block info and trans info from chain.
  * including tb_block and tb_trans (block contains trans)
  */
 @Log4j2
@@ -55,7 +55,7 @@ public synchronized void pullBlockStart() {
             log.warn("pullBlock jump over: not found any group");
             return;
         }
-
+        // count down group, make sure all group's pullBlock finished
         CountDownLatch latch = new CountDownLatch(groupList.size());
         groupList.stream()
                 .forEach(group -> blockService.pullBlockByGroupId(latch, group.getGroupId()));
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
index 66d98a9df..4b38fa50a 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
@@ -23,7 +23,6 @@
 
 /**
  * refresh group list
- * not synchronized cause resetting is rapid and cycle is long
  */
 @Log4j2
 @Component
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/TransMonitorTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/TransMonitorTask.java
index 2fc1174b1..73d1be3d7 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/TransMonitorTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/TransMonitorTask.java
@@ -28,6 +28,7 @@
 
 /**
  * using in async monitor
+ * 交易审计
  */
 @Log4j2
 @Component
@@ -56,7 +57,7 @@ public synchronized void monitorStart() {
             log.info("monitor jump over .not found any group");
             return;
         }
-
+        // count down group, make sure all group's transMonitor finished
         CountDownLatch latch = new CountDownLatch(groupList.size());
         groupList.stream()
             .forEach(group -> monitorService.transMonitorByGroupId(latch, group.getGroupId()));

From 944eeed84e434c02ef067375ff6c782303b09477 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Sat, 9 May 2020 18:24:22 +0800
Subject: [PATCH 023/131] fix remove invalid group

---
 .../node/mgr/base/tools/NodeMgrTools.java     | 35 +++++-----
 .../webase/node/mgr/block/BlockService.java   |  1 +
 .../frontgroupmap/FrontGroupMapService.java   |  2 +-
 .../frontinterface/FrontInterfaceService.java | 16 +++--
 .../node/mgr/group/GroupController.java       | 26 ++++++-
 .../webase/node/mgr/group/GroupService.java   | 67 +++++++++++++------
 .../node/mgr/monitor/MonitorService.java      |  3 +-
 7 files changed, 103 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
index 51ba993ec..d3d6d9190 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
@@ -357,42 +357,45 @@ public static void responseRetCodeException(HttpServletResponse response, RetCod
 
 
     /**
-     * check target time is valid.
+     * check target time if within time period
      *
-     * @param dateTime target time.
+     * @param lastTime target time.
      * @param validLength y:year, M:month, d:day of month, h:hour, m:minute, n:forever valid;
-     * example1:1d;example2:n
+     * example1: 1d; example2:n
      */
-    public static boolean isDateTimeInValid(LocalDateTime dateTime, String validLength) {
-        log.debug("start isDateTimeInValid. dateTime:{} validLength:{}", dateTime, validLength);
+    public static boolean isWithinPeriod(LocalDateTime lastTime, String validLength) {
+        log.debug("start isWithinTime. dateTime:{} validLength:{}", lastTime, validLength);
         if ("n".equals(validLength)) {
             return true;
         }
-        if (Objects.isNull(dateTime) || StringUtils.isBlank(validLength)
+        if (Objects.isNull(lastTime) || StringUtils.isBlank(validLength)
             || validLength.length() < 2) {
             return false;
         }
-
+        // example: 2d (2 day)
+        // 2
         String lifeStr = validLength.substring(0, validLength.length() - 1);
         if (!StringUtils.isNumeric(lifeStr)) {
-            log.warn("fail isDateTimeInValid");
-            throw new RuntimeException("fail isDateTimeInValid. validLength is error");
+            log.warn("fail isWithinTime");
+            throw new RuntimeException("fail isWithinTime. validLength is error");
         }
-        int lifeValue = Integer.valueOf(lifeStr);
+        int lifeValue = Integer.parseInt(lifeStr);
+        // d
         String lifeUnit = validLength.substring(validLength.length() - 1);
-
+        // now is day 2, last time is day 1, 2 - 1 = 1 < 2 true
+        // now is day 3, last time is day 1, 3 - 1 = 2 < 2 false, not within
         LocalDateTime now = LocalDateTime.now();
         switch (lifeUnit) {
             case "y":
-                return dateTime.getYear() - now.getYear() < lifeValue;
+                return now.getYear() - lastTime.getYear() < lifeValue;
             case "M":
-                return dateTime.getMonthValue() - now.getMonthValue() < lifeValue;
+                return now.getMonthValue() - lastTime.getMonthValue() < lifeValue;
             case "d":
-                return dateTime.getDayOfMonth() - now.getDayOfMonth() < lifeValue;
+                return  now.getDayOfMonth() - lastTime.getDayOfMonth() < lifeValue;
             case "m":
-                return dateTime.getMinute() - now.getMinute() < lifeValue;
+                return now.getMinute() - lastTime.getMinute() < lifeValue;
             default:
-                log.warn("fail isDateTimeInValid lifeUnit:{}", lifeUnit);
+                log.warn("fail isWithinTime lifeUnit:{}", lifeUnit);
                 return false;
         }
     }
diff --git a/src/main/java/com/webank/webase/node/mgr/block/BlockService.java b/src/main/java/com/webank/webase/node/mgr/block/BlockService.java
index 8194b42be..17885225a 100644
--- a/src/main/java/com/webank/webase/node/mgr/block/BlockService.java
+++ b/src/main/java/com/webank/webase/node/mgr/block/BlockService.java
@@ -87,6 +87,7 @@ public void pullBlockByGroupId(CountDownLatch latch, int groupId) {
         } catch (Exception ex) {
             log.error("fail pullBlockByGroupId. groupId:{} ", groupId, ex);
         }finally {
+            // finish one group, count down
             latch.countDown();
         }
         log.debug("end pullBlockByGroupId groupId:{}", groupId);
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index abd454931..d9b8779cd 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -95,7 +95,7 @@ public List<FrontGroup> getList(MapListParam mapListParam) {
     }
 
     /**
-     * remove invalid map info.
+     * remove group that not in tb_front or tb_group
      */
     public void removeInvalidFrontGroupMap() {
         frontGroupMapMapper.removeInvalidMap();
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
index a79abf555..6818a934f 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
@@ -18,6 +18,7 @@
 
 import com.webank.webase.node.mgr.base.code.ConstantCode;
 import com.webank.webase.node.mgr.base.entity.BasePageResponse;
+import com.webank.webase.node.mgr.base.entity.BaseResponse;
 import com.webank.webase.node.mgr.event.entity.ContractEventInfo;
 import com.webank.webase.node.mgr.event.entity.NewBlockEventInfo;
 import com.webank.webase.node.mgr.user.entity.KeyPair;
@@ -446,15 +447,20 @@ public GroupHandleResult generateGroup(String frontIp, Integer frontPort,
     /**
      * start group.
      */
-    public Object operateGroup(String frontIp, Integer frontPort, Integer groupId, String type) {
+    public BaseResponse operateGroup(String frontIp, Integer frontPort, Integer groupId, String type) {
         log.debug("start operateGroup frontIp:{} frontPort:{} groupId:{}", frontIp, frontPort,
                 groupId);
         String uri = String.format(FrontRestTools.URI_OPERATE_GROUP, type);
-        Object groupHandleResult =
-                getFromSpecificFront(groupId, frontIp, frontPort, uri, Object.class);
-
+        BaseResponse response =
+                getFromSpecificFront(groupId, frontIp, frontPort, uri, BaseResponse.class);
+//        GroupOperateStatus result = new GroupOperateStatus();
+//        if (Objects.nonNull(response.getData())) {
+//            result.setCode(String.valueOf(0));
+//            result.setMessage(response.getMessage());
+//            result.setStatus(response.getData().toString());
+//        }
         log.debug("end operateGroup");
-        return groupHandleResult;
+        return response;
     }
     
     /**
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 52ee76aee..6878b7951 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -21,7 +21,6 @@
 import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
-import com.webank.webase.node.mgr.frontinterface.entity.GenerateGroupInfo;
 import com.webank.webase.node.mgr.group.entity.*;
 import com.webank.webase.node.mgr.scheduler.ResetGroupListTask;
 import com.webank.webase.node.mgr.scheduler.StatisticsTransdailyTask;
@@ -95,7 +94,7 @@ public BaseResponse getGroupGeneral(@PathVariable("groupId") Integer groupId)
     }
 
     /**
-     * query all normal group.
+     * query all normal group without invalid group(suspend, removed)
      */
     @GetMapping("/all")
     public BasePageResponse getAllGroup() throws NodeMgrException {
@@ -120,6 +119,29 @@ public BasePageResponse getAllGroup() throws NodeMgrException {
         return pagesponse;
     }
 
+    @GetMapping("/all/invalid")
+    public BasePageResponse getAllGroupIncludeInvalidGroup() throws NodeMgrException {
+        BasePageResponse pagesponse = new BasePageResponse(ConstantCode.SUCCESS);
+        Instant startTime = Instant.now();
+        log.info("start getAllGroupIncludeInvalidGroup startTime:{}", startTime.toEpochMilli());
+
+        // get group list include invalid status
+        int count = groupService.countOfGroup(null, null);
+        if (count > 0) {
+            List<TbGroup> groupList = groupService.getGroupList(null);
+            pagesponse.setTotalCount(count);
+            pagesponse.setData(groupList);
+        }
+
+        // reset group
+        resetGroupListTask.asyncResetGroupList();
+
+        log.info("end getAllGroupIncludeInvalidGroup useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(),
+                JSON.toJSONString(pagesponse));
+        return pagesponse;
+    }
+
     /**
      * get trans daily.
      */
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index b1923eec9..c8111743d 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -15,6 +15,7 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.entity.BaseResponse;
 import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
@@ -47,10 +48,7 @@
 
 import java.time.Duration;
 import java.time.Instant;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * services for group data.
@@ -211,7 +209,7 @@ public void resetGroupList() {
             for (String groupId : groupIdList) {
                 Integer gId = Integer.valueOf(groupId);
                 allGroupSet.add(gId);
-                //peer in group
+                // peer in group
                 List<String> groupPeerList = frontInterface.getNodeIDListFromSpecificFront(frontIp, frontPort, gId);
                 // save group
                 saveGroup(gId, groupPeerList.size(), "synchronous",
@@ -228,9 +226,10 @@ public void resetGroupList() {
             }
         }
 
-        //check group status
+        // check group status
+        // if beyond gray period, remove invalid group, else, not remove
         checkGroupStatusAndRemoveInvalidGroup(allGroupSet);
-        //remove invalid group
+        // remove front_group_map that not in tb_front or tb_group
         frontGroupMapService.removeInvalidFrontGroupMap();
         //clear cache
         frontGroupMapCache.clearMapList();
@@ -272,7 +271,7 @@ private void removeAllGroup() {
         }
 
         //remove each group
-        allGroup.stream().forEach(group -> removeByGroupId(group.getGroupId()));
+        allGroup.stream().forEach(group -> removeAllDataByGroupId(group.getGroupId()));
     }
 
     /**
@@ -323,24 +322,25 @@ private void checkGroupStatusAndRemoveInvalidGroup(Set<Integer> allGroupOnChain)
             int localGroupId = localGroup.getGroupId();
             long count = allGroupOnChain.stream().filter(id -> id == localGroupId).count();
             try {
+                // found groupId in groupOnChain
                 if (count > 0) {
-                    log.warn("group is valid, localGroupId:{}", localGroupId);
+                    log.warn("group is normal, localGroupId:{}", localGroupId);
                     //update NORMAL
                     updateGroupStatus(localGroupId, DataStatus.NORMAL.getValue());
                     continue;
                 }
-
-                if (!NodeMgrTools.isDateTimeInValid(localGroup.getModifyTime(),
+                // check from last modifyTime if within gray period
+                if (!NodeMgrTools.isWithinPeriod(localGroup.getModifyTime(),
                         constants.getGroupInvalidGrayscaleValue())) {
                     log.warn("remove group, localGroup:{}", JSON.toJSONString(localGroup));
                     //remove group
-                    removeByGroupId(localGroupId);
+                    removeAllDataByGroupId(localGroupId);
                     continue;
                 }
-
+                // if not found in groupOnChain
                 log.warn("group is invalid, localGroupId:{}", localGroupId);
                 if (DataStatus.NORMAL.getValue() == localGroup.getGroupStatus()) {
-                    //update invalid
+                    // update invalid
                     updateGroupStatus(localGroupId, DataStatus.INVALID.getValue());
                     continue;
                 }
@@ -357,7 +357,7 @@ private void checkGroupStatusAndRemoveInvalidGroup(Set<Integer> allGroupOnChain)
     /**
      * remove by groupId.
      */
-    private void removeByGroupId(int groupId) {
+    private void removeAllDataByGroupId(int groupId) {
         if (groupId == 0) {
             return;
         }
@@ -365,9 +365,6 @@ private void removeByGroupId(int groupId) {
         groupMapper.remove(groupId);
         //remove mapping.
         frontGroupMapService.removeByGroupId(groupId);
-        // @Deprecated: not save privateKey anymore
-        // remove user and key
-        // userService.deleteByGroupId(groupId);
         //remove contract
         contractService.deleteByGroupId(groupId);
         //remove method
@@ -450,14 +447,13 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
             throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
         }
         // request front to operate
-        Object groupHandleResult = frontInterface.operateGroup(tbFront.getFrontIp(),
+        Object groupOperateStatus = frontInterface.operateGroup(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), groupId, type);
-
-        // refresh group status
+        // refresh group status, not remove tb_group if within gray period (yaml-groupInvalidGrayscaleValue)
         resetGroupList();
 
         // return
-        return groupHandleResult;
+        return groupOperateStatus;
     }
 
     /**
@@ -486,6 +482,33 @@ public void batchStartGroup(ReqBatchStartGroup req) {
         log.debug("end batchStartGroup.");
     }
 
+//    /**
+//     * batch get group's status
+//     *
+//     * @param req
+//     */
+//    public List<String> batchStatusGroup(ReqBatchStartGroup req) {
+//        log.debug("start batchStatusGroup:{}", req);
+//        Integer groupId = req.getGenerateGroupId();
+//        // check id
+//        checkGroupIdValid(groupId);
+//        List<String> groupStatusList = new ArrayList<>();
+//        for (String nodeId : req.getNodeList()) {
+//            // get front
+//            TbFront tbFront = frontService.getByNodeId(nodeId);
+//            if (tbFront == null) {
+//                log.error("fail batchStatusGroup node not exists.");
+//                throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
+//            }
+//            // request front to start
+//            BaseResponse response = frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
+//                    "getStatus");
+//            if ()
+//        }
+//        // refresh group status
+//        resetGroupList();
+//        log.debug("end batchStatusGroup.");
+//    }
 
     /**
      * save group id
diff --git a/src/main/java/com/webank/webase/node/mgr/monitor/MonitorService.java b/src/main/java/com/webank/webase/node/mgr/monitor/MonitorService.java
index b1d18a8d9..5a5f96337 100644
--- a/src/main/java/com/webank/webase/node/mgr/monitor/MonitorService.java
+++ b/src/main/java/com/webank/webase/node/mgr/monitor/MonitorService.java
@@ -97,7 +97,7 @@ public void transMonitorByGroupId(CountDownLatch latch, int groupId) {
                 List<TbTransHash> transHashList = transHashService
                     .qureyUnStatTransHashList(groupId);
                 log.info("=== groupId:{} transHashList:{}", groupId, transHashList.size());
-                if (Objects.isNull(transHashList) || transHashList.size() == 0) {
+                if (transHashList.size() == 0) {
                     log.debug("transMonitorByGroupId jump over. transHashList is empty");
                     return;
                 }
@@ -133,6 +133,7 @@ public void transMonitorByGroupId(CountDownLatch latch, int groupId) {
             log.error("fail transMonitorByGroupId, group:{}", groupId, ex);
         } finally {
             if (Objects.nonNull(latch)) {
+                // finish one group, count down
                 latch.countDown();
             }
         }

From 0353fdc1343f31e1c6c919c7008a9410ad5cb908 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 11 May 2020 11:51:36 +0800
Subject: [PATCH 024/131] add list of nodeId's groupStatuMap

---
 .../frontinterface/FrontInterfaceService.java | 22 +++++--
 .../mgr/frontinterface/FrontRestTools.java    |  1 +
 .../node/mgr/group/GroupController.java       | 23 ++++++-
 .../webase/node/mgr/group/GroupService.java   | 61 ++++++++++---------
 .../node/mgr/group/entity/ReqGroupStatus.java | 38 ++++++++++++
 .../mgr/test/group/GroupControllerTest.java   | 39 +++++++++++-
 6 files changed, 147 insertions(+), 37 deletions(-)
 create mode 100644 src/main/java/com/webank/webase/node/mgr/group/entity/ReqGroupStatus.java

diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
index 6818a934f..1bdd3d829 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
@@ -21,6 +21,7 @@
 import com.webank.webase.node.mgr.base.entity.BaseResponse;
 import com.webank.webase.node.mgr.event.entity.ContractEventInfo;
 import com.webank.webase.node.mgr.event.entity.NewBlockEventInfo;
+import com.webank.webase.node.mgr.group.entity.ReqGroupStatus;
 import com.webank.webase.node.mgr.user.entity.KeyPair;
 import org.apache.commons.lang3.StringUtils;
 import org.fisco.bcos.web3j.protocol.core.methods.response.NodeVersion;
@@ -453,15 +454,24 @@ public BaseResponse operateGroup(String frontIp, Integer frontPort, Integer grou
         String uri = String.format(FrontRestTools.URI_OPERATE_GROUP, type);
         BaseResponse response =
                 getFromSpecificFront(groupId, frontIp, frontPort, uri, BaseResponse.class);
-//        GroupOperateStatus result = new GroupOperateStatus();
-//        if (Objects.nonNull(response.getData())) {
-//            result.setCode(String.valueOf(0));
-//            result.setMessage(response.getMessage());
-//            result.setStatus(response.getData().toString());
-//        }
         log.debug("end operateGroup");
         return response;
     }
+
+    /**
+     * query group status list
+     */
+    public Map<Integer, String> queryGroupStatus(String frontIp, Integer frontPort, String nodeId, List<Integer> groupIdList) {
+        log.debug("start queryGroupStatusList frontIp:{} frontPort:{} nodeId:{} groupIdList:{}",
+                frontIp, frontPort, nodeId, groupIdList);
+        int uselessGroupId = 1;
+        Map<String, Object> param = new HashMap<>(1);
+        param.put("groupIdList", groupIdList);
+        BaseResponse response = requestSpecificFront(uselessGroupId, frontIp, frontPort,
+                        HttpMethod.POST, FrontRestTools.URI_QUERY_GROUP_STATUS, param, BaseResponse.class);
+        log.debug("end queryGroupStatusList");
+        return (Map<Integer, String>) response.getData();
+    }
     
     /**
      * refresh front.
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index e167dc479..5f4318d76 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -73,6 +73,7 @@ public class FrontRestTools {
     public static final String URI_GET_CLIENT_VERSION = "web3/clientVersion";
     public static final String URI_GENERATE_GROUP = "web3/generateGroup";
     public static final String URI_OPERATE_GROUP = "web3/operateGroup/%1s";
+    public static final String URI_QUERY_GROUP_STATUS = "web3/queryGroupStatus";
     public static final String URI_REFRESH_FRONT = "web3/refresh";
     public static final String FRONT_PERFORMANCE_RATIO = "performance";
     public static final String FRONT_PERFORMANCE_CONFIG = "performance/config";
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 6878b7951..2193ac062 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -30,6 +30,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 import javax.validation.Valid;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -119,7 +120,7 @@ public BasePageResponse getAllGroup() throws NodeMgrException {
         return pagesponse;
     }
 
-    @GetMapping("/all/invalid")
+    @GetMapping("/all/invalidIncluded")
     public BasePageResponse getAllGroupIncludeInvalidGroup() throws NodeMgrException {
         BasePageResponse pagesponse = new BasePageResponse(ConstantCode.SUCCESS);
         Instant startTime = Instant.now();
@@ -221,6 +222,26 @@ public Object operateGroup(@PathVariable("nodeId") String nodeId, @RequestBody @
         return groupHandleResult;
     }
 
+    /**
+     * query group status list
+     * @return map of <nodeId,<groupId, status>>
+     */
+    @PostMapping("/queryGroupStatus/list")
+//    @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+    public BaseResponse getGroupStatusList(@Valid @RequestBody ReqGroupStatus reqGroupStatus) throws NodeMgrException {
+        Instant startTime = Instant.now();
+        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
+        log.info("start getGroupStatusMap startTime:{}", startTime.toEpochMilli());
+        List<String> nodeIdList = reqGroupStatus.getNodeIdList();
+        Map<String, Map<Integer, String>> res = groupService.listGroupStatus(nodeIdList,
+                reqGroupStatus.getGroupIdList());
+        baseResponse.setData(res);
+        log.info("end getGroupStatusMap useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(),
+                JSON.toJSONString(baseResponse));
+        return baseResponse;
+    }
+
     /**
      * batch start group.(start group to all front
      */
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index c8111743d..7679b371d 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -456,6 +456,39 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
         return groupOperateStatus;
     }
 
+    /**
+     * list groupStatus Of each node of NodeList
+     * @param nodeIdList
+     * @param groupIdList
+     * @return map of <nodeId,<groupId, status>>
+     */
+    public Map<String, Map<Integer, String>> listGroupStatus(List<String> nodeIdList, List<Integer> groupIdList) {
+        Map<String, Map<Integer, String>> groupStatusMapList = new HashMap<>(nodeIdList.size());
+        for (String nodeId : nodeIdList) {
+            Map<Integer, String> resMap = getGroupStatus(nodeId, groupIdList);
+            groupStatusMapList.put(nodeId, resMap);
+        }
+        return groupStatusMapList;
+    }
+
+    /**
+     * getGroupStatus of single node's sight
+     * @param nodeId
+     * @param groupIdList
+     * @return map of <groupId, status>
+     */
+    private Map<Integer, String> getGroupStatus(String nodeId, List<Integer> groupIdList) {
+        // get front
+        TbFront tbFront = frontService.getByNodeId(nodeId);
+        if (tbFront == null) {
+            log.error("fail getGroupStatus node front not exists.");
+            throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
+        }
+        Map<Integer, String> statusRes = frontInterface.queryGroupStatus(tbFront.getFrontIp(),
+                tbFront.getFrontPort(), nodeId, groupIdList);
+        return statusRes;
+    }
+
     /**
      * batch start group.
      *
@@ -482,34 +515,6 @@ public void batchStartGroup(ReqBatchStartGroup req) {
         log.debug("end batchStartGroup.");
     }
 
-//    /**
-//     * batch get group's status
-//     *
-//     * @param req
-//     */
-//    public List<String> batchStatusGroup(ReqBatchStartGroup req) {
-//        log.debug("start batchStatusGroup:{}", req);
-//        Integer groupId = req.getGenerateGroupId();
-//        // check id
-//        checkGroupIdValid(groupId);
-//        List<String> groupStatusList = new ArrayList<>();
-//        for (String nodeId : req.getNodeList()) {
-//            // get front
-//            TbFront tbFront = frontService.getByNodeId(nodeId);
-//            if (tbFront == null) {
-//                log.error("fail batchStatusGroup node not exists.");
-//                throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
-//            }
-//            // request front to start
-//            BaseResponse response = frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
-//                    "getStatus");
-//            if ()
-//        }
-//        // refresh group status
-//        resetGroupList();
-//        log.debug("end batchStatusGroup.");
-//    }
-
     /**
      * save group id
      */
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/ReqGroupStatus.java b/src/main/java/com/webank/webase/node/mgr/group/entity/ReqGroupStatus.java
new file mode 100644
index 000000000..e475e4c3a
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/ReqGroupStatus.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.group.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * get front's(node's) group status
+ * different node might get different group status of the same group
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReqGroupStatus {
+	@NotNull
+	private List<String> nodeIdList;
+	@NotNull
+	private List<Integer> groupIdList;
+}
diff --git a/src/test/java/node/mgr/test/group/GroupControllerTest.java b/src/test/java/node/mgr/test/group/GroupControllerTest.java
index 49d587f92..0564aa52a 100644
--- a/src/test/java/node/mgr/test/group/GroupControllerTest.java
+++ b/src/test/java/node/mgr/test/group/GroupControllerTest.java
@@ -18,6 +18,7 @@
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.Application;
 import com.webank.webase.node.mgr.group.entity.ReqGenerateGroup;
+import com.webank.webase.node.mgr.group.entity.ReqGroupStatus;
 import com.webank.webase.node.mgr.group.entity.ReqOperateGroup;
 import org.junit.Before;
 import org.junit.Test;
@@ -70,8 +71,19 @@ public void testGetAll() throws Exception {
 
         ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.get("/group/all"));
         resultActions.
-            andExpect(MockMvcResultMatchers.status().isOk()).
-            andDo(MockMvcResultHandlers.print());
+                andExpect(MockMvcResultMatchers.status().isOk()).
+                andDo(MockMvcResultHandlers.print());
+        System.out.println("=================================response:"+resultActions.andReturn().getResponse().getContentAsString());
+    }
+
+
+    @Test
+    public void testGetAllInvalidIncluded() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.get("/group/all/invalidIncluded"));
+        resultActions.
+//                andExpect(MockMvcResultMatchers.status().isOk()).
+                andDo(MockMvcResultHandlers.print());
         System.out.println("=================================response:"+resultActions.andReturn().getResponse().getContentAsString());
     }
 
@@ -148,4 +160,27 @@ public void testUpdate() throws Exception {
         System.out.println("=================================response:"+resultActions.andReturn().getResponse().getContentAsString());
     }
 
+    @Test
+    public void testGroupStatusList() throws Exception {
+        ReqGroupStatus param = new ReqGroupStatus();
+        List<Integer> groupIdList = new ArrayList<>();
+        groupIdList.add(2020);
+        groupIdList.add(3);
+        groupIdList.add(1);
+        groupIdList.add(2021);
+        groupIdList.add(2023);
+        param.setGroupIdList(groupIdList);
+        List<String> nodeIdList = new ArrayList<>();
+        nodeIdList.add(targetNodeId);
+        param.setNodeIdList(nodeIdList);
+        ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders
+                .post("/group/queryGroupStatus/list")
+                .content(JSON.toJSONString(param))
+                .contentType(MediaType.APPLICATION_JSON_UTF8)
+        );
+        resultActions.
+//                andExpect(MockMvcResultMatchers.status().isOk()).
+                andDo(MockMvcResultHandlers.print());
+        System.out.println("=================================response:"+resultActions.andReturn().getResponse().getContentAsString());
+    }
 }

From 0bda9eea83ec4ce06ff63db8f19e6c28129265bc Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 11 May 2020 14:31:28 +0800
Subject: [PATCH 025/131] alter author

---
 .../java/com/webank/webase/node/mgr/group/GroupController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 2193ac062..2203297a0 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -227,7 +227,7 @@ public Object operateGroup(@PathVariable("nodeId") String nodeId, @RequestBody @
      * @return map of <nodeId,<groupId, status>>
      */
     @PostMapping("/queryGroupStatus/list")
-//    @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+    @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
     public BaseResponse getGroupStatusList(@Valid @RequestBody ReqGroupStatus reqGroupStatus) throws NodeMgrException {
         Instant startTime = Instant.now();
         BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);

From 9189c6a3ddab57864f2720f8518b2ea8ed72aa42 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 11 May 2020 15:08:16 +0800
Subject: [PATCH 026/131] add page in group api

---
 .../com/webank/webase/node/mgr/group/GroupController.java | 8 ++++++--
 .../java/node/mgr/test/group/GroupControllerTest.java     | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 2203297a0..0e79f799f 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -21,6 +21,7 @@
 import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
+import com.webank.webase.node.mgr.base.tools.pagetools.List2Page;
 import com.webank.webase.node.mgr.group.entity.*;
 import com.webank.webase.node.mgr.scheduler.ResetGroupListTask;
 import com.webank.webase.node.mgr.scheduler.StatisticsTransdailyTask;
@@ -120,8 +121,9 @@ public BasePageResponse getAllGroup() throws NodeMgrException {
         return pagesponse;
     }
 
-    @GetMapping("/all/invalidIncluded")
-    public BasePageResponse getAllGroupIncludeInvalidGroup() throws NodeMgrException {
+    @GetMapping("/all/invalidIncluded/{pageNumber}/{pageSize}")
+    public BasePageResponse getAllGroupIncludeInvalidGroup(@PathVariable("pageNumber") Integer pageNumber,
+                                                           @PathVariable("pageSize") Integer pageSize) throws NodeMgrException {
         BasePageResponse pagesponse = new BasePageResponse(ConstantCode.SUCCESS);
         Instant startTime = Instant.now();
         log.info("start getAllGroupIncludeInvalidGroup startTime:{}", startTime.toEpochMilli());
@@ -130,6 +132,8 @@ public BasePageResponse getAllGroupIncludeInvalidGroup() throws NodeMgrException
         int count = groupService.countOfGroup(null, null);
         if (count > 0) {
             List<TbGroup> groupList = groupService.getGroupList(null);
+            List2Page list2Page = new List2Page(groupList, pageSize, pageNumber);
+            pagesponse.setData(list2Page.getPagedList());
             pagesponse.setTotalCount(count);
             pagesponse.setData(groupList);
         }
diff --git a/src/test/java/node/mgr/test/group/GroupControllerTest.java b/src/test/java/node/mgr/test/group/GroupControllerTest.java
index 0564aa52a..c818d82d3 100644
--- a/src/test/java/node/mgr/test/group/GroupControllerTest.java
+++ b/src/test/java/node/mgr/test/group/GroupControllerTest.java
@@ -80,9 +80,9 @@ public void testGetAll() throws Exception {
     @Test
     public void testGetAllInvalidIncluded() throws Exception {
 
-        ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.get("/group/all/invalidIncluded"));
+        ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.get("/group/all/invalidIncluded/1/5"));
         resultActions.
-//                andExpect(MockMvcResultMatchers.status().isOk()).
+                andExpect(MockMvcResultMatchers.status().isOk()).
                 andDo(MockMvcResultHandlers.print());
         System.out.println("=================================response:"+resultActions.andReturn().getResponse().getContentAsString());
     }

From 1ccf604f6692a0b6bbe4df7b7668948a7f434e47 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 11 May 2020 15:59:54 +0800
Subject: [PATCH 027/131] add rsp of groupStatus & groupId as string

---
 .../frontinterface/FrontInterfaceService.java |  4 +-
 .../node/mgr/group/GroupController.java       |  5 +--
 .../webase/node/mgr/group/GroupService.java   | 22 +++++------
 .../node/mgr/group/entity/RspGroupStatus.java | 37 +++++++++++++++++++
 4 files changed, 52 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java

diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
index 1bdd3d829..fb03ad136 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
@@ -461,7 +461,7 @@ public BaseResponse operateGroup(String frontIp, Integer frontPort, Integer grou
     /**
      * query group status list
      */
-    public Map<Integer, String> queryGroupStatus(String frontIp, Integer frontPort, String nodeId, List<Integer> groupIdList) {
+    public Map<String, String> queryGroupStatus(String frontIp, Integer frontPort, String nodeId, List<Integer> groupIdList) {
         log.debug("start queryGroupStatusList frontIp:{} frontPort:{} nodeId:{} groupIdList:{}",
                 frontIp, frontPort, nodeId, groupIdList);
         int uselessGroupId = 1;
@@ -470,7 +470,7 @@ public Map<Integer, String> queryGroupStatus(String frontIp, Integer frontPort,
         BaseResponse response = requestSpecificFront(uselessGroupId, frontIp, frontPort,
                         HttpMethod.POST, FrontRestTools.URI_QUERY_GROUP_STATUS, param, BaseResponse.class);
         log.debug("end queryGroupStatusList");
-        return (Map<Integer, String>) response.getData();
+        return (Map<String, String>) response.getData();
     }
     
     /**
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 0e79f799f..e25cd7e73 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -31,7 +31,6 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
-import java.util.Map;
 import javax.validation.Valid;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -237,9 +236,9 @@ public BaseResponse getGroupStatusList(@Valid @RequestBody ReqGroupStatus reqGro
         BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
         log.info("start getGroupStatusMap startTime:{}", startTime.toEpochMilli());
         List<String> nodeIdList = reqGroupStatus.getNodeIdList();
-        Map<String, Map<Integer, String>> res = groupService.listGroupStatus(nodeIdList,
+        List<RspGroupStatus> resList = groupService.listGroupStatus(nodeIdList,
                 reqGroupStatus.getGroupIdList());
-        baseResponse.setData(res);
+        baseResponse.setData(resList);
         log.info("end getGroupStatusMap useTime:{} result:{}",
                 Duration.between(startTime, Instant.now()).toMillis(),
                 JSON.toJSONString(baseResponse));
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 7679b371d..08ba33497 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -15,7 +15,6 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
-import com.webank.webase.node.mgr.base.entity.BaseResponse;
 import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
@@ -30,7 +29,6 @@
 import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroupMapCache;
 import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
 import com.webank.webase.node.mgr.frontinterface.entity.GenerateGroupInfo;
-import com.webank.webase.node.mgr.frontinterface.entity.GroupHandleResult;
 import com.webank.webase.node.mgr.group.entity.*;
 import com.webank.webase.node.mgr.method.MethodService;
 import com.webank.webase.node.mgr.node.NodeService;
@@ -38,7 +36,6 @@
 import com.webank.webase.node.mgr.node.entity.PeerInfo;
 import com.webank.webase.node.mgr.table.TableService;
 import com.webank.webase.node.mgr.transdaily.TransDailyService;
-import com.webank.webase.node.mgr.user.UserService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -460,15 +457,18 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
      * list groupStatus Of each node of NodeList
      * @param nodeIdList
      * @param groupIdList
-     * @return map of <nodeId,<groupId, status>>
+     * @return GroupStatusInfo
      */
-    public Map<String, Map<Integer, String>> listGroupStatus(List<String> nodeIdList, List<Integer> groupIdList) {
-        Map<String, Map<Integer, String>> groupStatusMapList = new HashMap<>(nodeIdList.size());
+    public List<RspGroupStatus> listGroupStatus(List<String> nodeIdList, List<Integer> groupIdList) {
+        List<RspGroupStatus> resList = new ArrayList<>(nodeIdList.size());
         for (String nodeId : nodeIdList) {
-            Map<Integer, String> resMap = getGroupStatus(nodeId, groupIdList);
-            groupStatusMapList.put(nodeId, resMap);
+            Map<String, String> statusMap = new HashMap<>();
+            statusMap = getGroupStatus(nodeId, groupIdList);
+
+            RspGroupStatus rspGroupStatus = new RspGroupStatus(nodeId, statusMap);
+            resList.add(rspGroupStatus);
         }
-        return groupStatusMapList;
+        return resList;
     }
 
     /**
@@ -477,14 +477,14 @@ public Map<String, Map<Integer, String>> listGroupStatus(List<String> nodeIdList
      * @param groupIdList
      * @return map of <groupId, status>
      */
-    private Map<Integer, String> getGroupStatus(String nodeId, List<Integer> groupIdList) {
+    private Map<String, String> getGroupStatus(String nodeId, List<Integer> groupIdList) {
         // get front
         TbFront tbFront = frontService.getByNodeId(nodeId);
         if (tbFront == null) {
             log.error("fail getGroupStatus node front not exists.");
             throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
         }
-        Map<Integer, String> statusRes = frontInterface.queryGroupStatus(tbFront.getFrontIp(),
+        Map<String, String> statusRes = frontInterface.queryGroupStatus(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), nodeId, groupIdList);
         return statusRes;
     }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java b/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java
new file mode 100644
index 000000000..14ae0dbd9
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.group.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+/**
+ * entity of <nodeId,<groupId, status>>
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RspGroupStatus {
+	private String nodeId;
+	/**
+	 * <groupId, status> status: "INEXISTENT"、"STOPPING"、"RUNNING"、"STOPPED"、"DELETED"
+	 */
+	private Map<String, String> groupStatusMap;
+}

From 27ef30b2bdae5cfced2a1b9ff7f3e491414b0b05 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 11 May 2020 17:12:52 +0800
Subject: [PATCH 028/131] add comments

---
 .../webank/webase/node/mgr/group/entity/RspGroupStatus.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java b/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java
index 14ae0dbd9..9eb6102df 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java
@@ -31,7 +31,8 @@
 public class RspGroupStatus {
 	private String nodeId;
 	/**
-	 * <groupId, status> status: "INEXISTENT"、"STOPPING"、"RUNNING"、"STOPPED"、"DELETED"
+	 * <groupId, status>
+	 *     status: "INEXISTENT"、"STOPPING"、"RUNNING"、"STOPPED"、"DELETED"
 	 */
 	private Map<String, String> groupStatusMap;
 }

From 0a9648e3f90c9b67d90cc9bb759cbbc75bef33c2 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 12 May 2020 15:55:01 +0800
Subject: [PATCH 029/131] fix resetGroup modifyTime and not delete &add remove
 group data api

---
 .../node/mgr/group/GroupController.java       | 22 +++--
 .../webase/node/mgr/group/GroupMapper.java    |  5 ++
 .../webase/node/mgr/group/GroupService.java   | 85 +++++++++++++------
 .../webase/node/mgr/group/entity/TbGroup.java |  8 ++
 src/main/resources/mapper/GroupMapper.xml     |  7 +-
 5 files changed, 95 insertions(+), 32 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index e25cd7e73..f6442553b 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -36,12 +36,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * Controller for processing group information.
@@ -278,4 +273,19 @@ public BaseResponse updateGroup() throws NodeMgrException {
                 JSON.toJSONString(baseResponse));
         return baseResponse;
     }
+
+    /**
+     * delete all group's data(trans, contract, node etc.)
+     */
+    @DeleteMapping("/{groupId}")
+    public BaseResponse deleteGroupData(@PathVariable("groupId") Integer groupId) {
+        Instant startTime = Instant.now();
+        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
+        log.warn("start deleteGroupData startTime:{}", startTime.toEpochMilli());
+        groupService.removeAllDataByGroupId(groupId);
+        log.warn("end deleteGroupData useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(),
+                JSON.toJSONString(baseResponse));
+        return baseResponse;
+    }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupMapper.java b/src/main/java/com/webank/webase/node/mgr/group/GroupMapper.java
index ccf0ad4a7..1f1c987bd 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupMapper.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupMapper.java
@@ -51,6 +51,11 @@ public interface GroupMapper {
      */
     List<TbGroup> getList(@Param("groupStatus") Integer groupStatus);
 
+    /**
+     * get group by group id
+     */
+    TbGroup getGroupById(@Param("groupId") Integer groupId);
+
     /**
      * query the latest statistics trans on all groups.
      */
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 08ba33497..4bb30f292 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -43,6 +43,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.math.BigInteger;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.*;
@@ -207,10 +208,14 @@ public void resetGroupList() {
                 Integer gId = Integer.valueOf(groupId);
                 allGroupSet.add(gId);
                 // peer in group
-                List<String> groupPeerList = frontInterface.getNodeIDListFromSpecificFront(frontIp, frontPort, gId);
-                // save group
-                saveGroup(gId, groupPeerList.size(), "synchronous",
-                        GroupType.SYNC.getValue(), DataStatus.NORMAL.getValue());
+                List<String> groupPeerList = frontInterface.getGroupPeersFromSpecificFront(frontIp, frontPort, gId);
+                // check group not existed or node count differs
+                TbGroup checkGroup = getGroupById(gId);
+                if (Objects.isNull(checkGroup) || groupPeerList.size() != checkGroup.getNodeCount()) {
+                    // save group
+                    saveGroup(gId, groupPeerList.size(), "synchronous",
+                            GroupType.SYNC.getValue(), DataStatus.NORMAL.getValue());
+                }
                 frontGroupMapService.newFrontGroup(front.getFrontId(), gId);
                 //save new peers
                 savePeerList(frontIp, frontPort, gId, groupPeerList);
@@ -218,14 +223,11 @@ public void resetGroupList() {
                 removeInvalidPeer(gId, groupPeerList);
                 //refresh: add sealer and observer no matter validity
                 frontService.refreshSealerAndObserverInNodeList(frontIp, frontPort, gId);
-                //check node status
-                //nodeService.checkNodeStatus(gId);
             }
         }
 
         // check group status
-        // if beyond gray period, remove invalid group, else, not remove
-        checkGroupStatusAndRemoveInvalidGroup(allGroupSet);
+        checkAndUpdateGroupStatus(allGroupSet);
         // remove front_group_map that not in tb_front or tb_group
         frontGroupMapService.removeInvalidFrontGroupMap();
         //clear cache
@@ -236,7 +238,7 @@ public void resetGroupList() {
     }
 
     /**
-     * save new peers.
+     * save new peers that not in group peers
      */
     private void savePeerList(String frontIp, Integer frontPort, int groupId, List<String> groupPeerList) {
         //get all local nodes
@@ -303,9 +305,9 @@ private boolean checkSealerAndObserverListContains(int groupId, String nodeId) {
     }
 
     /**
-     * check group status.
+     * check group status and Update
      */
-    private void checkGroupStatusAndRemoveInvalidGroup(Set<Integer> allGroupOnChain) {
+    private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
         if (CollectionUtils.isEmpty(allGroupOnChain)) {
             return;
         }
@@ -326,14 +328,15 @@ private void checkGroupStatusAndRemoveInvalidGroup(Set<Integer> allGroupOnChain)
                     updateGroupStatus(localGroupId, DataStatus.NORMAL.getValue());
                     continue;
                 }
+                // v1.3.1: removed by api, not aumotically
                 // check from last modifyTime if within gray period
-                if (!NodeMgrTools.isWithinPeriod(localGroup.getModifyTime(),
-                        constants.getGroupInvalidGrayscaleValue())) {
-                    log.warn("remove group, localGroup:{}", JSON.toJSONString(localGroup));
-                    //remove group
-                    removeAllDataByGroupId(localGroupId);
-                    continue;
-                }
+//                if (!NodeMgrTools.isWithinPeriod(localGroup.getModifyTime(),
+//                        constants.getGroupInvalidGrayscaleValue())) {
+//                    log.warn("remove group, localGroup:{}", JSON.toJSONString(localGroup));
+//                    //remove group
+//                    removeAllDataByGroupId(localGroupId);
+//                    continue;
+//                }
                 // if not found in groupOnChain
                 log.warn("group is invalid, localGroupId:{}", localGroupId);
                 if (DataStatus.NORMAL.getValue() == localGroup.getGroupStatus()) {
@@ -352,12 +355,14 @@ private void checkGroupStatusAndRemoveInvalidGroup(Set<Integer> allGroupOnChain)
 
 
     /**
-     * remove by groupId.
+     * remove all data by groupId.
+     * included: tb_group, tb_front_group_map, group contract/trans, group method, group node etc.
      */
-    private void removeAllDataByGroupId(int groupId) {
+    protected void removeAllDataByGroupId(int groupId) {
         if (groupId == 0) {
             return;
         }
+        log.warn("removeAllDataByGroupId! groupId:{}", groupId);
         //remove groupId.
         groupMapper.remove(groupId);
         //remove mapping.
@@ -372,6 +377,7 @@ private void removeAllDataByGroupId(int groupId) {
         transDailyService.deleteByGroupId(groupId);
         //drop table.
         tableService.dropTableByGroupId(groupId);
+        log.warn("end removeAllDataByGroupId");
     }
 
     /**
@@ -395,7 +401,8 @@ public TbGroup generateToSingleNode(String nodeId, ReqGenerateGroup req) {
                 generateGroupInfo);
         // save group, saved as invalid status until start
         TbGroup tbGroup = saveGroup(generateGroupId, req.getNodeList().size(),
-                req.getDescription(), GroupType.MANUAL.getValue(), DataStatus.INVALID.getValue());
+                req.getDescription(), GroupType.MANUAL.getValue(), DataStatus.INVALID.getValue(),
+                req.getTimestamp(), req.getNodeList());
         return tbGroup;
     }
 
@@ -407,7 +414,9 @@ public TbGroup generateToSingleNode(String nodeId, ReqGenerateGroup req) {
      */
     public TbGroup generateGroup(ReqGenerateGroup req) {
         Integer generateGroupId = req.getGenerateGroupId();
-        checkGroupIdExisted(generateGroupId);
+        if (checkGroupIdExisted(generateGroupId)) {
+            throw new NodeMgrException(ConstantCode.GROUP_ID_EXISTS);
+        }
 
         for (String nodeId : req.getNodeList()) {
             // get front
@@ -424,7 +433,8 @@ public TbGroup generateGroup(ReqGenerateGroup req) {
         }
         // save group, saved as invalid status until start
         TbGroup tbGroup = saveGroup(generateGroupId, req.getNodeList().size(),
-                req.getDescription(), GroupType.MANUAL.getValue(), DataStatus.INVALID.getValue());
+                req.getDescription(), GroupType.MANUAL.getValue(), DataStatus.INVALID.getValue(),
+                req.getTimestamp(), req.getNodeList());
         return tbGroup;
     }
 
@@ -535,10 +545,29 @@ public TbGroup saveGroup(int groupId, int nodeCount, String description,
         return tbGroup;
     }
 
+    @Transactional
+    public TbGroup saveGroup(int groupId, int nodeCount, String description, int groupType,
+                             int groupStatus, BigInteger timestamp, List<String> nodeIdList) {
+        if (groupId == 0) {
+            return null;
+        }
+        // save group id
+        String groupName = "group" + groupId;
+        TbGroup tbGroup =
+                new TbGroup(groupId, groupName, nodeCount, description,
+                        groupType, groupStatus);
+        tbGroup.setTimestamp(String.valueOf(timestamp));
+        tbGroup.setNodeIdList(JSON.toJSONString(nodeIdList));
+        groupMapper.save(tbGroup);
+        // create table by group id
+        tableService.newTableByGroupId(groupId);
+        return tbGroup;
+    }
+
     /**
      * Check the validity of the groupId.
      */
-    public void checkGroupIdExisted(Integer groupId) throws NodeMgrException {
+    public boolean checkGroupIdExisted(Integer groupId) throws NodeMgrException {
         log.debug("start checkGroupIdExisted groupId:{}", groupId);
 
         if (groupId == null) {
@@ -549,9 +578,10 @@ public void checkGroupIdExisted(Integer groupId) throws NodeMgrException {
         Integer groupCount = countOfGroup(groupId, null);
         log.debug("checkGroupIdExisted groupId:{} groupCount:{}", groupId, groupCount);
         if (groupCount != null && groupCount > 0) {
-            throw new NodeMgrException(ConstantCode.GROUP_ID_EXISTS);
+            return true;
         }
         log.debug("end checkGroupIdExisted");
+        return false;
     }
 
     /**
@@ -573,4 +603,9 @@ public void checkGroupIdValid(Integer groupId) throws NodeMgrException {
         log.debug("end checkGroupIdValid");
     }
 
+    public TbGroup getGroupById(Integer groupId) {
+        log.debug("getGroupById groupId:{}", groupId);
+        return groupMapper.getGroupById(groupId);
+    }
+
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java b/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
index 038c75125..5a7ea583f 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
@@ -40,6 +40,14 @@ public class TbGroup {
     private LocalDateTime modifyTime;
     private String description;
     private Integer groupType;
+    /**
+     * group.x.genesis timestamp
+     */
+    private String timestamp;
+    /**
+     * group peers nodeid
+     */
+    private String nodeIdList;
 
     public TbGroup(Integer groupId, String groupName, Integer nodeCount,
                    String description, Integer groupType) {
diff --git a/src/main/resources/mapper/GroupMapper.xml b/src/main/resources/mapper/GroupMapper.xml
index be23a7b97..cef69c797 100644
--- a/src/main/resources/mapper/GroupMapper.xml
+++ b/src/main/resources/mapper/GroupMapper.xml
@@ -71,8 +71,13 @@
     order by group_id asc
   </select>
 
+    <select id="getGroupById" resultMap="groupMap">
+        select * from tb_group
+        where group_id = #{groupId}
+    </select>
 
-  <select id="queryLatestStatisticalTrans" resultMap="statisticalTransMap">
+
+    <select id="queryLatestStatisticalTrans" resultMap="statisticalTransMap">
 		select a.group_id,b.maxDay,c.block_number,c.trans_count from tb_group a
 		LEFT JOIN
 		(select group_id,max(trans_day) as maxDay from tb_trans_daily GROUP BY group_id)b

From 6867b1e35a4e51a08cf42e7d5a8c1f6f1d14965a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 12 May 2020 15:55:28 +0800
Subject: [PATCH 030/131] judge before update group

---
 .../com/webank/webase/node/mgr/front/FrontService.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index 2bf457c0d..f56019312 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -29,6 +29,7 @@
 import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
 import com.webank.webase.node.mgr.frontinterface.entity.SyncStatus;
 import com.webank.webase.node.mgr.group.GroupService;
+import com.webank.webase.node.mgr.group.entity.TbGroup;
 import com.webank.webase.node.mgr.node.NodeParam;
 import com.webank.webase.node.mgr.node.NodeService;
 import com.webank.webase.node.mgr.node.TbNode;
@@ -38,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
@@ -131,8 +133,12 @@ public TbFront newFront(FrontInfo frontInfo) {
                 .getPeersFromSpecificFront(frontIp, frontPort, group);
             List<PeerInfo> peerList = Arrays.asList(peerArr);
             //add group
-            groupService.saveGroup(group, groupPeerList.size(), "synchronous",
-                    GroupType.SYNC.getValue(), DataStatus.NORMAL.getValue());
+            // check group not existed or node count differs
+            TbGroup checkGroup = groupService.getGroupById(group);
+            if (Objects.isNull(checkGroup) || groupPeerList.size() != checkGroup.getNodeCount()) {
+                groupService.saveGroup(group, groupPeerList.size(), "synchronous",
+                        GroupType.SYNC.getValue(), DataStatus.NORMAL.getValue());
+            }
             //save front group map
             frontGroupMapService.newFrontGroup(tbFront.getFrontId(), group);
             //save nodes

From 06e95e8089e1c27a9c62d83021861b12524f6c6e Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 12 May 2020 16:06:14 +0800
Subject: [PATCH 031/131] add groupId validation

---
 .../webase/node/mgr/group/GroupService.java   | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 4bb30f292..e406f17ff 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -123,6 +123,7 @@ public void updateGroupStatus(int groupId, int groupStatus) {
 
     /**
      * Check the validity of the groupId.
+     * @throws NodeMgrException INVALID_GROUP_ID
      */
     public void checkGroupId(Integer groupId) throws NodeMgrException {
         log.debug("start checkGroupId groupId:{}", groupId);
@@ -362,6 +363,7 @@ protected void removeAllDataByGroupId(int groupId) {
         if (groupId == 0) {
             return;
         }
+        checkGroupId(groupId);
         log.warn("removeAllDataByGroupId! groupId:{}", groupId);
         //remove groupId.
         groupMapper.remove(groupId);
@@ -508,7 +510,7 @@ public void batchStartGroup(ReqBatchStartGroup req) {
         log.debug("start batchStartGroup:{}", req);
         Integer groupId = req.getGenerateGroupId();
         // check id
-        checkGroupIdValid(groupId);
+        checkGroupId(groupId);
         for (String nodeId : req.getNodeList()) {
             // get front
             TbFront tbFront = frontService.getByNodeId(nodeId);
@@ -584,25 +586,6 @@ public boolean checkGroupIdExisted(Integer groupId) throws NodeMgrException {
         return false;
     }
 
-    /**
-     * Check the validity of the groupId.
-     */
-    public void checkGroupIdValid(Integer groupId) throws NodeMgrException {
-        log.debug("start checkGroupIdValid groupId:{}", groupId);
-
-        if (groupId == null) {
-            log.error("fail checkGroupIdValid groupId is null");
-            throw new NodeMgrException(ConstantCode.GROUP_ID_NULL);
-        }
-
-        Integer groupCount = countOfGroup(groupId, null);
-        log.debug("checkGroupIdValid groupId:{} groupCount:{}", groupId, groupCount);
-        if (groupCount == null || groupCount == 0) {
-            throw new NodeMgrException(ConstantCode.INVALID_GROUP_ID);
-        }
-        log.debug("end checkGroupIdValid");
-    }
-
     public TbGroup getGroupById(Integer groupId) {
         log.debug("getGroupById groupId:{}", groupId);
         return groupMapper.getGroupById(groupId);

From eb0b50219074764b71963c914c0ad2cc914f3b8a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 12 May 2020 16:16:53 +0800
Subject: [PATCH 032/131] alter tb_group timestamp to groupTimestamp

---
 script/webase-ddl.sql                                         | 2 ++
 .../java/com/webank/webase/node/mgr/group/GroupService.java   | 2 +-
 .../java/com/webank/webase/node/mgr/group/entity/TbGroup.java | 2 +-
 src/main/resources/mapper/GroupMapper.xml                     | 4 ++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/script/webase-ddl.sql b/script/webase-ddl.sql
index 688a4aa57..57f08734a 100644
--- a/script/webase-ddl.sql
+++ b/script/webase-ddl.sql
@@ -9,6 +9,8 @@ CREATE TABLE IF NOT EXISTS tb_group (
     node_count int DEFAULT '0' COMMENT '群组下节点数',
     description varchar(1024) COMMENT '群组描述',
     group_type int COMMENT '群组类型（1-拉取，2-动态创建）',
+    group_timestamp varchar(64) COMMENT '群组创世块时间戳',
+    node_id_list text COMMENT '群组成员节点的ID',
     create_time datetime DEFAULT NULL COMMENT '创建时间',
     modify_time datetime DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (group_id)
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index e406f17ff..d4c6c4cd3 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -558,7 +558,7 @@ public TbGroup saveGroup(int groupId, int nodeCount, String description, int gro
         TbGroup tbGroup =
                 new TbGroup(groupId, groupName, nodeCount, description,
                         groupType, groupStatus);
-        tbGroup.setTimestamp(String.valueOf(timestamp));
+        tbGroup.setGroupTimestamp(String.valueOf(timestamp));
         tbGroup.setNodeIdList(JSON.toJSONString(nodeIdList));
         groupMapper.save(tbGroup);
         // create table by group id
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java b/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
index 5a7ea583f..584ea89fb 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/TbGroup.java
@@ -43,7 +43,7 @@ public class TbGroup {
     /**
      * group.x.genesis timestamp
      */
-    private String timestamp;
+    private String groupTimestamp;
     /**
      * group peers nodeid
      */
diff --git a/src/main/resources/mapper/GroupMapper.xml b/src/main/resources/mapper/GroupMapper.xml
index cef69c797..dc15dcf15 100644
--- a/src/main/resources/mapper/GroupMapper.xml
+++ b/src/main/resources/mapper/GroupMapper.xml
@@ -16,6 +16,10 @@
       property="description"/>
     <result column="group_type" javaType="java.lang.Integer" jdbcType="INTEGER"
       property="groupType"/>
+    <result column="group_timestamp" javaType="java.lang.String" jdbcType="VARCHAR"
+      property="groupTimestamp"/>
+    <result column="node_id_list" javaType="java.lang.String" jdbcType="VARCHAR"
+      property="nodeIdList"/>
     <result column="create_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP"
       property="createTime"/>
     <result column="modify_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP"

From 3e35757d6a1de910aa301a46669fb532ff8d4cf2 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 12 May 2020 17:52:32 +0800
Subject: [PATCH 033/131] fix save group

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java  | 2 +-
 src/main/resources/mapper/GroupMapper.xml                    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index d4c6c4cd3..d087e765b 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -558,7 +558,7 @@ public TbGroup saveGroup(int groupId, int nodeCount, String description, int gro
         TbGroup tbGroup =
                 new TbGroup(groupId, groupName, nodeCount, description,
                         groupType, groupStatus);
-        tbGroup.setGroupTimestamp(String.valueOf(timestamp));
+        tbGroup.setGroupTimestamp(timestamp.toString(10));
         tbGroup.setNodeIdList(JSON.toJSONString(nodeIdList));
         groupMapper.save(tbGroup);
         // create table by group id
diff --git a/src/main/resources/mapper/GroupMapper.xml b/src/main/resources/mapper/GroupMapper.xml
index dc15dcf15..48377f269 100644
--- a/src/main/resources/mapper/GroupMapper.xml
+++ b/src/main/resources/mapper/GroupMapper.xml
@@ -44,8 +44,9 @@
 
   <insert id="save" parameterType="com.webank.webase.node.mgr.group.entity.TbGroup">
 		insert into tb_group
-		(group_id,group_name,node_count,description,group_type,create_time)
-		values(#{groupId},#{groupName},#{nodeCount},#{description},#{groupType},NOW())
+		(group_id,group_name,node_count,description,group_type,group_status,group_timestamp,node_id_list,create_time)
+		values(#{groupId},#{groupName},#{nodeCount},#{description},#{groupType},#{groupStatus},
+      #{groupTimestamp},#{nodeIdList},NOW())
 		ON DUPLICATE KEY UPDATE node_count=#{nodeCount},modify_time=NOW()
 	</insert>
 

From 88ecc6ec17740faace0e01cbe316e278a4fbb15b Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 12 May 2020 19:03:21 +0800
Subject: [PATCH 034/131] fix modifyTime all same

---
 .../com/webank/webase/node/mgr/group/GroupService.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index d087e765b..30d460e81 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -19,7 +19,6 @@
 import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
-import com.webank.webase.node.mgr.base.tools.NodeMgrTools;
 import com.webank.webase.node.mgr.contract.ContractService;
 import com.webank.webase.node.mgr.front.FrontService;
 import com.webank.webase.node.mgr.front.entity.FrontParam;
@@ -322,8 +321,8 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
             int localGroupId = localGroup.getGroupId();
             long count = allGroupOnChain.stream().filter(id -> id == localGroupId).count();
             try {
-                // found groupId in groupOnChain
-                if (count > 0) {
+                // found groupId in groupOnChain, local status is invalid, set as normal
+                if (count > 0 && localGroup.getGroupStatus() != DataStatus.NORMAL.getValue()) {
                     log.warn("group is normal, localGroupId:{}", localGroupId);
                     //update NORMAL
                     updateGroupStatus(localGroupId, DataStatus.NORMAL.getValue());
@@ -338,7 +337,7 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
 //                    removeAllDataByGroupId(localGroupId);
 //                    continue;
 //                }
-                // if not found in groupOnChain
+                // if not found in groupOnChain and local status is normal, set as invalid
                 log.warn("group is invalid, localGroupId:{}", localGroupId);
                 if (DataStatus.NORMAL.getValue() == localGroup.getGroupStatus()) {
                     // update invalid

From 4644fe1124ace59f54a1a5e4c39c2bb79c175e82 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 12 May 2020 20:02:07 +0800
Subject: [PATCH 035/131] update delete abi api

---
 .../java/com/webank/webase/node/mgr/abi/AbiController.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java b/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
index f933caf88..c6ce7e554 100644
--- a/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
+++ b/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
@@ -117,11 +117,9 @@ public Object updateAbi(@RequestBody ReqImportAbi param, BindingResult result) {
 		return new BaseResponse(ConstantCode.SUCCESS, res);
 	}
 
-	@DeleteMapping("")
+	@DeleteMapping("/{abiId}")
 	@PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
-	public BaseResponse deleteAbi(@Valid @RequestBody ReqDelAbi param, BindingResult result) {
-		checkBindResult(result);
-		Integer abiId = param.getAbiId();
+	public BaseResponse deleteAbi(@PathVariable("abiId") Integer abiId) {
 		log.debug("start deleteAbi. abiId:{}", abiId);
 		abiService.delete(abiId);
 		log.debug("end deleteAbi");

From c0fe5b30d51b390975b15cbec7aa5e8e3c1af388 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 12 May 2020 20:06:40 +0800
Subject: [PATCH 036/131] fix code style of tools

---
 .../node/mgr/base/tools/NodeMgrTools.java     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
index d3d6d9190..4ab83a8c0 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
@@ -496,23 +496,23 @@ public static String removeBinFirstAndLast(String contractBin, int removaLastLen
         if (StringUtils.isBlank(contractBin)) {
             return null;
         }
-        contractBin = removeFirstStr(contractBin, "0x");
-        if (contractBin.length() > removaLastLength) {
-            contractBin = contractBin.substring(0, contractBin.length() - removaLastLength);
+        String contractBinResult = removeFirstStr(contractBin, "0x");
+        if (contractBinResult.length() > removaLastLength) {
+            contractBinResult = contractBinResult.substring(0, contractBinResult.length() - removaLastLength);
         }
-        return contractBin;
+        return contractBinResult;
     }
 
     /**
      * remove fist string.
      */
-    public static String removeFirstStr(String constant, String target) {
-        if (StringUtils.isBlank(constant) || StringUtils.isBlank(target)) {
-            return constant;
+    public static String removeFirstStr(String input, String target) {
+        if (StringUtils.isBlank(input) || StringUtils.isBlank(target)) {
+            return input;
         }
-        if (constant.startsWith(target)) {
-            constant = StringUtils.removeStart(constant, target);
+        if (input.startsWith(target)) {
+            input = StringUtils.removeStart(input, target);
         }
-        return constant;
+        return input;
     }
 }

From b77b5db9a675bbc62be5c4f07a30d28d4f2f90c6 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 13 May 2020 10:00:37 +0800
Subject: [PATCH 037/131] rm del abi entity

---
 .../webase/node/mgr/abi/AbiController.java    |  1 -
 .../webase/node/mgr/abi/entity/ReqDelAbi.java | 19 -------------------
 .../node/mgr/test/abi/AbiServiceTest.java     |  1 -
 3 files changed, 21 deletions(-)
 delete mode 100644 src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java

diff --git a/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java b/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
index c6ce7e554..bd2d3eeef 100644
--- a/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
+++ b/src/main/java/com/webank/webase/node/mgr/abi/AbiController.java
@@ -19,7 +19,6 @@
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.abi.entity.AbiInfo;
 import com.webank.webase.node.mgr.abi.entity.ReqAbiListParam;
-import com.webank.webase.node.mgr.abi.entity.ReqDelAbi;
 import com.webank.webase.node.mgr.abi.entity.ReqImportAbi;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
 import com.webank.webase.node.mgr.base.controller.BaseController;
diff --git a/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java b/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java
deleted file mode 100644
index a59dd5252..000000000
--- a/src/main/java/com/webank/webase/node/mgr/abi/entity/ReqDelAbi.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.webank.webase.node.mgr.abi.entity;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * entity to delete abi info by id
- * @author marsli
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class ReqDelAbi {
-	@NotNull
-	private Integer abiId;
-}
\ No newline at end of file
diff --git a/src/test/java/node/mgr/test/abi/AbiServiceTest.java b/src/test/java/node/mgr/test/abi/AbiServiceTest.java
index 70d3a3ca0..01cf2a1e5 100644
--- a/src/test/java/node/mgr/test/abi/AbiServiceTest.java
+++ b/src/test/java/node/mgr/test/abi/AbiServiceTest.java
@@ -21,7 +21,6 @@
 import com.webank.webase.node.mgr.abi.AbiService;
 import com.webank.webase.node.mgr.abi.entity.AbiInfo;
 import com.webank.webase.node.mgr.abi.entity.ReqAbiListParam;
-import com.webank.webase.node.mgr.abi.entity.ReqDelAbi;
 import com.webank.webase.node.mgr.abi.entity.ReqImportAbi;
 import com.webank.webase.node.mgr.base.enums.SqlSortType;
 import org.junit.Assert;

From e363a5bbbe1519758a564bed6f13b7dc7cfce7c7 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 13 May 2020 14:24:55 +0800
Subject: [PATCH 038/131] fix update group invalid

---
 .../webase/node/mgr/group/GroupService.java      | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 30d460e81..f2db127af 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -319,27 +319,19 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
 
         for (TbGroup localGroup : allLocalGroup) {
             int localGroupId = localGroup.getGroupId();
-            long count = allGroupOnChain.stream().filter(id -> id == localGroupId).count();
+            long count = 0;
+            count = allGroupOnChain.stream().filter(id -> id == localGroupId).count();
             try {
                 // found groupId in groupOnChain, local status is invalid, set as normal
-                if (count > 0 && localGroup.getGroupStatus() != DataStatus.NORMAL.getValue()) {
+                if (count > 0 && localGroup.getGroupStatus() == DataStatus.INVALID.getValue()) {
                     log.warn("group is normal, localGroupId:{}", localGroupId);
                     //update NORMAL
                     updateGroupStatus(localGroupId, DataStatus.NORMAL.getValue());
                     continue;
                 }
-                // v1.3.1: removed by api, not aumotically
-                // check from last modifyTime if within gray period
-//                if (!NodeMgrTools.isWithinPeriod(localGroup.getModifyTime(),
-//                        constants.getGroupInvalidGrayscaleValue())) {
-//                    log.warn("remove group, localGroup:{}", JSON.toJSONString(localGroup));
-//                    //remove group
-//                    removeAllDataByGroupId(localGroupId);
-//                    continue;
-//                }
                 // if not found in groupOnChain and local status is normal, set as invalid
                 log.warn("group is invalid, localGroupId:{}", localGroupId);
-                if (DataStatus.NORMAL.getValue() == localGroup.getGroupStatus()) {
+                if (count == 0 && DataStatus.NORMAL.getValue() == localGroup.getGroupStatus()) {
                     // update invalid
                     updateGroupStatus(localGroupId, DataStatus.INVALID.getValue());
                     continue;

From 4280cab0036f8e843bb45e88b114b0b180d64b3d Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 13 May 2020 14:26:36 +0800
Subject: [PATCH 039/131] fix update group log

---
 .../com/webank/webase/node/mgr/group/GroupService.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index f2db127af..6f4e35f7d 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -324,16 +324,17 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
             try {
                 // found groupId in groupOnChain, local status is invalid, set as normal
                 if (count > 0 && localGroup.getGroupStatus() == DataStatus.INVALID.getValue()) {
-                    log.warn("group is normal, localGroupId:{}", localGroupId);
+                    log.info("group is normal, localGroupId:{}", localGroupId);
                     //update NORMAL
                     updateGroupStatus(localGroupId, DataStatus.NORMAL.getValue());
                     continue;
                 }
                 // if not found in groupOnChain and local status is normal, set as invalid
-                log.warn("group is invalid, localGroupId:{}", localGroupId);
+
                 if (count == 0 && DataStatus.NORMAL.getValue() == localGroup.getGroupStatus()) {
                     // update invalid
-                    updateGroupStatus(localGroupId, DataStatus.INVALID.getValue());
+					log.warn("group is invalid, localGroupId:{}", localGroupId);
+					updateGroupStatus(localGroupId, DataStatus.INVALID.getValue());
                     continue;
                 }
 

From aded26ea341b03087c6748844870f361ada3b2b3 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 13 May 2020 19:02:49 +0800
Subject: [PATCH 040/131] add nodeIdList api

---
 .../frontinterface/FrontInterfaceService.java |  5 +++++
 .../webase/node/mgr/node/NodeController.java  | 19 +++++++++++++++++++
 .../webase/node/mgr/node/NodeService.java     |  7 +++++++
 .../mgr/test/node/NodeControllerTest.java     | 11 +++++++++++
 4 files changed, 42 insertions(+)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
index fb03ad136..f3a5474bc 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
@@ -524,4 +524,9 @@ public List<KeyPair> getKeyStoreList(Integer groupId, String frontIp, Integer fr
         List<KeyPair> resList = JSON.parseArray(JSON.toJSONString(data), KeyPair.class);
         return resList;
     }
+
+    public List<String> getNodeIdList(int groupId) {
+        return frontRestTools.getForEntity(groupId, FrontRestTools.URI_NODEID_LIST, List.class);
+
+    }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/node/NodeController.java b/src/main/java/com/webank/webase/node/mgr/node/NodeController.java
index 32ab638cc..491740cb0 100644
--- a/src/main/java/com/webank/webase/node/mgr/node/NodeController.java
+++ b/src/main/java/com/webank/webase/node/mgr/node/NodeController.java
@@ -112,4 +112,23 @@ public BaseResponse getNodeInfo(@PathVariable("groupId") Integer groupId)
         return baseResponse;
     }
 
+    /**
+     * get node id list
+     */
+    @GetMapping("/nodeIdList/{groupId}")
+    public BaseResponse getNodeIdList(@PathVariable("groupId") Integer groupId) {
+        Instant startTime = Instant.now();
+        log.info("start getNodeIdList startTime:{} groupId:{}",
+                startTime.toEpochMilli(), groupId);
+        List<String> res = nodeService.getNodeIdListService(groupId);
+
+        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
+        baseResponse.setData(res);
+
+        log.info("end getNodeIdList useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(), JSON.toJSONString(baseResponse));
+        return baseResponse;
+    }
+
+
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
index d53a2d91e..9a05db384 100644
--- a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
+++ b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
@@ -315,4 +315,11 @@ public List<PeerInfo> getSealerAndObserverList(int groupId) {
         log.debug("end getSealerAndObserverList resList:{}", resList);
         return resList;
     }
+
+    public List<String> getNodeIdListService(int groupId) {
+        log.debug("start getSealerAndObserverList groupId:{}", groupId);
+        List<String> nodeIdList = frontInterface.getNodeIdList(groupId);
+        log.debug("end getSealerAndObserverList nodeIdList:{}", nodeIdList);
+        return nodeIdList;
+    }
 }
diff --git a/src/test/java/node/mgr/test/node/NodeControllerTest.java b/src/test/java/node/mgr/test/node/NodeControllerTest.java
index 9e673d70a..bb39b2593 100644
--- a/src/test/java/node/mgr/test/node/NodeControllerTest.java
+++ b/src/test/java/node/mgr/test/node/NodeControllerTest.java
@@ -64,4 +64,15 @@ public void testQueryNodeId() {
         System.out.println(tbNode);
         Assert.assertNull(tbNode);
     }
+
+    @Test
+    public void testGetNodeIdList() throws Exception {
+        ResultActions resultActions = mockMvc
+                .perform(MockMvcRequestBuilders.get("/node/nodeIdList/2"));
+        resultActions.
+//                andExpect(MockMvcResultMatchers.status().isOk()).
+                andDo(MockMvcResultHandlers.print());
+        System.out.println("======================response:"
+                +resultActions.andReturn().getResponse().getContentAsString());
+    }
 }

From 61a35c583778596afcf7597a50343c1edf3c2861 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 13 May 2020 19:03:05 +0800
Subject: [PATCH 041/131] fix groupPeers

---
 .../java/com/webank/webase/node/mgr/front/FrontService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index f56019312..39ec31468 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -127,7 +127,7 @@ public TbFront newFront(FrontInfo frontInfo) {
             Integer group = Integer.valueOf(groupId);
             //peer in group
             List<String> groupPeerList = frontInterface
-                .getNodeIDListFromSpecificFront(frontIp, frontPort, group);
+                .getGroupPeersFromSpecificFront(frontIp, frontPort, group);
             //get peers on chain
             PeerInfo[] peerArr = frontInterface
                 .getPeersFromSpecificFront(frontIp, frontPort, group);

From 514e9d27a84f3a3a376990e0451ac9f114459d64 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 14 May 2020 11:13:39 +0800
Subject: [PATCH 042/131] fix abi send tx contractId null

---
 .../webase/node/mgr/abi/AbiService.java       |  8 +++++
 .../node/mgr/contract/ContractService.java    | 19 +++++++++---
 .../entity/TransactionInputParam.java         |  3 +-
 .../webase/node/mgr/group/GroupService.java   | 29 ++++++++++++++++++-
 4 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/abi/AbiService.java b/src/main/java/com/webank/webase/node/mgr/abi/AbiService.java
index a9be1351f..730160207 100644
--- a/src/main/java/com/webank/webase/node/mgr/abi/AbiService.java
+++ b/src/main/java/com/webank/webase/node/mgr/abi/AbiService.java
@@ -135,6 +135,14 @@ private void checkAbiIdExist(Integer abiId) {
 		}
 	}
 
+	public AbiInfo getAbiByGroupIdAndAddress(Integer groupId, String contractAddress) {
+		AbiInfo abiInfo = abiMapper.queryByGroupIdAndAddress(groupId, contractAddress);
+		if (Objects.isNull(abiInfo)) {
+			throw new NodeMgrException(ConstantCode.ABI_INFO_NOT_EXISTS);
+		}
+		return abiInfo;
+	}
+
 	/**
 	 * check address is valid.
 	 * @return address's runtime bin
diff --git a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
index 00b39f69f..fa3df47a1 100644
--- a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
+++ b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
@@ -15,6 +15,7 @@
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.webank.webase.node.mgr.abi.AbiService;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
 import com.webank.webase.node.mgr.base.enums.ContractStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
@@ -63,7 +64,8 @@ public class  ContractService {
     @Autowired
     private UserService userService;
     private static final int CONTRACT_ADDRESS_LENGTH = 42;
-
+    @Autowired
+    private AbiService abiService;
     /**
      * add new contract data.
      */
@@ -269,15 +271,24 @@ public Object sendTransaction(TransactionInputParam param) throws NodeMgrExcepti
             throw new NodeMgrException(ConstantCode.INVALID_PARAM_INFO);
         }
 
-        //check contractId
-        TbContract contract = verifyContractIdExist(param.getContractId(), param.getGroupId());
+        // check contractId
+        String contractAbiStr = "";
+        if (param.getContractId() != null) {
+            // get abi by contract
+            TbContract contract = verifyContractIdExist(param.getContractId(), param.getGroupId());
+            contractAbiStr = contract.getContractAbi();
+        } else {
+            // send tx by abi, no need to check abi exist in db
+            contractAbiStr = JSON.toJSONString(param.getContractAbi());
+        }
+
         //send abi to front
         sendAbi(param.getGroupId(), param.getContractId(), param.getContractAddress());
         //check contract deploy
         verifyContractDeploy(param.getContractId(), param.getGroupId());
 
         // if constant, signUserId is useless
-        AbiDefinition funcAbi = Web3Tools.getAbiDefinition(param.getFuncName(), contract.getContractAbi());
+        AbiDefinition funcAbi = Web3Tools.getAbiDefinition(param.getFuncName(), contractAbiStr);
         String signUserId = "empty";
         if (!funcAbi.isConstant()) {
             signUserId = userService.getSignUserIdByAddress(param.getGroupId(), param.getUser());
diff --git a/src/main/java/com/webank/webase/node/mgr/contract/entity/TransactionInputParam.java b/src/main/java/com/webank/webase/node/mgr/contract/entity/TransactionInputParam.java
index 1cccd264c..0da1f1678 100644
--- a/src/main/java/com/webank/webase/node/mgr/contract/entity/TransactionInputParam.java
+++ b/src/main/java/com/webank/webase/node/mgr/contract/entity/TransactionInputParam.java
@@ -24,13 +24,14 @@
 
 /**
  * param of send transaction from web
+ * support send by contract api and abi api
  */
 @Data
 @NoArgsConstructor
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class TransactionInputParam extends TransactionParam {
-    @NotNull
+
     private Integer contractId;
     /**
      * user address, identify signUserId
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 6f4e35f7d..ab61e2b8d 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -237,7 +237,8 @@ public void resetGroupList() {
                 Duration.between(startTime, Instant.now()).toMillis());
     }
 
-    /**
+
+	/**
      * save new peers that not in group peers
      */
     private void savePeerList(String frontIp, Integer frontPort, int groupId, List<String> groupPeerList) {
@@ -346,6 +347,32 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
         }
     }
 
+	/**
+	 * check group's genesis block the same from each front
+	 */
+//	private void checkGroupGenesisSame() {
+//		//get all front
+//		List<TbFront> frontList = frontService.getFrontList(new FrontParam());
+//		if (frontList == null || frontList.size() == 0) {
+//			log.info("not fount any front, start remove all group");
+//			//remove all group   TODO
+//			// removeAllGroup();
+//			return;
+//		}
+//		List<TbGroup> allGroupList = getGroupList(null);
+//		if (allGroupList.isEmpty()) {
+//			return;
+//		}
+//
+//		for (TbGroup tbGroup : allGroupList) {
+//			int groupId = tbGroup.getGroupId();
+//			for (TbFront front : frontList) {
+//				String frontIp = front.getFrontIp();
+//				int frontPort = front.getFrontPort();
+//
+//			}
+//		}
+//	}
 
     /**
      * remove all data by groupId.

From 00ffdb078d16db46bb009d71edb068ae4ebae274 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 14 May 2020 11:26:53 +0800
Subject: [PATCH 043/131] fix abi send tx nullpointer

---
 .../node/mgr/contract/ContractService.java       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
index fa3df47a1..07e621bd8 100644
--- a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
+++ b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
@@ -16,6 +16,7 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.webank.webase.node.mgr.abi.AbiService;
+import com.webank.webase.node.mgr.abi.entity.AbiInfo;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
 import com.webank.webase.node.mgr.base.enums.ContractStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
@@ -277,16 +278,17 @@ public Object sendTransaction(TransactionInputParam param) throws NodeMgrExcepti
             // get abi by contract
             TbContract contract = verifyContractIdExist(param.getContractId(), param.getGroupId());
             contractAbiStr = contract.getContractAbi();
+            //send abi to front
+            sendAbi(param.getGroupId(), param.getContractId(), param.getContractAddress());
+            //check contract deploy
+            verifyContractDeploy(param.getContractId(), param.getGroupId());
         } else {
-            // send tx by abi, no need to check abi exist in db
-            contractAbiStr = JSON.toJSONString(param.getContractAbi());
+            // send tx by abi
+            // get from db and it's deployed
+            AbiInfo abiInfo = abiService.getAbiByGroupIdAndAddress(param.getGroupId(), param.getContractAddress());
+            contractAbiStr = abiInfo.getContractAbi();
         }
 
-        //send abi to front
-        sendAbi(param.getGroupId(), param.getContractId(), param.getContractAddress());
-        //check contract deploy
-        verifyContractDeploy(param.getContractId(), param.getGroupId());
-
         // if constant, signUserId is useless
         AbiDefinition funcAbi = Web3Tools.getAbiDefinition(param.getFuncName(), contractAbiStr);
         String signUserId = "empty";

From 257ee145f05b00d904138c4c305cf7cf667f6a93 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 14 May 2020 17:04:20 +0800
Subject: [PATCH 044/131] add check genesis block

---
 .../node/mgr/base/enums/GroupStatus.java      | 47 ++++++++++
 .../frontinterface/FrontInterfaceService.java |  9 ++
 .../webase/node/mgr/group/GroupService.java   | 88 +++++++++++--------
 3 files changed, 107 insertions(+), 37 deletions(-)
 create mode 100644 src/main/java/com/webank/webase/node/mgr/base/enums/GroupStatus.java

diff --git a/src/main/java/com/webank/webase/node/mgr/base/enums/GroupStatus.java b/src/main/java/com/webank/webase/node/mgr/base/enums/GroupStatus.java
new file mode 100644
index 000000000..0c43da2ee
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/base/enums/GroupStatus.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.base.enums;
+
+/**
+ * group status in tb_group
+ */
+public enum GroupStatus {
+		/**
+		 * running
+		 */
+		NORMAL(1),
+		/**
+		 * stopped or removed
+		 */
+		MAINTAINING(2),
+		/**
+		 * invalid for group data conflicts etc.
+		 */
+		CONFLICT(3);
+
+		private int value;
+
+	GroupStatus(Integer groupType) {
+			this.value = groupType;
+		}
+
+	public int getValue() {
+		return this.value;
+	}
+
+}
+
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
index f3a5474bc..2f5c9f7fe 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
@@ -171,6 +171,15 @@ public SyncStatus getSyncStatusFromSpecificFront(String frontIp, Integer frontPo
                 SyncStatus.class);
     }
 
+    public BlockInfo getBlockByNumberFromSpecificFront(String frontIp, Integer frontPort,
+													   Integer groupId, BigInteger blockNumber) {
+		log.debug("start getBlockByNumberFromSpecificFront frontIp:{},frontPort{}," +
+				" groupId:{} blockNumber:{}", frontIp, frontPort, groupId, blockNumber);
+		String uri = String.format(FrontRestTools.URI_BLOCK_BY_NUMBER, blockNumber);
+		BlockInfo blockInfo = getFromSpecificFront(groupId, frontIp, frontPort, uri, BlockInfo.class);
+		return blockInfo;
+	}
+
     /**
      * get peers.
      */
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index ab61e2b8d..2c569663c 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -15,10 +15,11 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
-import com.webank.webase.node.mgr.base.enums.DataStatus;
+import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
+import com.webank.webase.node.mgr.block.entity.BlockInfo;
 import com.webank.webase.node.mgr.contract.ContractService;
 import com.webank.webase.node.mgr.front.FrontService;
 import com.webank.webase.node.mgr.front.entity.FrontParam;
@@ -187,9 +188,6 @@ public void resetGroupList() {
         //get all front
         List<TbFront> frontList = frontService.getFrontList(new FrontParam());
         if (frontList == null || frontList.size() == 0) {
-            log.info("not fount any front, start remove all group");
-            //remove all group   TODO
-            // removeAllGroup();
             return;
         }
         //get group from chain
@@ -214,7 +212,7 @@ public void resetGroupList() {
                 if (Objects.isNull(checkGroup) || groupPeerList.size() != checkGroup.getNodeCount()) {
                     // save group
                     saveGroup(gId, groupPeerList.size(), "synchronous",
-                            GroupType.SYNC.getValue(), DataStatus.NORMAL.getValue());
+                            GroupType.SYNC.getValue(), GroupStatus.NORMAL.getValue());
                 }
                 frontGroupMapService.newFrontGroup(front.getFrontId(), gId);
                 //save new peers
@@ -226,8 +224,10 @@ public void resetGroupList() {
             }
         }
 
-        // check group status
+        // check group status(normal or maintaining)
         checkAndUpdateGroupStatus(allGroupSet);
+        // check group's genesis block same(check dirty data of different chain)
+        checkGroupGenesisSame();
         // remove front_group_map that not in tb_front or tb_group
         frontGroupMapService.removeInvalidFrontGroupMap();
         //clear cache
@@ -324,18 +324,18 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
             count = allGroupOnChain.stream().filter(id -> id == localGroupId).count();
             try {
                 // found groupId in groupOnChain, local status is invalid, set as normal
-                if (count > 0 && localGroup.getGroupStatus() == DataStatus.INVALID.getValue()) {
+                if (count > 0 && localGroup.getGroupStatus() == GroupStatus.MAINTAINING.getValue()) {
                     log.info("group is normal, localGroupId:{}", localGroupId);
                     //update NORMAL
-                    updateGroupStatus(localGroupId, DataStatus.NORMAL.getValue());
+                    updateGroupStatus(localGroupId, GroupStatus.NORMAL.getValue());
                     continue;
                 }
-                // if not found in groupOnChain and local status is normal, set as invalid
 
-                if (count == 0 && DataStatus.NORMAL.getValue() == localGroup.getGroupStatus()) {
+                // if not found in groupOnChain and local status is normal, set as invalid
+                if (count == 0 && GroupStatus.NORMAL.getValue() == localGroup.getGroupStatus()) {
                     // update invalid
 					log.warn("group is invalid, localGroupId:{}", localGroupId);
-					updateGroupStatus(localGroupId, DataStatus.INVALID.getValue());
+					updateGroupStatus(localGroupId, GroupStatus.MAINTAINING.getValue());
                     continue;
                 }
 
@@ -348,31 +348,45 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
     }
 
 	/**
-	 * check group's genesis block the same from each front
+	 * check group's genesis block the same with each other
 	 */
-//	private void checkGroupGenesisSame() {
-//		//get all front
-//		List<TbFront> frontList = frontService.getFrontList(new FrontParam());
-//		if (frontList == null || frontList.size() == 0) {
-//			log.info("not fount any front, start remove all group");
-//			//remove all group   TODO
-//			// removeAllGroup();
-//			return;
-//		}
-//		List<TbGroup> allGroupList = getGroupList(null);
-//		if (allGroupList.isEmpty()) {
-//			return;
-//		}
-//
-//		for (TbGroup tbGroup : allGroupList) {
-//			int groupId = tbGroup.getGroupId();
-//			for (TbFront front : frontList) {
-//				String frontIp = front.getFrontIp();
-//				int frontPort = front.getFrontPort();
-//
-//			}
-//		}
-//	}
+	private void checkGroupGenesisSame() {
+	    log.info("start checkGroupGenesisSame.");
+		//get all front
+		List<TbFront> frontList = frontService.getFrontList(new FrontParam());
+		if (frontList == null || frontList.size() == 0) {
+            log.warn("checkGroupGenesisSame not found any front.");
+            return;
+		}
+		List<TbGroup> allGroupList = getGroupList(null);
+		if (allGroupList.isEmpty()) {
+            log.warn("checkGroupGenesisSame not found any group of front.");
+            return;
+		}
+
+		for (TbGroup tbGroup : allGroupList) {
+			int groupId = tbGroup.getGroupId();
+            String lastBlockHash = "";
+            for (TbFront front : frontList) {
+				String frontIp = front.getFrontIp();
+				int frontPort = front.getFrontPort();
+				// check genesis block
+                BlockInfo genesisBlock = frontInterface.getBlockByNumberFromSpecificFront(frontIp,
+                        frontPort, groupId, BigInteger.ZERO);
+
+                if (!"".equals(lastBlockHash) && !lastBlockHash.equals(genesisBlock.getHash())) {
+                    log.warn("checkGroupGenesisSame genesis block hash conflicts with other group," +
+                            " groupId:{}, frontId:{}", groupId, front.getFrontId());
+                    updateGroupStatus(groupId, GroupStatus.CONFLICT.getValue());
+                }
+                lastBlockHash = genesisBlock.getHash();
+                log.debug("checkGroupGenesisSame, groupId:{}, frontId:{}, genesis blockHash:{}",
+                        groupId, front.getFrontId(), lastBlockHash);
+			}
+		}
+	}
+
+
 
     /**
      * remove all data by groupId.
@@ -422,7 +436,7 @@ public TbGroup generateToSingleNode(String nodeId, ReqGenerateGroup req) {
                 generateGroupInfo);
         // save group, saved as invalid status until start
         TbGroup tbGroup = saveGroup(generateGroupId, req.getNodeList().size(),
-                req.getDescription(), GroupType.MANUAL.getValue(), DataStatus.INVALID.getValue(),
+                req.getDescription(), GroupType.MANUAL.getValue(), GroupStatus.MAINTAINING.getValue(),
                 req.getTimestamp(), req.getNodeList());
         return tbGroup;
     }
@@ -454,7 +468,7 @@ public TbGroup generateGroup(ReqGenerateGroup req) {
         }
         // save group, saved as invalid status until start
         TbGroup tbGroup = saveGroup(generateGroupId, req.getNodeList().size(),
-                req.getDescription(), GroupType.MANUAL.getValue(), DataStatus.INVALID.getValue(),
+                req.getDescription(), GroupType.MANUAL.getValue(), GroupStatus.MAINTAINING.getValue(),
                 req.getTimestamp(), req.getNodeList());
         return tbGroup;
     }

From c3d6dd6ae2b94e3f2cd3e28986fbfa62d6d8c80e Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 14 May 2020 17:23:05 +0800
Subject: [PATCH 045/131] fix invalid group when check

---
 .../webase/node/mgr/group/GroupService.java   | 11 ++++--
 .../node/mgr/test/group/GroupServiceTest.java | 38 +++++++++++++++++++
 .../mgr/test/node/NodeControllerTest.java     |  2 +-
 3 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/node/mgr/test/group/GroupServiceTest.java

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 2c569663c..cc3ed622d 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -358,14 +358,15 @@ private void checkGroupGenesisSame() {
             log.warn("checkGroupGenesisSame not found any front.");
             return;
 		}
-		List<TbGroup> allGroupList = getGroupList(null);
-		if (allGroupList.isEmpty()) {
+		List<TbGroup> allNormalGroupList = getGroupList(GroupStatus.NORMAL.getValue());
+		if (allNormalGroupList.isEmpty()) {
             log.warn("checkGroupGenesisSame not found any group of front.");
             return;
 		}
 
-		for (TbGroup tbGroup : allGroupList) {
+		for (TbGroup tbGroup : allNormalGroupList) {
 			int groupId = tbGroup.getGroupId();
+            log.error("checkGroupGenesisSame groupId:{}",groupId);
             String lastBlockHash = "";
             for (TbFront front : frontList) {
 				String frontIp = front.getFrontIp();
@@ -373,7 +374,9 @@ private void checkGroupGenesisSame() {
 				// check genesis block
                 BlockInfo genesisBlock = frontInterface.getBlockByNumberFromSpecificFront(frontIp,
                         frontPort, groupId, BigInteger.ZERO);
-
+                if (genesisBlock == null) {
+                    continue;
+                }
                 if (!"".equals(lastBlockHash) && !lastBlockHash.equals(genesisBlock.getHash())) {
                     log.warn("checkGroupGenesisSame genesis block hash conflicts with other group," +
                             " groupId:{}, frontId:{}", groupId, front.getFrontId());
diff --git a/src/test/java/node/mgr/test/group/GroupServiceTest.java b/src/test/java/node/mgr/test/group/GroupServiceTest.java
new file mode 100644
index 000000000..1377789fc
--- /dev/null
+++ b/src/test/java/node/mgr/test/group/GroupServiceTest.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package node.mgr.test.group;
+
+import com.webank.webase.node.mgr.Application;
+import com.webank.webase.node.mgr.group.GroupService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class GroupServiceTest {
+
+	@Autowired
+	private GroupService groupService;
+
+	@Test
+	public void testCheckGroupGenesisSame() {
+		groupService.resetGroupList();
+	}
+}
diff --git a/src/test/java/node/mgr/test/node/NodeControllerTest.java b/src/test/java/node/mgr/test/node/NodeControllerTest.java
index bb39b2593..1e8b25f38 100644
--- a/src/test/java/node/mgr/test/node/NodeControllerTest.java
+++ b/src/test/java/node/mgr/test/node/NodeControllerTest.java
@@ -70,7 +70,7 @@ public void testGetNodeIdList() throws Exception {
         ResultActions resultActions = mockMvc
                 .perform(MockMvcRequestBuilders.get("/node/nodeIdList/2"));
         resultActions.
-//                andExpect(MockMvcResultMatchers.status().isOk()).
+                andExpect(MockMvcResultMatchers.status().isOk()).
                 andDo(MockMvcResultHandlers.print());
         System.out.println("======================response:"
                 +resultActions.andReturn().getResponse().getContentAsString());

From 393ab616b63f87a251f9ee396c1d50a25b905e5b Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 15 May 2020 15:20:57 +0800
Subject: [PATCH 046/131] add check dirty group data

---
 .../node/mgr/base/enums/GroupStatus.java      |  8 +-
 .../node/mgr/base/tools/NodeMgrTools.java     | 25 +++++-
 .../webase/node/mgr/block/BlockMapper.java    |  8 ++
 .../webase/node/mgr/block/BlockService.java   | 32 +++++++
 .../webase/node/mgr/group/GroupService.java   | 84 ++++++++++++++++---
 src/main/resources/mapper/BlockMapper.xml     | 11 +++
 6 files changed, 149 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/enums/GroupStatus.java b/src/main/java/com/webank/webase/node/mgr/base/enums/GroupStatus.java
index 0c43da2ee..b5ae4aeb8 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/enums/GroupStatus.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/enums/GroupStatus.java
@@ -29,9 +29,13 @@ public enum GroupStatus {
 		 */
 		MAINTAINING(2),
 		/**
-		 * invalid for group data conflicts etc.
+		 * invalid for different front's group data conflicts with each other, need to remove invalid front
 		 */
-		CONFLICT(3);
+		CONFLICT_GROUP_GENESIS(3),
+		/**
+		 * invalid for db's group data conflicts with chain, need to delete data
+		 */
+		CONFLICT_LOCAL_DATA(4);
 
 		private int value;
 
diff --git a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
index 4ab83a8c0..f9f0347ec 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
@@ -26,10 +26,13 @@
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.security.MessageDigest;
+import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoField;
 import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -89,14 +92,28 @@ public static LocalDateTime hex2LocalDateTime(String hexStr) {
     /**
      * convert timestamp to localDateTime.
      */
-    public static LocalDateTime timestamp2LocalDateTime(Long inputTime) {
-        if (inputTime == null) {
-            log.warn("timestamp2LocalDateTime fail. inputTime is null");
+    public static LocalDateTime timestamp2LocalDateTime(Long inputTimeStamp) {
+        if (inputTimeStamp == null) {
+            log.warn("timestamp2LocalDateTime fail. inputTimeStamp is null");
             return null;
         }
-        Instant instant = Instant.ofEpochMilli(inputTime);
+        Instant instant = Instant.ofEpochMilli(inputTimeStamp);
         ZoneId zone = ZoneId.systemDefault();
         return LocalDateTime.ofInstant(instant, zone);
+//        Timestamp time = new Timestamp(inputTimeStamp);
+//        return time.toLocalDateTime();
+    }
+    /**
+     * LocalDateTime to timestamp
+     */
+    public static Long localDateTime2Timestamp(LocalDateTime inputDateTime) {
+        if (inputDateTime == null) {
+            log.warn("localDateTime2Timestamp fail. inputDateTime is null");
+            return null;
+        }
+//        Timestamp time = Timestamp.valueOf(inputDateTime);
+//        return time.getTime();
+        return inputDateTime.toInstant(ZoneOffset.of("+8")).toEpochMilli();
     }
 
     /**
diff --git a/src/main/java/com/webank/webase/node/mgr/block/BlockMapper.java b/src/main/java/com/webank/webase/node/mgr/block/BlockMapper.java
index 871d79446..008015939 100644
--- a/src/main/java/com/webank/webase/node/mgr/block/BlockMapper.java
+++ b/src/main/java/com/webank/webase/node/mgr/block/BlockMapper.java
@@ -31,6 +31,11 @@ public interface BlockMapper {
      */
     BigInteger getLatestBlockNumber(@Param("tableName") String tableName);
 
+    /**
+     * query smallest block number
+     */
+    BigInteger getSmallestBlockNumber(@Param("tableName") String tableName);
+
     /**
      * Add new block data.
      */
@@ -62,4 +67,7 @@ Integer getCount(@Param("tableName") String tableName, @Param("pkHash") String p
      */
     Integer remove(@Param("tableName") String tableName,
         @Param("blockRetainMax") BigInteger blockRetainMax);
+
+    TbBlock getBlockByBlockNumber(@Param("tableName") String tableName,
+                                  @Param("blockNumber") BigInteger blockNumber);
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/block/BlockService.java b/src/main/java/com/webank/webase/node/mgr/block/BlockService.java
index 17885225a..0f8bbaec0 100644
--- a/src/main/java/com/webank/webase/node/mgr/block/BlockService.java
+++ b/src/main/java/com/webank/webase/node/mgr/block/BlockService.java
@@ -307,4 +307,36 @@ public BlockInfo getBlockFromFrontByNumber(int groupId, BigInteger blockNumber)
     public BlockInfo getblockFromFrontByHash(int groupId, String pkHash) {
         return frontInterface.getblockByHash(groupId, pkHash);
     }
+
+    /**
+     * get smallest block height in local db
+	 *
+     */
+    public TbBlock getSmallestBlockInfo(int groupId) {
+        BigInteger smallestHeight = getSmallestBlockHeight(groupId);
+        if (smallestHeight == null) {
+        	log.debug("getSmallestBlockInfo groupId:{} has no block local", groupId);
+        	return null;
+		}
+        return getBlockByBlockNumber(groupId, smallestHeight);
+    }
+
+    /**
+     * get block of smallest height in local db
+     * @param groupId
+     */
+    public BigInteger getSmallestBlockHeight(int groupId) {
+        return blockmapper.getSmallestBlockNumber(TableName.BLOCK.getTableName(groupId));
+    }
+
+    /**
+     * get local tbBlock by blockNumber
+     * @param groupId
+     * @param blockNumber
+     * @return TbBlock
+     */
+    public TbBlock getBlockByBlockNumber(int groupId, BigInteger blockNumber) {
+        return blockmapper.getBlockByBlockNumber(TableName.BLOCK.getTableName(groupId),
+                blockNumber);
+    }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index cc3ed622d..270e2ec03 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -19,7 +19,10 @@
 import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
+import com.webank.webase.node.mgr.base.tools.NodeMgrTools;
+import com.webank.webase.node.mgr.block.BlockService;
 import com.webank.webase.node.mgr.block.entity.BlockInfo;
+import com.webank.webase.node.mgr.block.entity.TbBlock;
 import com.webank.webase.node.mgr.contract.ContractService;
 import com.webank.webase.node.mgr.front.FrontService;
 import com.webank.webase.node.mgr.front.entity.FrontParam;
@@ -46,6 +49,7 @@
 import java.math.BigInteger;
 import java.time.Duration;
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.util.*;
 
 /**
@@ -77,7 +81,8 @@ public class GroupService {
     private TransDailyService transDailyService;
     @Autowired
     private ConstantProperties constants;
-
+    @Autowired
+    private BlockService blockService;
 
     /**
      * query count of group.
@@ -226,8 +231,10 @@ public void resetGroupList() {
 
         // check group status(normal or maintaining)
         checkAndUpdateGroupStatus(allGroupSet);
-        // check group's genesis block same(check dirty data of different chain)
-        checkGroupGenesisSame();
+        // check group's genesis block same with each other
+        checkGroupGenesisSameWithEach();
+        // check group if has dirty data
+        checkSameChainDataWithLocal();
         // remove front_group_map that not in tb_front or tb_group
         frontGroupMapService.removeInvalidFrontGroupMap();
         //clear cache
@@ -348,25 +355,24 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
     }
 
 	/**
-	 * check group's genesis block the same with each other
+	 * check group's genesis block the same with each other on chain
 	 */
-	private void checkGroupGenesisSame() {
-	    log.info("start checkGroupGenesisSame.");
-		//get all front
+	private void checkGroupGenesisSameWithEach() {
+	    log.info("start checkGroupGenesisSameWithEach.");
+		// get all front
 		List<TbFront> frontList = frontService.getFrontList(new FrontParam());
 		if (frontList == null || frontList.size() == 0) {
-            log.warn("checkGroupGenesisSame not found any front.");
+            log.warn("checkGroupGenesisSameWithEach not found any front.");
             return;
 		}
 		List<TbGroup> allNormalGroupList = getGroupList(GroupStatus.NORMAL.getValue());
 		if (allNormalGroupList.isEmpty()) {
-            log.warn("checkGroupGenesisSame not found any group of front.");
+            log.warn("checkGroupGenesisSameWithEach not found any group of front.");
             return;
 		}
 
 		for (TbGroup tbGroup : allNormalGroupList) {
 			int groupId = tbGroup.getGroupId();
-            log.error("checkGroupGenesisSame groupId:{}",groupId);
             String lastBlockHash = "";
             for (TbFront front : frontList) {
 				String frontIp = front.getFrontIp();
@@ -378,17 +384,69 @@ private void checkGroupGenesisSame() {
                     continue;
                 }
                 if (!"".equals(lastBlockHash) && !lastBlockHash.equals(genesisBlock.getHash())) {
-                    log.warn("checkGroupGenesisSame genesis block hash conflicts with other group," +
+                    log.warn("checkGroupGenesisSameWithEach genesis block hash conflicts with other group," +
                             " groupId:{}, frontId:{}", groupId, front.getFrontId());
-                    updateGroupStatus(groupId, GroupStatus.CONFLICT.getValue());
+                    updateGroupStatus(groupId, GroupStatus.CONFLICT_GROUP_GENESIS.getValue());
                 }
                 lastBlockHash = genesisBlock.getHash();
-                log.debug("checkGroupGenesisSame, groupId:{}, frontId:{}, genesis blockHash:{}",
+                log.debug("checkGroupGenesisSameWithEach, groupId:{}, frontId:{}, genesis blockHash:{}",
                         groupId, front.getFrontId(), lastBlockHash);
 			}
 		}
 	}
 
+    /**
+     * check local block's hash same with blockHash on chain
+     * group status abnormal cases:
+     * @case1 rebuild chain(different genesis),
+     * @case2 drop group data and restart chain(same genesis), when local smallest block height greater than 0, mark as CONFLICT
+     */
+    private void checkSameChainDataWithLocal() {
+        log.info("start checkSameChainData.");
+        // get all group
+        List<TbGroup> allNormalGroupList = getGroupList(GroupStatus.NORMAL.getValue());
+        if (allNormalGroupList.isEmpty()) {
+            log.warn("checkSameChainData not found any group of front.");
+            return;
+        }
+
+        for (TbGroup tbGroup : allNormalGroupList) {
+            int groupId = tbGroup.getGroupId();
+            // find smallest block from db of group
+            TbBlock smallestBlockLocal = blockService.getSmallestBlockInfo(groupId);
+            // if no block in local db
+            if (smallestBlockLocal == null) {
+                continue;
+            }
+            BigInteger blockHeightLocal = smallestBlockLocal.getBlockNumber();
+            Long blockTimestampLocal = NodeMgrTools.localDateTime2Timestamp(smallestBlockLocal.getBlockTimestamp());
+
+            // get same height block from chain, contrast block hash
+            BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumber(groupId, blockHeightLocal);
+            // if no block in each node, not same chain
+            if (smallestBlockOnChain == null) {
+                log.warn("checkSameChainDataWithLocal block of {} on chain not exists, " +
+                        "conflict with local block of same height", blockHeightLocal);
+                updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
+                continue;
+            }
+            Long blockTimestampOnChain = Long.valueOf(smallestBlockOnChain.getTimestamp());
+            // drop nano second
+            blockTimestampOnChain = Math.round(blockTimestampOnChain / 1000.00)  * 1000;
+            log.debug("checkSameChainData groupId:{},blockHeight:{},localTime:{},chainTime:{} ",
+                    groupId, blockHeightLocal, blockTimestampLocal, blockTimestampOnChain);
+            // check same timestamp, the same chain
+            if (blockTimestampLocal.compareTo(blockTimestampOnChain) != 0) {
+                log.warn("checkSameChainDataWithLocal block of {} on chain conflicts with local block data",
+                        blockHeightLocal);
+                updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
+                continue;
+            } else {
+                updateGroupStatus(groupId, GroupStatus.NORMAL.getValue());
+            }
+        }
+
+    }
 
 
     /**
diff --git a/src/main/resources/mapper/BlockMapper.xml b/src/main/resources/mapper/BlockMapper.xml
index d2faf828f..f51c679fc 100644
--- a/src/main/resources/mapper/BlockMapper.xml
+++ b/src/main/resources/mapper/BlockMapper.xml
@@ -25,6 +25,10 @@
 		select max(block_number) from ${tableName}
 	</select>
 
+  <select id="getSmallestBlockNumber" resultType="java.math.BigInteger">
+    select min(block_number) from ${tableName}
+  </select>
+
   <insert id="add">
     insert ignore into ${tableName}
     (pk_hash,block_number,block_timestamp,trans_count,sealer_index,create_time,modify_time)
@@ -79,4 +83,11 @@
     DELETE tb from ${tableName} as tb,(SELECT max(block_number) maxBlock FROM ${tableName}) AS tmp
     where tb.block_number &lt;= tmp.maxBlock - ${blockRetainMax}
   </delete>
+
+  <select id="getBlockByBlockNumber" resultMap="blockMap">
+    select * from ${tableName}
+    where block_number = #{blockNumber}
+    limit 1
+  </select>
+
 </mapper>
\ No newline at end of file

From 69b07ffe12f9946c91fe51fbc30ca705ba019659 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 15 May 2020 15:21:18 +0800
Subject: [PATCH 047/131] add get block by number test

---
 .../java/node/mgr/test/frontInterface/FrontServiceTest.java   | 4 ++--
 src/test/java/node/mgr/test/group/GroupServiceTest.java       | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/java/node/mgr/test/frontInterface/FrontServiceTest.java b/src/test/java/node/mgr/test/frontInterface/FrontServiceTest.java
index 1c24ed197..be3a9b5eb 100644
--- a/src/test/java/node/mgr/test/frontInterface/FrontServiceTest.java
+++ b/src/test/java/node/mgr/test/frontInterface/FrontServiceTest.java
@@ -72,8 +72,8 @@ public void getTransactionTest() {
 
     @Test
     public void getBlockByNumberTest() {
-        BlockInfo blockInfo = frontInterface.getBlockByNumber(groupId, blockNumber);
-        assert (blockInfo != null);
+        BlockInfo blockInfo = frontInterface.getBlockByNumber(groupId, new BigInteger("1000"));
+//        assert (blockInfo != null);
         System.out.println(JSON.toJSONString(blockInfo));
     }
 
diff --git a/src/test/java/node/mgr/test/group/GroupServiceTest.java b/src/test/java/node/mgr/test/group/GroupServiceTest.java
index 1377789fc..fd762176e 100644
--- a/src/test/java/node/mgr/test/group/GroupServiceTest.java
+++ b/src/test/java/node/mgr/test/group/GroupServiceTest.java
@@ -17,6 +17,7 @@
 package node.mgr.test.group;
 
 import com.webank.webase.node.mgr.Application;
+import com.webank.webase.node.mgr.base.tools.NodeMgrTools;
 import com.webank.webase.node.mgr.group.GroupService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,6 +25,9 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 public class GroupServiceTest {

From dc707d6eb18a55356287bcef16a21fc1c18b94ca Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 15 May 2020 15:29:13 +0800
Subject: [PATCH 048/131] fix page in group controller

---
 .../java/com/webank/webase/node/mgr/group/GroupController.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index f6442553b..95f11db1c 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -129,7 +129,6 @@ public BasePageResponse getAllGroupIncludeInvalidGroup(@PathVariable("pageNumber
             List2Page list2Page = new List2Page(groupList, pageSize, pageNumber);
             pagesponse.setData(list2Page.getPagedList());
             pagesponse.setTotalCount(count);
-            pagesponse.setData(groupList);
         }
 
         // reset group

From 177ba4234d289e97f59e7da93bcf419d42cc670d Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 15 May 2020 15:50:53 +0800
Subject: [PATCH 049/131] add group list by status api

---
 .../node/mgr/group/GroupController.java       | 38 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 95f11db1c..8f74f94c2 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -19,6 +19,7 @@
 import com.webank.webase.node.mgr.base.entity.BasePageResponse;
 import com.webank.webase.node.mgr.base.entity.BaseResponse;
 import com.webank.webase.node.mgr.base.enums.DataStatus;
+import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
 import com.webank.webase.node.mgr.base.tools.pagetools.List2Page;
@@ -99,9 +100,9 @@ public BasePageResponse getAllGroup() throws NodeMgrException {
         log.info("start getAllGroup startTime:{}", startTime.toEpochMilli());
 
         // get group list
-        int count = groupService.countOfGroup(null, DataStatus.NORMAL.getValue());
+        int count = groupService.countOfGroup(null, GroupStatus.NORMAL.getValue());
         if (count > 0) {
-            List<TbGroup> groupList = groupService.getGroupList(DataStatus.NORMAL.getValue());
+            List<TbGroup> groupList = groupService.getGroupList(GroupStatus.NORMAL.getValue());
             pagesponse.setTotalCount(count);
             pagesponse.setData(groupList);
         }
@@ -115,6 +116,13 @@ public BasePageResponse getAllGroup() throws NodeMgrException {
         return pagesponse;
     }
 
+    /**
+     * get all group include invalid group status
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     * @throws NodeMgrException
+     */
     @GetMapping("/all/invalidIncluded/{pageNumber}/{pageSize}")
     public BasePageResponse getAllGroupIncludeInvalidGroup(@PathVariable("pageNumber") Integer pageNumber,
                                                            @PathVariable("pageSize") Integer pageSize) throws NodeMgrException {
@@ -140,6 +148,32 @@ public BasePageResponse getAllGroupIncludeInvalidGroup(@PathVariable("pageNumber
         return pagesponse;
     }
 
+    @GetMapping("/all/{groupStatus}")
+    public BaseResponse getAllGroupOfStatus(@PathVariable("groupStatus") Integer groupStatus) throws NodeMgrException {
+        if (groupStatus > GroupStatus.CONFLICT_LOCAL_DATA.getValue()
+                || groupStatus < GroupStatus.NORMAL.getValue()) {
+            return new BaseResponse(ConstantCode.INVALID_PARAM_INFO);
+        }
+        BaseResponse response = new BaseResponse(ConstantCode.SUCCESS);
+        Instant startTime = Instant.now();
+        log.info("start getAllGroupOfStatus startTime:{}", startTime.toEpochMilli());
+
+        // get group list
+        int count = groupService.countOfGroup(null, groupStatus);
+        if (count > 0) {
+            List<TbGroup> groupList = groupService.getGroupList(groupStatus);
+            response.setData(groupList);
+        }
+
+        // reset group
+        resetGroupListTask.asyncResetGroupList();
+
+        log.info("end getAllGroupOfStatus useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(),
+                JSON.toJSONString(response));
+        return response;
+    }
+
     /**
      * get trans daily.
      */

From 8bb749b054bb45176bde9ec9cf1f0de14867a97a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 15 May 2020 18:59:31 +0800
Subject: [PATCH 050/131] add group test

---
 .../java/node/mgr/test/group/GroupControllerTest.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/test/java/node/mgr/test/group/GroupControllerTest.java b/src/test/java/node/mgr/test/group/GroupControllerTest.java
index c818d82d3..f9e6aef7c 100644
--- a/src/test/java/node/mgr/test/group/GroupControllerTest.java
+++ b/src/test/java/node/mgr/test/group/GroupControllerTest.java
@@ -87,6 +87,17 @@ public void testGetAllInvalidIncluded() throws Exception {
         System.out.println("=================================response:"+resultActions.andReturn().getResponse().getContentAsString());
     }
 
+    @Test
+    public void testGetAllInvalid() throws Exception {
+
+        ResultActions resultActions = mockMvc.perform(MockMvcRequestBuilders.get("/group/all/4"));
+        resultActions.
+                andExpect(MockMvcResultMatchers.status().isOk()).
+                andDo(MockMvcResultHandlers.print());
+        System.out.println("=================================response:"+resultActions.andReturn().getResponse().getContentAsString());
+    }
+
+
     /**
      * dynamic group manage
      */

From 3ba78268e6d7a0beeee109c42eb82058b868938d Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 18 May 2020 16:12:47 +0800
Subject: [PATCH 051/131] fix timestamp floor

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 270e2ec03..701f7747d 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -425,14 +425,15 @@ private void checkSameChainDataWithLocal() {
             BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumber(groupId, blockHeightLocal);
             // if no block in each node, not same chain
             if (smallestBlockOnChain == null) {
-                log.warn("checkSameChainDataWithLocal block of {} on chain not exists, " +
+                log.warn("checkSameChainDataWithLocal block of height: {} on chain not exists, " +
                         "conflict with local block of same height", blockHeightLocal);
                 updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
                 continue;
             }
             Long blockTimestampOnChain = Long.valueOf(smallestBlockOnChain.getTimestamp());
             // drop nano second
-            blockTimestampOnChain = Math.round(blockTimestampOnChain / 1000.00)  * 1000;
+            Double floorValue = Math.floor(blockTimestampOnChain / 1000.00)  * 1000;
+            blockTimestampOnChain = floorValue.longValue();
             log.debug("checkSameChainData groupId:{},blockHeight:{},localTime:{},chainTime:{} ",
                     groupId, blockHeightLocal, blockTimestampLocal, blockTimestampOnChain);
             // check same timestamp, the same chain

From 3f16caa32b059b42fcc0e6b7461f63f45f85a51d Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 19 May 2020 18:10:21 +0800
Subject: [PATCH 052/131] fix check chain dirty data by block hash

---
 .../webase/node/mgr/group/GroupService.java   | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 701f7747d..7304aac14 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -419,27 +419,25 @@ private void checkSameChainDataWithLocal() {
                 continue;
             }
             BigInteger blockHeightLocal = smallestBlockLocal.getBlockNumber();
-            Long blockTimestampLocal = NodeMgrTools.localDateTime2Timestamp(smallestBlockLocal.getBlockTimestamp());
+			String blockHashLocal = smallestBlockLocal.getPkHash();
 
             // get same height block from chain, contrast block hash
             BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumber(groupId, blockHeightLocal);
             // if no block in each node, not same chain
             if (smallestBlockOnChain == null) {
-                log.warn("checkSameChainDataWithLocal block of height: {} on chain not exists, " +
-                        "conflict with local block of same height", blockHeightLocal);
+                log.warn("checkSameChainDataWithLocal groupId: {} block of height: {} on chain not exists, " +
+                        "conflict with local block of same height", groupId, blockHeightLocal);
                 updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
                 continue;
             }
-            Long blockTimestampOnChain = Long.valueOf(smallestBlockOnChain.getTimestamp());
-            // drop nano second
-            Double floorValue = Math.floor(blockTimestampOnChain / 1000.00)  * 1000;
-            blockTimestampOnChain = floorValue.longValue();
-            log.debug("checkSameChainData groupId:{},blockHeight:{},localTime:{},chainTime:{} ",
-                    groupId, blockHeightLocal, blockTimestampLocal, blockTimestampOnChain);
-            // check same timestamp, the same chain
-            if (blockTimestampLocal.compareTo(blockTimestampOnChain) != 0) {
-                log.warn("checkSameChainDataWithLocal block of {} on chain conflicts with local block data",
-                        blockHeightLocal);
+			String blockHashOnChain = smallestBlockOnChain.getHash();
+            log.debug("checkSameChainData groupId:{},blockHeight:{},localHash:{},chainHash:{} ",
+                    groupId, blockHeightLocal, blockHashLocal, blockHashOnChain);
+            // check same block hash, the same chain
+            if (!blockHashLocal.equals(blockHashOnChain)) {
+                log.warn("checkSameChainDataWithLocal group: {} block of height:{} on chain " +
+								"conflicts with local block data",
+                        groupId, blockHeightLocal);
                 updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
                 continue;
             } else {

From 60fcfdb98ff7231e31708e0d02e88c9755665f26 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 20 May 2020 11:08:59 +0800
Subject: [PATCH 053/131] add full list of group

---
 .../node/mgr/group/GroupController.java       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 8f74f94c2..46fc7ca7d 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -123,9 +123,10 @@ public BasePageResponse getAllGroup() throws NodeMgrException {
      * @return
      * @throws NodeMgrException
      */
-    @GetMapping("/all/invalidIncluded/{pageNumber}/{pageSize}")
-    public BasePageResponse getAllGroupIncludeInvalidGroup(@PathVariable("pageNumber") Integer pageNumber,
-                                                           @PathVariable("pageSize") Integer pageSize) throws NodeMgrException {
+    @GetMapping({"/all/invalidIncluded/{pageNumber}/{pageSize}",
+            "/all/invalidIncluded"})
+    public BasePageResponse getAllGroupIncludeInvalidGroup(@PathVariable(value = "pageNumber",required = false) Integer pageNumber,
+                                                           @PathVariable(value = "pageSize", required = false) Integer pageSize) throws NodeMgrException {
         BasePageResponse pagesponse = new BasePageResponse(ConstantCode.SUCCESS);
         Instant startTime = Instant.now();
         log.info("start getAllGroupIncludeInvalidGroup startTime:{}", startTime.toEpochMilli());
@@ -134,11 +135,15 @@ public BasePageResponse getAllGroupIncludeInvalidGroup(@PathVariable("pageNumber
         int count = groupService.countOfGroup(null, null);
         if (count > 0) {
             List<TbGroup> groupList = groupService.getGroupList(null);
-            List2Page list2Page = new List2Page(groupList, pageSize, pageNumber);
-            pagesponse.setData(list2Page.getPagedList());
-            pagesponse.setTotalCount(count);
+            if (pageNumber == null && pageSize == null) {
+                pagesponse.setData(groupList);
+                pagesponse.setTotalCount(count);
+            } else {
+                List2Page list2Page = new List2Page(groupList, pageSize, pageNumber);
+                pagesponse.setData(list2Page.getPagedList());
+                pagesponse.setTotalCount(count);
+            }
         }
-
         // reset group
         resetGroupListTask.asyncResetGroupList();
 

From 3568cc63e4ca56f9ce15cfb5ffa4676bf4a99579 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 20 May 2020 14:14:25 +0800
Subject: [PATCH 054/131] add input/message/root of tx receipt

---
 .../webase/node/mgr/transaction/TransHashController.java | 1 -
 .../webase/node/mgr/transaction/entity/TransReceipt.java | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/transaction/TransHashController.java b/src/main/java/com/webank/webase/node/mgr/transaction/TransHashController.java
index cdff084ef..438bf2e18 100644
--- a/src/main/java/com/webank/webase/node/mgr/transaction/TransHashController.java
+++ b/src/main/java/com/webank/webase/node/mgr/transaction/TransHashController.java
@@ -22,7 +22,6 @@
 import com.webank.webase.node.mgr.base.enums.SqlSortType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.group.GroupService;
-import com.webank.webase.node.mgr.group.entity.GroupGeneral;
 import com.webank.webase.node.mgr.transaction.entity.TbTransHash;
 import com.webank.webase.node.mgr.transaction.entity.TransListParam;
 import com.webank.webase.node.mgr.transaction.entity.TransReceipt;
diff --git a/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransReceipt.java b/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransReceipt.java
index 0a097e546..9b1211978 100644
--- a/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransReceipt.java
+++ b/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransReceipt.java
@@ -40,4 +40,13 @@ public class TransReceipt {
     private String transactionIndexRaw;
     private boolean statusOK;
     private String gasUsedRaw;
+
+    private String root;
+    private String message;
+    private String input;
+    /**
+     * list of MerkleProofUnit
+     */
+    private List<Object> txProof;
+    private List<Object> receiptProof;
 }

From f22f8649df7af81997cacba66c7c7dd05444e57c Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 20 May 2020 14:22:25 +0800
Subject: [PATCH 055/131] add tx entity comment

---
 .../webase/node/mgr/transaction/entity/TransReceipt.java       | 3 +++
 .../webase/node/mgr/transaction/entity/TransactionInfo.java    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransReceipt.java b/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransReceipt.java
index 9b1211978..b0f02cbd0 100644
--- a/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransReceipt.java
+++ b/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransReceipt.java
@@ -20,6 +20,9 @@
 import java.util.List;
 import lombok.Data;
 
+/**
+ * transaction receipt entity
+ */
 @Data
 public class TransReceipt {
 
diff --git a/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransactionInfo.java b/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransactionInfo.java
index d02d798e7..be9f0bc8c 100644
--- a/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransactionInfo.java
+++ b/src/main/java/com/webank/webase/node/mgr/transaction/entity/TransactionInfo.java
@@ -18,6 +18,9 @@
 import java.math.BigInteger;
 import lombok.Data;
 
+/**
+ * transaction info entity (different from receipt)
+ */
 @Data
 public class TransactionInfo {
     private String hash;

From b89fe5e6cd1c49954a3e1f2e37096063bc60d5ba Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 20 May 2020 15:55:54 +0800
Subject: [PATCH 056/131] fix repeat groupid

---
 .../webase/node/mgr/scheduler/PullBlockTransTask.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java
index 521b224dd..d979c742c 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java
@@ -13,9 +13,10 @@
  */
 package com.webank.webase.node.mgr.scheduler;
 
+import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.block.BlockService;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroup;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroupMapCache;
+import com.webank.webase.node.mgr.group.GroupService;
+import com.webank.webase.node.mgr.group.entity.TbGroup;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -37,7 +38,7 @@ public class PullBlockTransTask {
     @Autowired
     private BlockService blockService;
     @Autowired
-    private FrontGroupMapCache frontGroupMapCache;
+    private GroupService groupService;
 
     @Scheduled(fixedDelayString = "${constant.pullBlockTaskFixedDelay}")
     public void taskStart() {
@@ -50,7 +51,7 @@ public void taskStart() {
     public synchronized void pullBlockStart() {
         Instant startTime = Instant.now();
         log.info("start pullBLock startTime:{}", startTime.toEpochMilli());
-        List<FrontGroup> groupList = frontGroupMapCache.getAllMap();
+        List<TbGroup> groupList = groupService.getGroupList(GroupStatus.NORMAL.getValue());
         if (groupList == null || groupList.size() == 0) {
             log.warn("pullBlock jump over: not found any group");
             return;

From e1848f1c446a5e3d163700320b4f5cdf40e5fae7 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 21 May 2020 14:16:14 +0800
Subject: [PATCH 057/131] add null genesisi block warn log

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 7304aac14..541cecac4 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -381,6 +381,7 @@ private void checkGroupGenesisSameWithEach() {
                 BlockInfo genesisBlock = frontInterface.getBlockByNumberFromSpecificFront(frontIp,
                         frontPort, groupId, BigInteger.ZERO);
                 if (genesisBlock == null) {
+                    log.warn("checkGroupGenesisSameWithEach getGenesisBlock is null");
                     continue;
                 }
                 if (!"".equals(lastBlockHash) && !lastBlockHash.equals(genesisBlock.getHash())) {
@@ -416,6 +417,7 @@ private void checkSameChainDataWithLocal() {
             TbBlock smallestBlockLocal = blockService.getSmallestBlockInfo(groupId);
             // if no block in local db
             if (smallestBlockLocal == null) {
+                log.warn("checkSameChainDataWithLocal smallestBlockLocal is null");
                 continue;
             }
             BigInteger blockHeightLocal = smallestBlockLocal.getBlockNumber();
@@ -441,6 +443,7 @@ private void checkSameChainDataWithLocal() {
                 updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
                 continue;
             } else {
+                log.warn("checkSameChainDataWithLocal set groupId:{} as normal", groupId);
                 updateGroupStatus(groupId, GroupStatus.NORMAL.getValue());
             }
         }

From dd4693decbd7d8123889b596598cdc4d5976e45a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 21 May 2020 16:03:28 +0800
Subject: [PATCH 058/131] add deploy permission check

---
 .../node/mgr/base/code/ConstantCode.java      |  3 +
 .../node/mgr/contract/ContractService.java    | 55 ++++++++++++++++---
 .../frontinterface/FrontInterfaceService.java |  4 +-
 .../webase/node/mgr/group/GroupService.java   |  3 +-
 .../PermissionManageController.java           |  4 +-
 .../permission/PermissionManageService.java   | 17 +++---
 6 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index 764718ab3..b461492cd 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -32,6 +32,9 @@ public class ConstantCode {
     public static final RetCode SYSTEM_EXCEPTION = RetCode.mark(102000, "system exception");
     public static final RetCode SYSTEM_EXCEPTION_GET_PRIVATE_KEY_FAIL = RetCode.mark(102000, "system exception: please check front");
 
+    /* front error code */
+    public static final RetCode PERMISSION_DENIED = RetCode.mark(201202, "permission denied");
+
     /**
      * Business exception.
      */
diff --git a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
index 07e621bd8..94566797f 100644
--- a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
+++ b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
@@ -18,28 +18,29 @@
 import com.webank.webase.node.mgr.abi.AbiService;
 import com.webank.webase.node.mgr.abi.entity.AbiInfo;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.entity.BasePageResponse;
 import com.webank.webase.node.mgr.base.enums.ContractStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
-import com.webank.webase.node.mgr.base.properties.ConstantProperties;
 import com.webank.webase.node.mgr.base.tools.Web3Tools;
 import com.webank.webase.node.mgr.contract.entity.Contract;
 import com.webank.webase.node.mgr.contract.entity.ContractParam;
 import com.webank.webase.node.mgr.contract.entity.DeployInputParam;
 import com.webank.webase.node.mgr.contract.entity.TbContract;
 import com.webank.webase.node.mgr.contract.entity.TransactionInputParam;
+import com.webank.webase.node.mgr.event.entity.NewBlockEventInfo;
 import com.webank.webase.node.mgr.front.entity.TransactionParam;
 import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
 import com.webank.webase.node.mgr.frontinterface.FrontRestTools;
 import com.webank.webase.node.mgr.frontinterface.entity.PostAbiInfo;
 import com.webank.webase.node.mgr.monitor.MonitorService;
+import com.webank.webase.node.mgr.precompiled.permission.PermissionManageService;
 import com.webank.webase.node.mgr.user.UserService;
 import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
+import org.fisco.bcos.web3j.precompile.permission.PermissionInfo;
 import org.fisco.bcos.web3j.protocol.core.methods.response.AbiDefinition;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,9 @@
 @Service
 public class  ContractService {
 
+    private static final int CONTRACT_ADDRESS_LENGTH = 42;
+    private static final String PERMISSION_TYPE_DEPLOY_AND_CREATE = "deployAndCreate";
+
     @Autowired
     private ContractMapper contractMapper;
     @Autowired
@@ -64,9 +68,11 @@ public class  ContractService {
     private FrontInterfaceService frontInterface;
     @Autowired
     private UserService userService;
-    private static final int CONTRACT_ADDRESS_LENGTH = 42;
     @Autowired
     private AbiService abiService;
+    @Autowired
+    private PermissionManageService permissionManageService;
+
     /**
      * add new contract data.
      */
@@ -202,8 +208,11 @@ public List<TbContract> queryContractByBin(Integer groupId, String contractBin)
     public TbContract deployContract(DeployInputParam inputParam) throws NodeMgrException {
         log.info("start deployContract. inputParam:{}", JSON.toJSONString(inputParam));
         int groupId = inputParam.getGroupId();
+
+        // check deploy permission
+        checkDeployPermission(groupId, inputParam.getUser());
+
         String contractName = inputParam.getContractName();
-        // String version = Instant.now().toEpochMilli() + "";
         //check contract
         verifyContractNotDeploy(inputParam.getContractId(), inputParam.getGroupId());
         //check contractName
@@ -217,7 +226,9 @@ public TbContract deployContract(DeployInputParam inputParam) throws NodeMgrExce
         }
 
         // deploy param
+        // get signUserId
         String signUserId = userService.getSignUserIdByAddress(groupId, inputParam.getUser());
+
         Map<String, Object> params = new HashMap<>();
         params.put("groupId", groupId);
         params.put("signUserId", signUserId);
@@ -428,4 +439,34 @@ public void sendAbi(int groupId, int contractId, String address) {
         contract.setDescription("address add by sendAbi");
         contractMapper.update(contract);
     }
+
+    /**
+     * check user deploy permission
+     */
+    private void checkDeployPermission(int groupId, String userAddress) {
+        // get deploy permission list
+        List<PermissionInfo> deployUserList = new ArrayList<>();
+        BasePageResponse response = permissionManageService.listPermissionFull(groupId, PERMISSION_TYPE_DEPLOY_AND_CREATE, null);
+        if (response.getCode() != 0) {
+            log.error("checkDeployPermission get permission list error");
+            return;
+        } else {
+            List listData = (List) response.getData();
+            deployUserList = JSON.parseArray(JSON.toJSONString(listData), PermissionInfo.class);
+        }
+
+        // check user in the list,
+        if (deployUserList.isEmpty()) {
+            return;
+        } else {
+            long count = 0;
+            count = deployUserList.stream().filter( admin -> userAddress.equals(admin.getAddress())).count();
+            // if not in the list, permission denied
+            if (count == 0) {
+                log.error("checkDeployPermission permission denied for user:{}", userAddress);
+                throw new NodeMgrException(ConstantCode.PERMISSION_DENIED);
+            }
+        }
+    }
+
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
index 2f5c9f7fe..f627f0340 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
@@ -505,7 +505,7 @@ public List<NewBlockEventInfo> getNewBlockEventInfo(String frontIp, Integer fron
         if (response.getData() == null) {
             return new ArrayList<>();
         }
-        List<NewBlockEventInfo> data = (List<NewBlockEventInfo>) response.getData();
+        List data = (List) response.getData();
         List<NewBlockEventInfo> resList = JSON.parseArray(JSON.toJSONString(data), NewBlockEventInfo.class);
         resList.forEach(info -> info.setFrontInfo(frontIp));
         return resList;
@@ -521,7 +521,7 @@ public List<ContractEventInfo> getContractEventInfo(String frontIp, Integer fron
 		if (response.getData() == null) {
 			return new ArrayList<>();
 		}
-		List<ContractEventInfo> data = (List<ContractEventInfo>) response.getData();
+		List data = (List) response.getData();
 		List<ContractEventInfo> resList = JSON.parseArray(JSON.toJSONString(data), ContractEventInfo.class);
 		resList.forEach(info -> info.setFrontInfo(frontIp));
 		return resList;
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 541cecac4..2f59470a2 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -257,7 +257,8 @@ private void savePeerList(String frontIp, Integer frontPort, int groupId, List<S
         //save new nodes
         for (String nodeId : groupPeerList) {
             long count = localNodeList.stream().filter(
-                    ln -> groupId == ln.getGroupId() && nodeId.equals(ln.getNodeId())).count();
+                    ln -> nodeId.equals(ln.getNodeId()) && groupId == ln.getGroupId()).count();
+            // local node not contains this one:
             if (count == 0) {
                 PeerInfo newPeer = peerList.stream().filter(peer -> nodeId.equals(peer.getNodeId()))
                         .findFirst().orElseGet(() -> new PeerInfo(nodeId));
diff --git a/src/main/java/com/webank/webase/node/mgr/precompiled/permission/PermissionManageController.java b/src/main/java/com/webank/webase/node/mgr/precompiled/permission/PermissionManageController.java
index 9b6d325ae..bfbb7b8e1 100644
--- a/src/main/java/com/webank/webase/node/mgr/precompiled/permission/PermissionManageController.java
+++ b/src/main/java/com/webank/webase/node/mgr/precompiled/permission/PermissionManageController.java
@@ -88,7 +88,7 @@ public Object listPermissionManager(
         Instant startTime = Instant.now();
         log.info("start listPermissionManager startTime:{}", startTime.toEpochMilli());
 
-        Object result = permissionManageService.listPermission(groupId, permissionType, tableName, pageSize, pageNumber);
+        Object result = permissionManageService.listPermissionPaged(groupId, permissionType, tableName, pageSize, pageNumber);
 
         log.info("end listPermissionManager useTime:{} result:{}",
                 Duration.between(startTime, Instant.now()).toMillis(), JSON.toJSONString(result));
@@ -109,7 +109,7 @@ public Object listFullPermissionManager(
         Instant startTime = Instant.now();
         log.info("start listFullPermissionManager startTime:{}", startTime.toEpochMilli());
 
-        Object result = permissionManageService.getPermissionFullList(groupId, permissionType, tableName);
+        Object result = permissionManageService.listPermissionFull(groupId, permissionType, tableName);
 
         log.info("end listFullPermissionManager useTime:{} result:{}",
                 Duration.between(startTime, Instant.now()).toMillis(), JSON.toJSONString(result));
diff --git a/src/main/java/com/webank/webase/node/mgr/precompiled/permission/PermissionManageService.java b/src/main/java/com/webank/webase/node/mgr/precompiled/permission/PermissionManageService.java
index 91c3bdd3e..e85973420 100644
--- a/src/main/java/com/webank/webase/node/mgr/precompiled/permission/PermissionManageService.java
+++ b/src/main/java/com/webank/webase/node/mgr/precompiled/permission/PermissionManageService.java
@@ -17,6 +17,7 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.entity.BasePageResponse;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.tools.HttpRequestTools;
 import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
@@ -25,6 +26,7 @@
 import com.webank.webase.node.mgr.user.entity.TbUser;
 import com.webank.webase.node.mgr.user.entity.UserParam;
 import lombok.extern.log4j.Log4j2;
+import org.fisco.bcos.web3j.precompile.permission.PermissionInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -97,8 +99,8 @@ public Map<String, PermissionState> listPermissionStateFull(int groupId) {
     /**
      * get paged permission list
      */
-    public Object listPermission(int groupId, String permissionType, String tableName, int pageSize, int pageNumber) {
-        log.debug("start listPermission. groupId:{}, permissionType:{}" , groupId , permissionType);
+    public Object listPermissionPaged(int groupId, String permissionType, String tableName, int pageSize, int pageNumber) {
+        log.debug("start listPermissionPaged. groupId:{}, permissionType:{}" , groupId , permissionType);
         String uri;
         Map<String, String>  map = new HashMap<>();
         map.put("groupId", String.valueOf(groupId));
@@ -113,15 +115,15 @@ public Object listPermission(int groupId, String permissionType, String tableNam
         }
 
         Object frontRsp = frontRestTools.getForEntity(groupId, uri, Object.class);
-        log.debug("end listPermission. frontRsp:{}", JSON.toJSONString(frontRsp));
+        log.debug("end listPermissionPaged. frontRsp:{}", JSON.toJSONString(frontRsp));
         return frontRsp;
     }
 
     /**
      * get full permission list
      */
-    public Object getPermissionFullList(int groupId, String permissionType, String tableName) {
-        log.debug("start getPermissionFullList. groupId:{}, permissionType:{}" , groupId , permissionType);
+    public BasePageResponse listPermissionFull(int groupId, String permissionType, String tableName) {
+        log.debug("start listPermissionFull. groupId:{}, permissionType:{}" , groupId , permissionType);
         String uri;
         Map<String, String>  map = new HashMap<>();
         map.put("groupId", String.valueOf(groupId));
@@ -132,9 +134,8 @@ public Object getPermissionFullList(int groupId, String permissionType, String t
             map.put("tableName", tableName);
             uri = HttpRequestTools.getQueryUri(FrontRestTools.URI_PERMISSION_FULL_LIST, map);
         }
-
-        Object frontRsp = frontRestTools.getForEntity(groupId, uri, Object.class);
-        log.debug("end getPermissionFullList. frontRsp:{}", JSON.toJSONString(frontRsp));
+        BasePageResponse frontRsp = frontRestTools.getForEntity(groupId, uri, BasePageResponse.class);
+        log.debug("end listPermissionFull. frontRsp:{}", JSON.toJSONString(frontRsp));
         return frontRsp;
     }
 

From bb16ea598bb6207b67b43f856b4ba56f71363a44 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 21 May 2020 16:17:44 +0800
Subject: [PATCH 059/131] add address 0x00 validation

---
 .../webank/webase/node/mgr/contract/ContractController.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/com/webank/webase/node/mgr/contract/ContractController.java b/src/main/java/com/webank/webase/node/mgr/contract/ContractController.java
index 5753c174b..90e0d368c 100644
--- a/src/main/java/com/webank/webase/node/mgr/contract/ContractController.java
+++ b/src/main/java/com/webank/webase/node/mgr/contract/ContractController.java
@@ -34,6 +34,7 @@
 import java.util.Optional;
 import javax.validation.Valid;
 import lombok.extern.log4j.Log4j2;
+import org.fisco.bcos.web3j.abi.datatypes.Address;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -183,6 +184,10 @@ public BaseResponse deployContract(@RequestBody @Valid DeployInputParam deployIn
     public BaseResponse sendTransaction(@RequestBody @Valid TransactionInputParam param,
         BindingResult result) throws NodeMgrException {
         checkBindResult(result);
+        // 0x0000000000000000000000000000000000000000 address is invalid
+        if (Address.DEFAULT.toString().equals(param.getContractAddress())) {
+            throw new NodeMgrException(ConstantCode.CONTRACT_ADDRESS_INVALID);
+        }
         Instant startTime = Instant.now();
         log.info("start sendTransaction startTime:{} param:{}", startTime.toEpochMilli(),
             JSON.toJSONString(param));

From 453560b5c2bdaa00cc8d4cf1ea9e3d05a06056d7 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 21 May 2020 22:28:15 +0800
Subject: [PATCH 060/131] add import pri & pem

---
 .../node/mgr/base/code/ConstantCode.java      |  2 +
 .../node/mgr/base/tools/NodeMgrTools.java     |  9 ++-
 .../webase/node/mgr/base/tools/PemUtils.java  | 68 ++++++++++++++++
 .../mgr/frontinterface/FrontRestTools.java    |  1 +
 .../webase/node/mgr/user/UserController.java  | 56 +++++++++++--
 .../webase/node/mgr/user/UserService.java     | 81 +++++++++++++------
 .../node/mgr/user/entity/ReqImportPem.java    | 16 ++++
 .../mgr/user/entity/ReqImportPrivateKey.java  | 29 +++++++
 8 files changed, 230 insertions(+), 32 deletions(-)
 create mode 100644 src/main/java/com/webank/webase/node/mgr/base/tools/PemUtils.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPem.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPrivateKey.java

diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index b461492cd..c222b094d 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -34,6 +34,8 @@ public class ConstantCode {
 
     /* front error code */
     public static final RetCode PERMISSION_DENIED = RetCode.mark(201202, "permission denied");
+    public static final RetCode PEM_FORMAT_ERROR = RetCode.mark(201232, "Pem file format error, must surrounded by -----XXXXX PRIVATE KEY-----");
+    public static final RetCode PEM_CONTENT_ERROR = RetCode.mark(201233, "Pem file content error");
 
     /**
      * Business exception.
diff --git a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
index f9f0347ec..a669ce1d4 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
@@ -26,13 +26,11 @@
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.security.MessageDigest;
-import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoField;
 import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -532,4 +530,11 @@ public static String removeFirstStr(String input, String target) {
         }
         return input;
     }
+
+    public static String encodedBase64Str(String input) {
+        if (input == null) {
+            return null;
+        }
+        return Base64.getEncoder().encodeToString(input.getBytes());
+    }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/base/tools/PemUtils.java b/src/main/java/com/webank/webase/node/mgr/base/tools/PemUtils.java
new file mode 100644
index 000000000..97196cef3
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/base/tools/PemUtils.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.base.tools;
+
+import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.exception.NodeMgrException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PemUtils {
+    public static final String crtContentHead = "-----BEGIN PRIVATE KEY-----\n" ;
+    public static final String crtContentTail = "-----END PRIVATE KEY-----\n" ;
+    public static final String crtTailForConcat = "\n-----END PRIVATE KEY-----\n" ;
+
+    /**
+     * get pem file's content without head and tail
+     * support importing multiple pem private key
+     * @param certContent
+     * @return
+     */
+    public static List<String> getPemBareContentList(String certContent) {
+        List<String> list = new ArrayList<>();
+        if(!certContent.startsWith(crtContentHead)){
+            throw new NodeMgrException(ConstantCode.PEM_FORMAT_ERROR);
+        }
+        String[] nodeCrtStrArray = certContent.split(crtContentHead);
+        for(int i = 0; i < nodeCrtStrArray.length; i++) {
+            String[] nodeCrtStrArray2 = nodeCrtStrArray[i].split(crtContentTail);
+            for(int j = 0; j < nodeCrtStrArray2.length; j++) {
+                String ca = nodeCrtStrArray2[j];
+                if(ca.length() != 0) {
+                    list.add(formatPemStr(ca));
+                }
+            }
+        }
+        return list;
+    }
+
+    public static String formatPemStr(String string) {
+        return string.substring(0, string.length() - 1);
+    }
+
+    /**
+     * 给pem的内容加上头和尾
+     * begin ...
+     * end ...
+     */
+    public static String addPemHeadAndTail(String certContent) {
+        String headToConcat = crtContentHead;
+        String fullCert = headToConcat.concat(certContent).concat(crtTailForConcat);
+        return fullCert;
+    }
+}
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index 5f4318d76..0d0456c9b 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -79,6 +79,7 @@ public class FrontRestTools {
     public static final String FRONT_PERFORMANCE_CONFIG = "performance/config";
     public static final String URI_KEY_PAIR = "privateKey?type=2&userName=%s&signUserId=%s&appId=%s";
     public static final String URI_KEY_PAIR_LOCAL_KEYSTORE = "privateKey/localKeyStores";
+    public static final String URI_KEY_PAIR_IMPORT_WITH_SIGN = "privateKey/importWithSign";
     public static final String URI_CONTRACT_DEPLOY_WITH_SIGN = "contract/deployWithSign";
     public static final String URI_CONTRACT_SENDABI = "contract/abiInfo";
     public static final String URI_SEND_TRANSACTION_WITH_SIGN = "trans/handleWithSign";
diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserController.java b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
index bdc332c46..480dfb038 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserController.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
@@ -20,11 +20,9 @@
 import com.webank.webase.node.mgr.base.code.ConstantCode;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
-import com.webank.webase.node.mgr.user.entity.BindUserInputParam;
-import com.webank.webase.node.mgr.user.entity.NewUserInputParam;
-import com.webank.webase.node.mgr.user.entity.TbUser;
-import com.webank.webase.node.mgr.user.entity.UpdateUserInputParam;
-import com.webank.webase.node.mgr.user.entity.UserParam;
+import com.webank.webase.node.mgr.base.tools.PemUtils;
+import com.webank.webase.node.mgr.user.entity.*;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
@@ -66,7 +64,8 @@ public BaseResponse addUserInfo(@RequestBody @Valid NewUserInputParam user,
         Instant startTime = Instant.now();
 
         // add user row
-        Integer userId = userService.addUserInfo(user);
+        Integer userId = userService.addUserInfo(user.getGroupId(),
+                user.getUserName(), user.getDescription(), user.getUserType(), null);
 
         // query user row
         TbUser userRow = userService.queryByUserId(userId);
@@ -160,4 +159,49 @@ public BasePageResponse userList(@PathVariable("groupId") Integer groupId,
             Duration.between(startTime, Instant.now()).toMillis(), JSON.toJSONString(pagesponse));
         return pagesponse;
     }
+
+    @PostMapping("/import")
+    @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+    public BaseResponse importPrivateKey(@Valid @RequestBody ReqImportPrivateKey reqImport, BindingResult result) {
+        checkBindResult(result);
+        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
+        Instant startTime = Instant.now();
+
+        // encoded by web in base64
+        String privateKeyEncoded = reqImport.getPrivateKey();
+        // add user row
+        Integer userId = userService.addUserInfo(reqImport.getGroupId(), reqImport.getUserName(),
+                reqImport.getDescription(), reqImport.getUserType(), privateKeyEncoded);
+
+        // query user row
+        TbUser userRow = userService.queryByUserId(userId);
+        baseResponse.setData(userRow);
+
+        log.info("end importPrivateKey useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(), JSON.toJSONString(baseResponse));
+        return baseResponse;
+    }
+
+    @PostMapping("/importPem")
+    @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+    public BaseResponse importPemPrivateKey(@Valid @RequestBody ReqImportPem reqImportPem, BindingResult result) {
+        checkBindResult(result);
+        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
+        Instant startTime = Instant.now();
+
+        String pemContent = reqImportPem.getPemContent();
+        if(!pemContent.startsWith(PemUtils.crtContentHead)) {
+            throw new NodeMgrException(ConstantCode.PEM_FORMAT_ERROR);
+        }
+        // import
+        Integer userId = userService.importPem(reqImportPem);
+        // query user row
+        TbUser userRow = userService.queryByUserId(userId);
+        baseResponse.setData(userRow);
+
+        log.info("end importPemPrivateKey useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(), JSON.toJSONString(baseResponse));
+        return baseResponse;
+    }
+
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserService.java b/src/main/java/com/webank/webase/node/mgr/user/UserService.java
index e9ea48fb9..76cfb9607 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserService.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserService.java
@@ -18,23 +18,20 @@
 import com.webank.webase.node.mgr.base.enums.HasPk;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
+import com.webank.webase.node.mgr.base.tools.NodeMgrTools;
 import com.webank.webase.node.mgr.base.tools.Web3Tools;
 import com.webank.webase.node.mgr.frontinterface.FrontRestTools;
 import com.webank.webase.node.mgr.group.GroupService;
 import com.webank.webase.node.mgr.monitor.MonitorService;
-import com.webank.webase.node.mgr.user.entity.BindUserInputParam;
-import com.webank.webase.node.mgr.user.entity.KeyPair;
-import com.webank.webase.node.mgr.user.entity.NewUserInputParam;
-import com.webank.webase.node.mgr.user.entity.TbUser;
-import com.webank.webase.node.mgr.user.entity.UpdateUserInputParam;
-import com.webank.webase.node.mgr.user.entity.UserParam;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
+import com.webank.webase.node.mgr.user.entity.*;
+
+import java.io.ByteArrayInputStream;
+import java.util.*;
 
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
+import org.fisco.bcos.channel.client.PEMManager;
+import org.fisco.bcos.web3j.utils.Numeric;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -61,16 +58,15 @@ public class UserService {
      * add new user data.
      */
     @Transactional
-    public Integer addUserInfo(NewUserInputParam user) throws NodeMgrException {
-        log.debug("start addUserInfo User:{}", JSON.toJSONString(user));
-
-        Integer groupId = user.getGroupId();
-
+    public Integer addUserInfo(Integer groupId, String userName, String description,
+                               Integer userType, String privateKeyEncoded) throws NodeMgrException {
+        log.debug("start addUserInfo groupId:{},userName:{},description:{},userType:{},",
+                groupId, userName, description, userType);
         // check group id
         groupService.checkGroupId(groupId);
 
         // check userName
-        TbUser userRow = queryByName(user.getGroupId(), user.getUserName());
+        TbUser userRow = queryByName(groupId, userName);
         if (userRow != null) {
             log.warn("fail addUserInfo. user info already exists");
             throw new NodeMgrException(ConstantCode.USER_EXISTS);
@@ -78,10 +74,23 @@ public Integer addUserInfo(NewUserInputParam user) throws NodeMgrException {
         // add user by webase-front->webase-sign
         String signUserId = UUID.randomUUID().toString().replaceAll("-","");
         // group id as appId
-        String appId = user.getGroupId().toString();
-        String keyUri = String.format(FrontRestTools.URI_KEY_PAIR, user.getUserName(), signUserId, appId);
-        KeyPair keyPair = frontRestTools
-            .getForEntity(groupId, keyUri, KeyPair.class);
+        String appId = groupId.toString();
+
+        // request sign
+        KeyPair keyPair;
+        if (StringUtils.isNotBlank(privateKeyEncoded)) {
+            Map<String, Object> param = new HashMap<>();
+            param.put("signUserId", signUserId);
+            param.put("appId", appId);
+            // already encoded privateKey
+            param.put("privateKey", privateKeyEncoded);
+            keyPair = frontRestTools.postForEntity(groupId, FrontRestTools.URI_KEY_PAIR_IMPORT_WITH_SIGN,
+                    param, KeyPair.class);
+        } else {
+            String keyUri = String.format(FrontRestTools.URI_KEY_PAIR, userName, signUserId, appId);
+            keyPair = frontRestTools.getForEntity(groupId, keyUri, KeyPair.class);
+        }
+
         String publicKey = Optional.ofNullable(keyPair).map(k -> k.getPublicKey()).orElse(null);
         String address = Optional.ofNullable(keyPair).map(k -> k.getAddress()).orElse(null);
 
@@ -91,9 +100,8 @@ public Integer addUserInfo(NewUserInputParam user) throws NodeMgrException {
         }
 
         // add row
-        TbUser newUserRow = new TbUser(HasPk.HAS.getValue(), user.getUserType(), user.getUserName(),
-            groupId, address, publicKey,
-            user.getDescription());
+        TbUser newUserRow = new TbUser(HasPk.HAS.getValue(), userType, userName,
+                groupId, address, publicKey, description);
         newUserRow.setSignUserId(signUserId);
         newUserRow.setAppId(appId);
         Integer affectRow = userMapper.addUserRow(newUserRow);
@@ -103,7 +111,7 @@ public Integer addUserInfo(NewUserInputParam user) throws NodeMgrException {
         }
 
         // update monitor unusual user's info
-        monitorService.updateUnusualUser(groupId, user.getUserName(), address);
+        monitorService.updateUnusualUser(groupId, userName, address);
 
         Integer userId = newUserRow.getUserId();
         log.debug("end addNodeInfo userId:{}", userId);
@@ -309,4 +317,29 @@ public void deleteByAddress(String address) throws NodeMgrException{
         userMapper.deleteByAddress(address);
         log.debug("end deleteByAddress");
     }
+
+    /**
+     * import pem file to import privateKey
+     * @param reqImportPem
+     * @return userId
+     */
+    public Integer importPem(ReqImportPem reqImportPem) {
+        PEMManager pemManager = new PEMManager();
+        String privateKey;
+        try {
+            String pemContent = reqImportPem.getPemContent();
+            pemManager.load(new ByteArrayInputStream(pemContent.getBytes()));
+            privateKey = Numeric.toHexStringNoPrefix(pemManager.getECKeyPair().getPrivateKey());
+        }catch (Exception e) {
+            log.error("importKeyStoreFromPem error:[]", e);
+            throw new NodeMgrException(ConstantCode.PEM_CONTENT_ERROR);
+        }
+        // pem's privateKey encoded here
+        String privateKeyEncoded = NodeMgrTools.encodedBase64Str(privateKey);
+
+        // store local and save in sign
+        Integer userId = addUserInfo(reqImportPem.getGroupId(), reqImportPem.getUserName(),
+                reqImportPem.getDescription(), reqImportPem.getUserType(), privateKeyEncoded);
+        return userId;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPem.java b/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPem.java
new file mode 100644
index 000000000..bbb0d02c6
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPem.java
@@ -0,0 +1,16 @@
+package com.webank.webase.node.mgr.user.entity;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * import pem private key
+ */
+@Data
+@NoArgsConstructor
+public class ReqImportPem extends NewUserInputParam {
+    @NotBlank
+    private String pemContent;
+}
\ No newline at end of file
diff --git a/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPrivateKey.java b/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPrivateKey.java
new file mode 100644
index 000000000..9f4e2044b
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPrivateKey.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.user.entity;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@NoArgsConstructor
+public class ReqImportPrivateKey extends NewUserInputParam{
+	@NotBlank
+	private String privateKey;
+}

From 85f5bd7a6aa0a7c9818cb829aa3cc80697428d5e Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 21 May 2020 22:35:58 +0800
Subject: [PATCH 061/131] add call super of entity

---
 .../webase/node/mgr/contract/entity/TransactionInputParam.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/contract/entity/TransactionInputParam.java b/src/main/java/com/webank/webase/node/mgr/contract/entity/TransactionInputParam.java
index 0da1f1678..efc33cefa 100644
--- a/src/main/java/com/webank/webase/node/mgr/contract/entity/TransactionInputParam.java
+++ b/src/main/java/com/webank/webase/node/mgr/contract/entity/TransactionInputParam.java
@@ -16,7 +16,6 @@
 package com.webank.webase.node.mgr.contract.entity;
 
 import com.webank.webase.node.mgr.front.entity.TransactionParam;
-import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

From 06acd0b7079c82f7c263335f75b41c872d4ad9af Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 15:20:46 +0800
Subject: [PATCH 062/131] add call suer

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java   | 1 +
 .../com/webank/webase/node/mgr/user/entity/ReqImportPem.java  | 4 ++++
 .../webase/node/mgr/user/entity/ReqImportPrivateKey.java      | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 2f59470a2..86f8acfa7 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -258,6 +258,7 @@ private void savePeerList(String frontIp, Integer frontPort, int groupId, List<S
         for (String nodeId : groupPeerList) {
             long count = localNodeList.stream().filter(
                     ln -> nodeId.equals(ln.getNodeId()) && groupId == ln.getGroupId()).count();
+            log.error("=========== savePeerList:{}", count);
             // local node not contains this one:
             if (count == 0) {
                 PeerInfo newPeer = peerList.stream().filter(peer -> nodeId.equals(peer.getNodeId()))
diff --git a/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPem.java b/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPem.java
index bbb0d02c6..7dec055f0 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPem.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPem.java
@@ -1,7 +1,9 @@
 package com.webank.webase.node.mgr.user.entity;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 import javax.validation.constraints.NotBlank;
 
@@ -10,6 +12,8 @@
  */
 @Data
 @NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class ReqImportPem extends NewUserInputParam {
     @NotBlank
     private String pemContent;
diff --git a/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPrivateKey.java b/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPrivateKey.java
index 9f4e2044b..4e405a586 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPrivateKey.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/entity/ReqImportPrivateKey.java
@@ -17,12 +17,16 @@
 package com.webank.webase.node.mgr.user.entity;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 import javax.validation.constraints.NotBlank;
 
 @Data
 @NoArgsConstructor
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 public class ReqImportPrivateKey extends NewUserInputParam{
 	@NotBlank
 	private String privateKey;

From 3170c65e3d2b27a591bea105205531afb310d803 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 15:34:00 +0800
Subject: [PATCH 063/131] add p12 api

---
 .../node/mgr/base/code/ConstantCode.java      |  6 ++-
 .../node/mgr/base/tools/NodeMgrTools.java     |  8 ++++
 .../webase/node/mgr/user/UserController.java  | 29 ++++++++++++++
 .../webase/node/mgr/user/UserService.java     | 40 +++++++++++++++++--
 4 files changed, 79 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index c222b094d..de05d13ad 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -34,8 +34,12 @@ public class ConstantCode {
 
     /* front error code */
     public static final RetCode PERMISSION_DENIED = RetCode.mark(201202, "permission denied");
+    public static final RetCode CERT_FILE_NOT_FOUND = RetCode.mark(201231, "Cert file not found, please check cert path in config");
     public static final RetCode PEM_FORMAT_ERROR = RetCode.mark(201232, "Pem file format error, must surrounded by -----XXXXX PRIVATE KEY-----");
-    public static final RetCode PEM_CONTENT_ERROR = RetCode.mark(201233, "Pem file content error");
+    public static final RetCode PEM_CONTENT_ERROR = RetCode.mark(201234, "Pem file content error");
+    public static final RetCode P12_PASSWORD_NOT_CHINESE = RetCode.mark(201235, "p12's password cannot be chinese");
+    public static final RetCode P12_PASSWORD_ERROR = RetCode.mark(201236, "p12's password cannot be chinese");
+    public static final RetCode P12_FILE_ERROR = RetCode.mark(201237, "P12 file content error");
 
     /**
      * Business exception.
diff --git a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
index a669ce1d4..72b9c7b67 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
@@ -537,4 +537,12 @@ public static String encodedBase64Str(String input) {
         }
         return Base64.getEncoder().encodeToString(input.getBytes());
     }
+
+    /**
+     * 只包含中文
+     */
+    public static boolean notContainsChinese(String input) {
+        String regex = "[^\\u4e00-\\u9fa5]+";
+        return input.matches(regex);
+    }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserController.java b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
index 480dfb038..fde2f567a 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserController.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
@@ -20,9 +20,11 @@
 import com.webank.webase.node.mgr.base.code.ConstantCode;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
+import com.webank.webase.node.mgr.base.tools.NodeMgrTools;
 import com.webank.webase.node.mgr.base.tools.PemUtils;
 import com.webank.webase.node.mgr.user.entity.*;
 
+import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
@@ -40,6 +42,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * Key pair manage
@@ -204,4 +207,30 @@ public BaseResponse importPemPrivateKey(@Valid @RequestBody ReqImportPem reqImpo
         return baseResponse;
     }
 
+    @PostMapping("/importP12")
+    @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
+    public BaseResponse importP12PrivateKey(@RequestParam MultipartFile p12File, @RequestParam String p12Password,
+                                            @RequestParam Integer groupId, @RequestParam String userName,
+                                            @RequestParam(required = false) String description, BindingResult result) {
+        checkBindResult(result);
+        BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
+        Instant startTime = Instant.now();
+
+        if (!NodeMgrTools.notContainsChinese(p12Password)) {
+            throw new NodeMgrException(ConstantCode.P12_PASSWORD_NOT_CHINESE);
+        }
+        if (p12File.getSize() == 0) {
+            throw new NodeMgrException(ConstantCode.P12_FILE_ERROR);
+        }
+        Integer userId = userService.importKeyStoreFromP12(p12File, p12Password,
+                groupId, userName, description);
+        // query user row
+        TbUser userRow = userService.queryByUserId(userId);
+        baseResponse.setData(userRow);
+
+        log.info("end importPemPrivateKey useTime:{} result:{}",
+                Duration.between(startTime, Instant.now()).toMillis(), JSON.toJSONString(baseResponse));
+        return new BaseResponse(ConstantCode.SUCCESS);
+    }
+
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserService.java b/src/main/java/com/webank/webase/node/mgr/user/UserService.java
index 76cfb9607..b8b0a9e2a 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserService.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserService.java
@@ -16,6 +16,7 @@
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
 import com.webank.webase.node.mgr.base.enums.HasPk;
+import com.webank.webase.node.mgr.base.enums.UserType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
 import com.webank.webase.node.mgr.base.tools.NodeMgrTools;
@@ -30,12 +31,14 @@
 
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
+import org.fisco.bcos.channel.client.P12Manager;
 import org.fisco.bcos.channel.client.PEMManager;
 import org.fisco.bcos.web3j.utils.Numeric;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * services for user data.
@@ -76,7 +79,7 @@ public Integer addUserInfo(Integer groupId, String userName, String description,
         // group id as appId
         String appId = groupId.toString();
 
-        // request sign
+        // request sign or not
         KeyPair keyPair;
         if (StringUtils.isNotBlank(privateKeyEncoded)) {
             Map<String, Object> param = new HashMap<>();
@@ -84,8 +87,8 @@ public Integer addUserInfo(Integer groupId, String userName, String description,
             param.put("appId", appId);
             // already encoded privateKey
             param.put("privateKey", privateKeyEncoded);
-            keyPair = frontRestTools.postForEntity(groupId, FrontRestTools.URI_KEY_PAIR_IMPORT_WITH_SIGN,
-                    param, KeyPair.class);
+            keyPair = frontRestTools.postForEntity(groupId,
+                    FrontRestTools.URI_KEY_PAIR_IMPORT_WITH_SIGN, param, KeyPair.class);
         } else {
             String keyUri = String.format(FrontRestTools.URI_KEY_PAIR, userName, signUserId, appId);
             keyPair = frontRestTools.getForEntity(groupId, keyUri, KeyPair.class);
@@ -342,4 +345,35 @@ public Integer importPem(ReqImportPem reqImportPem) {
                 reqImportPem.getDescription(), reqImportPem.getUserType(), privateKeyEncoded);
         return userId;
     }
+
+    /**
+     * import keystore info from p12 file input stream and its password
+     * @param p12File
+     * @param p12Password
+     * @param userName
+     * @return KeyStoreInfo
+     */
+    public Integer importKeyStoreFromP12(MultipartFile p12File, String p12Password, Integer groupId,
+                                         String userName, String description) {
+        P12Manager p12Manager = new P12Manager();
+        String privateKey;
+        try {
+            p12Manager.load(p12File.getInputStream(), p12Password);
+            privateKey = Numeric.toHexStringNoPrefix(p12Manager.getECKeyPair().getPrivateKey());
+        }catch (Exception e) {
+            log.error("importKeyStoreFromP12 error:[]", e);
+            if (e.getMessage().contains("password")) {
+                throw new NodeMgrException(ConstantCode.P12_PASSWORD_ERROR);
+            }
+            throw new NodeMgrException(ConstantCode.P12_FILE_ERROR);
+        }
+        // pem's privateKey encoded here
+        String privateKeyEncoded = NodeMgrTools.encodedBase64Str(privateKey);
+
+        // store local and save in sign
+        Integer userId = addUserInfo(groupId, userName, description, UserType.GENERALUSER.getValue(),
+                privateKeyEncoded);
+
+        return userId;
+    }
 }
\ No newline at end of file

From 3cd3b0b926d5711305caf99d94e238a35504465b Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 16:05:55 +0800
Subject: [PATCH 064/131] fix reset all group

---
 .../com/webank/webase/node/mgr/base/code/ConstantCode.java    | 2 +-
 .../java/com/webank/webase/node/mgr/group/GroupService.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index de05d13ad..b7748d96f 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -38,7 +38,7 @@ public class ConstantCode {
     public static final RetCode PEM_FORMAT_ERROR = RetCode.mark(201232, "Pem file format error, must surrounded by -----XXXXX PRIVATE KEY-----");
     public static final RetCode PEM_CONTENT_ERROR = RetCode.mark(201234, "Pem file content error");
     public static final RetCode P12_PASSWORD_NOT_CHINESE = RetCode.mark(201235, "p12's password cannot be chinese");
-    public static final RetCode P12_PASSWORD_ERROR = RetCode.mark(201236, "p12's password cannot be chinese");
+    public static final RetCode P12_PASSWORD_ERROR = RetCode.mark(201236, "p12's password not match");
     public static final RetCode P12_FILE_ERROR = RetCode.mark(201237, "P12 file content error");
 
     /**
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 86f8acfa7..bbc182abe 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -407,7 +407,7 @@ private void checkGroupGenesisSameWithEach() {
     private void checkSameChainDataWithLocal() {
         log.info("start checkSameChainData.");
         // get all group
-        List<TbGroup> allNormalGroupList = getGroupList(GroupStatus.NORMAL.getValue());
+        List<TbGroup> allNormalGroupList = getGroupList(null);
         if (allNormalGroupList.isEmpty()) {
             log.warn("checkSameChainData not found any group of front.");
             return;
@@ -419,7 +419,7 @@ private void checkSameChainDataWithLocal() {
             TbBlock smallestBlockLocal = blockService.getSmallestBlockInfo(groupId);
             // if no block in local db
             if (smallestBlockLocal == null) {
-                log.warn("checkSameChainDataWithLocal smallestBlockLocal is null");
+                log.warn("checkSameChainDataWithLocal groupId {} smallestBlockLocal is null", groupId);
                 continue;
             }
             BigInteger blockHeightLocal = smallestBlockLocal.getBlockNumber();

From 4ffbe9af3f7b3082f7122e94be267c8addb96ee6 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 16:10:33 +0800
Subject: [PATCH 065/131] fix reset all group genesis

---
 .../webank/webase/node/mgr/group/GroupService.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index bbc182abe..ed314d80e 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -367,13 +367,13 @@ private void checkGroupGenesisSameWithEach() {
             log.warn("checkGroupGenesisSameWithEach not found any front.");
             return;
 		}
-		List<TbGroup> allNormalGroupList = getGroupList(GroupStatus.NORMAL.getValue());
-		if (allNormalGroupList.isEmpty()) {
+		List<TbGroup> allGroupList = getGroupList(null);
+		if (allGroupList.isEmpty()) {
             log.warn("checkGroupGenesisSameWithEach not found any group of front.");
             return;
 		}
 
-		for (TbGroup tbGroup : allNormalGroupList) {
+		for (TbGroup tbGroup : allGroupList) {
 			int groupId = tbGroup.getGroupId();
             String lastBlockHash = "";
             for (TbFront front : frontList) {
@@ -383,7 +383,7 @@ private void checkGroupGenesisSameWithEach() {
                 BlockInfo genesisBlock = frontInterface.getBlockByNumberFromSpecificFront(frontIp,
                         frontPort, groupId, BigInteger.ZERO);
                 if (genesisBlock == null) {
-                    log.warn("checkGroupGenesisSameWithEach getGenesisBlock is null");
+                    log.debug("checkGroupGenesisSameWithEach getGenesisBlock is null");
                     continue;
                 }
                 if (!"".equals(lastBlockHash) && !lastBlockHash.equals(genesisBlock.getHash())) {
@@ -419,7 +419,7 @@ private void checkSameChainDataWithLocal() {
             TbBlock smallestBlockLocal = blockService.getSmallestBlockInfo(groupId);
             // if no block in local db
             if (smallestBlockLocal == null) {
-                log.warn("checkSameChainDataWithLocal groupId {} smallestBlockLocal is null", groupId);
+                log.debug("checkSameChainDataWithLocal groupId {} smallestBlockLocal is null", groupId);
                 continue;
             }
             BigInteger blockHeightLocal = smallestBlockLocal.getBlockNumber();
@@ -445,7 +445,7 @@ private void checkSameChainDataWithLocal() {
                 updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
                 continue;
             } else {
-                log.warn("checkSameChainDataWithLocal set groupId:{} as normal", groupId);
+                log.info("checkSameChainDataWithLocal set groupId:{} as normal", groupId);
                 updateGroupStatus(groupId, GroupStatus.NORMAL.getValue());
             }
         }

From 24f9c8143673acada37b485eaeed51e51411619c Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 16:29:12 +0800
Subject: [PATCH 066/131] fix group dirty data case

---
 .../com/webank/webase/node/mgr/group/GroupService.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index ed314d80e..cafa34c2c 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -429,9 +429,10 @@ private void checkSameChainDataWithLocal() {
             BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumber(groupId, blockHeightLocal);
             // if no block in each node, not same chain
             if (smallestBlockOnChain == null) {
-                log.warn("checkSameChainDataWithLocal groupId: {} block of height: {} on chain not exists, " +
-                        "conflict with local block of same height", groupId, blockHeightLocal);
-                updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
+                log.info("smallestBlockOnChain groupId: {} height: {} return null, " +
+                        "please check groupStatus", groupId, blockHeightLocal);
+                // null block not means conflict
+                // updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
                 continue;
             }
 			String blockHashOnChain = smallestBlockOnChain.getHash();

From 841f483c837f3ff1fc27095a4da7c24d4f589507 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 16:55:13 +0800
Subject: [PATCH 067/131] update check group order

---
 .../mgr/frontinterface/FrontInterfaceService.java   |  2 +-
 .../webank/webase/node/mgr/group/GroupService.java  | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
index f627f0340..7b5c6d5a5 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
@@ -238,7 +238,7 @@ public BlockInfo getBlockByNumber(Integer groupId, BigInteger blockNumber)
         try {
             blockInfo = frontRestTools.getForEntity(groupId, uri, BlockInfo.class);
         } catch (Exception ex) {
-            log.info("fail getBlockByNumber,exception:{}", ex);
+            log.error("fail getBlockByNumber,exception:[]", ex);
         }
         log.debug("end getBlockByNumber");
         return blockInfo;
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index cafa34c2c..993053c08 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -231,10 +231,10 @@ public void resetGroupList() {
 
         // check group status(normal or maintaining)
         checkAndUpdateGroupStatus(allGroupSet);
-        // check group's genesis block same with each other
-        checkGroupGenesisSameWithEach();
         // check group if has dirty data
         checkSameChainDataWithLocal();
+        // check group's genesis block same with each other
+        checkGroupGenesisSameWithEach();
         // remove front_group_map that not in tb_front or tb_group
         frontGroupMapService.removeInvalidFrontGroupMap();
         //clear cache
@@ -429,8 +429,8 @@ private void checkSameChainDataWithLocal() {
             BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumber(groupId, blockHeightLocal);
             // if no block in each node, not same chain
             if (smallestBlockOnChain == null) {
-                log.info("smallestBlockOnChain groupId: {} height: {} return null, " +
-                        "please check groupStatus", groupId, blockHeightLocal);
+                log.info("smallestBlockOnChain groupId: {} height: {} return null block, " +
+                        "please check group's node", groupId, blockHeightLocal);
                 // null block not means conflict
                 // updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
                 continue;
@@ -440,9 +440,8 @@ private void checkSameChainDataWithLocal() {
                     groupId, blockHeightLocal, blockHashLocal, blockHashOnChain);
             // check same block hash, the same chain
             if (!blockHashLocal.equals(blockHashOnChain)) {
-                log.warn("checkSameChainDataWithLocal group: {} block of height:{} on chain " +
-								"conflicts with local block data",
-                        groupId, blockHeightLocal);
+                log.warn("checkSameChainDataWithLocal blockHashOnChain conflicts with local block data " +
+                                "groupId: {} height:{} on chain ", groupId, blockHeightLocal);
                 updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
                 continue;
             } else {

From feec19a045e0788f9da45a5931287f478cfcff0c Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 17:43:02 +0800
Subject: [PATCH 068/131] valid signUserId exist

---
 .../com/webank/webase/node/mgr/base/code/ConstantCode.java    | 3 +++
 .../java/com/webank/webase/node/mgr/user/UserService.java     | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index b7748d96f..f62e93f17 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -159,6 +159,9 @@ public class ConstantCode {
     public static final RetCode PARAM_FAIL_ABI_ID_EMPTY = RetCode.mark(202099, "Abi Id cannot be empty");
     public static final RetCode CONTRACT_ADDRESS_NULL = RetCode.mark(202100, "contractAddress is null");
 
+    public static final RetCode USER_NOT_EXIST = RetCode.mark(202110, "User's signUserId not exist");
+
+
     /* dynamic group manage */
     public static final RetCode GROUP_ID_EXISTS = RetCode.mark(202300, "group id already exists");
     public static final RetCode NODE_NOT_EXISTS = RetCode.mark(202301, "node's front not exists");
diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserService.java b/src/main/java/com/webank/webase/node/mgr/user/UserService.java
index b8b0a9e2a..8270d61a4 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserService.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserService.java
@@ -31,6 +31,7 @@
 
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.tomcat.util.bcel.Const;
 import org.fisco.bcos.channel.client.P12Manager;
 import org.fisco.bcos.channel.client.PEMManager;
 import org.fisco.bcos.web3j.utils.Numeric;
@@ -263,6 +264,9 @@ public TbUser queryByUserId(Integer userId) throws NodeMgrException {
      */
     public String getSignUserIdByAddress(int groupId, String address) throws NodeMgrException {
         TbUser user = queryUser(null, groupId, null, address);
+        if (user == null) {
+            throw new NodeMgrException(ConstantCode.USER_NOT_EXIST);
+        }
         return user.getSignUserId();
     }
 

From 1bc85e50ebdf1569fadd59ada584da444b1470f7 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 19:16:53 +0800
Subject: [PATCH 069/131] fix update all group bug

---
 .../com/webank/webase/node/mgr/group/GroupService.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 993053c08..e7a20f384 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -407,13 +407,13 @@ private void checkGroupGenesisSameWithEach() {
     private void checkSameChainDataWithLocal() {
         log.info("start checkSameChainData.");
         // get all group
-        List<TbGroup> allNormalGroupList = getGroupList(null);
-        if (allNormalGroupList.isEmpty()) {
+        List<TbGroup> allGroupList = getGroupList(null);
+        if (allGroupList.isEmpty()) {
             log.warn("checkSameChainData not found any group of front.");
             return;
         }
 
-        for (TbGroup tbGroup : allNormalGroupList) {
+        for (TbGroup tbGroup : allGroupList) {
             int groupId = tbGroup.getGroupId();
             // find smallest block from db of group
             TbBlock smallestBlockLocal = blockService.getSmallestBlockInfo(groupId);
@@ -444,7 +444,8 @@ private void checkSameChainDataWithLocal() {
                                 "groupId: {} height:{} on chain ", groupId, blockHeightLocal);
                 updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
                 continue;
-            } else {
+            } else if (tbGroup.getGroupStatus() == GroupStatus.CONFLICT_LOCAL_DATA.getValue()){
+                // if old group is conflict, now normal, set as normal
                 log.info("checkSameChainDataWithLocal set groupId:{} as normal", groupId);
                 updateGroupStatus(groupId, GroupStatus.NORMAL.getValue());
             }

From 742b8171a7fc48e4a7b98590683fd7f99607fe68 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 19:30:40 +0800
Subject: [PATCH 070/131] fix request normal front_group

---
 .../webase/node/mgr/contract/ContractService.java      |  2 +-
 .../mgr/frontgroupmap/entity/FrontGroupMapCache.java   | 10 +++++++++-
 .../webase/node/mgr/frontinterface/FrontRestTools.java |  4 +++-
 .../com/webank/webase/node/mgr/group/GroupService.java |  7 +++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
index 94566797f..2e3aa6e2e 100644
--- a/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
+++ b/src/main/java/com/webank/webase/node/mgr/contract/ContractService.java
@@ -455,7 +455,7 @@ private void checkDeployPermission(int groupId, String userAddress) {
             deployUserList = JSON.parseArray(JSON.toJSONString(listData), PermissionInfo.class);
         }
 
-        // check user in the list,
+        // check user in the list
         if (deployUserList.isEmpty()) {
             return;
         } else {
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java
index 6b8c6dc47..0b9a6de66 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java
@@ -14,9 +14,12 @@
 package com.webank.webase.node.mgr.frontgroupmap.entity;
 
 
+import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapService;
 import java.util.List;
 import java.util.stream.Collectors;
+
+import com.webank.webase.node.mgr.group.GroupService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -25,6 +28,8 @@ public class FrontGroupMapCache {
 
     @Autowired
     private FrontGroupMapService mapService;
+    @Autowired
+    private GroupService groupService;
 
     private static List<FrontGroup> mapList;
 
@@ -52,7 +57,10 @@ public List<FrontGroup> getMapListByGroupId(int groupId) {
         if (list == null) {
             return null;
         }
-        List<FrontGroup> map = list.stream().filter(m -> groupId == m.getGroupId())
+        // filter all FrontGroup which groupStatus is normal
+        List<FrontGroup> map = list.stream()
+            .filter(m -> groupId == m.getGroupId()
+                    && GroupStatus.NORMAL.getValue() == groupService.getGroupStatus(groupId))
             .collect(Collectors.toList());
         return map;
     }
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index 0d0456c9b..b7f440574 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -32,6 +32,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+
+import com.webank.webase.node.mgr.group.GroupService;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -302,7 +304,7 @@ private <T> T restTemplateExchange(int groupId, String uri, HttpMethod method,
         ArrayList<FrontGroup> list = new ArrayList<>(frontList);
         RestTemplate restTemplate = caseRestemplate(uri);
 
-        while (list != null && list.size() > 0) {
+        while (list.size() > 0) {
             String url = buildFrontUrl(list, uri, method);//build url
             try {
                 HttpEntity entity = buildHttpEntity(param);// build entity
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index e7a20f384..fbe09c905 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -690,4 +690,11 @@ public TbGroup getGroupById(Integer groupId) {
         return groupMapper.getGroupById(groupId);
     }
 
+    /**
+     * get status of group
+     * @return groupStatus
+     */
+    public Integer getGroupStatus(Integer groupId) {
+        return getGroupById(groupId).getGroupStatus();
+    }
 }

From dc118e2fed5769aba7cb16d88d96c72d295bd5b0 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 20:10:30 +0800
Subject: [PATCH 071/131] fix p12 load

---
 .../com/webank/webase/node/mgr/user/UserController.java    | 1 -
 .../java/com/webank/webase/node/mgr/user/UserService.java  | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserController.java b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
index fde2f567a..cb90832b2 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserController.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
@@ -24,7 +24,6 @@
 import com.webank.webase.node.mgr.base.tools.PemUtils;
 import com.webank.webase.node.mgr.user.entity.*;
 
-import java.io.IOException;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserService.java b/src/main/java/com/webank/webase/node/mgr/user/UserService.java
index 8270d61a4..996ebe927 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserService.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserService.java
@@ -27,6 +27,7 @@
 import com.webank.webase.node.mgr.user.entity.*;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.util.*;
 
 import lombok.extern.log4j.Log4j2;
@@ -362,14 +363,18 @@ public Integer importKeyStoreFromP12(MultipartFile p12File, String p12Password,
         P12Manager p12Manager = new P12Manager();
         String privateKey;
         try {
+            p12Manager.setPassword(p12Password);
             p12Manager.load(p12File.getInputStream(), p12Password);
             privateKey = Numeric.toHexStringNoPrefix(p12Manager.getECKeyPair().getPrivateKey());
-        }catch (Exception e) {
+        } catch ( IOException e) {
             log.error("importKeyStoreFromP12 error:[]", e);
             if (e.getMessage().contains("password")) {
                 throw new NodeMgrException(ConstantCode.P12_PASSWORD_ERROR);
             }
             throw new NodeMgrException(ConstantCode.P12_FILE_ERROR);
+        } catch (Exception e) {
+            log.error("importKeyStoreFromP12 error:[]", e);
+            throw new NodeMgrException(ConstantCode.P12_FILE_ERROR.getCode(), e.getMessage());
         }
         // pem's privateKey encoded here
         String privateKeyEncoded = NodeMgrTools.encodedBase64Str(privateKey);

From bc680716f713047b2f9dc4d92feb5ae137da1c46 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 22 May 2020 20:38:20 +0800
Subject: [PATCH 072/131] adjust log level

---
 .../entity/FrontGroupMapCache.java            |  3 +++
 .../webase/node/mgr/group/GroupService.java   | 13 ++++++----
 .../node/mgr/scheduler/DeleteInfoTask.java    | 24 +++++++++----------
 .../mgr/scheduler/PullBlockTransTask.java     |  4 ++--
 .../scheduler/StatisticsTransdailyTask.java   |  8 +++----
 .../node/mgr/scheduler/TransMonitorTask.java  |  6 ++---
 6 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java
index 0b9a6de66..f3286db9f 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java
@@ -20,9 +20,11 @@
 import java.util.stream.Collectors;
 
 import com.webank.webase.node.mgr.group.GroupService;
+import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+@Log4j2
 @Component
 public class FrontGroupMapCache {
 
@@ -55,6 +57,7 @@ public List<FrontGroup> resetMapList() {
     public List<FrontGroup> getMapListByGroupId(int groupId) {
         List<FrontGroup> list = getAllMap();
         if (list == null) {
+            log.warn("getMapListByGroupId getAllMap is null.");
             return null;
         }
         // filter all FrontGroup which groupStatus is normal
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index fbe09c905..bd2bcb5c1 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -256,11 +256,13 @@ private void savePeerList(String frontIp, Integer frontPort, int groupId, List<S
         List<PeerInfo> peerList = Arrays.asList(peerArr);
         //save new nodes
         for (String nodeId : groupPeerList) {
+            // if local hash node, count = 1
             long count = localNodeList.stream().filter(
                     ln -> nodeId.equals(ln.getNodeId()) && groupId == ln.getGroupId()).count();
+            // TODO remove
             log.error("=========== savePeerList:{}", count);
             // local node not contains this one:
-            if (count == 0) {
+            if (count != 1) {
                 PeerInfo newPeer = peerList.stream().filter(peer -> nodeId.equals(peer.getNodeId()))
                         .findFirst().orElseGet(() -> new PeerInfo(nodeId));
                 nodeService.addNodeInfo(groupId, newPeer);
@@ -296,9 +298,12 @@ private void removeInvalidPeer(int groupId, List<String> groupPeerList) {
             return;
         }
         //remove node that's not in groupPeerList and not in sealer/observer list
-        localNodes.stream().filter(node -> !groupPeerList.contains(node.getNodeId())
-                && !checkSealerAndObserverListContains(groupId, node.getNodeId()))
-                .forEach(n -> nodeService.deleteByNodeAndGroupId(n.getNodeId(), groupId));
+        localNodes.stream()
+                .filter(node ->
+                        !groupPeerList.contains(node.getNodeId())
+                    && !checkSealerAndObserverListContains(groupId, node.getNodeId()))
+                .forEach(n ->
+                        nodeService.deleteByNodeAndGroupId(n.getNodeId(), groupId));
     }
 
     private boolean checkSealerAndObserverListContains(int groupId, String nodeId) {
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java
index 6b667a038..a180d4bd2 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/DeleteInfoTask.java
@@ -63,17 +63,17 @@ public void taskStart() {
      */
     public void deleteInfoStart() {
         Instant startTime = Instant.now();
-        log.info("start deleteInfoStart. startTime:{}", startTime.toEpochMilli());
+        log.debug("start deleteInfoStart. startTime:{}", startTime.toEpochMilli());
         //get group list
         List<TbGroup> groupList = groupService.getGroupList(DataStatus.NORMAL.getValue());
         if (groupList == null || groupList.size() == 0) {
-            log.info("DeleteInfoTask jump over .not found any group");
+            log.warn("DeleteInfoTask jump over, not found any group");
             return;
         }
 
         groupList.stream().forEach(g -> deleteByGroupId(g.getGroupId()));
 
-        log.info("end deleteInfoStart useTime:{}",
+        log.debug("end deleteInfoStart useTime:{}",
             Duration.between(startTime, Instant.now()).toMillis());
     }
 
@@ -94,12 +94,12 @@ private void deleteByGroupId(int groupId) {
      * delete block.
      */
     private void deleteBlock(int groupId) {
-        log.info("start deleteBlock. groupId:{}", groupId);
+        log.debug("start deleteBlock. groupId:{}", groupId);
         try {
             Integer removeCount = blockService.remove(groupId, cProperties.getBlockRetainMax());
-            log.info("end deleteBlock. groupId:{} removeCount:{}", groupId, removeCount);
+            log.debug("end deleteBlock. groupId:{} removeCount:{}", groupId, removeCount);
         } catch (Exception ex) {
-            log.info("fail deleteBlock. groupId:{}", groupId, ex);
+            log.error("fail deleteBlock. groupId:{}", groupId, ex);
         }
     }
 
@@ -107,7 +107,7 @@ private void deleteBlock(int groupId) {
      * delete transHash.
      */
     private void deleteTransHash(int groupId) {
-        log.info("start deleteTransHash. groupId:{}", groupId);
+        log.debug("start deleteTransHash. groupId:{}", groupId);
         try {
 //            TransListParam queryParam = new TransListParam(null, null);
 //            Integer count = transHashService.queryCountOfTran(groupId, queryParam);
@@ -117,9 +117,9 @@ private void deleteTransHash(int groupId) {
                 Integer subTransNum = count - cProperties.getTransRetainMax().intValue();
                 removeCount = transHashService.remove(groupId, subTransNum);
             }
-            log.info("end deleteTransHash. groupId:{} removeCount:{}", groupId, removeCount);
+            log.debug("end deleteTransHash. groupId:{} removeCount:{}", groupId, removeCount);
         } catch (Exception ex) {
-            log.info("fail deleteTransHash. groupId:{}", groupId, ex);
+            log.error("fail deleteTransHash. groupId:{}", groupId, ex);
         }
     }
 
@@ -128,13 +128,13 @@ private void deleteTransHash(int groupId) {
      * delete monitor info.
      */
     private void deleteTransMonitor(int groupId) {
-        log.info("start deleteTransMonitor. groupId:{}", groupId);
+        log.debug("start deleteTransMonitor. groupId:{}", groupId);
         try {
             Integer removeCount = monitorService
                 .delete(groupId, cProperties.getMonitorInfoRetainMax());
-            log.info("end deleteTransMonitor. groupId:{} removeCount:{}", groupId, removeCount);
+            log.debug("end deleteTransMonitor. groupId:{} removeCount:{}", groupId, removeCount);
         } catch (Exception ex) {
-            log.info("fail deleteTransMonitor. groupId:{}", groupId, ex);
+            log.error("fail deleteTransMonitor. groupId:{}", groupId, ex);
         }
     }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java
index d979c742c..e3d8a9732 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/PullBlockTransTask.java
@@ -50,7 +50,7 @@ public void taskStart() {
      */
     public synchronized void pullBlockStart() {
         Instant startTime = Instant.now();
-        log.info("start pullBLock startTime:{}", startTime.toEpochMilli());
+        log.debug("start pullBLock startTime:{}", startTime.toEpochMilli());
         List<TbGroup> groupList = groupService.getGroupList(GroupStatus.NORMAL.getValue());
         if (groupList == null || groupList.size() == 0) {
             log.warn("pullBlock jump over: not found any group");
@@ -68,7 +68,7 @@ public synchronized void pullBlockStart() {
             Thread.currentThread().interrupt();
         }
 
-        log.info("end pullBLock useTime:{} ",
+        log.debug("end pullBLock useTime:{} ",
                 Duration.between(startTime, Instant.now()).toMillis());
     }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/StatisticsTransdailyTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/StatisticsTransdailyTask.java
index 4ebdae57f..671b42fc5 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/StatisticsTransdailyTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/StatisticsTransdailyTask.java
@@ -60,7 +60,7 @@ public void taskStart() {
      */
     public synchronized void updateTransdailyData() {
         Instant startTime = Instant.now();
-        log.info("start updateTransdailyData startTime:{}", startTime.toEpochMilli());
+        log.debug("start updateTransdailyData startTime:{}", startTime.toEpochMilli());
         try {
 
             // query all group statistical info
@@ -73,7 +73,7 @@ public synchronized void updateTransdailyData() {
         } catch (Exception ex) {
             log.error("fail updateTransdailyData", ex);
         }
-        log.info("end updateTransdailyData useTime:{}",
+        log.debug("end updateTransdailyData useTime:{}",
             Duration.between(startTime, Instant.now()).toMillis());
     }
 
@@ -104,7 +104,7 @@ private void traverseNetList(List<StatisticalGroupTransInfo> groupStatisticalLis
 
             // Traversing block list
             if (blockList == null | blockList.size() == 0) {
-                log.info("updateTransdailyData jump over .This chain [{}] did not find new block",
+                log.debug("updateTransdailyData jump over .This chain [{}] did not find new block",
                     groupId);
                 continue;
             }
@@ -113,7 +113,7 @@ private void traverseNetList(List<StatisticalGroupTransInfo> groupStatisticalLis
                 LocalDate blockDate = tbBlock.getBlockTimestamp() == null ? null
                     : tbBlock.getBlockTimestamp().toLocalDate();
                 if (blockDate == null) {
-                    log.warn("updateTransdailyData jump over . blockDate is null");
+                    log.debug("updateTransdailyData jump over . blockDate is null");
                     continue;
                 }
 
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/TransMonitorTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/TransMonitorTask.java
index 73d1be3d7..351dd58b8 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/TransMonitorTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/TransMonitorTask.java
@@ -50,11 +50,11 @@ public void taskStart() {
      */
     public synchronized void monitorStart() {
         Instant startTime = Instant.now();
-        log.info("=== start monitor. startTime:{}", startTime.toEpochMilli());
+        log.debug("=== start monitor. startTime:{}", startTime.toEpochMilli());
         //get group list
         List<TbGroup> groupList = groupService.getGroupList(DataStatus.NORMAL.getValue());
         if (groupList == null || groupList.size() == 0) {
-            log.info("monitor jump over .not found any group");
+            log.warn("monitor jump over, not found any group");
             return;
         }
         // count down group, make sure all group's transMonitor finished
@@ -69,7 +69,7 @@ public synchronized void monitorStart() {
             Thread.currentThread().interrupt();
         }
 
-        log.info("=== end monitor. useTime:{} ",
+        log.debug("=== end monitor. useTime:{} ",
             Duration.between(startTime, Instant.now()).toMillis());
     }
 }

From b6f5c175bd8e28a605c5a6e551ca0f97d96d8726 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 10:37:32 +0800
Subject: [PATCH 073/131] src/main/java/com/webank/webase/node/mgr/

---
 .../frontgroupmap/{entity => }/FrontGroupMapCache.java   | 3 +--
 src/main/resources/mapper/FrontGroupMapMapper.xml        | 9 ++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)
 rename src/main/java/com/webank/webase/node/mgr/frontgroupmap/{entity => }/FrontGroupMapCache.java (93%)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
similarity index 93%
rename from src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java
rename to src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
index f3286db9f..b2fa080aa 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroupMapCache.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
@@ -62,8 +62,7 @@ public List<FrontGroup> getMapListByGroupId(int groupId) {
         }
         // filter all FrontGroup which groupStatus is normal
         List<FrontGroup> map = list.stream()
-            .filter(m -> groupId == m.getGroupId()
-                    && GroupStatus.NORMAL.getValue() == groupService.getGroupStatus(groupId))
+            .filter(m -> groupId == m.getGroupId())
             .collect(Collectors.toList());
         return map;
     }
diff --git a/src/main/resources/mapper/FrontGroupMapMapper.xml b/src/main/resources/mapper/FrontGroupMapMapper.xml
index 5fd0afe27..16db4d847 100644
--- a/src/main/resources/mapper/FrontGroupMapMapper.xml
+++ b/src/main/resources/mapper/FrontGroupMapMapper.xml
@@ -11,12 +11,13 @@
         <result column="front_id" javaType="java.lang.Integer" jdbcType="INTEGER" property="frontId"/>
         <result column="front_ip" javaType="java.lang.String" jdbcType="VARCHAR" property="frontIp"/>
         <result column="front_port" javaType="java.lang.Integer" jdbcType="INTEGER" property="frontPort"/>
+        <result column="status" javaType="java.lang.Integer" jdbcType="INTEGER" property="status"/>
     </resultMap>
 
 
     <insert id="add" parameterType="com.webank.webase.node.mgr.frontgroupmap.entity.TbFrontGroupMap">
         insert ignore into tb_front_group_map
-        (front_id,group_id,create_time,modify_time)values(#{frontId},#{groupId},NOW(),NOW())
+        (front_id,group_id,status,create_time,modify_time)values(#{frontId},#{groupId},#{status},NOW(),NOW())
         <selectKey keyProperty="mapId" order="AFTER" resultType="java.lang.Integer">
             SELECT LAST_INSERT_ID()
         </selectKey>
@@ -34,6 +35,9 @@
         <if test="groupId != null and groupId != ''">
             and group_id = #{groupId}
         </if>
+        <if test="status != null and status != ''">
+            and status = #{status}
+        </if>
     </select>
 
     <select id="getList" resultMap="frontGroupMap"
@@ -52,6 +56,9 @@
         <if test="groupId != null and groupId != ''">
             and a.group_id = #{groupId}
         </if>
+        <if test="status != null and status != ''">
+            and a.status = #{status}
+        </if>
     </select>
 
     <delete id="removeByGroupId" parameterType="java.lang.Integer">

From 2308b9983085a9d8d7710006e15d56c1814f7184 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 10:40:52 +0800
Subject: [PATCH 074/131] fix group status of front_group

---
 .../node/mgr/base/filter/FrontFilter.java     |  2 +-
 .../webase/node/mgr/front/FrontService.java   |  5 ++--
 .../mgr/frontgroupmap/FrontGroupMapCache.java |  8 ++++--
 .../frontgroupmap/FrontGroupMapService.java   | 28 +++++++++++++++++--
 .../mgr/frontgroupmap/entity/FrontGroup.java  |  1 +
 .../frontgroupmap/entity/MapListParam.java    |  1 +
 .../frontgroupmap/entity/TbFrontGroupMap.java |  8 +++++-
 .../mgr/frontinterface/FrontRestTools.java    |  5 ++--
 .../webase/node/mgr/group/GroupService.java   | 15 +++-------
 9 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/filter/FrontFilter.java b/src/main/java/com/webank/webase/node/mgr/base/filter/FrontFilter.java
index 25c5901e8..f38a2e30a 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/filter/FrontFilter.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/filter/FrontFilter.java
@@ -21,7 +21,7 @@
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
 import com.webank.webase.node.mgr.base.tools.HttpRequestTools;
 import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroup;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroupMapCache;
+import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapCache;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index 39ec31468..9d84a4a18 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -25,14 +25,13 @@
 import com.webank.webase.node.mgr.front.entity.FrontParam;
 import com.webank.webase.node.mgr.front.entity.TbFront;
 import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapService;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroupMapCache;
+import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapCache;
 import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
 import com.webank.webase.node.mgr.frontinterface.entity.SyncStatus;
 import com.webank.webase.node.mgr.group.GroupService;
 import com.webank.webase.node.mgr.group.entity.TbGroup;
 import com.webank.webase.node.mgr.node.NodeParam;
 import com.webank.webase.node.mgr.node.NodeService;
-import com.webank.webase.node.mgr.node.TbNode;
 import com.webank.webase.node.mgr.node.entity.PeerInfo;
 import com.webank.webase.node.mgr.scheduler.ResetGroupListTask;
 
@@ -140,7 +139,7 @@ public TbFront newFront(FrontInfo frontInfo) {
                         GroupType.SYNC.getValue(), DataStatus.NORMAL.getValue());
             }
             //save front group map
-            frontGroupMapService.newFrontGroup(tbFront.getFrontId(), group);
+            frontGroupMapService.newFrontGroupWithStatus(tbFront, group);
             //save nodes
             for (String nodeId : groupPeerList) {
                 PeerInfo newPeer = peerList.stream().map(p -> NodeMgrTools
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
index b2fa080aa..759d4314e 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.webank.webase.node.mgr.frontgroupmap.entity;
+package com.webank.webase.node.mgr.frontgroupmap;
 
 
 import com.webank.webase.node.mgr.base.enums.GroupStatus;
@@ -19,6 +19,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroup;
+import com.webank.webase.node.mgr.frontgroupmap.entity.MapListParam;
 import com.webank.webase.node.mgr.group.GroupService;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,8 +64,10 @@ public List<FrontGroup> getMapListByGroupId(int groupId) {
         }
         // filter all FrontGroup which groupStatus is normal
         List<FrontGroup> map = list.stream()
-            .filter(m -> groupId == m.getGroupId())
+            .filter(m -> groupId == m.getGroupId()
+                    && m.getStatus() == GroupStatus.NORMAL.getValue())
             .collect(Collectors.toList());
+        log.error("getMapListByGroupId map size:{}", map.size());
         return map;
     }
 
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index d9b8779cd..50f908e41 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -13,10 +13,14 @@
  */
 package com.webank.webase.node.mgr.frontgroupmap;
 
+import com.webank.webase.node.mgr.base.entity.BaseResponse;
+import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.front.FrontService;
+import com.webank.webase.node.mgr.front.entity.TbFront;
 import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroup;
 import com.webank.webase.node.mgr.frontgroupmap.entity.MapListParam;
 import com.webank.webase.node.mgr.frontgroupmap.entity.TbFrontGroupMap;
+import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
 import com.webank.webase.node.mgr.group.GroupService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,18 +38,38 @@ public class FrontGroupMapService {
     private GroupService groupService;
     @Autowired
     private FrontService frontService;
+    @Autowired
+    private FrontInterfaceService frontInterface;
 
     /**
      * add new mapping
      */
-    public TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId) {
-        TbFrontGroupMap tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId);
+    private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
+        TbFrontGroupMap tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
 
         //add db
         frontGroupMapMapper.add(tbFrontGroupMap);
         return tbFrontGroupMap;
     }
 
+    /**
+     * new front group map only for normal group
+     */
+    public void newFrontGroupWithStatus(TbFront front, Integer groupId) {
+        // check front's all group status
+        BaseResponse res = frontInterface.operateGroup(front.getFrontIp(), front.getFrontPort(),
+                groupId, "getStatus");
+        // "INEXISTENT"、"STOPPING"、"RUNNING"、"STOPPED"、"DELETED"
+        if (res.getCode() == 0) {
+            String groupStatus = (String) res.getData();
+            if ("RUNNING".equals(groupStatus)) {
+                newFrontGroup(front.getFrontId(), groupId, GroupStatus.NORMAL.getValue());
+            } else {
+                newFrontGroup(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
+            }
+        }
+    }
+
     /**
      * get map count
      */
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroup.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroup.java
index ac35210f2..273b97e77 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroup.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/FrontGroup.java
@@ -25,4 +25,5 @@ public class FrontGroup {
     private Integer frontId;
     private String frontIp;
     private Integer frontPort;
+    private Integer status;
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/MapListParam.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/MapListParam.java
index 5ae5eb9d6..031c057ed 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/MapListParam.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/MapListParam.java
@@ -20,4 +20,5 @@ public class MapListParam {
     private int mapId;
     private int frontId;
     private int groupId;
+    private int status;
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/TbFrontGroupMap.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/TbFrontGroupMap.java
index 4e7731685..2cdc00513 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/TbFrontGroupMap.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/TbFrontGroupMap.java
@@ -26,9 +26,15 @@ public class TbFrontGroupMap {
     private Integer groupId;
     private LocalDateTime createTime;
     private LocalDateTime modifyTime;
+    /**
+     * front's group status, 1-normal
+     * @related GroupStatus enum
+     */
+    private Integer status;
 
-    public TbFrontGroupMap(Integer frontId,Integer groupId){
+    public TbFrontGroupMap(Integer frontId,Integer groupId, Integer status){
         this.frontId = frontId;
         this.groupId = groupId;
+        this.status = status;
     }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index b7f440574..a9edbaf58 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -20,7 +20,7 @@
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
 import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroup;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroupMapCache;
+import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapCache;
 import com.webank.webase.node.mgr.frontinterface.entity.FailInfo;
 import java.time.Duration;
 import java.time.Instant;
@@ -33,7 +33,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import com.webank.webase.node.mgr.group.GroupService;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -298,7 +297,7 @@ private <T> T restTemplateExchange(int groupId, String uri, HttpMethod method,
         Object param, Class<T> clazz) {
         List<FrontGroup> frontList = frontGroupMapCache.getMapListByGroupId(groupId);
         if (frontList == null || frontList.size() == 0) {
-            log.error("fail restTemplateExchange. frontList is empty");
+            log.error("fail restTemplateExchange. frontList is empty groupId:{}", groupId);
             throw new NodeMgrException(ConstantCode.FRONT_LIST_NOT_FOUNT);
         }
         ArrayList<FrontGroup> list = new ArrayList<>(frontList);
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index bd2bcb5c1..3dbd39e78 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -15,11 +15,11 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.entity.BaseResponse;
 import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
-import com.webank.webase.node.mgr.base.tools.NodeMgrTools;
 import com.webank.webase.node.mgr.block.BlockService;
 import com.webank.webase.node.mgr.block.entity.BlockInfo;
 import com.webank.webase.node.mgr.block.entity.TbBlock;
@@ -29,7 +29,7 @@
 import com.webank.webase.node.mgr.front.entity.TbFront;
 import com.webank.webase.node.mgr.front.entity.TotalTransCountInfo;
 import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapService;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroupMapCache;
+import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapCache;
 import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
 import com.webank.webase.node.mgr.frontinterface.entity.GenerateGroupInfo;
 import com.webank.webase.node.mgr.group.entity.*;
@@ -49,7 +49,6 @@
 import java.math.BigInteger;
 import java.time.Duration;
 import java.time.Instant;
-import java.time.LocalDateTime;
 import java.util.*;
 
 /**
@@ -219,7 +218,8 @@ public void resetGroupList() {
                     saveGroup(gId, groupPeerList.size(), "synchronous",
                             GroupType.SYNC.getValue(), GroupStatus.NORMAL.getValue());
                 }
-                frontGroupMapService.newFrontGroup(front.getFrontId(), gId);
+                // refresh front group map
+                frontGroupMapService.newFrontGroupWithStatus(front, gId);
                 //save new peers
                 savePeerList(frontIp, frontPort, gId, groupPeerList);
                 //remove invalid peers
@@ -695,11 +695,4 @@ public TbGroup getGroupById(Integer groupId) {
         return groupMapper.getGroupById(groupId);
     }
 
-    /**
-     * get status of group
-     * @return groupStatus
-     */
-    public Integer getGroupStatus(Integer groupId) {
-        return getGroupById(groupId).getGroupStatus();
-    }
 }

From 40fba39904cc25d57759d37d5a26e00b9ce64d1d Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 10:46:02 +0800
Subject: [PATCH 075/131] add status group_map

---
 script/webase-ddl.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/script/webase-ddl.sql b/script/webase-ddl.sql
index 57f08734a..c63a809bd 100644
--- a/script/webase-ddl.sql
+++ b/script/webase-ddl.sql
@@ -43,6 +43,7 @@ CREATE TABLE IF NOT EXISTS tb_front_group_map (
   group_id int(11) NOT NULL COMMENT '群组编号',
   create_time datetime DEFAULT NULL COMMENT '创建时间',
   modify_time datetime DEFAULT NULL COMMENT '修改时间',
+  status int(11) DEFAULT 1 NOT NULL COMMENT '节点（前置）的群组状态',
   PRIMARY KEY (map_id),
   unique  unique_front_group (front_id,group_id)
 ) ENGINE=InnoDB AUTO_INCREMENT=600001 DEFAULT CHARSET=utf8 COMMENT='前置群组映射表';

From 5b6f810a2f016709fd296dac0c9c8f001f922cfe Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 11:52:38 +0800
Subject: [PATCH 076/131] fix group_map status null

---
 .../webase/node/mgr/frontgroupmap/FrontGroupMapCache.java      | 3 +++
 .../java/com/webank/webase/node/mgr/group/GroupService.java    | 3 +--
 src/main/resources/mapper/FrontGroupMapMapper.xml              | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
index 759d4314e..7ee64fe4c 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
@@ -16,6 +16,9 @@
 
 import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapService;
+
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 3dbd39e78..8b5b073b4 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -15,7 +15,6 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
-import com.webank.webase.node.mgr.base.entity.BaseResponse;
 import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
@@ -327,7 +326,7 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
             return;
         }
 
-        List<TbGroup> allLocalGroup = getGroupList(null);
+         List<TbGroup> allLocalGroup = getGroupList(null);
         if (CollectionUtils.isEmpty(allLocalGroup)) {
             return;
         }
diff --git a/src/main/resources/mapper/FrontGroupMapMapper.xml b/src/main/resources/mapper/FrontGroupMapMapper.xml
index 16db4d847..b462ff997 100644
--- a/src/main/resources/mapper/FrontGroupMapMapper.xml
+++ b/src/main/resources/mapper/FrontGroupMapMapper.xml
@@ -42,7 +42,7 @@
 
     <select id="getList" resultMap="frontGroupMap"
             parameterType="com.webank.webase.node.mgr.frontgroupmap.entity.MapListParam">
-        select a.map_id,a.front_id,a.group_id,b.front_ip,b.front_port,c.group_name
+        select a.map_id,a.front_id,a.group_id,a.status,b.front_ip,b.front_port,c.group_name
         from tb_front_group_map a
         left join tb_front b on(a.front_id=b.front_id)
         left join tb_group c on(a.group_id=c.group_id)

From 170679124bf4de6351e0c9fb721a4f887efdeeb8 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 12:21:24 +0800
Subject: [PATCH 077/131] add refersh front group map in dynamic group

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 8b5b073b4..4a730f425 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -561,6 +561,10 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
         // request front to operate
         Object groupOperateStatus = frontInterface.operateGroup(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), groupId, type);
+        if ("start".equals(type) || "stop".equals(type)) {
+            // reset front group map status
+            frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
+        }
         // refresh group status, not remove tb_group if within gray period (yaml-groupInvalidGrayscaleValue)
         resetGroupList();
 
@@ -624,6 +628,8 @@ public void batchStartGroup(ReqBatchStartGroup req) {
             // request front to start
             frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
                     "start");
+            // reset front group map status
+            frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
         }
         // refresh group status
         resetGroupList();

From 33b7e101c1fd5aa953cc695e2ac8b529fab393e1 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 14:33:29 +0800
Subject: [PATCH 078/131] update group front

---
 .../node/mgr/frontgroupmap/FrontGroupMapService.java   |  6 ++++--
 .../com/webank/webase/node/mgr/group/GroupService.java | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index 50f908e41..0b0c288b9 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -28,6 +28,8 @@
 
 import java.util.List;
 
+import static com.webank.webase.node.mgr.group.GroupService.RUNNING_GROUP;
+
 @Slf4j
 @Service
 public class FrontGroupMapService {
@@ -44,7 +46,7 @@ public class FrontGroupMapService {
     /**
      * add new mapping
      */
-    private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
+    public TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
         TbFrontGroupMap tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
 
         //add db
@@ -62,7 +64,7 @@ public void newFrontGroupWithStatus(TbFront front, Integer groupId) {
         // "INEXISTENT"、"STOPPING"、"RUNNING"、"STOPPED"、"DELETED"
         if (res.getCode() == 0) {
             String groupStatus = (String) res.getData();
-            if ("RUNNING".equals(groupStatus)) {
+            if (RUNNING_GROUP.equals(groupStatus)) {
                 newFrontGroup(front.getFrontId(), groupId, GroupStatus.NORMAL.getValue());
             } else {
                 newFrontGroup(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 4a730f425..dac011405 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -82,6 +82,8 @@ public class GroupService {
     @Autowired
     private BlockService blockService;
 
+    public static final String RUNNING_GROUP = "RUNNING";
+
     /**
      * query count of group.
      */
@@ -603,8 +605,16 @@ private Map<String, String> getGroupStatus(String nodeId, List<Integer> groupIdL
             log.error("fail getGroupStatus node front not exists.");
             throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
         }
+
+        // groupId, status
         Map<String, String> statusRes = frontInterface.queryGroupStatus(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), nodeId, groupIdList);
+        // refresh front group map
+        groupIdList.forEach(gId -> {
+            Integer status = RUNNING_GROUP.equalsIgnoreCase(statusRes.get(gId.toString())) ?
+                    GroupStatus.NORMAL.getValue() : GroupStatus.MAINTAINING.getValue();
+            frontGroupMapService.newFrontGroup(tbFront, gId, status);
+        });
         return statusRes;
     }
 

From d27cbbde970652935b41a97a46ef7183a8806b74 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 14:37:57 +0800
Subject: [PATCH 079/131] add log of update status

---
 .../webase/node/mgr/frontgroupmap/FrontGroupMapService.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index 0b0c288b9..177a9a66f 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -61,12 +61,15 @@ public void newFrontGroupWithStatus(TbFront front, Integer groupId) {
         // check front's all group status
         BaseResponse res = frontInterface.operateGroup(front.getFrontIp(), front.getFrontPort(),
                 groupId, "getStatus");
+        log.info("newFrontGroupWithStatus getGroupStatus {}", res);
         // "INEXISTENT"、"STOPPING"、"RUNNING"、"STOPPED"、"DELETED"
         if (res.getCode() == 0) {
             String groupStatus = (String) res.getData();
             if (RUNNING_GROUP.equals(groupStatus)) {
+                log.info("newFrontGroupWithStatus update map's groupStatus NORMAL.");
                 newFrontGroup(front.getFrontId(), groupId, GroupStatus.NORMAL.getValue());
             } else {
+                log.info("newFrontGroupWithStatus update map's groupStatus MAINTAINING.");
                 newFrontGroup(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
             }
         }

From a29d6905a15b2077446287f2f9148bd8fdd1ea44 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 14:42:35 +0800
Subject: [PATCH 080/131] fix group service

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index dac011405..4f193653a 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -221,7 +221,7 @@ public void resetGroupList() {
                 }
                 // refresh front group map
                 frontGroupMapService.newFrontGroupWithStatus(front, gId);
-                //save new peers
+                //save new peers(tb_node)
                 savePeerList(frontIp, frontPort, gId, groupPeerList);
                 //remove invalid peers
                 removeInvalidPeer(gId, groupPeerList);
@@ -613,7 +613,7 @@ private Map<String, String> getGroupStatus(String nodeId, List<Integer> groupIdL
         groupIdList.forEach(gId -> {
             Integer status = RUNNING_GROUP.equalsIgnoreCase(statusRes.get(gId.toString())) ?
                     GroupStatus.NORMAL.getValue() : GroupStatus.MAINTAINING.getValue();
-            frontGroupMapService.newFrontGroup(tbFront, gId, status);
+            frontGroupMapService.newFrontGroup(tbFront.getFrontId(), gId, status);
         });
         return statusRes;
     }

From 680ef60a8b0935c50cf9c4c188e570ab4915054d Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 16:56:33 +0800
Subject: [PATCH 081/131] add remove group of invalid map

---
 .../webase/node/mgr/front/FrontService.java   |  4 +-
 .../mgr/frontgroupmap/FrontGroupMapCache.java |  2 +-
 .../frontgroupmap/FrontGroupMapService.java   |  3 +-
 .../mgr/frontinterface/FrontRestTools.java    |  3 +-
 .../webase/node/mgr/group/GroupService.java   | 43 ++++++++++++++++++-
 5 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index 9d84a4a18..58958ccef 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -270,8 +270,8 @@ public void removeFront(int frontId) {
         frontMapper.remove(frontId);
         //remove map
         frontGroupMapService.removeByFrontId(frontId);
-        //reset group list
-        resetGroupListTask.asyncResetGroupList();
+        //reset group list => remove groups that only belongs to this front
+         resetGroupListTask.asyncResetGroupList();
         //clear cache
         frontGroupMapCache.clearMapList();
     }
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
index 7ee64fe4c..a65139dd6 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
@@ -70,7 +70,7 @@ public List<FrontGroup> getMapListByGroupId(int groupId) {
             .filter(m -> groupId == m.getGroupId()
                     && m.getStatus() == GroupStatus.NORMAL.getValue())
             .collect(Collectors.toList());
-        log.error("getMapListByGroupId map size:{}", map.size());
+        log.info("getMapListByGroupId map size:{}", map.size());
         return map;
     }
 
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index 177a9a66f..487347759 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -61,7 +61,8 @@ public void newFrontGroupWithStatus(TbFront front, Integer groupId) {
         // check front's all group status
         BaseResponse res = frontInterface.operateGroup(front.getFrontIp(), front.getFrontPort(),
                 groupId, "getStatus");
-        log.info("newFrontGroupWithStatus getGroupStatus {}", res);
+        log.info("newFrontGroupWithStatus getGroupStatus frontId{} groupId{} res{}",
+                front.getFrontId(), groupId, res);
         // "INEXISTENT"、"STOPPING"、"RUNNING"、"STOPPED"、"DELETED"
         if (res.getCode() == 0) {
             String groupStatus = (String) res.getData();
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index a9edbaf58..c1227c8b9 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -205,7 +205,8 @@ private static void deleteKeyOfMap(Map<String, FailInfo> map, String rkey) {
         Iterator<String> iter = map.keySet().iterator();
         while (iter.hasNext()) {
             String key = iter.next();
-            if (rkey.equals(key)) {
+            // fix null
+            if (key.equals(rkey)) {
                 iter.remove();
             }
         }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 4f193653a..554c7f848 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -29,6 +29,8 @@
 import com.webank.webase.node.mgr.front.entity.TotalTransCountInfo;
 import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapService;
 import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapCache;
+import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroup;
+import com.webank.webase.node.mgr.frontgroupmap.entity.MapListParam;
 import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
 import com.webank.webase.node.mgr.frontinterface.entity.GenerateGroupInfo;
 import com.webank.webase.node.mgr.group.entity.*;
@@ -83,6 +85,8 @@ public class GroupService {
     private BlockService blockService;
 
     public static final String RUNNING_GROUP = "RUNNING";
+    public static final String OPERATE_START_GROUP = "start";
+    public static final String OPERATE_STOP_GROUP = "stop";
 
     /**
      * query count of group.
@@ -238,6 +242,8 @@ public void resetGroupList() {
         checkGroupGenesisSameWithEach();
         // remove front_group_map that not in tb_front or tb_group
         frontGroupMapService.removeInvalidFrontGroupMap();
+        // remove group and front_group_map that front_group_map's status is all invalid
+        removeInvalidGroupByMap(allGroupSet);
         //clear cache
         frontGroupMapCache.clearMapList();
 
@@ -563,7 +569,7 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
         // request front to operate
         Object groupOperateStatus = frontInterface.operateGroup(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), groupId, type);
-        if ("start".equals(type) || "stop".equals(type)) {
+        if (OPERATE_START_GROUP.equals(type) || OPERATE_STOP_GROUP.equals(type)) {
             // reset front group map status
             frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
         }
@@ -710,4 +716,39 @@ public TbGroup getGroupById(Integer groupId) {
         return groupMapper.getGroupById(groupId);
     }
 
+    /**
+     * check all group
+     * @param allGroupSet
+     */
+    private void removeInvalidGroupByMap(Set<Integer> allGroupSet) {
+        // if all front of group invalid, remove group and front_group_map
+        allGroupSet.forEach(this::removeGroupAccording2MapStatus);
+    }
+
+    /**
+     * remove group whose front(front_group_map) all invalid
+     * case1: remove front, call this
+     * case2: stop all front of one group, call this
+     * @param groupId
+     */
+    public void removeGroupAccording2MapStatus(Integer groupId) {
+        log.debug("removeGroupByMapStatus groupId:{}", groupId);
+        // get list of this group
+        MapListParam param = new MapListParam();
+        param.setGroupId(groupId);
+        // count of group belonging to this front
+        List<FrontGroup> frontListByGroup = frontGroupMapService.getList(param);
+
+        // count of front's groupStatus normal
+        long count = frontListByGroup.stream()
+                .filter( f -> f.getStatus() == GroupStatus.NORMAL.getValue())
+                .count();
+        long countInvalid = frontListByGroup.size() - count;
+        // front belong to this group all invalid
+        if (countInvalid == frontListByGroup.size()) {
+            log.warn("removeGroupByMapStatus all map is valid, remove group: countInvalid:{}", countInvalid);
+            removeAllDataByGroupId(groupId);
+        }
+    }
+
 }

From c6268eca27ab17a99e728eabe5cdcb37e54fdd56 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 17:14:29 +0800
Subject: [PATCH 082/131] debug map invalid

---
 .../node/mgr/frontgroupmap/FrontGroupMapService.java  |  3 ++-
 .../webank/webase/node/mgr/group/GroupService.java    | 11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index 487347759..45d15903f 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -28,6 +28,7 @@
 
 import java.util.List;
 
+import static com.webank.webase.node.mgr.group.GroupService.OPERATE_STATUS_GROUP;
 import static com.webank.webase.node.mgr.group.GroupService.RUNNING_GROUP;
 
 @Slf4j
@@ -60,7 +61,7 @@ public TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer s
     public void newFrontGroupWithStatus(TbFront front, Integer groupId) {
         // check front's all group status
         BaseResponse res = frontInterface.operateGroup(front.getFrontIp(), front.getFrontPort(),
-                groupId, "getStatus");
+                groupId, OPERATE_STATUS_GROUP);
         log.info("newFrontGroupWithStatus getGroupStatus frontId{} groupId{} res{}",
                 front.getFrontId(), groupId, res);
         // "INEXISTENT"、"STOPPING"、"RUNNING"、"STOPPED"、"DELETED"
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 554c7f848..5cabe26a0 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -87,6 +87,7 @@ public class GroupService {
     public static final String RUNNING_GROUP = "RUNNING";
     public static final String OPERATE_START_GROUP = "start";
     public static final String OPERATE_STOP_GROUP = "stop";
+    public static final String OPERATE_STATUS_GROUP = "getStatus";
 
     /**
      * query count of group.
@@ -616,11 +617,11 @@ private Map<String, String> getGroupStatus(String nodeId, List<Integer> groupIdL
         Map<String, String> statusRes = frontInterface.queryGroupStatus(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), nodeId, groupIdList);
         // refresh front group map
-        groupIdList.forEach(gId -> {
-            Integer status = RUNNING_GROUP.equalsIgnoreCase(statusRes.get(gId.toString())) ?
-                    GroupStatus.NORMAL.getValue() : GroupStatus.MAINTAINING.getValue();
-            frontGroupMapService.newFrontGroup(tbFront.getFrontId(), gId, status);
-        });
+//        groupIdList.forEach(gId -> {
+//            Integer status = RUNNING_GROUP.equalsIgnoreCase(statusRes.get(gId.toString())) ?
+//                    GroupStatus.NORMAL.getValue() : GroupStatus.MAINTAINING.getValue();
+//            frontGroupMapService.newFrontGroup(tbFront.getFrontId(), gId, status);
+//        });
         return statusRes;
     }
 

From 25a93332d70ca10d493bcfe64131f8114939cbb9 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 17:32:05 +0800
Subject: [PATCH 083/131] debug map invalid

---
 .../com/webank/webase/node/mgr/group/GroupService.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 5cabe26a0..60f1ff1c9 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -570,10 +570,10 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
         // request front to operate
         Object groupOperateStatus = frontInterface.operateGroup(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), groupId, type);
-        if (OPERATE_START_GROUP.equals(type) || OPERATE_STOP_GROUP.equals(type)) {
-            // reset front group map status
-            frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
-        }
+//        if (OPERATE_START_GROUP.equals(type) || OPERATE_STOP_GROUP.equals(type)) {
+//            // reset front group map status
+//            frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
+//        }
         // refresh group status, not remove tb_group if within gray period (yaml-groupInvalidGrayscaleValue)
         resetGroupList();
 
@@ -646,7 +646,7 @@ public void batchStartGroup(ReqBatchStartGroup req) {
             frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
                     "start");
             // reset front group map status
-            frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
+//            frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
         }
         // refresh group status
         resetGroupList();

From 632bc97652e986c78fa51f76eb518e238225ba00 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 19:06:30 +0800
Subject: [PATCH 084/131] catch null of block request

---
 .../frontgroupmap/FrontGroupMapService.java   |  4 +-
 .../frontinterface/FrontInterfaceService.java |  7 +++-
 .../webase/node/mgr/group/GroupService.java   | 41 +++++++++++++++----
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index 45d15903f..e5956ec98 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -47,9 +47,9 @@ public class FrontGroupMapService {
     /**
      * add new mapping
      */
-    public TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
+    private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
         TbFrontGroupMap tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
-
+        // TODO not working
         //add db
         frontGroupMapMapper.add(tbFrontGroupMap);
         return tbFrontGroupMap;
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
index 7b5c6d5a5..855a77c4a 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
@@ -176,7 +176,12 @@ public BlockInfo getBlockByNumberFromSpecificFront(String frontIp, Integer front
 		log.debug("start getBlockByNumberFromSpecificFront frontIp:{},frontPort{}," +
 				" groupId:{} blockNumber:{}", frontIp, frontPort, groupId, blockNumber);
 		String uri = String.format(FrontRestTools.URI_BLOCK_BY_NUMBER, blockNumber);
-		BlockInfo blockInfo = getFromSpecificFront(groupId, frontIp, frontPort, uri, BlockInfo.class);
+		BlockInfo blockInfo = null;
+		try{
+            blockInfo = getFromSpecificFront(groupId, frontIp, frontPort, uri, BlockInfo.class);
+        } catch (Exception ex) {
+		    log.error("getBlockByNumberFromSpecificFront:{}", ex.getMessage());
+        }
 		return blockInfo;
 	}
 
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 60f1ff1c9..c78af6254 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -212,6 +212,7 @@ public void resetGroupList() {
                 log.error("fail getGroupListFromSpecificFront.", ex);
                 continue;
             }
+            // update by group list on chain
             for (String groupId : groupIdList) {
                 Integer gId = Integer.valueOf(groupId);
                 allGroupSet.add(gId);
@@ -226,6 +227,7 @@ public void resetGroupList() {
                 }
                 // refresh front group map
                 frontGroupMapService.newFrontGroupWithStatus(front, gId);
+
                 //save new peers(tb_node)
                 savePeerList(frontIp, frontPort, gId, groupPeerList);
                 //remove invalid peers
@@ -235,16 +237,19 @@ public void resetGroupList() {
             }
         }
 
-        // check group status(normal or maintaining)
+        // check group status(normal or maintaining), update by local grouplist
         checkAndUpdateGroupStatus(allGroupSet);
         // check group if has dirty data
         checkSameChainDataWithLocal();
         // check group's genesis block same with each other
         checkGroupGenesisSameWithEach();
         // remove front_group_map that not in tb_front or tb_group
+        // if stop group, and not delete group, group not on chain but in local db,
+        // wont's update map as invalid
         frontGroupMapService.removeInvalidFrontGroupMap();
+        checkGroupMapByLocalGroupList(allGroupSet);
         // remove group and front_group_map that front_group_map's status is all invalid
-        removeInvalidGroupByMap(allGroupSet);
+        removeInvalidGroupByMap();
         //clear cache
         frontGroupMapCache.clearMapList();
 
@@ -335,7 +340,7 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
             return;
         }
 
-         List<TbGroup> allLocalGroup = getGroupList(null);
+        List<TbGroup> allLocalGroup = getGroupList(null);
         if (CollectionUtils.isEmpty(allLocalGroup)) {
             return;
         }
@@ -718,12 +723,34 @@ public TbGroup getGroupById(Integer groupId) {
     }
 
     /**
-     * check all group
-     * @param allGroupSet
+     * check and update front group map by local group id list
+     */
+    public void checkGroupMapByLocalGroupList(Set<Integer> allGroupSet) {
+        //get all front
+        List<TbFront> frontList = frontService.getFrontList(new FrontParam());
+        if (frontList == null || frontList.size() == 0) {
+            return;
+        }
+        // local group id
+        List<TbGroup> groupList = getGroupList(null);
+        for (TbFront front: frontList) {
+            groupList.forEach(group -> {
+                Integer groupId = group.getGroupId();
+                // only check local group id
+                if (!allGroupSet.contains(groupId)) {
+                    frontGroupMapService.newFrontGroupWithStatus(front, groupId);
+                }
+            });
+        }
+    }
+
+    /**
+     * check all group and remove those without normal front group
      */
-    private void removeInvalidGroupByMap(Set<Integer> allGroupSet) {
+    private void removeInvalidGroupByMap() {
+        List<TbGroup> groupList = getGroupList(null);
         // if all front of group invalid, remove group and front_group_map
-        allGroupSet.forEach(this::removeGroupAccording2MapStatus);
+        groupList.forEach(tbGroup -> removeGroupAccording2MapStatus(tbGroup.getGroupId()));
     }
 
     /**

From 46a04230f5ca22671c4fa20b790e2b0f83bb5503 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 19:56:07 +0800
Subject: [PATCH 085/131] fix update front_group_map

---
 .../frontgroupmap/FrontGroupMapMapper.java    |  4 +++
 .../frontgroupmap/FrontGroupMapService.java   |  8 +++---
 .../frontgroupmap/entity/MapListParam.java    | 13 ++++++++++
 .../webase/node/mgr/group/GroupService.java   |  8 +++---
 .../resources/mapper/FrontGroupMapMapper.xml  | 26 +++++++++++++++++++
 5 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapMapper.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapMapper.java
index 23d60fcb7..5304fcdcc 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapMapper.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapMapper.java
@@ -26,6 +26,10 @@ public interface FrontGroupMapMapper {
 
     int add(TbFrontGroupMap tbFrontGroupMap);
 
+    int update(TbFrontGroupMap tbFrontGroupMap);
+
+    FrontGroup queryFrontGroup(MapListParam mapListParam);
+
     int getCount(MapListParam mapListParam);
 
     int removeByGroupId(@Param("groupId") Integer groupId);
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index e5956ec98..654095f09 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -48,10 +48,12 @@ public class FrontGroupMapService {
      * add new mapping
      */
     private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
+        MapListParam param = new MapListParam(frontId, groupId);
+        FrontGroup frontGroup = frontGroupMapMapper.queryFrontGroup(param);
+        // add db
         TbFrontGroupMap tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
-        // TODO not working
-        //add db
-        frontGroupMapMapper.add(tbFrontGroupMap);
+        tbFrontGroupMap.setMapId(frontGroup.getMapId());
+        Integer res = frontGroupMapMapper.update(tbFrontGroupMap);
         return tbFrontGroupMap;
     }
 
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/MapListParam.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/MapListParam.java
index 031c057ed..4491aea6e 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/MapListParam.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/entity/MapListParam.java
@@ -14,11 +14,24 @@
 package com.webank.webase.node.mgr.frontgroupmap.entity;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
+@NoArgsConstructor
 public class MapListParam {
     private int mapId;
     private int frontId;
     private int groupId;
     private int status;
+
+    public MapListParam(int frontId, int groupId) {
+        this.frontId = frontId;
+        this.groupId = groupId;
+    }
+
+    public MapListParam(int frontId, int groupId, int status) {
+        this.frontId = frontId;
+        this.groupId = groupId;
+        this.status = status;
+    }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index c78af6254..3b292cd2c 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -225,7 +225,8 @@ public void resetGroupList() {
                     saveGroup(gId, groupPeerList.size(), "synchronous",
                             GroupType.SYNC.getValue(), GroupStatus.NORMAL.getValue());
                 }
-                // refresh front group map
+                // refresh front group map by group list onchain
+                // different from checkGroupMapByLocalGroupList
                 frontGroupMapService.newFrontGroupWithStatus(front, gId);
 
                 //save new peers(tb_node)
@@ -239,14 +240,15 @@ public void resetGroupList() {
 
         // check group status(normal or maintaining), update by local grouplist
         checkAndUpdateGroupStatus(allGroupSet);
-        // check group if has dirty data
+        // check group local whether has dirty data
         checkSameChainDataWithLocal();
-        // check group's genesis block same with each other
+        // check group's genesis block same with each other front
         checkGroupGenesisSameWithEach();
         // remove front_group_map that not in tb_front or tb_group
         // if stop group, and not delete group, group not on chain but in local db,
         // wont's update map as invalid
         frontGroupMapService.removeInvalidFrontGroupMap();
+        // update group_map status by local group
         checkGroupMapByLocalGroupList(allGroupSet);
         // remove group and front_group_map that front_group_map's status is all invalid
         removeInvalidGroupByMap();
diff --git a/src/main/resources/mapper/FrontGroupMapMapper.xml b/src/main/resources/mapper/FrontGroupMapMapper.xml
index b462ff997..8aa3a1458 100644
--- a/src/main/resources/mapper/FrontGroupMapMapper.xml
+++ b/src/main/resources/mapper/FrontGroupMapMapper.xml
@@ -23,6 +23,32 @@
         </selectKey>
     </insert>
 
+    <update id="update" parameterType="com.webank.webase.node.mgr.frontgroupmap.entity.TbFrontGroupMap">
+        update tb_front_group_map set modify_time = now()
+        <if test="status != null and status != ''">
+            ,status = #{status}
+        </if>
+        where map_id = #{mapId}
+    </update>
+
+    <select id="queryFrontGroup" parameterType="com.webank.webase.node.mgr.frontgroupmap.entity.MapListParam"
+            resultMap="frontGroupMap">
+        select * from tb_front_group_map where 1=1
+        <if test="mapId != null and mapId != ''">
+            and map_id = #{param.mapId}
+        </if>
+        <if test="frontId != null and frontId != ''">
+            and front_id = #{frontId}
+        </if>
+        <if test="groupId != null and groupId != ''">
+            and group_id = #{groupId}
+        </if>
+        <if test="status != null and status != ''">
+            and status = #{status}
+        </if>
+        limit 1
+    </select>
+
     <select id="getCount" resultType="java.lang.Integer"
             parameterType="com.webank.webase.node.mgr.frontgroupmap.entity.MapListParam">
         select count(1) from tb_front_group_map where 1=1

From b247304d846875aa24a550c9e5d97fb51eb027a9 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 20:03:15 +0800
Subject: [PATCH 086/131] fix dead lock

---
 .../node/mgr/frontgroupmap/FrontGroupMapService.java | 12 +++++++++---
 .../webank/webase/node/mgr/group/GroupService.java   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index 654095f09..b255ca448 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -51,9 +51,15 @@ private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer
         MapListParam param = new MapListParam(frontId, groupId);
         FrontGroup frontGroup = frontGroupMapMapper.queryFrontGroup(param);
         // add db
-        TbFrontGroupMap tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
-        tbFrontGroupMap.setMapId(frontGroup.getMapId());
-        Integer res = frontGroupMapMapper.update(tbFrontGroupMap);
+        TbFrontGroupMap tbFrontGroupMap;
+        if (frontGroup == null) {
+            tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
+            frontGroupMapMapper.add(tbFrontGroupMap);
+        } else {
+            tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
+            tbFrontGroupMap.setMapId(frontGroup.getMapId());
+            frontGroupMapMapper.update(tbFrontGroupMap);
+        }
         return tbFrontGroupMap;
     }
 
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 3b292cd2c..591626586 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -188,7 +188,7 @@ public GroupGeneral queryGroupGeneral(int groupId) throws NodeMgrException {
      * reset groupList.
      */
     @Transactional
-    public void resetGroupList() {
+    public synchronized void resetGroupList() {
         Instant startTime = Instant.now();
         log.info("start resetGroupList. startTime:{}", startTime.toEpochMilli());
 

From 6f10851cfed29953127ece528cb7082db0c566ef Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 20:30:19 +0800
Subject: [PATCH 087/131] add update map log

---
 .../node/mgr/frontgroupmap/FrontGroupMapService.java      | 1 +
 .../webase/node/mgr/precompiled/PrecompiledService.java   | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index b255ca448..b37e44147 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -48,6 +48,7 @@ public class FrontGroupMapService {
      * add new mapping
      */
     private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
+        log.info("start newFrontGroup frontId:{} groupId:{} status:{}", frontId, groupId, status);
         MapListParam param = new MapListParam(frontId, groupId);
         FrontGroup frontGroup = frontGroupMapMapper.queryFrontGroup(param);
         // add db
diff --git a/src/main/java/com/webank/webase/node/mgr/precompiled/PrecompiledService.java b/src/main/java/com/webank/webase/node/mgr/precompiled/PrecompiledService.java
index a8a8333ac..8bb69e04f 100644
--- a/src/main/java/com/webank/webase/node/mgr/precompiled/PrecompiledService.java
+++ b/src/main/java/com/webank/webase/node/mgr/precompiled/PrecompiledService.java
@@ -28,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -77,7 +78,12 @@ public Object getNodeListService(int groupId, int pageSize, int pageNumber) {
         map.put("pageSize", String.valueOf(pageSize));
         map.put("pageNumber", String.valueOf(pageNumber));
         uri = HttpRequestTools.getQueryUri(FrontRestTools.URI_CONSENSUS_LIST, map);
-        Object frontRsp = frontRestTools.getForEntity(groupId, uri, Object.class);
+        Object frontRsp = null;
+//        try {
+            frontRsp = frontRestTools.getForEntity(groupId, uri, Object.class);
+//        } catch (Exception ex) {
+//            log.error("getNodeListService :{}", ex.getMessage());
+//        }
         log.debug("end getNodeListService. frontRsp:{}", JSON.toJSONString(frontRsp));
         return frontRsp;
     }

From 569a1d54832ea79e75ee9c27226a0876cd7c3ae3 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 20:31:07 +0800
Subject: [PATCH 088/131] add update map log

---
 .../webase/node/mgr/frontgroupmap/FrontGroupMapService.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index b37e44147..a521bc1e2 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -51,6 +51,8 @@ private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer
         log.info("start newFrontGroup frontId:{} groupId:{} status:{}", frontId, groupId, status);
         MapListParam param = new MapListParam(frontId, groupId);
         FrontGroup frontGroup = frontGroupMapMapper.queryFrontGroup(param);
+        log.info("start newFrontGroup frontGroup query:{}", frontGroup);
+
         // add db
         TbFrontGroupMap tbFrontGroupMap;
         if (frontGroup == null) {

From 405a43858304880c1e5321785c6b7be8ffeeaec1 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 20:37:48 +0800
Subject: [PATCH 089/131] add update map log

---
 .../node/mgr/frontgroupmap/FrontGroupMapService.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index a521bc1e2..d1aab415f 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -55,14 +55,17 @@ private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer
 
         // add db
         TbFrontGroupMap tbFrontGroupMap;
+        Integer res;
         if (frontGroup == null) {
             tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
-            frontGroupMapMapper.add(tbFrontGroupMap);
+            res = frontGroupMapMapper.add(tbFrontGroupMap);
         } else {
             tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
             tbFrontGroupMap.setMapId(frontGroup.getMapId());
-            frontGroupMapMapper.update(tbFrontGroupMap);
+            res = frontGroupMapMapper.update(tbFrontGroupMap);
         }
+        log.info("end newFrontGroup res:{}", res);
+
         return tbFrontGroupMap;
     }
 

From fbceeb584cae859dd26ebffdaaa553651500e891 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 25 May 2020 20:41:20 +0800
Subject: [PATCH 090/131] add update map log

---
 .../webase/node/mgr/frontgroupmap/FrontGroupMapService.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index d1aab415f..a66f3d541 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -54,14 +54,16 @@ private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer
         log.info("start newFrontGroup frontGroup query:{}", frontGroup);
 
         // add db
-        TbFrontGroupMap tbFrontGroupMap;
+        TbFrontGroupMap tbFrontGroupMap = null;
         Integer res;
         if (frontGroup == null) {
             tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
+            log.info("newFrontGroup tbFrontGroupMap:{}", tbFrontGroupMap);
             res = frontGroupMapMapper.add(tbFrontGroupMap);
         } else {
             tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
             tbFrontGroupMap.setMapId(frontGroup.getMapId());
+            log.info("newFrontGroup tbFrontGroupMap:{}", tbFrontGroupMap);
             res = frontGroupMapMapper.update(tbFrontGroupMap);
         }
         log.info("end newFrontGroup res:{}", res);

From 7f29a8b37efbf9ba729c88ef9358f91041bfe525 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 09:53:00 +0800
Subject: [PATCH 091/131] add update map log

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 591626586..e4a8b8377 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -274,8 +274,6 @@ private void savePeerList(String frontIp, Integer frontPort, int groupId, List<S
             // if local hash node, count = 1
             long count = localNodeList.stream().filter(
                     ln -> nodeId.equals(ln.getNodeId()) && groupId == ln.getGroupId()).count();
-            // TODO remove
-            log.error("=========== savePeerList:{}", count);
             // local node not contains this one:
             if (count != 1) {
                 PeerInfo newPeer = peerList.stream().filter(peer -> nodeId.equals(peer.getNodeId()))
@@ -726,6 +724,7 @@ public TbGroup getGroupById(Integer groupId) {
 
     /**
      * check and update front group map by local group id list
+     *  TODO 未生效
      */
     public void checkGroupMapByLocalGroupList(Set<Integer> allGroupSet) {
         //get all front
@@ -735,11 +734,13 @@ public void checkGroupMapByLocalGroupList(Set<Integer> allGroupSet) {
         }
         // local group id
         List<TbGroup> groupList = getGroupList(null);
+        log.info("checkGroupMapByLocalGroupList allGroupSet:{},frontList:{},groupList:{}",allGroupSet ,frontList groupList);
         for (TbFront front: frontList) {
             groupList.forEach(group -> {
                 Integer groupId = group.getGroupId();
                 // only check local group id
                 if (!allGroupSet.contains(groupId)) {
+                    log.info("checkGroupMapByLocalGroupList. front:{}, groupId:{} ", front, groupId);
                     frontGroupMapService.newFrontGroupWithStatus(front, groupId);
                 }
             });

From c19fda66403f94681ae8d0d5f80eaac68c123b2a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 10:02:08 +0800
Subject: [PATCH 092/131] debug map staus

---
 .../webank/webase/node/mgr/group/GroupService.java  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index e4a8b8377..0582ee0f1 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -575,11 +575,12 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
         // request front to operate
         Object groupOperateStatus = frontInterface.operateGroup(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), groupId, type);
-//        if (OPERATE_START_GROUP.equals(type) || OPERATE_STOP_GROUP.equals(type)) {
-//            // reset front group map status
-//            frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
-//        }
-        // refresh group status, not remove tb_group if within gray period (yaml-groupInvalidGrayscaleValue)
+        if (OPERATE_START_GROUP.equals(type) || OPERATE_STOP_GROUP.equals(type)) {
+            // reset front group map status
+			log.info("operateGroup type:{}, update front_group_map status :{}:{}", type,  tbFront, groupId);
+			frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
+        }
+        // refresh group status
         resetGroupList();
 
         // return
@@ -734,7 +735,7 @@ public void checkGroupMapByLocalGroupList(Set<Integer> allGroupSet) {
         }
         // local group id
         List<TbGroup> groupList = getGroupList(null);
-        log.info("checkGroupMapByLocalGroupList allGroupSet:{},frontList:{},groupList:{}",allGroupSet ,frontList groupList);
+        log.info("checkGroupMapByLocalGroupList allGroupSet:{},frontList:{},groupList:{}",allGroupSet ,frontList, groupList);
         for (TbFront front: frontList) {
             groupList.forEach(group -> {
                 Integer groupId = group.getGroupId();

From 2f330f4ea9cda923464b590ca19b15ed60f08f13 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 10:31:36 +0800
Subject: [PATCH 093/131] fix check map status by local group

---
 .../webase/node/mgr/group/GroupService.java   | 334 +++++++++---------
 1 file changed, 172 insertions(+), 162 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 0582ee0f1..0a801e06d 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -192,7 +192,7 @@ public synchronized void resetGroupList() {
         Instant startTime = Instant.now();
         log.info("start resetGroupList. startTime:{}", startTime.toEpochMilli());
 
-        //all groupId from chain
+        //all groupId from chain and all node, to check the whole group whether normal
         Set<Integer> allGroupSet = new HashSet<>();
 
         //get all front
@@ -200,65 +200,110 @@ public synchronized void resetGroupList() {
         if (frontList == null || frontList.size() == 0) {
             return;
         }
-        //get group from chain
-        for (TbFront front : frontList) {
-            String frontIp = front.getFrontIp();
-            int frontPort = front.getFrontPort();
-            //query group list
-            List<String> groupIdList;
-            try {
-                groupIdList = frontInterface.getGroupListFromSpecificFront(frontIp, frontPort);
-            } catch (Exception ex) {
-                log.error("fail getGroupListFromSpecificFront.", ex);
-                continue;
-            }
-            // update by group list on chain
-            for (String groupId : groupIdList) {
-                Integer gId = Integer.valueOf(groupId);
-                allGroupSet.add(gId);
-                // peer in group
-                List<String> groupPeerList = frontInterface.getGroupPeersFromSpecificFront(frontIp, frontPort, gId);
-                // check group not existed or node count differs
-                TbGroup checkGroup = getGroupById(gId);
-                if (Objects.isNull(checkGroup) || groupPeerList.size() != checkGroup.getNodeCount()) {
-                    // save group
-                    saveGroup(gId, groupPeerList.size(), "synchronous",
-                            GroupType.SYNC.getValue(), GroupStatus.NORMAL.getValue());
-                }
-                // refresh front group map by group list onchain
-                // different from checkGroupMapByLocalGroupList
-                frontGroupMapService.newFrontGroupWithStatus(front, gId);
-
-                //save new peers(tb_node)
-                savePeerList(frontIp, frontPort, gId, groupPeerList);
-                //remove invalid peers
-                removeInvalidPeer(gId, groupPeerList);
-                //refresh: add sealer and observer no matter validity
-                frontService.refreshSealerAndObserverInNodeList(frontIp, frontPort, gId);
-            }
-        }
+        // save group and nodes(peers, sealer, observer) and front_group_map from chain
+		// update front_group_map by chain data
+		saveDataOfGroup(frontList, allGroupSet);
 
-        // check group status(normal or maintaining), update by local grouplist
+        // check group status(normal or maintaining), update by local group list
+		// if groupid not in allGroupSet, remove it
         checkAndUpdateGroupStatus(allGroupSet);
-        // check group local whether has dirty data
+        // check group local whether has dirty data by contrast of local blockHash with chain blockHash
+		// if not same, update group as DIRTY
         checkSameChainDataWithLocal();
-        // check group's genesis block same with each other front
+        // check group's genesis block same with each other front,
+		// if not, update group as CONFLICT
         checkGroupGenesisSameWithEach();
-        // remove front_group_map that not in tb_front or tb_group
-        // if stop group, and not delete group, group not on chain but in local db,
-        // wont's update map as invalid
+        // remove front_group_map that not in tb_front or tb_group by local data
         frontGroupMapService.removeInvalidFrontGroupMap();
-        // update group_map status by local group
-        checkGroupMapByLocalGroupList(allGroupSet);
+        // update front_group_map status of local group
+        checkGroupMapByLocalGroupList(frontList);
         // remove group and front_group_map that front_group_map's status is all invalid
         removeInvalidGroupByMap();
-        //clear cache
+        // clear cache
         frontGroupMapCache.clearMapList();
 
         log.info("end resetGroupList. useTime:{} ",
                 Duration.between(startTime, Instant.now()).toMillis());
     }
 
+	/**
+	 * check group status(normal or maintaining), update by local group list
+	 * if groupid not in allGroupSet, remove it
+	 * @param frontList
+	 * @param allGroupSet
+	 */
+	private void saveDataOfGroup(List<TbFront> frontList, Set<Integer> allGroupSet) {
+		for (TbFront front : frontList) {
+			String frontIp = front.getFrontIp();
+			int frontPort = front.getFrontPort();
+			// query group list from chain
+			List<String> groupIdList;
+			try {
+				groupIdList = frontInterface.getGroupListFromSpecificFront(frontIp, frontPort);
+			} catch (Exception ex) {
+				log.error("fail getGroupListFromSpecificFront.", ex);
+				continue;
+			}
+			// update by group list on chain
+			for (String groupId : groupIdList) {
+				Integer gId = Integer.valueOf(groupId);
+				allGroupSet.add(gId);
+				// peer in group
+				List<String> groupPeerList = frontInterface.getGroupPeersFromSpecificFront(frontIp, frontPort, gId);
+				// check group not existed or node count differs
+				// save group entity
+				TbGroup checkGroupExist = getGroupById(gId);
+				if (Objects.isNull(checkGroupExist) || groupPeerList.size() != checkGroupExist.getNodeCount()) {
+					saveGroup(gId, groupPeerList.size(), "synchronous",
+							GroupType.SYNC.getValue(), GroupStatus.NORMAL.getValue());
+				}
+				// refresh front group map by group list on chain
+				// different from checkGroupMapByLocalGroupList which update by local groupList
+				frontGroupMapService.newFrontGroupWithStatus(front, gId);
+
+				//save new peers(tb_node)
+				savePeerList(frontIp, frontPort, gId, groupPeerList);
+				//remove invalid peers
+				removeInvalidPeer(gId, groupPeerList);
+				//refresh: add sealer and observer no matter validity
+				frontService.refreshSealerAndObserverInNodeList(frontIp, frontPort, gId);
+			}
+		}
+	}
+
+	/**
+	 * remove invalid peer.
+	 */
+	private void removeInvalidPeer(int groupId, List<String> groupPeerList) {
+		if (groupId == 0) {
+			return;
+		}
+		//get local peers
+		List<TbNode> localNodes = nodeService.queryByGroupId(groupId);
+		if (CollectionUtils.isEmpty(localNodes)) {
+			return;
+		}
+		//remove node that's not in groupPeerList and not in sealer/observer list
+		localNodes.stream()
+				.filter(node ->
+						!groupPeerList.contains(node.getNodeId())
+								&& !checkSealerAndObserverListContains(groupId, node.getNodeId()))
+				.forEach(n ->
+						nodeService.deleteByNodeAndGroupId(n.getNodeId(), groupId));
+	}
+
+	private boolean checkSealerAndObserverListContains(int groupId, String nodeId) {
+		log.debug("checkSealerAndObserverListNotContains nodeId:{},groupId:{}",
+				nodeId, groupId);
+		//get sealer and observer on chain
+		List<PeerInfo> sealerAndObserverList = nodeService.getSealerAndObserverList(groupId);
+		for (PeerInfo peerInfo : sealerAndObserverList) {
+			if (nodeId.equals(peerInfo.getNodeId())) {
+				return true;
+			}
+		}
+		return false;
+	}
 
 	/**
      * save new peers that not in group peers
@@ -284,54 +329,6 @@ private void savePeerList(String frontIp, Integer frontPort, int groupId, List<S
     }
 
 
-    /**
-     * remove all group.
-     */
-    private void removeAllGroup() {
-        List<TbGroup> allGroup = getGroupList(null);
-        if (CollectionUtils.isEmpty(allGroup)) {
-            log.info("removeAllGroup jump over. not fount any group");
-            return;
-        }
-
-        //remove each group
-        allGroup.stream().forEach(group -> removeAllDataByGroupId(group.getGroupId()));
-    }
-
-    /**
-     * remove invalid peer.
-     */
-    private void removeInvalidPeer(int groupId, List<String> groupPeerList) {
-        if (groupId == 0) {
-            return;
-        }
-        //get local peers
-        List<TbNode> localNodes = nodeService.queryByGroupId(groupId);
-        if (CollectionUtils.isEmpty(localNodes)) {
-            return;
-        }
-        //remove node that's not in groupPeerList and not in sealer/observer list
-        localNodes.stream()
-                .filter(node ->
-                        !groupPeerList.contains(node.getNodeId())
-                    && !checkSealerAndObserverListContains(groupId, node.getNodeId()))
-                .forEach(n ->
-                        nodeService.deleteByNodeAndGroupId(n.getNodeId(), groupId));
-    }
-
-    private boolean checkSealerAndObserverListContains(int groupId, String nodeId) {
-        log.debug("checkSealerAndObserverListNotContains nodeId:{},groupId:{}",
-                nodeId, groupId);
-        //get sealer and observer on chain
-        List<PeerInfo> sealerAndObserverList = nodeService.getSealerAndObserverList(groupId);
-        for (PeerInfo peerInfo : sealerAndObserverList) {
-            if (nodeId.equals(peerInfo.getNodeId())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     /**
      * check group status and Update
      */
@@ -471,6 +468,83 @@ private void checkSameChainDataWithLocal() {
 
     }
 
+	/**
+	 * check and update front group map by local group id list
+	 */
+	public void checkGroupMapByLocalGroupList(List<TbFront> frontList) {
+		// local group id
+		List<TbGroup> groupListLocal = getGroupList(null);
+		log.info("checkGroupMapByLocalGroupList frontList:{},groupListLocal:{}",
+				frontList, groupListLocal);
+		for (TbFront front: frontList) {
+			// query roup list from chain
+			List<String> groupListOnChain;
+			try {
+				groupListOnChain = frontInterface.getGroupListFromSpecificFront(front.getFrontIp(), front.getFrontPort());
+			} catch (Exception ex) {
+				log.error("fail getGroupListFromSpecificFront.", ex);
+				continue;
+			}
+			groupListLocal.forEach(group -> {
+				Integer groupId = group.getGroupId();
+				// only check local group id
+				if (!groupListOnChain.contains(groupId.toString())) {
+					log.info("checkGroupMapByLocalGroupList. front:{}, groupId:{} ", front, groupId);
+					frontGroupMapService.newFrontGroupWithStatus(front, groupId);
+				}
+			});
+		}
+	}
+
+	/**
+	 * check all group and remove those without normal front group
+	 */
+	private void removeInvalidGroupByMap() {
+		List<TbGroup> groupList = getGroupList(null);
+		// if all front of group invalid, remove group and front_group_map
+		groupList.forEach(tbGroup -> removeGroupAccording2MapStatus(tbGroup.getGroupId()));
+	}
+
+	/**
+	 * remove group whose front(front_group_map) all invalid
+	 * case1: remove front, call this
+	 * case2: stop all front of one group, call this
+	 * @param groupId
+	 */
+	public void removeGroupAccording2MapStatus(Integer groupId) {
+		log.debug("removeGroupByMapStatus groupId:{}", groupId);
+		// get list of this group
+		MapListParam param = new MapListParam();
+		param.setGroupId(groupId);
+		// count of group belonging to this front
+		List<FrontGroup> frontListByGroup = frontGroupMapService.getList(param);
+
+		// count of front's groupStatus normal
+		long count = frontListByGroup.stream()
+				.filter( f -> f.getStatus() == GroupStatus.NORMAL.getValue())
+				.count();
+		long countInvalid = frontListByGroup.size() - count;
+		// front belong to this group all invalid
+		if (countInvalid == frontListByGroup.size()) {
+			log.warn("removeGroupByMapStatus all map is valid, remove group: countInvalid:{}", countInvalid);
+			removeAllDataByGroupId(groupId);
+		}
+	}
+
+
+	/**
+	 * remove all group.
+	 */
+	private void removeAllGroup() {
+		List<TbGroup> allGroup = getGroupList(null);
+		if (CollectionUtils.isEmpty(allGroup)) {
+			log.info("removeAllGroup jump over. not fount any group");
+			return;
+		}
+
+		//remove each group
+		allGroup.stream().forEach(group -> removeAllDataByGroupId(group.getGroupId()));
+	}
 
     /**
      * remove all data by groupId.
@@ -499,6 +573,7 @@ protected void removeAllDataByGroupId(int groupId) {
         log.warn("end removeAllDataByGroupId");
     }
 
+    /* dynamic group operation */
     /**
      * generate group to single node.
      *
@@ -622,12 +697,6 @@ private Map<String, String> getGroupStatus(String nodeId, List<Integer> groupIdL
         // groupId, status
         Map<String, String> statusRes = frontInterface.queryGroupStatus(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), nodeId, groupIdList);
-        // refresh front group map
-//        groupIdList.forEach(gId -> {
-//            Integer status = RUNNING_GROUP.equalsIgnoreCase(statusRes.get(gId.toString())) ?
-//                    GroupStatus.NORMAL.getValue() : GroupStatus.MAINTAINING.getValue();
-//            frontGroupMapService.newFrontGroup(tbFront.getFrontId(), gId, status);
-//        });
         return statusRes;
     }
 
@@ -651,14 +720,14 @@ public void batchStartGroup(ReqBatchStartGroup req) {
             // request front to start
             frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
                     "start");
-            // reset front group map status
-//            frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
         }
         // refresh group status
         resetGroupList();
         log.debug("end batchStartGroup.");
     }
 
+    /* end dynamic group operation*/
+
     /**
      * save group id
      */
@@ -723,64 +792,5 @@ public TbGroup getGroupById(Integer groupId) {
         return groupMapper.getGroupById(groupId);
     }
 
-    /**
-     * check and update front group map by local group id list
-     *  TODO 未生效
-     */
-    public void checkGroupMapByLocalGroupList(Set<Integer> allGroupSet) {
-        //get all front
-        List<TbFront> frontList = frontService.getFrontList(new FrontParam());
-        if (frontList == null || frontList.size() == 0) {
-            return;
-        }
-        // local group id
-        List<TbGroup> groupList = getGroupList(null);
-        log.info("checkGroupMapByLocalGroupList allGroupSet:{},frontList:{},groupList:{}",allGroupSet ,frontList, groupList);
-        for (TbFront front: frontList) {
-            groupList.forEach(group -> {
-                Integer groupId = group.getGroupId();
-                // only check local group id
-                if (!allGroupSet.contains(groupId)) {
-                    log.info("checkGroupMapByLocalGroupList. front:{}, groupId:{} ", front, groupId);
-                    frontGroupMapService.newFrontGroupWithStatus(front, groupId);
-                }
-            });
-        }
-    }
-
-    /**
-     * check all group and remove those without normal front group
-     */
-    private void removeInvalidGroupByMap() {
-        List<TbGroup> groupList = getGroupList(null);
-        // if all front of group invalid, remove group and front_group_map
-        groupList.forEach(tbGroup -> removeGroupAccording2MapStatus(tbGroup.getGroupId()));
-    }
-
-    /**
-     * remove group whose front(front_group_map) all invalid
-     * case1: remove front, call this
-     * case2: stop all front of one group, call this
-     * @param groupId
-     */
-    public void removeGroupAccording2MapStatus(Integer groupId) {
-        log.debug("removeGroupByMapStatus groupId:{}", groupId);
-        // get list of this group
-        MapListParam param = new MapListParam();
-        param.setGroupId(groupId);
-        // count of group belonging to this front
-        List<FrontGroup> frontListByGroup = frontGroupMapService.getList(param);
-
-        // count of front's groupStatus normal
-        long count = frontListByGroup.stream()
-                .filter( f -> f.getStatus() == GroupStatus.NORMAL.getValue())
-                .count();
-        long countInvalid = frontListByGroup.size() - count;
-        // front belong to this group all invalid
-        if (countInvalid == frontListByGroup.size()) {
-            log.warn("removeGroupByMapStatus all map is valid, remove group: countInvalid:{}", countInvalid);
-            removeAllDataByGroupId(groupId);
-        }
-    }
 
 }

From 719a3d9b68fafb0ee8e918266a08cd68b3d7a43c Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 10:41:18 +0800
Subject: [PATCH 094/131] add comments of update

---
 .../webase/node/mgr/group/GroupService.java   | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 0a801e06d..3361c2bff 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -229,8 +229,8 @@ public synchronized void resetGroupList() {
 	/**
 	 * check group status(normal or maintaining), update by local group list
 	 * if groupid not in allGroupSet, remove it
-	 * @param frontList
-	 * @param allGroupSet
+	 * @param frontList all front
+	 * @param allGroupSet to record all group from each front
 	 */
 	private void saveDataOfGroup(List<TbFront> frontList, Set<Integer> allGroupSet) {
 		for (TbFront front : frontList) {
@@ -331,6 +331,8 @@ private void savePeerList(String frontIp, Integer frontPort, int groupId, List<S
 
     /**
      * check group status and Update
+	 * check group status(normal or maintaining), update by local group list
+	 * 	@param allGroupOnChain if groupid not in allGroupSet, remove it
      */
     private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
         if (CollectionUtils.isEmpty(allGroupOnChain)) {
@@ -373,6 +375,7 @@ private void checkAndUpdateGroupStatus(Set<Integer> allGroupOnChain) {
 
 	/**
 	 * check group's genesis block the same with each other on chain
+	 * @case: each front has different genesis conf, but add in same nodemgr
 	 */
 	private void checkGroupGenesisSameWithEach() {
 	    log.info("start checkGroupGenesisSameWithEach.");
@@ -470,11 +473,14 @@ private void checkSameChainDataWithLocal() {
 
 	/**
 	 * check and update front group map by local group id list
+	 * @case: front1 has group2, front2 not has group2,
+	 * so groupListOnChain from front don't contain group2, need to check if front_group_map of front2_group2 in db
+	 * if so, remove it
 	 */
 	public void checkGroupMapByLocalGroupList(List<TbFront> frontList) {
 		// local group id
 		List<TbGroup> groupListLocal = getGroupList(null);
-		log.info("checkGroupMapByLocalGroupList frontList:{},groupListLocal:{}",
+		log.debug("checkGroupMapByLocalGroupList frontList:{},groupListLocal:{}",
 				frontList, groupListLocal);
 		for (TbFront front: frontList) {
 			// query roup list from chain
@@ -489,7 +495,8 @@ public void checkGroupMapByLocalGroupList(List<TbFront> frontList) {
 				Integer groupId = group.getGroupId();
 				// only check local group id
 				if (!groupListOnChain.contains(groupId.toString())) {
-					log.info("checkGroupMapByLocalGroupList. front:{}, groupId:{} ", front, groupId);
+					log.info("update front_group_map by local data front:{}, groupId:{} ",
+							front, groupId);
 					frontGroupMapService.newFrontGroupWithStatus(front, groupId);
 				}
 			});
@@ -498,11 +505,13 @@ public void checkGroupMapByLocalGroupList(List<TbFront> frontList) {
 
 	/**
 	 * check all group and remove those without normal front group
+	 * @related removeGroupAccording2MapStatus
 	 */
 	private void removeInvalidGroupByMap() {
 		List<TbGroup> groupList = getGroupList(null);
 		// if all front of group invalid, remove group and front_group_map
-		groupList.forEach(tbGroup -> removeGroupAccording2MapStatus(tbGroup.getGroupId()));
+		groupList.forEach(tbGroup ->
+				removeGroupBy2MapStatus(tbGroup.getGroupId()));
 	}
 
 	/**
@@ -511,7 +520,7 @@ private void removeInvalidGroupByMap() {
 	 * case2: stop all front of one group, call this
 	 * @param groupId
 	 */
-	public void removeGroupAccording2MapStatus(Integer groupId) {
+	private void removeGroupBy2MapStatus(Integer groupId) {
 		log.debug("removeGroupByMapStatus groupId:{}", groupId);
 		// get list of this group
 		MapListParam param = new MapListParam();

From ac9236e9085ffbc8b37b9311ccabecf270114b6c Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 11:09:44 +0800
Subject: [PATCH 095/131] fix import url

---
 .../mgr/frontgroupmap/FrontGroupMapService.java    | 14 +++++++-------
 .../node/mgr/frontinterface/FrontRestTools.java    |  3 ++-
 .../webase/node/mgr/user/UserController.java       |  5 ++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index a66f3d541..273adff32 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -51,22 +51,22 @@ private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer
         log.info("start newFrontGroup frontId:{} groupId:{} status:{}", frontId, groupId, status);
         MapListParam param = new MapListParam(frontId, groupId);
         FrontGroup frontGroup = frontGroupMapMapper.queryFrontGroup(param);
-        log.info("start newFrontGroup frontGroup query:{}", frontGroup);
+        log.debug("start newFrontGroup frontGroup query:{}", frontGroup);
 
         // add db
         TbFrontGroupMap tbFrontGroupMap = null;
         Integer res;
         if (frontGroup == null) {
             tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
-            log.info("newFrontGroup tbFrontGroupMap:{}", tbFrontGroupMap);
+            log.debug("newFrontGroup tbFrontGroupMap:{}", tbFrontGroupMap);
             res = frontGroupMapMapper.add(tbFrontGroupMap);
         } else {
             tbFrontGroupMap = new TbFrontGroupMap(frontId, groupId, status);
             tbFrontGroupMap.setMapId(frontGroup.getMapId());
-            log.info("newFrontGroup tbFrontGroupMap:{}", tbFrontGroupMap);
+            log.debug("newFrontGroup tbFrontGroupMap:{}", tbFrontGroupMap);
             res = frontGroupMapMapper.update(tbFrontGroupMap);
         }
-        log.info("end newFrontGroup res:{}", res);
+        log.debug("end newFrontGroup res:{}", res);
 
         return tbFrontGroupMap;
     }
@@ -78,16 +78,16 @@ public void newFrontGroupWithStatus(TbFront front, Integer groupId) {
         // check front's all group status
         BaseResponse res = frontInterface.operateGroup(front.getFrontIp(), front.getFrontPort(),
                 groupId, OPERATE_STATUS_GROUP);
-        log.info("newFrontGroupWithStatus getGroupStatus frontId{} groupId{} res{}",
+        log.debug("newFrontGroupWithStatus getGroupStatus frontId{} groupId{} res{}",
                 front.getFrontId(), groupId, res);
         // "INEXISTENT"、"STOPPING"、"RUNNING"、"STOPPED"、"DELETED"
         if (res.getCode() == 0) {
             String groupStatus = (String) res.getData();
             if (RUNNING_GROUP.equals(groupStatus)) {
-                log.info("newFrontGroupWithStatus update map's groupStatus NORMAL.");
+                log.debug("newFrontGroupWithStatus update map's groupStatus NORMAL.");
                 newFrontGroup(front.getFrontId(), groupId, GroupStatus.NORMAL.getValue());
             } else {
-                log.info("newFrontGroupWithStatus update map's groupStatus MAINTAINING.");
+                log.debug("newFrontGroupWithStatus update map's groupStatus MAINTAINING.");
                 newFrontGroup(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
             }
         }
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index c1227c8b9..69872d8e1 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -108,7 +108,8 @@ public class FrontRestTools {
         .asList(URI_CONTRACT_DEPLOY_WITH_SIGN, URI_SEND_TRANSACTION_WITH_SIGN, URI_KEY_PAIR, URI_KEY_PAIR_LOCAL_KEYSTORE,
                 URI_CONTRACT_SENDABI, URI_PERMISSION, URI_PERMISSION_FULL_LIST, URI_CNS_LIST, URI_SYS_CONFIG_LIST,
                 URI_SYS_CONFIG, URI_CONSENSUS_LIST, URI_CONSENSUS, URI_CRUD, URI_PERMISSION_SORTED_LIST,
-                URI_PERMISSION_SORTED_FULL_LIST, URI_CERT, URI_ENCRYPT_TYPE);
+                URI_PERMISSION_SORTED_FULL_LIST, URI_CERT, URI_ENCRYPT_TYPE,
+                URI_KEY_PAIR_IMPORT_WITH_SIGN);
 
     public static List<String> URI_CONTAIN_GROUP_ID = new ArrayList<>();
 
diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserController.java b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
index cb90832b2..c30af1d65 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserController.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
@@ -196,7 +196,7 @@ public BaseResponse importPemPrivateKey(@Valid @RequestBody ReqImportPem reqImpo
             throw new NodeMgrException(ConstantCode.PEM_FORMAT_ERROR);
         }
         // import
-        Integer userId = userService.importPem(reqImportPem);
+        Integer userId = userService.impoPem(reqImportPem);
         // query user row
         TbUser userRow = userService.queryByUserId(userId);
         baseResponse.setData(userRow);
@@ -210,8 +210,7 @@ public BaseResponse importPemPrivateKey(@Valid @RequestBody ReqImportPem reqImpo
     @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
     public BaseResponse importP12PrivateKey(@RequestParam MultipartFile p12File, @RequestParam String p12Password,
                                             @RequestParam Integer groupId, @RequestParam String userName,
-                                            @RequestParam(required = false) String description, BindingResult result) {
-        checkBindResult(result);
+                                            @RequestParam(required = false) String description) {
         BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
         Instant startTime = Instant.now();
 

From 8c0935888dead43d999ca8f77a0f7191bc9b4d9c Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 11:59:18 +0800
Subject: [PATCH 096/131] fix method name

---
 .../java/com/webank/webase/node/mgr/user/UserController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserController.java b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
index c30af1d65..4fda3b226 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserController.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
@@ -196,7 +196,7 @@ public BaseResponse importPemPrivateKey(@Valid @RequestBody ReqImportPem reqImpo
             throw new NodeMgrException(ConstantCode.PEM_FORMAT_ERROR);
         }
         // import
-        Integer userId = userService.impoPem(reqImportPem);
+        Integer userId = userService.importPem(reqImportPem);
         // query user row
         TbUser userRow = userService.queryByUserId(userId);
         baseResponse.setData(userRow);

From 80295e31f7f9dee1299f34dfe6e4d3ef5f636867 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 16:20:54 +0800
Subject: [PATCH 097/131] fix get null block from all front

---
 .../webase/node/mgr/group/GroupService.java   | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 3361c2bff..9dcad0e50 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -443,17 +443,29 @@ private void checkSameChainDataWithLocal() {
             BigInteger blockHeightLocal = smallestBlockLocal.getBlockNumber();
 			String blockHashLocal = smallestBlockLocal.getPkHash();
 
-            // get same height block from chain, contrast block hash
-            BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumber(groupId, blockHeightLocal);
-            // if no block in each node, not same chain
-            if (smallestBlockOnChain == null) {
-                log.info("smallestBlockOnChain groupId: {} height: {} return null block, " +
-                        "please check group's node", groupId, blockHeightLocal);
-                // null block not means conflict
-                // updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
-                continue;
-            }
-			String blockHashOnChain = smallestBlockOnChain.getHash();
+            // get same height block from chain(if null, get from another front), contrast block hash
+			String blockHashOnChain = "";
+			// get all frontGroupMap list by group id
+			List<FrontGroup> allFrontList = frontGroupMapCache.getMapListByGroupId(groupId);
+			for(FrontGroup front: allFrontList) {
+				BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumberFromSpecificFront(
+						front.getFrontIp(), front.getFrontPort(), groupId, blockHeightLocal);
+				if (smallestBlockOnChain == null) {
+					continue;
+				} else {
+					blockHashOnChain = smallestBlockOnChain.getHash();
+					break;
+				}
+			}
+			// if no block in each node, not same chain, else contrast with local hash
+			if (blockHashOnChain.isEmpty()) {
+				log.info("smallestBlockOnChain groupId: {} height: {} return null block, " +
+						"please check group's node", groupId, blockHeightLocal);
+				// null block not means conflict
+			 	updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());
+				continue;
+			}
+
             log.debug("checkSameChainData groupId:{},blockHeight:{},localHash:{},chainHash:{} ",
                     groupId, blockHeightLocal, blockHashLocal, blockHashOnChain);
             // check same block hash, the same chain

From 217a12f86716f4ac542b481291aa8c0c0033264a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 16:37:08 +0800
Subject: [PATCH 098/131] update no front error code

---
 .../com/webank/webase/node/mgr/base/code/ConstantCode.java    | 2 +-
 .../webank/webase/node/mgr/frontinterface/FrontRestTools.java | 3 ++-
 .../java/com/webank/webase/node/mgr/group/GroupService.java   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index f62e93f17..1953fdaaa 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -48,7 +48,7 @@ public class ConstantCode {
 
     public static final RetCode DB_EXCEPTION = RetCode.mark(202001, "database exception");
 
-    public static final RetCode FRONT_LIST_NOT_FOUNT = RetCode.mark(202002, "not found any front");
+    public static final RetCode FRONT_LIST_NOT_FOUNT = RetCode.mark(202002, "not found any front for this group");
 
     public static final RetCode INVALID_FRONT_IP = RetCode.mark(202003, "not support this ip");
 
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index 69872d8e1..6d83df95a 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -300,7 +300,8 @@ private <T> T restTemplateExchange(int groupId, String uri, HttpMethod method,
         List<FrontGroup> frontList = frontGroupMapCache.getMapListByGroupId(groupId);
         if (frontList == null || frontList.size() == 0) {
             log.error("fail restTemplateExchange. frontList is empty groupId:{}", groupId);
-            throw new NodeMgrException(ConstantCode.FRONT_LIST_NOT_FOUNT);
+            throw new NodeMgrException(ConstantCode.FRONT_LIST_NOT_FOUNT.getCode(),
+                    "all front of group: " + groupId + " is stopped");
         }
         ArrayList<FrontGroup> list = new ArrayList<>(frontList);
         RestTemplate restTemplate = caseRestemplate(uri);
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 9dcad0e50..a72bc1eca 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -446,8 +446,8 @@ private void checkSameChainDataWithLocal() {
             // get same height block from chain(if null, get from another front), contrast block hash
 			String blockHashOnChain = "";
 			// get all frontGroupMap list by group id
-			List<FrontGroup> allFrontList = frontGroupMapCache.getMapListByGroupId(groupId);
-			for(FrontGroup front: allFrontList) {
+			List<FrontGroup> allFrontGroupList = frontGroupMapCache.getMapListByGroupId(groupId);
+			for(FrontGroup front: allFrontGroupList) {
 				BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumberFromSpecificFront(
 						front.getFrontIp(), front.getFrontPort(), groupId, blockHeightLocal);
 				if (smallestBlockOnChain == null) {

From 1fbc8ad6356ad4a0ebbbf953491d967a1a7829ec Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 16:38:39 +0800
Subject: [PATCH 099/131] rm remove invalid group

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index a72bc1eca..2335d3486 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -218,7 +218,7 @@ public synchronized void resetGroupList() {
         // update front_group_map status of local group
         checkGroupMapByLocalGroupList(frontList);
         // remove group and front_group_map that front_group_map's status is all invalid
-        removeInvalidGroupByMap();
+        // removeInvalidGroupByMap();
         // clear cache
         frontGroupMapCache.clearMapList();
 

From a31a0ef10c9d9ff61e14b14cc490c7651b3a4e2a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 16:47:12 +0800
Subject: [PATCH 100/131] fix modify time null

---
 src/main/resources/mapper/GroupMapper.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/GroupMapper.xml b/src/main/resources/mapper/GroupMapper.xml
index 48377f269..173e56f96 100644
--- a/src/main/resources/mapper/GroupMapper.xml
+++ b/src/main/resources/mapper/GroupMapper.xml
@@ -44,9 +44,9 @@
 
   <insert id="save" parameterType="com.webank.webase.node.mgr.group.entity.TbGroup">
 		insert into tb_group
-		(group_id,group_name,node_count,description,group_type,group_status,group_timestamp,node_id_list,create_time)
+		(group_id,group_name,node_count,description,group_type,group_status,group_timestamp,node_id_list,create_time,modify_time)
 		values(#{groupId},#{groupName},#{nodeCount},#{description},#{groupType},#{groupStatus},
-      #{groupTimestamp},#{nodeIdList},NOW())
+      #{groupTimestamp},#{nodeIdList},NOW(),NOW())
 		ON DUPLICATE KEY UPDATE node_count=#{nodeCount},modify_time=NOW()
 	</insert>
 

From f96bb29c3c166ed6af16f76bc1523013591fef62 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 16:55:51 +0800
Subject: [PATCH 101/131] fix modify time null

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 2335d3486..1ff9b9856 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -458,7 +458,8 @@ private void checkSameChainDataWithLocal() {
 				}
 			}
 			// if no block in each node, not same chain, else contrast with local hash
-			if (blockHashOnChain.isEmpty()) {
+			// if all front group map invalid, ignore
+			if (!allFrontGroupList.isEmpty() && blockHashOnChain.isEmpty()) {
 				log.info("smallestBlockOnChain groupId: {} height: {} return null block, " +
 						"please check group's node", groupId, blockHeightLocal);
 				// null block not means conflict

From 54aeebbf8aeb1e4f7ed55cb7548afd34cc9ba69b Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 17:04:39 +0800
Subject: [PATCH 102/131] fix front empty map

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 1ff9b9856..84437a347 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -447,6 +447,7 @@ private void checkSameChainDataWithLocal() {
 			String blockHashOnChain = "";
 			// get all frontGroupMap list by group id
 			List<FrontGroup> allFrontGroupList = frontGroupMapCache.getMapListByGroupId(groupId);
+			boolean flagEmptyFront = (allFrontGroupList == null || allFrontGroupList.size() == 0);
 			for(FrontGroup front: allFrontGroupList) {
 				BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumberFromSpecificFront(
 						front.getFrontIp(), front.getFrontPort(), groupId, blockHeightLocal);
@@ -459,7 +460,7 @@ private void checkSameChainDataWithLocal() {
 			}
 			// if no block in each node, not same chain, else contrast with local hash
 			// if all front group map invalid, ignore
-			if (!allFrontGroupList.isEmpty() && blockHashOnChain.isEmpty()) {
+			if (blockHashOnChain.isEmpty() && !flagEmptyFront) {
 				log.info("smallestBlockOnChain groupId: {} height: {} return null block, " +
 						"please check group's node", groupId, blockHeightLocal);
 				// null block not means conflict

From ae896d12bcc7025592ae8b30b28ac3b42bd0765a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 17:10:04 +0800
Subject: [PATCH 103/131] fix group status upadate order

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 84437a347..cbf3e7529 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -207,6 +207,8 @@ public synchronized void resetGroupList() {
         // check group status(normal or maintaining), update by local group list
 		// if groupid not in allGroupSet, remove it
         checkAndUpdateGroupStatus(allGroupSet);
+		// update front_group_map status of local group
+		checkGroupMapByLocalGroupList(frontList);
         // check group local whether has dirty data by contrast of local blockHash with chain blockHash
 		// if not same, update group as DIRTY
         checkSameChainDataWithLocal();
@@ -215,8 +217,6 @@ public synchronized void resetGroupList() {
         checkGroupGenesisSameWithEach();
         // remove front_group_map that not in tb_front or tb_group by local data
         frontGroupMapService.removeInvalidFrontGroupMap();
-        // update front_group_map status of local group
-        checkGroupMapByLocalGroupList(frontList);
         // remove group and front_group_map that front_group_map's status is all invalid
         // removeInvalidGroupByMap();
         // clear cache

From e9aac63d1a097d53db6bc32cedfdb33e0f432f41 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 17:11:00 +0800
Subject: [PATCH 104/131] fix group status upadate order

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index cbf3e7529..bf4400e8e 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -447,6 +447,7 @@ private void checkSameChainDataWithLocal() {
 			String blockHashOnChain = "";
 			// get all frontGroupMap list by group id
 			List<FrontGroup> allFrontGroupList = frontGroupMapCache.getMapListByGroupId(groupId);
+			log.debug("checkSameChainDataWithLocal allFrontGroupList:{}", allFrontGroupList);
 			boolean flagEmptyFront = (allFrontGroupList == null || allFrontGroupList.size() == 0);
 			for(FrontGroup front: allFrontGroupList) {
 				BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumberFromSpecificFront(
@@ -461,7 +462,7 @@ private void checkSameChainDataWithLocal() {
 			// if no block in each node, not same chain, else contrast with local hash
 			// if all front group map invalid, ignore
 			if (blockHashOnChain.isEmpty() && !flagEmptyFront) {
-				log.info("smallestBlockOnChain groupId: {} height: {} return null block, " +
+				log.warn("smallestBlockOnChain groupId: {} height: {} return null block, " +
 						"please check group's node", groupId, blockHeightLocal);
 				// null block not means conflict
 			 	updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());

From 3db64e31deab84ff4811e4d930e33928b97c4172 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 17:23:22 +0800
Subject: [PATCH 105/131] fix group status block hash onchain

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index bf4400e8e..baa096d99 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -472,7 +472,7 @@ private void checkSameChainDataWithLocal() {
             log.debug("checkSameChainData groupId:{},blockHeight:{},localHash:{},chainHash:{} ",
                     groupId, blockHeightLocal, blockHashLocal, blockHashOnChain);
             // check same block hash, the same chain
-            if (!blockHashLocal.equals(blockHashOnChain)) {
+            if (! blockHashOnChain.isEmpty() && !blockHashLocal.equals(blockHashOnChain)) {
                 log.warn("checkSameChainDataWithLocal blockHashOnChain conflicts with local block data " +
                                 "groupId: {} height:{} on chain ", groupId, blockHeightLocal);
                 updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());

From a4690c2ef879dd4d59b2dfd633ed25605e702588 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 17:23:32 +0800
Subject: [PATCH 106/131] fix group status block hash onchain

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index baa096d99..cf9488931 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -472,7 +472,7 @@ private void checkSameChainDataWithLocal() {
             log.debug("checkSameChainData groupId:{},blockHeight:{},localHash:{},chainHash:{} ",
                     groupId, blockHeightLocal, blockHashLocal, blockHashOnChain);
             // check same block hash, the same chain
-            if (! blockHashOnChain.isEmpty() && !blockHashLocal.equals(blockHashOnChain)) {
+            if (!blockHashOnChain.isEmpty() && !blockHashLocal.equals(blockHashOnChain)) {
                 log.warn("checkSameChainDataWithLocal blockHashOnChain conflicts with local block data " +
                                 "groupId: {} height:{} on chain ", groupId, blockHeightLocal);
                 updateGroupStatus(groupId, GroupStatus.CONFLICT_LOCAL_DATA.getValue());

From d6a7d58345eba31e40126d0b3d88fa850da21d30 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 17:41:05 +0800
Subject: [PATCH 107/131] adjust group map order

---
 .../java/com/webank/webase/node/mgr/group/GroupService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index cf9488931..f305ee0a6 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -207,8 +207,6 @@ public synchronized void resetGroupList() {
         // check group status(normal or maintaining), update by local group list
 		// if groupid not in allGroupSet, remove it
         checkAndUpdateGroupStatus(allGroupSet);
-		// update front_group_map status of local group
-		checkGroupMapByLocalGroupList(frontList);
         // check group local whether has dirty data by contrast of local blockHash with chain blockHash
 		// if not same, update group as DIRTY
         checkSameChainDataWithLocal();
@@ -217,6 +215,8 @@ public synchronized void resetGroupList() {
         checkGroupGenesisSameWithEach();
         // remove front_group_map that not in tb_front or tb_group by local data
         frontGroupMapService.removeInvalidFrontGroupMap();
+		// update front_group_map status of local group
+		checkGroupMapByLocalGroupList(frontList);
         // remove group and front_group_map that front_group_map's status is all invalid
         // removeInvalidGroupByMap();
         // clear cache

From 6ba721641419fb1187b6378d3e56756bbb4d0bed Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Tue, 26 May 2020 17:48:37 +0800
Subject: [PATCH 108/131] adjust group map order

---
 .../webase/node/mgr/group/GroupService.java   | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index f305ee0a6..a488178d5 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -207,21 +207,20 @@ public synchronized void resetGroupList() {
         // check group status(normal or maintaining), update by local group list
 		// if groupid not in allGroupSet, remove it
         checkAndUpdateGroupStatus(allGroupSet);
-        // check group local whether has dirty data by contrast of local blockHash with chain blockHash
-		// if not same, update group as DIRTY
-        checkSameChainDataWithLocal();
-        // check group's genesis block same with each other front,
-		// if not, update group as CONFLICT
-        checkGroupGenesisSameWithEach();
-        // remove front_group_map that not in tb_front or tb_group by local data
-        frontGroupMapService.removeInvalidFrontGroupMap();
-		// update front_group_map status of local group
-		checkGroupMapByLocalGroupList(frontList);
         // remove group and front_group_map that front_group_map's status is all invalid
         // removeInvalidGroupByMap();
         // clear cache
         frontGroupMapCache.clearMapList();
-
+		// check group local whether has dirty data by contrast of local blockHash with chain blockHash
+		// if not same, update group as DIRTY
+		checkSameChainDataWithLocal();
+		// check group's genesis block same with each other front,
+		// if not, update group as CONFLICT
+		checkGroupGenesisSameWithEach();
+		// remove front_group_map that not in tb_front or tb_group by local data
+		frontGroupMapService.removeInvalidFrontGroupMap();
+		// update front_group_map status of local group
+		checkGroupMapByLocalGroupList(frontList);
         log.info("end resetGroupList. useTime:{} ",
                 Duration.between(startTime, Instant.now()).toMillis());
     }

From 90bcafcb4336f1647e1aa2174269296e72b6fa3a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 27 May 2020 11:20:26 +0800
Subject: [PATCH 109/131] fix p12Password empty

---
 .../com/webank/webase/node/mgr/base/tools/NodeMgrTools.java    | 3 +++
 .../java/com/webank/webase/node/mgr/user/UserController.java   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
index 72b9c7b67..aeb0fad77 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
@@ -542,6 +542,9 @@ public static String encodedBase64Str(String input) {
      * 只包含中文
      */
     public static boolean notContainsChinese(String input) {
+        if (input.isEmpty()) {
+            return true;
+        }
         String regex = "[^\\u4e00-\\u9fa5]+";
         return input.matches(regex);
     }
diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserController.java b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
index 4fda3b226..927b598b9 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserController.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
@@ -208,7 +208,8 @@ public BaseResponse importPemPrivateKey(@Valid @RequestBody ReqImportPem reqImpo
 
     @PostMapping("/importP12")
     @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
-    public BaseResponse importP12PrivateKey(@RequestParam MultipartFile p12File, @RequestParam String p12Password,
+    public BaseResponse importP12PrivateKey(@RequestParam MultipartFile p12File,
+                                            @RequestParam(required = false) String p12Password,
                                             @RequestParam Integer groupId, @RequestParam String userName,
                                             @RequestParam(required = false) String description) {
         BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);

From a7baaadfbcc7e8d59723c67307a98931a5a38bcc Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 27 May 2020 11:27:30 +0800
Subject: [PATCH 110/131] fix p12Password null

---
 .../java/com/webank/webase/node/mgr/user/UserController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/user/UserController.java b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
index 927b598b9..86f0c908c 100644
--- a/src/main/java/com/webank/webase/node/mgr/user/UserController.java
+++ b/src/main/java/com/webank/webase/node/mgr/user/UserController.java
@@ -209,7 +209,7 @@ public BaseResponse importPemPrivateKey(@Valid @RequestBody ReqImportPem reqImpo
     @PostMapping("/importP12")
     @PreAuthorize(ConstantProperties.HAS_ROLE_ADMIN)
     public BaseResponse importP12PrivateKey(@RequestParam MultipartFile p12File,
-                                            @RequestParam(required = false) String p12Password,
+                                            @RequestParam(required = false, defaultValue = "") String p12Password,
                                             @RequestParam Integer groupId, @RequestParam String userName,
                                             @RequestParam(required = false) String description) {
         BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);

From aceba154056a90a777c9142969e3923bf8fbdb93 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 27 May 2020 17:47:41 +0800
Subject: [PATCH 111/131] remove start and add map

---
 .../com/webank/webase/node/mgr/group/GroupService.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index a488178d5..adc708ed2 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -673,11 +673,11 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
         // request front to operate
         Object groupOperateStatus = frontInterface.operateGroup(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), groupId, type);
-        if (OPERATE_START_GROUP.equals(type) || OPERATE_STOP_GROUP.equals(type)) {
-            // reset front group map status
-			log.info("operateGroup type:{}, update front_group_map status :{}:{}", type,  tbFront, groupId);
-			frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
-        }
+//        if (OPERATE_START_GROUP.equals(type) || OPERATE_STOP_GROUP.equals(type)) {
+//            // reset front group map status
+//			log.info("operateGroup type:{}, update front_group_map status :{}:{}", type,  tbFront, groupId);
+//			frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
+//        }
         // refresh group status
         resetGroupList();
 

From 936dc559f8caa20f332ab8e87704d34caa099444 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Wed, 27 May 2020 18:00:22 +0800
Subject: [PATCH 112/131] fix front_group_map by local groupList

---
 .../webase/node/mgr/frontgroupmap/FrontGroupMapService.java   | 2 +-
 .../java/com/webank/webase/node/mgr/group/GroupService.java   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index 273adff32..b23e83e78 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -47,7 +47,7 @@ public class FrontGroupMapService {
     /**
      * add new mapping
      */
-    private TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
+    public TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
         log.info("start newFrontGroup frontId:{} groupId:{} status:{}", frontId, groupId, status);
         MapListParam param = new MapListParam(frontId, groupId);
         FrontGroup frontGroup = frontGroupMapMapper.queryFrontGroup(param);
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index adc708ed2..067fb0b1f 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -505,13 +505,15 @@ public void checkGroupMapByLocalGroupList(List<TbFront> frontList) {
 				log.error("fail getGroupListFromSpecificFront.", ex);
 				continue;
 			}
+			// group list local
 			groupListLocal.forEach(group -> {
 				Integer groupId = group.getGroupId();
 				// only check local group id
 				if (!groupListOnChain.contains(groupId.toString())) {
 					log.info("update front_group_map by local data front:{}, groupId:{} ",
 							front, groupId);
-					frontGroupMapService.newFrontGroupWithStatus(front, groupId);
+					// TODO bug: group2 in font1, not in front2, but local has group2, so add front1_group2_map and front2_group2_map
+					frontGroupMapService.newFrontGroup(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
 				}
 			});
 		}

From 1f0a17f5b6a0b85bfafeeb4c98b825909e767f2a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 28 May 2020 15:25:48 +0800
Subject: [PATCH 113/131] fix null valid

---
 .../webank/webase/node/mgr/base/tools/NodeMgrTools.java   | 2 +-
 .../com/webank/webase/node/mgr/group/GroupService.java    | 8 ++++++--
 .../webase/node/mgr/precompiled/PrecompiledService.java   | 8 ++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
index aeb0fad77..e5a4d843c 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/tools/NodeMgrTools.java
@@ -542,7 +542,7 @@ public static String encodedBase64Str(String input) {
      * 只包含中文
      */
     public static boolean notContainsChinese(String input) {
-        if (input.isEmpty()) {
+        if (StringUtils.isBlank(input)) {
             return true;
         }
         String regex = "[^\\u4e00-\\u9fa5]+";
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 067fb0b1f..48c677414 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -446,8 +446,12 @@ private void checkSameChainDataWithLocal() {
 			String blockHashOnChain = "";
 			// get all frontGroupMap list by group id
 			List<FrontGroup> allFrontGroupList = frontGroupMapCache.getMapListByGroupId(groupId);
+			if (allFrontGroupList == null) {
+				continue;
+			}
 			log.debug("checkSameChainDataWithLocal allFrontGroupList:{}", allFrontGroupList);
-			boolean flagEmptyFront = (allFrontGroupList == null || allFrontGroupList.size() == 0);
+			// case: if group's all front is stopped, front_group_map still normal, would set as CONFLICT for no data from front
+			boolean flagEmptyFront = (allFrontGroupList.size() == 0);
 			for(FrontGroup front: allFrontGroupList) {
 				BlockInfo smallestBlockOnChain = frontInterface.getBlockByNumberFromSpecificFront(
 						front.getFrontIp(), front.getFrontPort(), groupId, blockHeightLocal);
@@ -512,7 +516,7 @@ public void checkGroupMapByLocalGroupList(List<TbFront> frontList) {
 				if (!groupListOnChain.contains(groupId.toString())) {
 					log.info("update front_group_map by local data front:{}, groupId:{} ",
 							front, groupId);
-					// TODO bug: group2 in font1, not in front2, but local has group2, so add front1_group2_map and front2_group2_map
+					// case: group2 in font1, not in front2, but local has group2, so add front1_group2_map but not front2_group2_map
 					frontGroupMapService.newFrontGroup(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
 				}
 			});
diff --git a/src/main/java/com/webank/webase/node/mgr/precompiled/PrecompiledService.java b/src/main/java/com/webank/webase/node/mgr/precompiled/PrecompiledService.java
index 8bb69e04f..8200a7d17 100644
--- a/src/main/java/com/webank/webase/node/mgr/precompiled/PrecompiledService.java
+++ b/src/main/java/com/webank/webase/node/mgr/precompiled/PrecompiledService.java
@@ -71,7 +71,7 @@ public Object listCnsService(int groupId, String contractNameAndVersion, int pag
      * get node list with consensus status
      */
     public Object getNodeListService(int groupId, int pageSize, int pageNumber) {
-        log.debug("start getNodeListService. groupId:{}" + groupId);
+        log.debug("start getNodeListService. groupId:{}", groupId);
         String uri;
         Map<String, String> map = new HashMap<>();
         map.put("groupId", String.valueOf(groupId));
@@ -79,11 +79,7 @@ public Object getNodeListService(int groupId, int pageSize, int pageNumber) {
         map.put("pageNumber", String.valueOf(pageNumber));
         uri = HttpRequestTools.getQueryUri(FrontRestTools.URI_CONSENSUS_LIST, map);
         Object frontRsp = null;
-//        try {
-            frontRsp = frontRestTools.getForEntity(groupId, uri, Object.class);
-//        } catch (Exception ex) {
-//            log.error("getNodeListService :{}", ex.getMessage());
-//        }
+        frontRsp = frontRestTools.getForEntity(groupId, uri, Object.class);
         log.debug("end getNodeListService. frontRsp:{}", JSON.toJSONString(frontRsp));
         return frontRsp;
     }

From 1e62e8641eac4d08b62201dba363b2f1e86235a9 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 28 May 2020 15:59:59 +0800
Subject: [PATCH 114/131] add batch operate status list

---
 .../node/mgr/base/enums/OperateStatus.java    | 34 ++++++++
 .../node/mgr/group/GroupController.java       |  7 +-
 .../webase/node/mgr/group/GroupService.java   | 85 +++++++++++++------
 .../node/mgr/group/entity/RspGroupStatus.java |  1 +
 .../mgr/group/entity/RspOperateResult.java    | 32 +++++++
 5 files changed, 128 insertions(+), 31 deletions(-)
 create mode 100644 src/main/java/com/webank/webase/node/mgr/base/enums/OperateStatus.java
 create mode 100644 src/main/java/com/webank/webase/node/mgr/group/entity/RspOperateResult.java

diff --git a/src/main/java/com/webank/webase/node/mgr/base/enums/OperateStatus.java b/src/main/java/com/webank/webase/node/mgr/base/enums/OperateStatus.java
new file mode 100644
index 000000000..4b3cdb1b5
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/base/enums/OperateStatus.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.base.enums;
+
+/**
+ * result code of operate group
+ */
+public enum OperateStatus {
+	SUCCESS(0), FAIL(1);
+
+	private int value;
+
+	OperateStatus(Integer result) {
+		this.value = result;
+	}
+
+	public int getValue() {
+		return this.value;
+	}
+}
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 46fc7ca7d..f363aa089 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -230,8 +230,8 @@ public BaseResponse generateGroup(@RequestBody @Valid ReqGenerateGroup req,
         BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
         log.info("start generateGroup startTime:{} groupId:{}", startTime.toEpochMilli(),
                 req.getGenerateGroupId());
-        TbGroup tbGroup = groupService.generateGroup(req);
-        baseResponse.setData(tbGroup);
+        List<RspOperateResult> generateResultList = groupService.generateGroup(req);
+        baseResponse.setData(generateResultList);
         log.info("end generateGroup useTime:{}",
                 Duration.between(startTime, Instant.now()).toMillis());
         return baseResponse;
@@ -290,7 +290,8 @@ public BaseResponse batchStartGroup(@RequestBody @Valid ReqBatchStartGroup req,
         BaseResponse baseResponse = new BaseResponse(ConstantCode.SUCCESS);
         log.info("start batchStartGroup startTime:{} groupId:{}", startTime.toEpochMilli(),
                 req.getGenerateGroupId());
-        groupService.batchStartGroup(req);
+        List<RspOperateResult> operateResultList = groupService.batchStartGroup(req);
+        baseResponse.setData(operateResultList);
         log.info("end batchStartGroup useTime:{} result:{}",
                 Duration.between(startTime, Instant.now()).toMillis(),
                 JSON.toJSONString(baseResponse));
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 48c677414..42689a3f5 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -15,8 +15,10 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.base.enums.GroupType;
+import com.webank.webase.node.mgr.base.enums.OperateStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
 import com.webank.webase.node.mgr.block.BlockService;
@@ -635,30 +637,43 @@ public TbGroup generateToSingleNode(String nodeId, ReqGenerateGroup req) {
      * @param req info
      * @return
      */
-    public TbGroup generateGroup(ReqGenerateGroup req) {
+    public List<RspOperateResult> generateGroup(ReqGenerateGroup req) {
         Integer generateGroupId = req.getGenerateGroupId();
         if (checkGroupIdExisted(generateGroupId)) {
             throw new NodeMgrException(ConstantCode.GROUP_ID_EXISTS);
         }
-
-        for (String nodeId : req.getNodeList()) {
+        List<String> nodeIdList = req.getNodeList();
+		List<RspOperateResult> resOperateList = new ArrayList<>(nodeIdList.size());
+        for (String nodeId : nodeIdList) {
             // get front
             TbFront tbFront = frontService.getByNodeId(nodeId);
             if (tbFront == null) {
                 log.error("fail generateGroup node front not exists.");
                 throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
             }
+			// record generate result
+			RspOperateResult operateResult = new RspOperateResult(tbFront.getFrontId(),
+					OperateStatus.SUCCESS.getValue());
             // request front to generate
             GenerateGroupInfo generateGroupInfo = new GenerateGroupInfo();
             BeanUtils.copyProperties(req, generateGroupInfo);
-            frontInterface.generateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(),
-                    generateGroupInfo);
+            try {
+            	frontInterface.generateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(),
+						generateGroupInfo);
+				resOperateList.add(operateResult);
+			} catch (NodeMgrException e) {
+				log.error("fail generateGroup in frontId:{}, exception:{}",
+						tbFront.getFrontId(), e.getMessage());
+				// request front fail
+				operateResult.setCode(e.getRetCode().getCode());
+				resOperateList.add(operateResult);
+			}
         }
         // save group, saved as invalid status until start
         TbGroup tbGroup = saveGroup(generateGroupId, req.getNodeList().size(),
                 req.getDescription(), GroupType.MANUAL.getValue(), GroupStatus.MAINTAINING.getValue(),
                 req.getTimestamp(), req.getNodeList());
-        return tbGroup;
+        return resOperateList;
     }
 
     /**
@@ -679,11 +694,6 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
         // request front to operate
         Object groupOperateStatus = frontInterface.operateGroup(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), groupId, type);
-//        if (OPERATE_START_GROUP.equals(type) || OPERATE_STOP_GROUP.equals(type)) {
-//            // reset front group map status
-//			log.info("operateGroup type:{}, update front_group_map status :{}:{}", type,  tbFront, groupId);
-//			frontGroupMapService.newFrontGroupWithStatus(tbFront, groupId);
-//        }
         // refresh group status
         resetGroupList();
 
@@ -699,10 +709,22 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
      */
     public List<RspGroupStatus> listGroupStatus(List<String> nodeIdList, List<Integer> groupIdList) {
         List<RspGroupStatus> resList = new ArrayList<>(nodeIdList.size());
-        for (String nodeId : nodeIdList) {
+		for (String nodeId : nodeIdList) {
+			// get front
+			TbFront tbFront = frontService.getByNodeId(nodeId);
+			if (tbFront == null) {
+				log.error("fail getGroupStatus node front not exists.");
+				throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
+			}
             Map<String, String> statusMap = new HashMap<>();
-            statusMap = getGroupStatus(nodeId, groupIdList);
-
+            try{
+            	statusMap = getGroupStatus(tbFront, groupIdList);
+			} catch (NodeMgrException e) {
+				log.error("fail getGroupStatus in frontId:{}, exception:{}",
+						tbFront.getFrontId(), e.getMessage());
+				// request front fail
+				statusMap.put(nodeId, "FAIL");
+			}
             RspGroupStatus rspGroupStatus = new RspGroupStatus(nodeId, statusMap);
             resList.add(rspGroupStatus);
         }
@@ -711,21 +733,14 @@ public List<RspGroupStatus> listGroupStatus(List<String> nodeIdList, List<Intege
 
     /**
      * getGroupStatus of single node's sight
-     * @param nodeId
+     * @param tbFront
      * @param groupIdList
      * @return map of <groupId, status>
      */
-    private Map<String, String> getGroupStatus(String nodeId, List<Integer> groupIdList) {
-        // get front
-        TbFront tbFront = frontService.getByNodeId(nodeId);
-        if (tbFront == null) {
-            log.error("fail getGroupStatus node front not exists.");
-            throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
-        }
-
+    private Map<String, String> getGroupStatus(TbFront tbFront, List<Integer> groupIdList) {
         // groupId, status
         Map<String, String> statusRes = frontInterface.queryGroupStatus(tbFront.getFrontIp(),
-                tbFront.getFrontPort(), nodeId, groupIdList);
+                tbFront.getFrontPort(), tbFront.getNodeId(), groupIdList);
         return statusRes;
     }
 
@@ -734,25 +749,39 @@ private Map<String, String> getGroupStatus(String nodeId, List<Integer> groupIdL
      *
      * @param req
      */
-    public void batchStartGroup(ReqBatchStartGroup req) {
+    public List<RspOperateResult> batchStartGroup(ReqBatchStartGroup req) {
         log.debug("start batchStartGroup:{}", req);
         Integer groupId = req.getGenerateGroupId();
         // check id
         checkGroupId(groupId);
-        for (String nodeId : req.getNodeList()) {
+        List<String> nodeIdList = req.getNodeList();
+		List<RspOperateResult> resOperateList = new ArrayList<>(nodeIdList.size());
+		for (String nodeId : nodeIdList) {
             // get front
             TbFront tbFront = frontService.getByNodeId(nodeId);
             if (tbFront == null) {
                 log.error("fail batchStartGroup node not exists.");
                 throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
             }
+			// record generate result
+			RspOperateResult operateResult = new RspOperateResult(tbFront.getFrontId(),
+					OperateStatus.SUCCESS.getValue());
             // request front to start
-            frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
-                    "start");
+            try{
+            	frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
+						OPERATE_START_GROUP);
+				resOperateList.add(operateResult);
+			} catch (NodeMgrException e) {
+				log.error("fail startGroup in frontId:{}, exception:{}",
+						tbFront.getFrontId(), e.getMessage());
+				operateResult.setCode(e.getRetCode().getCode());
+				resOperateList.add(operateResult);
+			}
         }
         // refresh group status
         resetGroupList();
         log.debug("end batchStartGroup.");
+        return resOperateList;
     }
 
     /* end dynamic group operation*/
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java b/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java
index 9eb6102df..1021ac06d 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/RspGroupStatus.java
@@ -33,6 +33,7 @@ public class RspGroupStatus {
 	/**
 	 * <groupId, status>
 	 *     status: "INEXISTENT"、"STOPPING"、"RUNNING"、"STOPPED"、"DELETED"
+	 *     request fail: "FAIL"
 	 */
 	private Map<String, String> groupStatusMap;
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/entity/RspOperateResult.java b/src/main/java/com/webank/webase/node/mgr/group/entity/RspOperateResult.java
new file mode 100644
index 000000000..7b4cfa95d
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/group/entity/RspOperateResult.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.group.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * entity of batch operate group
+ * etc: batch start, batch generate, batch query group status
+ */
+@Data
+@AllArgsConstructor
+public class RspOperateResult {
+	private Integer frontId;
+	// 0-success, others-fail
+	private Integer code;
+}

From d99a3fa5a92d7002521d78769bad5032d334a14b Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 28 May 2020 16:29:52 +0800
Subject: [PATCH 115/131] adjust error code

---
 .../mgr/frontinterface/FrontInterfaceService.java    |  2 +-
 .../webank/webase/node/mgr/group/GroupService.java   | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
index 855a77c4a..11cc8c3a2 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontInterfaceService.java
@@ -449,7 +449,7 @@ public String getClientVersion(String frontIp, Integer frontPort,
      */
     public GroupHandleResult generateGroup(String frontIp, Integer frontPort,
             GenerateGroupInfo param) {
-        log.debug("start generateGroup frontIp:{} frontPort:{} param:{}", JSON.toJSONString(param));
+        log.debug("start generateGroup frontIp:{} frontPort:{} param:{}", frontIp, frontPort, JSON.toJSONString(param));
 
         Integer groupId = Integer.MAX_VALUE;
         GroupHandleResult groupHandleResult = requestSpecificFront(groupId, frontIp, frontPort,
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 42689a3f5..fccb23bee 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -48,7 +48,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.client.HttpStatusCodeException;
 
+import java.io.IOException;
 import java.math.BigInteger;
 import java.time.Duration;
 import java.time.Instant;
@@ -661,11 +663,11 @@ public List<RspOperateResult> generateGroup(ReqGenerateGroup req) {
             	frontInterface.generateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(),
 						generateGroupInfo);
 				resOperateList.add(operateResult);
-			} catch (NodeMgrException e) {
+			} catch (NodeMgrException | HttpStatusCodeException e) {
 				log.error("fail generateGroup in frontId:{}, exception:{}",
 						tbFront.getFrontId(), e.getMessage());
 				// request front fail
-				operateResult.setCode(e.getRetCode().getCode());
+				operateResult.setCode(OperateStatus.FAIL.getValue());
 				resOperateList.add(operateResult);
 			}
         }
@@ -719,7 +721,7 @@ public List<RspGroupStatus> listGroupStatus(List<String> nodeIdList, List<Intege
             Map<String, String> statusMap = new HashMap<>();
             try{
             	statusMap = getGroupStatus(tbFront, groupIdList);
-			} catch (NodeMgrException e) {
+			} catch (NodeMgrException | HttpStatusCodeException e) {
 				log.error("fail getGroupStatus in frontId:{}, exception:{}",
 						tbFront.getFrontId(), e.getMessage());
 				// request front fail
@@ -771,10 +773,10 @@ public List<RspOperateResult> batchStartGroup(ReqBatchStartGroup req) {
             	frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
 						OPERATE_START_GROUP);
 				resOperateList.add(operateResult);
-			} catch (NodeMgrException e) {
+			} catch (NodeMgrException | HttpStatusCodeException e) {
 				log.error("fail startGroup in frontId:{}, exception:{}",
 						tbFront.getFrontId(), e.getMessage());
-				operateResult.setCode(e.getRetCode().getCode());
+				operateResult.setCode(OperateStatus.FAIL.getValue());
 				resOperateList.add(operateResult);
 			}
         }

From 44352cc8959d46e36ae6ca7a99b08d376c96b368 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 28 May 2020 18:03:32 +0800
Subject: [PATCH 116/131] add front status

---
 .../node/mgr/base/code/ConstantCode.java      |  2 ++
 .../webase/node/mgr/front/FrontMapper.java    |  2 ++
 .../webase/node/mgr/front/FrontService.java   | 21 +++++++++---
 .../webase/node/mgr/front/entity/TbFront.java |  6 ++++
 .../mgr/frontgroupmap/FrontGroupMapCache.java |  3 --
 .../mgr/frontinterface/FrontRestTools.java    | 31 ++++++++++++++---
 .../frontinterface/entity/FrontUrlInfo.java   | 28 +++++++++++++++
 .../webase/node/mgr/node/NodeService.java     | 34 +++++++++++++++++--
 8 files changed, 113 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/com/webank/webase/node/mgr/frontinterface/entity/FrontUrlInfo.java

diff --git a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
index 1953fdaaa..a627e6cd5 100644
--- a/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
+++ b/src/main/java/com/webank/webase/node/mgr/base/code/ConstantCode.java
@@ -124,6 +124,8 @@ public class ConstantCode {
     public static final RetCode INVALID_TOKEN = RetCode.mark(202052, "invalid token");
     public static final RetCode TOKEN_EXPIRE = RetCode.mark(202053, "token expire");
 
+    public static final RetCode AVAILABLE_FRONT_URL_IS_NULL = RetCode.mark(202054, "Available front url is empty, check front status");
+
     // 证书管理
     public static final RetCode CERT_ERROR = RetCode.mark(202060, "cert handle error");
     public static final RetCode FAIL_SAVE_CERT_ERROR = RetCode.mark(202061, "store cert error");
diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontMapper.java b/src/main/java/com/webank/webase/node/mgr/front/FrontMapper.java
index 4e8b17c05..9dd788833 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontMapper.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontMapper.java
@@ -24,6 +24,8 @@ public interface FrontMapper {
 
     int add(TbFront tbFront);
 
+    int update(TbFront tbFront);
+
     int remove(@Param("frontId") int frontId);
 
     Integer getCount(FrontParam param);
diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index 58958ccef..b9a8059aa 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -276,10 +276,23 @@ public void removeFront(int frontId) {
         frontGroupMapCache.clearMapList();
     }
 
-    public void setFrontEncryptType(List<TbFront> list) {
-
-        list.stream().forEach(front -> {
+    public void updateFront(TbFront updateFront) {
+        log.debug("updateFrontStatus updateFront:{}", updateFront);
+        if (updateFront == null) {
+            log.error("updateFrontStatus updateFront is null");
+            return;
+        }
+        frontMapper.update(updateFront);
+    }
 
-        });
+    public void updateFront(Integer frontId, Integer status) {
+        log.info("updateFrontStatus frontId:{}, status:{}", frontId, status);
+        TbFront updateFront = getById(frontId);
+        if (updateFront == null) {
+            log.error("updateFrontStatus updateFront is null");
+            return;
+        }
+        updateFront.setStatus(status);
+        frontMapper.update(updateFront);
     }
 }
diff --git a/src/main/java/com/webank/webase/node/mgr/front/entity/TbFront.java b/src/main/java/com/webank/webase/node/mgr/front/entity/TbFront.java
index 67537c9ba..1514b37b5 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/entity/TbFront.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/entity/TbFront.java
@@ -31,6 +31,12 @@ public class TbFront {
     private String clientVersion;
     private LocalDateTime createTime;
     private LocalDateTime modifyTime;
+    /**
+     * front status by now
+     * @case1: front's node is abnormal
+     * @case2: front's request fail/no response
+     */
+    private Integer status;
 }
 
 
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
index a65139dd6..97a0b146c 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapCache.java
@@ -15,10 +15,7 @@
 
 
 import com.webank.webase.node.mgr.base.enums.GroupStatus;
-import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapService;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index 6d83df95a..dfabb6b08 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -17,8 +17,10 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.properties.ConstantProperties;
+import com.webank.webase.node.mgr.front.FrontService;
 import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroup;
 import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapCache;
 import com.webank.webase.node.mgr.frontinterface.entity.FailInfo;
@@ -33,6 +35,7 @@
 import java.util.Map;
 import java.util.Objects;
 
+import com.webank.webase.node.mgr.frontinterface.entity.FrontUrlInfo;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -123,6 +126,11 @@ public class FrontRestTools {
     private ConstantProperties cproperties;
     @Autowired
     private FrontGroupMapCache frontGroupMapCache;
+    /**
+     * update front status
+     */
+    @Autowired
+    private FrontService frontService;
 
     private static Map<String, FailInfo> failRequestMap = new HashMap<>();
 
@@ -147,13 +155,14 @@ public static String uriAddGroupId(Integer groupId, String uri) {
 
     /**
      * check url status.
+     * @return if sleeping, true
      */
     private boolean isServiceSleep(String url, String methType) {
         //get failInfo
         String key = buildKey(url, methType);
         FailInfo failInfo = failRequestMap.get(key);
 
-        //cehck server status
+        //check server status
         if (failInfo == null) {
             return false;
         }
@@ -218,13 +227,15 @@ private static void deleteKeyOfMap(Map<String, FailInfo> map, String rkey) {
     /**
      * build  url of front service.
      */
-    private String buildFrontUrl(ArrayList<FrontGroup> list, String uri, HttpMethod httpMethod) {
+    private FrontUrlInfo buildFrontUrl(ArrayList<FrontGroup> list, String uri, HttpMethod httpMethod) {
         Collections.shuffle(list);//random one
         log.info("====================map list:{}",JSON.toJSONString(list));
         Iterator<FrontGroup> iterator = list.iterator();
         while (iterator.hasNext()) {
             FrontGroup frontGroup = iterator.next();
             log.info("============frontGroup:{}",JSON.toJSONString(frontGroup));
+            FrontUrlInfo frontUrlInfo = new FrontUrlInfo();
+            frontUrlInfo.setFrontId(frontGroup.getFrontId());
 
             uri = uriAddGroupId(frontGroup.getGroupId(), uri);//append groupId to uri
             String url = String
@@ -237,7 +248,8 @@ private String buildFrontUrl(ArrayList<FrontGroup> list, String uri, HttpMethod
                 log.warn("front url[{}] is sleep,jump over", url);
                 continue;
             }
-            return url;
+            frontUrlInfo.setUrl(url);
+            return frontUrlInfo;
         }
         log.info("end buildFrontUrl. url is null");
         return null;
@@ -307,7 +319,16 @@ private <T> T restTemplateExchange(int groupId, String uri, HttpMethod method,
         RestTemplate restTemplate = caseRestemplate(uri);
 
         while (list.size() > 0) {
-            String url = buildFrontUrl(list, uri, method);//build url
+            // build by frontGroupList, if build one, remove one;
+            // build until find success url and return
+            // while loop use the same list, try again until get response
+            FrontUrlInfo frontUrlInfo = buildFrontUrl(list, uri, method);//build url
+            String url = frontUrlInfo.getUrl();
+            // check url available
+            if (StringUtils.isBlank(uri)) {
+                log.warn("restTemplateExchange buildFrontUrl get null url:{}", list);
+                throw new NodeMgrException(ConstantCode.AVAILABLE_FRONT_URL_IS_NULL);
+            }
             try {
                 HttpEntity entity = buildHttpEntity(param);// build entity
                 if (null == restTemplate) {
@@ -316,11 +337,13 @@ private <T> T restTemplateExchange(int groupId, String uri, HttpMethod method,
                     throw new NodeMgrException(ConstantCode.SYSTEM_EXCEPTION);
                 }
                 ResponseEntity<T> response = restTemplate.exchange(url, method, entity, clazz);
+                frontService.updateFront(frontUrlInfo.getFrontId(), DataStatus.NORMAL.getValue());
                 return response.getBody();
             } catch (ResourceAccessException ex) {
                 log.warn("fail restTemplateExchange", ex);
                 setFailCount(url, method.toString());
                 if (isServiceSleep(url, method.toString())) {
+                    frontService.updateFront(frontUrlInfo.getFrontId(), DataStatus.INVALID.getValue());
                     throw ex;
                 }
                 log.info("continue next front", ex);
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/entity/FrontUrlInfo.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/entity/FrontUrlInfo.java
new file mode 100644
index 000000000..d83f2086d
--- /dev/null
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/entity/FrontUrlInfo.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright 2014-2020 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.webank.webase.node.mgr.frontinterface.entity;
+
+import lombok.Data;
+
+/**
+ * vo of front's frontId and built url to request front
+ */
+@Data
+public class FrontUrlInfo {
+	private Integer frontId;
+	private String url;
+}
diff --git a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
index 9a05db384..022131c5b 100644
--- a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
+++ b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
@@ -19,6 +19,8 @@
 import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.exception.NodeMgrException;
 import com.webank.webase.node.mgr.base.tools.NodeMgrTools;
+import com.webank.webase.node.mgr.front.FrontService;
+import com.webank.webase.node.mgr.front.entity.TbFront;
 import com.webank.webase.node.mgr.frontinterface.FrontInterfaceService;
 import com.webank.webase.node.mgr.frontinterface.entity.PeerOfConsensusStatus;
 import com.webank.webase.node.mgr.frontinterface.entity.PeerOfSyncStatus;
@@ -47,6 +49,12 @@ public class NodeService {
     private NodeMapper nodeMapper;
     @Autowired
     private FrontInterfaceService frontInterface;
+    /**
+     * update front status
+     */
+    @Autowired
+    private FrontService frontService;
+
     // interval of check node status
     private static final Long CHECK_NODE_WAIT_MIN_MILLIS = 7500L;
 
@@ -218,6 +226,14 @@ public void checkAndUpdateNodeStatus(int groupId) {
                 log.warn("checkNodeStatus jump over. subTime:{}", subTime);
                 return;
             }
+
+            // to update front status
+            TbFront updateFront = frontService.getByNodeId(nodeId);
+            if (updateFront == null) {
+                log.warn(" checkAndUpdateNodeStatus updateFront is null, nodeId:{}", nodeId);
+                log.warn("checkNodeStatus jump over. subTime:{}", subTime);
+                return;
+            }
             
             int nodeType = 0;   //0-consensus;1-observer
             if (observerList != null) {
@@ -237,10 +253,12 @@ public void checkAndUpdateNodeStatus(int groupId) {
                     log.warn("node[{}] is invalid. localNumber:{} chainNumber:{} localView:{} chainView:{}",
                         nodeId, localBlockNumber, latestNumber, localPbftView, latestView);
                     tbNode.setNodeActive(DataStatus.INVALID.getValue());
+                    updateFront.setStatus(DataStatus.INVALID.getValue());
                 } else {
                     tbNode.setBlockNumber(latestNumber);
                     tbNode.setPbftView(latestView);
                     tbNode.setNodeActive(DataStatus.NORMAL.getValue());
+                    updateFront.setStatus(DataStatus.NORMAL.getValue());
                 }
             } else { //observer
                 // if latest block number not equal, invalid
@@ -248,15 +266,19 @@ public void checkAndUpdateNodeStatus(int groupId) {
                     log.warn("node[{}] is invalid. localNumber:{} chainNumber:{} localView:{} chainView:{}",
                             nodeId, localBlockNumber, latestNumber, localPbftView, latestView);
                     tbNode.setNodeActive(DataStatus.INVALID.getValue());
+                    updateFront.setStatus(DataStatus.INVALID.getValue());
                 } else {
                     tbNode.setBlockNumber(latestNumber);
                     tbNode.setPbftView(latestView);
                     tbNode.setNodeActive(DataStatus.NORMAL.getValue());
+                    updateFront.setStatus(DataStatus.NORMAL.getValue());
                 }
             }
             tbNode.setModifyTime(LocalDateTime.now());
             //update node
             updateNode(tbNode);
+            // update front status
+            frontService.updateFront(updateFront);
         }
 
     }
@@ -318,8 +340,14 @@ public List<PeerInfo> getSealerAndObserverList(int groupId) {
 
     public List<String> getNodeIdListService(int groupId) {
         log.debug("start getSealerAndObserverList groupId:{}", groupId);
-        List<String> nodeIdList = frontInterface.getNodeIdList(groupId);
-        log.debug("end getSealerAndObserverList nodeIdList:{}", nodeIdList);
-        return nodeIdList;
+        try {
+            List<String> nodeIdList = frontInterface.getNodeIdList(groupId);
+            log.debug("end getSealerAndObserverList nodeIdList:{}", nodeIdList);
+            return nodeIdList;
+        } catch (Exception e) {
+            log.error("getNodeIdList error groupId:{}, exception:{}", groupId, e.getMessage());
+            throw new NodeMgrException(ConstantCode.REQUEST_FRONT_FAIL.getCode(), e.getMessage());
+        }
+
     }
 }

From dbbbbf6fb27ab1cb951cd3d69db1446a13720efe Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 28 May 2020 18:08:57 +0800
Subject: [PATCH 117/131] add status front

---
 script/webase-ddl.sql                     |  1 +
 src/main/resources/mapper/FrontMapper.xml | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/script/webase-ddl.sql b/script/webase-ddl.sql
index c63a809bd..3729e8a27 100644
--- a/script/webase-ddl.sql
+++ b/script/webase-ddl.sql
@@ -27,6 +27,7 @@ CREATE TABLE IF NOT EXISTS tb_front (
   front_port int(11) DEFAULT NULL COMMENT '前置服务端口',
   agency varchar(32) NOT NULL COMMENT '所属机构名称',
   client_version varchar(32) NOT NULL COMMENT '节点版本（国密/非国密）',
+  status int(11) DEFAULT 1 COMMENT '前置服务状态',
   create_time datetime DEFAULT NULL COMMENT '创建时间',
   modify_time datetime DEFAULT NULL COMMENT '修改时间',
   PRIMARY KEY (front_id),
diff --git a/src/main/resources/mapper/FrontMapper.xml b/src/main/resources/mapper/FrontMapper.xml
index 8fc7024cc..f3bff5672 100644
--- a/src/main/resources/mapper/FrontMapper.xml
+++ b/src/main/resources/mapper/FrontMapper.xml
@@ -10,13 +10,14 @@
     <result column="front_port" javaType="java.lang.Integer" jdbcType="INTEGER" property="frontPort"/>
     <result column="agency" javaType="java.lang.String" jdbcType="VARCHAR" property="agency"/>
     <result column="client_version" javaType="java.lang.String" jdbcType="VARCHAR" property="clientVersion"/>
+    <result column="status" javaType="java.lang.Integer" jdbcType="INTEGER" property="status"/>
     <result column="create_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP"  property="createTime"/>
     <result column="modify_time" javaType="java.time.LocalDateTime" jdbcType="TIMESTAMP"  property="modifyTime"/>
   </resultMap>
 
 
   <sql id="QUERY_ROW_COLUMN">
-		front_id frontId,front_ip frontIp,front_port frontPort,agency,client_version,create_time createTime,modify_time modifyTime
+		front_id frontId,front_ip frontIp,front_port frontPort,agency,client_version,status,create_time createTime,modify_time modifyTime
 	</sql>
 
   <insert id="add">
@@ -27,6 +28,14 @@
     </selectKey>
   </insert>
 
+  <update id="update" parameterType="com.webank.webase.node.mgr.front.entity.TbFront">
+    update tb_front set modify_time = now()
+    <if test="status != null and status != ''">
+      ,status = #{status}
+    </if>
+    where front_id = #{frontId}
+  </update>
+
   <delete id="remove" parameterType="java.lang.Integer">
     delete from tb_front where front_id=#{frontId}
   </delete>

From 9f616b4222a3ed5b6c4ad43f09e1aca50f13295e Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 28 May 2020 18:19:39 +0800
Subject: [PATCH 118/131] catch access exception of front

---
 .../com/webank/webase/node/mgr/group/GroupService.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index fccb23bee..dc245474e 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -15,7 +15,6 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
-import com.webank.webase.node.mgr.base.enums.DataStatus;
 import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.enums.OperateStatus;
@@ -48,7 +47,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.client.HttpStatusCodeException;
+import org.springframework.web.client.ResourceAccessException;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -663,7 +662,7 @@ public List<RspOperateResult> generateGroup(ReqGenerateGroup req) {
             	frontInterface.generateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(),
 						generateGroupInfo);
 				resOperateList.add(operateResult);
-			} catch (NodeMgrException | HttpStatusCodeException e) {
+			} catch (NodeMgrException | ResourceAccessException e) {
 				log.error("fail generateGroup in frontId:{}, exception:{}",
 						tbFront.getFrontId(), e.getMessage());
 				// request front fail
@@ -721,7 +720,7 @@ public List<RspGroupStatus> listGroupStatus(List<String> nodeIdList, List<Intege
             Map<String, String> statusMap = new HashMap<>();
             try{
             	statusMap = getGroupStatus(tbFront, groupIdList);
-			} catch (NodeMgrException | HttpStatusCodeException e) {
+			} catch (NodeMgrException | ResourceAccessException e) {
 				log.error("fail getGroupStatus in frontId:{}, exception:{}",
 						tbFront.getFrontId(), e.getMessage());
 				// request front fail
@@ -773,7 +772,7 @@ public List<RspOperateResult> batchStartGroup(ReqBatchStartGroup req) {
             	frontInterface.operateGroup(tbFront.getFrontIp(), tbFront.getFrontPort(), groupId,
 						OPERATE_START_GROUP);
 				resOperateList.add(operateResult);
-			} catch (NodeMgrException | HttpStatusCodeException e) {
+			} catch (NodeMgrException | ResourceAccessException e) {
 				log.error("fail startGroup in frontId:{}, exception:{}",
 						tbFront.getFrontId(), e.getMessage());
 				operateResult.setCode(OperateStatus.FAIL.getValue());

From 7b918f3393c1544be1c1464d81e4e63dc0e7b1e1 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Thu, 28 May 2020 18:30:10 +0800
Subject: [PATCH 119/131] fix catch 500 and update front

---
 .../java/com/webank/webase/node/mgr/front/FrontService.java    | 3 +++
 .../webank/webase/node/mgr/frontinterface/FrontRestTools.java  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index b9a8059aa..00ddfd0ce 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -292,6 +292,9 @@ public void updateFront(Integer frontId, Integer status) {
             log.error("updateFrontStatus updateFront is null");
             return;
         }
+        if (updateFront.getStatus().equals(status)) {
+            return;
+        }
         updateFront.setStatus(status);
         frontMapper.update(updateFront);
     }
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index dfabb6b08..032a1024c 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -355,7 +355,8 @@ private <T> T restTemplateExchange(int groupId, String uri, HttpMethod method,
                     throw new NodeMgrException(error.getInteger("code"),
                             error.getString("errorMessage"), ex);
                 }
-                throw new NodeMgrException(ConstantCode.REQUEST_FRONT_FAIL, ex);
+                frontService.updateFront(frontUrlInfo.getFrontId(), DataStatus.INVALID.getValue());
+                throw new NodeMgrException(ConstantCode.REQUEST_FRONT_FAIL.getCode(), error.getString("message"));
             }
         }
         return null;

From 641df2aa264a1bf464b74df1f8c075c72fe6c0c7 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 29 May 2020 10:31:16 +0800
Subject: [PATCH 120/131] add update front internal

---
 .../webase/node/mgr/front/FrontService.java    | 18 ++++++++++++++++--
 .../mgr/frontinterface/FrontRestTools.java     |  6 +++---
 .../webase/node/mgr/node/NodeService.java      |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index 00ddfd0ce..864f006c3 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -35,6 +35,8 @@
 import com.webank.webase.node.mgr.node.entity.PeerInfo;
 import com.webank.webase.node.mgr.scheduler.ResetGroupListTask;
 
+import java.time.Duration;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -72,6 +74,9 @@ public class FrontService {
     @Autowired
     private ConstantProperties constants;
 
+	// interval of check front status
+	private static final Long CHECK_FRONT_STATUS_WAIT_MIN_MILLIS = 3000L;
+
     /**
      * add new front
      */
@@ -285,8 +290,8 @@ public void updateFront(TbFront updateFront) {
         frontMapper.update(updateFront);
     }
 
-    public void updateFront(Integer frontId, Integer status) {
-        log.info("updateFrontStatus frontId:{}, status:{}", frontId, status);
+    public void updateFrontWithInternal(Integer frontId, Integer status) {
+        log.debug("updateFrontStatus frontId:{}, status:{}", frontId, status);
         TbFront updateFront = getById(frontId);
         if (updateFront == null) {
             log.error("updateFrontStatus updateFront is null");
@@ -295,6 +300,15 @@ public void updateFront(Integer frontId, Integer status) {
         if (updateFront.getStatus().equals(status)) {
             return;
         }
+        LocalDateTime modifyTime = updateFront.getModifyTime();
+        LocalDateTime createTime = updateFront.getCreateTime();
+		Duration duration = Duration.between(modifyTime, LocalDateTime.now());
+		Long subTime = duration.toMillis();
+		if (subTime < CHECK_FRONT_STATUS_WAIT_MIN_MILLIS && createTime.isBefore(modifyTime)) {
+			log.info("updateFrontWithInternal jump. subTime:{}, minInternal:{}",
+					subTime, CHECK_FRONT_STATUS_WAIT_MIN_MILLIS);
+			return;
+		}
         updateFront.setStatus(status);
         frontMapper.update(updateFront);
     }
diff --git a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
index 032a1024c..fd1bc6ac2 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontinterface/FrontRestTools.java
@@ -337,13 +337,13 @@ private <T> T restTemplateExchange(int groupId, String uri, HttpMethod method,
                     throw new NodeMgrException(ConstantCode.SYSTEM_EXCEPTION);
                 }
                 ResponseEntity<T> response = restTemplate.exchange(url, method, entity, clazz);
-                frontService.updateFront(frontUrlInfo.getFrontId(), DataStatus.NORMAL.getValue());
+                frontService.updateFrontWithInternal(frontUrlInfo.getFrontId(), DataStatus.NORMAL.getValue());
                 return response.getBody();
             } catch (ResourceAccessException ex) {
                 log.warn("fail restTemplateExchange", ex);
                 setFailCount(url, method.toString());
                 if (isServiceSleep(url, method.toString())) {
-                    frontService.updateFront(frontUrlInfo.getFrontId(), DataStatus.INVALID.getValue());
+                    frontService.updateFrontWithInternal(frontUrlInfo.getFrontId(), DataStatus.INVALID.getValue());
                     throw ex;
                 }
                 log.info("continue next front", ex);
@@ -355,7 +355,7 @@ private <T> T restTemplateExchange(int groupId, String uri, HttpMethod method,
                     throw new NodeMgrException(error.getInteger("code"),
                             error.getString("errorMessage"), ex);
                 }
-                frontService.updateFront(frontUrlInfo.getFrontId(), DataStatus.INVALID.getValue());
+                frontService.updateFrontWithInternal(frontUrlInfo.getFrontId(), DataStatus.INVALID.getValue());
                 throw new NodeMgrException(ConstantCode.REQUEST_FRONT_FAIL.getCode(), error.getString("message"));
             }
         }
diff --git a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
index 022131c5b..1df65a2c6 100644
--- a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
+++ b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
@@ -277,7 +277,7 @@ public void checkAndUpdateNodeStatus(int groupId) {
             tbNode.setModifyTime(LocalDateTime.now());
             //update node
             updateNode(tbNode);
-            // update front status
+            // update front status as long as update node (7.5s internal)
             frontService.updateFront(updateFront);
         }
 

From 12ccbfef15208533ebb21fc81487af9ceeb97ab5 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 29 May 2020 16:50:20 +0800
Subject: [PATCH 121/131] adjust async task

---
 .../com/webank/webase/node/mgr/front/FrontService.java    | 2 +-
 .../com/webank/webase/node/mgr/group/GroupController.java | 6 +++---
 .../com/webank/webase/node/mgr/group/GroupService.java    | 8 ++++++++
 .../webase/node/mgr/scheduler/ResetGroupListTask.java     | 8 --------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index 864f006c3..d6b6c05e0 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -276,7 +276,7 @@ public void removeFront(int frontId) {
         //remove map
         frontGroupMapService.removeByFrontId(frontId);
         //reset group list => remove groups that only belongs to this front
-         resetGroupListTask.asyncResetGroupList();
+        groupService.asyncResetGroupList();
         //clear cache
         frontGroupMapCache.clearMapList();
     }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index f363aa089..65f03d2b1 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -108,7 +108,7 @@ public BasePageResponse getAllGroup() throws NodeMgrException {
         }
 
         // reset group
-        resetGroupListTask.asyncResetGroupList();
+        groupService.asyncResetGroupList();
 
         log.info("end getAllGroup useTime:{} result:{}",
                 Duration.between(startTime, Instant.now()).toMillis(),
@@ -145,7 +145,7 @@ public BasePageResponse getAllGroupIncludeInvalidGroup(@PathVariable(value = "pa
             }
         }
         // reset group
-        resetGroupListTask.asyncResetGroupList();
+        groupService.asyncResetGroupList();
 
         log.info("end getAllGroupIncludeInvalidGroup useTime:{} result:{}",
                 Duration.between(startTime, Instant.now()).toMillis(),
@@ -171,7 +171,7 @@ public BaseResponse getAllGroupOfStatus(@PathVariable("groupStatus") Integer gro
         }
 
         // reset group
-        resetGroupListTask.asyncResetGroupList();
+        groupService.asyncResetGroupList();
 
         log.info("end getAllGroupOfStatus useTime:{} result:{}",
                 Duration.between(startTime, Instant.now()).toMillis(),
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index dc245474e..02c88753c 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -44,6 +44,7 @@
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -186,6 +187,13 @@ public GroupGeneral queryGroupGeneral(int groupId) throws NodeMgrException {
         return generalInfo;
     }
 
+	/**
+	 * async reset groupList.
+	 */
+	@Async(value = "mgrAsyncExecutor")
+	public void asyncResetGroupList() {
+		resetGroupList();
+	}
 
     /**
      * reset groupList.
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
index 4b38fa50a..de04890f2 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
@@ -36,14 +36,6 @@ public void taskStart() {
         resetGroupList();
     }
 
-    /**
-     * async reset groupList.
-     */
-    @Async(value = "mgrAsyncExecutor")
-    public void asyncResetGroupList() {
-        resetGroupList();
-    }
-
     /**
      * reset groupList.
      */

From 40b376758820600e0abfb44dddcd800fc261245a Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 29 May 2020 19:26:50 +0800
Subject: [PATCH 122/131] add log of update map

---
 .../webase/node/mgr/frontgroupmap/FrontGroupMapService.java | 3 +++
 .../java/com/webank/webase/node/mgr/group/GroupService.java | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index b23e83e78..c61a7af94 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -90,6 +90,9 @@ public void newFrontGroupWithStatus(TbFront front, Integer groupId) {
                 log.debug("newFrontGroupWithStatus update map's groupStatus MAINTAINING.");
                 newFrontGroup(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
             }
+        } else {
+            log.warn("newFrontGroupWithStatus get group status fail, " +
+                    "update front_group_map status fail. res:{}", res);
         }
     }
 
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 02c88753c..f99d4d332 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -212,7 +212,7 @@ public synchronized void resetGroupList() {
             return;
         }
         // save group and nodes(peers, sealer, observer) and front_group_map from chain
-		// update front_group_map by chain data
+		// update front_group_map by group list on chain
 		saveDataOfGroup(frontList, allGroupSet);
 
         // check group status(normal or maintaining), update by local group list
@@ -251,7 +251,7 @@ private void saveDataOfGroup(List<TbFront> frontList, Set<Integer> allGroupSet)
 			try {
 				groupIdList = frontInterface.getGroupListFromSpecificFront(frontIp, frontPort);
 			} catch (Exception ex) {
-				log.error("fail getGroupListFromSpecificFront.", ex);
+				log.error("saveDataOfGroup fail getGroupListFromSpecificFront.", ex);
 				continue;
 			}
 			// update by group list on chain
@@ -517,7 +517,7 @@ public void checkGroupMapByLocalGroupList(List<TbFront> frontList) {
 			try {
 				groupListOnChain = frontInterface.getGroupListFromSpecificFront(front.getFrontIp(), front.getFrontPort());
 			} catch (Exception ex) {
-				log.error("fail getGroupListFromSpecificFront.", ex);
+				log.error("checkGroupMapByLocalGroupList fail getGroupListFromSpecificFront.", ex);
 				continue;
 			}
 			// group list local

From d3111321e707187ccb82a996bff46f3bd2b79e9d Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 29 May 2020 19:27:06 +0800
Subject: [PATCH 123/131] add schedule threads to 50

---
 src/main/resources/application.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 81f9a5216..c6de487a5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -76,9 +76,9 @@ executor:
 
 # scheduler config for sync scheduled task
 scheduler:
-  poolSize: 5
+  poolSize: 50
   threadNamePrefix: "node-mgr-task-"
-  awaitTerminationSeconds: 60
+  awaitTerminationSeconds: 600
   waitForTasksToCompleteOnShutdown: true
 
 sdk:

From 3fe29466ec5e4603b9fb2338047a855c4fee2a13 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 29 May 2020 20:06:12 +0800
Subject: [PATCH 124/131] stop group manually set map as invalid

---
 .../frontgroupmap/FrontGroupMapService.java   |  2 +-
 .../webase/node/mgr/group/GroupService.java   | 19 +++++++++++++++++--
 .../mgr/test/user/UserControllerTest.java     |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index c61a7af94..c3d22e33a 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -45,7 +45,7 @@ public class FrontGroupMapService {
     private FrontInterfaceService frontInterface;
 
     /**
-     * add new mapping
+     * add new mapping with group status directly
      */
     public TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
         log.info("start newFrontGroup frontId:{} groupId:{} status:{}", frontId, groupId, status);
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index f99d4d332..1bb541187 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -15,6 +15,7 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.base.code.ConstantCode;
+import com.webank.webase.node.mgr.base.entity.BaseResponse;
 import com.webank.webase.node.mgr.base.enums.GroupStatus;
 import com.webank.webase.node.mgr.base.enums.GroupType;
 import com.webank.webase.node.mgr.base.enums.OperateStatus;
@@ -259,7 +260,15 @@ private void saveDataOfGroup(List<TbFront> frontList, Set<Integer> allGroupSet)
 				Integer gId = Integer.valueOf(groupId);
 				allGroupSet.add(gId);
 				// peer in group
-				List<String> groupPeerList = frontInterface.getGroupPeersFromSpecificFront(frontIp, frontPort, gId);
+				List<String> groupPeerList;
+				try {
+					groupPeerList = frontInterface.getGroupPeersFromSpecificFront(frontIp, frontPort, gId);
+				} catch (Exception e) {
+					// case: if front1 group1 stopped, getGroupPeers error, update front1_group1_map invalid fail
+					log.warn("saveDataOfGroup getGroupPeersFromSpecificFront fail, frontId:{}, groupId:{}",
+							front.getFrontId(), groupId);
+					continue;
+				}
 				// check group not existed or node count differs
 				// save group entity
 				TbGroup checkGroupExist = getGroupById(gId);
@@ -701,9 +710,15 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
             throw new NodeMgrException(ConstantCode.NODE_NOT_EXISTS);
         }
         // request front to operate
-        Object groupOperateStatus = frontInterface.operateGroup(tbFront.getFrontIp(),
+        BaseResponse groupOperateStatus = frontInterface.operateGroup(tbFront.getFrontIp(),
                 tbFront.getFrontPort(), groupId, type);
+        // if stop group, manually refresh front_group_map as invalid
+        if (OPERATE_STOP_GROUP.equals(type) && groupOperateStatus.getCode() == 0) {
+        	log.info("stopGroup newFrontGroup frontId:{}, groupId:{}", tbFront.getFrontId(), groupId);
+        	frontGroupMapService.newFrontGroup(tbFront.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
+		}
         // refresh group status
+		// if stop group, cannot update front_group_map as invalid for getGroupPeers fail
         resetGroupList();
 
         // return
diff --git a/src/test/java/node/mgr/test/user/UserControllerTest.java b/src/test/java/node/mgr/test/user/UserControllerTest.java
index acde55cc5..57f088f68 100644
--- a/src/test/java/node/mgr/test/user/UserControllerTest.java
+++ b/src/test/java/node/mgr/test/user/UserControllerTest.java
@@ -15,7 +15,7 @@
 
 import com.alibaba.fastjson.JSON;
 import com.webank.webase.node.mgr.Application;
-import com.webank.webase.node.mgr.frontgroupmap.entity.FrontGroupMapCache;
+import com.webank.webase.node.mgr.frontgroupmap.FrontGroupMapCache;
 import com.webank.webase.node.mgr.user.entity.BindUserInputParam;
 import com.webank.webase.node.mgr.user.entity.NewUserInputParam;
 import com.webank.webase.node.mgr.user.entity.UpdateUserInputParam;

From daee645e8e5fe262f49b6cba1561dae7f8c907cf Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 29 May 2020 20:24:49 +0800
Subject: [PATCH 125/131] fix all node invalid

---
 .../webase/node/mgr/node/NodeService.java     | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
index 1df65a2c6..717860c60 100644
--- a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
+++ b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
@@ -223,17 +223,10 @@ public void checkAndUpdateNodeStatus(int groupId) {
             Duration duration = Duration.between(modifyTime, LocalDateTime.now());
             Long subTime = duration.toMillis();
             if (subTime < CHECK_NODE_WAIT_MIN_MILLIS && createTime.isBefore(modifyTime)) {
-                log.warn("checkNodeStatus jump over. subTime:{}", subTime);
+                log.warn("checkNodeStatus jump over. for time internal subTime:{}", subTime);
                 return;
             }
 
-            // to update front status
-            TbFront updateFront = frontService.getByNodeId(nodeId);
-            if (updateFront == null) {
-                log.warn(" checkAndUpdateNodeStatus updateFront is null, nodeId:{}", nodeId);
-                log.warn("checkNodeStatus jump over. subTime:{}", subTime);
-                return;
-            }
             
             int nodeType = 0;   //0-consensus;1-observer
             if (observerList != null) {
@@ -253,12 +246,10 @@ public void checkAndUpdateNodeStatus(int groupId) {
                     log.warn("node[{}] is invalid. localNumber:{} chainNumber:{} localView:{} chainView:{}",
                         nodeId, localBlockNumber, latestNumber, localPbftView, latestView);
                     tbNode.setNodeActive(DataStatus.INVALID.getValue());
-                    updateFront.setStatus(DataStatus.INVALID.getValue());
                 } else {
                     tbNode.setBlockNumber(latestNumber);
                     tbNode.setPbftView(latestView);
                     tbNode.setNodeActive(DataStatus.NORMAL.getValue());
-                    updateFront.setStatus(DataStatus.NORMAL.getValue());
                 }
             } else { //observer
                 // if latest block number not equal, invalid
@@ -266,19 +257,23 @@ public void checkAndUpdateNodeStatus(int groupId) {
                     log.warn("node[{}] is invalid. localNumber:{} chainNumber:{} localView:{} chainView:{}",
                             nodeId, localBlockNumber, latestNumber, localPbftView, latestView);
                     tbNode.setNodeActive(DataStatus.INVALID.getValue());
-                    updateFront.setStatus(DataStatus.INVALID.getValue());
                 } else {
                     tbNode.setBlockNumber(latestNumber);
                     tbNode.setPbftView(latestView);
                     tbNode.setNodeActive(DataStatus.NORMAL.getValue());
-                    updateFront.setStatus(DataStatus.NORMAL.getValue());
                 }
             }
             tbNode.setModifyTime(LocalDateTime.now());
             //update node
             updateNode(tbNode);
-            // update front status as long as update node (7.5s internal)
-            frontService.updateFront(updateFront);
+            // to update front status
+            TbFront updateFront = frontService.getByNodeId(nodeId);
+            if (updateFront != null) {
+                // update front status as long as update node (7.5s internal)
+                log.debug("update front with node update nodeStatus:{}", tbNode.getNodeActive());
+                updateFront.setStatus(tbNode.getNodeActive());
+                frontService.updateFront(updateFront);
+            }
         }
 
     }

From f3ef1e5d03f34268cb931a5759a7d13057f64bab Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 29 May 2020 20:42:56 +0800
Subject: [PATCH 126/131] rename map service

---
 .../com/webank/webase/node/mgr/front/FrontService.java |  2 +-
 .../node/mgr/frontgroupmap/FrontGroupMapService.java   | 10 +++++-----
 .../com/webank/webase/node/mgr/group/GroupService.java |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index d6b6c05e0..b4bf01942 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -144,7 +144,7 @@ public TbFront newFront(FrontInfo frontInfo) {
                         GroupType.SYNC.getValue(), DataStatus.NORMAL.getValue());
             }
             //save front group map
-            frontGroupMapService.newFrontGroupWithStatus(tbFront, group);
+            frontGroupMapService.newFrontGroup(tbFront, group);
             //save nodes
             for (String nodeId : groupPeerList) {
                 PeerInfo newPeer = peerList.stream().map(p -> NodeMgrTools
diff --git a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
index c3d22e33a..45b85d28d 100644
--- a/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
+++ b/src/main/java/com/webank/webase/node/mgr/frontgroupmap/FrontGroupMapService.java
@@ -47,7 +47,7 @@ public class FrontGroupMapService {
     /**
      * add new mapping with group status directly
      */
-    public TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer status) {
+    public TbFrontGroupMap newFrontGroupWithStatus(Integer frontId, Integer groupId, Integer status) {
         log.info("start newFrontGroup frontId:{} groupId:{} status:{}", frontId, groupId, status);
         MapListParam param = new MapListParam(frontId, groupId);
         FrontGroup frontGroup = frontGroupMapMapper.queryFrontGroup(param);
@@ -72,9 +72,9 @@ public TbFrontGroupMap newFrontGroup(Integer frontId, Integer groupId, Integer s
     }
 
     /**
-     * new front group map only for normal group
+     * new front group map
      */
-    public void newFrontGroupWithStatus(TbFront front, Integer groupId) {
+    public void newFrontGroup(TbFront front, Integer groupId) {
         // check front's all group status
         BaseResponse res = frontInterface.operateGroup(front.getFrontIp(), front.getFrontPort(),
                 groupId, OPERATE_STATUS_GROUP);
@@ -85,10 +85,10 @@ public void newFrontGroupWithStatus(TbFront front, Integer groupId) {
             String groupStatus = (String) res.getData();
             if (RUNNING_GROUP.equals(groupStatus)) {
                 log.debug("newFrontGroupWithStatus update map's groupStatus NORMAL.");
-                newFrontGroup(front.getFrontId(), groupId, GroupStatus.NORMAL.getValue());
+                newFrontGroupWithStatus(front.getFrontId(), groupId, GroupStatus.NORMAL.getValue());
             } else {
                 log.debug("newFrontGroupWithStatus update map's groupStatus MAINTAINING.");
-                newFrontGroup(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
+                newFrontGroupWithStatus(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
             }
         } else {
             log.warn("newFrontGroupWithStatus get group status fail, " +
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 1bb541187..296e55a7f 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -278,7 +278,7 @@ private void saveDataOfGroup(List<TbFront> frontList, Set<Integer> allGroupSet)
 				}
 				// refresh front group map by group list on chain
 				// different from checkGroupMapByLocalGroupList which update by local groupList
-				frontGroupMapService.newFrontGroupWithStatus(front, gId);
+				frontGroupMapService.newFrontGroup(front, gId);
 
 				//save new peers(tb_node)
 				savePeerList(frontIp, frontPort, gId, groupPeerList);
@@ -537,7 +537,7 @@ public void checkGroupMapByLocalGroupList(List<TbFront> frontList) {
 					log.info("update front_group_map by local data front:{}, groupId:{} ",
 							front, groupId);
 					// case: group2 in font1, not in front2, but local has group2, so add front1_group2_map but not front2_group2_map
-					frontGroupMapService.newFrontGroup(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
+					frontGroupMapService.newFrontGroupWithStatus(front.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
 				}
 			});
 		}
@@ -715,7 +715,7 @@ public Object operateGroup(String nodeId, Integer groupId, String type) {
         // if stop group, manually refresh front_group_map as invalid
         if (OPERATE_STOP_GROUP.equals(type) && groupOperateStatus.getCode() == 0) {
         	log.info("stopGroup newFrontGroup frontId:{}, groupId:{}", tbFront.getFrontId(), groupId);
-        	frontGroupMapService.newFrontGroup(tbFront.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
+        	frontGroupMapService.newFrontGroupWithStatus(tbFront.getFrontId(), groupId, GroupStatus.MAINTAINING.getValue());
 		}
         // refresh group status
 		// if stop group, cannot update front_group_map as invalid for getGroupPeers fail

From 58b22da34860df324bf2a1a45eaf986ab3c94e5e Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Fri, 29 May 2020 20:59:36 +0800
Subject: [PATCH 127/131] revert group async rename

---
 .../com/webank/webase/node/mgr/front/FrontService.java    | 2 +-
 .../com/webank/webase/node/mgr/group/GroupController.java | 6 +++---
 .../com/webank/webase/node/mgr/group/GroupService.java    | 8 --------
 .../webase/node/mgr/scheduler/ResetGroupListTask.java     | 8 ++++++++
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
index b4bf01942..4df8f5494 100644
--- a/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
+++ b/src/main/java/com/webank/webase/node/mgr/front/FrontService.java
@@ -276,7 +276,7 @@ public void removeFront(int frontId) {
         //remove map
         frontGroupMapService.removeByFrontId(frontId);
         //reset group list => remove groups that only belongs to this front
-        groupService.asyncResetGroupList();
+        resetGroupListTask.asyncResetGroupList();
         //clear cache
         frontGroupMapCache.clearMapList();
     }
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
index 65f03d2b1..f363aa089 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupController.java
@@ -108,7 +108,7 @@ public BasePageResponse getAllGroup() throws NodeMgrException {
         }
 
         // reset group
-        groupService.asyncResetGroupList();
+        resetGroupListTask.asyncResetGroupList();
 
         log.info("end getAllGroup useTime:{} result:{}",
                 Duration.between(startTime, Instant.now()).toMillis(),
@@ -145,7 +145,7 @@ public BasePageResponse getAllGroupIncludeInvalidGroup(@PathVariable(value = "pa
             }
         }
         // reset group
-        groupService.asyncResetGroupList();
+        resetGroupListTask.asyncResetGroupList();
 
         log.info("end getAllGroupIncludeInvalidGroup useTime:{} result:{}",
                 Duration.between(startTime, Instant.now()).toMillis(),
@@ -171,7 +171,7 @@ public BaseResponse getAllGroupOfStatus(@PathVariable("groupStatus") Integer gro
         }
 
         // reset group
-        groupService.asyncResetGroupList();
+        resetGroupListTask.asyncResetGroupList();
 
         log.info("end getAllGroupOfStatus useTime:{} result:{}",
                 Duration.between(startTime, Instant.now()).toMillis(),
diff --git a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
index 296e55a7f..efae386b6 100644
--- a/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
+++ b/src/main/java/com/webank/webase/node/mgr/group/GroupService.java
@@ -188,14 +188,6 @@ public GroupGeneral queryGroupGeneral(int groupId) throws NodeMgrException {
         return generalInfo;
     }
 
-	/**
-	 * async reset groupList.
-	 */
-	@Async(value = "mgrAsyncExecutor")
-	public void asyncResetGroupList() {
-		resetGroupList();
-	}
-
     /**
      * reset groupList.
      */
diff --git a/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java b/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
index de04890f2..4b38fa50a 100644
--- a/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
+++ b/src/main/java/com/webank/webase/node/mgr/scheduler/ResetGroupListTask.java
@@ -36,6 +36,14 @@ public void taskStart() {
         resetGroupList();
     }
 
+    /**
+     * async reset groupList.
+     */
+    @Async(value = "mgrAsyncExecutor")
+    public void asyncResetGroupList() {
+        resetGroupList();
+    }
+
     /**
      * reset groupList.
      */

From ea0d1e897bd606c3ab1b80ec61399f3502dfbb22 Mon Sep 17 00:00:00 2001
From: marsli <marsli@webank.com>
Date: Mon, 1 Jun 2020 11:09:00 +0800
Subject: [PATCH 128/131] v1.3.1

---
 Changelog.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index fcc88c996..077702e04 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,26 @@
+### v1.3.1(2020-06-01)
+
+**Add**
+- 新增动态管理群组接口，支持群组脏数据提醒，手动删除群组数据等
+- 新增导入已部署合约的ABI接口，进行合约调用
+- 新增导入.p12/.pem/.txt格式私钥接口，支持导入控制台与前置的私钥
+- 新增节点前置状态，可查看前置运行状态
+
+**Fix**
+- 修复部署合约权限不足导致合约地址为0x0
+- 移除自动删除无效群组数据的逻辑
+- 修复公钥用户签名报空问题
+
+**兼容性**
+- 支持FISCO-BCOS v2.2.0 及以上版本
+- WeBASE-Web v1.3.1+
+- WeBASE-Front v1.3.0+
+- WeBASE-Sign v1.3.0+
+- WeBASE-Transaction v1.3.0+
+
+详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)。
+
+
 ### v1.3.0(2020-04-29)
 
 **Add**

From 1a48cfdd7e353f9c4f4649070a45a8ce68c2925d Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 1 Jun 2020 11:43:24 +0800
Subject: [PATCH 129/131] fix index out range

---
 src/main/java/com/webank/webase/node/mgr/node/NodeService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
index 717860c60..729edd14d 100644
--- a/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
+++ b/src/main/java/com/webank/webase/node/mgr/node/NodeService.java
@@ -306,8 +306,8 @@ private List<PeerOfConsensusStatus> getPeerOfConsensusStatus(int groupId) {
         JSONArray jsonArr = JSONArray.parseArray(consensusStatusJson);
         List<Object> dataIsList = jsonArr.stream().filter(jsonObj -> jsonObj instanceof List)
             .map(arr -> {
-                Object obj = JSONArray.parseArray(JSON.toJSONString(arr)).get(0);
                 try {
+                    Object obj = JSONArray.parseArray(JSON.toJSONString(arr)).get(0);
                     NodeMgrTools.object2JavaBean(obj, PeerOfConsensusStatus.class);
                 } catch (Exception e) {
                     return null;

From 63a84749a8821d0eb056ecf5231633bddeff9607 Mon Sep 17 00:00:00 2001
From: CodingCattwo <847701726@qq.com>
Date: Mon, 1 Jun 2020 14:18:54 +0800
Subject: [PATCH 130/131] update fastjson

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index bb7186aec..b3eed6f8e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,7 +63,7 @@ dependencies {
     compile springboot,jaxb,web3jsdk,jackson
     compile "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.0.0"
     compile "org.apache.commons:commons-lang3:3.8.1"
-    compile "com.alibaba:fastjson:1.2.67"
+    compile "com.alibaba:fastjson:1.2.69"
     compile "mysql:mysql-connector-java:8.0.13"
     compile "com.zaxxer:HikariCP:3.2.0"
     compile "com.github.sgroschupf:zkclient:0.1"

From b189a02f8e8eb3d17f978cc6402fc34e640635dd Mon Sep 17 00:00:00 2001
From: marsli <marsli@webank.com>
Date: Thu, 4 Jun 2020 11:14:28 +0800
Subject: [PATCH 131/131] v1.3.1

update support version
---
 Changelog.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 077702e04..8362fb84f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,8 +14,8 @@
 **兼容性**
 - 支持FISCO-BCOS v2.2.0 及以上版本
 - WeBASE-Web v1.3.1+
-- WeBASE-Front v1.3.0+
-- WeBASE-Sign v1.3.0+
+- WeBASE-Front v1.3.1+
+- WeBASE-Sign v1.3.1+
 - WeBASE-Transaction v1.3.0+
 
 详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)。