yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9704 from zmstone/0109-update-default-lic 

0109 update default lic, exclude license from config api
This commit is contained in:
zhongwencool 2023-01-09 18:50:58 +08:00 committed by GitHub
parent 3859878985 8d53d154d9
commit 63b54bbe80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_management/src/emqx_mgmt_api_configs.erl
View File

@ -62,7 +62,8 @@
<<"event_message">>, <<"event_message">>,
<<"prometheus">>, <<"prometheus">>,
<<"telemetry">>, <<"telemetry">>,
<<"listeners">> <<"listeners">>,
<<"license">>
] ++ global_zone_roots() ] ++ global_zone_roots()
). ).

6
lib-ee/emqx_license/i18n/emqx_license_schema_i18n.conf
View File

@ -3,14 +3,14 @@ emqx_license_schema {
desc { desc {
en: "Defines the EMQX Enterprise license. \n\n" en: "Defines the EMQX Enterprise license. \n\n"
"\n" "\n"
"The default license has 1000 connections limit, it is " "The default license has 100 connections limit, it is "
"issued on 2023-01-02 and valid for 5 years (1825 days).\n" "issued on 2023-01-09 and valid for 5 years (1825 days).\n"
"\n" "\n"
"EMQX comes with a default trial license. For production use, please \n" "EMQX comes with a default trial license. For production use, please \n"
"visit https://www.emqx.com/apply-licenses/emqx to apply." "visit https://www.emqx.com/apply-licenses/emqx to apply."
zh: "EMQX企业许可证。\n" zh: "EMQX企业许可证。\n"
"EMQX 自带一个默认的试用许可证，" "EMQX 自带一个默认的试用许可证，"
"默认试用许可允许最多接入 1000 个连接，签发时间是 2023年1月2日，有效期是 5 年（1825 天）。" "默认试用许可允许最多接入 100 个连接，签发时间是 2023年1月9日，有效期是 5 年（1825 天）。"
"若需要在生产环境部署，\n" "若需要在生产环境部署，\n"
"请访问 https://www.emqx.com/apply-licenses/emqx 来申请。\n" "请访问 https://www.emqx.com/apply-licenses/emqx 来申请。\n"
} }

8
lib-ee/emqx_license/src/emqx_license_schema.erl
View File

@ -78,11 +78,11 @@ check_license_watermark(Conf) ->
%% @doc The default license key. %% @doc The default license key.
%% This default license has 1000 connections limit. %% This default license has 1000 connections limit.
%% It is issued on 2023-01-02 and valid for 5 years (1825 days) %% It is issued on 2023-01-09 and valid for 5 years (1825 days)
%% NOTE: when updating a new key, the schema doc in emqx_license_schema_i18n.conf %% NOTE: when updating a new key, the schema doc in emqx_license_schema_i18n.conf
%% should be updated accordingly %% should be updated accordingly
default_license() -> default_license() ->
"MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KZ" "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KZ"
"GVmYXVsdAoyMDIzMDEwMgoxODI1CjEwMDAK.MEQCIGEuYO8KxSh5d" "GVmYXVsdAoyMDIzMDEwOQoxODI1CjEwMAo=.MEUCIG62t8W15g05f"
"1WanqHG41OOjHEVkU8ChnyoOTry2FFUAiA+vPBAH8yhcGuzMUX1ER" "1cKx3tA3YgJoR0dmyHOPCdbUxBGxgKKAiEAhHKh8dUwhU+OxNEaOn"
"kf6nY+xrVSKxnsx0GivANEXA==". "8mgRDtiT3R8RZooqy6dEsOmDI=".