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

Merge pull request #9658 from zmstone/0102-update-trial-license 

0102 update trial license
This commit is contained in:
Zaiming (Stone) Shi 2023-01-02 13:31:11 +01:00 committed by GitHub
parent dbc10c2eed fc6d9d0890
commit e1ae06a132
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib-ee/BSL.txt
View File

@ -2,12 +2,12 @@ Business Source License 1.1
Licensor: Hangzhou EMQ Technologies Co., Ltd. Licensor: Hangzhou EMQ Technologies Co., Ltd.
Licensed Work: EMQX Enterprise Edition Licensed Work: EMQX Enterprise Edition
The Licensed Work is (c) 2021 The Licensed Work is (c) 2023
Hangzhou EMQ Technologies Co., Ltd. Hangzhou EMQ Technologies Co., Ltd.
Additional Use Grant: Students and educators are granted right to copy, Additional Use Grant: Students and educators are granted right to copy,
modify, and create derivative work for research modify, and create derivative work for research
or education. or education.
Change Date: 2026-03-01 Change Date: 2027-02-01
Change License: Apache License, Version 2.0 Change License: Apache License, Version 2.0
For information about alternative licensing arrangements for the Software, For information about alternative licensing arrangements for the Software,

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

@ -4,13 +4,13 @@ emqx_license_schema {
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 1000 connections limit, it is "
"issued on 2022-04-19 and valid for 5 years (1825 days).\n" "issued on 2023-01-02 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 个连接，签发时间是 2022年4月19日，有效期是 5 年（1825 天）。" "默认试用许可允许最多接入 1000 个连接，签发时间是 2023年1月2日，有效期是 5 年（1825 天）。"
"若需要在生产环境部署，\n" "若需要在生产环境部署，\n"
"请访问 https://www.emqx.com/apply-licenses/emqx 来申请。\n" "请访问 https://www.emqx.com/apply-licenses/emqx 来申请。\n"
} }

2
lib-ee/emqx_license/src/emqx_license.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_license, [ {application, emqx_license, [
{description, "EMQX License"}, {description, "EMQX License"},
{vsn, "5.0.3"}, {vsn, "5.0.4"},
{modules, []}, {modules, []},
{registered, [emqx_license_sup]}, {registered, [emqx_license_sup]},
{applications, [kernel, stdlib]}, {applications, [kernel, stdlib]},

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 2022-04-19 and valid for 5 years (1825 days) %% It is issued on 2023-01-02 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"
"GVmYXVsdAoyMDIyMDQxOQoxODI1CjEwMDAK.MEQCICbgRVijCQov2" "GVmYXVsdAoyMDIzMDEwMgoxODI1CjEwMDAK.MEQCIGEuYO8KxSh5d"
"hrvZXR1mk9Oa+tyV1F5oJ6iOZeSHjnQAiB9dUiVeaZekDOjztk+NC" "1WanqHG41OOjHEVkU8ChnyoOTry2FFUAiA+vPBAH8yhcGuzMUX1ER"
"Wjhk4PG8tWfw2uFZWruSzD6g==". "kf6nY+xrVSKxnsx0GivANEXA==".