diff --git a/.drone.yml b/.drone.yml index 31687ec..9af4599 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ pipeline: commands: - export GO111MODULE=on - export GOPROXY=https://goproxy.cn,direct - - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o server.app ./cmd/server + - CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o server.app # - make build docker-dev: @@ -22,7 +22,7 @@ pipeline: use_cache: true dockerfile: Dockerfile secrets: [ docker_username, docker_password ] - tags: upload-service + tags: seller-api 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 seller-api + - docker pull registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-bkb-seller:seller-api + - docker run --name=seller-api -p 30203:8001 -d registry.cn-shenzhen.aliyuncs.com/ax-stor/ax-bkb-seller:seller-api when: branch: develop \ No newline at end of file diff --git a/dev.yaml b/dev.yaml index 44b1389..03382d7 100644 --- a/dev.yaml +++ b/dev.yaml @@ -14,11 +14,11 @@ jwt: local: path: uploads/file mysql: - path: 172.16.0.26:3306 + path: 1.92.109.79:30306 config: charset=utf8mb4&parseTime=True&loc=Local db-name: bkb - username: bkbrd - password: yJGQ3hlV#*4nTJrn + username: root + password: vBwU7vwAGQ max-idle-conns: 10 max-open-conns: 100 log-mode: info diff --git a/initialize/grpc.go b/initialize/grpc.go index 8cdbb2a..603cd5b 100644 --- a/initialize/grpc.go +++ b/initialize/grpc.go @@ -17,13 +17,11 @@ import ( func InitNacosClient() { sc := []constant.ServerConfig{ - *constant.NewServerConfig("72535c70-8d6d-400f-9893-4bb3e634f682.nacos.cn-north-4.cse.myhuaweicloud.com", 8848), + *constant.NewServerConfig("1.92.109.79", 30848), } cc := constant.ClientConfig{ NamespaceId: "dev", TimeoutMs: 5000, - Username: "nacos", - Password: "nacos", } func() { client, err := clients.NewNamingClient(