diff --git a/cmd/root.go b/cmd/root.go index 5ba6356..8e04901 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,11 +1,11 @@ package cmd import ( - _ "app/providers" + _ "atom/providers" - "app/container" - "app/services/http" - "app/utils" + "atom/container" + "atom/services/http" + "atom/utils" "fmt" "os" diff --git a/go.mod b/go.mod index bf8cb04..d7bf80a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module app +module atom go 1.18 diff --git a/main.go b/main.go index 64b6ebd..ec27bb7 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "app/cmd" + "atom/cmd" ) func main() { diff --git a/modules/modules.go b/modules/modules.go index 7da7aa9..7c3e3b1 100644 --- a/modules/modules.go +++ b/modules/modules.go @@ -1,5 +1,5 @@ package modules import ( - _ "app/modules/system/container" + _ "atom/modules/system/container" ) diff --git a/modules/system/container/container.go b/modules/system/container/container.go index 0fce2aa..be2ea6c 100644 --- a/modules/system/container/container.go +++ b/modules/system/container/container.go @@ -1,11 +1,11 @@ package container import ( - "app/container" - "app/modules/system/controller" - "app/modules/system/dao" - "app/modules/system/routes" - "app/modules/system/service" + "atom/container" + "atom/modules/system/controller" + "atom/modules/system/dao" + "atom/modules/system/routes" + "atom/modules/system/service" "log" "go.uber.org/dig" diff --git a/modules/system/controller/controller.go b/modules/system/controller/controller.go index 28213ad..d100c2f 100644 --- a/modules/system/controller/controller.go +++ b/modules/system/controller/controller.go @@ -1,10 +1,10 @@ package controller import ( - "app/modules/system/dao" - "app/modules/system/dto" - "app/modules/system/service" - "app/providers/config" + "atom/modules/system/dao" + "atom/modules/system/dto" + "atom/modules/system/service" + "atom/providers/config" "github.com/gin-gonic/gin" ) diff --git a/modules/system/dao/dao.go b/modules/system/dao/dao.go index aeb39d3..45e4dca 100644 --- a/modules/system/dao/dao.go +++ b/modules/system/dao/dao.go @@ -1,7 +1,7 @@ package dao import ( - "app/providers/config" + "atom/providers/config" "context" "errors" diff --git a/modules/system/routes/routes.go b/modules/system/routes/routes.go index 06e99a1..6ff74eb 100644 --- a/modules/system/routes/routes.go +++ b/modules/system/routes/routes.go @@ -1,9 +1,9 @@ package routes import ( - "app/contracts" - "app/modules/system/controller" - "app/providers/http" + "atom/contracts" + "atom/modules/system/controller" + "atom/providers/http" "github.com/rogeecn/gen" ) diff --git a/modules/system/service/service.go b/modules/system/service/service.go index c1cf27b..249535c 100644 --- a/modules/system/service/service.go +++ b/modules/system/service/service.go @@ -1,8 +1,8 @@ package service import ( - "app/modules/system/dao" - "app/modules/system/dto" + "atom/modules/system/dao" + "atom/modules/system/dto" "context" ) diff --git a/modules/system/service_test.go b/modules/system/service_test.go index 0f615df..1c90793 100644 --- a/modules/system/service_test.go +++ b/modules/system/service_test.go @@ -1,16 +1,16 @@ package system import ( - "app/container" + "atom/container" "context" "fmt" "testing" - _ "app/providers/config" // 这里的依赖需要被导入，否则会报错 - _ "app/providers/logger" - _ "app/providers/mysql" - _ "app/web/system/container" - "app/web/system/service" + _ "atom/modules/system/container" + "atom/modules/system/service" + _ "atom/providers/config" // 这里的依赖需要被导入，否则会报错 + _ "atom/providers/logger" + _ "atom/providers/mysql" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" @@ -45,7 +45,7 @@ func (s *TServiceSuite) Test_GetName() { assert.Equal(s.T(), "System.GetName", name.Name) } -////// +// //// func (s *TServiceSuite) SetupSuite() { fmt.Println("SetupSuite") } diff --git a/providers/config/loader.go b/providers/config/loader.go index 548a0b5..9d1d846 100644 --- a/providers/config/loader.go +++ b/providers/config/loader.go @@ -1,8 +1,8 @@ package config import ( - "app/container" - "app/utils" + "atom/container" + "atom/utils" "log" "os" "strings" diff --git a/providers/config/section_app.go b/providers/config/section_app.go index abd8810..ac1e5c1 100644 --- a/providers/config/section_app.go +++ b/providers/config/section_app.go @@ -1,6 +1,6 @@ package config -import "app/utils" +import "atom/utils" type App struct { Mode string diff --git a/providers/http/engine.go b/providers/http/engine.go index e7dd06d..72abaef 100644 --- a/providers/http/engine.go +++ b/providers/http/engine.go @@ -1,9 +1,9 @@ package http import ( - "app/container" - "app/providers/config" - "app/providers/logger" + "atom/container" + "atom/providers/config" + "atom/providers/logger" "fmt" "log" "time" diff --git a/providers/logger/logger.go b/providers/logger/logger.go index 2568aab..0135e5c 100644 --- a/providers/logger/logger.go +++ b/providers/logger/logger.go @@ -1,8 +1,8 @@ package logger import ( - "app/container" - "app/providers/config" + "atom/container" + "atom/providers/config" "log" "strings" diff --git a/providers/micro/micro.go b/providers/micro/micro.go index 7fed8be..89122ea 100644 --- a/providers/micro/micro.go +++ b/providers/micro/micro.go @@ -1,9 +1,9 @@ package micro import ( - "app/container" - "app/providers/config" - "app/utils" + "atom/container" + "atom/providers/config" + "atom/utils" "log" mgrpc "github.com/go-micro/plugins/v4/client/grpc" diff --git a/providers/mysql/mysql.go b/providers/mysql/mysql.go index c2429c8..a8d1293 100644 --- a/providers/mysql/mysql.go +++ b/providers/mysql/mysql.go @@ -1,7 +1,7 @@ package mysql import ( - "app/container" + "atom/container" "gorm.io/gorm" ) diff --git a/providers/provider.go b/providers/provider.go index 0986da1..72511a1 100644 --- a/providers/provider.go +++ b/providers/provider.go @@ -1,9 +1,9 @@ package providers import ( - _ "app/providers/config" - _ "app/providers/http" - _ "app/providers/logger" - _ "app/providers/micro" - _ "app/providers/mysql" + _ "atom/providers/config" + _ "atom/providers/http" + _ "atom/providers/logger" + _ "atom/providers/micro" + _ "atom/providers/mysql" ) diff --git a/providers/rpc/assets.go b/providers/rpc/assets.go index df65228..909b04e 100644 --- a/providers/rpc/assets.go +++ b/providers/rpc/assets.go @@ -3,8 +3,8 @@ package rpc import ( "log" - "app/container" - "app/proto" + "atom/container" + "atom/proto" "go-micro.dev/v4" ) diff --git a/services/http/http.go b/services/http/http.go index 2fe7446..2b86394 100644 --- a/services/http/http.go +++ b/services/http/http.go @@ -1,12 +1,12 @@ package http import ( - _ "app/modules" + _ "atom/modules" - "app/contracts" - "app/providers/config" - "app/providers/http" - "app/providers/logger" + "atom/contracts" + "atom/providers/config" + "atom/providers/http" + "atom/providers/logger" "go.uber.org/dig" )