Merge branch 'master' of YangSen-qn:qiniu/java-sdk

Author: yangsen

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 7.10.4 (2022-05-27)
+* 添加查询单个短信模板接口
+
 ## 7.10.3 (2022-05-19)
 * 支持非 UTF-8 环境变量
 * QVS修复中文前缀列举问题 

src/main/java/com/qiniu/common/Constants.java

@@ -9,7 +9,7 @@ public final class Constants {
     /**
      * 版本号
      */
-    public static final String VERSION = "7.10.3";
+    public static final String VERSION = "7.10.4";
     /**
      * 块大小，不能改变
      */

src/main/java/com/qiniu/sms/SmsManager.java

@@ -215,6 +215,27 @@ public TemplateInfo describeTemplateItems(String auditStatus, int page, int page
         return templateInfo;
     }
 
+    /**
+     * 查询单个模板信息
+     *
+     * @param templateId  模板ID
+     */
+    public Response describeTemplate(String templateId) throws QiniuException {
+        String requestUrl = String.format("%s/v1/template/%s", configuration.smsHost(), templateId);
+        return get(requestUrl);
+    }
+
+    /**
+     * 查询单个模板信息
+     *
+     * @param templateId  模板ID
+     */
+    public TemplateInfo.Item describeTemplateItem(String templateId) throws QiniuException {
+        Response resp = describeTemplate(templateId);
+        TemplateInfo.Item item = Json.decode(resp.bodyString(), TemplateInfo.Item.class);
+        return item;
+    }
+
     /**
      * 创建模板
      *

src/main/java/com/qiniu/storage/ApiUploadV2CompleteUpload.java

@@ -7,7 +7,6 @@
 import com.qiniu.util.Json;
 import com.qiniu.util.StringUtils;
 
-import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/qiniu/storage/FixBlockUploader.java

@@ -11,7 +11,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
-import java.nio.charset.Charset;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;

src/main/java/com/qiniu/storage/persistent/FileRecorder.java

@@ -1,6 +1,5 @@
 package com.qiniu.storage.persistent;
 
-import com.qiniu.common.Constants;
 import com.qiniu.storage.Recorder;
 import com.qiniu.util.StringUtils;
 

src/main/java/com/qiniu/util/Auth.java

@@ -10,7 +10,6 @@
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 import java.net.URI;
-import java.nio.charset.Charset;
 import java.security.GeneralSecurityException;
 import java.security.SecureRandom;
 import java.text.DateFormat;

src/main/java/com/qiniu/util/StringUtils.java

@@ -2,7 +2,6 @@
 
 import com.qiniu.common.Constants;
 
-import java.nio.charset.Charset;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Collection;

src/test/java/test/com/qiniu/sms/SmsTest.java

@@ -187,6 +187,29 @@ public void testDescribeTemplateItems() {
         }
     }
 
+    @Test
+    @Tag("IntegrationTest")
+    public void testDescribeSingleTemplate() {
+        try {
+            Response response = smsManager.describeTemplate("templateId");
+            assertNotNull(response);
+        } catch (QiniuException e) {
+            assertTrue(ResCode.find(e.code(), ResCode.getPossibleResCode(401)));
+        }
+    }
+
+    @Test
+    @Tag("IntegrationTest")
+    public void testDescribeSingleTemplateItem() {
+        try {
+            TemplateInfo.Item item = smsManager.describeTemplateItem("templateId");
+            assertNotNull(item);
+        } catch (QiniuException e) {
+            assertTrue(ResCode.find(e.code(), ResCode.getPossibleResCode(401)));
+        }
+    }
+
+
     @Test
     @Tag("IntegrationTest")
     public void testCreateTemplate() {