Skip to content

Commit 57daecc

Browse files
authored
modify Files.seperator to / (#413)
1 parent 2bb687f commit 57daecc

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

sdk-core/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
package org.fisco.bcos.sdk.config.model;
1717

18-
import java.io.File;
1918
import java.util.Map;
2019
import org.fisco.bcos.sdk.config.exceptions.ConfigException;
2120
import org.fisco.bcos.sdk.model.CryptoType;
@@ -124,20 +123,15 @@ public CryptoMaterialConfig getDefaultCaCertPath(int cryptoType, String certPath
124123
CryptoMaterialConfig cryptoMaterialConfig = new CryptoMaterialConfig();
125124
cryptoMaterialConfig.setCertPath(certPath);
126125
if (cryptoType == CryptoType.ECDSA_TYPE) {
127-
cryptoMaterialConfig.setCaCertPath(certPath + File.separator + "ca.crt");
128-
cryptoMaterialConfig.setSdkCertPath(certPath + File.separator + "sdk.crt");
129-
cryptoMaterialConfig.setSdkPrivateKeyPath(certPath + File.separator + "sdk.key");
126+
cryptoMaterialConfig.setCaCertPath(certPath + "/" + "ca.crt");
127+
cryptoMaterialConfig.setSdkCertPath(certPath + "/" + "sdk.crt");
128+
cryptoMaterialConfig.setSdkPrivateKeyPath(certPath + "/" + "sdk.key");
130129
} else if (cryptoType == CryptoType.SM_TYPE) {
131-
cryptoMaterialConfig.setCaCertPath(
132-
certPath + File.separator + File.separator + "sm_ca.crt");
133-
cryptoMaterialConfig.setSdkCertPath(
134-
certPath + File.separator + File.separator + "sm_sdk.crt");
135-
cryptoMaterialConfig.setSdkPrivateKeyPath(
136-
certPath + File.separator + File.separator + "sm_sdk.key");
137-
cryptoMaterialConfig.setEnSdkCertPath(
138-
certPath + File.separator + File.separator + "sm_ensdk.crt");
139-
cryptoMaterialConfig.setEnSdkPrivateKeyPath(
140-
certPath + File.separator + File.separator + "sm_ensdk.key");
130+
cryptoMaterialConfig.setCaCertPath(certPath + "/" + "sm_ca.crt");
131+
cryptoMaterialConfig.setSdkCertPath(certPath + "/" + "sm_sdk.crt");
132+
cryptoMaterialConfig.setSdkPrivateKeyPath(certPath + "/" + "sm_sdk.key");
133+
cryptoMaterialConfig.setEnSdkCertPath(certPath + "/" + "sm_ensdk.crt");
134+
cryptoMaterialConfig.setEnSdkPrivateKeyPath(certPath + "/" + "sm_ensdk.key");
141135
} else {
142136
throw new ConfigException(
143137
"load CryptoMaterialConfig failed, only support ecdsa and sm now, expected 0 or 1, but provided "

sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/keypair/CryptoKeyPair.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ protected String getKeyStoreFilePath(String address, String postFix) {
301301
if (config != null) {
302302
keyStoreFileDir = config.getAccountConfig().getKeyStoreDir();
303303
}
304-
keyStoreFileDir = keyStoreFileDir + File.separator + keyStoreSubDir + File.separator;
304+
keyStoreFileDir = keyStoreFileDir + "/" + keyStoreSubDir + "/";
305305
return keyStoreFileDir + address + postFix;
306306
}
307307
}

sdk-crypto/src/test/java/org/fisco/bcos/sdk/crypto/SignatureTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,9 @@ public void testSignAndVerifyWithKeyManager() {
426426
public String getKeyStoreFilePath(
427427
CryptoSuite cryptoSuite, ConfigOption configOption, String postFix) {
428428
return configOption.getAccountConfig().getKeyStoreDir()
429-
+ File.separator
429+
+ "/"
430430
+ cryptoSuite.getCryptoKeyPair().getKeyStoreSubDir()
431-
+ File.separator
431+
+ "/"
432432
+ cryptoSuite.getCryptoKeyPair().getAddress()
433433
+ postFix;
434434
}

0 commit comments

Comments
 (0)