Browse Source

Move constants to engine folder

Vova Tkach 5 years ago
parent
commit
e6258fb740

+ 3 - 3
Makefile

@@ -49,9 +49,9 @@ update:
 	go mod download
 
 version:
-	@echo "package consts" > consts/consts_version.go
-	@echo "" >> consts/consts_version.go
-	@echo "const ServerVersion = \"${VERSION}\"" >> consts/consts_version.go
+	@echo "package consts" > engine/consts/consts_version.go
+	@echo "" >> engine/consts/consts_version.go
+	@echo "const ServerVersion = \"${VERSION}\"" >> engine/consts/consts_version.go
 
 template:
 	@./support/template.sh

+ 1 - 1
assets/assets.go

@@ -1,7 +1,7 @@
 package assets
 
 import (
-	"golang-fave/consts"
+	"golang-fave/engine/consts"
 
 	"github.com/vladimirok5959/golang-server-resources/resource"
 )

+ 1 - 1
engine/basket/basket.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"sync"
 
-	"golang-fave/consts"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/sqlw"
 	"golang-fave/engine/wrapper/config"
 	"golang-fave/utils"

+ 0 - 0
consts/consts.go → engine/consts/consts.go


+ 0 - 0
consts/consts_version.go → engine/consts/consts_version.go


+ 0 - 0
consts/platform_other.go → engine/consts/platform_other.go


+ 0 - 0
consts/platform_windows.go → engine/consts/platform_windows.go


+ 1 - 1
engine/fetdata/fetdata.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"time"
 
-	"golang-fave/consts"
 	"golang-fave/engine/basket"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"
 )

+ 1 - 1
engine/sqlw/log.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"golang-fave/consts"
+	"golang-fave/engine/consts"
 )
 
 func log(query string, s time.Time, e error, transaction bool) {

+ 1 - 1
engine/sqlw/sqlw.go

@@ -8,7 +8,7 @@ import (
 	"errors"
 	"time"
 
-	"golang-fave/consts"
+	"golang-fave/engine/consts"
 )
 
 type Rows = sql.Rows

+ 1 - 1
engine/sqlw/txw.go

@@ -7,7 +7,7 @@ import (
 
 	"time"
 
-	"golang-fave/consts"
+	"golang-fave/engine/consts"
 )
 
 type Tx struct {

+ 1 - 1
engine/wrapper/wrapper.go

@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"golang-fave/cblocks"
-	"golang-fave/consts"
 	"golang-fave/engine/basket"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/mysqlpool"
 	"golang-fave/engine/sqlw"
 	"golang-fave/engine/wrapper/config"

+ 1 - 1
logger/logger.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"golang-fave/consts"
 	"golang-fave/domains"
+	"golang-fave/engine/consts"
 	"golang-fave/utils"
 )
 

+ 1 - 1
main.go

@@ -12,10 +12,10 @@ import (
 
 	"golang-fave/assets"
 	"golang-fave/cblocks"
-	"golang-fave/consts"
 	"golang-fave/domains"
 	"golang-fave/engine"
 	"golang-fave/engine/basket"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/mysqlpool"
 	"golang-fave/logger"
 	"golang-fave/modules"

+ 1 - 1
modules/module_blog.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"golang-fave/assets"
-	"golang-fave/consts"
 	"golang-fave/engine/builder"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/fetdata"
 	"golang-fave/engine/sqlw"
 	"golang-fave/engine/wrapper"

+ 1 - 1
modules/module_index.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"golang-fave/assets"
-	"golang-fave/consts"
 	"golang-fave/engine/builder"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/fetdata"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"

+ 1 - 1
modules/module_index_act_cypress.go

@@ -3,7 +3,7 @@ package modules
 import (
 	"os"
 
-	"golang-fave/consts"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/sqlw"
 	"golang-fave/engine/wrapper"
 )

+ 1 - 1
modules/module_notify_mail.go

@@ -4,8 +4,8 @@ import (
 	"html"
 
 	"golang-fave/assets"
-	"golang-fave/consts"
 	"golang-fave/engine/builder"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/sqlw"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"

+ 1 - 1
modules/module_settings.go

@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"golang-fave/assets"
-	"golang-fave/consts"
 	"golang-fave/engine/builder"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"
 )

+ 1 - 1
modules/module_shop.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"golang-fave/assets"
-	"golang-fave/consts"
 	"golang-fave/engine/basket"
 	"golang-fave/engine/builder"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/fetdata"
 	"golang-fave/engine/sqlw"
 	"golang-fave/engine/wrapper"

+ 1 - 1
modules/module_shop_act_order.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
-	"golang-fave/consts"
 	"golang-fave/engine/basket"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"
 )

+ 1 - 1
modules/module_template.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"golang-fave/assets"
-	"golang-fave/consts"
 	"golang-fave/engine/builder"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"
 )

+ 1 - 1
modules/module_users.go

@@ -4,8 +4,8 @@ import (
 	"html"
 
 	"golang-fave/assets"
-	"golang-fave/consts"
 	"golang-fave/engine/builder"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"
 )

+ 1 - 1
modules/modules.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"golang-fave/assets"
-	"golang-fave/consts"
+	"golang-fave/engine/consts"
 	"golang-fave/engine/wrapper"
 	"golang-fave/utils"
 )

+ 1 - 1
params.go

@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"golang-fave/consts"
+	"golang-fave/engine/consts"
 	"golang-fave/utils"
 )
 

+ 1 - 1
utils/utils.go

@@ -19,7 +19,7 @@ import (
 	"unicode/utf16"
 
 	"golang-fave/assets"
-	"golang-fave/consts"
+	"golang-fave/engine/consts"
 )
 
 func Trim(str string) string {

+ 1 - 1
utils/utils_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"golang-fave/consts"
+	"golang-fave/engine/consts"
 )
 
 func Expect(t *testing.T, actual, expect interface{}) {