This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new 4276d6d25 [Improve] docker check minor improvement
4276d6d25 is described below
commit 4276d6d2580526af14a8d50daf8330ac16c058a0
Author: benjobs <[email protected]>
AuthorDate: Fri Mar 1 17:14:26 2024 +0800
[Improve] docker check minor improvement
---
.../src/locales/lang/en/setting/system.ts | 3 +-
.../src/locales/lang/zh-CN/setting/system.ts | 1 +
.../src/views/setting/System/SettingForm.vue | 32 +++++++++++++++-------
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/system.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/system.ts
index 62edca8b0..eff1a3573 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/system.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/system.ts
@@ -34,7 +34,8 @@ export default {
},
},
update: {
- success: 'setting updated successfully',
+ success: 'Setting updated successfully',
+ dockerNotStart: 'Please make sure your Docker service has been started. 🙂',
},
docker: {
address: {
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/system.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/system.ts
index b4839b88f..9875fdbaf 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/system.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/system.ts
@@ -35,6 +35,7 @@ export default {
},
update: {
success: '设置更新成功!',
+ dockerNotStart: '依赖你本地的Docker服务,请确保本地Docker已启动. 🙂',
},
docker: {
address: {
diff --git
a/streampark-console/streampark-console-webapp/src/views/setting/System/SettingForm.vue
b/streampark-console/streampark-console-webapp/src/views/setting/System/SettingForm.vue
index 86d3bd3e8..343c27228 100644
---
a/streampark-console/streampark-console-webapp/src/views/setting/System/SettingForm.vue
+++
b/streampark-console/streampark-console-webapp/src/views/setting/System/SettingForm.vue
@@ -95,16 +95,28 @@
const formData = await validate();
if (type.value === 'docker') {
const resp = await fetchVerifyDocker(formData);
- if (resp.status === 200 || resp.status === 400) {
- await fetchDockerUpdate(formData);
- } else {
- Swal.fire({
- icon: 'error',
- title: resp.msg,
- showConfirmButton: true,
- timer: 3500,
- });
- return;
+ switch (resp.status) {
+ case 200:
+ await fetchDockerUpdate(formData);
+ break;
+ case 400:
+ Swal.fire({
+ icon: 'error',
+ title: t('setting.system.update.dockerNotStart'),
+ showConfirmButton: true,
+ timer: 3500,
+ });
+ return;
+ case 500:
+ Swal.fire({
+ icon: 'error',
+ title: resp.msg,
+ showConfirmButton: true,
+ timer: 3500,
+ });
+ return;
+ default:
+ break;
}
}
if (type.value === 'email') {