Skip to content

Commit f2d1da1

Browse files
committed
fix: 移除 Sa-Token/Redis 配置,改用实际的 Spring Security + JWT 环境变量
1 parent d166e12 commit f2d1da1

2 files changed

Lines changed: 25 additions & 70 deletions

File tree

.env.example

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,30 @@
1-
# --- 数据库与基础设施 (针对 Neon 或本地 Docker) ---
2-
PGHOST=localhost
3-
PGPORT=5432
4-
PGUSER=neondb_owner
5-
PGPASSWORD=change_me
6-
PGDATABASE=neondb
7-
PGSSLMODE=disable
8-
9-
# 你也可以直接提供单一条目 (Spring Boot 将优先尝试解析 individual 变量)
10-
DATABASE_URL=postgresql://neondb_owner:change_me@localhost:5432/neondb?sslmode=disable
1+
# --- 数据库(本地 Docker postgres 服务)---
2+
POSTGRES_DB=involution_hell
3+
POSTGRES_USER=involution
4+
POSTGRES_PASSWORD=change_me
5+
SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/involution_hell
116

12-
# --- Spring Security OAuth2 (针对 GitHub 认证) ---
13-
# 请从 GitHub Developer Settings 获取以下信息
7+
# --- Spring Security OAuth2GitHub 登录)---
8+
# GitHub Developer Settings 获取
149
AUTH_GITHUB_ID=
1510
AUTH_GITHUB_SECRET=
1611
AUTH_SECRET=
1712

18-
# --- 应用基本设置 ---
19-
SPRING_APPLICATION_NAME=backend
20-
SERVER_PORT=8080
21-
SPRING_PROFILES_ACTIVE=default
22-
SPRING_SQL_INIT_MODE=always
23-
24-
# --- OpenAI 与 AI 助手 ---
13+
# --- OpenAI ---
2514
OPENAI_API_KEY=
2615
OPENAI_API_URL=https://api.openai.com/v1
2716
OPENAI_MODEL=gpt-4.1
2817

29-
# --- 监控与 Actuator ---
30-
MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE=health,info,metrics
31-
MANAGEMENT_ENDPOINT_HEALTH_PROBES_ENABLED=true
32-
MANAGEMENT_ENDPOINT_HEALTH_SHOW_DETAILS=always
33-
34-
# --- 缓存 (Redis) ---
35-
REDIS_PASSWORD=change-me
18+
# --- 应用基本设置 ---
19+
SERVER_PORT=8080
20+
SPRING_APPLICATION_NAME=backend
21+
SPRING_SQL_INIT_MODE=always
3622

37-
# --- 网关与代理 (Caddy) ---
23+
# --- 网关(Caddy---
3824
CADDY_SITE_ADDRESS=:80
3925
CADDY_HTTP_PORT=80
4026
CADDY_HTTPS_PORT=443
4127
CADDY_UPSTREAM=backend:8080
4228

4329
# --- Docker 镜像 ---
4430
BACKEND_IMAGE_NAME=ghcr.io/involutionhell/involutionhell-backend:latest
45-
46-
# --- 数据库(本地 Docker postgres 服务)---
47-
POSTGRES_DB=involution_hell
48-
POSTGRES_USER=involution
49-
POSTGRES_PASSWORD=change_me
50-
SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/involution_hell
51-
SPRING_DATASOURCE_USERNAME=involution
52-
SPRING_DATASOURCE_PASSWORD=change_me

docker-compose.yml

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,23 @@ services:
99
- .env
1010
environment:
1111
SERVER_PORT: ${SERVER_PORT:-8080}
12-
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-default}
1312
SPRING_APPLICATION_NAME: ${SPRING_APPLICATION_NAME:-backend}
13+
# 数据库连接(使用 PG* 变量,与 application.properties 保持一致)
1414
SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL:-jdbc:postgresql://postgres:5432/involution_hell}
15-
SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME:-involution}
16-
SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD:-change_me}
15+
PGUSER: ${POSTGRES_USER:-involution}
16+
PGPASSWORD: ${POSTGRES_PASSWORD:-change_me}
1717
SPRING_SQL_INIT_MODE: ${SPRING_SQL_INIT_MODE:-always}
18-
SA_TOKEN_TOKEN_NAME: ${SA_TOKEN_TOKEN_NAME:-satoken}
19-
SA_TOKEN_TIMEOUT: ${SA_TOKEN_TIMEOUT:-2592000}
20-
SA_TOKEN_ACTIVE_TIMEOUT: ${SA_TOKEN_ACTIVE_TIMEOUT:-7200}
21-
SA_TOKEN_IS_CONCURRENT: ${SA_TOKEN_IS_CONCURRENT:-true}
22-
SA_TOKEN_IS_SHARE: ${SA_TOKEN_IS_SHARE:-false}
23-
SA_TOKEN_TOKEN_STYLE: ${SA_TOKEN_TOKEN_STYLE:-random-64}
24-
SA_TOKEN_IS_LOG: ${SA_TOKEN_IS_LOG:-true}
18+
# GitHub OAuth2
19+
AUTH_GITHUB_ID: ${AUTH_GITHUB_ID:-}
20+
AUTH_GITHUB_SECRET: ${AUTH_GITHUB_SECRET:-}
21+
AUTH_SECRET: ${AUTH_SECRET:-}
22+
# OpenAI
23+
OPENAI_API_KEY: ${OPENAI_API_KEY:-}
24+
OPENAI_API_URL: ${OPENAI_API_URL:-https://api.openai.com/v1}
25+
OPENAI_MODEL: ${OPENAI_MODEL:-gpt-4.1}
26+
# Actuator
2527
MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE: ${MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE:-health}
2628
MANAGEMENT_ENDPOINT_HEALTH_PROBES_ENABLED: ${MANAGEMENT_ENDPOINT_HEALTH_PROBES_ENABLED:-true}
27-
MANAGEMENT_ENDPOINT_HEALTH_SHOW_DETAILS: ${MANAGEMENT_ENDPOINT_HEALTH_SHOW_DETAILS:-never}
2829
expose:
2930
- "${SERVER_PORT:-8080}"
3031
healthcheck:
@@ -40,8 +41,6 @@ services:
4041
condition: service_started
4142
postgres:
4243
condition: service_healthy
43-
redis:
44-
condition: service_healthy
4544

4645
postgres:
4746
image: postgres:18-alpine
@@ -64,27 +63,6 @@ services:
6463
networks:
6564
- InvolutionHell-net
6665

67-
redis:
68-
image: redis:7-alpine
69-
container_name: involution-redis
70-
restart: unless-stopped
71-
command: >
72-
redis-server
73-
--appendonly yes
74-
--requirepass ${REDIS_PASSWORD:-change_me}
75-
volumes:
76-
- involution-redis-data:/data
77-
ports:
78-
- "6382:6379"
79-
- "16382:16379"
80-
healthcheck:
81-
test: ["CMD-SHELL", "redis-cli -a ${REDIS_PASSWORD:-change_me} ping | grep PONG"]
82-
interval: 10s
83-
timeout: 5s
84-
retries: 10
85-
networks:
86-
- InvolutionHell-net
87-
8866
caddy:
8967
image: caddy:2.10-alpine
9068
container_name: involution-hell-caddy
@@ -107,6 +85,5 @@ networks:
10785

10886
volumes:
10987
involution-postgres-data:
110-
involution-redis-data:
11188
involution-caddy-data:
11289
involution-caddy-config:

0 commit comments

Comments
 (0)