You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/07/09 10:41:15 UTC
[incubator-apisix-dashboard] branch master updated: fix goimport
bug (#301)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git
The following commit(s) were added to refs/heads/master by this push:
new 605c1f3 fix goimport bug (#301)
605c1f3 is described below
commit 605c1f3cccc114fef072764dcb63cc4a79d98138
Author: kv <gx...@163.com>
AuthorDate: Thu Jul 9 18:41:08 2020 +0800
fix goimport bug (#301)
---
api/filter/request_id.go | 1 +
api/route/consumer.go | 1 +
api/route/route.go | 1 +
api/route/ssl.go | 1 +
api/route/upstream.go | 1 +
api/service/base.go | 1 +
api/service/consumer.go | 1 +
api/service/consumer_test.go | 4 ++--
api/service/route.go | 1 +
api/service/ssl.go | 1 +
api/service/ssl_test.go | 4 ++--
api/service/upstream.go | 1 +
12 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/api/filter/request_id.go b/api/filter/request_id.go
index 4bda17c..f4cf521 100644
--- a/api/filter/request_id.go
+++ b/api/filter/request_id.go
@@ -18,6 +18,7 @@ package filter
import (
"github.com/gin-gonic/gin"
+ uuid "github.com/satori/go.uuid"
)
func RequestId() gin.HandlerFunc {
diff --git a/api/route/consumer.go b/api/route/consumer.go
index a66e89f..8c442b6 100644
--- a/api/route/consumer.go
+++ b/api/route/consumer.go
@@ -25,6 +25,7 @@ import (
"github.com/apisix/manager-api/conf"
"github.com/apisix/manager-api/errno"
"github.com/apisix/manager-api/service"
+ uuid "github.com/satori/go.uuid"
)
func AppendConsumer(r *gin.Engine) *gin.Engine {
diff --git a/api/route/route.go b/api/route/route.go
index 234ad23..82d5106 100644
--- a/api/route/route.go
+++ b/api/route/route.go
@@ -25,6 +25,7 @@ import (
"github.com/apisix/manager-api/errno"
"github.com/apisix/manager-api/service"
"github.com/gin-gonic/gin"
+ uuid "github.com/satori/go.uuid"
)
func AppendRoute(r *gin.Engine) *gin.Engine {
diff --git a/api/route/ssl.go b/api/route/ssl.go
index 46257e9..7b62b49 100644
--- a/api/route/ssl.go
+++ b/api/route/ssl.go
@@ -25,6 +25,7 @@ import (
"github.com/apisix/manager-api/conf"
"github.com/apisix/manager-api/errno"
"github.com/apisix/manager-api/service"
+ uuid "github.com/satori/go.uuid"
)
func AppendSsl(r *gin.Engine) *gin.Engine {
diff --git a/api/route/upstream.go b/api/route/upstream.go
index 2c3c9ac..263b8be 100644
--- a/api/route/upstream.go
+++ b/api/route/upstream.go
@@ -10,6 +10,7 @@ import (
"github.com/apisix/manager-api/errno"
"github.com/apisix/manager-api/service"
"github.com/gin-gonic/gin"
+ uuid "github.com/satori/go.uuid"
)
func AppendUpstream(r *gin.Engine) *gin.Engine {
diff --git a/api/service/base.go b/api/service/base.go
index 02429e8..8ed5f5c 100644
--- a/api/service/base.go
+++ b/api/service/base.go
@@ -20,6 +20,7 @@ import (
"time"
"github.com/jinzhu/gorm"
+ uuid "github.com/satori/go.uuid"
)
// Base contains common columns for all tables.
diff --git a/api/service/consumer.go b/api/service/consumer.go
index 0dde8d9..a29dde6 100644
--- a/api/service/consumer.go
+++ b/api/service/consumer.go
@@ -23,6 +23,7 @@ import (
"github.com/apisix/manager-api/conf"
"github.com/apisix/manager-api/errno"
"github.com/apisix/manager-api/utils"
+ uuid "github.com/satori/go.uuid"
)
type Consumer struct {
diff --git a/api/service/consumer_test.go b/api/service/consumer_test.go
index 54076b2..ea1a077 100644
--- a/api/service/consumer_test.go
+++ b/api/service/consumer_test.go
@@ -19,9 +19,9 @@ package service
import (
"testing"
- "github.com/stretchr/testify/assert"
-
"github.com/apisix/manager-api/errno"
+ uuid "github.com/satori/go.uuid"
+ "github.com/stretchr/testify/assert"
)
var (
diff --git a/api/service/route.go b/api/service/route.go
index 8d90427..ea7e535 100644
--- a/api/service/route.go
+++ b/api/service/route.go
@@ -25,6 +25,7 @@ import (
"github.com/apisix/manager-api/errno"
"github.com/apisix/manager-api/log"
"github.com/apisix/manager-api/utils"
+ uuid "github.com/satori/go.uuid"
)
const (
diff --git a/api/service/ssl.go b/api/service/ssl.go
index ff33e2c..08dea43 100644
--- a/api/service/ssl.go
+++ b/api/service/ssl.go
@@ -27,6 +27,7 @@ import (
"github.com/apisix/manager-api/conf"
"github.com/apisix/manager-api/errno"
"github.com/apisix/manager-api/utils"
+ uuid "github.com/satori/go.uuid"
)
type Ssl struct {
diff --git a/api/service/ssl_test.go b/api/service/ssl_test.go
index b07cd66..46607e8 100644
--- a/api/service/ssl_test.go
+++ b/api/service/ssl_test.go
@@ -20,9 +20,9 @@ import (
"strings"
"testing"
- "github.com/stretchr/testify/assert"
-
"github.com/apisix/manager-api/errno"
+ uuid "github.com/satori/go.uuid"
+ "github.com/stretchr/testify/assert"
)
var (
diff --git a/api/service/upstream.go b/api/service/upstream.go
index 188273a..0302ea9 100644
--- a/api/service/upstream.go
+++ b/api/service/upstream.go
@@ -7,6 +7,7 @@ import (
"github.com/apisix/manager-api/conf"
"github.com/apisix/manager-api/errno"
"github.com/apisix/manager-api/utils"
+ uuid "github.com/satori/go.uuid"
)
type UpstreamDao struct {