diff --git a/apps/endpoint/.gitignore b/apps/endpoint/.gitignore deleted file mode 100644 index f1c4554..0000000 --- a/apps/endpoint/.gitignore +++ /dev/null @@ -1,19 +0,0 @@ -.rebar3 -_* -.eunit -*.o -*.beam -*.plt -*.swp -*.swo -.erlang.cookie -ebin -log -erl_crash.dump -.rebar -logs -_build -.idea -*.iml -rebar3.crashdump -*~ diff --git a/apps/endpoint/LICENSE b/apps/endpoint/LICENSE deleted file mode 100644 index 8ed2215..0000000 --- a/apps/endpoint/LICENSE +++ /dev/null @@ -1,191 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - Copyright 2024, anlicheng <244108715@qq.com>. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/apps/endpoint/README.md b/apps/endpoint/README.md deleted file mode 100644 index 327372e..0000000 --- a/apps/endpoint/README.md +++ /dev/null @@ -1,9 +0,0 @@ -endpoint -===== - -An OTP application - -Build ------ - - $ rebar3 compile diff --git a/apps/endpoint/src/endpoint.app.src b/apps/endpoint/src/endpoint.app.src deleted file mode 100644 index b10c10f..0000000 --- a/apps/endpoint/src/endpoint.app.src +++ /dev/null @@ -1,17 +0,0 @@ -{application, endpoint, - [{description, "An OTP application"}, - {vsn, "0.1.0"}, - {registered, []}, - {mod, {endpoint_app, []}}, - {applications, - [ - emqtt, - kernel, - stdlib - ]}, - {env,[]}, - {modules, []}, - - {licenses, ["Apache-2.0"]}, - {links, []} - ]}. diff --git a/apps/endpoint/src/endpoint_app.erl b/apps/endpoint/src/endpoint_app.erl deleted file mode 100644 index 4ec2d1e..0000000 --- a/apps/endpoint/src/endpoint_app.erl +++ /dev/null @@ -1,18 +0,0 @@ -%%%------------------------------------------------------------------- -%% @doc endpoint public API -%% @end -%%%------------------------------------------------------------------- - --module(endpoint_app). - --behaviour(application). - --export([start/2, stop/1]). - -start(_StartType, _StartArgs) -> - endpoint_sup:start_link(). - -stop(_State) -> - ok. - -%% internal functions diff --git a/apps/endpoint/include/endpoint.hrl b/apps/iot/include/endpoint.hrl similarity index 100% rename from apps/endpoint/include/endpoint.hrl rename to apps/iot/include/endpoint.hrl diff --git a/apps/iot/src/database/endpoint_bo.erl b/apps/iot/src/database/endpoint_bo.erl new file mode 100644 index 0000000..831d4d4 --- /dev/null +++ b/apps/iot/src/database/endpoint_bo.erl @@ -0,0 +1,27 @@ +%%%------------------------------------------------------------------- +%%% @author aresei +%%% @copyright (C) 2023, +%%% @doc +%%% +%%% @end +%%% Created : 16. 5月 2023 12:48 +%%%------------------------------------------------------------------- +-module(endpoint_bo). +-author("aresei"). +-include("iot.hrl"). + +%% API +-export([get_all_endpoints/0, get_endpoint_by_id/1]). + +-spec get_all_endpoints() -> EndpointIds :: [integer()]. +get_all_endpoints() -> + case mysql_pool:get_all(mysql_iot, <<"SELECT id FROM endpoint where status = 1">>) of + {ok, Endpoints} -> + lists:map(fun(#{<<"id">> := Id}) -> Id end, Endpoints); + {error, _} -> + [] + end. + +-spec get_endpoint_by_id(Id :: integer()) -> undefined | {ok, EndpointInfo :: map()}. +get_endpoint_by_id(Id) when is_integer(Id) -> + mysql_pool:get_row(mysql_iot, <<"SELECT * FROM endpoint WHERE id = ? and status = 1 LIMIT 1">>, [Id]). \ No newline at end of file diff --git a/apps/endpoint/src/endpoint.erl b/apps/iot/src/endpoint/endpoint.erl similarity index 98% rename from apps/endpoint/src/endpoint.erl rename to apps/iot/src/endpoint/endpoint.erl index 5e54725..b6697c5 100644 --- a/apps/endpoint/src/endpoint.erl +++ b/apps/iot/src/endpoint/endpoint.erl @@ -50,9 +50,6 @@ reload(Pid, NEndpoint = #endpoint{}) when is_pid(Pid) -> clean_up(Pid) when is_pid(Pid) -> gen_server:call(Pid, clean_up, 5000). -check_name(Name) when is_binary(Name) -> - ok. - -spec config_equals(any(), any()) -> boolean(). config_equals(#http_endpoint{url = Url}, #http_endpoint{url = Url}) -> true; diff --git a/apps/endpoint/src/endpoint_buffer.erl b/apps/iot/src/endpoint/endpoint_buffer.erl similarity index 100% rename from apps/endpoint/src/endpoint_buffer.erl rename to apps/iot/src/endpoint/endpoint_buffer.erl diff --git a/apps/endpoint/src/endpoint_http.erl b/apps/iot/src/endpoint/endpoint_http.erl similarity index 100% rename from apps/endpoint/src/endpoint_http.erl rename to apps/iot/src/endpoint/endpoint_http.erl diff --git a/apps/endpoint/src/endpoint_mnesia.erl b/apps/iot/src/endpoint/endpoint_mnesia.erl similarity index 100% rename from apps/endpoint/src/endpoint_mnesia.erl rename to apps/iot/src/endpoint/endpoint_mnesia.erl diff --git a/apps/endpoint/src/endpoint_mqtt.erl b/apps/iot/src/endpoint/endpoint_mqtt.erl similarity index 100% rename from apps/endpoint/src/endpoint_mqtt.erl rename to apps/iot/src/endpoint/endpoint_mqtt.erl diff --git a/apps/endpoint/src/endpoint_mysql.erl b/apps/iot/src/endpoint/endpoint_mysql.erl similarity index 100% rename from apps/endpoint/src/endpoint_mysql.erl rename to apps/iot/src/endpoint/endpoint_mysql.erl diff --git a/apps/endpoint/src/endpoint_timer.erl b/apps/iot/src/endpoint/endpoint_timer.erl similarity index 100% rename from apps/endpoint/src/endpoint_timer.erl rename to apps/iot/src/endpoint/endpoint_timer.erl diff --git a/apps/iot/src/iot.app.src b/apps/iot/src/iot.app.src index 1642ad7..000642f 100644 --- a/apps/iot/src/iot.app.src +++ b/apps/iot/src/iot.app.src @@ -6,6 +6,7 @@ {applications, [ sync, + emqtt, eredis, ranch, cowboy, diff --git a/apps/endpoint/src/endpoint_sup.erl b/apps/iot/src/iot_endpoint_sup.erl similarity index 98% rename from apps/endpoint/src/endpoint_sup.erl rename to apps/iot/src/iot_endpoint_sup.erl index 2bf517e..766fc54 100644 --- a/apps/endpoint/src/endpoint_sup.erl +++ b/apps/iot/src/iot_endpoint_sup.erl @@ -3,7 +3,7 @@ %% @end %%%------------------------------------------------------------------- --module(endpoint_sup). +-module(iot_endpoint_sup). -behaviour(supervisor). -include("endpoint.hrl"). diff --git a/apps/iot/src/iot_sup.erl b/apps/iot/src/iot_sup.erl index a4928a2..becf8a6 100644 --- a/apps/iot/src/iot_sup.erl +++ b/apps/iot/src/iot_sup.erl @@ -28,21 +28,14 @@ start_link() -> init([]) -> SupFlags = #{strategy => one_for_one, intensity => 1000, period => 3600}, - Endpoint = #endpoint{ - id = 1, - config = #http_endpoint{ - url = <<"http://localhost:8080">> - } - }, - Specs = [ #{ - id => endpoint, - start => {'endpoint', start_link, [Endpoint]}, + id => 'iot_endpoint_sup', + start => {'iot_endpoint_sup', start_link, []}, restart => permanent, shutdown => 2000, - type => worker, - modules => ['endpoint'] + type => supervisor, + modules => ['iot_endpoint_sup'] }, #{