From 33e23655d32b63f9ced7f3c19f20c271ac1bcc01 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Wed, 19 Feb 2025 15:42:30 +0800
Subject: [PATCH] fix: Fixed the issue of failing to update reverse proxy files
 (#7910)

---
 agent/app/service/website.go                        |  2 +-
 frontend/src/components/log-file/index.vue          | 12 ++++++++++++
 frontend/src/views/website/website/create/index.vue |  7 +++++--
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/agent/app/service/website.go b/agent/app/service/website.go
index d321426fb..b65623217 100644
--- a/agent/app/service/website.go
+++ b/agent/app/service/website.go
@@ -1810,7 +1810,7 @@ func (w WebsiteService) UpdateProxyFile(req request.NginxProxyUpdate) (err error
 	if err != nil {
 		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)
 	fileOp := files.NewFileOp()
 	oldRewriteContent, err = fileOp.GetContent(absolutePath)
diff --git a/frontend/src/components/log-file/index.vue b/frontend/src/components/log-file/index.vue
index f65110d9d..3cf1d563f 100644
--- a/frontend/src/components/log-file/index.vue
+++ b/frontend/src/components/log-file/index.vue
@@ -46,6 +46,9 @@ interface LogProps {
     tail?: boolean;
     taskID?: string;
     colorMode?: string;
+    taskType?: string;
+    taskOperate?: string;
+    resourceID?: number;
 }
 
 const props = defineProps({
@@ -57,6 +60,9 @@ const props = defineProps({
             name: '',
             tail: false,
             colorMode: 'nginx',
+            taskType: '',
+            taskOperate: '',
+            resourceID: 0,
         }),
     },
     defaultButton: {
@@ -106,6 +112,9 @@ const readReq = reactive({
     pageSize: 500,
     latest: false,
     taskID: '',
+    taskType: '',
+    taskOperate: '',
+    resourceID: 0,
 });
 const isLoading = ref(false);
 const end = ref(false);
@@ -182,6 +191,9 @@ const getContent = async (pre: boolean) => {
     readReq.type = props.config.type;
     readReq.name = props.config.name;
     readReq.taskID = props.config.taskID;
+    readReq.taskType = props.config.taskType;
+    readReq.taskOperate = props.config.taskOperate;
+    readReq.resourceID = props.config.resourceID;
     if (readReq.page < 1) {
         readReq.page = 1;
     }
diff --git a/frontend/src/views/website/website/create/index.vue b/frontend/src/views/website/website/create/index.vue
index c9dbed705..a50d5c778 100644
--- a/frontend/src/views/website/website/create/index.vue
+++ b/frontend/src/views/website/website/create/index.vue
@@ -554,6 +554,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { dateFormatSimple, getProvider, getAccountName } from '@/utils/util';
 import { Website } from '@/api/interface/website';
 import DomainCreate from '@/views/website/website/domain-create/index.vue';
+import { getPathByType } from '@/api/modules/files';
 
 const websiteForm = ref<FormInstance>();
 
@@ -818,12 +819,14 @@ const getRuntimes = async () => {
     } catch (error) {}
 };
 
-const acceptParams = async (installPath: string) => {
+const acceptParams = async () => {
     website.value = initData();
     if (websiteForm.value) {
         websiteForm.value.resetFields();
     }
-    staticPath.value = installPath + '/www/sites/';
+    getPathByType('websiteDir').then((res) => {
+        staticPath.value = res.data + '/sites/';
+    });
 
     const res = await getGroupList('website');
     groups.value = res.data;