From 4ab2ea59bc4b5f159df7c00d0ecc19164d048e8e Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Fri, 17 Apr 2026 18:52:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {apps/iot/include => include}/endpoint.hrl | 0 {apps/iot/include => include}/iot.hrl | 0 {apps/iot/include => include}/iot_tables.hrl | 0 {apps/iot/include => include}/message.hrl | 0 {apps/iot/priv => priv}/2024-01-18-log.txt | 0 rebar.config | 2 +- rebar.lock | 2 +- {apps/iot/src => src}/data_format/line_format.erl | 0 {apps/iot/src => src}/endpoint/endpoint.erl | 0 {apps/iot/src => src}/endpoint/endpoint_buffer.erl | 0 {apps/iot/src => src}/endpoint/endpoint_http.erl | 0 {apps/iot/src => src}/endpoint/endpoint_kafka.erl | 0 {apps/iot/src => src}/endpoint/endpoint_mqtt.erl | 0 {apps/iot/src => src}/endpoint/endpoint_subscription.erl | 0 {apps/iot/src => src}/endpoint/endpoint_sup.erl | 0 {apps/iot/src => src}/endpoint/endpoint_sup_sup.erl | 0 {apps/iot/src => src}/endpoint/endpoint_timer.erl | 0 {apps/iot/src => src}/http_handlers/container_handler.erl | 0 {apps/iot/src => src}/http_handlers/endpoint_handler.erl | 0 {apps/iot/src => src}/http_handlers/event_stream_handler.erl | 0 {apps/iot/src => src}/http_handlers/host_handler.erl | 0 {apps/iot/src => src}/http_handlers/http_protocol.erl | 0 {apps/iot/src => src}/influxdb/influx_client.erl | 0 {apps/iot/src => src}/influxdb/influx_point.erl | 0 {apps/iot/src => src}/iot.app.src | 0 {apps/iot/src => src}/iot_api.erl | 0 {apps/iot/src => src}/iot_app.erl | 0 {apps/iot/src => src}/iot_auth.erl | 0 {apps/iot/src => src}/iot_event_stream_observer.erl | 0 {apps/iot/src => src}/iot_host.erl | 0 {apps/iot/src => src}/iot_host_sup.erl | 0 {apps/iot/src => src}/iot_http_client.erl | 0 {apps/iot/src => src}/iot_logger.erl | 0 {apps/iot/src => src}/iot_observer.erl | 0 {apps/iot/src => src}/iot_sup.erl | 0 {apps/iot/src => src}/iot_udp_handler.erl | 0 {apps/iot/src => src}/iot_util.erl | 0 {apps/iot/src => src}/message/message_codec.erl | 0 {apps/iot/src => src}/mocker/endpoint_kafka_test.erl | 0 {apps/iot/src => src}/mocker/endpoint_mqtt_subscriber.erl | 0 {apps/iot/src => src}/mocker/eval_test.erl | 0 {apps/iot/src => src}/mocker/iot_mock.erl | 0 {apps/iot/src => src}/mysql/mysql_pool.erl | 0 {apps/iot/src => src}/mysql/mysql_provider.erl | 0 {apps/iot/src => src}/redis/redis_client.erl | 0 {apps/iot/src => src}/tcp/tcp_channel.erl | 0 {apps/iot/src => src}/util/http_client.erl | 0 47 files changed, 2 insertions(+), 2 deletions(-) rename {apps/iot/include => include}/endpoint.hrl (100%) rename {apps/iot/include => include}/iot.hrl (100%) rename {apps/iot/include => include}/iot_tables.hrl (100%) rename {apps/iot/include => include}/message.hrl (100%) rename {apps/iot/priv => priv}/2024-01-18-log.txt (100%) rename {apps/iot/src => src}/data_format/line_format.erl (100%) rename {apps/iot/src => src}/endpoint/endpoint.erl (100%) rename {apps/iot/src => src}/endpoint/endpoint_buffer.erl (100%) rename {apps/iot/src => src}/endpoint/endpoint_http.erl (100%) rename {apps/iot/src => src}/endpoint/endpoint_kafka.erl (100%) rename {apps/iot/src => src}/endpoint/endpoint_mqtt.erl (100%) rename {apps/iot/src => src}/endpoint/endpoint_subscription.erl (100%) rename {apps/iot/src => src}/endpoint/endpoint_sup.erl (100%) rename {apps/iot/src => src}/endpoint/endpoint_sup_sup.erl (100%) rename {apps/iot/src => src}/endpoint/endpoint_timer.erl (100%) rename {apps/iot/src => src}/http_handlers/container_handler.erl (100%) rename {apps/iot/src => src}/http_handlers/endpoint_handler.erl (100%) rename {apps/iot/src => src}/http_handlers/event_stream_handler.erl (100%) rename {apps/iot/src => src}/http_handlers/host_handler.erl (100%) rename {apps/iot/src => src}/http_handlers/http_protocol.erl (100%) rename {apps/iot/src => src}/influxdb/influx_client.erl (100%) rename {apps/iot/src => src}/influxdb/influx_point.erl (100%) rename {apps/iot/src => src}/iot.app.src (100%) rename {apps/iot/src => src}/iot_api.erl (100%) rename {apps/iot/src => src}/iot_app.erl (100%) rename {apps/iot/src => src}/iot_auth.erl (100%) rename {apps/iot/src => src}/iot_event_stream_observer.erl (100%) rename {apps/iot/src => src}/iot_host.erl (100%) rename {apps/iot/src => src}/iot_host_sup.erl (100%) rename {apps/iot/src => src}/iot_http_client.erl (100%) rename {apps/iot/src => src}/iot_logger.erl (100%) rename {apps/iot/src => src}/iot_observer.erl (100%) rename {apps/iot/src => src}/iot_sup.erl (100%) rename {apps/iot/src => src}/iot_udp_handler.erl (100%) rename {apps/iot/src => src}/iot_util.erl (100%) rename {apps/iot/src => src}/message/message_codec.erl (100%) rename {apps/iot/src => src}/mocker/endpoint_kafka_test.erl (100%) rename {apps/iot/src => src}/mocker/endpoint_mqtt_subscriber.erl (100%) rename {apps/iot/src => src}/mocker/eval_test.erl (100%) rename {apps/iot/src => src}/mocker/iot_mock.erl (100%) rename {apps/iot/src => src}/mysql/mysql_pool.erl (100%) rename {apps/iot/src => src}/mysql/mysql_provider.erl (100%) rename {apps/iot/src => src}/redis/redis_client.erl (100%) rename {apps/iot/src => src}/tcp/tcp_channel.erl (100%) rename {apps/iot/src => src}/util/http_client.erl (100%) diff --git a/apps/iot/include/endpoint.hrl b/include/endpoint.hrl similarity index 100% rename from apps/iot/include/endpoint.hrl rename to include/endpoint.hrl diff --git a/apps/iot/include/iot.hrl b/include/iot.hrl similarity index 100% rename from apps/iot/include/iot.hrl rename to include/iot.hrl diff --git a/apps/iot/include/iot_tables.hrl b/include/iot_tables.hrl similarity index 100% rename from apps/iot/include/iot_tables.hrl rename to include/iot_tables.hrl diff --git a/apps/iot/include/message.hrl b/include/message.hrl similarity index 100% rename from apps/iot/include/message.hrl rename to include/message.hrl diff --git a/apps/iot/priv/2024-01-18-log.txt b/priv/2024-01-18-log.txt similarity index 100% rename from apps/iot/priv/2024-01-18-log.txt rename to priv/2024-01-18-log.txt diff --git a/rebar.config b/rebar.config index 9acc2fa..9d119a6 100644 --- a/rebar.config +++ b/rebar.config @@ -9,7 +9,7 @@ {jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "1.1.1"}}}, {mysql, ".*", {git, "https://github.com/mysql-otp/mysql-otp", {tag, "1.8.0"}}}, {eredis, ".*", {git, "https://github.com/wooga/eredis.git", {tag, "v1.2.0"}}}, - {emqtt, ".*", {git, "https://gitea.s5s8.com/anlicheng/emqtt.git", {branch, "main"}}}, + {emqtt, ".*", {git, "https://gitea.s5s8.com/anlicheng/emqtt.git", {tag, "v1.2"}}}, {gproc, ".*", {git, "https://github.com/uwiger/gproc.git", {tag, "0.9.1"}}}, {parse_trans, ".*", {git, "https://github.com/uwiger/parse_trans", {tag, "3.0.0"}}}, {lager, ".*", {git,"https://github.com/erlang-lager/lager.git", {tag, "3.9.2"}}} diff --git a/rebar.lock b/rebar.lock index dcc80ad..44a3885 100644 --- a/rebar.lock +++ b/rebar.lock @@ -15,7 +15,7 @@ {<<"crc32cer">>,{pkg,<<"crc32cer">>,<<"1.0.3">>},2}, {<<"emqtt">>, {git,"https://gitea.s5s8.com/anlicheng/emqtt.git", - {ref,"5111914a9b1b92b0b497f825c77bdd365e3989b0"}}, + {ref,"c5a52dcb57cd23a4318e342b705f9f726e8d67a1"}}, 0}, {<<"eredis">>, {git,"https://github.com/wooga/eredis.git", diff --git a/apps/iot/src/data_format/line_format.erl b/src/data_format/line_format.erl similarity index 100% rename from apps/iot/src/data_format/line_format.erl rename to src/data_format/line_format.erl diff --git a/apps/iot/src/endpoint/endpoint.erl b/src/endpoint/endpoint.erl similarity index 100% rename from apps/iot/src/endpoint/endpoint.erl rename to src/endpoint/endpoint.erl diff --git a/apps/iot/src/endpoint/endpoint_buffer.erl b/src/endpoint/endpoint_buffer.erl similarity index 100% rename from apps/iot/src/endpoint/endpoint_buffer.erl rename to src/endpoint/endpoint_buffer.erl diff --git a/apps/iot/src/endpoint/endpoint_http.erl b/src/endpoint/endpoint_http.erl similarity index 100% rename from apps/iot/src/endpoint/endpoint_http.erl rename to src/endpoint/endpoint_http.erl diff --git a/apps/iot/src/endpoint/endpoint_kafka.erl b/src/endpoint/endpoint_kafka.erl similarity index 100% rename from apps/iot/src/endpoint/endpoint_kafka.erl rename to src/endpoint/endpoint_kafka.erl diff --git a/apps/iot/src/endpoint/endpoint_mqtt.erl b/src/endpoint/endpoint_mqtt.erl similarity index 100% rename from apps/iot/src/endpoint/endpoint_mqtt.erl rename to src/endpoint/endpoint_mqtt.erl diff --git a/apps/iot/src/endpoint/endpoint_subscription.erl b/src/endpoint/endpoint_subscription.erl similarity index 100% rename from apps/iot/src/endpoint/endpoint_subscription.erl rename to src/endpoint/endpoint_subscription.erl diff --git a/apps/iot/src/endpoint/endpoint_sup.erl b/src/endpoint/endpoint_sup.erl similarity index 100% rename from apps/iot/src/endpoint/endpoint_sup.erl rename to src/endpoint/endpoint_sup.erl diff --git a/apps/iot/src/endpoint/endpoint_sup_sup.erl b/src/endpoint/endpoint_sup_sup.erl similarity index 100% rename from apps/iot/src/endpoint/endpoint_sup_sup.erl rename to src/endpoint/endpoint_sup_sup.erl diff --git a/apps/iot/src/endpoint/endpoint_timer.erl b/src/endpoint/endpoint_timer.erl similarity index 100% rename from apps/iot/src/endpoint/endpoint_timer.erl rename to src/endpoint/endpoint_timer.erl diff --git a/apps/iot/src/http_handlers/container_handler.erl b/src/http_handlers/container_handler.erl similarity index 100% rename from apps/iot/src/http_handlers/container_handler.erl rename to src/http_handlers/container_handler.erl diff --git a/apps/iot/src/http_handlers/endpoint_handler.erl b/src/http_handlers/endpoint_handler.erl similarity index 100% rename from apps/iot/src/http_handlers/endpoint_handler.erl rename to src/http_handlers/endpoint_handler.erl diff --git a/apps/iot/src/http_handlers/event_stream_handler.erl b/src/http_handlers/event_stream_handler.erl similarity index 100% rename from apps/iot/src/http_handlers/event_stream_handler.erl rename to src/http_handlers/event_stream_handler.erl diff --git a/apps/iot/src/http_handlers/host_handler.erl b/src/http_handlers/host_handler.erl similarity index 100% rename from apps/iot/src/http_handlers/host_handler.erl rename to src/http_handlers/host_handler.erl diff --git a/apps/iot/src/http_handlers/http_protocol.erl b/src/http_handlers/http_protocol.erl similarity index 100% rename from apps/iot/src/http_handlers/http_protocol.erl rename to src/http_handlers/http_protocol.erl diff --git a/apps/iot/src/influxdb/influx_client.erl b/src/influxdb/influx_client.erl similarity index 100% rename from apps/iot/src/influxdb/influx_client.erl rename to src/influxdb/influx_client.erl diff --git a/apps/iot/src/influxdb/influx_point.erl b/src/influxdb/influx_point.erl similarity index 100% rename from apps/iot/src/influxdb/influx_point.erl rename to src/influxdb/influx_point.erl diff --git a/apps/iot/src/iot.app.src b/src/iot.app.src similarity index 100% rename from apps/iot/src/iot.app.src rename to src/iot.app.src diff --git a/apps/iot/src/iot_api.erl b/src/iot_api.erl similarity index 100% rename from apps/iot/src/iot_api.erl rename to src/iot_api.erl diff --git a/apps/iot/src/iot_app.erl b/src/iot_app.erl similarity index 100% rename from apps/iot/src/iot_app.erl rename to src/iot_app.erl diff --git a/apps/iot/src/iot_auth.erl b/src/iot_auth.erl similarity index 100% rename from apps/iot/src/iot_auth.erl rename to src/iot_auth.erl diff --git a/apps/iot/src/iot_event_stream_observer.erl b/src/iot_event_stream_observer.erl similarity index 100% rename from apps/iot/src/iot_event_stream_observer.erl rename to src/iot_event_stream_observer.erl diff --git a/apps/iot/src/iot_host.erl b/src/iot_host.erl similarity index 100% rename from apps/iot/src/iot_host.erl rename to src/iot_host.erl diff --git a/apps/iot/src/iot_host_sup.erl b/src/iot_host_sup.erl similarity index 100% rename from apps/iot/src/iot_host_sup.erl rename to src/iot_host_sup.erl diff --git a/apps/iot/src/iot_http_client.erl b/src/iot_http_client.erl similarity index 100% rename from apps/iot/src/iot_http_client.erl rename to src/iot_http_client.erl diff --git a/apps/iot/src/iot_logger.erl b/src/iot_logger.erl similarity index 100% rename from apps/iot/src/iot_logger.erl rename to src/iot_logger.erl diff --git a/apps/iot/src/iot_observer.erl b/src/iot_observer.erl similarity index 100% rename from apps/iot/src/iot_observer.erl rename to src/iot_observer.erl diff --git a/apps/iot/src/iot_sup.erl b/src/iot_sup.erl similarity index 100% rename from apps/iot/src/iot_sup.erl rename to src/iot_sup.erl diff --git a/apps/iot/src/iot_udp_handler.erl b/src/iot_udp_handler.erl similarity index 100% rename from apps/iot/src/iot_udp_handler.erl rename to src/iot_udp_handler.erl diff --git a/apps/iot/src/iot_util.erl b/src/iot_util.erl similarity index 100% rename from apps/iot/src/iot_util.erl rename to src/iot_util.erl diff --git a/apps/iot/src/message/message_codec.erl b/src/message/message_codec.erl similarity index 100% rename from apps/iot/src/message/message_codec.erl rename to src/message/message_codec.erl diff --git a/apps/iot/src/mocker/endpoint_kafka_test.erl b/src/mocker/endpoint_kafka_test.erl similarity index 100% rename from apps/iot/src/mocker/endpoint_kafka_test.erl rename to src/mocker/endpoint_kafka_test.erl diff --git a/apps/iot/src/mocker/endpoint_mqtt_subscriber.erl b/src/mocker/endpoint_mqtt_subscriber.erl similarity index 100% rename from apps/iot/src/mocker/endpoint_mqtt_subscriber.erl rename to src/mocker/endpoint_mqtt_subscriber.erl diff --git a/apps/iot/src/mocker/eval_test.erl b/src/mocker/eval_test.erl similarity index 100% rename from apps/iot/src/mocker/eval_test.erl rename to src/mocker/eval_test.erl diff --git a/apps/iot/src/mocker/iot_mock.erl b/src/mocker/iot_mock.erl similarity index 100% rename from apps/iot/src/mocker/iot_mock.erl rename to src/mocker/iot_mock.erl diff --git a/apps/iot/src/mysql/mysql_pool.erl b/src/mysql/mysql_pool.erl similarity index 100% rename from apps/iot/src/mysql/mysql_pool.erl rename to src/mysql/mysql_pool.erl diff --git a/apps/iot/src/mysql/mysql_provider.erl b/src/mysql/mysql_provider.erl similarity index 100% rename from apps/iot/src/mysql/mysql_provider.erl rename to src/mysql/mysql_provider.erl diff --git a/apps/iot/src/redis/redis_client.erl b/src/redis/redis_client.erl similarity index 100% rename from apps/iot/src/redis/redis_client.erl rename to src/redis/redis_client.erl diff --git a/apps/iot/src/tcp/tcp_channel.erl b/src/tcp/tcp_channel.erl similarity index 100% rename from apps/iot/src/tcp/tcp_channel.erl rename to src/tcp/tcp_channel.erl diff --git a/apps/iot/src/util/http_client.erl b/src/util/http_client.erl similarity index 100% rename from apps/iot/src/util/http_client.erl rename to src/util/http_client.erl