From aa6febca297b0e1a68b1877fc9f41885e9fc0c7a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 16 十月 2023 15:56:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/core/constants/Constants.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index 6887607..4bdbd4a 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -33,16 +33,18 @@
     public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
     public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
     public static String REDIS_DEBUG_STR="test_";
+    public static final String AD = "AD";
     public  interface MqttTopic{
-        //寮�閿侊紙鍙戝竷锛�
+
         String topic_index = "device/lock/";
-        String openLock = "device/lock/+/unlock";
+        //寮�閿侊紙鍙戝竷锛�
+        String pub_openLock = "device/lock/{siteId}/{lockId}/unlock";
         //閿佷俊鎭紝鍦ㄥ垵濮嬪寲銆佺姸鎬佸彉鏇存椂浼氭帹閫侀攣鐨勫畬鏁寸姸鎬�(璁㈤槄锛�
-        String lockInfo = "device/lock/+/info";
+        String sub_lockInfo = "device/lock/+/+/info";
         //杩樿溅閿佸ご锛堣闃咃級
-        String closeLock = "device/lock/+/bike";
+        String sub_closeLock = "device/lock/+/+/bike";
         //瀹炴椂鑾峰彇閿佷俊鎭紙鍙戝竷锛�
-        String getLockInfo = "device/lock/+/getInfo";
+        String pub_getLockInfo = "device/lock/{siteId}/{lockId}/getInfo";
     }
 
     /**

--
Gitblit v1.9.3