feat: 优化容器编排模版使用

internal/biz/template.go

@@ -9,5 +9,5 @@ type TemplateRepo interface {
 	List() api.Templates
 	Get(slug string) (*api.Template, error)
 	Callback(slug string) error
-	CreateCompose(name, compose string, envs []types.KV, autoFirewall bool) error
+	CreateCompose(name, compose string, envs []types.KV, autoFirewall bool) (string, error)
 }

internal/data/container_compose.go

@@ -33,7 +33,7 @@ func (r *containerComposeRepo) List() ([]types.ContainerCompose, error) {
 		return nil, err
 	}
 
-	composeDir := filepath.Join(app.Root, "server", "compose")
+	composeDir := filepath.Join(app.Root, "compose")
 	entries, err := os.ReadDir(composeDir)
 	if err != nil {
 		return nil, err
@@ -74,8 +74,8 @@ func (r *containerComposeRepo) List() ([]types.ContainerCompose, error) {
 
 // Get 获取编排文件和环境变量内容
 func (r *containerComposeRepo) Get(name string) (string, []types.KV, error) {
-	content, _ := os.ReadFile(filepath.Join(app.Root, "server", "compose", name, "docker-compose.yml"))
-	env, _ := os.ReadFile(filepath.Join(app.Root, "server", "compose", name, ".env"))
+	content, _ := os.ReadFile(filepath.Join(app.Root, "compose", name, "docker-compose.yml"))
+	env, _ := os.ReadFile(filepath.Join(app.Root, "compose", name, ".env"))
 
 	var envs []types.KV
 	for _, line := range strings.Split(string(env), "\n") {
@@ -94,7 +94,7 @@ func (r *containerComposeRepo) Get(name string) (string, []types.KV, error) {
 
 // Create 创建编排文件
 func (r *containerComposeRepo) Create(name, compose string, envs []types.KV) error {
-	dir := filepath.Join(app.Root, "server", "compose", name)
+	dir := filepath.Join(app.Root, "compose", name)
 	if err := os.MkdirAll(dir, 0644); err != nil {
 		return err
 	}
@@ -118,7 +118,7 @@ func (r *containerComposeRepo) Create(name, compose string, envs []types.KV) err
 
 // Update 更新编排文件
 func (r *containerComposeRepo) Update(name, compose string, envs []types.KV) error {
-	dir := filepath.Join(app.Root, "server", "compose", name)
+	dir := filepath.Join(app.Root, "compose", name)
 	if err := os.WriteFile(filepath.Join(dir, "docker-compose.yml"), []byte(compose), 0644); err != nil {
 		return err
 	}
@@ -139,7 +139,7 @@ func (r *containerComposeRepo) Update(name, compose string, envs []types.KV) err
 
 // Up 启动编排
 func (r *containerComposeRepo) Up(name string, force bool) error {
-	file := filepath.Join(app.Root, "server", "compose", name, "docker-compose.yml")
+	file := filepath.Join(app.Root, "compose", name, "docker-compose.yml")
 	cmd := "docker compose -f %s up -d"
 	if force {
 		cmd += " --pull always" // 强制拉取镜像
@@ -152,7 +152,7 @@ func (r *containerComposeRepo) Up(name string, force bool) error {
 
 // Down 停止编排
 func (r *containerComposeRepo) Down(name string) error {
-	file := filepath.Join(app.Root, "server", "compose", name, "docker-compose.yml")
+	file := filepath.Join(app.Root, "compose", name, "docker-compose.yml")
 	_ = os.Setenv("PODMAN_COMPOSE_WARNING_LOGS", "false") // 禁用 Podman Compose 的警告日志
 	_, err := shell.Execf("docker compose -f %s down", file)
 	_ = os.Unsetenv("PODMAN_COMPOSE_WARNING_LOGS")
@@ -164,6 +164,6 @@ func (r *containerComposeRepo) Remove(name string) error {
 	if err := r.Down(name); err != nil {
 		return err
 	}
-	dir := filepath.Join(app.Root, "server", "compose", name)
+	dir := filepath.Join(app.Root, "compose", name)
 	return os.RemoveAll(dir)
 }

internal/data/template.go

@@ -65,13 +65,13 @@ func (r *templateRepo) Callback(slug string) error {
 }
 
 // CreateCompose 创建编排
-func (r *templateRepo) CreateCompose(name, compose string, envs []types.KV, autoFirewall bool) error {
-	dir := filepath.Join(app.Root, "server", "compose", name)
+func (r *templateRepo) CreateCompose(name, compose string, envs []types.KV, autoFirewall bool) (string, error) {
+	dir := filepath.Join(app.Root, "compose", name)
 	if err := os.MkdirAll(dir, 0755); err != nil {
-		return err
+		return "", err
 	}
 	if err := os.WriteFile(filepath.Join(dir, "docker-compose.yml"), []byte(compose), 0644); err != nil {
-		return err
+		return "", err
 	}
 
 	var sb strings.Builder
@@ -82,7 +82,7 @@ func (r *templateRepo) CreateCompose(name, compose string, envs []types.KV, auto
 		sb.WriteString("\n")
 	}
 	if err := os.WriteFile(filepath.Join(dir, ".env"), []byte(sb.String()), 0644); err != nil {
-		return err
+		return "", err
 	}
 
 	// 自动放行端口
@@ -100,7 +100,7 @@ func (r *templateRepo) CreateCompose(name, compose string, envs []types.KV, auto
 		}
 	}
 
-	return nil
+	return dir, nil
 }
 
 type composePort struct {

internal/service/template.go

@@ -66,7 +66,8 @@ func (s *TemplateService) Create(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// 创建编排
-	if err = s.templateRepo.CreateCompose(req.Name, template.Compose, req.Envs, req.AutoFirewall); err != nil {
+	dir, err := s.templateRepo.CreateCompose(req.Name, template.Compose, req.Envs, req.AutoFirewall)
+	if err != nil {
 		Error(w, http.StatusInternalServerError, "%v", err)
 		return
 	}
@@ -74,7 +75,7 @@ func (s *TemplateService) Create(w http.ResponseWriter, r *http.Request) {
 	// 回调
 	_ = s.templateRepo.Callback(req.Slug)
 
-	Success(w, nil)
+	Success(w, dir)
 }
 
 // Callback 模版下载回调

web/src/views/app/TemplateDeployModal.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import templateApi from '@/api/panel/template'
 import PtyTerminalModal from '@/components/common/PtyTerminalModal.vue'
+import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
 import { useGettext } from 'vue3-gettext'
-import type { FormInst, FormRules, FormItemRule } from 'naive-ui'
 
 import type { Template, TemplateEnvironment } from './types'
 
@@ -109,11 +109,11 @@ const handleSubmit = async () => {
       auto_firewall: deployModel.autoFirewall
     })
   )
-    .onSuccess(() => {
+    .onSuccess(({ data }) => {
       window.$message.success($gettext('Created successfully'))
       if (deployModel.autoStart) {
         // 自动启动
-        upCommand.value = `docker compose -f /opt/ace/server/compose/${deployModel.name}/docker-compose.yml up -d`
+        upCommand.value = `docker compose -f ${data}/docker-compose.yml up -d`
         upModal.value = true
       } else {
         show.value = false
@@ -209,7 +209,13 @@ watch(
         name="environment"
         :tab="$gettext('Environment Variables')"
       >
-        <n-form ref="formRef" :model="deployModel" :rules="formRules" label-placement="left" label-width="160">
+        <n-form
+          ref="formRef"
+          :model="deployModel"
+          :rules="formRules"
+          label-placement="left"
+          label-width="160"
+        >
           <n-form-item
             v-for="env in template.environments"
             :key="env.name"