diff --git a/dist/hap-sign-tool.jar b/dist/hap-sign-tool.jar
index 3edaa44b21a994604582ee35ffcc8e40416fa3c3..42d752fdcf1cba34a88c98bf72b7725e851cbb39 100644
Binary files a/dist/hap-sign-tool.jar and b/dist/hap-sign-tool.jar differ
diff --git a/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntoolcmd/CmdUtil.java b/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntoolcmd/CmdUtil.java
index b3c7aeffce8212246929470cef49bc6ab7fbcace..a6ba13c0c18ff3d2d1006717594c638b6b695e51 100644
--- a/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntoolcmd/CmdUtil.java
+++ b/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntoolcmd/CmdUtil.java
@@ -23,7 +23,6 @@ import com.ohos.hapsigntool.utils.ValidateUtils;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import java.util.Optional;
 import java.util.regex.Pattern;
 
 /**
diff --git a/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntoolcmd/ParamsTrustlist.java b/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntoolcmd/ParamsTrustlist.java
index e1bbf407b1cbab99fa63e06839c6e11fba670bce..cbc81f1b89295fee21bfc4ffcf74b4cfa7d4f498 100644
--- a/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntoolcmd/ParamsTrustlist.java
+++ b/hapsigntool/hap_sign_tool/src/main/java/com/ohos/hapsigntoolcmd/ParamsTrustlist.java
@@ -38,10 +38,12 @@ public final class ParamsTrustlist {
      * Define generic string
      */
     public static final String OPTIONS = " [options]:";
+
     /**
      * Define commond list
      */
     private static final List<String> COMMONDS = new ArrayList<String>();
+
     /**
      * Define trust map
      */
@@ -85,10 +87,7 @@ public final class ParamsTrustlist {
                 if (COMMONDS.contains(param)) {
                     cmdStandBy = param;
                 } else {
-                    boolean success = putTrustMap(cmdStandBy, param);
-                    if (!success && cmdStandBy != null) {
-                        cmdStandBy = null;
-                    }
+                    putTrustMap(cmdStandBy, param);
                 }
             }
         } catch (IOException ioe) {
@@ -102,18 +101,15 @@ public final class ParamsTrustlist {
      *
      * @param cmdStandBy command as key
      * @param param commond as value
-     * @return boolean
      */
-    private static boolean putTrustMap(String cmdStandBy, String param) {
-        if (cmdStandBy != null && param.startsWith("-")) {
+    private static void putTrustMap(String cmdStandBy, String param) {
+        if (param.startsWith("-")) {
             String subParam = param.substring(0, param.indexOf(":")).trim();
             List<String> trustLists = Optional.ofNullable(
                     trustMap.get(cmdStandBy)).orElse(new ArrayList<>());
             trustLists.add(subParam);
             trustMap.put(cmdStandBy, trustLists);
-            return true;
         }
-        return false;
     }
 
     /**
@@ -125,8 +121,7 @@ public final class ParamsTrustlist {
     public static List<String> getTrustList(String commond) {
         generateTrustlist();
         String keyParam = commond + OPTIONS;
-        List<String> list = Optional.ofNullable(trustMap.get(keyParam)).orElse(new ArrayList<>());
-        return  list;
+        return Optional.ofNullable(trustMap.get(keyParam)).orElse(new ArrayList<>());
     }
 
 }
diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/error/ERROR.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/error/ERROR.java
index 2d7fe1b9617a47353c682ca1844d8cac363f8012..286031eef28f9834822ad4c033407b001f43f3fd 100644
--- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/error/ERROR.java
+++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/error/ERROR.java
@@ -62,33 +62,34 @@ public enum ERROR {
      */
     COMMAND_PARAM_ERROR(110),
     /**
-     *Enum constant OPERATOR_CREATION_ERROR.
+     * Enum constant OPERATOR_CREATION_ERROR.
      */
     OPERATOR_CREATION_ERROR(111),
     /**
-     *Enum constant PARAM_NOT_EXIST_ERROR.
+     * Enum constant PARAM_NOT_EXIST_ERROR.
      */
     PARAM_NOT_EXIST_ERROR(113),
     /**
-     *Enum constant KEYSTORE_OPERATION_ERROR.
+     * Enum constant KEYSTORE_OPERATION_ERROR.
      */
     KEYSTORE_OPERATION_ERROR(114),
     /**
-     *Enum constant CERTIFICATE_ERROR.
+     * Enum constant CERTIFICATE_ERROR.
      */
     CERTIFICATE_ERROR(115),
     /**
-     *Enum constant KEY_ERROR.
+     * Enum constant KEY_ERROR.
      */
     KEY_ERROR(116),
     /**
-     *Enum constant IO_CERT_ERROR.
+     * Enum constant IO_CERT_ERROR.
      */
     IO_CERT_ERROR(117),
     /**
-     *Enum constant IO_CSR_ERROR.
+     * Enum constant IO_CSR_ERROR.
      */
     IO_CSR_ERROR(118);
+
     /**
      * Field errorCode.
      */
diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/provider/RemoteSignProvider.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/provider/RemoteSignProvider.java
index ef7cd7ff6db93d750e88f9be0553e9475946d4ee..2c046bf833c0de2d8ef3a35e7d84d395f697735f 100644
--- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/provider/RemoteSignProvider.java
+++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/hap/provider/RemoteSignProvider.java
@@ -23,6 +23,8 @@ import java.security.cert.X509Certificate;
 
 /**
  * Remote Sign Provider
+ *
+ * @since 2021/12/22
  */
 public class RemoteSignProvider extends SignProvider {
     @Override
diff --git a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/CertUtils.java b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/CertUtils.java
index 58533882e05a37380caa9ac9b8479510bbc8c5b1..35f5b0beb8116c760ec64239dece0916e7178ff7 100644
--- a/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/CertUtils.java
+++ b/hapsigntool/hap_sign_tool_lib/src/main/java/com/ohos/hapsigntool/utils/CertUtils.java
@@ -23,22 +23,15 @@ import org.apache.logging.log4j.Logger;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x509.KeyPurposeId;
 import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemWriter;
 
 import javax.security.auth.x500.X500Principal;
 import java.io.ByteArrayInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
-import java.security.cert.CRLException;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
-import java.security.cert.X509CRL;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.Collections;