chore(env): 更新生产环境配置及调整定时任务注册

- 增加OTEL及数据库、Redis相关环境变量配置
- 修改服务网关、商城和门户地址为新IP及端口
- 注释掉骆驼加油模块定时任务注册代码，暂时停用相关定时任务
- docker-compose.yml中添加extra_hosts配置，支持host.docker.internal映射
- 代码逻辑中增加条件判断，控制是否使用Haozhu平台功能

.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
+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

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:

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).

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, "骆驼加油模块定时任务注册完成")
+//}