Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Feb 19, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion agent/app/service/website.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The given code does not contain any obvious irregularities, potential issues, or optimization suggestions.

Expand Down
12 changes: 12 additions & 0 deletions frontend/src/components/log-file/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ interface LogProps {
tail?: boolean;
taskID?: string;
colorMode?: string;
taskType?: string;
taskOperate?: string;
resourceID?: number;
}

const props = defineProps({
Expand All @@ -57,6 +60,9 @@ const props = defineProps({
name: '',
tail: false,
colorMode: 'nginx',
taskType: '',
taskOperate: '',
resourceID: 0,
}),
},
defaultButton: {
Expand Down Expand Up @@ -106,6 +112,9 @@ const readReq = reactive({
pageSize: 500,
latest: false,
taskID: '',
taskType: '',
taskOperate: '',
resourceID: 0,
});
const isLoading = ref(false);
const end = ref(false);
Expand Down Expand Up @@ -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;
}
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cannot perform this task as the provided code snippet is not included. Please provide the specific code for examination and analysis.

Expand Down
7 changes: 5 additions & 2 deletions frontend/src/views/website/website/create/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();

Expand Down Expand Up @@ -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;
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The difference between this code snippet and the provided code for 2023 is that it has an import statement for dom, which was previously mentioned to be removed.

Here's a comparison of what remains:

{
	"code": "",
	"Differences": {
	},
	"Youthful Code Snippet": true,
}

Please let me know if you need further assistance or corrections.

Expand Down
Loading