gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-01 03:24:14 +08:00
Code

fix: Fixed the issue of failing to update reverse proxy files (#7910)

Browse Source
This commit is contained in:
zhengkunwang 2025-02-19 15:42:30 +08:00 committed by GitHub
parent 79ecd60ea8
commit 33e23655d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/app/service/website.go
View File

@ -1810,7 +1810,7 @@ func (w WebsiteService) UpdateProxyFile(req request.NginxProxyUpdate) (err error
if err != nil { if err != nil {
return err return err
} }
includePath := fmt.Sprintf("/www/sites/%s/proxy/%s.conf", website.Alias, req.Name) includePath := fmt.Sprintf("%s/%s.conf", GetSitePath(website, SiteProxyDir), req.Name)
absolutePath := path.Join(nginxFull.Install.GetPath(), includePath) absolutePath := path.Join(nginxFull.Install.GetPath(), includePath)
fileOp := files.NewFileOp() fileOp := files.NewFileOp()
oldRewriteContent, err = fileOp.GetContent(absolutePath) oldRewriteContent, err = fileOp.GetContent(absolutePath)

12
frontend/src/components/log-file/index.vue
View File

@ -46,6 +46,9 @@ interface LogProps {
tail?: boolean; tail?: boolean;
taskID?: string; taskID?: string;
colorMode?: string; colorMode?: string;
taskType?: string;
taskOperate?: string;
resourceID?: number;
} }
const props = defineProps({ const props = defineProps({
@ -57,6 +60,9 @@ const props = defineProps({
name: '', name: '',
tail: false, tail: false,
colorMode: 'nginx', colorMode: 'nginx',
taskType: '',
taskOperate: '',
resourceID: 0,
}), }),
}, },
defaultButton: { defaultButton: {
@ -106,6 +112,9 @@ const readReq = reactive({
pageSize: 500, pageSize: 500,
latest: false, latest: false,
taskID: '', taskID: '',
taskType: '',
taskOperate: '',
resourceID: 0,
}); });
const isLoading = ref(false); const isLoading = ref(false);
const end = ref(false); const end = ref(false);
@ -182,6 +191,9 @@ const getContent = async (pre: boolean) => {
readReq.type = props.config.type; readReq.type = props.config.type;
readReq.name = props.config.name; readReq.name = props.config.name;
readReq.taskID = props.config.taskID; readReq.taskID = props.config.taskID;
readReq.taskType = props.config.taskType;
readReq.taskOperate = props.config.taskOperate;
readReq.resourceID = props.config.resourceID;
if (readReq.page < 1) { if (readReq.page < 1) {
readReq.page = 1; readReq.page = 1;
} }

7
frontend/src/views/website/website/create/index.vue
View File

@ -554,6 +554,7 @@ import { v4 as uuidv4 } from 'uuid';
import { dateFormatSimple, getProvider, getAccountName } from '@/utils/util'; import { dateFormatSimple, getProvider, getAccountName } from '@/utils/util';
import { Website } from '@/api/interface/website'; import { Website } from '@/api/interface/website';
import DomainCreate from '@/views/website/website/domain-create/index.vue'; import DomainCreate from '@/views/website/website/domain-create/index.vue';
import { getPathByType } from '@/api/modules/files';
const websiteForm = ref<FormInstance>(); const websiteForm = ref<FormInstance>();
@ -818,12 +819,14 @@ const getRuntimes = async () => {
} catch (error) {} } catch (error) {}
}; };
const acceptParams = async (installPath: string) => { const acceptParams = async () => {
website.value = initData(); website.value = initData();
if (websiteForm.value) { if (websiteForm.value) {
websiteForm.value.resetFields(); websiteForm.value.resetFields();
} }
staticPath.value = installPath + '/www/sites/'; getPathByType('websiteDir').then((res) => {
staticPath.value = res.data + '/sites/';
});
const res = await getGroupList('website'); const res = await getGroupList('website');
groups.value = res.data; groups.value = res.data;