1
0
mirror of https://github.com/thingsboard/thingsboard-gateway synced 2025-10-26 22:31:42 +08:00

Merge pull request #884 from samson0v/master

Fixed topic to regexp method for MQTT Connector
This commit is contained in:
Illia Barkov
2022-07-19 15:56:46 +03:00
committed by GitHub

View File

@@ -74,11 +74,11 @@ class TBUtility:
@staticmethod
def topic_to_regex(topic):
return topic.replace("+", "[^/]+").replace("#", ".+")
return topic.replace("+", "[^/]+").replace("#", ".+").replace('$', '\\$')
@staticmethod
def regex_to_topic(regex):
return regex.replace("[^/]+", "+").replace(".+", "#")
return regex.replace("[^/]+", "+").replace(".+", "#").replace('\\$', '$')
@staticmethod
def get_value(expression, body=None, value_type="string", get_tag=False, expression_instead_none=False):