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

feat: 优化网站反向代理地址填写 (#1885)

Browse Source
This commit is contained in:
zhengkunwang 2023-08-09 11:40:12 +08:00 committed by GitHub
parent 7e5cdbf953
commit fe705a25ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/app/service/host_tool.go
View File

@ -110,12 +110,13 @@ func (h *HostToolService) GetToolStatus(req request.HostToolReq) (*response.Host
supervisorConfig.ConfigPath = args[cIndex+1]
}
}
} else {
}
if supervisorConfig.ConfigPath == "" {
configPath := "/etc/supervisord.conf"
if !fileOp.Stat(configPath) {
configPath = "/etc/supervisor/supervisord.conf"
if !fileOp.Stat(configPath) {
return nil, buserr.New("ErrConfigNotFound")
if fileOp.Stat(configPath) {
supervisorConfig.ConfigPath = configPath
}
}
}

2
frontend/src/api/interface/website.ts
View File

@ -343,6 +343,8 @@ export namespace Website {
filePath?: string;
replaces?: ProxReplace;
content?: string;
proxyAddress?: string;
proxyProtocol?: string;
}
export interface ProxReplace {

37
frontend/src/views/website/website/config/basic/proxy/create/index.vue
View File

@ -38,7 +38,15 @@
<el-row :gutter="10">
<el-col :span="12">
<el-form-item :label="$t('website.proxyPass')" prop="proxyPass">
<el-input v-model.trim="proxy.proxyPass"></el-input>
<el-input v-model.trim="proxy.proxyAddress" :placeholder="$t('website.proxyHelper')">
<template #prepend>
<el-select v-model="proxy.proxyProtocol" class="pre-select">
<el-option label="http" value="http://" />
<el-option label="https" value="https://" />
<el-option :label="$t('website.other')" value="" />
</el-select>
</template>
</el-input>
<div>
<span class="input-help">{{ $t('website.proxyPassHelper') }}</span>
</div>
@ -131,10 +139,12 @@ const initData = (): Website.ProxyConfig => ({
name: '',
modifier: '^~',
match: '/',
proxyPass: 'http://',
proxyPass: 'http://127.0.0.1:8080',
proxyHost: '$host',
filePath: '',
replaces: {},
proxyAddress: '',
proxyProtocol: 'http://',
});
let proxy = ref(initData());
const replaces = ref<any>([]);
@ -148,6 +158,15 @@ const handleClose = () => {
const acceptParams = (proxyParam: Website.ProxyConfig) => {
replaces.value = [];
proxy.value = proxyParam;
const res = getProtocolAndHost(proxyParam.proxyPass);
if (res != null) {
proxy.value.proxyProtocol = res.protocol;
proxy.value.proxyAddress = res.host;
} else {
proxy.value.proxyProtocol = 'http://';
}
open.value = true;
if (proxy.value.replaces) {
for (const key in proxy.value.replaces) {
@ -198,6 +217,7 @@ const submit = async (formEl: FormInstance | undefined) => {
}
}
loading.value = true;
proxy.value.proxyPass = proxy.value.proxyProtocol + proxy.value.proxyAddress;
OperateProxyConfig(proxy.value)
.then(() => {
if (proxy.value.operate == 'create') {
@ -213,6 +233,19 @@ const submit = async (formEl: FormInstance | undefined) => {
});
};
const getProtocolAndHost = (url: string): { protocol: string; host: string } | null => {
const regex = /^(https?:\/\/)([^\/]+)/;
const match = url.match(regex);
if (match) {
return {
protocol: match[1],
host: match[2],
};
}
console.log('err');
return null;
};
defineExpose({
acceptParams,
});