diff --git a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js index 7f9f61a672..dad3730c0f 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/en-US.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/en-US.js @@ -509,6 +509,8 @@ const message = { invalid: 'invalid', count_warning: 'The number of system users has exceeded the license limit. Please contact the staff as soon as possible.', expired: 'expired', + serial_num: 'serial number', + remark: 'remark', }, workstation: { sync: 'Synchronize', diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js index 7d7370df71..f813f39259 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-CN.js @@ -513,6 +513,8 @@ const message = { invalid: '无效', count_warning: '系统用户数已超过license限制数量,请尽快联系工作人员。', expired: '已过期', + serial_num: '序列号', + remark: '备注', }, workstation: { sync: '同步', diff --git a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js index 9dd0a0ead3..fc18c7f8cb 100644 --- a/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js +++ b/framework/sdk-parent/frontend/src/i18n/lang/zh-TW.js @@ -512,6 +512,8 @@ const message = { invalid: '無效', count_warning: '系統用戶數已超過license限制數量,請盡快聯繫工作人員。', expired: '已過期', + serial_num: '序列號', + remark: '備註', }, workstation: { sync: '同步', diff --git a/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/license/dto/LicenseInfoDTO.java b/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/license/dto/LicenseInfoDTO.java index eac3931641..2e4a61c239 100644 --- a/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/license/dto/LicenseInfoDTO.java +++ b/framework/sdk-parent/xpack-interface/src/main/java/io/metersphere/xpack/license/dto/LicenseInfoDTO.java @@ -30,4 +30,12 @@ public class LicenseInfoDTO implements Serializable { * 授权数量 */ private int count; + /** + * 序列号 + */ + private String serialNo; + /** + * 备注 + */ + private String remark; } diff --git a/system-setting/frontend/src/business/system/license/MxLicense.vue b/system-setting/frontend/src/business/system/license/MxLicense.vue index f70cda551d..18c4468963 100644 --- a/system-setting/frontend/src/business/system/license/MxLicense.vue +++ b/system-setting/frontend/src/business/system/license/MxLicense.vue @@ -37,6 +37,14 @@ {{ $t('license.count') }} {{ license.count }} + + {{ $t('license.serial_num') }} + {{ license.serialNo }} + + + {{ $t('license.remark') }} + {{ license.remark }} + {{ $t('license.status') }} @@ -108,6 +116,8 @@ export default { this.license.licenseVersion = value.license.licenseVersion; this.license.licenseCount = value.license.licenseCount; this.license.status = value.status; + this.license.serialNo = value.license.serialNo; + this.license.remark = value.license.remark; saveLicense(value.status); if (hasLicense()) { getModuleList()