[优化] 操作优化

openflare_server/service/pages.go

@@ -41,6 +41,8 @@ type PagesProjectInput struct {
 	APIProxyPath       string `json:"api_proxy_path"`
 	APIProxyPass       string `json:"api_proxy_pass"`
 	APIProxyRewrite    string `json:"api_proxy_rewrite"`
+	RootDir            string `json:"root_dir"`
+	EntryFile          string `json:"entry_file"`
 }
 
 type PagesProjectView struct {
@@ -55,6 +57,8 @@ type PagesProjectView struct {
 	APIProxyPath       string               `json:"api_proxy_path"`
 	APIProxyPass       string               `json:"api_proxy_pass"`
 	APIProxyRewrite    string               `json:"api_proxy_rewrite"`
+	RootDir            string               `json:"root_dir"`
+	EntryFile          string               `json:"entry_file"`
 	ActiveDeploymentID *uint                `json:"active_deployment_id"`
 	ActiveDeployment   *PagesDeploymentView `json:"active_deployment,omitempty"`
 	DeploymentCount    int64                `json:"deployment_count"`
@@ -151,6 +155,8 @@ func UpdatePagesProject(id uint, input PagesProjectInput) (*PagesProjectView, er
 		"api_proxy_path":       project.APIProxyPath,
 		"api_proxy_pass":       project.APIProxyPass,
 		"api_proxy_rewrite":    project.APIProxyRewrite,
+		"root_dir":             project.RootDir,
+		"entry_file":           project.EntryFile,
 	}).Error; err != nil {
 		if model.IsUniqueConstraintError(err) {
 			return nil, errors.New("Pages 项目标识已存在")
@@ -241,11 +247,11 @@ func UploadPagesDeployment(projectID uint, fileHeader *multipart.FileHeader, roo
 	if !strings.EqualFold(filepath.Ext(fileHeader.Filename), ".zip") {
 		return nil, errors.New("Pages 部署包必须是 .zip 文件")
 	}
-	rootDir, err = validateAndNormalizePagesRootDir(rootDir)
+	rootDir, err = validateAndNormalizePagesRootDir(project.RootDir)
 	if err != nil {
 		return nil, err
 	}
-	entryFile = normalizePagesEntryFile(entryFile)
+	entryFile = normalizePagesEntryFile(project.EntryFile)
 	tempPath, checksum, err := persistPagesUploadTemp(fileHeader)
 	if err != nil {
 		return nil, err
@@ -485,6 +491,13 @@ func buildPagesProject(project *model.PagesProject, input PagesProjectInput) (*m
 	project.APIProxyPass = apiProxyPass
 	project.APIProxyRewrite = apiProxyRewrite
 
+	rootDir, err := validateAndNormalizePagesRootDir(input.RootDir)
+	if err != nil {
+		return nil, err
+	}
+	project.RootDir = rootDir
+	project.EntryFile = normalizePagesEntryFile(input.EntryFile)
+
 	return project, nil
 }
 
@@ -504,6 +517,8 @@ func buildPagesProjectView(project *model.PagesProject) (*PagesProjectView, erro
 		APIProxyPath:       project.APIProxyPath,
 		APIProxyPass:       project.APIProxyPass,
 		APIProxyRewrite:    project.APIProxyRewrite,
+		RootDir:            project.RootDir,
+		EntryFile:          project.EntryFile,
 		ActiveDeploymentID: project.ActiveDeploymentID,
 		CreatedAt:          project.CreatedAt,
 		UpdatedAt:          project.UpdatedAt,

openflare_server/service/pages_test.go

@@ -331,15 +331,17 @@ func TestUploadPagesDeploymentWithRootDir(t *testing.T) {
 	setupServiceTestDB(t)
 
 	project, err := CreatePagesProject(PagesProjectInput{
-		Name:    "App Site",
-		Slug:    "app-site",
-		Enabled: true,
+		Name:      "App Site",
+		Slug:      "app-site",
+		Enabled:   true,
+		RootDir:   "build",
+		EntryFile: "index.html",
 	})
 	if err != nil {
 		t.Fatalf("CreatePagesProject failed: %v", err)
 	}
 
-	// 1. Upload a zip with files inside a subfolder, specifying "build" as rootDir.
+	// 1. Upload a zip with files inside a subfolder.
 	uploadHeader := multipartFileHeader(t, "site.zip", testPagesZip(t, map[string]string{
 		"build/index.html":       "<h1>App Root</h1>",
 		"build/static/bundle.js": "console.log('app')",
@@ -359,12 +361,34 @@ func TestUploadPagesDeploymentWithRootDir(t *testing.T) {
 		t.Fatalf("expected EntryFile to be 'index.html', got %q", deployment.EntryFile)
 	}
 
-	// 2. Try uploading with wrong entry file relative to root directory, should fail
+	// 2. Update project configuration to a wrong entry file relative to root directory, upload should fail
+	project, err = UpdatePagesProject(project.ID, PagesProjectInput{
+		Name:      "App Site",
+		Slug:      "app-site",
+		Enabled:   true,
+		RootDir:   "build",
+		EntryFile: "missing.html",
+	})
+	if err != nil {
+		t.Fatalf("UpdatePagesProject failed: %v", err)
+	}
 	_, err = UploadPagesDeployment(project.ID, uploadHeader, "build", "missing.html", "root")
 	if err == nil || !strings.Contains(err.Error(), "缺少入口文件") {
 		t.Fatalf("expected failure for missing entry file, got %v", err)
 	}
 
+	// Revert to correct config for snapshot check
+	project, err = UpdatePagesProject(project.ID, PagesProjectInput{
+		Name:      "App Site",
+		Slug:      "app-site",
+		Enabled:   true,
+		RootDir:   "build",
+		EntryFile: "index.html",
+	})
+	if err != nil {
+		t.Fatalf("UpdatePagesProject failed: %v", err)
+	}
+
 	// 3. Test config snapshot LocalRoot path rendering
 	project, err = ActivatePagesDeployment(project.ID, deployment.ID)
 	if err != nil {