From 2b102fe315ace60746ea7e90da6d52f6335ef0dd Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Mon, 20 Jun 2022 09:50:02 +0800
Subject: [PATCH] fixed
 https://github.com/jetlinks/jetlinks-community/issues/173

---
 .../network/manager/enums/CertificateType.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/enums/CertificateType.java b/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/enums/CertificateType.java
index 5cc17d0f..301983ff 100644
--- a/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/enums/CertificateType.java
+++ b/jetlinks-manager/network-manager/src/main/java/org/jetlinks/community/network/manager/enums/CertificateType.java
@@ -4,13 +4,13 @@ import lombok.Getter;
 import org.jetlinks.community.network.manager.entity.CertificateEntity;
 import org.jetlinks.community.network.security.DefaultCertificate;
 
-import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
 
+import static org.apache.commons.codec.binary.Base64.decodeBase64;
+
 /**
  * @author wangzheng
- * @see
  * @since 1.0
  */
 @Getter
@@ -19,26 +19,26 @@ public enum CertificateType {
         @Override
         public DefaultCertificate init(DefaultCertificate certificate, CertificateEntity.CertificateConfig config) {
             return certificate
-                .initPfxKey(Base64.getDecoder().decode(config.getKeystoreBase64()), config.getKeystorePwd())
-                .initPfxTrust(Base64.getDecoder().decode(config.getTrustKeyStoreBase64()), config.getTrustKeyStorePwd());
+                .initPfxKey(decodeBase64(config.getKeystoreBase64()), config.getKeystorePwd())
+                .initPfxTrust(decodeBase64(config.getTrustKeyStoreBase64()), config.getTrustKeyStorePwd());
         }
     },
     JKS {
         @Override
         public DefaultCertificate init(DefaultCertificate certificate, CertificateEntity.CertificateConfig config) {
             return certificate
-                .initJksKey(Base64.getDecoder().decode(config.getKeystoreBase64()), config.getKeystorePwd())
-                .initJksTrust(Base64.getDecoder().decode(config.getTrustKeyStoreBase64()), config.getTrustKeyStorePwd());
+                .initJksKey(decodeBase64(config.getKeystoreBase64()), config.getKeystorePwd())
+                .initJksTrust(decodeBase64(config.getTrustKeyStoreBase64()), config.getTrustKeyStorePwd());
         }
     },
     PEM {
         @Override
         public DefaultCertificate init(DefaultCertificate certificate, CertificateEntity.CertificateConfig config) {
-            List<byte[]> keyCert = Collections.singletonList(Base64.getDecoder().decode(config.getKeystoreBase64()));
+            List<byte[]> keyCert = Collections.singletonList(decodeBase64(config.getKeystoreBase64()));
 
             return certificate
                 .initPemKey(keyCert, keyCert)
-                .initPemTrust(Collections.singletonList(Base64.getDecoder().decode(config.getTrustKeyStoreBase64())));
+                .initPemTrust(Collections.singletonList(decodeBase64(config.getTrustKeyStoreBase64())));
 
         }
     };