Merge branch 'codezhang-dev' into 'master'

Codezhang dev

See merge request esl_ipdd/ucloud-sdk-java!64

Author: jianhui.zhang

ucloud-sdk-java-usms/src/main/java/cn/ucloud/usms/model/SendUSMSMessageParam.java

@@ -91,7 +91,7 @@ public List<Param> checkPhoneNumbers() throws ValidatorException {
     public List<Param> checkTemplateParams() throws ValidatorException {
         List<Param> params = new ArrayList<>();
         if (templateParams == null || templateParams.isEmpty()) {
-            throw new ValidatorException("templateParams can not be empty");
+            return params;
         }
         int size = templateParams.size();
         String templateParamFormat = "TemplateParams.%d";

ucloud-sdk-java-usms/src/test/java/cn/ucloud/usms/client/SendUSMSMessageTest.java

@@ -30,17 +30,14 @@ public void setUp() throws Exception {
                 new Account(System.getenv("UCloudPrivateKey"),
                         System.getenv("UCloudPublicKey"))));
         List<String> phoneNumbers = new ArrayList<>();
-        phoneNumbers.add("1895509xxxx");
-        //phoneNumbers.add("1851612xxxx");
-        String templateId = "UTA190604D47Fxx";
-        String sig = System.getenv("USMSSIG");
-
+        phoneNumbers.add(System.getenv("USMSPhone"));
+        String templateId = System.getenv("USMSTemplateId");
         param = new SendUSMSMessageParam(phoneNumbers, templateId);
-        //param.setSigContent(sig);
-        param.setProjectId("org-o1ftjk");
-        List<String> templateParams = new ArrayList<>();
-        templateParams.add("param test");
-        param.setTemplateParams(templateParams);
+        param.setSigContent(System.getenv("USMSSigId"));
+        param.setProjectId(System.getenv("ProjectId"));
+//      List<String> templateParams = new ArrayList<>();
+//      templateParams.add("param test");
+//      param.setTemplateParams(templateParams);
     }