From 83dfb7dac8f073e2e37dba102b154e4ac2baadbd Mon Sep 17 00:00:00 2001 From: danial Date: Mon, 15 Dec 2025 17:01:26 +0800 Subject: [PATCH] =?UTF-8?q?chore(env):=20=E6=9B=B4=E6=96=B0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=E5=8F=8A=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 增加OTEL及数据库、Redis相关环境变量配置 - 修改服务网关、商城和门户地址为新IP及端口 - 注释掉骆驼加油模块定时任务注册代码，暂时停用相关定时任务 - docker-compose.yml中添加extra_hosts配置，支持host.docker.internal映射 - 代码逻辑中增加条件判断，控制是否使用Haozhu平台功能 --- .env.prod | 22 +++++++++--- docker-compose.yml | 6 ++++ internal/logic/camel_oil/cron_tasks.go | 4 +++ utility/cron/cron.go | 46 +++++++++++++------------- 4 files changed, 51 insertions(+), 27 deletions(-) diff --git a/.env.prod b/.env.prod index 1fef5f51..5647b318 100644 --- a/.env.prod +++ b/.env.prod @@ -1,6 +1,20 @@ VERSION=latest BRANCH=production -SERVER_NAME=测试 -gatewayAddr=https://gateway.kkknametrans.buzz -shopAddr=https://shop.kkknametrans.buzz -portalAddr=https://partial2.kkknametrans.buzz \ No newline at end of file +OTEL_SERVICE_NAME=盛天 +OTEL_EXPORTER_ENDPOINT=38.38.251.113:31547 +gatewayAddr=http://119.45.132.185:12309 +shopAddr=http://119.45.132.185:12305 +portalAddr=http://119.45.132.185:12310 +DB_SPIDER_USER=kami_spider +DB_SPIDER_PASSWORD=AP7z5pdShYMtHndi +DB_SPIDER_HOST=mysql +DB_SPIDER_PORT=3306 +DB_SPIDER_NAME=kami_spider +DB_USER=kami +DB_PASSWORD=zZxr5hQcYBaahr4G +DB_HOST=mysql +DB_PORT=3306 +DB_NAME=kami +REDIS_HOST=redis +REDIS_PORT=6379 +REDIS_PASSWORD=redis_TeTDkN diff --git a/docker-compose.yml b/docker-compose.yml index ce80f440..39b81f20 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,6 +50,8 @@ services: gatewayAddr: $gatewayAddr shopAddr: $shopAddr portalAddr: $portalAddr + extra_hosts: + - "host.docker.internal:host-gateway" profiles: - kami_backend - all @@ -93,6 +95,8 @@ services: gatewayAddr: $gatewayAddr shopAddr: $shopAddr portalAddr: $portalAddr + extra_hosts: + - "host.docker.internal:host-gateway" profiles: - gateway - all @@ -166,6 +170,8 @@ services: REDIS_DB: 4 REDIS_PASSWORD: ${REDIS_PASSWORD} OTEL_EXPORTER_ENDPOINT: ${OTEL_EXPORTER_ENDPOINT} + extra_hosts: + - "host.docker.internal:host-gateway" networks: - 1panel-network labels: diff --git a/internal/logic/camel_oil/cron_tasks.go b/internal/logic/camel_oil/cron_tasks.go index 3a2e648e..7b452e72 100644 --- a/internal/logic/camel_oil/cron_tasks.go +++ b/internal/logic/camel_oil/cron_tasks.go @@ -30,6 +30,10 @@ func (s *sCamelOil) CronAccountPrefetchTask(ctx context.Context) error { return err } + if !settings.UseHaozhuPlatform { + return nil + } + // 1. 获取当前在线账号数量 m := dao.V1CamelOilAccount.Ctx(ctx).DB(config.GetDatabaseV1()) onlineCount, err := m.Where(dao.V1CamelOilAccount.Columns().Status, consts.CamelOilAccountStatusOnline). diff --git a/utility/cron/cron.go b/utility/cron/cron.go index b73b4b4a..5d17fd32 100644 --- a/utility/cron/cron.go +++ b/utility/cron/cron.go @@ -81,28 +81,28 @@ func registerMainTasks(ctx context.Context) { // glog.Error(ctx, "京东支付状态监控任务失败", err) // } //}) - registerCamelOilTasks(ctx) + //registerCamelOilTasks(ctx) } -// registerCamelOilTasks 注册骆驼加油模块的定时任务 -func registerCamelOilTasks(ctx context.Context) { - _, _ = gcron.AddSingleton(ctx, "@every 10s", func(ctx context.Context) { - _ = service.CamelOil().CronAccountPrefetchTask(ctx) - _ = service.CamelOil().CronVerifyCodeCheckTask(ctx) - _ = service.CamelOil().CronOrderPaymentCheckTask(ctx) - _ = service.CamelOil().ProcessPendingCallbacks(ctx) - _, _ = service.CamelOil().CronCleanExpiredPrefetchOrders(ctx) - _ = service.CamelOil().CronCardBindingTask(ctx) - _ = service.CamelOil().CronExpiredTokensCode(ctx) - }, "CamelOilAccountPrefetch") - - _, _ = gcron.AddSingleton(ctx, "0 1 0 * * ?", func(ctx context.Context) { - _ = service.CamelOil().CronAccountDailyResetTask(ctx) - }, "CamelOilAccountDailyReset") - - _, _ = gcron.AddSingleton(ctx, "@every 1s", func(ctx context.Context) { - _ = service.CamelOil().CronPrefetchOrderSupplementTask(ctx) - }, "CamelOilPrefetchOrderSupplementOrders") - - glog.Info(ctx, "骆驼加油模块定时任务注册完成") -} +//// registerCamelOilTasks 注册骆驼加油模块的定时任务 +//func registerCamelOilTasks(ctx context.Context) { +// _, _ = gcron.AddSingleton(ctx, "@every 10s", func(ctx context.Context) { +// _ = service.CamelOil().CronAccountPrefetchTask(ctx) +// _ = service.CamelOil().CronVerifyCodeCheckTask(ctx) +// _ = service.CamelOil().CronOrderPaymentCheckTask(ctx) +// _ = service.CamelOil().ProcessPendingCallbacks(ctx) +// _, _ = service.CamelOil().CronCleanExpiredPrefetchOrders(ctx) +// _ = service.CamelOil().CronCardBindingTask(ctx) +// _ = service.CamelOil().CronExpiredTokensCode(ctx) +// }, "CamelOilAccountPrefetch") +// +// _, _ = gcron.AddSingleton(ctx, "0 1 0 * * ?", func(ctx context.Context) { +// _ = service.CamelOil().CronAccountDailyResetTask(ctx) +// }, "CamelOilAccountDailyReset") +// +// _, _ = gcron.AddSingleton(ctx, "@every 1s", func(ctx context.Context) { +// _ = service.CamelOil().CronPrefetchOrderSupplementTask(ctx) +// }, "CamelOilPrefetchOrderSupplementOrders") +// +// glog.Info(ctx, "骆驼加油模块定时任务注册完成") +//}