danial/kami_backend
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- 增加OTEL及数据库、Redis相关环境变量配置
- 修改服务网关、商城和门户地址为新IP及端口
- 注释掉骆驼加油模块定时任务注册代码，暂时停用相关定时任务
- docker-compose.yml中添加extra_hosts配置，支持host.docker.internal映射
- 代码逻辑中增加条件判断，控制是否使用Haozhu平台功能
This commit is contained in:
danial
2025-12-15 17:01:26 +08:00
parent 0d861c6099
commit 83dfb7dac8
4 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.env.prod
View File

@@ -1,6 +1,20 @@
VERSION=latest VERSION=latest
BRANCH=production BRANCH=production
SERVER_NAME=测试 OTEL_SERVICE_NAME=盛天
gatewayAddr=https://gateway.kkknametrans.buzz OTEL_EXPORTER_ENDPOINT=38.38.251.113:31547
shopAddr=https://shop.kkknametrans.buzz gatewayAddr=http://119.45.132.185:12309
portalAddr=https://partial2.kkknametrans.buzz 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

6
docker-compose.yml
View File

@@ -50,6 +50,8 @@ services:
gatewayAddr: $gatewayAddr gatewayAddr: $gatewayAddr
shopAddr: $shopAddr shopAddr: $shopAddr
portalAddr: $portalAddr portalAddr: $portalAddr
extra_hosts:
- "host.docker.internal:host-gateway"
profiles: profiles:
- kami_backend - kami_backend
- all - all
@@ -93,6 +95,8 @@ services:
gatewayAddr: $gatewayAddr gatewayAddr: $gatewayAddr
shopAddr: $shopAddr shopAddr: $shopAddr
portalAddr: $portalAddr portalAddr: $portalAddr
extra_hosts:
- "host.docker.internal:host-gateway"
profiles: profiles:
- gateway - gateway
- all - all
@@ -166,6 +170,8 @@ services:
REDIS_DB: 4 REDIS_DB: 4
REDIS_PASSWORD: ${REDIS_PASSWORD} REDIS_PASSWORD: ${REDIS_PASSWORD}
OTEL_EXPORTER_ENDPOINT: ${OTEL_EXPORTER_ENDPOINT} OTEL_EXPORTER_ENDPOINT: ${OTEL_EXPORTER_ENDPOINT}
extra_hosts:
- "host.docker.internal:host-gateway"
networks: networks:
- 1panel-network - 1panel-network
labels: labels:

4
internal/logic/camel_oil/cron_tasks.go
View File

@@ -30,6 +30,10 @@ func (s *sCamelOil) CronAccountPrefetchTask(ctx context.Context) error {
return err return err
} }
if !settings.UseHaozhuPlatform {
return nil
}
// 1. 获取当前在线账号数量 // 1. 获取当前在线账号数量
m := dao.V1CamelOilAccount.Ctx(ctx).DB(config.GetDatabaseV1()) m := dao.V1CamelOilAccount.Ctx(ctx).DB(config.GetDatabaseV1())
onlineCount, err := m.Where(dao.V1CamelOilAccount.Columns().Status, consts.CamelOilAccountStatusOnline). onlineCount, err := m.Where(dao.V1CamelOilAccount.Columns().Status, consts.CamelOilAccountStatusOnline).

46
utility/cron/cron.go
View File

@@ -81,28 +81,28 @@ func registerMainTasks(ctx context.Context) {
// glog.Error(ctx, "京东支付状态监控任务失败", err) // glog.Error(ctx, "京东支付状态监控任务失败", err)
// } // }
//}) //})
registerCamelOilTasks(ctx) //registerCamelOilTasks(ctx)
} }
// registerCamelOilTasks 注册骆驼加油模块的定时任务 //// registerCamelOilTasks 注册骆驼加油模块的定时任务
func registerCamelOilTasks(ctx context.Context) { //func registerCamelOilTasks(ctx context.Context) {
_, _ = gcron.AddSingleton(ctx, "@every 10s", func(ctx context.Context) { // _, _ = gcron.AddSingleton(ctx, "@every 10s", func(ctx context.Context) {
_ = service.CamelOil().CronAccountPrefetchTask(ctx) // _ = service.CamelOil().CronAccountPrefetchTask(ctx)
_ = service.CamelOil().CronVerifyCodeCheckTask(ctx) // _ = service.CamelOil().CronVerifyCodeCheckTask(ctx)
_ = service.CamelOil().CronOrderPaymentCheckTask(ctx) // _ = service.CamelOil().CronOrderPaymentCheckTask(ctx)
_ = service.CamelOil().ProcessPendingCallbacks(ctx) // _ = service.CamelOil().ProcessPendingCallbacks(ctx)
_, _ = service.CamelOil().CronCleanExpiredPrefetchOrders(ctx) // _, _ = service.CamelOil().CronCleanExpiredPrefetchOrders(ctx)
_ = service.CamelOil().CronCardBindingTask(ctx) // _ = service.CamelOil().CronCardBindingTask(ctx)
_ = service.CamelOil().CronExpiredTokensCode(ctx) // _ = service.CamelOil().CronExpiredTokensCode(ctx)
}, "CamelOilAccountPrefetch") // }, "CamelOilAccountPrefetch")
//
_, _ = gcron.AddSingleton(ctx, "0 1 0 * * ?", func(ctx context.Context) { // _, _ = gcron.AddSingleton(ctx, "0 1 0 * * ?", func(ctx context.Context) {
_ = service.CamelOil().CronAccountDailyResetTask(ctx) // _ = service.CamelOil().CronAccountDailyResetTask(ctx)
}, "CamelOilAccountDailyReset") // }, "CamelOilAccountDailyReset")
//
_, _ = gcron.AddSingleton(ctx, "@every 1s", func(ctx context.Context) { // _, _ = gcron.AddSingleton(ctx, "@every 1s", func(ctx context.Context) {
_ = service.CamelOil().CronPrefetchOrderSupplementTask(ctx) // _ = service.CamelOil().CronPrefetchOrderSupplementTask(ctx)
}, "CamelOilPrefetchOrderSupplementOrders") // }, "CamelOilPrefetchOrderSupplementOrders")
//
glog.Info(ctx, "骆驼加油模块定时任务注册完成") // glog.Info(ctx, "骆驼加油模块定时任务注册完成")
} //}