From 20bf9ed26d14c232a695c11340c079a366f213a9 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Thu, 9 Nov 2023 22:29:21 +0800 Subject: [PATCH] fix(gw_gbt32960): mountpoint should not with `/` suffix --- .../include/emqx_gbt32960.hrl | 3 +++ .../src/emqx_gbt32960_channel.erl | 18 ++++++++---------- .../src/emqx_gbt32960_schema.erl | 3 +-- .../test/emqx_gbt32960_SUITE.erl | 3 ++- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/apps/emqx_gateway_gbt32960/include/emqx_gbt32960.hrl b/apps/emqx_gateway_gbt32960/include/emqx_gbt32960.hrl index ba7e7dc4a..2649f3f98 100644 --- a/apps/emqx_gateway_gbt32960/include/emqx_gbt32960.hrl +++ b/apps/emqx_gateway_gbt32960/include/emqx_gbt32960.hrl @@ -75,3 +75,6 @@ % 0x0A~0x2F: Customized data for Platform Exchange Protocol % 0x30~0x7F: Reserved % 0x80~0xFE: Customized by user + +-define(DEFAULT_MOUNTPOINT, <<"gbt32960/${clientid}/">>). +-define(DEFAULT_DOWNLINK_TOPIC, <<"dnstream">>). diff --git a/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_channel.erl b/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_channel.erl index 98b84a55e..5cb65f104 100644 --- a/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_channel.erl +++ b/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_channel.erl @@ -74,8 +74,6 @@ }). -define(INFO_KEYS, [conninfo, conn_state, clientinfo, session, will_msg]). --define(DEFAULT_MOUNTPOINT, <<"gbt32960/${clientid}">>). --define(DEFAULT_DOWNLINK_TOPIC, <<"/dnstream">>). -dialyzer({nowarn_function, init/2}). @@ -702,14 +700,14 @@ upstreaming( transform(Frame = ?CMD(Cmd), Mountpoint) -> Suffix = case Cmd of - ?CMD_VIHECLE_LOGIN -> <<"/upstream/vlogin">>; - ?CMD_INFO_REPORT -> <<"/upstream/info">>; - ?CMD_INFO_RE_REPORT -> <<"/upstream/reinfo">>; - ?CMD_VIHECLE_LOGOUT -> <<"/upstream/vlogout">>; - ?CMD_PLATFORM_LOGIN -> <<"/upstream/plogin">>; - ?CMD_PLATFORM_LOGOUT -> <<"/upstream/plogout">>; + ?CMD_VIHECLE_LOGIN -> <<"upstream/vlogin">>; + ?CMD_INFO_REPORT -> <<"upstream/info">>; + ?CMD_INFO_RE_REPORT -> <<"upstream/reinfo">>; + ?CMD_VIHECLE_LOGOUT -> <<"upstream/vlogout">>; + ?CMD_PLATFORM_LOGIN -> <<"upstream/plogin">>; + ?CMD_PLATFORM_LOGOUT -> <<"upstream/plogout">>; %CMD_HEARTBEAT, CMD_SCHOOL_TIME ... - _ -> <<"/upstream/transparent">> + _ -> <<"upstream/transparent">> end, Topic = emqx_mountpoint:mount(Mountpoint, Suffix), Payload = to_json(Frame), @@ -717,7 +715,7 @@ transform(Frame = ?CMD(Cmd), Mountpoint) -> transform(Frame = #frame{ack = Ack}, Mountpoint) when ?IS_ACK_CODE(Ack) -> - Topic = emqx_mountpoint:mount(Mountpoint, <<"/upstream/response">>), + Topic = emqx_mountpoint:mount(Mountpoint, <<"upstream/response">>), Payload = to_json(Frame), {Topic, Payload}. diff --git a/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_schema.erl b/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_schema.erl index abc1623f6..743c74e70 100644 --- a/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_schema.erl +++ b/apps/emqx_gateway_gbt32960/src/emqx_gbt32960_schema.erl @@ -4,11 +4,10 @@ -module(emqx_gbt32960_schema). +-include("emqx_gbt32960.hrl"). -include_lib("hocon/include/hoconsc.hrl"). -include_lib("typerefl/include/types.hrl"). --define(DEFAULT_MOUNTPOINT, <<"gbt32960/${clientid}">>). - %% config schema provides -export([fields/1, desc/1]). diff --git a/apps/emqx_gateway_gbt32960/test/emqx_gbt32960_SUITE.erl b/apps/emqx_gateway_gbt32960/test/emqx_gbt32960_SUITE.erl index 16d56e28a..56184fc5f 100644 --- a/apps/emqx_gateway_gbt32960/test/emqx_gbt32960_SUITE.erl +++ b/apps/emqx_gateway_gbt32960/test/emqx_gbt32960_SUITE.erl @@ -29,7 +29,8 @@ "}\n" >>). -all() -> emqx_common_test_helpers:all(?MODULE). +all() -> + emqx_common_test_helpers:all(?MODULE). init_per_suite(Config) -> application:load(emqx_gateway_gbt32960),