Merge branch 'go-micro-main'

Author: wantao

.github/workflows/ci.yml

@@ -25,9 +25,9 @@ jobs:
 
       - name: Set up Go
         if: steps.changes.outputs.backend == 'true'
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.18
+          go-version: '1.20'
 
       - name: Test Backend
         if: steps.changes.outputs.backend == 'true'

Dockerfile

@@ -8,7 +8,7 @@ RUN npm install -g @angular/cli && \
     npm install && \
     npm run build
 
-FROM golang:1.18 as backend-builder
+FROM golang:1.20 as backend-builder
 
 WORKDIR /micro
 

config/config.go

@@ -4,7 +4,7 @@ import "time"
 
 const (
 	Name    = "go.micro.dashboard"
-	Version = "1.4.3"
+	Version = "1.4.5"
 )
 
 const (

frontend/src/app/layout/passport/passport.component.html

@@ -3,12 +3,11 @@
     <div class="top">
       <div class="head">
         <img class="logo" src="./assets/logo-color.png" />
-        <p class="title">Go Micro Dashboard</p>
       </div>
     </div>
     <router-outlet></router-outlet>
     <global-footer>
-      <a href="https://github.com/xpunch" target="_blank">X Punch</a>
+      <a href="https://github.com/go-micro/dashboard" target="_blank">Github</a>
       <p>{{ version }}</p>
     </global-footer>
   </div>

frontend/src/app/layout/passport/passport.component.less

@@ -54,7 +54,7 @@
     height: 96px;
     margin-top: 64px;
     margin-right: 16px;
-    margin-bottom: 16px;
+    margin-bottom: 64px;
   }
   .title {
     position: relative;

frontend/src/assets/logo-color.png

@@ -1,6 +1,6 @@
 /* You can add global styles to this file, and also import other style files */
 .alain-default__header-logo-expanded{
-    max-height: 48px;
+    max-height: 80px;
 }
 
 .alain-default__header-logo-collapsed{

frontend/src/assets/logo-full.png

@@ -1,9 +1,8 @@
 module github.com/go-micro/dashboard
 
-go 1.18
+go 1.20
 
 require (
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/gin-gonic/gin v1.8.1
 	github.com/go-micro/plugins/v4/broker/kafka v1.2.0
@@ -27,32 +26,28 @@ require (
 	github.com/go-micro/plugins/v4/registry/zookeeper v1.2.0
 	github.com/go-micro/plugins/v4/server/http v1.2.0
 	github.com/go-micro/plugins/v4/transport/grpc v1.2.0
-	github.com/go-micro/plugins/v4/transport/nats v1.2.0
-	github.com/go-micro/plugins/v4/transport/quic v1.1.0
-	github.com/go-micro/plugins/v4/transport/rabbitmq v1.1.0
-	github.com/go-micro/plugins/v4/transport/tcp v1.1.0
-	github.com/go-micro/plugins/v4/transport/utp v1.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a
 	github.com/swaggo/gin-swagger v1.5.3
 	github.com/swaggo/swag v1.8.8
-	go-micro.dev/v4 v4.9.0
-	golang.org/x/net v0.2.0
+	go-micro.dev/v4 v4.10.0
+	golang.org/x/net v0.8.0
 )
 
 require (
 	github.com/BurntSushi/toml v1.2.1 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/Microsoft/go-winio v0.6.0 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
-	github.com/Shopify/sarama v1.37.2 // indirect
+	github.com/Shopify/sarama v1.30.1 // indirect
 	github.com/acomagu/bufpipe v1.0.3 // indirect
 	github.com/aliyun/alibaba-cloud-sdk-go v1.62.68 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bitly/go-simplejson v0.5.0 // indirect
+	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
+	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/clbanning/mxj v1.8.4 // indirect
 	github.com/cloudflare/circl v1.3.0 // indirect
@@ -147,7 +142,7 @@ require (
 	github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
-	github.com/pierrec/lz4/v4 v4.1.17 // indirect
+	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
 	github.com/pjbgf/sha1cd v0.2.3 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
@@ -167,19 +162,19 @@ require (
 	go.etcd.io/etcd/client/pkg/v3 v3.5.6 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.6 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.21.0 // indirect
 	golang.org/x/crypto v0.3.0 // indirect
-	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/oauth2 v0.2.0 // indirect
+	golang.org/x/mod v0.9.0 // indirect
+	golang.org/x/oauth2 v0.4.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	golang.org/x/time v0.2.0 // indirect
-	golang.org/x/tools v0.3.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
+	golang.org/x/tools v0.7.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd // indirect
-	google.golang.org/grpc v1.51.0 // indirect
+	google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
+	google.golang.org/grpc v1.53.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/gcfg.v1 v1.2.3 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect