From 6788964624390ece94061458e3dd9382be05f6a5 Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Thu, 8 Jan 2026 15:39:35 +0800 Subject: [PATCH] fix config --- apps/aircon/src/aircon.app.src | 1 - apps/aircon/src/aircon_sup.erl | 34 +++++++++++++++++----------------- config/sys-dev.config | 6 +++--- rebar.config | 2 +- rebar.lock | 2 +- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/apps/aircon/src/aircon.app.src b/apps/aircon/src/aircon.app.src index 96e7e56..7bbef3e 100644 --- a/apps/aircon/src/aircon.app.src +++ b/apps/aircon/src/aircon.app.src @@ -8,7 +8,6 @@ sync, emqtt, jiffy, - logger, kernel, stdlib ]}, diff --git a/apps/aircon/src/aircon_sup.erl b/apps/aircon/src/aircon_sup.erl index b31e00e..7553938 100644 --- a/apps/aircon/src/aircon_sup.erl +++ b/apps/aircon/src/aircon_sup.erl @@ -36,14 +36,23 @@ init([]) -> RegisterName = read_service_name(), ChildSpecs = [ - #{ - id => 'efka_client', - start => {'efka_client', start_link, [RegisterName, Host, Port]}, - restart => permanent, - shutdown => 2000, - type => worker, - modules => ['efka_client'] - }, + %#{ + % id => 'efka_client', + % start => {'efka_client', start_link, [RegisterName, Host, Port]}, + % restart => permanent, + % shutdown => 2000, + % type => worker, + % modules => ['efka_client'] + %}, + + %#{ + % id => 'aircon_args', + % start => {'aircon_args', start_link, []}, + % restart => permanent, + % shutdown => 2000, + % type => worker, + % modules => ['aircon_args'] + %}, #{ id => aircon_logger, @@ -54,15 +63,6 @@ init([]) -> modules => ['aircon_logger'] }, - #{ - id => 'aircon_args', - start => {'aircon_args', start_link, []}, - restart => permanent, - shutdown => 2000, - type => worker, - modules => ['aircon_args'] - }, - #{ id => 'aircon_device_sup', start => {'aircon_device_sup', start_link, []}, diff --git a/config/sys-dev.config b/config/sys-dev.config index 71154ac..4d5d4d1 100644 --- a/config/sys-dev.config +++ b/config/sys-dev.config @@ -4,11 +4,11 @@ {heartbeat_ticker, 120}, {emqx_server, [ - {host, "39.98.184.67"}, + {host, "118.178.229.213"}, {port, 1883}, {tcp_opts, []}, - {username, "test"}, - {password, "test1234"}, + {username, "aircon"}, + {password, "A9K2rM8QxL7WZsP5D@B!3"}, {keepalive, 86400}, {retry_interval, 5} ]}, diff --git a/rebar.config b/rebar.config index 2237233..6e8a7e0 100644 --- a/rebar.config +++ b/rebar.config @@ -2,7 +2,7 @@ {deps, [ {sync, ".*", {git, "https://github.com/rustyio/sync.git", {branch, "master"}}}, {jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "1.1.1"}}}, - {emqtt, ".*", {git, "https://gitea.s5s8.com/anlicheng/emqtt.git", {tag, "v1.0"}}} + {emqtt, ".*", {git, "https://gitea.s5s8.com/anlicheng/emqtt.git", {tag, "v1.1"}}} ]}. {relx, [{release, {aircon, "0.1.0"}, diff --git a/rebar.lock b/rebar.lock index d8a2975..3e15659 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,7 +1,7 @@ {"1.2.0", [{<<"emqtt">>, {git,"https://gitea.s5s8.com/anlicheng/emqtt.git", - {ref,"5111914a9b1b92b0b497f825c77bdd365e3989b0"}}, + {ref,"c590588b16f887bd5e1151626090f28aae55099b"}}, 0}, {<<"fs">>,{pkg,<<"fs">>,<<"6.1.1">>},1}, {<<"jiffy">>,