From 8738b7aa54ebd8837e135bab88ea031b6ed788b0 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 17:03:43 +0800
Subject: [PATCH] 接口整理
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 2 +-
server/web/src/main/java/com/doumee/api/web/HomeApi.java | 6 ------
server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java | 3 +++
server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java | 35 ++++++++++++++++++++++++++++++++---
server/services/src/main/resources/application-dev.yml | 1 -
server/platform/src/main/resources/application.yml | 3 +++
server/web/src/main/resources/application.yml | 3 +++
7 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index f1d3d21..dd94396 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -59,3 +59,6 @@
# WEB鏈嶅姟鍣ㄩ厤缃�
server:
port: 10012
+
+mqtt:
+ clientid: doumeetestplat
diff --git a/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java b/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
index 70783e3..8085cba 100644
--- a/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
+++ b/server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java
@@ -5,9 +5,6 @@
import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.eclipse.paho.client.mqttv3.MqttTopic;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
public class MqttClientInit {
static MqttClient client;
@@ -44,5 +41,37 @@
}
return client;
}
+ public static synchronized MqttClient refreshClient(MqttConfig config,MqttPushCallback callBack){
+ if(client !=null){
+ return client;
+ }
+ try {
+ // host涓轰富鏈哄悕锛宑lientid鍗宠繛鎺QTT鐨勫鎴风ID锛屼竴鑸互鍞竴鏍囪瘑绗﹁〃绀猴紝MemoryPersistence璁剧疆clientid鐨勪繚瀛樺舰寮忥紝榛樿涓轰互鍐呭瓨淇濆瓨
+ client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), config.getClientid() ,new MemoryPersistence());
+ // MQTT鐨勮繛鎺ヨ缃�
+ MqttConnectOptions options = new MqttConnectOptions();
+ // 璁剧疆鏄惁娓呯┖session,杩欓噷濡傛灉璁剧疆涓篺alse琛ㄧず鏈嶅姟鍣ㄤ細淇濈暀瀹㈡埛绔殑杩炴帴璁板綍锛岃缃负true琛ㄧず姣忔杩炴帴鍒版湇鍔″櫒閮戒互鏂扮殑韬唤杩炴帴
+ options.setCleanSession(false);
+ // 璁剧疆杩炴帴鐨勭敤鎴峰悕
+ options.setUserName(config.getUsername());
+ // 璁剧疆杩炴帴鐨勫瘑鐮�
+ options.setPassword(config.getPassword().toCharArray());
+ // 璁剧疆瓒呮椂鏃堕棿 鍗曚綅涓虹
+ options.setConnectionTimeout(10);
+ // 璁剧疆浼氳瘽蹇冭烦鏃堕棿 鍗曚綅涓虹 鏈嶅姟鍣ㄤ細姣忛殧1.5*20绉掔殑鏃堕棿鍚戝鎴风鍙戦�佷釜娑堟伅鍒ゆ柇瀹㈡埛绔槸鍚﹀湪绾匡紝浣嗚繖涓柟娉曞苟娌℃湁閲嶈繛鐨勬満鍒�
+ options.setKeepAliveInterval(20);
+ // 璁剧疆鍥炶皟
+ client.setCallback(callBack);
+ //璁剧疆鏂紑鍚庨噸鏂拌繛鎺�
+ options.setAutomaticReconnect(true);
+ MqttTopic topic = client.getTopic(config.getClientid()+"_close");
+ //閬楀槺
+ options.setWill(topic, "close".getBytes(), 1, true);
+ client.connect(options);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return client;
+ }
}
diff --git a/server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java b/server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java
index aee7901..d15c553 100644
--- a/server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java
+++ b/server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java
@@ -1,5 +1,6 @@
package com.doumee.core.mqtt.service;
+import com.doumee.core.mqtt.config.MqttConfig;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.DeviceSubcribeService;
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
@@ -15,6 +16,8 @@
public class MqttPushCallback implements MqttCallback {
@Autowired
private DeviceSubcribeService deviceSubcribeService;
+ @Autowired
+ private MqttConfig mqttConfig;
//鎺ユ敹娑堟伅鍥炶皟
@Override
public void connectionLost(Throwable cause) {
diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index 88f215a..4388eaa 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -299,7 +299,7 @@
nowDate = sdfShort.format(date);
return nowDate;
} catch (Exception e) {
- throw e;
+ return null;
}
}
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 842d361..a46d491 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -54,7 +54,6 @@
########################mqtt鐩稿叧閰嶇疆########################
mqtt:
host: tcp://175.27.187.84:1883
- clientid: doumeetest
username: doumee
password: doumee@168
diff --git a/server/web/src/main/java/com/doumee/api/web/HomeApi.java b/server/web/src/main/java/com/doumee/api/web/HomeApi.java
index 0d31240..4754edc 100644
--- a/server/web/src/main/java/com/doumee/api/web/HomeApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/HomeApi.java
@@ -34,7 +34,6 @@
@Autowired
private GoodsorderService goodsorderService;
-
@LoginRequired
@ApiOperation(value = "棣栭〉淇℃伅", notes = "棣栭〉淇℃伅")
@GetMapping("/home")
@@ -45,10 +44,5 @@
HomeResponse homeResponse = goodsorderService.getHome(getMemberId());
return ApiResponse.success("鏌ヨ鎴愬姛",homeResponse);
}
-
-
-
-
-
}
diff --git a/server/web/src/main/resources/application.yml b/server/web/src/main/resources/application.yml
index 8f71211..e6fd44e 100644
--- a/server/web/src/main/resources/application.yml
+++ b/server/web/src/main/resources/application.yml
@@ -61,3 +61,6 @@
# WEB鏈嶅姟鍣ㄩ厤缃�
server:
port: 10013
+
+mqtt:
+ clientid: doumeetestweb
--
Gitblit v1.9.3