Merge tag '1.1.0' into develop

no message

source/manager/manager-model/src/main/java/com/jd/blockchain/ump/model/config/PeerLocalConfig.java

@@ -16,7 +16,7 @@ public class PeerLocalConfig extends PeerSharedConfig {
 
     private String peerPath;
 
-    private String consensusConf = "bftsmart.config"; // 默认为bftsmart配置
+    private String consensusConf = "bftsmart.default.config"; // 默认为bftsmart配置
 
     private String privKey;
 

source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/SecurityServiceHandler.java

@@ -14,9 +14,11 @@ import java.util.Properties;
 @Service
 public class SecurityServiceHandler implements SecurityService {
 
+    private static final String PATH_INNER = "/";
+
     private static final Logger LOGGER = LoggerFactory.getLogger(SecurityServiceHandler.class);
 
-    static final String SECURITY_FILE = "security.config";
+    static final String SECURITY_FILE = "security.default.config";
 
     private List<String> securityConfigs = new ArrayList<>();
 
@@ -42,7 +44,7 @@ public class SecurityServiceHandler implements SecurityService {
         try {
             // 读取配置文件中的内容
             InputStream currentFileInputStream = SecurityServiceHandler.class.getResourceAsStream(
-                    File.separator + SECURITY_FILE);
+                    PATH_INNER + SECURITY_FILE);
 
             Properties currentProps = new Properties();
 

source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/ConsensusServiceHandler.java

@@ -16,6 +16,8 @@ import java.util.concurrent.ConcurrentHashMap;
 @Service
 public class ConsensusServiceHandler implements ConsensusService {
 
+    private static final String PATH_INNER = "/";
+
     private static final Map<String, ConsensusProvider> CONSENSUS_PROVIDERS = new ConcurrentHashMap<>();
 
     static {
@@ -60,7 +62,7 @@ public class ConsensusServiceHandler implements ConsensusService {
 
                         // 根据value读取配置文件中的内容
                         InputStream currentFileInputStream = ConsensusServiceHandler.class.getResourceAsStream(
-                                File.separator + provider.configFilePath());
+                                PATH_INNER + provider.configFilePath());
 
                         Properties currentProps = new Properties();
 

source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/BftsmartConsensusProvider.java

@@ -12,7 +12,7 @@ public class BftsmartConsensusProvider implements ConsensusProvider {
 
     public static final String BFTSMART_PROVIDER = "com.jd.blockchain.consensus.bftsmart.BftsmartConsensusProvider";
 
-    public static final String BFTSMART_CONFIG_FILE = "bftsmart.config";
+    public static final String BFTSMART_CONFIG_FILE = "bftsmart.default.config";
 
     private static final int MIN_PARTI_SIZE = 4;
 

source/manager/manager-service/src/main/java/com/jd/blockchain/ump/service/consensus/providers/MsgQueueConsensusProvider.java

@@ -10,7 +10,7 @@ public class MsgQueueConsensusProvider implements ConsensusProvider {
 
     private static final String MSGQUEUE_PROVIDER = "com.jd.blockchain.consensus.mq.MsgQueueConsensusProvider";
 
-    private static final String MSGQUEUE_CONFIG_FILE = "mq.config";
+    private static final String MSGQUEUE_CONFIG_FILE = "mq.default.config";
 
     private Properties msgQueueProps;