feat(import): resort import

morehao · Nov 30, 2024 · d415561 · d415561
1 parent c42e08a
commit d415561
Show file tree

Hide file tree

Showing 30 changed files with 61 additions and 46 deletions.
diff --git a/codeGen/db.go b/codeGen/db.go
@@ -3,6 +3,7 @@ package codeGen
 import (
 	"database/sql"
 	"fmt"
+
 	"gorm.io/gorm"
 )
 

diff --git a/codeGen/gen.go b/codeGen/gen.go
@@ -2,9 +2,10 @@ package codeGen
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/morehao/go-tools/gutils"
 	"gorm.io/gorm"
-	"strings"
 )
 
 type Generator interface {

diff --git a/codeGen/gen_test.go b/codeGen/gen_test.go
@@ -2,11 +2,12 @@ package codeGen
 
 import (
 	"fmt"
+	"os"
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
-	"os"
-	"testing"
 )
 
 func TestGenModuleCode(t *testing.T) {

diff --git a/codeGen/mysql.go b/codeGen/mysql.go
@@ -2,6 +2,7 @@ package codeGen
 
 import (
 	"fmt"
+
 	"github.com/morehao/go-tools/gutils"
 	"gorm.io/gorm"
 )

diff --git a/codeGen/template.go b/codeGen/template.go
@@ -2,11 +2,12 @@ package codeGen
 
 import (
 	"fmt"
-	"github.com/morehao/go-tools/gast"
-	"github.com/morehao/go-tools/gutils"
 	"os"
 	"strings"
 	"text/template"
+
+	"github.com/morehao/go-tools/gast"
+	"github.com/morehao/go-tools/gutils"
 )
 
 const (

diff --git a/conf/conf.go b/conf/conf.go
@@ -2,8 +2,9 @@ package conf
 
 import (
 	"fmt"
-	"gopkg.in/yaml.v3"
 	"os"
+
+	"gopkg.in/yaml.v3"
 )
 
 func LoadConfig(filepath string, dest interface{}) {

diff --git a/dbClient/mysql.go b/dbClient/mysql.go
@@ -2,9 +2,10 @@ package dbClient
 
 import (
 	"fmt"
+	"time"
+
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
-	"time"
 )
 
 type MysqlConfig struct {

diff --git a/dbClient/mysql_test.go b/dbClient/mysql_test.go
@@ -2,11 +2,12 @@ package dbClient
 
 import (
 	"context"
+	"testing"
+
 	"github.com/morehao/go-tools/glog"
 	"github.com/morehao/go-tools/gutils"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
-	"testing"
 )
 
 func TestInitMysql(t *testing.T) {

diff --git a/dbClient/orm_logger.go b/dbClient/orm_logger.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"time"
+
 	"github.com/morehao/go-tools/glog"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/utils"
-	"time"
 )
 
 type ormLogger struct {

diff --git a/dbClient/redis.go b/dbClient/redis.go
@@ -3,12 +3,13 @@ package dbClient
 import (
 	"context"
 	"fmt"
-	"github.com/morehao/go-tools/glog"
-	"github.com/redis/go-redis/v9"
-	"go.uber.org/zap"
 	"net"
 	"strings"
 	"time"
+
+	"github.com/morehao/go-tools/glog"
+	"github.com/redis/go-redis/v9"
+	"go.uber.org/zap"
 )
 
 type RedisConfig struct {

diff --git a/dbClient/redis_test.go b/dbClient/redis_test.go
@@ -2,10 +2,11 @@ package dbClient
 
 import (
 	"context"
+	"testing"
+
 	"github.com/morehao/go-tools/glog"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
-	"testing"
 )
 
 func TestInitRedis(t *testing.T) {

diff --git a/gast/analysis_test.go b/gast/analysis_test.go
@@ -2,12 +2,13 @@ package gast
 
 import (
 	"bytes"
-	"github.com/stretchr/testify/assert"
 	"go/parser"
 	"go/printer"
 	"go/token"
 	"os"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestParseFile(t *testing.T) {

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

diff --git a/gast/test.go b/gast/test.go
@@ -2,6 +2,7 @@ package gast
 
 import (
 	"fmt"
+
 	"github.com/gin-gonic/gin"
 )
 

diff --git a/gcli/cmd/generate/config.go b/gcli/cmd/generate/config.go
@@ -20,7 +20,6 @@ type CodeGen struct {
 }
 
 type ModuleConfig struct {
-	TplDir             string `yaml:"tpl_dir"`               // 模板目录
 	InternalAppRootDir string `yaml:"internal_app_root_dir"` // 项目内当前项目的根目录，如internal/genCode
 	ProjectRootDir     string `yaml:"project_root_dir"`      // 项目根目录，如go-gin-web
 	Description        string `yaml:"description"`           // 描述
@@ -32,7 +31,6 @@ type ModuleConfig struct {
 }
 
 type ModelConfig struct {
-	TplDir             string `yaml:"tpl_dir"`               // 模板目录
 	InternalAppRootDir string `yaml:"internal_app_root_dir"` // 项目内当前项目的根目录，如internal/genCode
 	ProjectRootDir     string `yaml:"project_root_dir"`      // import目录前缀
 	Description        string `yaml:"description"`           // 描述
@@ -41,7 +39,6 @@ type ModelConfig struct {
 }
 
 type ApiConfig struct {
-	TplDir             string `yaml:"tpl_dir"`               // 模板目录
 	InternalAppRootDir string `yaml:"internal_app_root_dir"` // 项目内当前项目的根目录，如internal/genCode
 	ProjectRootDir     string `yaml:"project_root_dir"`      // import目录前缀
 	Description        string `yaml:"description"`           // 描述
@@ -55,12 +52,3 @@ type ApiConfig struct {
 	ApiPrefix          string `yaml:"api_prefix"`            // api前缀
 	ApiSuffix          string `yaml:"api_suffix"`            // api后缀
 }
-
-const (
-	ModeModule = "module"
-	ModeModel  = "model"
-	ModeApi    = "api"
-
-	HttpMethodGET  = "GET"
-	HttpMethodPOST = "POST"
-)
diff --git a/gcli/cmd/generate/generate.go b/gcli/cmd/generate/generate.go
@@ -30,7 +30,7 @@ var Cmd = &cobra.Command{
 		// 初始化配置和 MySQL 客户端
 		if cfg == nil {
 			workDir, _ := os.Getwd()
-			configFilepath := filepath.Join(workDir, "config", "config_generate.yaml")
+			configFilepath := filepath.Join(workDir, "config", "config.yaml")
 			conf.LoadConfig(configFilepath, &cfg)
 		}
 

diff --git a/gcontext/ginRender/render.go b/gcontext/ginRender/render.go
@@ -1,11 +1,12 @@
 package ginRender
 
 import (
+	"net/http"
+
 	"github.com/gin-gonic/gin"
 	"github.com/morehao/go-tools/gcontext"
 	"github.com/morehao/go-tools/gerror"
 	"github.com/pkg/errors"
-	"net/http"
 )
 
 func Success(ctx *gin.Context, data any) {

diff --git a/gerror/error.go b/gerror/error.go
@@ -2,6 +2,7 @@ package gerror
 
 import (
 	"fmt"
+
 	"github.com/pkg/errors"
 )
 

diff --git a/glog/zap_logger.go b/glog/zap_logger.go
@@ -3,14 +3,14 @@ package glog
 import (
 	"context"
 	"fmt"
-	"go.uber.org/zap/buffer"
 	"io"
 	"os"
 	"path"
 	"strings"
 	"time"
 
 	"go.uber.org/zap"
+	"go.uber.org/zap/buffer"
 	"go.uber.org/zap/zapcore"
 )
 

diff --git a/glog/zap_logger_test.go b/glog/zap_logger_test.go
@@ -2,12 +2,13 @@ package glog
 
 import (
 	"context"
-	"github.com/stretchr/testify/assert"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"regexp"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 )
 
 func TestLogger(t *testing.T) {

diff --git a/gutils/convert.go b/gutils/convert.go
@@ -3,9 +3,10 @@ package gutils
 import (
 	"container/list"
 	"fmt"
-	jsoniter "github.com/json-iterator/go"
 	"reflect"
 	"strconv"
+
+	jsoniter "github.com/json-iterator/go"
 )
 
 func ToJsonString(v any) string {

diff --git a/gutils/convert_test.go b/gutils/convert_test.go
@@ -2,8 +2,9 @@ package gutils
 
 import (
 	"container/list"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestLinkedListToArray(t *testing.T) {

diff --git a/jwtAuth/claims.go b/jwtAuth/claims.go
@@ -1,8 +1,9 @@
 package jwtAuth
 
 import (
-	"github.com/golang-jwt/jwt/v5"
 	"time"
+
+	"github.com/golang-jwt/jwt/v5"
 )
 
 // Claims 包含注册的 claims 和自定义的 claims

diff --git a/jwtAuth/claims_test.go b/jwtAuth/claims_test.go
@@ -1,9 +1,10 @@
 package jwtAuth
 
 import (
-	"github.com/morehao/go-tools/gutils"
 	"testing"
 	"time"
+
+	"github.com/morehao/go-tools/gutils"
 )
 
 func TestNewClaims(t *testing.T) {

diff --git a/jwtAuth/token.go b/jwtAuth/token.go
@@ -3,9 +3,10 @@ package jwtAuth
 import (
 	"errors"
 	"fmt"
-	"github.com/golang-jwt/jwt/v5"
 	"reflect"
 	"time"
+
+	"github.com/golang-jwt/jwt/v5"
 )
 
 func CreateToken(signKey string, claims *Claims) (string, error) {

diff --git a/jwtAuth/token_test.go b/jwtAuth/token_test.go
@@ -1,11 +1,12 @@
 package jwtAuth
 
 import (
+	"testing"
+	"time"
+
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/morehao/go-tools/gutils"
 	"github.com/stretchr/testify/assert"
-	"testing"
-	"time"
 )
 
 func TestCreateToken(t *testing.T) {

diff --git a/rateLimit/config.go b/rateLimit/config.go
@@ -1,8 +1,9 @@
 package rateLimit
 
 import (
-	"github.com/redis/go-redis/v9"
 	"time"
+
+	"github.com/redis/go-redis/v9"
 )
 
 type Config struct {

diff --git a/rateLimit/limiter.go b/rateLimit/limiter.go
@@ -3,8 +3,9 @@ package rateLimit
 import (
 	"context"
 	"errors"
-	"github.com/go-redis/redis_rate/v10"
 	"time"
+
+	"github.com/go-redis/redis_rate/v10"
 )
 
 type Limiter interface {

diff --git a/rateLimit/limiter_test.go b/rateLimit/limiter_test.go
@@ -3,10 +3,11 @@ package rateLimit
 import (
 	"context"
 	"fmt"
-	"github.com/redis/go-redis/v9"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/redis/go-redis/v9"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestAllow(t *testing.T) {

diff --git a/rateLimit/redis.go b/rateLimit/redis.go
@@ -3,11 +3,12 @@ package rateLimit
 import (
 	"context"
 	"errors"
-	"github.com/go-redis/redis_rate/v10"
-	"github.com/redis/go-redis/v9"
 	"sync"
 	"sync/atomic"
 	"time"
+
+	"github.com/go-redis/redis_rate/v10"
+	"github.com/redis/go-redis/v9"
 )
 
 const pingInterval = time.Millisecond * 100
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ package codeGen @@
     import (
     	"database/sql"
     	"fmt"
     	"gorm.io/gorm"
     )
@@ Expand Down @@