diff --git a/README.md b/README.md
index 62e54fc6..4b03cc54 100755
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 ## ucloud-sdk-java
 ucloud开发者工具套件（SDK）。<br/>
+<i>jyf-custom分支，基于ucloud主分支的0.8.3.0-release版本进行的二次开发。</i><br/>
+<b style="font-color: #FFF">不排除重构可能</b><br/>
 面向UCloud的多个产品服务，目前包括：
 - uhost
 - udisk
diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java
new file mode 100644
index 00000000..2837ea5e
--- /dev/null
+++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/client/UnetClients.java
@@ -0,0 +1,38 @@
+package cn.ucloud.unet.client;
+
+import cn.ucloud.common.pojo.Account;
+import cn.ucloud.unet.pojo.UnetConfig;
+
+/**
+ * UnetClient的工厂类
+ * @author jucyfer
+ */
+public abstract class UnetClients {
+    /**
+     * 根据公私钥创建默认实现
+     * @param privateKey 私钥
+     * @param publicKey 公钥
+     * @return {@link cn.ucloud.unet.client.UnetClient}实例
+     */
+    public static UnetClient getDefaultInstance(String privateKey,String publicKey){
+        return new DefaultUnetClient(new UnetConfig(new Account(privateKey,publicKey)));
+    }
+
+    /**
+     * 根据指定Account创建默认实现
+     * @param account {@link cn.ucloud.common.pojo.Account}对象
+     * @return {@link cn.ucloud.unet.client.UnetClient}实例
+     */
+    public static UnetClient getDefaultInstance(Account account){
+        return new DefaultUnetClient(new UnetConfig(account));
+    }
+
+    /**
+     * 根据指定UnetConfig创建默认实现
+     * @param unetConfig {@link cn.ucloud.unet.pojo.UnetConfig}对象
+     * @return {@link cn.ucloud.unet.client.UnetClient}实例
+     */
+    public static UnetClient getDefaultInstance(UnetConfig unetConfig){
+        return new DefaultUnetClient(unetConfig);
+    }
+}
diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java
index a050f39c..fb5ce6b0 100755
--- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java
+++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/CreateFirewallParam.java
@@ -10,11 +10,12 @@
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @description: 创建防火墙  参数类
- * @author: joshua
- * @E-mail: joshua.yin@ucloud.cn
+ * @author: joshua jucyfer
+ * @E-mail: joshua.yin@ucloud.cn 502223422@qq.com
  * @date: 2018/9/27 11:31
  */
 public class CreateFirewallParam extends BaseRequestParam {
@@ -68,6 +69,9 @@ public List<Param> checkFirewallRule() throws ValidatorException {
                 if (StringUtils.isBlank(rule.getProtocol())) {
                     throw new ValidatorException(String.format(exceptionFormat, i, "protocol can not be empty"));
                 }
+                if (rule.getPort() == null || !rule.getPort().matches("^$|^[1-9][0-9]*$|^[1-9][0-9]*-[1-9][0-9]*$")) {
+                    throw new ValidatorException(String.format(exceptionFormat, i, "illegal port"));
+                }
                 if (StringUtils.isBlank(rule.getIp())) {
                     throw new ValidatorException(String.format(exceptionFormat, i, "ip can not be empty"));
                 }
@@ -93,6 +97,25 @@ public CreateFirewallParam(String region,
         this.name = name;
     }
 
+    public CreateFirewallParam(String region, DescribeFirewallResult.FirewallData firewallData) {
+        super("CreateFirewall");
+        this.region = region;
+        this.rule = this.rule = firewallData
+                .getRule()
+                .parallelStream()
+                .map(rule ->
+                        new Rule(
+                                rule.getProtocolType(),
+                                rule.getDstPort(),
+                                rule.getSrcIP(),
+                                rule.getRuleAction(),
+                                rule.getPiority(),
+                                rule.getRemark()
+                        )
+                )
+                .collect(Collectors.toList());
+    }
+
     public String getRegion() {
         return region;
     }
@@ -133,12 +156,17 @@ public void setRule(List<Rule> rule) {
         this.rule = rule;
     }
 
+    public void addRule(Rule rule) {
+        this.rule.add(rule);
+    }
+
+    public void addRule(String protocol, String port, String ip, String action, String priority, String remark) {
+        this.rule.add(new Rule(protocol, port, ip, action, priority, remark));
+    }
 
     public static class Rule {
         @SuppressWarnings("squid:S1170")
-        private final String ruleFormatWithPort = "%s|%d|%s|%s|%s";
-        @SuppressWarnings("squid:S1170")
-        private final String ruleFormatWithoutPort = "%s||%s|%s|%s";
+        private final String ruleFormatWithPort = "%s|%s|%s|%s|%s";
         @SuppressWarnings("squid:S1700")
         private String rule;
 
@@ -150,7 +178,7 @@ public static class Rule {
         /**
          * 端口号
          */
-        private Integer port;
+        private String port;
 
         /**
          * IP
@@ -167,8 +195,13 @@ public static class Rule {
          */
         private String priority;
 
+        /**
+         * 用户备注
+         */
+        private String remark;
+
         public Rule(String protocol,
-                    Integer port,
+                    String port,
                     String ip,
                     String acceptOrNot,
                     String priority) {
@@ -177,14 +210,25 @@ public Rule(String protocol,
             this.ip = ip;
             this.acceptOrNot = acceptOrNot;
             this.priority = priority;
+            this.remark = "";
+        }
+
+        public Rule(String protocol,
+                    String port,
+                    String ip,
+                    String acceptOrNot,
+                    String priority,
+                    String remark) {
+            this.protocol = protocol;
+            this.port = port;
+            this.ip = ip;
+            this.acceptOrNot = acceptOrNot;
+            this.priority = priority;
+            this.remark = remark;
         }
 
         public String getRule() {
-            if (port == null){
-                rule = String.format(ruleFormatWithoutPort, protocol, ip, acceptOrNot, priority);
-            }else {
-                rule = String.format(ruleFormatWithPort, protocol, port, ip, acceptOrNot, priority);
-            }
+            rule = String.format(ruleFormatWithPort, protocol, port, ip, acceptOrNot, priority, remark);
             return rule;
         }
 
@@ -196,11 +240,11 @@ public void setProtocol(String protocol) {
             this.protocol = protocol;
         }
 
-        public Integer getPort() {
+        public String getPort() {
             return port;
         }
 
-        public void setPort(Integer port) {
+        public void setPort(String port) {
             this.port = port;
         }
 
@@ -228,5 +272,12 @@ public void setPriority(String priority) {
             this.priority = priority;
         }
 
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
     }
 }
diff --git a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java
index a58c46cf..ad40509f 100755
--- a/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java
+++ b/ucloud-sdk-java-unet/src/main/java/cn/ucloud/unet/model/UpdateFirewallParam.java
@@ -10,11 +10,12 @@
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @description: 更新防火墙
- * @author: joshua
- * @E-mail: joshua.yin@ucloud.cn
+ * @author: joshua jucyfer
+ * @E-mail: joshua.yin@ucloud.cn 502223422@qq.com
  * @date: 2018/9/27 15:43
  */
 public class UpdateFirewallParam extends BaseRequestParam {
@@ -54,8 +55,8 @@ public List<Param> checkFirewallRule() throws ValidatorException {
                 if (StringUtils.isBlank(rule.getProtocol())) {
                     throw new ValidatorException(String.format(exceptionFormat, i, "protocol can not be empty"));
                 }
-                if (rule.getPort() == null || rule.getPort() <= 0) {
-                    throw new ValidatorException(String.format(exceptionFormat, i, "port can not be null or value <= 0"));
+                if (rule.getPort() == null || !rule.getPort().matches("^$|^[1-9][0-9]*$|^[1-9][0-9]*-[1-9][0-9]*$")) {
+                    throw new ValidatorException(String.format(exceptionFormat, i, "illegal port"));
                 }
                 if (StringUtils.isBlank(rule.getIp())) {
                     throw new ValidatorException(String.format(exceptionFormat, i, "ip can not be empty"));
@@ -81,6 +82,26 @@ public UpdateFirewallParam(@NotEmpty(message = "region can not be empty") String
         this.rule = rule;
     }
 
+    public UpdateFirewallParam(String region, DescribeFirewallResult.FirewallData firewallData) {
+        super("UpdateFirewall");
+        this.region = region;
+        this.fwId = firewallData.getFwId();
+        this.rule = firewallData
+                .getRule()
+                .parallelStream()
+                .map(rule ->
+                        new Rule(
+                                rule.getProtocolType(),
+                                rule.getDstPort(),
+                                rule.getSrcIP(),
+                                rule.getRuleAction(),
+                                rule.getPiority(),
+                                rule.getRemark()
+                        )
+                )
+                .collect(Collectors.toList());
+    }
+
     public String getRegion() {
         return region;
     }
@@ -105,9 +126,17 @@ public void setRule(List<Rule> rule) {
         this.rule = rule;
     }
 
+    public void addRule(Rule rule){
+        this.rule.add(rule);
+    }
+
+    public void addRule(String protocol,String port,String ip,String action,String priority,String remark){
+        this.rule.add(new Rule(protocol,port,ip,action,priority,remark));
+    }
+
     public static class Rule {
         @SuppressWarnings("squid:S1170")
-        private final String ruleFormat = "%s|%d|%s|%s|%s";
+        private final String ruleFormat = "%s|%s|%s|%s|%s|%s";
         @SuppressWarnings("squid:S1700")
         private String rule;
 
@@ -121,7 +150,7 @@ public static class Rule {
          * 端口号
          */
         @NotNull(message = "port can not be null")
-        private Integer port;
+        private String port;
 
         /**
          * IP
@@ -141,8 +170,13 @@ public static class Rule {
         @NotEmpty(message = "priority can not be empty")
         private String priority;
 
+        /**
+         * 备注：用户自定义备注
+         */
+        private String remark;
+
         public Rule(@NotEmpty(message = "protocol can not be empty") String protocol,
-                    @NotNull(message = "port can not be null") Integer port,
+                    @NotNull(message = "port can not be null") String port,
                     @NotEmpty(message = "ip can not be empty") String ip,
                     @NotEmpty(message = "acceptOrNot can not be empty") String acceptOrNot,
                     @NotEmpty(message = "priority can not be empty") String priority) {
@@ -151,12 +185,27 @@ public Rule(@NotEmpty(message = "protocol can not be empty") String protocol,
             this.ip = ip;
             this.acceptOrNot = acceptOrNot;
             this.priority = priority;
+            this.remark = "";
+        }
+
+        public Rule(@NotEmpty(message = "protocol can not be empty") String protocol,
+                    @NotNull(message = "port can not be null") String port,
+                    @NotEmpty(message = "ip can not be empty") String ip,
+                    @NotEmpty(message = "acceptOrNot can not be empty") String acceptOrNot,
+                    @NotEmpty(message = "priority can not be empty") String priority,
+                    String remark) {
+            this.protocol = protocol;
+            this.port = port;
+            this.ip = ip;
+            this.acceptOrNot = acceptOrNot;
+            this.priority = priority;
+            this.remark = remark == null ? "" : remark;
         }
 
         @NotEmpty(message = "rule can not be empty")
         @UcloudParam("Rule")
         public String getRule() {
-            rule = String.format(ruleFormat, protocol, port, ip, acceptOrNot, priority);
+            rule = String.format(ruleFormat, protocol, port, ip, acceptOrNot, priority, remark);
             return rule;
         }
 
@@ -168,14 +217,18 @@ public void setProtocol(String protocol) {
             this.protocol = protocol;
         }
 
-        public Integer getPort() {
+        public String getPort() {
             return port;
         }
 
-        public void setPort(Integer port) {
+        public void setPort(String port) {
             this.port = port;
         }
 
+        public void setPort(int port) {
+            this.port = Integer.toString(port);
+        }
+
         public String getIp() {
             return ip;
         }
@@ -199,5 +252,13 @@ public String getPriority() {
         public void setPriority(String priority) {
             this.priority = priority;
         }
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
     }
 }
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateEIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateEIPTest.java
index 9fd662b2..eeaf9aef 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateEIPTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateEIPTest.java
@@ -20,7 +20,7 @@ public class AllocateEIPTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new AllocateEIPParam("cn-sh2", "Bgp", 2);
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateShareBandwidthTest.java
index 3fa72544..9ef3244f 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateShareBandwidthTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateShareBandwidthTest.java
@@ -20,7 +20,7 @@ public class AllocateShareBandwidthTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new AllocateShareBandwidthParam("cn-sh2", "ucloud-sdk-java-shareBandwidth", "Dynamic", 24);
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateVIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateVIPTest.java
index 6813be11..a59d7b3d 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateVIPTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AllocateVIPTest.java
@@ -20,7 +20,7 @@ public class AllocateVIPTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new AllocateVIPParam("cn-sh2", "uvnet-3fy3r4", "subnet-orq0th");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AssociateEIPWithShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AssociateEIPWithShareBandwidthTest.java
index 6c86bfb8..0373f009 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AssociateEIPWithShareBandwidthTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/AssociateEIPWithShareBandwidthTest.java
@@ -23,7 +23,7 @@ public class AssociateEIPWithShareBandwidthTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/BindEIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/BindEIPTest.java
index e7d9e985..5313823b 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/BindEIPTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/BindEIPTest.java
@@ -20,7 +20,7 @@ public class BindEIPTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new BindEIPParam("cn-sh2", "eip-vcsnbgi4", "uhost", "uhost-dwomflqt");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateBandwidthPackageTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateBandwidthPackageTest.java
index f4c6c4f1..bb6509c8 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateBandwidthPackageTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateBandwidthPackageTest.java
@@ -20,7 +20,7 @@ public class CreateBandwidthPackageTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new CreateBandwidthPackageParam("cn-sh2", "eip-vcsnbgi4", 6, 1);
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateFirewallTest.java
index 72cd9be2..66fd7eaf 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateFirewallTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/CreateFirewallTest.java
@@ -23,12 +23,12 @@ public class CreateFirewallTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
         List<CreateFirewallParam.Rule> rules = new ArrayList<>();
-        rules.add(new CreateFirewallParam.Rule("TCP", 22, "120.132.8.183", "ACCEPT", "LOW"));
+        rules.add(new CreateFirewallParam.Rule("TCP", "22", "120.132.8.183", "ACCEPT", "LOW","TEST_REMARK"));
         param = new CreateFirewallParam("cn-sh2", rules, "Firewall-test");
     }
 
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteBandwidthPackageTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteBandwidthPackageTest.java
index c75f5490..805c31f6 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteBandwidthPackageTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteBandwidthPackageTest.java
@@ -21,7 +21,7 @@ public class DeleteBandwidthPackageTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new DeleteBandwidthPackageParam("cn-sh2", "bwpack-z13014dl");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteFirewallTest.java
index c7f59949..01abc7ba 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteFirewallTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DeleteFirewallTest.java
@@ -20,7 +20,7 @@ public class DeleteFirewallTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthPackageTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthPackageTest.java
index 146e594f..f04943da 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthPackageTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthPackageTest.java
@@ -20,7 +20,7 @@ public class DescribeBandwidthPackageTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new DescribeBandwidthPackageParam("cn-sh2");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthUsageTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthUsageTest.java
index 081579a5..6de663a8 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthUsageTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeBandwidthUsageTest.java
@@ -23,7 +23,7 @@ public class DescribeBandwidthUsageTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeEIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeEIPTest.java
index 684d364f..723330a4 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeEIPTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeEIPTest.java
@@ -20,7 +20,7 @@ public class DescribeEIPTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new DescribeEIPParam("cn-sh2");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallResourceTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallResourceTest.java
index a3e1e384..376e7a3b 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallResourceTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallResourceTest.java
@@ -20,7 +20,7 @@ public class DescribeFirewallResourceTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallTest.java
index 22613799..f7c6bd43 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeFirewallTest.java
@@ -20,7 +20,7 @@ public class DescribeFirewallTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeShareBandwidthTest.java
index 3bf0666f..b773acd6 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeShareBandwidthTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeShareBandwidthTest.java
@@ -20,7 +20,7 @@ public class DescribeShareBandwidthTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new DescribeShareBandwidthParam("cn-sh2");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeVIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeVIPTest.java
index f742f8dd..78ff3cc9 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeVIPTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DescribeVIPTest.java
@@ -20,7 +20,7 @@ public class DescribeVIPTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new DescribeVIPParam("cn-sh2");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DisassociateEIPWithShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DisassociateEIPWithShareBandwidthTest.java
index 92061b3d..80e2dacd 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DisassociateEIPWithShareBandwidthTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/DisassociateEIPWithShareBandwidthTest.java
@@ -23,7 +23,7 @@ public class DisassociateEIPWithShareBandwidthTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPayModeTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPayModeTest.java
index 63eca439..6f297b83 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPayModeTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPayModeTest.java
@@ -23,7 +23,7 @@ public class GetEIPPayModeTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new GetEIPPayModeParam("cn-sh2");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPriceTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPriceTest.java
index 1c76ec02..8c4c683a 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPriceTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPPriceTest.java
@@ -20,7 +20,7 @@ public class GetEIPPriceTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new GetEIPPriceParam("cn-sh2", "Bgp", 2);
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPUpgradePriceTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPUpgradePriceTest.java
index 370464ca..55d58c33 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPUpgradePriceTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GetEIPUpgradePriceTest.java
@@ -20,7 +20,7 @@ public class GetEIPUpgradePriceTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new GetEIPUpgradePriceParam("cn-sh2", "eip-vcsnbgi4", 10);
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GrantFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GrantFirewallTest.java
index 8e1e9f0d..8aacc82b 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GrantFirewallTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/GrantFirewallTest.java
@@ -20,7 +20,7 @@ public class GrantFirewallTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPBandwidthTest.java
index 5bc6ceca..9dc9a438 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPBandwidthTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPBandwidthTest.java
@@ -20,7 +20,7 @@ public class ModifyEIPBandwidthTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new ModifyEIPBandwidthParam("cn-sh2", "eip-vcsnbgi4", 4);
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPWeightTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPWeightTest.java
index 92dff30a..835b74a3 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPWeightTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ModifyEIPWeightTest.java
@@ -20,7 +20,7 @@ public class ModifyEIPWeightTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new ModifyEIPWeightParam("cn-bj2", "eip-vcsnbgi4", 100);
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseEIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseEIPTest.java
index 19e94c21..7e14897c 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseEIPTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseEIPTest.java
@@ -21,7 +21,7 @@ public class ReleaseEIPTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new ReleaseEIPParam("cn-sh2", "eip-243oe1tx");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseShareBandwidthTest.java
index 01d18c51..90e11dfb 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseShareBandwidthTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseShareBandwidthTest.java
@@ -20,7 +20,7 @@ public class ReleaseShareBandwidthTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseVIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseVIPTest.java
index 2d74fea0..516c4caf 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseVIPTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ReleaseVIPTest.java
@@ -20,7 +20,7 @@ public class ReleaseVIPTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new ReleaseVIPParam("cn-sh2", "vip-utxslh2t");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ResizeShareBandwidthTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ResizeShareBandwidthTest.java
index ad17955f..edbaafbe 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ResizeShareBandwidthTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/ResizeShareBandwidthTest.java
@@ -21,7 +21,7 @@ public class ResizeShareBandwidthTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new ResizeShareBandwidthParam("cn-sh2", 20, "bwshare-cybkx5q2");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/SetEIPPayModeTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/SetEIPPayModeTest.java
index 3e67a87e..1a673503 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/SetEIPPayModeTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/SetEIPPayModeTest.java
@@ -20,7 +20,7 @@ public class SetEIPPayModeTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new SetEIPPayModeParam("cn-sh2", "eip-vcsnbgi4", "Traffic", 4);
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UnBindEIPTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UnBindEIPTest.java
index 9b5e9a42..af56a681 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UnBindEIPTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UnBindEIPTest.java
@@ -20,7 +20,7 @@ public class UnBindEIPTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new UnBindEIPParam("cn-sh2", "eip-vcsnbgi4", "uhost", "uhost-dwomflqt");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateEIPAttributeTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateEIPAttributeTest.java
index c772d24b..f0a7b58c 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateEIPAttributeTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateEIPAttributeTest.java
@@ -20,7 +20,7 @@ public class UpdateEIPAttributeTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         param = new UpdateEIPAttributeParam("cn-sh2", "eip-vcsnbgi4");
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallAttributeTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallAttributeTest.java
index 624bb16d..504af490 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallAttributeTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallAttributeTest.java
@@ -20,7 +20,7 @@ public class UpdateFirewallAttributeTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
diff --git a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java
index 319f0b1d..5a4108ec 100755
--- a/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java
+++ b/ucloud-sdk-java-unet/src/test/java/cn/ucloud/unet/client/UpdateFirewallTest.java
@@ -23,12 +23,12 @@ public class UpdateFirewallTest {
 
     @Before
     public void initData() {
-        client = new DefaultUnetClient(new UnetConfig(
+        client = UnetClients.getDefaultInstance(new UnetConfig(
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
 
         List<UpdateFirewallParam.Rule> rules = new ArrayList<>();
-        rules.add(new UpdateFirewallParam.Rule("TCP", 24, "0.0.0.0/0", "ACCEPT", "MEDIUM"));
+        rules.add(new UpdateFirewallParam.Rule("TCP", "24-25", "0.0.0.0/0", "ACCEPT", "MEDIUM","TestRemark"));
         param = new UpdateFirewallParam("cn-sh2", "firewall-yzb2r03v", rules);
     }