修改集成测试BUG

source/binary-proto/pom.xml

@@ -15,9 +15,16 @@
 			<artifactId>utils-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j2</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<scope>test</scope>
 		</dependency>
 	</dependencies>
 </project>

source/gateway/src/main/java/com/jd/blockchain/gateway/web/GatewayWebServerConfigurer.java

@@ -35,7 +35,7 @@ public class GatewayWebServerConfigurer implements WebMvcConfigurer {
 		JSONSerializeUtils.disableCircularReferenceDetect();
 		JSONSerializeUtils.configStringSerializer(ByteArray.class);
 		DataContractRegistry.register(BftsmartNodeSettings.class);
-		DataContractRegistry.register(LedgerAdminInfo.class);
+//		DataContractRegistry.register(LedgerAdminInfo.class);
 	}
 
 

source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/RolesConfigureOpTemplate.java

@@ -19,6 +19,7 @@ public class RolesConfigureOpTemplate implements RolesConfigurer, RolesConfigure
 
 	static {
 		DataContractRegistry.register(UserRegisterOperation.class);
+		DataContractRegistry.register(RolesConfigureOperation.class);
 	}
 
 	private Map<String, RolePrivilegeConfig> rolesMap = Collections

source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserAuthorizeOpTemplate.java

@@ -18,6 +18,7 @@ public class UserAuthorizeOpTemplate implements UserAuthorizer, UserAuthorizeOpe
 
 	static {
 		DataContractRegistry.register(UserRegisterOperation.class);
+		DataContractRegistry.register(UserAuthorizeOperation.class);
 	}
 
 	private Set<UserRolesAuthorization> userAuthMap = Collections

source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java

@@ -111,7 +111,7 @@ public class ManagementController implements LedgerBindingConfigAware, PeerManag
 		DataContractRegistry.register(BftsmartConsensusSettings.class);
 		DataContractRegistry.register(BftsmartNodeSettings.class);
 		
-		DataContractRegistry.register(LedgerAdminDataQuery.class);
+//		DataContractRegistry.register(LedgerAdminDataQuery.class);
 
 	}
 

source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java

@@ -43,6 +43,21 @@ public class LedgerInitializeWeb4Nodes {
 
 	public static final String[] PRIV_KEYS = IntegrationBase.PRIV_KEYS;
 
+	static {
+		try {
+			// 首先获取当前Resource路径
+			ClassPathResource ledgerInitSettingResource = new ClassPathResource("");
+			String path = ledgerInitSettingResource.getURL().getPath();
+			System.out.println("-----" + path + "-----");
+			// 将参数注册进去
+			System.setProperty("peer.log", path);
+			System.setProperty("init.log", path);
+			System.setProperty("gateway.log", path);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
 	@Test
 	public void testMQInitByMemWith4Nodes() {
 		testInitWith4Nodes(LedgerInitConsensusConfig.mqConfig, LedgerInitConsensusConfig.memConnectionStrings);

source/test/test-integration/src/test/resources/logback-test.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/base.xml" />
-    <!-- 日志级别设置为 ERROR -->
-    <root level="ERROR" />
-</configuration>