jiangping
2023-10-11 8738b7aa54ebd8837e135bab88ea031b6ed788b0
接口整理
已修改7个文件
53 ■■■■ 文件已修改
server/platform/src/main/resources/application.yml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/mqtt/config/MqttClientInit.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/mqtt/service/MqttPushCallback.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/core/utils/DateUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/resources/application-dev.yml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/java/com/doumee/api/web/HomeApi.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/web/src/main/resources/application.yml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/platform/src/main/resources/application.yml
@@ -59,3 +59,6 @@
# WEB服务器配置
server:
  port: 10012
mqtt:
  clientid: doumeetestplat
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为主机名,clientid即连接MQTT的客户端ID,一般以唯一标识符表示,MemoryPersistence设置clientid的保存形式,默认为以内存保存
                client = new org.eclipse.paho.client.mqttv3.MqttClient(config.getHost(), config.getClientid() ,new MemoryPersistence());
                // MQTT的连接设置
                MqttConnectOptions   options = new MqttConnectOptions();
                // 设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录,设置为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;
        }
}
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) {
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;
        }
    }
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
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);
    }
}
server/web/src/main/resources/application.yml
@@ -61,3 +61,6 @@
  # WEB服务器配置
server:
   port: 10013
mqtt:
  clientid: doumeetestweb