Skip to content

Commit

Permalink
change git
Browse files Browse the repository at this point in the history
  • Loading branch information
lsxredrain committed Jun 17, 2021
1 parent 7202bc4 commit 3bd4d1d
Show file tree
Hide file tree
Showing 33 changed files with 47 additions and 46 deletions.
2 changes: 1 addition & 1 deletion apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-bridge-mqtt"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-bridge-mqtt"}
]}
]}.
4 changes: 2 additions & 2 deletions apps/emqx_coap/intergration_test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ case4:


$(RELX_CONF):
git clone https://hub.fastgit.org/fastdgiot/emqx-rel.git
git clone https://hub.fastgit.org/fastdgiot/emq-coap.git
git clone https://github.com.cnpmjs.org/fastdgiot/emqx-rel.git
git clone https://github.com.cnpmjs.org/fastdgiot/emq-coap.git
@echo "update emq-coap with this development code"
mv emq-coap emqx_coap
-rm -rf emqx_coap/etc
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_coap/rebar.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{deps,
[
{gen_coap, {git, "https://hub.fastgit.org/fastdgiot/gen_coap", {tag, "v0.3.2"}}}
{gen_coap, {git, "https://github.com.cnpmjs.org/fastdgiot/gen_coap", {tag, "v0.3.2"}}}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_coap/src/emqx_coap.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-coap"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-coap"}
]}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_exhook/docs/design-cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
2.`emqx-extension-hook` 重命名为 `emqx-exhook`


旧版本的设计:[emqx-extension-hook design in v4.2.0](https://hub.fastgit.org/fastdgiot/emqx-exhook/blob/v4.2.0/docs/design.md)
旧版本的设计:[emqx-extension-hook design in v4.2.0](https://github.com.cnpmjs.org/fastdgiot/emqx-exhook/blob/v4.2.0/docs/design.md)

## 设计

Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_exhook/rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
]}.

{deps,
[{grpc, {git, "https://hub.fastgit.org/fastdgiot/grpc-erl", {tag, "0.6.2"}}}
[{grpc, {git, "https://github.com.cnpmjs.org/fastdgiot/grpc-erl", {tag, "0.6.2"}}}
]}.

{grpc,
Expand Down Expand Up @@ -43,7 +43,7 @@
{profiles,
[{test,
[{deps,
[{emqx_ct_helper, {git, "https://hub.fastgit.org/fastdgiot/emqx-ct-helpers", {tag, "v1.3.1"}}}
[{emqx_ct_helper, {git, "https://github.com.cnpmjs.org/fastdgiot/emqx-ct-helpers", {tag, "v1.3.1"}}}
]}
]}
]}.
4 changes: 2 additions & 2 deletions apps/emqx_exproto/rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
]}.

{deps,
[{grpc, {git, "https://hub.fastgit.org/fastdgiot/grpc-erl", {tag, "0.6.2"}}}
[{grpc, {git, "https://github.com.cnpmjs.org/fastdgiot/grpc-erl", {tag, "0.6.2"}}}
]}.

{grpc,
Expand Down Expand Up @@ -46,7 +46,7 @@
{profiles,
[{test,
[{deps,
[{emqx_ct_helper, {git, "https://hub.fastgit.org/fastdgiot/emqx-ct-helpers", {tag, "v1.3.0"}}}
[{emqx_ct_helper, {git, "https://github.com.cnpmjs.org/fastdgiot/emqx-ct-helpers", {tag, "v1.3.0"}}}
]}
]}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_lua_hook/rebar.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{deps,
[{luerl, {git, "https://hub.fastgit.org/fastdgiot/luerl", {tag, "v0.3.1"}}}
[{luerl, {git, "https://github.com.cnpmjs.org/fastdgiot/luerl", {tag, "v0.3.1"}}}
]}.

{edoc_opts, [{preprocess, true}]}.
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_lua_hook/src/emqx_lua_hook.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-lua-hook"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-lua-hook"}
]}
]}.
4 changes: 2 additions & 2 deletions apps/emqx_lwm2m/integration_test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ case3:


$(EMQ):
git clone https://hub.fastgit.org/fastdgiot/emqx-enterprise-rel
git clone https://hub.fastgit.org/fastdgiot/emqx-lwm2m.git
git clone https://github.com.cnpmjs.org/fastdgiot/emqx-enterprise-rel
git clone https://github.com.cnpmjs.org/fastdgiot/emqx-lwm2m.git
@echo "update emqx-lwm2m with this development code"
mv emqx-lwm2m emqx_lwm2m
-rm -rf emqx_lwm2m/etc
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_lwm2m/integration_test/insert_lwm2m_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def change_makefile():
f.close()

if data.find("emqx_lwm2m") < 0:
data = data.replace("emqx_auth_pgsql emqx_auth_mongo", "emqx_auth_pgsql emqx_auth_mongo emqx_lwm2m\n\ndep_emqx_lwm2m = git https://hub.fastgit.org/fastdgiot/emqx-lwm2m\n\n")
data = data.replace("emqx_auth_pgsql emqx_auth_mongo", "emqx_auth_pgsql emqx_auth_mongo emqx_lwm2m\n\ndep_emqx_lwm2m = git https://github.com.cnpmjs.org/fastdgiot/emqx-lwm2m\n\n")
f = open("emqx-rel/Makefile", "wb")
f.write(data)
f.close()
Expand Down
8 changes: 4 additions & 4 deletions apps/emqx_lwm2m/rebar.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{deps,
[{lwm2m_coap, {git, "https://hub.fastgit.org/fastdgiot/lwm2m-coap", {tag, "v1.1.2"}}}
[{lwm2m_coap, {git, "https://github.com.cnpmjs.org/fastdgiot/lwm2m-coap", {tag, "v1.1.2"}}}
]}.

{profiles,
[{test,
[{deps, [{er_coap_client, {git, "https://hub.fastgit.org/fastdgiot/er_coap_client", {tag, "v1.0"}}},
{emqx_ct_helpers, {git, "https://hub.fastgit.org/fastdgiot/emqx-ct-helpers", {tag, "1.2.2"}}},
{emqtt, {git, "https://hub.fastgit.org/fastdgiot/emqtt", {tag, "1.2.0"}}}
[{deps, [{er_coap_client, {git, "https://github.com.cnpmjs.org/fastdgiot/er_coap_client", {tag, "v1.0"}}},
{emqx_ct_helpers, {git, "https://github.com.cnpmjs.org/fastdgiot/emqx-ct-helpers", {tag, "1.2.2"}}},
{emqtt, {git, "https://github.com.cnpmjs.org/fastdgiot/emqtt", {tag, "1.2.0"}}}
]}
]}
]}.
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_lwm2m/src/emqx_lwm2m_coap_resource.erl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

-dialyzer([{nowarn_function, [coap_discover/2]}]).
% we use {'absolute', string(), [{atom(), binary()}]} as coap_uri()
% https://hub.fastgit.org/fastdgiot/lwm2m-coap/blob/258e9bd3762124395e83c1e68a1583b84718230f/src/lwm2m_coap_resource.erl#L61
% https://github.com.cnpmjs.org/fastdgiot/lwm2m-coap/blob/258e9bd3762124395e83c1e68a1583b84718230f/src/lwm2m_coap_resource.erl#L61
% resource operations
coap_discover(_Prefix, _Args) ->
[{absolute, "mqtt", []}].
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_management/src/emqx_management.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-management"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-management"}
]}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_prometheus/rebar.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{deps,
[{prometheus, {git, "https://hub.fastgit.org/fastdgiot/prometheus.erl", {tag, "v3.1.1"}}}
[{prometheus, {git, "https://github.com.cnpmjs.org/fastdgiot/prometheus.erl", {tag, "v3.1.1"}}}
]}.

{edoc_opts, [{preprocess, true}]}.
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_prometheus/src/emqx_prometheus.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-prometheus"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-prometheus"}
]}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_psk_file/src/emqx_psk_file.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-psk-file"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-psk-file"}
]}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_recon/src/emqx_recon.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-recon"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-recon"}
]}
]}.
4 changes: 2 additions & 2 deletions apps/emqx_retainer/rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{profiles,
[{test,
[{deps,
[{emqx_ct_helpers, {git, "https://hub.fastgit.org/fastdgiot/emqx-ct-helpers", {tag, "1.2.2"}}},
{emqtt, {git, "https://hub.fastgit.org/fastdgiot/emqtt", {tag, "1.2.3"}}}]}
[{emqx_ct_helpers, {git, "https://github.com.cnpmjs.org/fastdgiot/emqx-ct-helpers", {tag, "1.2.2"}}},
{emqtt, {git, "https://github.com.cnpmjs.org/fastdgiot/emqtt", {tag, "1.2.3"}}}]}
]}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_retainer/src/emqx_retainer.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-retainer"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-retainer"}
]}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_rule_engine/src/emqx_rule_actions.erl
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ on_action_republish(Selected, _Envs = #{
'TargetQoS' := TargetQoS,
'TopicTks' := TopicTks,
'PayloadTks' := PayloadTks
}}) ->
} }) ->
?LOG(debug, "[republish] republish to: ~p, Payload: ~p",
[TargetTopic, Selected]),
increase_and_publish(ActId,
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_rule_engine/src/emqx_rule_engine.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-rule-engine"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-rule-engine"}
]}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -2117,7 +2117,7 @@ t_sqlparse_new_map(_Config) ->
}, Res00).

t_sqlparse_payload_as(_Config) ->
%% https://hub.fastgit.org/fastdgiot/emqx/issues/3866
%% https://github.com.cnpmjs.org/fastdgiot/emqx/issues/3866
Sql00 = "SELECT "
" payload, map_get('engineWorkTime', payload.params, -1) as payload.params.engineWorkTime, "
" map_get('hydOilTem', payload.params, -1) as payload.params.hydOilTem "
Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_rule_engine/test/emqx_rule_utils_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ t_preproc_sql3(_) ->

t_preproc_sql4(_) ->
%% with apostrophes
%% https://hub.fastgit.org/fastdgiot/emqx/issues/4135
%% https://github.com.cnpmjs.org/fastdgiot/emqx/issues/4135
Selected = #{a => <<"1''2">>, b => 1, c => 1.0,
d => #{d1 => <<"someone's phone">>}},
ParamsTokens = emqx_rule_utils:preproc_tmpl(<<"a:${a},b:${b},c:${c},d:${d}">>),
Expand All @@ -128,7 +128,7 @@ t_preproc_sql4(_) ->

t_preproc_sql5(_) ->
%% with apostrophes for cassandra
%% https://hub.fastgit.org/fastdgiot/emqx/issues/4148
%% https://github.com.cnpmjs.org/fastdgiot/emqx/issues/4148
Selected = #{a => <<"1''2">>, b => 1, c => 1.0,
d => #{d1 => <<"someone's phone">>}},
ParamsTokens = emqx_rule_utils:preproc_tmpl(<<"a:${a},b:${b},c:${c},d:${d}">>),
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_sasl/rebar.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{deps,
[{pbkdf2, {git, "https://hub.fastgit.org/fastdgiot/erlang-pbkdf2.git", {branch, "2.0.4"}}}
[{pbkdf2, {git, "https://github.com.cnpmjs.org/fastdgiot/erlang-pbkdf2.git", {branch, "2.0.4"}}}
]}.

{edoc_opts, [{preprocess, true}]}.
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_sasl/src/emqx_sasl.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-sasl"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-sasl"}
]}
]}.
4 changes: 2 additions & 2 deletions apps/emqx_sn/intergration_test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ case6:
client/case6_sleep.exe

$(RELX_CONF):
git clone -b master https://hub.fastgit.org/fastdgiot/emqx-rel.git
git clone https://hub.fastgit.org/fastdgiot/emqx-sn.git
git clone -b master https://github.com.cnpmjs.org/fastdgiot/emqx-rel.git
git clone https://github.com.cnpmjs.org/fastdgiot/emqx-sn.git
@echo "update emqx-sn with this development code"
mv emqx-sn emqx_sn
-rm -rf emqx_sn/etc
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_sn/intergration_test/add_emqx_sn_to_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
if data.find("emqx-sn") < 0:
f = open("emqx-rel/Makefile", "w")
data = data.replace("emqx_auth_pgsql emqx_auth_mongo", "emqx_auth_pgsql emqx_auth_mongo emqx_sn")
data = data.replace("dep_emqx_auth_mongo", "dep_emqx_sn = git https://hub.fastgit.org/fastdgiot/emqx-sn.git develop\ndep_emqx_auth_mongo")
data = data.replace("dep_emqx_auth_mongo", "dep_emqx_sn = git https://github.com.cnpmjs.org/fastdgiot/emqx-sn.git develop\ndep_emqx_auth_mongo")
f.write(data)
f.close()

Expand Down
4 changes: 2 additions & 2 deletions apps/emqx_sn/rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{plugins, [rebar3_proper]}.

{deps,
[{esockd, {git, "https://hub.fastgit.org/fastdgiot/esockd", {tag, "5.7.4"}}},
{cuttlefish, {git, "https://hub.fastgit.org/fastdgiot/cuttlefish", {tag, "v3.0.0"}}}
[{esockd, {git, "https://github.com.cnpmjs.org/fastdgiot/esockd", {tag, "5.7.4"}}},
{cuttlefish, {git, "https://github.com.cnpmjs.org/fastdgiot/cuttlefish", {tag, "v3.0.0"}}}
]}.

{edoc_opts, [{preprocess, true}]}.
Expand Down
2 changes: 1 addition & 1 deletion apps/emqx_sn/src/emqx_sn.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-sn"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-sn"}
]}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_stomp/src/emqx_stomp.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-stomp"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-stomp"}
]}
]}.
2 changes: 1 addition & 1 deletion apps/emqx_web_hook/src/emqx_web_hook.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
{licenses, ["Apache-2.0"]},
{maintainers, ["EMQ X Team <[email protected]>"]},
{links, [{"Homepage", "https://emqx.io/"},
{"Github", "https://hub.fastgit.org/fastdgiot/emqx-web-hook"}
{"Github", "https://github.com.cnpmjs.org/fastdgiot/emqx-web-hook"}
]}
]}.
7 changes: 4 additions & 3 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@

{deps,
[
{grpc_plugin, {getopt, {git, "https://github.com.cnpmjs.org/fastdgiot/getopt", {tag, "v1.0.2"}}}
, {git, "https://github.com.cnpmjs.org/fastdgiot/grpc_plugin.git", {tag, "v0.10.3"}}}
{getopt, {git, "https://github.com.cnpmjs.org/fastdgiot/getopt", {tag, "v1.0.2"}}}
, {grpc_plugin, {git, "https://github.com.cnpmjs.org/fastdgiot/grpc_plugin.git", {tag, "v0.10.3"}}}
, {getopt, {git, "https://github.com.cnpmjs.org/fastdgiot/getopt.git", {tag, "v1.0.2"}}}
, {gpb, {git, "https://github.com.cnpmjs.org/fastdgiot/gpb", {tag, "4.17.6"}}}
, {cuttlefish, {git, "https://github.com.cnpmjs.org/fastdgiot/cuttlefish", {tag, "v3.3.4"}}}
, {cowboy, {git, "https://github.com.cnpmjs.org/fastdgiot/cowboy", {tag, "2.8.3"}}}
Expand All @@ -56,7 +57,7 @@
, {ehttpc, {git, "https://github.com.cnpmjs.org/fastdgiot/ehttpc", {tag, "0.1.5"}}}
, {erlydtl, {git, "https://github.com.cnpmjs.org/fastdgiot/erlydtl.git", {tag, "0.12.1"}}}
, {erlport, {git, "https://github.com.cnpmjs.org/fastdgiot/erlport", {tag, "v1.2.2"}}}
, {websocket_client, {git, "https://github.com.cnpmjs.org/fastdgiot/websocket_client", {tag, "v0.7"}}}
, {websocket_client, {git, "https://github.com/fastdgiot/websocket_client", {tag, "v0.7"}}}
, {observer_cli, "1.6.1"} % NOTE: depends on recon 2.5.1
, {ejdbc, {git, "https://github.com.cnpmjs.org/fastdgiot/ejdbc", {tag, "1.0.1"}}}
, {snabbkaffe, {git, "https://github.com.cnpmjs.org/fastdgiot/snabbkaffe.git", {tag, "0.12.0"}}}
Expand Down

0 comments on commit 3bd4d1d

Please sign in to comment.