From 545d678c1b8fbf579987329670aacf94948c5abb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=87=E6=AD=A6?= <875892894@qq.com> Date: Thu, 1 Aug 2024 17:18:07 +0800 Subject: [PATCH] test --- .drone.yml | 8 ++++---- configs/config.yaml | 2 +- internal/server/server.go | 16 +++++++++------- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 31687ec..f50bfe7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,7 @@ pipeline: use_cache: true dockerfile: Dockerfile secrets: [ docker_username, docker_password ] - tags: upload-service + tags: order-service when: branch: develop @@ -42,8 +42,8 @@ pipeline: from_secret: ssh_password port: 22 # 可选,指定 SSH 端口,默认为 22 script: - - docker rm -f upload-service - - docker pull registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-bkb-seller:upload-service - - docker run --name=upload-service -p 30008:8001 -d registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-bkb-seller:upload-service + - docker rm -f order-service + - docker pull registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-bkb-seller:order-service + - docker run --name=order-service -d registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-bkb-seller:order-service when: branch: develop \ No newline at end of file diff --git a/configs/config.yaml b/configs/config.yaml index 7960dc8..63d8edb 100644 --- a/configs/config.yaml +++ b/configs/config.yaml @@ -8,7 +8,7 @@ server: data: database: driver: mysql - source: fmdb:FmgeER*&jd@db@tcp(tw2oalkgjloy7q07nk84-rw4rm.rwlb.rds.aliyuncs.com:3306)/dev_news?charset=utf8mb4&parseTime=True&loc=Local + source: root:vBwU7vwAGQ@tcp(1.92.109.79:30306)/bkb?charset=utf8mb4&parseTime=True&loc=Local redis: addr: r-uf6xhely1bkxg95yht.redis.rds.aliyuncs.com:6379 password: fmrdadmin:FmadminRD123456 diff --git a/internal/server/server.go b/internal/server/server.go index 260acb8..b686745 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -25,19 +25,21 @@ func NewNacosClient(env string) vo.NacosClientParam { var nc config if env == "prod" || env == "uat" { nc = config{ - addr: "https://nacos.mangguonews.com", - username: "nacos_pub", - password: "88m8JxgK", + // addr: "https://nacos.mangguonews.com", + // username: "nacos_pub", + // password: "88m8JxgK", + addr: "http://1.92.109.79", } } else { nc = config{ - addr: "https://nacos-dev.mangguonews.com", - username: "nacos", - password: "nacos", + // addr: "https://nacos-dev.mangguonews.com", + // username: "nacos", + // password: "nacos", + addr: "http://1.92.109.79", } } sc := []constant.ServerConfig{ - *constant.NewServerConfig(nc.addr, 443), + *constant.NewServerConfig(nc.addr, 30848), } cc := &constant.ClientConfig{