+
@@ -283,19 +283,19 @@ export default {
},
fetchData() {
if (!this.listQuery.mark) {
- this.$message.warning('线程池类型不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') }));
return;
}
if (!this.listQuery.tenantId) {
- this.$message.warning('租户不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }));
return;
}
if (!this.listQuery.itemId) {
- this.$message.warning('项目不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }));
return;
}
if (!this.listQuery.threadPoolKey) {
- this.$message.warning('线程池标识不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') }));
return;
}
this.listLoading = true;
@@ -333,7 +333,7 @@ export default {
if (valid) {
if (parseInt(this.temp.maximumSize) < parseInt(this.temp.coreSize)) {
this.$message({
- message: '最大线程必须大于等于核心线程',
+ message: this.$t('threadPool.threadsNumErrorTip'),
type: 'warning',
});
return;
@@ -385,13 +385,13 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('修改线程池失败');
+ this.$message.error(this.$t('message.updateFailure'));
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -497,7 +497,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
},
diff --git a/hippo4j-ui/src/views/hippo4j/other/dubbo/index.vue b/hippo4j-ui/src/views/hippo4j/other/dubbo/index.vue
index 530275f6..ad3847f0 100755
--- a/hippo4j-ui/src/views/hippo4j/other/dubbo/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/other/dubbo/index.vue
@@ -3,7 +3,7 @@
- 搜索
+ {{ $t('common.query') }}
- 重置
+ {{ $t('common.reset') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.identify }}
-
+
{{ scope.row.active }}
-
+
{{ scope.row.threadPoolKey }}
-
+
{{ scope.row.coreSize }}
-
+
{{ scope.row.maximumSize }}
@@ -110,7 +110,7 @@
{{ scope.row.queueCapacity }}
-->
-
+
- 编辑
+ {{ $t('common.edit') }}
@@ -134,7 +134,7 @@
label-position="left"
label-width="110px"
>
-
+
-
+
-
+
@@ -283,19 +283,19 @@ export default {
},
fetchData() {
if (!this.listQuery.mark) {
- this.$message.warning('线程池类型不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') }));
return;
}
if (!this.listQuery.tenantId) {
- this.$message.warning('租户不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }));
return;
}
if (!this.listQuery.itemId) {
- this.$message.warning('项目不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }));
return;
}
if (!this.listQuery.threadPoolKey) {
- this.$message.warning('线程池标识不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') }));
return;
}
this.listLoading = true;
@@ -333,7 +333,7 @@ export default {
if (valid) {
if (parseInt(this.temp.maximumSize) < parseInt(this.temp.coreSize)) {
this.$message({
- message: '最大线程必须大于等于核心线程',
+ message: this.$t('threadPool.threadsNumErrorTip'),
type: 'warning',
});
return;
@@ -385,13 +385,13 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('修改线程池失败');
+ this.$message.error(this.$t('message.updateFailure'));
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -497,7 +497,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
},
diff --git a/hippo4j-ui/src/views/hippo4j/other/hystrix/index.vue b/hippo4j-ui/src/views/hippo4j/other/hystrix/index.vue
index 1162ed67..79dc1f2d 100755
--- a/hippo4j-ui/src/views/hippo4j/other/hystrix/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/other/hystrix/index.vue
@@ -3,7 +3,7 @@
- 搜索
+ {{ $t('common.query') }}
- 重置
+ {{ $t('common.reset') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.identify }}
-
+
{{ scope.row.active }}
-
+
{{ scope.row.threadPoolKey }}
-
+
{{ scope.row.coreSize }}
-
+
{{ scope.row.maximumSize }}
@@ -110,7 +110,7 @@
{{ scope.row.queueCapacity }}
-->
-
+
- 编辑
+ {{ $t('common.edit') }}
@@ -134,7 +134,7 @@
label-position="left"
label-width="110px"
>
-
+
-
+
-
+
@@ -283,19 +283,19 @@ export default {
},
fetchData() {
if (!this.listQuery.mark) {
- this.$message.warning('线程池类型不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') }));
return;
}
if (!this.listQuery.tenantId) {
- this.$message.warning('租户不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }));
return;
}
if (!this.listQuery.itemId) {
- this.$message.warning('项目不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }));
return;
}
if (!this.listQuery.threadPoolKey) {
- this.$message.warning('线程池标识不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') }));
return;
}
this.listLoading = true;
@@ -333,7 +333,7 @@ export default {
if (valid) {
if (parseInt(this.temp.maximumSize) < parseInt(this.temp.coreSize)) {
this.$message({
- message: '最大线程必须大于等于核心线程',
+ message: this.$t('threadPool.threadsNumErrorTip'),
type: 'warning',
});
return;
@@ -385,13 +385,13 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('修改线程池失败');
+ this.$message.error(this.$t('message.updateFailure'));
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -497,7 +497,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
},
diff --git a/hippo4j-ui/src/views/hippo4j/other/rabbitmq-stream/index.vue b/hippo4j-ui/src/views/hippo4j/other/rabbitmq-stream/index.vue
index b2c4918c..14b72fc9 100755
--- a/hippo4j-ui/src/views/hippo4j/other/rabbitmq-stream/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/other/rabbitmq-stream/index.vue
@@ -3,7 +3,7 @@
- 搜索
+ {{ $t('common.query') }}
- 重置
+ {{ $t('common.reset') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.identify }}
-
+
{{ scope.row.active }}
-
+
{{ scope.row.threadPoolKey }}
-
+
{{ scope.row.coreSize }}
-
+
{{ scope.row.maximumSize }}
@@ -110,7 +110,7 @@
{{ scope.row.queueCapacity }}
-->
-
+
- 编辑
+ {{ $t('common.edit') }}
@@ -133,7 +133,7 @@
label-position="left"
label-width="110px"
>
-
+
-
+
-
+
@@ -282,19 +282,19 @@ export default {
},
fetchData() {
if (!this.listQuery.mark) {
- this.$message.warning('线程池类型不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') }));
return;
}
if (!this.listQuery.tenantId) {
- this.$message.warning('租户不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }));
return;
}
if (!this.listQuery.itemId) {
- this.$message.warning('项目不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }));
return;
}
if (!this.listQuery.threadPoolKey) {
- this.$message.warning('线程池标识不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') }));
return;
}
this.listLoading = true;
@@ -332,7 +332,7 @@ export default {
if (valid) {
if (parseInt(this.temp.maximumSize) < parseInt(this.temp.coreSize)) {
this.$message({
- message: '最大线程必须大于等于核心线程',
+ message: this.$t('threadPool.threadsNumErrorTip'),
type: 'warning',
});
return;
@@ -384,13 +384,13 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('修改线程池失败');
+ this.$message.error(this.$t('message.updateFailure'));
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -496,7 +496,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
},
diff --git a/hippo4j-ui/src/views/hippo4j/other/rabbitmq/index.vue b/hippo4j-ui/src/views/hippo4j/other/rabbitmq/index.vue
index 9dabd398..adf993e9 100755
--- a/hippo4j-ui/src/views/hippo4j/other/rabbitmq/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/other/rabbitmq/index.vue
@@ -3,7 +3,7 @@
- 搜索
+ {{ $t('common.query') }}
- 重置
+ {{ $t('common.reset') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.identify }}
-
+
{{ scope.row.active }}
-
+
{{ scope.row.threadPoolKey }}
-
+
{{ scope.row.coreSize }}
-
+
{{ scope.row.maximumSize }}
@@ -110,7 +110,7 @@
{{ scope.row.queueCapacity }}
-->
-
+
- 编辑
+ {{ $t('common.edit') }}
@@ -134,7 +134,7 @@
label-position="left"
label-width="110px"
>
-
+
-
+
-
+
@@ -283,19 +283,19 @@ export default {
},
fetchData() {
if (!this.listQuery.mark) {
- this.$message.warning('线程池类型不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') }));
return;
}
if (!this.listQuery.tenantId) {
- this.$message.warning('租户不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }));
return;
}
if (!this.listQuery.itemId) {
- this.$message.warning('项目不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }));
return;
}
if (!this.listQuery.threadPoolKey) {
- this.$message.warning('线程池标识不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') }));
return;
}
this.listLoading = true;
@@ -333,7 +333,7 @@ export default {
if (valid) {
if (parseInt(this.temp.maximumSize) < parseInt(this.temp.coreSize)) {
this.$message({
- message: '最大线程必须大于等于核心线程',
+ message: this.$t('threadPool.threadsNumErrorTip'),
type: 'warning',
});
return;
@@ -381,13 +381,13 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('修改线程池失败');
+ this.$message.error(this.$t('message.updateFailure'));
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -493,7 +493,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
},
diff --git a/hippo4j-ui/src/views/hippo4j/other/rocketmq-stream/index.vue b/hippo4j-ui/src/views/hippo4j/other/rocketmq-stream/index.vue
index f64b9c78..5bea453b 100755
--- a/hippo4j-ui/src/views/hippo4j/other/rocketmq-stream/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/other/rocketmq-stream/index.vue
@@ -3,7 +3,7 @@
- 搜索
+ {{ $t('common.query') }}
- 重置
+ {{ $t('common.reset') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.identify }}
-
+
{{ scope.row.active }}
-
+
{{ scope.row.threadPoolKey }}
-
+
{{ scope.row.coreSize }}
-
+
{{ scope.row.maximumSize }}
@@ -110,7 +110,7 @@
{{ scope.row.queueCapacity }}
-->
-
+
- 编辑
+ {{ $t('common.edit') }}
@@ -133,7 +133,7 @@
label-position="left"
label-width="110px"
>
-
+
-
+
-
+
@@ -282,19 +282,19 @@ export default {
},
fetchData() {
if (!this.listQuery.mark) {
- this.$message.warning('线程池类型不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') }));
return;
}
if (!this.listQuery.tenantId) {
- this.$message.warning('租户不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }));
return;
}
if (!this.listQuery.itemId) {
- this.$message.warning('项目不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }));
return;
}
if (!this.listQuery.threadPoolKey) {
- this.$message.warning('线程池标识不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') }));
return;
}
this.listLoading = true;
@@ -332,7 +332,7 @@ export default {
if (valid) {
if (parseInt(this.temp.maximumSize) < parseInt(this.temp.coreSize)) {
this.$message({
- message: '最大线程必须大于等于核心线程',
+ message: this.$t('threadPool.threadsNumErrorTip'),
type: 'warning',
});
return;
@@ -384,13 +384,13 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('修改线程池失败');
+ this.$message.error(this.$t('message.updateFailure'));
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -496,7 +496,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
},
diff --git a/hippo4j-ui/src/views/hippo4j/other/rocketmq/index.vue b/hippo4j-ui/src/views/hippo4j/other/rocketmq/index.vue
index 17c4fb9a..a37fd516 100755
--- a/hippo4j-ui/src/views/hippo4j/other/rocketmq/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/other/rocketmq/index.vue
@@ -3,7 +3,7 @@
- 搜索
+ {{ $t('common.query') }}
- 重置
+ {{ $t('common.reset') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.identify }}
-
+
{{ scope.row.active }}
-
+
{{ scope.row.threadPoolKey }}
-
+
{{ scope.row.coreSize }}
-
+
{{ scope.row.maximumSize }}
@@ -110,7 +110,7 @@
{{ scope.row.queueCapacity }}
-->
-
+
- 编辑
+ {{ $t('common.edit') }}
@@ -134,7 +134,7 @@
label-position="left"
label-width="110px"
>
-
+
-
+
-
+
@@ -283,19 +283,19 @@ export default {
},
fetchData() {
if (!this.listQuery.mark) {
- this.$message.warning('线程池类型不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolType') }));
return;
}
if (!this.listQuery.tenantId) {
- this.$message.warning('租户不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }));
return;
}
if (!this.listQuery.itemId) {
- this.$message.warning('项目不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }));
return;
}
if (!this.listQuery.threadPoolKey) {
- this.$message.warning('线程池标识不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this. $t('frameworkThreadPool.threadPoolID') }));
return;
}
this.listLoading = true;
@@ -333,7 +333,7 @@ export default {
if (valid) {
if (parseInt(this.temp.maximumSize) < parseInt(this.temp.coreSize)) {
this.$message({
- message: '最大线程必须大于等于核心线程',
+ message: this.$t('threadPool.threadsNumErrorTip'),
type: 'warning',
});
return;
@@ -385,13 +385,13 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('修改线程池失败');
+ this.$message.error(this.$t('message.updateFailure'));
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -497,7 +497,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
},
diff --git a/hippo4j-ui/src/views/hippo4j/server/jetty/index.vue b/hippo4j-ui/src/views/hippo4j/server/jetty/index.vue
index 6b4c9709..487ceac0 100755
--- a/hippo4j-ui/src/views/hippo4j/server/jetty/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/server/jetty/index.vue
@@ -3,7 +3,7 @@
- 搜索
+ {{ $t('common.query') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.identify }}
-
+
{{ scope.row.active }}
-
+
{{ scope.row.coreSize }}
-
+
{{ scope.row.maximumSize }}
-
+
{{ scope.row.queueType }}
-
+
{{ scope.row.queueCapacity }}
-
+
{{ scope.row.rejectedName }}
-
+
{{ scope.row.keepAliveTime }}
- 查看
-
- 编辑
-
+ {{ $t('common.detail') }}
+ {{ $t('common.edit') }}
@@ -108,81 +106,81 @@
width="1000px"
>
-
+
- 当前负载
+ {{ $t('threadPoolInstance.CurrentLoad') }}
{{ runTimeTemp.currentLoad }}
- 峰值负载
+ {{ $t('threadPoolInstance.PeakLoad') }}
{{ runTimeTemp.peakLoad }}
- 剩余内存
+ {{ $t('threadPoolInstance.RemainingMemory') }}
{{ runTimeTemp.freeMemory }}
- 内存占比
+ {{ $t('threadPoolInstance.MemoryRatio') }}
{{ runTimeTemp.memoryProportion }}
-
+
- 核心线程
+ {{ $t('threadPool.coreSize') }}
{{ runTimeTemp.coreSize }}
- 当前线程
+ {{ $t('threadPoolInstance.currentSize') }}
{{ runTimeTemp.poolSize }}
- 最大线程
+ {{ $t('threadPool.maximumSize') }}
{{ runTimeTemp.maximumSize }}
- 活跃线程
+ {{ $t('threadPoolInstance.activeSize') }}
{{ runTimeTemp.activeSize }}
- 同存最大线程
+ {{ $t('threadPoolInstance.largestSize') }}
{{ runTimeTemp.largestPoolSize }}
-
+
- 队列容量
+ {{ $t('threadPool.queueCapacity') }}
{{ runTimeTemp.queueCapacity }}
- 队列元素
+ {{ $t('threadPoolInstance.queueCount') }}
{{ runTimeTemp.queueSize }}
- 队列剩余容量
+ {{ $t('threadPoolInstance.queueRemainingCapacity') }}
{{ runTimeTemp.queueRemainingCapacity }}
- 阻塞队列
+ {{ $t('threadPoolInstance.queueType') }}
{{ runTimeTemp.queueType }}
-
+
- 任务总量
+ {{ $t('threadPoolInstance.totalTask') }}
{{ runTimeTemp.completedTaskCount }}
- 最后更新时间
+ {{ $t('threadPoolInstance.lastUpdateTime') }}
{{ runTimeTemp.clientLastRefreshTime }}
- 拒绝策略
+ {{ $t('threadPool.rejectedHandler') }}
{{ runTimeTemp.rejectedName }}
@@ -190,11 +188,11 @@
@@ -206,7 +204,7 @@
label-position="left"
label-width="110px"
>
-
+
-
+
-
+
@@ -352,11 +350,11 @@ export default {
},
fetchData() {
if (!this.listQuery.tenantId) {
- this.$message.warning('租户不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }));
return;
}
if (!this.listQuery.itemId) {
- this.$message.warning('项目不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }));
return;
}
this.listLoading = true;
@@ -474,7 +472,7 @@ export default {
if (valid) {
if (parseInt(this.temp.maximumSize) < parseInt(this.temp.coreSize)) {
this.$message({
- message: '最大线程必须大于等于核心线程',
+ message: this.$t('threadPool.threadsNumErrorTip'),
type: 'warning',
});
return;
@@ -482,7 +480,7 @@ export default {
const clientAddressList = [];
const tempData = {
corePoolSize: this.temp.coreSize,
- itemId: this.temp.itemId,
+ temId: this.temp.itemId,
tenantId: this.temp.tenantId,
maximumPoolSize: this.temp.maximumSize,
keepAliveTime: this.temp.keepAliveTime,
@@ -520,14 +518,14 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -634,7 +632,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
},
diff --git a/hippo4j-ui/src/views/hippo4j/server/tomcat/index.vue b/hippo4j-ui/src/views/hippo4j/server/tomcat/index.vue
index d9f8c015..b62d904f 100755
--- a/hippo4j-ui/src/views/hippo4j/server/tomcat/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/server/tomcat/index.vue
@@ -3,7 +3,7 @@
- 搜索
+ {{ $t('common.query') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.identify }}
-
+
{{ scope.row.active }}
-
+
{{ scope.row.coreSize }}
-
+
{{ scope.row.maximumSize }}
-
+
{{ scope.row.queueType }}
-
+
{{ scope.row.queueCapacity }}
-
+
{{ scope.row.rejectedName }}
-
+
{{ scope.row.keepAliveTime }}
- 查看
- 编辑
+ {{ $t('common.detail') }}
+ {{ $t('common.edit') }}
@@ -106,81 +106,81 @@
width="1000px"
>
-
+
- 当前负载
+ {{ $t('threadPoolInstance.CurrentLoad') }}
{{ runTimeTemp.currentLoad }}
- 峰值负载
+ {{ $t('threadPoolInstance.PeakLoad') }}
{{ runTimeTemp.peakLoad }}
- 剩余内存
+ {{ $t('threadPoolInstance.RemainingMemory') }}
{{ runTimeTemp.freeMemory }}
- 内存占比
+ {{ $t('threadPoolInstance.MemoryRatio') }}
{{ runTimeTemp.memoryProportion }}
-
+
- 核心线程
+ {{ $t('threadPool.coreSize') }}
{{ runTimeTemp.coreSize }}
- 当前线程
+ {{ $t('threadPoolInstance.currentSize') }}
{{ runTimeTemp.poolSize }}
- 最大线程
+ {{ $t('threadPool.maximumSize') }}
{{ runTimeTemp.maximumSize }}
- 活跃线程
+ {{ $t('threadPoolInstance.activeSize') }}
{{ runTimeTemp.activeSize }}
- 同存最大线程
+ {{ $t('threadPoolInstance.largestSize') }}
{{ runTimeTemp.largestPoolSize }}
-
+
- 队列容量
+ {{ $t('threadPool.queueCapacity') }}
{{ runTimeTemp.queueCapacity }}
- 队列元素
+ {{ $t('threadPoolInstance.queueCount') }}
{{ runTimeTemp.queueSize }}
- 队列剩余容量
+ {{ $t('threadPoolInstance.queueRemainingCapacity') }}
{{ runTimeTemp.queueRemainingCapacity }}
- 阻塞队列
+ {{ $t('threadPoolInstance.queueType') }}
{{ runTimeTemp.queueType }}
-
+
- 任务总量
+ {{ $t('threadPoolInstance.totalTask') }}
{{ runTimeTemp.completedTaskCount }}
- 最后更新时间
+ {{ $t('threadPoolInstance.lastUpdateTime') }}
{{ runTimeTemp.clientLastRefreshTime }}
- 拒绝策略
+ {{ $t('threadPool.rejectedHandler') }}
{{ runTimeTemp.rejectedName }}
@@ -188,11 +188,11 @@
@@ -204,7 +204,7 @@
label-position="left"
label-width="110px"
>
-
+
-
+
-
+
-
+
@@ -272,7 +272,7 @@ export default {
UAT: 'warning',
PROD: 'danger',
};
- return statusMap[status];
+ return statusMap[status]
},
},
data() {
@@ -360,11 +360,11 @@ export default {
},
fetchData() {
if (!this.listQuery.tenantId) {
- this.$message.warning('租户不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }));
return;
}
if (!this.listQuery.itemId) {
- this.$message.warning('项目不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }));
return;
}
this.listLoading = true;
@@ -482,7 +482,7 @@ export default {
if (valid) {
if (parseInt(this.temp.maximumSize) < parseInt(this.temp.coreSize)) {
this.$message({
- message: '最大线程必须大于等于核心线程',
+ message: this.$t('threadPool.threadsNumErrorTip'),
type: 'warning',
});
return;
@@ -528,14 +528,14 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -642,7 +642,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
},
diff --git a/hippo4j-ui/src/views/hippo4j/server/undertow/index.vue b/hippo4j-ui/src/views/hippo4j/server/undertow/index.vue
index bdf42073..840af455 100755
--- a/hippo4j-ui/src/views/hippo4j/server/undertow/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/server/undertow/index.vue
@@ -3,7 +3,7 @@
- 搜索
+ {{ $t('common.query') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.identify }}
-
+
{{ scope.row.active }}
-
+
{{ scope.row.coreSize }}
-
+
{{ scope.row.maximumSize }}
-
+
{{ scope.row.queueType }}
-
+
{{ scope.row.queueCapacity }}
-
+
{{ scope.row.rejectedName }}
-
+
{{ scope.row.keepAliveTime }}
- 查看
-
- 编辑
-
+ {{ $t('common.detail') }}
+ {{ $t('common.edit') }}
@@ -108,81 +106,81 @@
width="1000px"
>
-
+
- 当前负载
+ {{ $t('threadPoolInstance.CurrentLoad') }}
{{ runTimeTemp.currentLoad }}
- 峰值负载
+ {{ $t('threadPoolInstance.PeakLoad') }}
{{ runTimeTemp.peakLoad }}
- 剩余内存
+ {{ $t('threadPoolInstance.RemainingMemory') }}
{{ runTimeTemp.freeMemory }}
- 内存占比
+ {{ $t('threadPoolInstance.MemoryRatio') }}
{{ runTimeTemp.memoryProportion }}
-
+
- 核心线程
+ {{ $t('threadPool.coreSize') }}
{{ runTimeTemp.coreSize }}
- 当前线程
+ {{ $t('threadPoolInstance.currentSize') }}
{{ runTimeTemp.poolSize }}
- 最大线程
+ {{ $t('threadPool.maximumSize') }}
{{ runTimeTemp.maximumSize }}
- 活跃线程
+ {{ $t('threadPoolInstance.activeSize') }}
{{ runTimeTemp.activeSize }}
- 同存最大线程
+ {{ $t('threadPoolInstance.largestSize') }}
{{ runTimeTemp.largestPoolSize }}
-
+
- 队列容量
+ {{ $t('threadPool.queueCapacity') }}
{{ runTimeTemp.queueCapacity }}
- 队列元素
+ {{ $t('threadPoolInstance.queueCount') }}
{{ runTimeTemp.queueSize }}
- 队列剩余容量
+ {{ $t('threadPoolInstance.queueRemainingCapacity') }}
{{ runTimeTemp.queueRemainingCapacity }}
- 阻塞队列
+ {{ $t('threadPoolInstance.queueType') }}
{{ runTimeTemp.queueType }}
-
+
- 任务总量
+ {{ $t('threadPoolInstance.totalTask') }}
{{ runTimeTemp.completedTaskCount }}
- 最后更新时间
+ {{ $t('threadPoolInstance.lastUpdateTime') }}
{{ runTimeTemp.clientLastRefreshTime }}
- 拒绝策略
+ {{ $t('threadPool.rejectedHandler') }}
{{ runTimeTemp.rejectedName }}
@@ -190,11 +188,11 @@
@@ -206,7 +204,7 @@
label-position="left"
label-width="110px"
>
-
+
-
+
-
+
-
+
@@ -362,11 +360,11 @@ export default {
},
fetchData() {
if (!this.listQuery.tenantId) {
- this.$message.warning('租户不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('tenantManage.tenant') }));
return;
}
if (!this.listQuery.itemId) {
- this.$message.warning('项目不允许为空');
+ this.$message.warning(this.$t('message.emptyWarning', { name: this.$t('projectManage.item') }));
return;
}
this.listLoading = true;
@@ -484,7 +482,7 @@ export default {
if (valid) {
if (parseInt(this.temp.maximumSize) < parseInt(this.temp.coreSize)) {
this.$message({
- message: '最大线程必须大于等于核心线程',
+ message: this.$t('threadPool.threadsNumErrorTip'),
type: 'warning',
});
return;
@@ -492,7 +490,7 @@ export default {
const clientAddressList = [];
const tempData = {
corePoolSize: this.temp.coreSize,
- temId: this.temp.itemId,
+ itemId: this.temp.itemId,
tenantId: this.temp.tenantId,
maximumPoolSize: this.temp.maximumSize,
keepAliveTime: this.temp.keepAliveTime,
@@ -530,14 +528,14 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -644,7 +642,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},
},
diff --git a/hippo4j-ui/src/views/hippo4j/threadpool/index.vue b/hippo4j-ui/src/views/hippo4j/threadpool/index.vue
index ffdd51b2..98099c81 100755
--- a/hippo4j-ui/src/views/hippo4j/threadpool/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/threadpool/index.vue
@@ -252,6 +252,8 @@
v-model="temp.executeTimeOut"
:placeholder="$t('threadPool.executionTimeoutUnit')"
controls-position="right"
+ :min="-1"
+ :max="999999"
/>
diff --git a/hippo4j-ui/src/views/hippo4j/user/index.vue b/hippo4j-ui/src/views/hippo4j/user/index.vue
index a895f205..10171a41 100755
--- a/hippo4j-ui/src/views/hippo4j/user/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/user/index.vue
@@ -3,7 +3,7 @@
@@ -14,7 +14,7 @@
icon="el-icon-search"
@click="fetchData"
>
- 搜索
+ {{ $t('common.query') }}
- 添加
+ {{ $t('common.insert') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.userName }}
-
+
{{ scope.row.role }}
-
+
{{ scope.row.gmtCreate }}
-
+
{{ scope.row.gmtModified }}
-
+
- 编辑
+ {{ $t('common.edit') }}
- 删除
+ {{ $t('common.delete') }}
@@ -85,38 +85,38 @@
label-width="100px"
style="width: 400px; margin-left: 50px"
>
-
+
-
-
+
+
-
+
-
+
{{
- tenantKey
- }}
+ tenantKey
+ }}
@@ -168,10 +168,10 @@ export default {
create: 'Create',
},
rules: {
- role: [{ required: true, message: 'role is required', trigger: 'change' }],
- userName: [{ required: true, message: 'userName is required', trigger: 'blur' }],
- tenants: [{ required: false, message: 'tenants is required', trigger: 'blur' }],
- password: [{ required: false, message: 'password is required', trigger: 'blur' }],
+ role: [{ required: true, message: this.$t('message.requiredError'), trigger: 'change' }],
+ userName: [{ required: true, message: this.$t('message.requiredError'), trigger: 'blur' }],
+ tenants: [{ required: false, message: this.$t('message.requiredError'), trigger: 'blur' }],
+ password: [{ required: false, message: this.$t('message.requiredError'), trigger: 'blur' }],
},
temp: {
id: undefined,
@@ -182,7 +182,14 @@ export default {
resources: [],
},
resetTemp() {
- this.temp = this.$options.data().temp;
+ this.temp = {
+ id: undefined,
+ role: '',
+ userName: '',
+ password: '',
+ permission: '',
+ resources: [],
+ }
},
};
},
@@ -222,8 +229,8 @@ export default {
this.fetchData();
this.dialogFormVisible = false;
this.$notify({
- title: 'Success',
- message: 'Created Successfully',
+ title: this.$t('message.success'),
+ message: this.$t('message.createdSuccess'),
type: 'success',
duration: 2000,
});
@@ -256,8 +263,8 @@ export default {
this.fetchData();
this.dialogFormVisible = false;
this.$notify({
- title: 'Success',
- message: 'Update Successfully',
+ title: this.$t('message.success'),
+ message: this.$t('message.updateSuccess'),
type: 'success',
duration: 2000,
});
@@ -266,9 +273,9 @@ export default {
});
},
openDelConfirm(name) {
- return this.$confirm(`此操作将删除 ${name}, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.deleteMessage', { name }), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -277,8 +284,8 @@ export default {
user.deleteUser(row.userName).then((response) => {
this.fetchData();
this.$notify({
- title: 'Success',
- message: 'Delete Successfully',
+ title: this.$t('message.success'),
+ message: this.$t('message.deleteSuccess'),
type: 'success',
duration: 2000,
});
diff --git a/hippo4j-ui/src/views/hippo4j/verify/index.vue b/hippo4j-ui/src/views/hippo4j/verify/index.vue
index a6b5f697..c9aa7ac1 100644
--- a/hippo4j-ui/src/views/hippo4j/verify/index.vue
+++ b/hippo4j-ui/src/views/hippo4j/verify/index.vue
@@ -3,7 +3,7 @@
- 搜索
+ {{ $t('common.query') }}
- 重置
+ {{ $t('common.reset') }}
-
+
{{ scope.$index + 1 }}
-
+
{{ scope.row.itemId }}
-
+
{{ scope.row.tpId || '-' }}
-
+
{{ scope.row.identify || '-' }}
-
- {{ scope.row.type | modifyTypeFilter }}
+
+ {{ scope.row.type | modifyTypeFilter(that) }}
-
+
{{ scope.row.modifyAll | modifyAllFilter }}
-
+
{{ scope.row.modifyUser }}
-
- {{ scope.row.verifyStatus | verifyStatusFilter }}
+
+ {{ scope.row.verifyStatus | verifyStatusFilter(that) }}
-
+
{{ scope.row.verifyUser }}
-
+
{{ scope.row.gmtCreate }}
-
+
{{ scope.row.gmtVerify }}
- 审核
+ {{$t('common.audit')}}
@@ -126,38 +126,38 @@
:model="temp"
label-width="80px"
>
-
+
{{ detailInfo.corePoolSize }}
-
+
{{ detailInfo.maximumPoolSize }}
-
+
{{ detailInfo.queueType | queueTypeFilter }}
-
+
{{ detailInfo.capacity }}
-
+
{{ detailInfo.executeTimeOut }}
-
+
{{ detailInfo.keepAliveTime }}
-
- {{ detailInfo.allowCoreThreadTimeOut | enableFilter }}
+
+ {{ detailInfo.allowCoreThreadTimeOut | enableFilter(that) }}
-
- {{ detailInfo.isAlarm | enableFilter }}
+
+ {{ detailInfo.isAlarm | enableFilter(that) }}
-
+
{{ detailInfo.livenessAlarm }}
-
+
{{ detailInfo.capacityAlarm }}
-
+
{{ detailInfo.rejectedType | rejectedTypeFilter }}
-
+
{{ detailInfo.corePoolSize }}
-
+
{{ detailInfo.maximumPoolSize }}
-
+
{{ detailInfo.keepAliveTime }}
-
+
@@ -268,26 +268,26 @@
{{ detailInfo.mark }}
-
+
{{ detailInfo.corePoolSize }}
-
+
{{ detailInfo.maximumPoolSize }}
-
+
@@ -310,6 +310,8 @@ import * as tenantApi from '@/api/hippo4j-tenant';
import * as verifyApi from '@/api/verify';
import waves from '@/directive/waves';
import Pagination from '@/components/Pagination';
+import * as threadPoolApi from '@/api/hippo4j-threadPool';
+import * as threadPoolAdapterApi from '@/api/hippo4j-adapterThreadPool';
export default {
name: 'JobProject',
@@ -329,11 +331,11 @@ export default {
}
return value;
},
- enableFilter(type) {
+ enableFilter(type, that) {
if (1 == type) {
- return '是';
+ return that.$t('common.yes');
} else if (0 == type) {
- return '否';
+ return that.$t('common.no')
}
},
alarmFilter(type) {
@@ -377,26 +379,27 @@ export default {
return 'CustomRejectedPolicy_' + type;
}
},
- modifyTypeFilter(type) {
+ modifyTypeFilter(type, that) {
+ console.log(that)
if (1 == type) {
- return '管理';
+ return that.$t('threadPoolAudit.manage')
} else if (2 == type) {
- return '实例';
+ return that.$t('threadPoolAudit.instance');
} else if (3 == type) {
- return '容器';
+ return that.$t('threadPoolAudit.container');
} else if (4 == type) {
- return '框架';
+ return that.$t('threadPoolAudit.framework');
}
},
- verifyStatusFilter(type) {
+ verifyStatusFilter(type, that) {
if (0 == type) {
- return '待审核';
+ return that.$t('threadPoolAudit.unaudited')
} else if (1 == type) {
- return '审核通过';
+ return that.$t('threadPoolAudit.auditApproved');
} else if (2 == type) {
- return '审核拒绝';
+ return that.$t('threadPoolAudit.auditRejection');
} else if (3 == type) {
- return '失效';
+ return that.$t('threadPoolAudit.expired');
}
},
modifyAllFilter(type) {
@@ -463,10 +466,10 @@ export default {
size: 500,
dialogStatus: '',
textMap: {
- 1: '线程池管理',
- 2: '线程池实例',
- 3: '容器线程池',
- 4: '框架线程池',
+ 1: this.$t('threadPoolAudit.threadPoolManage'),
+ 2: this.$t('threadPoolAudit.threadPoolInstance'),
+ 3: this.$t('threadPoolAudit.containerThreadPool'),
+ 4: this.$t('threadPoolAudit.frameworkThreadPool'),
},
temp: {
id: undefined,
@@ -478,6 +481,8 @@ export default {
maxSize: 8,
},
visible: true,
+ // filters中无法使用this来调用$t，通过参数that传入filters中
+ that: this
};
},
created() {
@@ -565,16 +570,16 @@ export default {
});
},
openAcceptConfitm() {
- return this.$confirm(`此操作将接受线程池变更申请, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.auditApprovedMessage'), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
openRejectConfirm() {
- return this.$confirm(`此操作将拒绝线程池变更申请, 是否继续?`, '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ return this.$confirm(this.$t('message.auditRejectionMessage'), this.$t('common.hint'), {
+ confirmButtonText: this.$t('common.ok'),
+ cancelButtonText: this.$t('common.cancel'),
type: 'warning',
});
},
@@ -631,7 +636,7 @@ export default {
})
.catch((error) => {
console.log(error);
- this.$message.error('查询失败，请尝试刷新页面');
+ this.$message.error(this.$t('message.queryFailure'));
});
},