From 051abca66db233f5dbde3f69aa706422e1ac9fd9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 16:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 16 +++++++++++-----
1 files changed, 11 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..78c83fb 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
@@ -1,5 +1,6 @@
package com.doumee.core.constants;
+import ch.qos.logback.core.util.COWArrayList;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang3.StringUtils;
@@ -30,19 +31,24 @@
public static final String FILE_DIR ="FILE_DIR" ;
public static final String PRIVATE_KEY = "PRIVATE_KEY";
public static final String PROJECT_FILE = "PROJECT_FILE";
+ public static final String PROJECTS = "PROJECTS";
public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
+ //杞﹁締绫诲瀷鏁版嵁
+ public static final String BIKE_TYPE ="1,2,3,4,5,6,7,8" ;
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