diff --git a/hippo4j-ui/src/locale/lang/en.js b/hippo4j-ui/src/locale/lang/en.js index 303bdf9a..6815cebd 100644 --- a/hippo4j-ui/src/locale/lang/en.js +++ b/hippo4j-ui/src/locale/lang/en.js @@ -16,7 +16,9 @@ export default { deleteSuccess: 'Delete Successfully', deleteMessage: 'This action will delete {name}, Do you want to continue?', selectMessage: 'Please select a {target}', - NoDeletionPermissionTip: 'Contact the administrator to delete it' + NoDeletionPermissionTip: 'Contact the administrator to delete it', + emptyWarning: "The '{name}' cannot be empty", + queryFailure: 'The query fails. Please refresh the page' }, // 公共 @@ -27,13 +29,18 @@ export default { create: 'Create', edit: 'Edit', delete: 'Delete', + detail: 'Detail', cancel: 'Cancel', confirm: 'Confirm', + reset: 'Reset', ok: 'Ok', num: 'Num', + close: 'Close', + refresh: 'Refresh', createTime: 'Create Time', updateTime: 'Update Time', hint: 'Warning', + info: 'Info' }, // 运行报表 @@ -47,6 +54,7 @@ export default { // 租户管理 tenantManage: { tenant: 'Tenant', + tenantRequired: 'Tenant(Required)', tenantName: 'Tenant Name', owner: 'Owner', tenantIntro: 'Tenant Intro' @@ -55,6 +63,7 @@ export default { // 项目管理 projectManage: { item: 'Item', + itemRequired: 'Item(Required)', itemName: 'Item Name', owner: 'Owner', itemIntro: 'Item Intro' @@ -63,6 +72,7 @@ export default { // 线程池管理 threadPool: { threadPool: 'Thread Pool', + threadPoolRequired: 'ThreadPool(Required)', coreSize: 'Core Size', maximumSize: 'Maximum Size', queueType: 'Queue Type', @@ -83,6 +93,37 @@ export default { customRejectedHandler: 'Custom Rejected Handler', customRejectedHandlerTip: 'Please enter a custom SPI Deny Policy ID', threadsNumErrorTip: 'The maximum thread must be greater than or equal to the core thread' + }, + + // 线程池实例 + threadPoolInstance: { + instanceID: 'Instance ID', + active: 'Active', + stack: 'Stack', + basicInformation: 'Basic Information', + runningState: 'Running state', + activeID: 'Active', + instanceHost: 'Instance Host', + threadPoolID: 'ThreadPool ID', + LoadInformation: 'Load Information', + CurrentLoad: 'Current Load', + PeakLoad: 'Peak Load', + RemainingMemory: 'Remaining Memory', + MemoryRatio: 'Memory Ratio', + threadInformation: 'Thread Information', + currentSize: 'Current Size', + activeSize: 'Active Size', + largestSize: 'Largest Size', + queueInformation: 'Queue Information', + queueCount: 'Queue Count', + queueRemainingCapacity: 'Queue Remaining Capacity', + queueType: 'Queue Type', + otherInformation: 'Other Information', + totalTask: 'Total Task', + totalRejection: 'Total Rejection', + lastUpdateTime: 'Last update time', + allowCoreThreadTimeOut: 'Allow Core Thread Time Out', + changeAll: 'Change All', + stackRequestFail: 'The current thread pool has no stack information' } - } diff --git a/hippo4j-ui/src/locale/lang/zh.js b/hippo4j-ui/src/locale/lang/zh.js index f64c9bc4..c7ceb010 100644 --- a/hippo4j-ui/src/locale/lang/zh.js +++ b/hippo4j-ui/src/locale/lang/zh.js @@ -16,7 +16,9 @@ export default { deleteSuccess: '删除成功', deleteMessage: '此操作将删除 {name}, 是否继续?', selectMessage: '请选择{target}', - NoDeletionPermissionTip: '请联系管理员删除' + NoDeletionPermissionTip: '请联系管理员删除', + emptyWarning: "{name}不允许为空", + queryFailure: '查询失败,请尝试刷新页面' }, // 公共 @@ -27,13 +29,18 @@ export default { create: '创建', edit: '编辑', delete: '删除', + detail: '查看', cancel: '取消', confirm: '确认', + reset: '重置', + close: '关闭', + refresh: '刷新', ok: '确定', num: '序号', createTime: '创建时间', updateTime: '修改时间', - hint: '提示' + hint: '提示', + info: '详情' }, // 运行报表 @@ -47,6 +54,7 @@ export default { // 租户管理 tenantManage: { tenant: '租户', + tenantRequired: '租户(必填)', tenantName: '租户名称', owner: '负责人', tenantIntro: '租户简介' @@ -55,6 +63,7 @@ export default { // 项目管理 projectManage: { item: '项目', + itemRequired: '项目(必填)', itemName: '项目名称', owner: '负责人', itemIntro: '项目简介' @@ -63,6 +72,7 @@ export default { // 线程池管理 threadPool: { threadPool: '线程池', + threadPoolRequired: '线程池(必填)', coreSize: '核心线程', maximumSize: '最大线程', queueType: '队列类型', @@ -83,5 +93,38 @@ export default { customRejectedHandler: '自定义拒绝策略', customRejectedHandlerTip: '请输入自定义 SPI 拒绝策略标识', threadsNumErrorTip: '最大线程必须大于等于核心线程' + }, + + + // 线程池实例 + threadPoolInstance: { + instanceID: '实例标识', + active: 'Active', + stack: '堆栈', + basicInformation: '基础信息', + runningState: '运行状态', + activeID: '环境标识', + instanceHost: '实例Host', + threadPoolID: '线程池', + LoadInformation: '负载信息', + CurrentLoad: '当前负载', + PeakLoad: '峰值负载', + RemainingMemory: '剩余内存', + MemoryRatio: '内存占比', + threadInformation: '线程信息', + currentSize: '当前线程', + activeSize: '活跃线程', + largestSize: '同存最大线程', + queueInformation: '队列信息', + queueCount: '队列元素', + queueRemainingCapacity: '队列剩余容量', + queueType: '阻塞队列', + otherInformation: '其它信息', + totalTask: '任务总量', + totalRejection: '拒绝次数', + lastUpdateTime: '最后更新时间', + allowCoreThreadTimeOut: '线程超时', + changeAll: '全部修改', + stackRequestFail: '当前线程池暂无堆栈信息' } } diff --git a/hippo4j-ui/src/views/hippo4j/instance/index.vue b/hippo4j-ui/src/views/hippo4j/instance/index.vue index d830ec52..3c750ac4 100755 --- a/hippo4j-ui/src/views/hippo4j/instance/index.vue +++ b/hippo4j-ui/src/views/hippo4j/instance/index.vue @@ -3,7 +3,7 @@
- 搜索 + {{ $t('common.query') }} - 重置 + {{ $t('common.reset') }}
@@ -73,51 +73,52 @@ border :data="list" element-loading-text="Loading" - fit + :fit="true" max-height="714" highlight-current-row + header-row-name="headerRowName" > - + - + - + - + - + - + - + - + - + - + @@ -129,7 +130,7 @@ --> --> @@ -168,111 +169,111 @@ width="1000px" >