fix(docker): 修正数据库连接和迁移配置

- 更新docker-compose中migrate命令参数,改为使用目录方式管理迁移文件
- 修改spider服务环境变量,切换为单独的数据库连接配置前缀
- main.go中调整服务名称拼接逻辑,追加环境变量中的OTEL服务名称
- 删除main.go中OTel配置中的注释认证头部代码,提高配置清晰度
This commit is contained in:
danial
2025-12-14 23:41:20 +08:00
parent cb2bba17f6
commit 0d861c6099
2 changed files with 10 additions and 17 deletions

View File

@@ -6,15 +6,12 @@ services:
- all - all
- migrate - migrate
command: command:
- "schema" - "migrate"
- "apply" - "apply"
- "--url" - "--url"
- "mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}" - "mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}"
- "--to" - "--dir"
- "file://schema.sql" - "file://migrations"
- "--dev-url"
- "mysql://${DB_USER_DEV}:${DB_PASSWORD_DEV}@${DB_HOST}:${DB_PORT}/${DB_NAME_DEV}"
- "--auto-approve"
- "--baseline" - "--baseline"
- "20251213191759" - "20251213191759"
restart: "no" restart: "no"
@@ -155,11 +152,11 @@ services:
- spider - spider
- all - all
environment: environment:
DB_HOST: ${DB_HOST} DB_HOST: ${DB_SPIDER_HOST}
DB_PORT: ${DB_PORT} DB_PORT: ${DB_SPIDER_PORT}
DB_NAME: ${DB_NAME} DB_NAME: ${DB_SPIDER_NAME}
DB_USER: ${DB_USER} DB_USER: ${DB_SPIDER_USER}
DB_PASSWORD: ${DB_PASSWORD} DB_PASSWORD: ${DB_SPIDER_PASSWORD}
DB_POOL_SIZE: 20 DB_POOL_SIZE: 20
DB_MAX_OVERFLOW: 50 DB_MAX_OVERFLOW: 50
OTEL_SERVICE_NAME: ${OTEL_SERVICE_NAME} OTEL_SERVICE_NAME: ${OTEL_SERVICE_NAME}

View File

@@ -17,14 +17,14 @@ import (
) )
var ( var (
serviceName = "后台服务" serviceName = "后台服务——"
) )
func main() { func main() {
// 从环境变量获取OTEL服务名称如果不存在则使用默认值 // 从环境变量获取OTEL服务名称如果不存在则使用默认值
otelServiceName := genv.Get("OTEL_SERVICE_NAME") otelServiceName := genv.Get("OTEL_SERVICE_NAME")
if !otelServiceName.IsNil() { if !otelServiceName.IsNil() {
serviceName = otelServiceName.String() serviceName += otelServiceName.String()
} }
// 从环境变量获取OTEL收集器地址如果不存在则使用默认值 // 从环境变量获取OTEL收集器地址如果不存在则使用默认值
@@ -38,10 +38,6 @@ func main() {
config.ServiceName = serviceName config.ServiceName = serviceName
config.CollectorURL = collectorURL config.CollectorURL = collectorURL
config.Insecure = true // 根据实际环境调整 config.Insecure = true // 根据实际环境调整
//config.Headers = map[string]string{
// "x-service-token": "your-token-here", // 如果需要认证token
//}
if err := otel.InitWithConfig(config); err != nil { if err := otel.InitWithConfig(config); err != nil {
glog.Fatal(gctx.GetInitCtx(), "OTel初始化失败", err) glog.Fatal(gctx.GetInitCtx(), "OTel初始化失败", err)
} }