@@ -15,9 +15,16 @@ | |||||
<artifactId>utils-common</artifactId> | <artifactId>utils-common</artifactId> | ||||
<version>${project.version}</version> | <version>${project.version}</version> | ||||
</dependency> | </dependency> | ||||
<dependency> | |||||
<groupId>org.springframework.boot</groupId> | |||||
<artifactId>spring-boot-starter-log4j2</artifactId> | |||||
</dependency> | |||||
<dependency> | <dependency> | ||||
<groupId>junit</groupId> | <groupId>junit</groupId> | ||||
<artifactId>junit</artifactId> | <artifactId>junit</artifactId> | ||||
<scope>test</scope> | |||||
</dependency> | </dependency> | ||||
</dependencies> | </dependencies> | ||||
</project> | </project> |
@@ -35,7 +35,7 @@ public class GatewayWebServerConfigurer implements WebMvcConfigurer { | |||||
JSONSerializeUtils.disableCircularReferenceDetect(); | JSONSerializeUtils.disableCircularReferenceDetect(); | ||||
JSONSerializeUtils.configStringSerializer(ByteArray.class); | JSONSerializeUtils.configStringSerializer(ByteArray.class); | ||||
DataContractRegistry.register(BftsmartNodeSettings.class); | DataContractRegistry.register(BftsmartNodeSettings.class); | ||||
DataContractRegistry.register(LedgerAdminInfo.class); | |||||
// DataContractRegistry.register(LedgerAdminInfo.class); | |||||
} | } | ||||
@@ -19,6 +19,7 @@ public class RolesConfigureOpTemplate implements RolesConfigurer, RolesConfigure | |||||
static { | static { | ||||
DataContractRegistry.register(UserRegisterOperation.class); | DataContractRegistry.register(UserRegisterOperation.class); | ||||
DataContractRegistry.register(RolesConfigureOperation.class); | |||||
} | } | ||||
private Map<String, RolePrivilegeConfig> rolesMap = Collections | private Map<String, RolePrivilegeConfig> rolesMap = Collections | ||||
@@ -18,6 +18,7 @@ public class UserAuthorizeOpTemplate implements UserAuthorizer, UserAuthorizeOpe | |||||
static { | static { | ||||
DataContractRegistry.register(UserRegisterOperation.class); | DataContractRegistry.register(UserRegisterOperation.class); | ||||
DataContractRegistry.register(UserAuthorizeOperation.class); | |||||
} | } | ||||
private Set<UserRolesAuthorization> userAuthMap = Collections | private Set<UserRolesAuthorization> userAuthMap = Collections | ||||
@@ -111,7 +111,7 @@ public class ManagementController implements LedgerBindingConfigAware, PeerManag | |||||
DataContractRegistry.register(BftsmartConsensusSettings.class); | DataContractRegistry.register(BftsmartConsensusSettings.class); | ||||
DataContractRegistry.register(BftsmartNodeSettings.class); | DataContractRegistry.register(BftsmartNodeSettings.class); | ||||
DataContractRegistry.register(LedgerAdminDataQuery.class); | |||||
// DataContractRegistry.register(LedgerAdminDataQuery.class); | |||||
} | } | ||||
@@ -43,6 +43,21 @@ public class LedgerInitializeWeb4Nodes { | |||||
public static final String[] PRIV_KEYS = IntegrationBase.PRIV_KEYS; | 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 | @Test | ||||
public void testMQInitByMemWith4Nodes() { | public void testMQInitByMemWith4Nodes() { | ||||
testInitWith4Nodes(LedgerInitConsensusConfig.mqConfig, LedgerInitConsensusConfig.memConnectionStrings); | testInitWith4Nodes(LedgerInitConsensusConfig.mqConfig, LedgerInitConsensusConfig.memConnectionStrings); | ||||
@@ -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> |