From a07b4b6ff1c98dcf81338bb45d59308db7c058a9 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 03 十一月 2023 17:18:56 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 hd/pipe/StaffManage/src/main/java/com/thhy/staff/config/EmqxConfig.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/config/EmqxConfig.java b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/config/EmqxConfig.java
index 9f1c34c..e8d1042 100644
--- a/hd/pipe/StaffManage/src/main/java/com/thhy/staff/config/EmqxConfig.java
+++ b/hd/pipe/StaffManage/src/main/java/com/thhy/staff/config/EmqxConfig.java
@@ -15,7 +15,7 @@
 
     private String port;
 
-    private String username;
+    private String login;
 
     private String password;
 
@@ -29,15 +29,16 @@
 
     @Override
     public String toString() {
-        return "{" +
+        return "{\"host\":\""+host+"\",\"login\":\""+login+"\",\"password\":\""+password+"\",\"port\":"+port+",\"qos\":1}";
+        /*return "{" +
                 "host:'" + host + '\'' +
                 ", port:'" + port + '\'' +
-                ", username:'" + username + '\'' +
+                ", login:'" + login + '\'' +
                 ", password:'" + password + '\'' +
                 ", qos:" + qos +
                 ", topic:'" + topic + '\'' +
                 ", willTopic:'" + willTopic + '\'' +
                 ", willContent:'" + willContent + '\'' +
-                '}';
+                '}';*/
     }
 }

--
Gitblit v1.9.3