Move utils to engine folder

engine/basket/basket.go

@@ -7,8 +7,8 @@ import (
 
 	"golang-fave/engine/consts"
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper/config"
-	"golang-fave/utils"
 )
 
 type SBParam struct {

engine/basket/session.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"golang-fave/engine/sqlw"
-	"golang-fave/utils"
+	"golang-fave/engine/utils"
 )
 
 type session struct {

engine/builder/data_form.go

@@ -3,8 +3,8 @@ package builder
 import (
 	"html"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 const (

engine/builder/data_table.go

@@ -8,8 +8,8 @@ import (
 	"strconv"
 
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type DataTableRow struct {

engine/domains/domains.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"sync"
 
-	"golang-fave/utils"
+	"golang-fave/engine/utils"
 )
 
 type Domains struct {

engine/engine.go

@@ -10,9 +10,9 @@ import (
 	"golang-fave/engine/cblocks"
 	"golang-fave/engine/logger"
 	"golang-fave/engine/mysqlpool"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
 	"golang-fave/modules"
-	"golang-fave/utils"
 
 	"github.com/vladimirok5959/golang-server-sessions/session"
 )

engine/fetdata/blog.go

@@ -5,8 +5,8 @@ import (
 	"sort"
 	"strings"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type BlogPagination struct {

engine/fetdata/blog_category.go

@@ -1,8 +1,8 @@
 package fetdata
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type BlogCategory struct {

engine/fetdata/blog_post.go

@@ -4,8 +4,8 @@ import (
 	"html/template"
 	"time"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type BlogPost struct {

engine/fetdata/fetdata.go

@@ -9,8 +9,8 @@ import (
 
 	"golang-fave/engine/basket"
 	"golang-fave/engine/consts"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type FERData struct {

engine/fetdata/index.go

@@ -4,8 +4,8 @@ import (
 	"html/template"
 	"time"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type Page struct {

engine/fetdata/shop.go

@@ -5,8 +5,8 @@ import (
 	"sort"
 	"strings"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type ShopPagination struct {

engine/fetdata/shop_category.go

@@ -1,8 +1,8 @@
 package fetdata
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type ShopCategory struct {

engine/fetdata/shop_currency.go

@@ -1,8 +1,8 @@
 package fetdata
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type ShopCurrency struct {

engine/fetdata/shop_product.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type ShopProductVarItem struct {

engine/fetdata/shop_product_image.go

@@ -1,8 +1,8 @@
 package fetdata
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type ShopProductImage struct {

engine/fetdata/shop_product_spec.go

@@ -1,8 +1,8 @@
 package fetdata
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type ShopProductSpec struct {

engine/fetdata/user.go

@@ -1,8 +1,8 @@
 package fetdata
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type User struct {

engine/logger/logger.go

@@ -8,7 +8,7 @@ import (
 
 	"golang-fave/engine/consts"
 	"golang-fave/engine/domains"
-	"golang-fave/utils"
+	"golang-fave/engine/utils"
 )
 
 type logMsg struct {

utils/utils_test.go → engine/utils/utils_test.go

@@ -20,27 +20,27 @@ func Expect(t *testing.T, actual, expect interface{}) {
 }
 
 func TestIsFileExists(t *testing.T) {
-	Expect(t, IsFileExists("./../support"), true)
-	Expect(t, IsFileExists("./../support/some-file.txt"), true)
-	Expect(t, IsFileExists("./../support/no-existed-file"), false)
+	Expect(t, IsFileExists("./../../support"), true)
+	Expect(t, IsFileExists("./../../support/some-file.txt"), true)
+	Expect(t, IsFileExists("./../../support/no-existed-file"), false)
 }
 
 func TestIsRegularFileExists(t *testing.T) {
-	Expect(t, IsRegularFileExists("./../support/some-file.txt"), true)
-	Expect(t, IsRegularFileExists("./../support/no-existed-file"), false)
-	Expect(t, IsRegularFileExists("./../support"), false)
+	Expect(t, IsRegularFileExists("./../../support/some-file.txt"), true)
+	Expect(t, IsRegularFileExists("./../../support/no-existed-file"), false)
+	Expect(t, IsRegularFileExists("./../../support"), false)
 }
 
 func TestIsDir(t *testing.T) {
-	Expect(t, IsDir("./../support"), true)
-	Expect(t, IsDir("./../support/some-file.txt"), false)
-	Expect(t, IsDir("./../support/no-existed-dir"), false)
+	Expect(t, IsDir("./../../support"), true)
+	Expect(t, IsDir("./../../support/some-file.txt"), false)
+	Expect(t, IsDir("./../../support/no-existed-dir"), false)
 }
 
 func TestIsDirExists(t *testing.T) {
-	Expect(t, IsDirExists("./../support"), true)
-	Expect(t, IsDirExists("./../support/some-file.txt"), false)
-	Expect(t, IsDirExists("./../support/no-existed-dir"), false)
+	Expect(t, IsDirExists("./../../support"), true)
+	Expect(t, IsDirExists("./../../support/some-file.txt"), false)
+	Expect(t, IsDirExists("./../../support/no-existed-dir"), false)
 }
 
 func TestIsNumeric(t *testing.T) {

engine/wrapper/wrapper.go

@@ -18,8 +18,8 @@ import (
 	"golang-fave/engine/logger"
 	"golang-fave/engine/mysqlpool"
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper/config"
-	"golang-fave/utils"
 
 	"github.com/vladimirok5959/golang-server-sessions/session"
 )

image.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper/config"
-	"golang-fave/utils"
 
 	"github.com/disintegration/imaging"
 	"github.com/vladimirok5959/golang-worker/worker"

main.go

@@ -18,9 +18,9 @@ import (
 	"golang-fave/engine/domains"
 	"golang-fave/engine/logger"
 	"golang-fave/engine/mysqlpool"
+	"golang-fave/engine/utils"
 	"golang-fave/modules"
 	"golang-fave/support"
-	"golang-fave/utils"
 
 	"github.com/vladimirok5959/golang-server-bootstrap/bootstrap"
 	"github.com/vladimirok5959/golang-server-resources/resource"

modules/module_api.go

@@ -6,8 +6,8 @@ import (
 
 	"golang-fave/engine/assets"
 	"golang-fave/engine/fetdata"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterModule_Api() *Module {

modules/module_blog.go

@@ -10,8 +10,8 @@ import (
 	"golang-fave/engine/consts"
 	"golang-fave/engine/fetdata"
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterModule_Blog() *Module {

modules/module_blog_act_delete.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_BlogDelete() *Action {

modules/module_blog_act_modify.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"strings"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_BlogModify() *Action {

modules/module_blog_categories.go

@@ -4,8 +4,8 @@ import (
 	"html"
 	"strings"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) blog_GetCategorySelectOptions(wrap *wrapper.Wrapper, id int, parentId int, selids []int) string {

modules/module_blog_categories_act_delete.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_BlogCategoriesDelete() *Action {

modules/module_blog_categories_act_modify.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) blog_ActionCategoryAdd(wrap *wrapper.Wrapper, pf_id, pf_name, pf_alias, pf_parent string) (error, int64) {

modules/module_index.go

@@ -8,8 +8,8 @@ import (
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/fetdata"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterModule_Index() *Module {

modules/module_index_act_delete.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_IndexDelete() *Action {

modules/module_index_act_first_user.go

@@ -1,8 +1,8 @@
 package modules
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_IndexFirstUser() *Action {

modules/module_index_act_modify.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_IndexModify() *Action {

modules/module_index_act_mysql_setup.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_IndexMysqlSetup() *Action {

modules/module_index_act_signin.go

@@ -2,8 +2,8 @@ package modules
 
 import (
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_IndexUserSignIn() *Action {

modules/module_index_act_update_profile.go

@@ -1,8 +1,8 @@
 package modules
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_IndexUserUpdateProfile() *Action {

modules/module_notify_mail.go

@@ -7,8 +7,8 @@ import (
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterModule_NotifyMail() *Module {

modules/module_settings.go

@@ -8,8 +8,8 @@ import (
 	"golang-fave/engine/assets"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterModule_Settings() *Module {

modules/module_settings_act_api.go

@@ -1,8 +1,8 @@
 package modules
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_SettingsApi() *Action {

modules/module_settings_act_general.go

@@ -1,8 +1,8 @@
 package modules
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_SettingsGeneral() *Action {

modules/module_settings_act_pagination.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"strconv"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_SettingsPagination() *Action {

modules/module_settings_act_shop.go

@@ -1,8 +1,8 @@
 package modules
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_SettingsShop() *Action {

modules/module_settings_act_smtp.go

@@ -1,8 +1,8 @@
 package modules
 
 import (
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_SettingsSmtp() *Action {

modules/module_settings_act_thumbnails.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"strconv"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_SettingsThumbnails() *Action {

modules/module_shop.go

@@ -12,8 +12,8 @@ import (
 	"golang-fave/engine/consts"
 	"golang-fave/engine/fetdata"
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) shop_GetCurrencySelectOptions(wrap *wrapper.Wrapper, id int) string {

modules/module_shop_act_attach_product_search.go

@@ -4,8 +4,8 @@ import (
 	"html"
 	"strings"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) shop_GetProductsListForAttaching(wrap *wrapper.Wrapper, name string, id int) string {

modules/module_shop_act_attach_product_to.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopAttachProductTo() *Action {

modules/module_shop_act_delete.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopDelete() *Action {

modules/module_shop_act_detach.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopDetach() *Action {

modules/module_shop_act_duplicate.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopDuplicate() *Action {

modules/module_shop_act_get_attribute_values.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"html"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopGetAttributeValues() *Action {

modules/module_shop_act_images_reorder.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/json"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type OrderItem struct {

modules/module_shop_act_modify.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"strings"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopModify() *Action {

modules/module_shop_act_order.go

@@ -5,8 +5,8 @@ import (
 
 	"golang-fave/engine/basket"
 	"golang-fave/engine/consts"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopOrder() *Action {

modules/module_shop_act_order_set_status.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopOrderSetStatus() *Action {

modules/module_shop_act_upload_delete.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopUploadDelete() *Action {

modules/module_shop_act_upload_image.go

@@ -13,8 +13,8 @@ import (
 	_ "image/jpeg"
 	_ "image/png"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopUploadImage() *Action {

modules/module_shop_attributes_act_delete.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopAttributesDelete() *Action {

modules/module_shop_attributes_act_modify.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"strings"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopAttributesModify() *Action {

modules/module_shop_categories.go

@@ -4,8 +4,8 @@ import (
 	"html"
 	"strings"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) shop_GetCategorySelectOptions(wrap *wrapper.Wrapper, id int, parentId int, selids []int) string {

modules/module_shop_categories_act_delete.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopCategoriesDelete() *Action {

modules/module_shop_categories_act_modify.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) shop_ActionCategoryAdd(wrap *wrapper.Wrapper, pf_id, pf_name, pf_alias, pf_parent string) (error, int64) {

modules/module_shop_currencies_act_delete.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopCurrenciesDelete() *Action {

modules/module_shop_currencies_act_modify.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_ShopCurrenciesModify() *Action {

modules/module_template.go

@@ -11,8 +11,8 @@ import (
 	"golang-fave/engine/assets"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) template_GetThemeFiles(wrap *wrapper.Wrapper) []string {

modules/module_template_act_edit_theme_file.go

@@ -4,8 +4,8 @@ import (
 	"io/ioutil"
 	"os"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_TemplateEditThemeFile() *Action {

modules/module_template_act_restore_file.go

@@ -5,8 +5,8 @@ import (
 	"os"
 
 	ThemeFiles "golang-fave/engine/assets/template"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_TemplateRestoreFile() *Action {

modules/module_template_act_restore_file_all.go

@@ -5,8 +5,8 @@ import (
 	"os"
 
 	ThemeFiles "golang-fave/engine/assets/template"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_TemplateRestoreFileAll() *Action {

modules/module_users.go

@@ -6,8 +6,8 @@ import (
 	"golang-fave/engine/assets"
 	"golang-fave/engine/builder"
 	"golang-fave/engine/consts"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterModule_Users() *Module {

modules/module_users_act_delete.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_UsersDelete() *Action {

modules/module_users_act_modify.go

@@ -3,8 +3,8 @@ package modules
 import (
 	"context"
 
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 func (this *Modules) RegisterAction_UsersModify() *Action {

modules/modules.go

@@ -12,8 +12,8 @@ import (
 
 	"golang-fave/engine/assets"
 	"golang-fave/engine/consts"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper"
-	"golang-fave/utils"
 )
 
 type MISub struct {

params.go

@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"golang-fave/engine/consts"
-	"golang-fave/utils"
+	"golang-fave/engine/utils"
 )
 
 func read_env_params() {

session.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	"golang-fave/utils"
+	"golang-fave/engine/utils"
 
 	"github.com/vladimirok5959/golang-server-sessions/session"
 	"github.com/vladimirok5959/golang-worker/worker"

smtp.go

@@ -11,8 +11,8 @@ import (
 
 	"golang-fave/engine/mysqlpool"
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper/config"
-	"golang-fave/utils"
 
 	"github.com/vladimirok5959/golang-worker/worker"
 )

support/migrate/000000000.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"golang-fave/engine/sqlw"
-	"golang-fave/utils"
+	"golang-fave/engine/utils"
 )
 
 func Run(ctx context.Context, db *sqlw.DB, version int, host string) error {

support/migrate/000000003.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"golang-fave/engine/sqlw"
-	"golang-fave/utils"
+	"golang-fave/engine/utils"
 )
 
 func Migrate_000000003(ctx context.Context, db *sqlw.DB, host string) error {

support/support.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/support/migrate"
-	"golang-fave/utils"
 )
 
 type Support struct {

xml.go

@@ -11,8 +11,8 @@ import (
 
 	"golang-fave/engine/mysqlpool"
 	"golang-fave/engine/sqlw"
+	"golang-fave/engine/utils"
 	"golang-fave/engine/wrapper/config"
-	"golang-fave/utils"
 
 	"github.com/vladimirok5959/golang-worker/worker"
 )