mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-10 18:05:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(confilg-template): build template error #989

Browse source
This commit is contained in:
Jacky 2025-04-27 09:22:14 +08:00
parent 70fe8fdec1
commit 28ed291250
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/views/site/site_edit/components/ConfigTemplate/TemplateForm.vue
View file

@ -3,7 +3,7 @@ import type { Variable } from '@/api/template'
import TemplateFormItem from './TemplateFormItem.vue' import TemplateFormItem from './TemplateFormItem.vue'
const data = defineModel<Record<string, Variable>>({ const data = defineModel<Record<string, Variable>>({
default: () => {}, default: reactive({}),
}) })
</script> </script>

4
app/src/views/site/site_edit/components/ConfigTemplate/store.ts
View file

@ -8,8 +8,8 @@ export const useConfigTemplateStore = defineStore('configTemplate', () => {
const variables = computed(() => data.value?.variables ?? {}) const variables = computed(() => data.value?.variables ?? {})
function __buildTemplate(name: string) { function __buildTemplate() {
template.build_block(name, variables.value).then(r => { template.build_block(data.value.filename, variables.value).then(r => {
data.value.directives = r.directives data.value.directives = r.directives
data.value.locations = r.locations data.value.locations = r.locations
data.value.custom = r.custom data.value.custom = r.custom

14
internal/template/template.go
View file

@ -13,7 +13,6 @@ import (
"github.com/uozi-tech/cosy/logger" "github.com/uozi-tech/cosy/logger"
cSettings "github.com/uozi-tech/cosy/settings" cSettings "github.com/uozi-tech/cosy/settings"
"io" "io"
"io/fs"
"path/filepath" "path/filepath"
"strings" "strings"
"text/template" "text/template"
@ -40,14 +39,13 @@ func GetTemplateInfo(path, name string) (configListItem ConfigInfoItem) {
Filename: name, Filename: name,
} }
file, _ := templ.DistFS.Open(filepath.Join(path, name)) file, err := templ.DistFS.Open(filepath.Join(path, name))
if err != nil {
logger.Error(err)
return
}
defer func(file fs.File) { defer file.Close()
err := file.Close()
if err != nil {
logger.Error(err)
}
}(file)
r := bufio.NewReader(file) r := bufio.NewReader(file)
lineBytes, _, err := r.ReadLine() lineBytes, _, err := r.ReadLine()