Merge remote-tracking branch 'gogs/master'

app/Services/PreviewTemplateUpdater.php

@@ -25,7 +25,7 @@ class PreviewTemplateUpdater
 
         // 使用默认值的函数封装，避免重复逻辑
         $template_dist_id = $dist->id ?? trim(config('liquid.template_dist_id'));
-        $template_name = $dist->appearance->file_name;
+        $template_name = $dist->appearance->folder;
 
         if (self::$baseTemplatePath === null) {
             self::$baseTemplatePath = rtrim(config('liquid.preview_template_path'), '/') . '/' .

app/Services/TemplateUpdater.php

@@ -27,7 +27,7 @@ class TemplateUpdater
 
         // 使用默认值的函数封装，避免重复逻辑
         $template_dist_id = $dist->id ?? trim(config('liquid.template_dist_id'));
-        $template_name = $dist->appearance->file_name ?? trim(config('liquid.template_name'));
+        $template_name = $dist->appearance->folder ?? trim(config('liquid.template_name'));
 
         if (self::$baseTemplatePath === null) {
             self::$baseTemplatePath = rtrim(config('liquid.template_path'), '/') . '/' .
@@ -35,6 +35,7 @@ class TemplateUpdater
                 ltrim($template_name, '/');
         }
 
+
         // 查询 dist_appearance_publish_list 表的记录
         $publishList = DistAppearancePublishList::where('dist_id', $dist->id)
             ->where('appearance_id', $dist->appearance_id)