style(format): code format

ajithdesilva · Jul 9, 2020 · 45926f1 · 45926f1
1 parent ffed452
commit 45926f1
Show file tree

Hide file tree

Showing 161 changed files with 425 additions and 264 deletions.
diff --git a/Makefile b/Makefile
@@ -106,6 +106,7 @@ lint: fmt golint govet cilint
 
 fmt:
 	GO111MODULE=off go fmt ./...
+	GO111MODULE=off goimports -l -w .
 
 govet:
 	GO111MODULE=off go vet ./...

diff --git a/adapter/adapter.go b/adapter/adapter.go
@@ -7,6 +7,8 @@ package adapter
 import (
 	"bytes"
 	"fmt"
+	"net/url"
+
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/modules/auth"
 	"github.com/GoAdminGroup/go-admin/modules/config"
@@ -18,7 +20,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/plugins/admin/models"
 	"github.com/GoAdminGroup/go-admin/template"
 	"github.com/GoAdminGroup/go-admin/template/types"
-	"net/url"
 )
 
 // WebFrameWork is an interface which is used as an adapter of

diff --git a/adapter/beego/beego.go b/adapter/beego/beego.go
@@ -7,6 +7,10 @@ package beego
 import (
 	"bytes"
 	"errors"
+	"net/http"
+	"net/url"
+	"strings"
+
 	"github.com/GoAdminGroup/go-admin/adapter"
 	gctx "github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/engine"
@@ -17,9 +21,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/context"
-	"net/http"
-	"net/url"
-	"strings"
 )
 
 // Beego structure value is a Beego GoAdmin adapter.

diff --git a/adapter/buffalo/buffalo.go b/adapter/buffalo/buffalo.go
@@ -7,6 +7,11 @@ package buffalo
 import (
 	"bytes"
 	"errors"
+	"net/http"
+	neturl "net/url"
+	"regexp"
+	"strings"
+
 	"github.com/GoAdminGroup/go-admin/adapter"
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/engine"
@@ -16,10 +21,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/constant"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/gobuffalo/buffalo"
-	"net/http"
-	neturl "net/url"
-	"regexp"
-	"strings"
 )
 
 // Buffalo structure value is a Buffalo GoAdmin adapter.

diff --git a/adapter/chi/chi.go b/adapter/chi/chi.go
@@ -7,6 +7,11 @@ package chi
 import (
 	"bytes"
 	"errors"
+	"net/http"
+	"net/url"
+	"regexp"
+	"strings"
+
 	"github.com/GoAdminGroup/go-admin/adapter"
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/engine"
@@ -16,10 +21,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/constant"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/go-chi/chi"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strings"
 )
 
 // Chi structure value is a Chi GoAdmin adapter.

diff --git a/adapter/echo/echo.go b/adapter/echo/echo.go
@@ -7,6 +7,10 @@ package echo
 import (
 	"bytes"
 	"errors"
+	"net/http"
+	"net/url"
+	"strings"
+
 	"github.com/GoAdminGroup/go-admin/adapter"
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/engine"
@@ -16,9 +20,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/constant"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/labstack/echo/v4"
-	"net/http"
-	"net/url"
-	"strings"
 )
 
 // Echo structure value is an Echo GoAdmin adapter.

diff --git a/adapter/fasthttp/fasthttp.go b/adapter/fasthttp/fasthttp.go
@@ -7,6 +7,11 @@ package fasthttp
 import (
 	"bytes"
 	"errors"
+	"io"
+	"net/http"
+	"net/url"
+	"strings"
+
 	"github.com/GoAdminGroup/go-admin/adapter"
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/engine"
@@ -17,10 +22,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/buaazp/fasthttprouter"
 	"github.com/valyala/fasthttp"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
 )
 
 // Fasthttp structure value is a Fasthttp GoAdmin adapter.

diff --git a/adapter/gf/gf.go b/adapter/gf/gf.go
@@ -7,6 +7,11 @@ package gf
 import (
 	"bytes"
 	"errors"
+	"net/http"
+	"net/url"
+	"regexp"
+	"strings"
+
 	"github.com/GoAdminGroup/go-admin/adapter"
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/engine"
@@ -16,10 +21,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/constant"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/gogf/gf/net/ghttp"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strings"
 )
 
 // Gf structure value is a Gf GoAdmin adapter.

diff --git a/adapter/gin/gin.go b/adapter/gin/gin.go
@@ -7,6 +7,10 @@ package gin
 import (
 	"bytes"
 	"errors"
+	"net/http"
+	"net/url"
+	"strings"
+
 	"github.com/GoAdminGroup/go-admin/adapter"
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/engine"
@@ -16,9 +20,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/constant"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/gin-gonic/gin"
-	"net/http"
-	"net/url"
-	"strings"
 )
 
 // Gin structure value is a Gin GoAdmin adapter.

diff --git a/adapter/gorilla/gorilla.go b/adapter/gorilla/gorilla.go
@@ -7,6 +7,11 @@ package gorilla
 import (
 	"bytes"
 	"errors"
+	"net/http"
+	"net/url"
+	"regexp"
+	"strings"
+
 	"github.com/GoAdminGroup/go-admin/adapter"
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/engine"
@@ -16,10 +21,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/constant"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/gorilla/mux"
-	"net/http"
-	"net/url"
-	"regexp"
-	"strings"
 )
 
 // Gorilla structure value is a Gorilla GoAdmin adapter.

diff --git a/adapter/iris/iris.go b/adapter/iris/iris.go
@@ -7,13 +7,14 @@ package iris
 import (
 	"bytes"
 	"errors"
+	"net/http"
+	"net/url"
+	"strings"
+
 	"github.com/GoAdminGroup/go-admin/adapter"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/models"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/kataras/iris/v12"
-	"net/http"
-	"net/url"
-	"strings"
 
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/engine"

diff --git a/context/context.go b/context/context.go
@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/GoAdminGroup/go-admin/modules/constant"
 	"io"
 	"io/ioutil"
 	"math"
@@ -20,6 +19,8 @@ import (
 	"path"
 	"strings"
 	"time"
+
+	"github.com/GoAdminGroup/go-admin/modules/constant"
 )
 
 const abortIndex int8 = math.MaxInt8 / 2

diff --git a/context/context_test.go b/context/context_test.go
@@ -2,8 +2,9 @@ package context
 
 import (
 	"fmt"
-	"github.com/magiconair/properties/assert"
 	"testing"
+
+	"github.com/magiconair/properties/assert"
 )
 
 func TestSlash(t *testing.T) {

diff --git a/engine/engine.go b/engine/engine.go
@@ -9,14 +9,15 @@ import (
 	"encoding/json"
 	errors2 "errors"
 	"fmt"
-	"github.com/GoAdminGroup/go-admin/modules/language"
-	"github.com/GoAdminGroup/go-admin/template/icon"
-	"github.com/GoAdminGroup/go-admin/template/types/action"
 	template2 "html/template"
 	"net/http"
 	"runtime/debug"
 	"strings"
 
+	"github.com/GoAdminGroup/go-admin/modules/language"
+	"github.com/GoAdminGroup/go-admin/template/icon"
+	"github.com/GoAdminGroup/go-admin/template/types/action"
+
 	"github.com/GoAdminGroup/go-admin/adapter"
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/modules/auth"

diff --git a/examples/datamodel/content.go b/examples/datamodel/content.go
@@ -1,6 +1,8 @@
 package datamodel
 
 import (
+	"html/template"
+
 	"github.com/GoAdminGroup/go-admin/context"
 	tmpl "github.com/GoAdminGroup/go-admin/template"
 	"github.com/GoAdminGroup/go-admin/template/chartjs"
@@ -12,7 +14,6 @@ import (
 	"github.com/GoAdminGroup/themes/adminlte/components/productlist"
 	"github.com/GoAdminGroup/themes/adminlte/components/progress_group"
 	"github.com/GoAdminGroup/themes/adminlte/components/smallbox"
-	"html/template"
 )
 
 // GetContent return the content of index page.

diff --git a/examples/datamodel/posts.go b/examples/datamodel/posts.go
@@ -1,14 +1,15 @@
 package datamodel
 
 import (
+	template2 "html/template"
+
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/modules/db"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules/table"
 	"github.com/GoAdminGroup/go-admin/template"
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/GoAdminGroup/go-admin/template/types/form"
 	editType "github.com/GoAdminGroup/go-admin/template/types/table"
-	template2 "html/template"
 )
 
 // GetPostsTable return the model of table posts.

diff --git a/examples/datamodel/user.go b/examples/datamodel/user.go
@@ -2,6 +2,7 @@ package datamodel
 
 import (
 	"fmt"
+
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/modules/db"
 	form2 "github.com/GoAdminGroup/go-admin/plugins/admin/modules/form"
@@ -11,7 +12,7 @@ import (
 	"github.com/GoAdminGroup/go-admin/template/types"
 	"github.com/GoAdminGroup/go-admin/template/types/action"
 	"github.com/GoAdminGroup/go-admin/template/types/form"
-	"github.com/GoAdminGroup/go-admin/template/types/form/select"
+	selection "github.com/GoAdminGroup/go-admin/template/types/form/select"
 	editType "github.com/GoAdminGroup/go-admin/template/types/table"
 )
 

diff --git a/modules/auth/auth.go b/modules/auth/auth.go
@@ -5,13 +5,14 @@
 package auth
 
 import (
+	"sync"
+
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/modules/db"
 	"github.com/GoAdminGroup/go-admin/modules/service"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/models"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules"
 	"golang.org/x/crypto/bcrypt"
-	"sync"
 )
 
 // Auth get the user model from Context.

diff --git a/modules/auth/auth_test.go b/modules/auth/auth_test.go
@@ -1,8 +1,9 @@
 package auth
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestEncodePassword(t *testing.T) {

diff --git a/modules/auth/middleware.go b/modules/auth/middleware.go
@@ -5,6 +5,9 @@
 package auth
 
 import (
+	"net/http"
+	"net/url"
+
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/modules/config"
 	"github.com/GoAdminGroup/go-admin/modules/constant"
@@ -16,8 +19,6 @@ import (
 	"github.com/GoAdminGroup/go-admin/plugins/admin/models"
 	template2 "github.com/GoAdminGroup/go-admin/template"
 	"github.com/GoAdminGroup/go-admin/template/types"
-	"net/http"
-	"net/url"
 )
 
 // Invoker contains the callback functions which are used

diff --git a/modules/auth/middleware_test.go b/modules/auth/middleware_test.go
@@ -1,11 +1,12 @@
 package auth
 
 import (
+	"net/url"
+	"testing"
+
 	"github.com/GoAdminGroup/go-admin/modules/config"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/models"
 	"github.com/stretchr/testify/assert"
-	"net/url"
-	"testing"
 )
 
 func TestCheckPermissions(t *testing.T) {

diff --git a/modules/auth/session.go b/modules/auth/session.go
@@ -6,15 +6,16 @@ package auth
 
 import (
 	"encoding/json"
+	"net/http"
+	"strconv"
+	"time"
+
 	"github.com/GoAdminGroup/go-admin/context"
 	"github.com/GoAdminGroup/go-admin/modules/config"
 	"github.com/GoAdminGroup/go-admin/modules/db"
 	"github.com/GoAdminGroup/go-admin/modules/db/dialect"
 	"github.com/GoAdminGroup/go-admin/modules/logger"
 	"github.com/GoAdminGroup/go-admin/plugins/admin/modules"
-	"net/http"
-	"strconv"
-	"time"
 )
 
 const DefaultCookieKey = "go_admin_session"