diff --git a/source/binary-proto/pom.xml b/source/binary-proto/pom.xml
index b0c94608..ace2ff38 100644
--- a/source/binary-proto/pom.xml
+++ b/source/binary-proto/pom.xml
@@ -15,9 +15,16 @@
utils-common
${project.version}
+
+
+ org.springframework.boot
+ spring-boot-starter-log4j2
+
+
junit
junit
+ test
\ No newline at end of file
diff --git a/source/gateway/src/main/java/com/jd/blockchain/gateway/web/GatewayWebServerConfigurer.java b/source/gateway/src/main/java/com/jd/blockchain/gateway/web/GatewayWebServerConfigurer.java
index fba7295a..83268ad8 100644
--- a/source/gateway/src/main/java/com/jd/blockchain/gateway/web/GatewayWebServerConfigurer.java
+++ b/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);
}
diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/RolesConfigureOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/RolesConfigureOpTemplate.java
index 5ff5fea0..ab8d19dc 100644
--- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/RolesConfigureOpTemplate.java
+++ b/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 rolesMap = Collections
diff --git a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserAuthorizeOpTemplate.java b/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserAuthorizeOpTemplate.java
index a8f44f87..ed851763 100644
--- a/source/ledger/ledger-model/src/main/java/com/jd/blockchain/transaction/UserAuthorizeOpTemplate.java
+++ b/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 userAuthMap = Collections
diff --git a/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java b/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java
index c65ab837..b254da02 100644
--- a/source/peer/src/main/java/com/jd/blockchain/peer/web/ManagementController.java
+++ b/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);
}
diff --git a/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java b/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java
index 6909c155..a48e7ca2 100644
--- a/source/test/test-integration/src/test/java/test/com/jd/blockchain/intgr/initializer/LedgerInitializeWeb4Nodes.java
+++ b/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);
diff --git a/source/test/test-integration/src/test/resources/logback-test.xml b/source/test/test-integration/src/test/resources/logback-test.xml
deleted file mode 100644
index 29013782..00000000
--- a/source/test/test-integration/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file