Merge pull request #42 from xelloss00x/main

[feature] 1.支持别名类型;2.增加鸿蒙平台厂商参数

Author: jianbin2001

CHANGES.md

@@ -1,5 +1,12 @@
 # Release Notes
 
+## 1.0.0.16
+
+### update
+
+* 支持别名类型
+* 增加鸿蒙平台厂商参数
+
 ## 1.0.0.15
 
 ### update

README.md

@@ -22,7 +22,7 @@
     <dependency>
         <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
-    <version>1.0.0.15</version>
+    <version>1.0.0.16</version>
 </dependency>
 ```
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.getui.push</groupId>
     <artifactId>restful-sdk</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0.15</version>
+    <version>1.0.0.16</version>
     <url>https://github.com/GetuiLaboratory/getui-pushapi-java-client-v2</url>
     <name>Getui Push API Java Client</name>
     <description>Getui's officially supported Java client library for accessing Getui APIs.</description>

src/main/java/com/getui/push/v2/sdk/api/UserApi.java

@@ -6,6 +6,7 @@
 import com.getui.push.v2.sdk.anno.method.GtPut;
 import com.getui.push.v2.sdk.anno.param.GtBodyParam;
 import com.getui.push.v2.sdk.anno.param.GtPathParam;
+import com.getui.push.v2.sdk.anno.param.GtQueryParam;
 import com.getui.push.v2.sdk.common.ApiResult;
 import com.getui.push.v2.sdk.dto.req.*;
 import com.getui.push.v2.sdk.dto.res.AliasResDTO;
@@ -41,6 +42,16 @@ public interface UserApi {
     @GtGet(uri = "/user/alias/cid/")
     ApiResult<AliasResDTO> queryAliasByCid(@GtPathParam String cid);
 
+    /**
+     * 根据cid查询指定别名类型下的别名
+     *
+     * @param cid
+     * @param aliasType 别名类型
+     * @return
+     */
+    @GtGet(uri = "/user/alias/cid/")
+    ApiResult<AliasResDTO> queryAliasByCid(@GtPathParam String cid, @GtQueryParam(name = "alias_type") String aliasType);
+
     /**
      * 根据别名查询cid
      *
@@ -50,6 +61,16 @@ public interface UserApi {
     @GtGet(uri = "/user/cid/alias/")
     ApiResult<QueryCidResDTO> queryCidByAlias(@GtPathParam String alias);
 
+    /**
+     * 根据别名类型与别名查询cid
+     *
+     * @param alias
+     * @param aliasType
+     * @return
+     */
+    @GtGet(uri = "/user/cid/alias/")
+    ApiResult<QueryCidResDTO> queryCidByAlias(@GtPathParam String alias, @GtQueryParam(name = "alias_type") String aliasType);
+
     /**
      * 批量解绑别名
      *
@@ -78,6 +99,16 @@ public interface UserApi {
     @GtPost(uri = "/user/custom_tag/cid/")
     ApiResult<Void> userBindTags(@GtPathParam String cid, @GtBodyParam TagDTO tagDTO);
 
+    /**
+     * 解绑指定别名类型下的别名
+     *
+     * @param alias
+     * @param aliasType
+     * @return
+     */
+    @GtDelete(uri = "/user/alias")
+    ApiResult<Void> unbindAllAlias(@GtPathParam String alias, @GtQueryParam(name = "alias_type") String aliasType);
+
     /**
      * 一批用户绑定一个标签
      *

src/main/java/com/getui/push/v2/sdk/core/Configs.java

@@ -13,7 +13,7 @@ public interface Configs {
 
     String HEADER_DOMAIN_HASH_KEY = "domainHash";
     String HEADER_OPEN_STABLE_DOMAIN = "openStableDomain";
-    String SDK_VERSION = "1.0.0.15";
+    String SDK_VERSION = "1.0.0.16";
     /**
      * 预置域名列表
      */

src/main/java/com/getui/push/v2/sdk/dto/CommonEnum.java

@@ -24,6 +24,19 @@ enum ClickTypeEnum {
         }
     }
 
+    enum HarmonyClickTypeEnum {
+        TYPE_WANT("want", "打开应用内特定页面"),
+        TYPE_STARTAPP("startapp", "打开应用首页")
+        ;
+        public final String type;
+        public final String msg;
+
+        HarmonyClickTypeEnum(String type, String msg) {
+            this.type = type;
+            this.msg = msg;
+        }
+    }
+
     /**
      * 通知渠道重要性
      */

src/main/java/com/getui/push/v2/sdk/dto/req/Audience.java

@@ -8,6 +8,7 @@
  */
 public class Audience {
     private List<String> cid;
+    private String aliasType;
     private List<String> alias;
     private String fastCustomTag;
     private List<Condition> tag;
@@ -42,6 +43,14 @@ public void setCid(List<String> cid) {
         this.cid = cid;
     }
 
+    public String getAliasType() {
+        return aliasType;
+    }
+
+    public void setAliasType(String aliasType) {
+        this.aliasType = aliasType;
+    }
+
     public List<String> getAlias() {
         return alias;
     }
@@ -78,6 +87,7 @@ public void setAll(String all) {
     public String toString() {
         return "Audience{" +
                 "cid=" + cid +
+                ", aliasType='" + aliasType + '\'' +
                 ", alias=" + alias +
                 ", fastCustomTag='" + fastCustomTag + '\'' +
                 ", tag=" + tag +

src/main/java/com/getui/push/v2/sdk/dto/req/CidAliasListDTO.java

@@ -13,6 +13,8 @@
  */
 public class CidAliasListDTO implements BaseReqDTO {
 
+    private String aliasType;
+
     private List<CidAlias> dataList;
 
     public CidAliasListDTO add(CidAlias cidAlias) {
@@ -60,6 +62,14 @@ public void setAlias(String alias) {
         }
     }
 
+    public String getAliasType() {
+        return aliasType;
+    }
+
+    public void setAliasType(String aliasType) {
+        this.aliasType = aliasType;
+    }
+
     public List<CidAlias> getDataList() {
         return dataList;
     }
@@ -68,10 +78,12 @@ public void setDataList(List<CidAlias> dataList) {
         this.dataList = dataList;
     }
 
+
     @Override
     public String toString() {
         return "CidAliasListDTO{" +
-                "dataList=" + dataList +
+                "aliasType='" + aliasType + '\'' +
+                ", dataList=" + dataList +
                 '}';
     }
-}
+}

src/main/java/com/getui/push/v2/sdk/dto/req/message/PushChannel.java

@@ -3,6 +3,7 @@
 import com.getui.push.v2.sdk.common.ApiException;
 import com.getui.push.v2.sdk.dto.BaseDTO;
 import com.getui.push.v2.sdk.dto.req.message.android.AndroidDTO;
+import com.getui.push.v2.sdk.dto.req.message.harmony.HarmonyDTO;
 import com.getui.push.v2.sdk.dto.req.message.ios.IosDTO;
 
 /**
@@ -20,6 +21,10 @@ public class PushChannel implements BaseDTO {
      * android通道推送消息内容
      */
     private AndroidDTO android;
+    /**
+     * harmony通道推送消息内容
+     */
+    private HarmonyDTO harmony;
 
     @Override
     public void check() throws ApiException {
@@ -45,11 +50,20 @@ public void setAndroid(AndroidDTO android) {
         this.android = android;
     }
 
+    public HarmonyDTO getHarmony() {
+        return harmony;
+    }
+
+    public void setHarmony(HarmonyDTO harmony) {
+        this.harmony = harmony;
+    }
+
     @Override
     public String toString() {
         return "PushChannel{" +
                 "ios=" + ios +
                 ", android=" + android +
+                ", harmony=" + harmony +
                 '}';
     }
 }

src/main/java/com/getui/push/v2/sdk/dto/req/message/harmony/HarmonyDTO.java

@@ -0,0 +1,72 @@
+package com.getui.push.v2.sdk.dto.req.message.harmony;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class HarmonyDTO {
+
+    /**
+     * 通知消息内容，与transmission 二选一，两个都填写时报错
+     */
+    private HarmonyNotification notification;
+    /**
+     * 透传消息内容，与notification 二选一，两个都填写时报错，长度 ≤ 3072
+     */
+    private String transmission;
+
+    /**
+     * 第三方厂商扩展内容
+     */
+    private Map<String, Map<String, Object>> options;
+
+    public HarmonyNotification getNotification() {
+        return notification;
+    }
+
+    public void setNotification(HarmonyNotification notification) {
+        this.notification = notification;
+    }
+
+    public String getTransmission() {
+        return transmission;
+    }
+
+    public void setTransmission(String transmission) {
+        this.transmission = transmission;
+    }
+
+    public Map<String, Map<String, Object>> getOptions() {
+        return options;
+    }
+
+    public void setOptions(Map<String, Map<String, Object>> options) {
+        this.options = options;
+    }
+
+    public void addOptionAll(String key, Object value) {
+        addOption("ALL", key, value);
+    }
+
+    public void addOption(String constraint, String key, Object value) {
+        if (constraint == null || "".equals(constraint)) {
+            constraint = "ALL";
+        }
+        if (options == null) {
+            options = new HashMap<String, Map<String, Object>>();
+        }
+        if (!options.containsKey(constraint)) {
+            options.put(constraint, new HashMap<String, Object>());
+        }
+        Map<String, Object> map = options.get(constraint);
+        map.put(key, value);
+    }
+
+    @Override
+    public String toString() {
+        return "HarmonyDTO{" +
+                "notification=" + notification +
+                ", transmission='" + transmission + '\'' +
+                ", options=" + options +
+                '}';
+    }
+}