diff --git a/docker-compose.yml b/docker-compose.yml index 9ca85212..ce80f440 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,15 +6,12 @@ services: - all - migrate command: - - "schema" + - "migrate" - "apply" - "--url" - "mysql://${DB_USER}:${DB_PASSWORD}@${DB_HOST}:${DB_PORT}/${DB_NAME}" - - "--to" - - "file://schema.sql" - - "--dev-url" - - "mysql://${DB_USER_DEV}:${DB_PASSWORD_DEV}@${DB_HOST}:${DB_PORT}/${DB_NAME_DEV}" - - "--auto-approve" + - "--dir" + - "file://migrations" - "--baseline" - "20251213191759" restart: "no" @@ -155,11 +152,11 @@ services: - spider - all environment: - DB_HOST: ${DB_HOST} - DB_PORT: ${DB_PORT} - DB_NAME: ${DB_NAME} - DB_USER: ${DB_USER} - DB_PASSWORD: ${DB_PASSWORD} + DB_HOST: ${DB_SPIDER_HOST} + DB_PORT: ${DB_SPIDER_PORT} + DB_NAME: ${DB_SPIDER_NAME} + DB_USER: ${DB_SPIDER_USER} + DB_PASSWORD: ${DB_SPIDER_PASSWORD} DB_POOL_SIZE: 20 DB_MAX_OVERFLOW: 50 OTEL_SERVICE_NAME: ${OTEL_SERVICE_NAME} diff --git a/main.go b/main.go index 84e5693a..f3717ab1 100644 --- a/main.go +++ b/main.go @@ -17,14 +17,14 @@ import ( ) var ( - serviceName = "后台服务" + serviceName = "后台服务——" ) func main() { // 从环境变量获取OTEL服务名称,如果不存在则使用默认值 otelServiceName := genv.Get("OTEL_SERVICE_NAME") if !otelServiceName.IsNil() { - serviceName = otelServiceName.String() + serviceName += otelServiceName.String() } // 从环境变量获取OTEL收集器地址,如果不存在则使用默认值 @@ -38,10 +38,6 @@ func main() { config.ServiceName = serviceName config.CollectorURL = collectorURL config.Insecure = true // 根据实际环境调整 - //config.Headers = map[string]string{ - // "x-service-token": "your-token-here", // 如果需要认证token - //} - if err := otel.InitWithConfig(config); err != nil { glog.Fatal(gctx.GetInitCtx(), "OTel初始化失败", err) }