From fdde96f3d569602a9b3b3af5bebe1cc56bd4e6c7 Mon Sep 17 00:00:00 2001
From: "1049970895@qniao.cn" <1049970895>
Date: Mon, 30 Jan 2023 10:47:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=BA=E6=99=BA=E4=BA=91?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=ACsdk=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 iot-gizwits-statistics/pom.xml                |  8 +---
 .../iot/gizwits/source/GizWitsIotSource.java  | 46 +++++++++----------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/iot-gizwits-statistics/pom.xml b/iot-gizwits-statistics/pom.xml
index 84371a7..52a4e19 100644
--- a/iot-gizwits-statistics/pom.xml
+++ b/iot-gizwits-statistics/pom.xml
@@ -145,7 +145,7 @@
         <dependency>
             <groupId>com.gizwits.noti</groupId>
             <artifactId>noti-client</artifactId>
-            <version>1.9.0-RELEASE</version>
+            <version>1.9.2-20230130.022732-1</version>
         </dependency>
 
         <dependency>
@@ -237,12 +237,6 @@
     </build>
 
     <repositories>
-        <repository>
-            <id>archiva.general</id>
-            <name>Gizwits General Repository</name>
-            <url>https://archiva.gizwits.com/repository/general/</url>
-        </repository>
-
         <repository>
             <id>maven-releases</id>
             <name>Nexus releases Repository</name>
diff --git a/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/source/GizWitsIotSource.java b/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/source/GizWitsIotSource.java
index 63ffc76..4bdda35 100644
--- a/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/source/GizWitsIotSource.java
+++ b/iot-gizwits-statistics/src/main/java/com/qniao/iot/gizwits/source/GizWitsIotSource.java
@@ -3,11 +3,10 @@ package com.qniao.iot.gizwits.source;
 import com.alibaba.fastjson.JSONObject;
 import com.gizwits.noti.noticlient.OhMyNotiClient;
 import com.gizwits.noti.noticlient.OhMyNotiClientImpl;
+import com.gizwits.noti.noticlient.bean.Credential;
 import com.gizwits.noti.noticlient.bean.req.NotiReqPushEvents;
-import com.gizwits.noti.noticlient.bean.req.body.AuthorizationData;
 import com.gizwits.noti.noticlient.config.SnotiCallback;
 import com.gizwits.noti.noticlient.config.SnotiConfig;
-import com.gizwits.noti.noticlient.enums.ProtocolType;
 import com.google.common.base.Preconditions;
 import com.qniao.iot.gizwits.GizWitsProperties;
 import lombok.extern.slf4j.Slf4j;
@@ -15,6 +14,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.streaming.api.functions.source.RichSourceFunction;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -33,10 +33,11 @@ public class GizWitsIotSource extends RichSourceFunction<JSONObject> {
 
         log.info("开始启动gizwits客户端...");
 
-        client = new OhMyNotiClientImpl()
-                .addLoginAuthorizes(getSnotiLoginCredential())
-                .setCallback(getSnotiCallback())
-                .setSnotiConfig(getGizWitsConfig());
+        client =
+                new OhMyNotiClientImpl()
+                        .setCredentials(getSnotiLoginCredential())
+                        .setCallback(getSnotiCallback())
+                        .setSnotiConfig(getSnotiConfig());
 
         //启动client
         client.doStart();
@@ -57,19 +58,19 @@ public class GizWitsIotSource extends RichSourceFunction<JSONObject> {
         RUNNING = false;
     }
 
-    private AuthorizationData[] getSnotiLoginCredential() {
+    private List<Credential> getSnotiLoginCredential() {
         List<GizWitsProperties.Item> itemList = PROPERTIES.getItemList();
-        Preconditions.checkArgument(!CollectionUtils.isEmpty(itemList), "未配置gizwits登陆信息, gizwits初始化失败");
+        Preconditions.checkArgument(!CollectionUtils.isEmpty(itemList), "未配置snoti登陆信息, snoti初始化失败");
         return itemList.stream()
-                .map(it -> new AuthorizationData()
-                        //监听所有推送事件
-                        .setProtocolType(ProtocolType.V2)
-                        .addEvents(NotiReqPushEvents.values())
-                        .setSubkey(it.getSubKey())
-                        .setAuth_id(it.getAuthId())
-                        .setAuth_secret(it.getAuthSecret())
-                        .setProduct_key(it.getProductKey()))
-                .toArray(AuthorizationData[]::new);
+                .map(it ->
+                        Credential.builder()
+                                .events(Arrays.asList(NotiReqPushEvents.values()))
+                                .subkey(it.getSubKey())
+                                .authId(it.getAuthId())
+                                .authSecret(it.getAuthSecret())
+                                .productKey(it.getProductKey())
+                                .build())
+                .collect(Collectors.toList());
     }
 
     private SnotiCallback getSnotiCallback() {
@@ -84,19 +85,16 @@ public class GizWitsIotSource extends RichSourceFunction<JSONObject> {
             public void disconnected() {
                 log.warn("gizwits客户端连接断开, 即将尝试重连...");
             }
-
-            @Override
-            public void reload(AuthorizationData... authorizationData) {
-                log.info("gizwits重载登录信息[{}]...", Stream.of(authorizationData).map(AuthorizationData::toString)
-                        .collect(Collectors.joining(",")));
-            }
         };
     }
 
-    private SnotiConfig getGizWitsConfig() {
+    private SnotiConfig getSnotiConfig() {
         return new SnotiConfig()
                 .setAutomaticConfirmation(PROPERTIES.getAutomaticConfirmation())
+                .setWithMetrics(true)
+                .setEnableCheckNoData(false)
                 .setHost(PROPERTIES.getHost())
                 .setPort(PROPERTIES.getPort());
     }
+
 }