From 222815a12a770dc660380c02b302c5a3c37d8d7c Mon Sep 17 00:00:00 2001 From: lmk <1095689763@qq.com> Date: Wed, 22 Apr 2026 09:39:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.yml | 20 ++++++++++---------- k8s/configmap.yaml | 4 ++-- k8s/deployment.yaml | 8 ++++---- k8s/service.yaml | 6 +++--- main.go | 1 - 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/config.yml b/config.yml index ed40704..f8b59be 100644 --- a/config.yml +++ b/config.yml @@ -1,6 +1,6 @@ server: - address : ":3001" - name: "report-engine" + address : ":3002" + name: "data-engine" workerId: 1 logPath: "resource/log/server" logStdout: true @@ -17,7 +17,7 @@ database: port: "5432" user: "postgres" pass: "root" - name: "cid" + name: "data-engine" role: "master" maxIdle: "5" maxOpen: "20" @@ -42,13 +42,13 @@ redis: readTimeout: "30s" #TCP的Read操作超时时间,使用时间字符串例如30s/1m/1d writeTimeout: "30s" #TCP的Write操作超时时间,使用时间字符串例如30s/1m/1d maxActive: 100 -#consul: -# address: 116.204.74.41:8500 -k8s: - apiServer: "https://192.168.3.37:6443" - token: "eyJhbGciOiJSUzI1NiIsImtpZCI6IlR6X0QtelVDYkZPYnpjTDlfamZzOEFjbERJb2dUMTRqMjNfYUNncGcwRW8ifQ.eyJhdWQiOlsiaHR0cHM6Ly9rdWJlcm5ldGVzLmRlZmF1bHQuc3ZjLmNsdXN0ZXIubG9jYWwiLCJrM3MiXSwiZXhwIjoxODA3ODY3MTA1LCJpYXQiOjE3NzYzMzExMDUsImlzcyI6Imh0dHBzOi8va3ViZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FsIiwianRpIjoiNjAwMGY0ODctZTQ4Ni00NTUxLWIyNjgtMzE1MWE1MDE5YjU4Iiwia3ViZXJuZXRlcy5pbyI6eyJuYW1lc3BhY2UiOiJrdWJlcm5ldGVzLWRhc2hib2FyZCIsInNlcnZpY2VhY2NvdW50Ijp7Im5hbWUiOiJkYXNoYm9hcmQtYWRtaW4iLCJ1aWQiOiJlZjAxY2IxNS0xNTc0LTRlYTYtODg4Ny03YjZhODY3OWFkYmIifX0sIm5iZiI6MTc3NjMzMTEwNSwic3ViIjoic3lzdGVtOnNlcnZpY2VhY2NvdW50Omt1YmVybmV0ZXMtZGFzaGJvYXJkOmRhc2hib2FyZC1hZG1pbiJ9.Z5MEy-dhWq6lruuR6QSI--cYRZzDoeEes78a4lLMtXa8lSLt1FZy16kNVn2pJli74RSk0kKS2F5GAatyuyGjF_yB7Tm1Tb7iCjzeUM7xRpdvXEmk4MUImlzwGeW31NXpwFrfR0oPS-9TLlbahEmsgwL0DUOC0CekSiToVbIduwEmmrB0FMPFayr5_wqGDmxdqtaAH3K-LJNCqPiAMqevsxTebrhyJSrThU-Pi7iJYm_sUd8VHKrRxrwDiGA77j4lfita_hZSdyrZe8qsrbGqomHxFWk9ZzcJJ9q7OLS13OXo-Xbcu-_TZcfDOreZhune9ctM2lmuOtmYnad47gYRcA" - kubeconfig: "" - namespace: "default" +consul: + address: 116.204.74.41:8500 +#k8s: +# apiServer: "https://192.168.3.37:6443" +# token: "eyJhbGciOiJSUzI1NiIsImtpZCI6IlR6X0QtelVDYkZPYnpjTDlfamZzOEFjbERJb2dUMTRqMjNfYUNncGcwRW8ifQ.eyJhdWQiOlsiaHR0cHM6Ly9rdWJlcm5ldGVzLmRlZmF1bHQuc3ZjLmNsdXN0ZXIubG9jYWwiLCJrM3MiXSwiZXhwIjoxODA3ODY3MTA1LCJpYXQiOjE3NzYzMzExMDUsImlzcyI6Imh0dHBzOi8va3ViZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FsIiwianRpIjoiNjAwMGY0ODctZTQ4Ni00NTUxLWIyNjgtMzE1MWE1MDE5YjU4Iiwia3ViZXJuZXRlcy5pbyI6eyJuYW1lc3BhY2UiOiJrdWJlcm5ldGVzLWRhc2hib2FyZCIsInNlcnZpY2VhY2NvdW50Ijp7Im5hbWUiOiJkYXNoYm9hcmQtYWRtaW4iLCJ1aWQiOiJlZjAxY2IxNS0xNTc0LTRlYTYtODg4Ny03YjZhODY3OWFkYmIifX0sIm5iZiI6MTc3NjMzMTEwNSwic3ViIjoic3lzdGVtOnNlcnZpY2VhY2NvdW50Omt1YmVybmV0ZXMtZGFzaGJvYXJkOmRhc2hib2FyZC1hZG1pbiJ9.Z5MEy-dhWq6lruuR6QSI--cYRZzDoeEes78a4lLMtXa8lSLt1FZy16kNVn2pJli74RSk0kKS2F5GAatyuyGjF_yB7Tm1Tb7iCjzeUM7xRpdvXEmk4MUImlzwGeW31NXpwFrfR0oPS-9TLlbahEmsgwL0DUOC0CekSiToVbIduwEmmrB0FMPFayr5_wqGDmxdqtaAH3K-LJNCqPiAMqevsxTebrhyJSrThU-Pi7iJYm_sUd8VHKrRxrwDiGA77j4lfita_hZSdyrZe8qsrbGqomHxFWk9ZzcJJ9q7OLS13OXo-Xbcu-_TZcfDOreZhune9ctM2lmuOtmYnad47gYRcA" +# kubeconfig: "" +# namespace: "default" # pass: jiahui8888 jaeger: #链路追踪 addr: 116.204.74.41:4318 \ No newline at end of file diff --git a/k8s/configmap.yaml b/k8s/configmap.yaml index 4352be4..5444846 100644 --- a/k8s/configmap.yaml +++ b/k8s/configmap.yaml @@ -1,13 +1,13 @@ apiVersion: v1 kind: ConfigMap metadata: - name: report-engine-config + name: data-engine-config namespace: default data: config.yml: | server: address : ":3001" - name: "report-engine" + name: "data-engine" workerId: 1 logPath: "resource/log/server" logStdout: true diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml index 269523f..c133a58 100644 --- a/k8s/deployment.yaml +++ b/k8s/deployment.yaml @@ -20,7 +20,7 @@ spec: image: data-engine:latest imagePullPolicy: IfNotPresent ports: - - containerPort: 3001 + - containerPort: 3002 protocol: TCP name: http env: @@ -41,20 +41,20 @@ spec: cpu: "1000m" livenessProbe: tcpSocket: - port: 3001 + port: 3002 initialDelaySeconds: 30 periodSeconds: 10 timeoutSeconds: 5 readinessProbe: tcpSocket: - port: 3001 + port: 3002 initialDelaySeconds: 15 periodSeconds: 5 timeoutSeconds: 3 volumes: - name: config-volume configMap: - name: report-engine-config + name: data-engine-config - name: log-volume emptyDir: {} restartPolicy: Always diff --git a/k8s/service.yaml b/k8s/service.yaml index b29278c..8a8c2f6 100644 --- a/k8s/service.yaml +++ b/k8s/service.yaml @@ -11,7 +11,7 @@ spec: app: data-engine ports: - name: http - port: 3001 - targetPort: 3001 - nodePort: 30301 + port: 3002 + targetPort: 3002 + nodePort: 30302 protocol: TCP diff --git a/main.go b/main.go index c821f14..504fa17 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,6 @@ import ( "gitea.com/red-future/common/http" "gitea.com/red-future/common/jaeger" _ "gitea.com/red-future/common/k3sconfig" - _ "gitea.com/red-future/common/ragflow" // RAGFlow 客户端自动初始化 _ "github.com/gogf/gf/contrib/drivers/pgsql/v2" _ "github.com/gogf/gf/contrib/nosql/redis/v2" "golang.org/x/net/context"