diff --git a/sdk-core/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java b/sdk-core/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java index b4377eacd..92bd4c0e9 100644 --- a/sdk-core/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java +++ b/sdk-core/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java @@ -15,7 +15,6 @@ package org.fisco.bcos.sdk.config.model; -import java.io.File; import java.util.Map; import org.fisco.bcos.sdk.config.exceptions.ConfigException; import org.fisco.bcos.sdk.model.CryptoType; @@ -124,20 +123,15 @@ public CryptoMaterialConfig getDefaultCaCertPath(int cryptoType, String certPath CryptoMaterialConfig cryptoMaterialConfig = new CryptoMaterialConfig(); cryptoMaterialConfig.setCertPath(certPath); if (cryptoType == CryptoType.ECDSA_TYPE) { - cryptoMaterialConfig.setCaCertPath(certPath + File.separator + "ca.crt"); - cryptoMaterialConfig.setSdkCertPath(certPath + File.separator + "sdk.crt"); - cryptoMaterialConfig.setSdkPrivateKeyPath(certPath + File.separator + "sdk.key"); + cryptoMaterialConfig.setCaCertPath(certPath + "/" + "ca.crt"); + cryptoMaterialConfig.setSdkCertPath(certPath + "/" + "sdk.crt"); + cryptoMaterialConfig.setSdkPrivateKeyPath(certPath + "/" + "sdk.key"); } else if (cryptoType == CryptoType.SM_TYPE) { - cryptoMaterialConfig.setCaCertPath( - certPath + File.separator + File.separator + "sm_ca.crt"); - cryptoMaterialConfig.setSdkCertPath( - certPath + File.separator + File.separator + "sm_sdk.crt"); - cryptoMaterialConfig.setSdkPrivateKeyPath( - certPath + File.separator + File.separator + "sm_sdk.key"); - cryptoMaterialConfig.setEnSdkCertPath( - certPath + File.separator + File.separator + "sm_ensdk.crt"); - cryptoMaterialConfig.setEnSdkPrivateKeyPath( - certPath + File.separator + File.separator + "sm_ensdk.key"); + cryptoMaterialConfig.setCaCertPath(certPath + "/" + "sm_ca.crt"); + cryptoMaterialConfig.setSdkCertPath(certPath + "/" + "sm_sdk.crt"); + cryptoMaterialConfig.setSdkPrivateKeyPath(certPath + "/" + "sm_sdk.key"); + cryptoMaterialConfig.setEnSdkCertPath(certPath + "/" + "sm_ensdk.crt"); + cryptoMaterialConfig.setEnSdkPrivateKeyPath(certPath + "/" + "sm_ensdk.key"); } else { throw new ConfigException( "load CryptoMaterialConfig failed, only support ecdsa and sm now, expected 0 or 1, but provided " diff --git a/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/keypair/CryptoKeyPair.java b/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/keypair/CryptoKeyPair.java index 7e8e689f6..d3645fb34 100644 --- a/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/keypair/CryptoKeyPair.java +++ b/sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/keypair/CryptoKeyPair.java @@ -301,7 +301,7 @@ protected String getKeyStoreFilePath(String address, String postFix) { if (config != null) { keyStoreFileDir = config.getAccountConfig().getKeyStoreDir(); } - keyStoreFileDir = keyStoreFileDir + File.separator + keyStoreSubDir + File.separator; + keyStoreFileDir = keyStoreFileDir + "/" + keyStoreSubDir + "/"; return keyStoreFileDir + address + postFix; } } diff --git a/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/SignatureTest.java b/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/SignatureTest.java index e43eb8430..ce91c571f 100644 --- a/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/SignatureTest.java +++ b/sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/SignatureTest.java @@ -426,9 +426,9 @@ public void testSignAndVerifyWithKeyManager() { public String getKeyStoreFilePath( CryptoSuite cryptoSuite, ConfigOption configOption, String postFix) { return configOption.getAccountConfig().getKeyStoreDir() - + File.separator + + "/" + cryptoSuite.getCryptoKeyPair().getKeyStoreSubDir() - + File.separator + + "/" + cryptoSuite.getCryptoKeyPair().getAddress() + postFix; }