987

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/PlannerServiceImpl.java

@@ -70,12 +70,12 @@ public class PlannerServiceImpl implements  PlannerService{
 		pp.setOperationTime(currentTime);//操作时间
 		pp.setHash(hash);//操作hash
 		userMapper.insertOperationHistory(pp);//插入到操作记录表去
-		ProtobufBean protobufBean = blockChainUtil.getProtobufBean(pp.getSign());
+	/*	ProtobufBean protobufBean = blockChainUtil.getProtobufBean(pp.getSign());
 		String result = blockChainUtil.sendPostParam(protobufBean);
-		boolean flag = blockChainUtil.vilaResult(result);
-//		boolean flag = blockChainUtil.sendBlockChain(pp.getSign());//发送签名直接转发到区块链
+		boolean flag = blockChainUtil.vilaResult(result);*/
+		boolean flag = blockChainUtil.sendBlockChain(pp.getSign());//发送签名直接转发到区块链
 		if(!flag) {
-			 throw new RuntimeException("区块链操作失败:"+result);
+			 throw new RuntimeException("区块链操作失败:");
 		}
 
 	}

saicLogistics/src/main/java/com/fuzamei/service/serviceImpl/UserServiceImpl.java

@@ -144,10 +144,12 @@ public class UserServiceImpl  implements  UserService {
 		user.setOperationTime(currentTime);//操作时间
 		user.setHash(hash);//操作hash
 		userMapper.insertOperationHistoryOfDelete(user);//插入到操作记录表去
-		
-		boolean flag = blockChainUtil.sendBlockChain(user.getSign());//发送签名直接转发到区块链
+		ProtobufBean protobufBean = blockChainUtil.getProtobufBean(user.getSign());
+		String result = blockChainUtil.sendPostParam(protobufBean);
+		boolean flag = blockChainUtil.vilaResult(result);
+		//boolean flag = blockChainUtil.sendBlockChain(user.getSign());//发送签名直接转发到区块链
 		if(!flag) {
-			 throw new RuntimeException("区块链操作失败");	
+			 throw new RuntimeException("区块链操作失败:"+result);	
 		}
 	}
 

saicLogistics/src/main/java/com/fuzamei/web/UserAction.java

@@ -136,7 +136,7 @@ public class UserAction {
 			 ValidationUtil.checkBlankAndAssignString(user.getPassword(),RegexConstant.PWD_REGEX);//校验密码
 			 ValidationUtil.checkBlankAndAssignString(user.getPersonName());//校验名称
 			 ValidationUtil.checkBlankAndAssignString(user.getSign());//校验签名
-			 if(userDetail.getUsername().equals(user.getUsername())) {
+			 if(userDetail.getUsername().equals(user.getUsername())) {//-------------------------TODO
 				 user.setUsername(null);
 				 userService.updateAccountByUserId(user);
 				 return JSONUtil.getJsonMap(200, true, HintMSG.OPERATION_SUCCESS, null);