refactor(server): 调整 Docker 运行架构为 Next.js 代理 Go API
- 修改 Dockerfile 中的运行命令,将 Next.js 设为对外服务,Go 服务在内部监听 - 更新端口配置,后端监听端口从 3000 改为 80 - 移除 Go 服务中的反向代理逻辑,统一由 Next.js 处理页面请求 - 修改 Next.js 配置,在生产环境中也启用 API 代理功能 - 更新文档描述,明确 Next.js 作为页面入口,API 请求代理到 Go 服务 - 调整开发环境端口配置,web 开发端口从 3001 改为 3000 - 更新版本号至 v0.0.4 并修改 CHANGELOG
This commit is contained in:
+5
-2
@@ -6,8 +6,11 @@ ADMIN_PASSWORD=infinite-canvas
|
|||||||
JWT_SECRET=infinite-canvas
|
JWT_SECRET=infinite-canvas
|
||||||
JWT_EXPIRE_HOURS=168
|
JWT_EXPIRE_HOURS=168
|
||||||
|
|
||||||
# 后端对外监听端口,Docker 默认由 Go 统一暴露 3000。
|
# 后端监听端口
|
||||||
PORT=3000
|
PORT=8080
|
||||||
|
|
||||||
|
# 前端开发代理默认使用 http://127.0.0.1:8080,如后端开发端口不同,启动前端时可单独设置 API_BASE_URL。
|
||||||
|
# API_BASE_URL=http://127.0.0.1:8080
|
||||||
|
|
||||||
# 数据库配置,默认使用本地 SQLite。
|
# 数据库配置,默认使用本地 SQLite。
|
||||||
STORAGE_DRIVER=sqlite
|
STORAGE_DRIVER=sqlite
|
||||||
|
|||||||
@@ -2,6 +2,13 @@
|
|||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
|
|
||||||
|
## v0.0.4 - 2026-05-20
|
||||||
|
|
||||||
|
|
||||||
|
+ [调整] Docker 运行入口改为 Next.js 对外提供页面,`/api/*` 由 Next.js 代理到内部 Go 服务。
|
||||||
|
+ [修复] 文本复制在局域网 IP 访问时可能失败的问题。
|
||||||
|
|
||||||
## v0.0.3 - 2026-05-19
|
## v0.0.3 - 2026-05-19
|
||||||
|
|
||||||
+ [修复] 更新 nanoid 依赖并修改 ID 生成方式,防止其他ip无法使用crypto模块导致的ID生成失败问题。
|
+ [修复] 更新 nanoid 依赖并修改 ID 生成方式,防止其他ip无法使用crypto模块导致的ID生成失败问题。
|
||||||
|
|||||||
+3
-3
@@ -23,7 +23,7 @@ COPY service ./service
|
|||||||
COPY main.go ./
|
COPY main.go ./
|
||||||
RUN go build -o /server .
|
RUN go build -o /server .
|
||||||
|
|
||||||
# 运行镜像:Go 对外监听 3000,Next.js 只在容器内部监听 3001。
|
# 运行镜像:Next.js 对外监听 3000,Go 只在容器内部监听 8080。
|
||||||
FROM oven/bun:1
|
FROM oven/bun:1
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
@@ -35,5 +35,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates
|
|||||||
RUN mkdir -p /app/data/prompts
|
RUN mkdir -p /app/data/prompts
|
||||||
|
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
# 先启动内部 Next.js,再由 Go 统一处理 /api/* 和页面反代。
|
# 先启动内部 Go API,再由 Next.js 提供页面并代理 /api/*。
|
||||||
CMD ["sh", "-c", "cd /app/web && HOSTNAME=0.0.0.0 PORT=3001 bun run start & PORT=3000 /app/server"]
|
CMD ["sh", "-c", "PORT=8080 /app/server & cd /app/web && HOSTNAME=0.0.0.0 PORT=3000 bun run start"]
|
||||||
|
|||||||
+1
-1
@@ -152,7 +152,7 @@
|
|||||||
## 后端能力
|
## 后端能力
|
||||||
|
|
||||||
- Gin 提供 API 服务。
|
- Gin 提供 API 服务。
|
||||||
- Docker 运行时由 Go 提供统一入口,`/api/*` 直接处理,其它页面请求转到内部 Next.js 服务。
|
- Docker 运行时由 Next.js 提供页面入口,`/api/*` 请求代理到内部 Go 服务。
|
||||||
- GORM 管理数据库连接和自动迁移。
|
- GORM 管理数据库连接和自动迁移。
|
||||||
- 支持 SQLite、MySQL、PostgreSQL。
|
- 支持 SQLite、MySQL、PostgreSQL。
|
||||||
- 数据库保存用户、提示词分组、提示词和服务器素材。
|
- 数据库保存用户、提示词分组、提示词和服务器素材。
|
||||||
|
|||||||
+1
-15
@@ -2,17 +2,12 @@ package router
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httputil"
|
|
||||||
"net/url"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/basketikun/infinite-canvas/handler"
|
"github.com/basketikun/infinite-canvas/handler"
|
||||||
"github.com/basketikun/infinite-canvas/middleware"
|
"github.com/basketikun/infinite-canvas/middleware"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
const webBaseURL = "http://127.0.0.1:3001"
|
|
||||||
|
|
||||||
func New() *gin.Engine {
|
func New() *gin.Engine {
|
||||||
router := gin.Default()
|
router := gin.Default()
|
||||||
router.RedirectTrailingSlash = false
|
router.RedirectTrailingSlash = false
|
||||||
@@ -47,16 +42,7 @@ func New() *gin.Engine {
|
|||||||
handler.AdminDeleteAsset(c.Writer, c.Request, c.Param("id"))
|
handler.AdminDeleteAsset(c.Writer, c.Request, c.Param("id"))
|
||||||
})
|
})
|
||||||
|
|
||||||
webURL, _ := url.Parse(webBaseURL)
|
router.NoRoute(middleware.NotFoundJSON)
|
||||||
webProxy := httputil.NewSingleHostReverseProxy(webURL)
|
|
||||||
router.NoRoute(func(c *gin.Context) {
|
|
||||||
path := c.Request.URL.Path
|
|
||||||
if path == "/api" || strings.HasPrefix(path, "/api/") {
|
|
||||||
middleware.NotFoundJSON(c)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
webProxy.ServeHTTP(c.Writer, c.Request)
|
|
||||||
})
|
|
||||||
|
|
||||||
return router
|
return router
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-2
@@ -1,15 +1,17 @@
|
|||||||
import type { NextConfig } from "next";
|
import type { NextConfig } from "next";
|
||||||
import { PHASE_DEVELOPMENT_SERVER } from "next/constants";
|
import { PHASE_DEVELOPMENT_SERVER } from "next/constants";
|
||||||
|
import { loadEnvConfig } from "@next/env";
|
||||||
import { readFileSync } from "node:fs";
|
import { readFileSync } from "node:fs";
|
||||||
import { fileURLToPath } from "node:url";
|
import { fileURLToPath } from "node:url";
|
||||||
import { dirname, resolve } from "node:path";
|
import { dirname, resolve } from "node:path";
|
||||||
|
|
||||||
const apiBaseUrl = process.env.API_BASE_URL || "http://127.0.0.1:3000";
|
|
||||||
const webDir = dirname(fileURLToPath(import.meta.url));
|
const webDir = dirname(fileURLToPath(import.meta.url));
|
||||||
const version = readFileSync(resolve(webDir, "../VERSION"), "utf8").trim() || "dev";
|
const version = readFileSync(resolve(webDir, "../VERSION"), "utf8").trim() || "dev";
|
||||||
|
|
||||||
export default function nextConfig(phase: string): NextConfig {
|
export default function nextConfig(phase: string): NextConfig {
|
||||||
const isDev = phase === PHASE_DEVELOPMENT_SERVER;
|
const isDev = phase === PHASE_DEVELOPMENT_SERVER;
|
||||||
|
loadEnvConfig(resolve(webDir, ".."), isDev, undefined, true);
|
||||||
|
const apiBaseUrl = process.env.API_BASE_URL || "http://127.0.0.1:8080";
|
||||||
return {
|
return {
|
||||||
allowedDevOrigins: isDev ? ["*.*.*.*"] : [],
|
allowedDevOrigins: isDev ? ["*.*.*.*"] : [],
|
||||||
typescript: {
|
typescript: {
|
||||||
@@ -19,7 +21,7 @@ export default function nextConfig(phase: string): NextConfig {
|
|||||||
NEXT_PUBLIC_APP_VERSION: version,
|
NEXT_PUBLIC_APP_VERSION: version,
|
||||||
},
|
},
|
||||||
async rewrites() {
|
async rewrites() {
|
||||||
return isDev ? [{ source: "/api/:path*", destination: `${apiBaseUrl}/api/:path*` }] : [];
|
return [{ source: "/api/:path*", destination: `${apiBaseUrl}/api/:path*` }];
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev --webpack -H 0.0.0.0 -p 3001",
|
"dev": "next dev --webpack -H 0.0.0.0 -p 3000",
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
"start": "next start"
|
"start": "next start"
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user