refactor: 前后端目录结构模块化 + v2 优化移植与缺陷修复
前端: - src/srv/api → src/api,按域分文件夹(auth/cluster/host/storage/deployment/collector) - 新增 http.ts 引擎(http.get/post/put/delete),域模块改用语义化调用 - index.html 增加 favicon(匹配应用 logo 的 emerald + Activity 脉冲) 后端分层增强(保留包名): - 新增 repository/:从 models 拆出 JsonDB 持久化层(InitDB/GetDB/Shutdown/RequestSave) - 新增 dto/:从 controllers 抽出各域请求契约(带 binding 校验) - 新增 pkg/crypto、pkg/jwt:从 utils 拆出安全原语(外部 jwt 别名 jwtv5 避免冲突) - models 只留领域实体 + sanitizer;utils 只留 gin/应用相关(response/errors) v2 优化移植与缺陷修复: - 移植密钥分离/SSH TOFU/并发写安全/Loki 生产级配置/Docker 加固 - 修复 deployment.go 并发丢更新、Helm values 重复键、EncryptField 哨兵、loki-gateway 端点等审计缺陷 - 实现真正的优雅关停(main.go http.Server + signal + repository.Shutdown) - 修复登录契约:后端返回 accessToken,前端 auth.ts/Login.tsx 对齐 - 补 crypto/jwt/repository 单元测试(含并发写回归) 验证: go build/vet/test 全绿;npm run build 通过;登录→鉴权→优雅关停冒烟通过 Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
1 parent
fb8d10231a
commit
327e282356
93 files changed
+8433
-3089
No files matched your search
@@ -0,0 +1,124 @@
|
||||
# ============================================================
|
||||
# LokiDeploy - Makefile
|
||||
# Convenient shortcuts for common operations
|
||||
# ============================================================
|
||||
|
||||
.PHONY: help build start stop status logs clean prod-setup secrets
|
||||
|
||||
# Default target
|
||||
help:
|
||||
@echo "LokiDeploy v2 - Available Commands:"
|
||||
@echo ""
|
||||
@echo " make build - Build Docker image"
|
||||
@echo " make start - Start with docker-compose (dev)"
|
||||
@echo " make stop - Stop all services"
|
||||
@echo " make status - Show container status and health"
|
||||
@echo " make logs - Follow container logs"
|
||||
@echo " make prod - Start production deployment"
|
||||
@echo " make prod-stop - Stop production deployment"
|
||||
@echo " make secrets - Generate secret files"
|
||||
@echo " make clean - Remove containers, volumes, and images"
|
||||
@echo " make shell - Open shell in running container"
|
||||
@echo " make lint - Validate Docker and Compose files"
|
||||
@echo ""
|
||||
|
||||
# Build Docker image
|
||||
build:
|
||||
@echo "Building LokiDeploy v2 image..."
|
||||
@docker compose build --no-cache
|
||||
|
||||
# Development
|
||||
start:
|
||||
@echo "Starting LokiDeploy (dev mode)..."
|
||||
@echo ""
|
||||
@if [ -z "$${JWT_SECRET:-}" ]; then \
|
||||
echo "WARNING: JWT_SECRET not set!"; \
|
||||
echo "Run: export JWT_SECRET=\$$(openssl rand -hex 32)"; \
|
||||
echo " export ENCRYPTION_KEY=\$$(openssl rand -hex 32)"; \
|
||||
echo ""; \
|
||||
read -p "Continue without secrets? (y/N) " ans; \
|
||||
[ "$$ans" != "y" ] && [ "$$ans" != "Y" ] && exit 1; \
|
||||
fi
|
||||
@docker compose up -d
|
||||
@echo ""
|
||||
@echo "LokiDeploy started!"
|
||||
@echo " URL: http://localhost:$${SERVER_PORT:-8080}"
|
||||
@echo " Check status: make status"
|
||||
|
||||
stop:
|
||||
@echo "Stopping LokiDeploy..."
|
||||
@docker compose down --timeout 15
|
||||
|
||||
status:
|
||||
@echo "=== Container Status ==="
|
||||
@docker compose ps
|
||||
@echo ""
|
||||
@echo "=== Health Checks ==="
|
||||
@docker inspect --format='{{.Name}}: {{.State.Health.Status}}' lokideploy 2>/dev/null || echo "lokideploy: container not found"
|
||||
@echo ""
|
||||
@echo "=== Resource Usage ==="
|
||||
@docker stats --no-stream --format "table {{.Name}}\t{{.CPUPerc}}\t{{.MemUsage}}\t{{.NetIO}}\t{{.BlockIO}}" lokideploy 2>/dev/null || true
|
||||
|
||||
logs:
|
||||
@docker compose logs -f --tail=50
|
||||
|
||||
# Production
|
||||
prod-setup: secrets
|
||||
@echo "Setting up production environment..."
|
||||
@mkdir -p secrets
|
||||
@echo "Production secrets created in ./secrets/"
|
||||
|
||||
prod:
|
||||
@echo "Starting LokiDeploy (production mode)..."
|
||||
@if [ ! -f secrets/jwt_secret.txt ] || [ ! -f secrets/encryption_key.txt ]; then \
|
||||
echo "ERROR: Secrets not found. Run 'make secrets' first."; \
|
||||
exit 1; \
|
||||
fi
|
||||
@docker compose -f docker-compose.prod.yml up -d
|
||||
@echo "Production deployment started!"
|
||||
@echo " Load Balancer: http://localhost:$${SERVER_PORT:-8080}"
|
||||
@echo " Check status: docker compose -f docker-compose.prod.yml ps"
|
||||
|
||||
prod-stop:
|
||||
@echo "Stopping production deployment..."
|
||||
@docker compose -f docker-compose.prod.yml down --timeout 30
|
||||
|
||||
# Secrets generation
|
||||
secrets:
|
||||
@echo "Generating secret files..."
|
||||
@mkdir -p secrets
|
||||
@chmod 700 secrets
|
||||
@openssl rand -hex 32 > secrets/jwt_secret.txt
|
||||
@openssl rand -hex 32 > secrets/encryption_key.txt
|
||||
@chmod 600 secrets/*.txt
|
||||
@echo "Secrets created:"
|
||||
@echo " - secrets/jwt_secret.txt"
|
||||
@echo " - secrets/encryption_key.txt"
|
||||
@echo ""
|
||||
@echo "IMPORTANT: Keep these files secure and never commit them!"
|
||||
|
||||
# Maintenance
|
||||
shell:
|
||||
@docker compose exec lokideploy /bin/sh
|
||||
|
||||
clean:
|
||||
@echo "Cleaning up..."
|
||||
@docker compose down --volumes --rmi local --timeout 15 2>/dev/null || true
|
||||
@docker compose -f docker-compose.prod.yml down --volumes --rmi local --timeout 30 2>/dev/null || true
|
||||
@echo "Cleanup complete."
|
||||
|
||||
# Linting
|
||||
lint:
|
||||
@echo "Validating Dockerfile..."
|
||||
@docker run --rm -i hadolint/hadolint < Dockerfile 2>/dev/null || echo "hadolint not available, install from: https://github.com/hadolint/hadolint"
|
||||
@echo ""
|
||||
@echo "Validating docker-compose.yml..."
|
||||
@docker compose config > /dev/null && echo "docker-compose.yml: OK"
|
||||
@echo ""
|
||||
@echo "Validating docker-compose.prod.yml..."
|
||||
@docker compose -f docker-compose.prod.yml config > /dev/null && echo "docker-compose.prod.yml: OK"
|
||||
@echo ""
|
||||
@echo "Checking shell scripts..."
|
||||
@bash -n run.sh && echo "run.sh: syntax OK"
|
||||
@bash -n build.sh && echo "build.sh: syntax OK"
|
||||
@bash -n docker-entrypoint.sh && echo "docker-entrypoint.sh: syntax OK"
|
||||
Reference in new issue
Block a user