diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index 7bb7d102..befde2df 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -89,7 +89,7 @@ const config = { navbar: { title: '', logo: { - alt: 'HIPPO-4J 动态可观测线程池框架', + alt: 'Hippo4j 动态可观测线程池框架', src: 'img/hippo4j.png', }, items: [ @@ -184,7 +184,7 @@ const config = { items: [ { label: 'Gitee', - href: 'https://gitee.com/magestack/hippo4j', + href: 'https://gitee.com/opengoofy/hippo4j', }, { label: 'GitHub', @@ -206,7 +206,7 @@ const config = { ], }, ], - copyright: `Copyright © 2021-2022 小马哥版权所有 京ICP备2021038095号-2 + copyright: `Copyright © 2021-2022 马丁版权所有 京ICP备2021038095号 `, }, prism: { diff --git a/hippo4j-ui/src/layout/components/Sidebar/Logo.vue b/hippo4j-ui/src/layout/components/Sidebar/Logo.vue index 667ca0d6..a7cfbfcb 100755 --- a/hippo4j-ui/src/layout/components/Sidebar/Logo.vue +++ b/hippo4j-ui/src/layout/components/Sidebar/Logo.vue @@ -24,7 +24,7 @@ export default { }, data() { return { - title: 'hippo4j 1.5.0', + title: 'Hippo4j 1.5.0', logo: '', }; }, diff --git a/hippo4j-ui/src/locale/lang/en.js b/hippo4j-ui/src/locale/lang/en.js index 88ba730f..f1903ff8 100644 --- a/hippo4j-ui/src/locale/lang/en.js +++ b/hippo4j-ui/src/locale/lang/en.js @@ -19,9 +19,11 @@ export default { NoDeletionPermissionTip: 'Contact the administrator to delete it', emptyWarning: "The '{name}' cannot be empty", queryFailure: 'The query fails. Please refresh the page', - updateFailure:'Failed to modify thread pool', - auditApprovedMessage: 'This operation will accept thread pool change requests. Do you want to continue?', - auditRejectionMessage: 'This operation will reject the thread pool change request. Do you want to continue?', + updateFailure: 'Failed to modify thread-pool', + auditApprovedMessage: + 'This operation will accept thread-pool change requests. Do you want to continue?', + auditRejectionMessage: + 'This operation will reject the thread-pool change request. Do you want to continue?', inputMessage: 'Please input {target}', }, @@ -48,7 +50,7 @@ export default { stack: 'Stack', audit: 'audit', yes: 'Yes', - no: 'No' + no: 'No', }, // 运行报表 @@ -56,7 +58,10 @@ export default { poolInstance: 'Pool Instance', user: 'User', role: 'Role', - tenants: 'Tenants' + tenants: 'Tenants', + threadPoolId: 'ThreadPool ID', + taskCount: 'Task Count', + inst: 'Instance', }, // 租户管理 @@ -65,7 +70,7 @@ export default { tenantRequired: 'Tenant(Required)', tenantName: 'Tenant Name', owner: 'Owner', - tenantIntro: 'Tenant Intro' + tenantIntro: 'Tenant Intro', }, // 项目管理 @@ -74,12 +79,12 @@ export default { itemRequired: 'Item(Required)', itemName: 'Item Name', owner: 'Owner', - itemIntro: 'Item Intro' + itemIntro: 'Item Intro', }, // 线程池管理 threadPool: { - threadPool: 'Thread Pool', + threadPool: 'ThreadPool', threadPoolRequired: 'ThreadPool(Required)', coreSize: 'Core Size', maximumSize: 'Maximum Size', @@ -100,7 +105,7 @@ export default { capacityAlarm: 'Capacity Alarm', 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' + threadsNumErrorTip: 'The maximum thread must be greater than or equal to the core thread', }, // 线程池实例 @@ -132,25 +137,25 @@ export default { lastUpdateTime: 'Last update time', allowCoreThreadTimeOut: 'Allow Core Thread Time Out', changeAll: 'Change All', - stackRequestFail: 'The current thread pool has no stack information' + stackRequestFail: 'The current thread-pool has no stack information', }, //线程池监控 threadPoolMonitor: { ipPort: 'IP : Port', ipPortRequired: 'IP : Port(Required)', - noResultsYet: 'No results yet' + noResultsYet: 'No results yet', }, //框架线程池 - frameworkThreadPool : { + frameworkThreadPool: { threadPoolIDRequired: 'ThreadPool ID(Required)', threadPoolID: 'ThreadPool ID', - threadPoolType: 'ThreadPool Type' + threadPoolType: 'ThreadPool Type', }, //线程池审核 - threadPoolAudit: { + threadPoolAudit: { changeType: 'Change Type', modifiedBy: 'Modified by', auditStatus: 'Audit Status', @@ -181,17 +186,18 @@ export default { enabling: 'Enabling', disabling: 'Disabling', token: 'Token', - receiverTip: 'Use English commas for multiple recipients and separate them (be careful not to have spaces)\n' + + receiverTip: + 'Use English commas for multiple recipients and separate them (be careful not to have spaces)\n' + '-Ding: Fill in the phone number\n' + - '-WeChat: Fill in \'userid\' and it will be sent to the user as a @ message, otherwise fill in the name, such as: XiaomaGe\n' + - '-Lark: Fill in with \'ou_\' the unique user ID at the beginning will be sent to the user as a @ message, and filling in the phone number is normal@' + "-WeChat: Fill in 'userid' and it will be sent to the user as a @ message, otherwise fill in the name, such as: XiaomaGe\n" + + "-Lark: Fill in with 'ou_' the unique user ID at the beginning will be sent to the user as a @ message, and filling in the phone number is normal@", }, //用户权限 userAuthority: { userName: 'User Name', role: 'Role', - password: 'Password' + password: 'Password', }, //日志管理 @@ -212,9 +218,9 @@ export default { threadPoolInstance: 'ThreadPool Instance', threadPoolMonitor: 'ThreadPool Monitor', containerThreadPool: 'Container ThreadPool', - tomcat: 'Tomcat', - undertow: 'Undertow', - jetty : 'Jetty', + tomcat: 'Tomcat', + undertow: 'Undertow', + jetty: 'Jetty', frameworkThreadPool: 'Framework ThreadPool', dubbo: 'Dubbo', hystrix: 'Hystrix', @@ -228,5 +234,5 @@ export default { userAuthority: 'User Authority', logManage: 'Log Manage', officialWebsite: 'Official Website', - } -} + }, +}; diff --git a/hippo4j-ui/src/locale/lang/zh.js b/hippo4j-ui/src/locale/lang/zh.js index ae064439..c1e419b9 100644 --- a/hippo4j-ui/src/locale/lang/zh.js +++ b/hippo4j-ui/src/locale/lang/zh.js @@ -17,9 +17,9 @@ export default { deleteMessage: '此操作将删除 {name}, 是否继续?', selectMessage: '请选择{target}', NoDeletionPermissionTip: '请联系管理员删除', - emptyWarning: "{name}不允许为空", + emptyWarning: '{name}不允许为空', queryFailure: '查询失败，请尝试刷新页面', - updateFailure:'修改线程池失败', + updateFailure: '修改线程池失败', auditApprovedMessage: '此操作将接受线程池变更申请, 是否继续?', auditRejectionMessage: '此操作将拒绝线程池变更申请, 是否继续?', inputMessage: '请输入{target}', @@ -48,7 +48,7 @@ export default { stack: '堆栈', audit: '审核', yes: '是', - no: '否' + no: '否', }, // 运行报表 @@ -56,7 +56,10 @@ export default { poolInstance: '线程池实例', user: '登录用户', role: '用户角色', - tenants: '所属租户' + tenants: '所属租户', + threadPoolId: '线程池', + taskCount: '任务数', + inst: '实例数', }, // 租户管理 @@ -65,7 +68,7 @@ export default { tenantRequired: '租户（必填）', tenantName: '租户名称', owner: '负责人', - tenantIntro: '租户简介' + tenantIntro: '租户简介', }, // 项目管理 @@ -74,7 +77,7 @@ export default { itemRequired: '项目（必填）', itemName: '项目名称', owner: '负责人', - itemIntro: '项目简介' + itemIntro: '项目简介', }, // 线程池管理 @@ -100,7 +103,7 @@ export default { capacityAlarm: '容量报警', customRejectedHandler: '自定义拒绝策略', customRejectedHandlerTip: '请输入自定义 SPI 拒绝策略标识', - threadsNumErrorTip: '最大线程必须大于等于核心线程' + threadsNumErrorTip: '最大线程必须大于等于核心线程', }, // 线程池实例 @@ -132,25 +135,25 @@ export default { lastUpdateTime: '最后更新时间', allowCoreThreadTimeOut: '线程超时', changeAll: '全部修改', - stackRequestFail: '当前线程池暂无堆栈信息' + stackRequestFail: '当前线程池暂无堆栈信息', }, //线程池监控 threadPoolMonitor: { ipPort: 'IP : Port', ipPortRequired: 'IP : Port（必填）', - noResultsYet: '暂无结果' + noResultsYet: '暂无结果', }, //框架线程池 frameworkThreadPool: { threadPoolIDRequired: '线程池标识（必填）', threadPoolID: '线程池标识', - threadPoolType: '线程池类型' + threadPoolType: '线程池类型', }, //线程池审核 - threadPoolAudit: { + threadPoolAudit: { changeType: '变更类型', modifiedBy: '修改人', auditStatus: '审核状态', @@ -181,17 +184,18 @@ export default { enabling: '启用', disabling: '禁用', token: 'Token', - receiverTip: '多个接收者使用英文逗号 , 分割 (注意不要有空格)\n' + + receiverTip: + '多个接收者使用英文逗号 , 分割 (注意不要有空格)\n' + '- 钉钉：填写手机号\n' + '- 企微：填写user_id会以@的消息发给用户，否则填写姓名，如：小马哥\n' + - '- 飞书：填写ou_开头用户唯一标识会以@的消息发给用户，填写手机号则是普通的@"' + '- 飞书：填写ou_开头用户唯一标识会以@的消息发给用户，填写手机号则是普通的@', }, //用户权限 userAuthority: { userName: '用户名', role: '角色', - password: '密码' + password: '密码', }, //日志管理 @@ -212,9 +216,9 @@ export default { threadPoolInstance: '线程池实例', threadPoolMonitor: '线程池监控', containerThreadPool: '容器线程池', - tomcat: 'Tomcat', - undertow: 'Undertow', - jetty : 'Jetty', + tomcat: 'Tomcat', + undertow: 'Undertow', + jetty: 'Jetty', frameworkThreadPool: '框架线程池', dubbo: 'Dubbo', hystrix: 'Hystrix', @@ -228,5 +232,5 @@ export default { userAuthority: '用户权限', logManage: '日志管理', officialWebsite: '官网外链', - } -} + }, +}; diff --git a/hippo4j-ui/src/views/dashboard/admin/components/TransactionTable.vue b/hippo4j-ui/src/views/dashboard/admin/components/TransactionTable.vue index 0e9b7b94..a625f534 100755 --- a/hippo4j-ui/src/views/dashboard/admin/components/TransactionTable.vue +++ b/hippo4j-ui/src/views/dashboard/admin/components/TransactionTable.vue @@ -1,17 +1,17 @@