From d934e63ab4fcf6575ddc050500c361156e4ed276 Mon Sep 17 00:00:00 2001 From: Johnson Date: Sat, 16 Apr 2022 18:35:36 +0800 Subject: [PATCH] ci: docker publish --- .dockerignore | 5 +- .github/workflows/docker-publish.yml | 47 ++++++++++++++++ .github/workflows/pr.yml | 61 +++++++++++++++++++++ Dockerfile | 29 +++++++--- config/load.go | 4 +- go.mod | 40 +++++++------- go.sum | 80 ++++++++++++++-------------- handler/client/service.go | 6 +-- main.go | 2 +- plugins.go | 26 ++++----- 10 files changed, 213 insertions(+), 87 deletions(-) create mode 100644 .github/workflows/docker-publish.yml create mode 100644 .github/workflows/pr.yml diff --git a/.dockerignore b/.dockerignore index fa29cdf..52bbcfd 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,4 @@ -** \ No newline at end of file +docs +frontend/node_modules +frontend/dist +web/b0xfile*.go \ No newline at end of file diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml new file mode 100644 index 0000000..9c20827 --- /dev/null +++ b/.github/workflows/docker-publish.yml @@ -0,0 +1,47 @@ +name: Docker + +on: + push: + # Publish semver tags as releases. + tags: ["*"] + +env: + IMAGE_NAME: xpunch/go-micro-dashboard + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Extract metadata (tags, labels) for Docker + # https://github.com/docker/metadata-action + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@v3 + with: + images: ${{ env.IMAGE_NAME }} + + # Login against a Docker registry except on PR + # https://github.com/docker/login-action + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + # Build and push Docker image with Buildx (don't push on PR) + # https://github.com/docker/build-push-action + - name: Build and push Docker image + id: build-and-push + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 0000000..a3184c3 --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,61 @@ +name: PR Sanity Check + +on: + pull_request: + branches: + - "main" + push: + branches: + - "main" + +jobs: + backend-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Set up Go + uses: actions/setup-go@v3 + with: + go-version: 1.18 + + - name: Go Test + run: go test -v ./... + + - name: Notify of test failure + if: failure() + uses: rtCamp/action-slack-notify@v2.0.0 + env: + SLACK_CHANNEL: dashboard + SLACK_COLOR: "#BF280A" + SLACK_ICON: https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png + SLACK_TITLE: Tests Failed + SLACK_USERNAME: GitHub Actions + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} + + frontend-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Set up Node.js + uses: actions/setup-node@v3 + with: + node-version: 17 + cache: "npm" + + - name: NG Test + run: | + npm install + npm run test --if-present + + - name: Notify of test failure + if: failure() + uses: rtCamp/action-slack-notify@v2.0.0 + env: + SLACK_CHANNEL: dashboard + SLACK_COLOR: "#BF280A" + SLACK_ICON: https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png + SLACK_TITLE: Tests Failed + SLACK_USERNAME: GitHub Actions + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }} diff --git a/Dockerfile b/Dockerfile index 2fd06f0..467378b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,31 @@ -FROM golang:1.17 as builder +FROM node:16 as frontend-builder -RUN git clone https://github.com/go-micro/dashboard.git /usr/local/micro \ - && cd /usr/local/micro \ - && go install github.com/swaggo/swag/cmd/swag@latest \ - && swag init \ - && CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o dashboard . +WORKDIR /micro + +COPY frontend . + +RUN npm install -g @angular/cli && \ + npm install && \ + npm run build + +FROM golang:1.18 as backend-builder + +WORKDIR /micro + +COPY . . +COPY --from=frontend-builder /micro/dist frontend/dist + +RUN go install github.com/swaggo/swag/cmd/swag@latest && \ + swag init && \ + go install github.com/UnnoTed/fileb0x@latest && \ + fileb0x b0x.yaml && \ + CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o dashboard . FROM alpine:latest WORKDIR /usr/local/bin -COPY --from=builder /usr/local/micro/dashboard . +COPY --from=backend-builder /micro/dashboard . EXPOSE 80 diff --git a/config/load.go b/config/load.go index 1034850..58f227d 100644 --- a/config/load.go +++ b/config/load.go @@ -6,8 +6,8 @@ import ( "time" "github.com/go-micro/dashboard/util" - "github.com/go-micro/plugins/config/encoder/toml" - "github.com/go-micro/plugins/config/encoder/yaml" + "github.com/go-micro/plugins/v4/config/encoder/toml" + "github.com/go-micro/plugins/v4/config/encoder/yaml" "github.com/pkg/errors" "go-micro.dev/v4/config" "go-micro.dev/v4/config/reader" diff --git a/go.mod b/go.mod index 86978a7..401ca2c 100644 --- a/go.mod +++ b/go.mod @@ -5,27 +5,27 @@ go 1.17 require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.7.7 - github.com/go-micro/plugins/broker/kafka v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/broker/mqtt v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/broker/nats v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/broker/rabbitmq v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/broker/redis v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/client/grpc v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/client/http v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/client/mucp v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/config/encoder/toml v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/config/encoder/yaml v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/registry/consul v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/registry/etcd v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/registry/eureka v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/registry/gossip v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/registry/kubernetes v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/registry/nacos v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/registry/nats v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/registry/zookeeper v0.0.0-20220408041722-48f19627b61b - github.com/go-micro/plugins/server/http v0.0.0-20220408041722-48f19627b61b + github.com/go-micro/plugins/v4/broker/kafka v1.0.0 + github.com/go-micro/plugins/v4/broker/mqtt v1.0.0 + github.com/go-micro/plugins/v4/broker/nats v1.0.0 + github.com/go-micro/plugins/v4/broker/rabbitmq v1.0.0 + github.com/go-micro/plugins/v4/broker/redis v1.0.0 + github.com/go-micro/plugins/v4/client/grpc v1.0.0 + github.com/go-micro/plugins/v4/client/http v1.0.0 + github.com/go-micro/plugins/v4/client/mucp v1.0.0 + github.com/go-micro/plugins/v4/config/encoder/toml v1.0.0 + github.com/go-micro/plugins/v4/config/encoder/yaml v1.0.0 + github.com/go-micro/plugins/v4/registry/consul v1.0.0 + github.com/go-micro/plugins/v4/registry/etcd v1.0.0 + github.com/go-micro/plugins/v4/registry/eureka v1.0.0 + github.com/go-micro/plugins/v4/registry/gossip v1.0.0 + github.com/go-micro/plugins/v4/registry/kubernetes v1.0.0 + github.com/go-micro/plugins/v4/registry/nacos v1.0.0 + github.com/go-micro/plugins/v4/registry/nats v1.0.0 + github.com/go-micro/plugins/v4/registry/zookeeper v1.0.0 + github.com/go-micro/plugins/v4/server/http v1.0.0 github.com/pkg/errors v0.9.1 - github.com/swaggo/gin-swagger v1.4.1 + github.com/swaggo/gin-swagger v1.4.2 github.com/swaggo/swag v1.8.1 go-micro.dev/v4 v4.6.0 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd diff --git a/go.sum b/go.sum index ba90f11..5970245 100644 --- a/go.sum +++ b/go.sum @@ -245,44 +245,44 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-micro/plugins/broker/kafka v0.0.0-20220408041722-48f19627b61b h1:K50vIuuJnVNHCT8miMCJCgZ38YZazKodQGcDQVDNBiA= -github.com/go-micro/plugins/broker/kafka v0.0.0-20220408041722-48f19627b61b/go.mod h1:0Pq3Pcs06lnfsEtUpIMHAhij1g3Cn13YRz+EpymKixc= -github.com/go-micro/plugins/broker/mqtt v0.0.0-20220408041722-48f19627b61b h1:AhO5lk+ABGoBrPlOXeIjDDmG0ju4KGCJtOOdFyvUkdw= -github.com/go-micro/plugins/broker/mqtt v0.0.0-20220408041722-48f19627b61b/go.mod h1:vpoRiOwjQalqcJAzWApRC27y1/rp83108S3swzEfHBw= -github.com/go-micro/plugins/broker/nats v0.0.0-20220408041722-48f19627b61b h1:yMyoeJZ/jAenJC/c576m8p1sqwwi+ABjYRncElg4lPs= -github.com/go-micro/plugins/broker/nats v0.0.0-20220408041722-48f19627b61b/go.mod h1:nt7+mbGGMmIQnADmhqGAanYFMEX8+DRI+NH2stYPFFc= -github.com/go-micro/plugins/broker/rabbitmq v0.0.0-20220408041722-48f19627b61b h1:Vq1LAZshXPYmaEwS3UKrW01jaz4czNUo4n/89XQeiXU= -github.com/go-micro/plugins/broker/rabbitmq v0.0.0-20220408041722-48f19627b61b/go.mod h1:BVo2c5DM0faeAmlLthYngkwnIO8gL0BS/TuIF+9A1UY= -github.com/go-micro/plugins/broker/redis v0.0.0-20220408041722-48f19627b61b h1:0lleKa/ZqacCWNfX/chnHKDa4lfZN1D5DzkzWgov8EA= -github.com/go-micro/plugins/broker/redis v0.0.0-20220408041722-48f19627b61b/go.mod h1:y3Gk0HpHXaXANtc4gCyYqqAz+HCOP835B8TM+yZSg9A= -github.com/go-micro/plugins/client/grpc v0.0.0-20220408041722-48f19627b61b h1:56F4PRfgArGJbZLrC+ZenNKBX7wG+Cz20/nIFvZvfn0= -github.com/go-micro/plugins/client/grpc v0.0.0-20220408041722-48f19627b61b/go.mod h1:ScJfB8fafOaeZILtpLG+9YzpcclL22JL1zIRTao8QcQ= -github.com/go-micro/plugins/client/http v0.0.0-20220408041722-48f19627b61b h1:aYZIF7OE5Q+viiYt7H0edy4gHbGFYPk1QIFvpRQHWDI= -github.com/go-micro/plugins/client/http v0.0.0-20220408041722-48f19627b61b/go.mod h1:A1fL7p53dzXyCby9Ng/VVO+/DyNMuImXGXBFEqvkGlo= -github.com/go-micro/plugins/client/mucp v0.0.0-20220408041722-48f19627b61b h1:JsbjqO3RlqPpIGhMxglM8XpmnKKFxwS3cedDrkMancA= -github.com/go-micro/plugins/client/mucp v0.0.0-20220408041722-48f19627b61b/go.mod h1:iyJO06ntY5udOzMJMUbDK0XH+wTpF/rEon797zwv7Ko= -github.com/go-micro/plugins/config/encoder/toml v0.0.0-20220408041722-48f19627b61b h1:hjEYmrs1+h5Lx11gklMrLE6zo2XdZre2LJPFIfJmCN4= -github.com/go-micro/plugins/config/encoder/toml v0.0.0-20220408041722-48f19627b61b/go.mod h1:kopAiAOTMC3ZhAKnugfwsxFJrNLc1ELTRziIbqFeWsw= -github.com/go-micro/plugins/config/encoder/yaml v0.0.0-20220408041722-48f19627b61b h1:IqkqYUdZ5Pz13m2lBBTass8+39Zy96nSCydJblmrkVQ= -github.com/go-micro/plugins/config/encoder/yaml v0.0.0-20220408041722-48f19627b61b/go.mod h1:m4JfdP8uBtpS0UmSO/O7V8fN4PXmXc2+n7BCKWMVvmE= -github.com/go-micro/plugins/registry/consul v0.0.0-20220408041722-48f19627b61b h1:iu3ilGCvVgbL/mdIbba96GhsccRIixo9uZcWdZdgVss= -github.com/go-micro/plugins/registry/consul v0.0.0-20220408041722-48f19627b61b/go.mod h1:lLWEKb6/zxRAgIFM7Ke0Xw+je1rhkpHYaBCMwJzGKek= -github.com/go-micro/plugins/registry/etcd v0.0.0-20220408041722-48f19627b61b h1:9v52DyYgGjILzp5vBnA+ORcbv+RnWhYNvl7pRZBWwZQ= -github.com/go-micro/plugins/registry/etcd v0.0.0-20220408041722-48f19627b61b/go.mod h1:zQz4a2ubZyQUqTAF1LZqyjbEDStb7zCvYZ+X1qhauSA= -github.com/go-micro/plugins/registry/eureka v0.0.0-20220408041722-48f19627b61b h1:88po2psUpl5Iy2CsbU6WX0MDBA5BuyWK0T/8TfVBN0Q= -github.com/go-micro/plugins/registry/eureka v0.0.0-20220408041722-48f19627b61b/go.mod h1:xQkV146NoUp44Z/uwxXLfhepX5C95RMATfg6m7tVdWg= -github.com/go-micro/plugins/registry/gossip v0.0.0-20220408041722-48f19627b61b h1:DBnH+yJrJoGsTUmYLtTXZTmTwf6uA7bh5J6MLvqx1RM= -github.com/go-micro/plugins/registry/gossip v0.0.0-20220408041722-48f19627b61b/go.mod h1:Gz1aMxx3zm4HnjCW9Bl0JQEEGnGFdjO7o/pjbQi1Xl0= -github.com/go-micro/plugins/registry/kubernetes v0.0.0-20220408041722-48f19627b61b h1:97WVjKvDdqcOQMtwu5/uTqtGLpRaLEKZKN2D2KWB6wc= -github.com/go-micro/plugins/registry/kubernetes v0.0.0-20220408041722-48f19627b61b/go.mod h1:02jGYsgzWTGRIQyjeICMp4F07Zug55xh69iN7R+2KHc= -github.com/go-micro/plugins/registry/nacos v0.0.0-20220408041722-48f19627b61b h1:QEBrvey+sDRM+dF3OJMPsCQbO2bdCEpNt8emnU7gRZ8= -github.com/go-micro/plugins/registry/nacos v0.0.0-20220408041722-48f19627b61b/go.mod h1:nN6E53uM8Ye1p2binsOTnx2FwDoeG/dNBz/RHNr2DBc= -github.com/go-micro/plugins/registry/nats v0.0.0-20220408041722-48f19627b61b h1:TrCbwTdrFYmCV36j6lpGq633106EeqwJWcra5OP3ZVE= -github.com/go-micro/plugins/registry/nats v0.0.0-20220408041722-48f19627b61b/go.mod h1:zcUTGt82SqStHbRHgHyH8udKv7MG1Q51v+gIa15TGJo= -github.com/go-micro/plugins/registry/zookeeper v0.0.0-20220408041722-48f19627b61b h1:I6s9m/NvMp/gGLV8oTIQcYcQtYcdlgpoL1aYWf/Mq4Y= -github.com/go-micro/plugins/registry/zookeeper v0.0.0-20220408041722-48f19627b61b/go.mod h1:8+F8LMKJcQVX1Pw9BKgt8lrvNZiKfJoXUJmvQMXpIcI= -github.com/go-micro/plugins/server/http v0.0.0-20220408041722-48f19627b61b h1:MVaSzo1uL+a27RJWy/oIrWFOQtNWci/rXrkmQe5JN7w= -github.com/go-micro/plugins/server/http v0.0.0-20220408041722-48f19627b61b/go.mod h1:DWLnodv8T/lfIX3rGOGwyRwdkfzxNwq5skNrOW5uNTA= +github.com/go-micro/plugins/v4/broker/kafka v1.0.0 h1:cLpmFyjvf2CEPYCGsaSXoDImX7oiH8wIXv1TKoIhXn8= +github.com/go-micro/plugins/v4/broker/kafka v1.0.0/go.mod h1:MK69rzmyhmq9tDfXEIbVyxU0Mi2wk4dSVE7fdzqDf8s= +github.com/go-micro/plugins/v4/broker/mqtt v1.0.0 h1:xthhJ1R5SGkjqikTy/a8oj8mciuP8LelVrlqzYwUQtg= +github.com/go-micro/plugins/v4/broker/mqtt v1.0.0/go.mod h1:VnOEmiu/5XMp3DzwHnWMErIK6pzhp2CzcGRPmDibEn0= +github.com/go-micro/plugins/v4/broker/nats v1.0.0 h1:DO1myB3w3c78B9BmPJx2jbGtWS8czXnGmY+DAEnLJ98= +github.com/go-micro/plugins/v4/broker/nats v1.0.0/go.mod h1:Ug2YXLrwwk+kVXbh3QfHRhg2/zZ/LF2AAOGYQzdUVXw= +github.com/go-micro/plugins/v4/broker/rabbitmq v1.0.0 h1:epAblBp1bwni2yQGAD0VHSJgH9tu9YbfKm352/CK1M0= +github.com/go-micro/plugins/v4/broker/rabbitmq v1.0.0/go.mod h1:wTGNsETqOYZ73z9FqcpstsIvVGUsaVhNwU1whcJcxS0= +github.com/go-micro/plugins/v4/broker/redis v1.0.0 h1:ZbkzJiNA/DxgwZXGd6iaqJQnaYfDcvYlQ5JJ3oKi578= +github.com/go-micro/plugins/v4/broker/redis v1.0.0/go.mod h1:rEb11avyjdg9eEFFl1nbvK4MqvXWpt3Xd1TegDFaQMQ= +github.com/go-micro/plugins/v4/client/grpc v1.0.0 h1:OAQBt3gT8JBhJ3u8TFJwMP9XcvLFGy4bJU+fAUYTLIc= +github.com/go-micro/plugins/v4/client/grpc v1.0.0/go.mod h1:LmO2jnrlbHkfI3/E7fo8bgE6mDk0L0LVQyKR7crOkX8= +github.com/go-micro/plugins/v4/client/http v1.0.0 h1:XS1T6zOnRHOd3C/BJdrvrgV01Yb3P+J/p9tx3YXgQaM= +github.com/go-micro/plugins/v4/client/http v1.0.0/go.mod h1:dlsVJnbxbuJfwz0lXHdPXXP1qqSZzk5g4pAVZ13RC5E= +github.com/go-micro/plugins/v4/client/mucp v1.0.0 h1:yK63jbGsYnEPtbZHl5+oOcsW1SiXiWolEY2MtUOqIyM= +github.com/go-micro/plugins/v4/client/mucp v1.0.0/go.mod h1:P/1Z5/xepYfNWlo/+Hh8Wmha031Vya2qVmvsuCudj/8= +github.com/go-micro/plugins/v4/config/encoder/toml v1.0.0 h1:xrP2f5+nDfEEQvRFrHzqmpRsSZUe7TxTFMNGadmR164= +github.com/go-micro/plugins/v4/config/encoder/toml v1.0.0/go.mod h1:bYMRT1ROIP9plXgdqgALHuPioBmFZxUtfm0IQ3eqEbE= +github.com/go-micro/plugins/v4/config/encoder/yaml v1.0.0 h1:sAWMKBEiCA0OgG/d7y1Lag6bNJNajHD/ZRZT4iXSmA4= +github.com/go-micro/plugins/v4/config/encoder/yaml v1.0.0/go.mod h1:hyTGSX1nT58n/rCukaWQf4sps+HbJEtZ6ys8yUh985U= +github.com/go-micro/plugins/v4/registry/consul v1.0.0 h1:LHW9vfKxa6+LoHi2LwtoTZj7l17gtcD7dRiIm5UTME0= +github.com/go-micro/plugins/v4/registry/consul v1.0.0/go.mod h1:7dTm1ciJZVVUT9PFZVPTrvyvZNh4TPZnuXGyINnEioE= +github.com/go-micro/plugins/v4/registry/etcd v1.0.0 h1:JAb7M4Vxvanh7dxnbgPJbcHeDiV08YFAdsN2NVGCdaU= +github.com/go-micro/plugins/v4/registry/etcd v1.0.0/go.mod h1:QbgJQQImYfQJgfdrnP+ZRls2GWZ+ncfSn7Vp3UVlntg= +github.com/go-micro/plugins/v4/registry/eureka v1.0.0 h1:e39dOoJFlAhvrLAoMkaj9MPLozOttUfE0SKRT56hPTY= +github.com/go-micro/plugins/v4/registry/eureka v1.0.0/go.mod h1:9+aVUZ5bqulrWRaVsyZkeFHjWIPx1LMQXrkP1uRdgYs= +github.com/go-micro/plugins/v4/registry/gossip v1.0.0 h1:k8cWNfAqyyMBGJAS2RARbWLYB9/jCHhDPfuz068h5VQ= +github.com/go-micro/plugins/v4/registry/gossip v1.0.0/go.mod h1:8PD8b4IagPZ/7F+nlwcaNGzOLfbpeb0R7N8oAcEMS1M= +github.com/go-micro/plugins/v4/registry/kubernetes v1.0.0 h1:C/6cWtwXw2eMVupDU0kY6zo60ZGemWdGBZtOc6LOEKQ= +github.com/go-micro/plugins/v4/registry/kubernetes v1.0.0/go.mod h1:zRn2eRRSu/Jql5pPesOjTUnedYSlml9rMVpCzw8Zvng= +github.com/go-micro/plugins/v4/registry/nacos v1.0.0 h1:7aEVUUCpSH2Wjzv2EVB7kWcfk0WNSIoyFu0fLHlsC9I= +github.com/go-micro/plugins/v4/registry/nacos v1.0.0/go.mod h1:3pCK+8gBVBN4bMVmKATrS3YqxlfvCsP54NJqFvbcUJg= +github.com/go-micro/plugins/v4/registry/nats v1.0.0 h1:8X5gitlE546kY+k7hdNoY4mciebHXsAipZEYftnZ1qY= +github.com/go-micro/plugins/v4/registry/nats v1.0.0/go.mod h1:Sq9N8ETykCmWVhj2/Hrc9268rl6TTsEIoSXaqsFvgk0= +github.com/go-micro/plugins/v4/registry/zookeeper v1.0.0 h1:XKU/LlCe05/qCt/vMAXlI2y8V5CD3uV/6Kzqg/smlec= +github.com/go-micro/plugins/v4/registry/zookeeper v1.0.0/go.mod h1:TzTuOK75tgmKp/rMsd5KKW2aPQaMwpBgV0CkWJRfjik= +github.com/go-micro/plugins/v4/server/http v1.0.0 h1:cuSp4F8uS7sWjvmsJ8M4k18rZF3AxA2qdLA6kFxPktM= +github.com/go-micro/plugins/v4/server/http v1.0.0/go.mod h1:E8eoUONK91jcMpvkcFUsqbgDyKyri3x7ty2GuM5SsI0= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= @@ -775,8 +775,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/swaggo/files v0.0.0-20210815190702-a29dd2bc99b2/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w= -github.com/swaggo/gin-swagger v1.4.1 h1:F2vJndw+Q+ZBOlsC6CaodqXJV3ZOf6hpg/4Y6MEx5BM= -github.com/swaggo/gin-swagger v1.4.1/go.mod h1:hmJ1vPn+XjUvnbzjCdUAxVqgraxELxk8x5zAsjCE5mg= +github.com/swaggo/gin-swagger v1.4.2 h1:qDs1YrBOTnurDG/JVMc8678KhoS1B1okQGPtIqVz4YU= +github.com/swaggo/gin-swagger v1.4.2/go.mod h1:hmJ1vPn+XjUvnbzjCdUAxVqgraxELxk8x5zAsjCE5mg= github.com/swaggo/swag v1.7.9/go.mod h1:gZ+TJ2w/Ve1RwQsA2IRoSOTidHz6DX+PIG8GWvbnoLU= github.com/swaggo/swag v1.8.1 h1:JuARzFX1Z1njbCGz+ZytBR15TFJwF2Q7fu8puJHhQYI= github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ= diff --git a/handler/client/service.go b/handler/client/service.go index ef5e1e1..a4fed86 100644 --- a/handler/client/service.go +++ b/handler/client/service.go @@ -9,9 +9,9 @@ import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/render" "github.com/go-micro/dashboard/handler/route" - cgrpc "github.com/go-micro/plugins/client/grpc" - chttp "github.com/go-micro/plugins/client/http" - cmucp "github.com/go-micro/plugins/client/mucp" + cgrpc "github.com/go-micro/plugins/v4/client/grpc" + chttp "github.com/go-micro/plugins/v4/client/http" + cmucp "github.com/go-micro/plugins/v4/client/mucp" "go-micro.dev/v4/client" debug "go-micro.dev/v4/debug/proto" "go-micro.dev/v4/errors" diff --git a/main.go b/main.go index 38267d1..0c40920 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,7 @@ import ( "github.com/gin-gonic/gin" "github.com/go-micro/dashboard/config" "github.com/go-micro/dashboard/handler" - "github.com/go-micro/plugins/server/http" + "github.com/go-micro/plugins/v4/server/http" "go-micro.dev/v4" "go-micro.dev/v4/logger" ) diff --git a/plugins.go b/plugins.go index 6e36fba..5b98789 100644 --- a/plugins.go +++ b/plugins.go @@ -1,18 +1,18 @@ package main import ( - _ "github.com/go-micro/plugins/broker/kafka" - _ "github.com/go-micro/plugins/broker/mqtt" - _ "github.com/go-micro/plugins/broker/nats" - _ "github.com/go-micro/plugins/broker/rabbitmq" - _ "github.com/go-micro/plugins/broker/redis" + _ "github.com/go-micro/plugins/v4/broker/kafka" + _ "github.com/go-micro/plugins/v4/broker/mqtt" + _ "github.com/go-micro/plugins/v4/broker/nats" + _ "github.com/go-micro/plugins/v4/broker/rabbitmq" + _ "github.com/go-micro/plugins/v4/broker/redis" - _ "github.com/go-micro/plugins/registry/consul" - _ "github.com/go-micro/plugins/registry/etcd" - _ "github.com/go-micro/plugins/registry/eureka" - _ "github.com/go-micro/plugins/registry/gossip" - _ "github.com/go-micro/plugins/registry/kubernetes" - _ "github.com/go-micro/plugins/registry/nacos" - _ "github.com/go-micro/plugins/registry/nats" - _ "github.com/go-micro/plugins/registry/zookeeper" + _ "github.com/go-micro/plugins/v4/registry/consul" + _ "github.com/go-micro/plugins/v4/registry/etcd" + _ "github.com/go-micro/plugins/v4/registry/eureka" + _ "github.com/go-micro/plugins/v4/registry/gossip" + _ "github.com/go-micro/plugins/v4/registry/kubernetes" + _ "github.com/go-micro/plugins/v4/registry/nacos" + _ "github.com/go-micro/plugins/v4/registry/nats" + _ "github.com/go-micro/plugins/v4/registry/zookeeper" )