mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-23 18:49:21 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 关闭代理同时更新 Docker 代理 (#7028)

Browse Source
This commit is contained in:
蘭 2024-11-13 14:50:00 +08:00 committed by GitHub
parent d06583773a
commit 7d4230ecfb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/service/docker.go
View File

@ -206,7 +206,7 @@ func (u *DockerService) UpdateConf(req dto.SettingUpdate) error {
} }
daemonMap["proxies"] = proxies daemonMap["proxies"] = proxies
} }
case "socks5-proxy": case "socks5-proxy", "close-proxy":
delete(daemonMap, "proxies") delete(daemonMap, "proxies")
if len(req.Value) > 0 { if len(req.Value) > 0 {
proxies := map[string]interface{}{ proxies := map[string]interface{}{

3
frontend/src/views/setting/panel/proxy/index.vue
View File

@ -195,6 +195,9 @@ const submitChangePassword = async (formEl: FormInstance | undefined) => {
loading.value = false; loading.value = false;
emit('search'); emit('search');
passwordVisible.value = false; passwordVisible.value = false;
if (isClose) {
await updateDaemonJson(`${form.proxyType}-proxy`, '');
}
MsgSuccess(i18n.global.t('commons.msg.operationSuccess')); MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
}) })
.catch(() => { .catch(() => {