Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/assets/img/aliyun.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/img/login-banner-enterprise.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 8 additions & 13 deletions src/components/BatchSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,6 @@
<div>{{ $t('Base.downloadTemplatePrompt') }}</div>
<ul>
<li>{{ $t('Base.batchSettingDownloadFirst') }}</li>
<i18n-t keypath="Base.moreImportInstructions" tag="li">
<template #link>
<a :href="checkDocMap[type]" target="_blank">{{ $t('Base.helpDocs') }}</a>
</template>
</i18n-t>
</ul>
</template>
<template #description>
Expand Down Expand Up @@ -79,14 +74,14 @@ const UploadRef = ref<typeof ElUpload | null>(null)
const dialogVisible = ref(false)
const fileList = ref<any[]>([])
const importLoading = ref(false)
const { docMap } = useDocLink()
// const { docMap } = useDocLink()

const checkDocMap = {
[BatchSettingDatabaseType.InfluxDB]: docMap.influxDbBatchSettings,
[BatchSettingDatabaseType.TDengine]: docMap.tdengineBatchSettings,
[BatchSettingDatabaseType.IoTDB]: docMap.iotDbBatchSettings,
[BatchSettingDatabaseType.Datalayers]: docMap.datalayersBatchSettings,
}
// const checkDocMap = {
// [BatchSettingDatabaseType.InfluxDB]: docMap.influxDbBatchSettings,
// [BatchSettingDatabaseType.TDengine]: docMap.tdengineBatchSettings,
// [BatchSettingDatabaseType.IoTDB]: docMap.iotDbBatchSettings,
// [BatchSettingDatabaseType.Datalayers]: docMap.datalayersBatchSettings,
// }

const dbNameMap = {
[BatchSettingDatabaseType.InfluxDB]: 'InfluxDB',
Expand All @@ -106,7 +101,7 @@ const {

function downloadTemplate() {
const template = templateContentMap[props.type]
handleDownloadTemp(template, `EMQX_${dbNameMap[props.type]}_Template.csv`)
handleDownloadTemp(template, `ApsaraEMQX_${dbNameMap[props.type]}_Template.csv`)
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/useEditionConfigs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function useEditionConfigs(): {
const edition = computed(() =>
IS_ENTERPRISE ? editionConfigs.enterprise : editionConfigs.openSource,
)
const loginTitle = computed(() => `${t('Base.login')} - EMQX ${t(edition.value.title)}`)
const loginTitle = computed(() => `${t('Base.login')} - ApsaraEMQX`)
const loginBgBanner = computed(() => edition.value.banner)
const appLogo = computed(() => edition.value.logo)

Expand Down
22 changes: 11 additions & 11 deletions src/i18n/Auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ export default {
en: 'Enable External Resource Cache',
},
enableNodeCacheDesc: {
zh: '启用外部资源缓存后,EMQX 将缓存外部资源(如 MySQL、MongoDB 等)的查询结果,以提高效率;对于本地数据源,如内置数据库或文件等不进行缓存。',
en: 'After enabling external resource cache, EMQX will cache the query results of external resources (such as MySQL, MongoDB, etc.), to improve efficiency; for local data sources, such as built-in databases or file, are not cached.',
zh: '启用外部资源缓存后,ApsaraEMQX 将缓存外部资源(如 MySQL、MongoDB 等)的查询结果,以提高效率;对于本地数据源,如内置数据库或文件等不进行缓存。',
en: 'After enabling external resource cache, ApsaraEMQX will cache the query results of external resources (such as MySQL, MongoDB, etc.), to improve efficiency; for local data sources, such as built-in databases or file, are not cached.',
},
nodeCacheMaxCount: {
zh: '缓存最大数量',
Expand Down Expand Up @@ -413,7 +413,7 @@ export default {
},
delAuthnConfirm: {
zh: '删除该认证器后,可能导致非法客户端连接至当前服务器,{additionalTip}是否确认删除?',
en: 'Deleting this authenticator may result in unauthorized clients connecting to the EMQX server, {additionalTip}continue? ',
en: 'Deleting this authenticator may result in unauthorized clients connecting to the ApsaraEMQX server, {additionalTip}continue? ',
},
delAuthzConfirm: {
zh: '删除该授权后,可能影响客户端发布和订阅操作的权限控制,{additionalTip}是否确认删除?',
Expand Down Expand Up @@ -528,16 +528,16 @@ export default {
en: 'Local Password Comparison',
},
methodHashDesc: {
zh: 'EMQX 查询 LDAP 以获取客户端的密码,然后在本地进行比对。',
en: "EMQX queries LDAP to retrieve the client's password and then compares it locally.",
zh: 'ApsaraEMQX 查询 LDAP 以获取客户端的密码,然后在本地进行比对。',
en: "ApsaraEMQX queries LDAP to retrieve the client's password and then compares it locally.",
},
methodBindLabel: {
zh: 'LDAP绑定验证',
en: 'LDAP Bind Authentication',
},
methodBindDesc: {
zh: 'EMQX 直接使用 LDAP 绑定验证用户名和密码。',
en: 'EMQX directly uses LDAP binding to authenticate the username and password.',
zh: 'ApsaraEMQX 直接使用 LDAP 绑定验证用户名和密码。',
en: 'ApsaraEMQX directly uses LDAP binding to authenticate the username and password.',
},
authnTotalDesc: {
zh: '认证器被触发执行的总次数',
Expand Down Expand Up @@ -726,8 +726,8 @@ export default {
en: 'Principal',
},
principalDesc: {
zh: "服务器的 Kerberos 主体。例如 `mqtt/cluster1.my.net{'@'}MY.REALM.COM`。\n注意:使用的 realm 必须在 EMQX 节点的 `/etc/krb5.conf` 中配置。\n注意:主体必须存在于默认的 keytab 文件中。系统默认的 keytab 文件通常是 `/etc/krb5.keytab`,也可以通过环境变量 `KRB5_KTNAME` 或 `/etc/krb5.conf` 中的 `default_keytab_name` 设置。",
en: "Kerberos principal for server. For example, `mqtt/cluster1.my.net{'@'}MY.REALM.COM`.\nNOTE: The realm in use has to be configured in `/etc/krb5.conf` in EMQX nodes.\nNOTE: The principal must be found in the default keytab file. System default keytab file is usually `/etc/krb5.keytab`, or can be set with environment variable `KRB5_KTNAME` or `default_keytab_name` in `/etc/krb5.conf`.",
zh: "服务器的 Kerberos 主体。例如 `mqtt/cluster1.my.net{'@'}MY.REALM.COM`。\n注意:使用的 realm 必须在 ApsaraEMQX 节点的 `/etc/krb5.conf` 中配置。\n注意:主体必须存在于默认的 keytab 文件中。系统默认的 keytab 文件通常是 `/etc/krb5.keytab`,也可以通过环境变量 `KRB5_KTNAME` 或 `/etc/krb5.conf` 中的 `default_keytab_name` 设置。",
en: "Kerberos principal for server. For example, `mqtt/cluster1.my.net{'@'}MY.REALM.COM`.\nNOTE: The realm in use has to be configured in `/etc/krb5.conf` in ApsaraEMQX nodes.\nNOTE: The principal must be found in the default keytab file. System default keytab file is usually `/etc/krb5.keytab`, or can be set with environment variable `KRB5_KTNAME` or `default_keytab_name` in `/etc/krb5.conf`.",
},
cinfoAuthDesc: {
zh: '使用 Client Information 进行认证',
Expand Down Expand Up @@ -807,7 +807,7 @@ For more functions and advanced usage, please refer to the full documentation.`,
- 仅当密码存在且区域为 \`zone1\` 时调用:
\`iif(is_empty_val(password), false, str_eq(zone, 'zone1'))\`

更多关于 Variform 表达式的信息,请参阅 EMQX 文档。
更多关于 Variform 表达式的信息,请参阅 ApsaraEMQX 文档。
`,
en: `A Variform expression to evaluate with a set of pre-bound variables derived from the client information.<br />
**The expression must evaluate to a string value of 'true' for this authenticator to be invoked.**<br />
Expand All @@ -832,6 +832,6 @@ Examples:
- Only invoke if password exists and zone is 'zone1':
\`iif(is_empty_val(password), false, str_eq(zone, 'zone1'))\`

Find more information about Variform expressions in EMQX doc.`,
Find more information about Variform expressions in ApsaraEMQX doc.`,
},
}
18 changes: 9 additions & 9 deletions src/i18n/BasicConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ export default {
},
readOnlyTip: {
zh: '此配置项不支持热配置,请到配置文件内修改并重启服务',
en: 'This configuration does not support online-reload. Please update the config file and restart EMQX.',
en: 'This configuration does not support online-reload. Please update the config file and restart ApsaraEMQX.',
},
telemetry: {
zh: '遥测数据',
en: 'Telemetry',
},
telemetryTip: {
zh: '遥测收集有关 EMQX 使用情况的信息,与我们共享这些指标可以帮助我们更好地了解您如何使用我们的产品,并可以持续地帮助我们改进产品',
en: 'Telemetry collects information about EMQX usage. Sharing these metrics helps us to better understand how EMQX is used, so we can continuously improve it.',
zh: '遥测收集有关 ApsaraEMQX 使用情况的信息,与我们共享这些指标可以帮助我们更好地了解您如何使用我们的产品,并可以持续地帮助我们改进产品',
en: 'Telemetry collects information about ApsaraEMQX usage. Sharing these metrics helps us to better understand how ApsaraEMQX is used, so we can continuously improve it.',
},
enableTelemetry: {
zh: '启动遥测',
Expand Down Expand Up @@ -169,16 +169,16 @@ export default {
en: 'Linked (remote) cluster name. Must be exactly equal to the value of `cluster.name` configured at the remote cluster. Must **not** be equal to the local `cluster.name`. All configured cluster link names must be unique.',
},
serverAddressDesc: {
zh: '远程 EMQX 服务的 MQTT 主机和端口。',
en: 'MQTT host and port of the remote EMQX broker.',
zh: '远程 ApsaraEMQX 服务的 MQTT 主机和端口。',
en: 'MQTT host and port of the remote ApsaraEMQX broker.',
},
clientIdPrefix: {
zh: '客户端 ID 前缀',
en: 'Client ID Prefix',
},
clientIdPrefixDesc: {
zh: '如果省略,则默认使用本地的 `cluster.name`。EMQX 会在连接集群时维护多个连接,并自动在基础客户端 ID 后添加不同的后缀。',
en: 'If omitted, local `cluster.name` is used. EMQX maintains several connections between linked clusters, so distinct suffixes are automatically appended to the base client ID.',
zh: '如果省略,则默认使用本地的 `cluster.name`。ApsaraEMQX 会在连接集群时维护多个连接,并自动在基础客户端 ID 后添加不同的后缀。',
en: 'If omitted, local `cluster.name` is used. ApsaraEMQX maintains several connections between linked clusters, so distinct suffixes are automatically appended to the base client ID.',
},
disabledDeleteTopicTopic: {
zh: '请先禁用再删除主题',
Expand All @@ -193,8 +193,8 @@ export default {
en: 'Execution status and efficiency of message forwarding on each node',
},
linkingTopicsDesc: {
zh: '由连接的远程 EMQX 服务转发至本地代理的 MQTT 主题。仅当本地 EMQX 服务有匹配的订阅者时,消息才会被转发。<br />支持通配符。如果在连接的一侧设置空主题列表,可实现单向连接:空主题列表的一侧不会接收远程消息,但可以根据另一侧配置的主题,将相关消息转发给其连接方。',
en: "MQTT topics to be forwarded by the linked remote EMQX broker to the local broker. Messages are only forwarded if the local EMQX broker has matching subscriber(s).<br />Wildcards are supported. Setting empty topics list on one side of the link can be used to establish unidirectional links: the side with the empty topics won't receive remote messages, but it can forward relevant messages to its linked counterpart (according to the topics configured on that side of the link).",
zh: '由连接的远程 ApsaraEMQX 服务转发至本地代理的 MQTT 主题。仅当本地 ApsaraEMQX 服务有匹配的订阅者时,消息才会被转发。<br />支持通配符。如果在连接的一侧设置空主题列表,可实现单向连接:空主题列表的一侧不会接收远程消息,但可以根据另一侧配置的主题,将相关消息转发给其连接方。',
en: "MQTT topics to be forwarded by the linked remote ApsaraEMQX broker to the local broker. Messages are only forwarded if the local ApsaraEMQX broker has matching subscriber(s).<br />Wildcards are supported. Setting empty topics list on one side of the link can be used to establish unidirectional links: the side with the empty topics won't receive remote messages, but it can forward relevant messages to its linked counterpart (according to the topics configured on that side of the link).",
},
routes: {
zh: '路由',
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/Clients.ts
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,8 @@ export default {
en: 'Message queue used to store messages that cannot be sent due to the limit of inflight window, and to temporarily store messages when a client is offline. The message queue has a length limit, and if it is reached, the oldest messages will be dropped.',
},
inflightDesc: {
zh: 'EMQX 允许多个未确认的 QoS 1 和 QoS 2 报文同时存在于网路链路上。这些已发送但未确认的报文将被存放在 Inflight Window 中直至完成确认。',
en: 'EMQX allows multiple unacknowledged QoS 1 and QoS 2 packets to exist on the network link at the same time. These sent but unconfirmed packets will be stored in the Inflight Window until acknowledgment is complete.',
zh: 'ApsaraEMQX 允许多个未确认的 QoS 1 和 QoS 2 报文同时存在于网路链路上。这些已发送但未确认的报文将被存放在 Inflight Window 中直至完成确认。',
en: 'ApsaraEMQX allows multiple unacknowledged QoS 1 and QoS 2 packets to exist on the network link at the same time. These sent but unconfirmed packets will be stored in the Inflight Window until acknowledgment is complete.',
},
cannotViewMsg: {
zh: '当开启持久会话时,将无法查看消息列表',
Expand Down
Loading