merge: develop -> master 环境标识改造 #1
@@ -0,0 +1,6 @@
|
||||
ACCESS_MANAGE_API_BASE_URL=http://127.0.0.1:3501/api
|
||||
ROLE_USER_SESSION_COOKIE=role_user_session_develop
|
||||
APP_ENV=develop
|
||||
APP_ENV_LABEL=测试环境
|
||||
PORT=3211
|
||||
HOSTNAME=0.0.0.0
|
||||
+5
-1
@@ -1,2 +1,6 @@
|
||||
ACCESS_MANAGE_API_BASE_URL=http://localhost:3500/api
|
||||
ROLE_USER_SESSION_COOKIE=role_user_session
|
||||
ROLE_USER_SESSION_COOKIE=role_user_session_local
|
||||
APP_ENV=local
|
||||
APP_ENV_LABEL=本地环境
|
||||
PORT=3210
|
||||
HOSTNAME=0.0.0.0
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
ACCESS_MANAGE_API_BASE_URL=http://127.0.0.1:3501/api
|
||||
ROLE_USER_SESSION_COOKIE=role_user_session_test
|
||||
APP_ENV=test
|
||||
ROLE_USER_SESSION_COOKIE=role_user_session_develop
|
||||
APP_ENV=develop
|
||||
APP_ENV_LABEL=测试环境
|
||||
PORT=3211
|
||||
HOSTNAME=0.0.0.0
|
||||
|
||||
@@ -26,11 +26,23 @@ pnpm dev
|
||||
|
||||
```bash
|
||||
ACCESS_MANAGE_API_BASE_URL=http://localhost:3500/api
|
||||
ROLE_USER_SESSION_COOKIE=role_user_session
|
||||
ROLE_USER_SESSION_COOKIE=role_user_session_local
|
||||
APP_ENV=local
|
||||
APP_ENV_LABEL=本地环境
|
||||
PORT=3210
|
||||
HOSTNAME=0.0.0.0
|
||||
```
|
||||
|
||||
`ACCESS_MANAGE_API_BASE_URL` 指向 `access-manage` 服务端 API 根路径。员工登录会调用后端 `POST /api/auth/employee/login`，登录成功后只把 JWT 写入 Next.js 服务端 HttpOnly Cookie，不写入 `localStorage`。
|
||||
|
||||
环境标识按 `APP_ENV` 区分：
|
||||
|
||||
- `local`: 本地环境，默认使用 `.env.example` 复制出的 `.env.local`。
|
||||
- `develop`: 测试环境，参考 `.env.develop.example`；`.env.test.example` 保留为兼容入口。
|
||||
- `production`: 生产环境，参考 `.env.production.example`。
|
||||
|
||||
`APP_ENV_LABEL` 可覆盖页面右上角显示文案；未配置时会按 `APP_ENV` 自动显示“本地环境”“测试环境”或“生产环境”。Cookie 只在 `APP_ENV=production` 时设置 `Secure`，避免测试环境 HTTP 访问时登录后被浏览器丢弃 Cookie。
|
||||
|
||||
## 可用命令
|
||||
|
||||
```bash
|
||||
@@ -38,6 +50,10 @@ pnpm dev
|
||||
pnpm typecheck
|
||||
pnpm lint
|
||||
pnpm build
|
||||
pnpm build:develop
|
||||
pnpm build:prod
|
||||
pnpm start:develop
|
||||
pnpm start:prod
|
||||
```
|
||||
|
||||
## 当前实现范围
|
||||
|
||||
+6
-3
@@ -3,11 +3,14 @@
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "next dev -p 3210",
|
||||
"dev": "APP_ENV=local APP_ENV_LABEL=本地环境 ACCESS_MANAGE_API_BASE_URL=http://localhost:3500/api ROLE_USER_SESSION_COOKIE=role_user_session_local next dev -p 3210",
|
||||
"build": "next build",
|
||||
"build:test": "next build",
|
||||
"build:prod": "next build",
|
||||
"build:develop": "APP_ENV=develop APP_ENV_LABEL=测试环境 ACCESS_MANAGE_API_BASE_URL=http://127.0.0.1:3501/api ROLE_USER_SESSION_COOKIE=role_user_session_develop next build",
|
||||
"build:test": "pnpm build:develop",
|
||||
"build:prod": "APP_ENV=production APP_ENV_LABEL=生产环境 ACCESS_MANAGE_API_BASE_URL=http://127.0.0.1:3500/api ROLE_USER_SESSION_COOKIE=role_user_session next build",
|
||||
"start": "next start",
|
||||
"start:develop": "APP_ENV=develop APP_ENV_LABEL=测试环境 ACCESS_MANAGE_API_BASE_URL=http://127.0.0.1:3501/api ROLE_USER_SESSION_COOKIE=role_user_session_develop next start -p 3211",
|
||||
"start:prod": "APP_ENV=production APP_ENV_LABEL=生产环境 ACCESS_MANAGE_API_BASE_URL=http://127.0.0.1:3500/api ROLE_USER_SESSION_COOKIE=role_user_session next start -p 3210",
|
||||
"lint": "eslint",
|
||||
"typecheck": "tsc --noEmit --incremental false"
|
||||
},
|
||||
|
||||
+2
-1
@@ -1,6 +1,7 @@
|
||||
import type { Metadata, Viewport } from "next";
|
||||
import { connection } from "next/server";
|
||||
|
||||
import { getAppEnvLabel } from "@/lib/environment";
|
||||
import "./globals.css";
|
||||
|
||||
export const metadata: Metadata = {
|
||||
@@ -28,7 +29,7 @@ export const viewport: Viewport = {
|
||||
export default async function RootLayout({ children }: Readonly<{ children: React.ReactNode }>) {
|
||||
await connection();
|
||||
|
||||
const environmentLabel = process.env.APP_ENV_LABEL || "生产环境";
|
||||
const environmentLabel = getAppEnvLabel();
|
||||
|
||||
return (
|
||||
<html lang="zh-CN">
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
import "server-only";
|
||||
|
||||
export type AppEnv = "local" | "develop" | "production";
|
||||
|
||||
export function getAppEnv(): AppEnv {
|
||||
const appEnv = process.env.APP_ENV;
|
||||
|
||||
if (appEnv === "production") {
|
||||
return "production";
|
||||
}
|
||||
|
||||
if (appEnv === "develop" || appEnv === "test") {
|
||||
return "develop";
|
||||
}
|
||||
|
||||
if (appEnv === "local") {
|
||||
return "local";
|
||||
}
|
||||
|
||||
return process.env.NODE_ENV === "production" ? "production" : "local";
|
||||
}
|
||||
|
||||
export function getAppEnvLabel() {
|
||||
if (process.env.APP_ENV_LABEL) {
|
||||
return process.env.APP_ENV_LABEL;
|
||||
}
|
||||
|
||||
const labels: Record<AppEnv, string> = {
|
||||
local: "本地环境",
|
||||
develop: "测试环境",
|
||||
production: "生产环境"
|
||||
};
|
||||
|
||||
return labels[getAppEnv()];
|
||||
}
|
||||
+3
-1
@@ -2,6 +2,8 @@ import "server-only";
|
||||
|
||||
import { cookies } from "next/headers";
|
||||
|
||||
import { getAppEnv } from "@/lib/environment";
|
||||
|
||||
const DEFAULT_COOKIE_NAME = "role_user_session";
|
||||
|
||||
export function getSessionCookieName() {
|
||||
@@ -17,7 +19,7 @@ export async function setSessionToken(token: string) {
|
||||
|
||||
cookieStore.set(getSessionCookieName(), token, {
|
||||
httpOnly: true,
|
||||
secure: process.env.NODE_ENV === "production",
|
||||
secure: getAppEnv() === "production",
|
||||
sameSite: "lax",
|
||||
path: "/",
|
||||
maxAge: 60 * 60 * 8
|
||||
|
||||
Reference in New Issue
Block a user