From b3e1801b54ff08ef454f2777a65f0a12cf287cb1 Mon Sep 17 00:00:00 2001 From: dengbiao Date: Sat, 17 Aug 2024 18:06:21 +0800 Subject: [PATCH] update --- etc/cfg.yml | 2 +- go.mod | 4 +--- k8s/container.yaml | 8 ++++---- k8s/ingress.yaml | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/etc/cfg.yml b/etc/cfg.yml index 891b21d..841ed21 100644 --- a/etc/cfg.yml +++ b/etc/cfg.yml @@ -4,7 +4,7 @@ curldebug: true prd: false local: true # 服务器参数 -srv_addr: ':1001' +srv_addr: ':1000' # 缓存 redis_addr: '120.24.28.6:32572' diff --git a/go.mod b/go.mod index c3592f8..48b0bff 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,6 @@ require ( github.com/go-playground/universal-translator v0.18.1 github.com/go-playground/validator/v10 v10.20.0 github.com/go-redis/redis v6.15.9+incompatible - github.com/go-sql-driver/mysql v1.8.1 github.com/gocolly/colly v1.2.0 github.com/gomodule/redigo v2.0.0+incompatible github.com/iGoogle-ink/gopay v1.5.36 @@ -48,7 +47,6 @@ require ( github.com/antchfx/xpath v1.3.1 // indirect github.com/bytedance/sonic v1.11.6 // indirect github.com/bytedance/sonic/loader v0.1.1 // indirect - github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect @@ -57,6 +55,7 @@ require ( github.com/go-openapi/jsonreference v0.19.6 // indirect github.com/go-openapi/spec v0.20.4 // indirect github.com/go-openapi/swag v0.19.15 // indirect + github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -80,7 +79,6 @@ require ( github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect - github.com/smartystreets/goconvey v1.6.4 // indirect github.com/syndtr/goleveldb v1.0.0 // indirect github.com/temoto/robotstxt v1.1.2 // indirect github.com/tidwall/match v1.0.3 // indirect diff --git a/k8s/container.yaml b/k8s/container.yaml index 4e5ce5a..d5d0be3 100644 --- a/k8s/container.yaml +++ b/k8s/container.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1 # 元数据 metadata: name: advertisement-super - namespace: advertisement-super + namespace: advertisement labels: app: advertisement-super annotations: @@ -36,9 +36,9 @@ spec: name: advertisement-super-cfg defaultMode: 420 # pvc - - name: advertisement-super-pvc # 在该部署中的名称，后面使用改名称挂载 + - name: advertisement-super # 在该部署中的名称，后面使用改名称挂载 persistentVolumeClaim: - claimName: advertisement-super-pvc # pvc的名称 + claimName: advertisement-super # pvc的名称 # Nginx配置 - name: advertisement-super-nginx configMap: @@ -79,7 +79,7 @@ spec: readOnly: true mountPath: /etc/localtime # 存储卷 用于存放前端代码 - - name: advertisement-super-pvc # 前面volumes声明的名称 + - name: advertisement-super # 前面volumes声明的名称 mountPath: /usr/share/nginx/html - name: advertisement-super-nginx # Nginx 配置 readOnly: true diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml index 5743e3b..da51f4f 100644 --- a/k8s/ingress.yaml +++ b/k8s/ingress.yaml @@ -1,7 +1,7 @@ kind: Ingress apiVersion: extensions/v1beta1 metadata: - name: advertisement # ingress名称 + name: advertisement-super # ingress名称 namespace: advertisement annotations: kubesphere.io/creator: dengbiao @@ -13,5 +13,5 @@ spec: - path: / pathType: ImplementationSpecific backend: - serviceName: advertisement # 流量转发到的服务 + serviceName: advertisement-super # 流量转发到的服务 servicePort: 80 \ No newline at end of file