diff --git a/config/config.dev.yaml b/config/config.dev.yaml index ca531fc..29d3082 100644 --- a/config/config.dev.yaml +++ b/config/config.dev.yaml @@ -8,6 +8,13 @@ log: maxBackups: 100 maxAge: 7 +metric: + prometheus: + address: "0.0.0.0" + port: 18601 + jaeger: + endpoint: "47.108.184.184:4317" + db: etcd: endpoints: [ "10.0.40.9:2379" ] @@ -27,5 +34,5 @@ db: serve: grpc: address: "10.0.40.199" - port: 8603 + port: 18600 ttl: 20 diff --git a/config/config.go b/config/config.go index 17e398b..fb884bf 100644 --- a/config/config.go +++ b/config/config.go @@ -5,10 +5,11 @@ import "git.hlsq.asia/mmorpg/service-common/config" const path = "./config" type Config struct { - App *config.AppConfig `yaml:"app"` - Log *config.LogConfig `yaml:"log"` - DB *config.DBConfig `yaml:"db"` - Serve *config.ServeConfig `yaml:"serve"` + App *config.AppConfig `yaml:"app"` + Log *config.LogConfig `yaml:"log"` + Metric *config.MetricConfig `yaml:"metric"` + DB *config.DBConfig `yaml:"db"` + Serve *config.ServeConfig `yaml:"serve"` } var cfg *Config diff --git a/config/config.prod.yaml b/config/config.prod.yaml index 52f372d..dc31c09 100644 --- a/config/config.prod.yaml +++ b/config/config.prod.yaml @@ -8,6 +8,13 @@ log: maxBackups: 100 maxAge: 7 +metric: + prometheus: + address: "0.0.0.0" + port: 18601 + jaeger: + endpoint: "172.18.28.0:4317" + db: etcd: endpoints: [ "172.18.28.0:2379" ] @@ -27,5 +34,5 @@ db: serve: grpc: address: "172.18.28.0" - port: 8603 + port: 18600 ttl: 20 diff --git a/deploy/Jenkinsfile b/deploy/Jenkinsfile index c676dfa..e763d7c 100644 --- a/deploy/Jenkinsfile +++ b/deploy/Jenkinsfile @@ -51,7 +51,7 @@ pipeline { stage('Build Go Binary') { agent { docker { - image 'golang:1.23.1-alpine' + image 'golang:1.24.0-alpine' reuseNode true args '-u root:root -v $GO_MOD_CACHE_DIR:/go/pkg/mod -v $GO_BUILD_CACHE_DIR:/root/.cache/go-build' } @@ -109,7 +109,7 @@ pipeline { docker run -d \\ --name ${env.APP_NAME} \\ --restart unless-stopped \\ - -p 8603:8603 \\ + -p 18600-18601:18600-18601 \\ --env XH_G_ENV=prod \\ -v /root/service/logs/qgdzs_log/:/app/logs \\ ${env.IMAGE_TAG}