update

application/init_app.go

@@ -17,10 +17,10 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/tracer"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
 	"gitlab.wanzhuangkj.com/tush/xpkg/rd/nacos"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/dxsf"
-	goutils "gitlab.wanzhuangkj.com/tush/xpkg/util/goutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/dxsf"
+	goutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/goutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/app"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"

config/consul.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/eventbus"
-	hashutils "gitlab.wanzhuangkj.com/tush/xpkg/util/hashutils"
+	hashutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/hashutils"
 
 	"github.com/hashicorp/consul/api"
 	"github.com/spf13/viper"

database/mysql.go

@@ -3,13 +3,13 @@ package database
 import (
 	"time"
 
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/config"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/mysql"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 func InitMysql(dbConfig *config.Database) (*sgorm.DB, error) {

gin/handlerfunc/common.go

@@ -10,7 +10,7 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 // CheckHealthReply check health result

gin/middleware/auth.go

@@ -7,8 +7,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/jwt"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 const (

gin/middleware/breaker_test.go

@@ -15,7 +15,7 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/container/group"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/shield/circuitbreaker"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 func runCircuitBreakerHTTPServer() string {

gin/middleware/logging.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli/entity"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/ips"
 

gin/middleware/logging_test.go

@@ -10,8 +10,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 func init() {

gin/middleware/metrics/metrics_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/handlerfunc"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 func TestMetrics(t *testing.T) {

gin/middleware/rate_limiter.go

@@ -14,7 +14,7 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/eventbus"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/ips"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 var (

gin/middleware/ratelimit_test.go

@@ -13,7 +13,7 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 func runRateLimiterHTTPServer() string {

gin/middleware/recovery.go

@@ -3,7 +3,7 @@ package middleware
 import (
 	"net/http"
 
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"

gin/middleware/requstid.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 	"go.uber.org/zap"
 )
 

gin/middleware/sync_ratelimiter/sync_ratelimiter.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/redis/go-redis/v9"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/goredis"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 	"go.uber.org/zap"
 )
 

gin/middleware/sync_ratelimiter/sync_ratelimiter_test.go

@@ -2,7 +2,7 @@ package sw
 
 import (
 	"context"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"testing"
 	"time"
 )

gin/middleware/tracing_test.go

@@ -7,7 +7,7 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 
 	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/assert"

gin/prof/prof_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 func TestRegister(t *testing.T) {

gin/request/request.go

@@ -5,7 +5,7 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 const (

gin/response/response.go

@@ -10,7 +10,7 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli/entity"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 
 	"github.com/gin-gonic/gin"
 

gin/response/response_test.go

@@ -12,7 +12,7 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 var (

gin/swagger/swagger_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 func runHTTPServer(registerSwaggerFn func(r *gin.Engine)) string {

gin/validator/validator_test.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gin-gonic/gin/binding"
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 func runValidatorHTTPServer() string {

gin/xgin/xgin.go

@@ -26,8 +26,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/jwt"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/text"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/weblogutils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/weblogutils"
 )
 
 func New() *gin.Engine {

pkg/cache/cache_test.go

@@ -8,7 +8,7 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/gotest"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 type cacheUser struct {

pkg/cache/memory.go

@@ -13,8 +13,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
-	xslice "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
+	xslice "gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
 )
 
 type memoryCache struct {

pkg/cache/memory_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/gotest"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 type memoryUser struct {

pkg/cache/redis_test.go

@@ -8,7 +8,7 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/gotest"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 type redisUser struct {

pkg/email/biz/email.go

@@ -2,10 +2,10 @@ package biz
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type Email struct {

pkg/email/biz/email_receiver.go

@@ -2,10 +2,10 @@ package biz
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type EmailReceiver struct {

pkg/email/biz/email_send.go

@@ -2,10 +2,10 @@ package biz
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type EmailSend struct {

pkg/email/biz/email_send_log.go

@@ -2,10 +2,10 @@ package biz
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type EmailSendLog struct {

pkg/email/biz/email_tpl.go

@@ -2,9 +2,9 @@ package biz
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type EmailTpl struct {

pkg/email/biz/email_tpl_receiver.go

@@ -2,10 +2,10 @@ package biz
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type EmailTplReceiver struct {

pkg/email/controller/email.go

@@ -6,8 +6,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 type emailController struct {

pkg/email/controller/email_receiver.go

@@ -6,8 +6,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 type emailReceiverController struct {

pkg/email/controller/email_send.go

@@ -6,8 +6,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 type emailSendController struct {

pkg/email/controller/email_send_log.go

@@ -6,8 +6,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 type emailSendLogController struct {

pkg/email/controller/email_tpl.go

@@ -6,8 +6,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 type emailTplController struct {

pkg/email/controller/email_tpl_receiver.go

@@ -6,8 +6,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 type emailTplReceiverController struct {

pkg/email/dao/email.go

@@ -3,8 +3,8 @@ package dao
 import (
 	"context"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailDao struct {

pkg/email/dao/email_receiver.go

@@ -3,8 +3,8 @@ package dao
 import (
 	"context"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailReceiverDao struct {

pkg/email/dao/email_send.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailSendDao struct {

pkg/email/dao/email_send_log.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailSendLogDao struct {

pkg/email/dao/email_tpl_receiver.go

@@ -3,8 +3,8 @@ package dao
 import (
 	"context"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailTplReceiverDao struct {

pkg/email/email.go

@@ -18,7 +18,7 @@ import (
 	xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 	"gorm.io/gorm"
 
 	"gopkg.in/gomail.v2"

pkg/email/models/email.go

 package models
 
 import (
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"gorm.io/gorm"
 )
 

pkg/email/models/email_receiver.go

 package models
 
 import (
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"gorm.io/gorm"
 )
 

pkg/email/models/email_send.go

@@ -2,9 +2,9 @@ package models
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"gorm.io/gorm"
 )
 

pkg/email/models/email_send_log.go

@@ -2,9 +2,9 @@ package models
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"gorm.io/gorm"
 )
 

pkg/email/models/email_tpl.go

 package models
 
 import (
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"gorm.io/gorm"
 )
 

pkg/email/models/email_tpl_receiver.go

 package models
 
 import (
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"gorm.io/gorm"
 )
 

pkg/email/service/common.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/spf13/cast"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 type commonService struct{}

pkg/email/service/email.go

@@ -10,9 +10,9 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
 	xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
-	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/xutils/csv_exporter"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailService struct {

pkg/email/service/email_receiver.go

@@ -10,9 +10,9 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
 	xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
-	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/xutils/csv_exporter"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailReceiverService struct {

pkg/email/service/email_send.go

@@ -11,9 +11,9 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
 	xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
-	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/xutils/csv_exporter"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailSendService struct {

pkg/email/service/email_send_log.go

@@ -10,9 +10,9 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
 	xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
-	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/xutils/csv_exporter"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailSendLogService struct {

pkg/email/service/email_tpl.go

@@ -10,9 +10,9 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
 	xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
-	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/xutils/csv_exporter"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailTplService struct {

pkg/email/service/email_tpl_receiver.go

@@ -10,9 +10,9 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
 	xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
-	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/xutils/csv_exporter"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type emailTplReceiverService struct {

pkg/email/types/email.go

@@ -6,8 +6,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 var _ xtime.DateTime

pkg/email/types/email_receiver.go

@@ -6,8 +6,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 var _ xtime.DateTime

pkg/email/types/email_send.go

@@ -7,9 +7,9 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 var _ xtime.DateTime

pkg/email/types/email_send_log.go

@@ -7,9 +7,9 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 var _ xtime.DateTime

pkg/email/types/email_tpl.go

@@ -6,8 +6,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 var _ xtime.DateTime

pkg/email/types/email_tpl_receiver.go

@@ -6,8 +6,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 var _ xtime.DateTime

pkg/email/xsf_utils/xsf_utils.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/dxsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/dxsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 const (

pkg/errcode/rpc_error_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/status"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 var rpcStatus = []*RPCStatus{

pkg/goredis/logger.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 
 	"github.com/redis/go-redis/v9"
 	"go.uber.org/zap"

pkg/gotest/cache.go

@@ -6,7 +6,7 @@ import (
 	"github.com/alicebob/miniredis/v2"
 	"github.com/redis/go-redis/v9"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 // Cache redis cache

pkg/gotest/handler.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 // Handler info

pkg/gotest/service.go

@@ -9,7 +9,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 // Service info

pkg/httpcli/entity/entity.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/gin-gonic/gin"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 type CopyHttpReq struct {

pkg/httpcli/httpcli.go

@@ -18,8 +18,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
-	retryutils "gitlab.wanzhuangkj.com/tush/xpkg/util/retryutils"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
+	retryutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/retryutils"
 )
 
 const defaultTimeout = 30 * time.Second

pkg/prof/http_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 func TestRegister(t *testing.T) {

pkg/sgorm/query/query_condition.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 const (

pkg/ws/server_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/gorilla/websocket"
 	"go.uber.org/zap"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
 )
 
 func TestWebSocketServerDefault(t *testing.T) {

pkg/ws/ws.go

@@ -10,7 +10,7 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/jwt"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"

xcommon/biz.go

@@ -2,7 +2,7 @@ package xcommon
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xtype"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type IConverter[ID xtype.Key, T, B any] interface {

xcommon/controller.go

@@ -12,7 +12,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
-	maputils "gitlab.wanzhuangkj.com/tush/xpkg/util/maputils"
+	maputils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/maputils"
 )
 
 type IValid interface {

xcommon/ocache/ocache.go

@@ -11,8 +11,8 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/cache"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 const (

xcommon/odao/odao.go

@@ -12,11 +12,11 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
-	setutils "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/ocache"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
+	setutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 	"golang.org/x/sync/singleflight"
 	"gorm.io/gorm"
 	olog "gorm.io/gorm/logger"

xcommon/xmodels/models.go

 package xmodels
 
 import (
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
-	setutils "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
+	setutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 	"gorm.io/gorm"
 )
 

xcron/biz/cron_job.go

@@ -5,10 +5,10 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 type CronJob struct {

xcron/biz/cron_job_log.go

 package biz
 
 import (
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type CronJobLog struct {

xcron/biz/cron_job_record.go

@@ -3,10 +3,10 @@ package biz
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type CronJobRecord struct {

xcron/controller/cron_job.go

@@ -12,9 +12,6 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/gocron"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/redsyncutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao"
@@ -22,6 +19,9 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/service"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/types"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/redsyncutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 const (

xcron/cron.go

@@ -7,12 +7,12 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/config"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/gocron"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/controller"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/enums"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/service"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/types"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
 )
 
 func AddHandler(k string, h controller.Fn) {

xcron/dao/cron_job.go

@@ -8,7 +8,7 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 	"golang.org/x/sync/singleflight"
 	"gorm.io/gorm"
 	glogger "gorm.io/gorm/logger"

xcron/dao/cron_job_log.go

@@ -3,9 +3,9 @@ package dao
 import (
 	"context"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 
 	"golang.org/x/sync/singleflight"
 )

xcron/dao/cron_job_record.go

@@ -3,9 +3,9 @@ package dao
 import (
 	"context"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 
 	"golang.org/x/sync/singleflight"
 )

xcron/models/cron_job.go

@@ -5,8 +5,8 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/enums"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"gorm.io/gorm"
 )
 

xcron/models/cron_job_log.go

 package models
 
 import (
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"gorm.io/gorm"
 )
 

xcron/models/cron_job_record.go

 package models
 
 import (
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"gorm.io/gorm"
 )
 

xcron/service/cron_job.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao"
@@ -12,10 +11,11 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/enums"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/types"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 
 	"github.com/jinzhu/copier"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/sliceutils"
 )
 
 type cronJobService struct {

xcron/service/cron_job_log.go

@@ -3,12 +3,12 @@ package service
 import (
 	"context"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/types"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type cronJobLogService struct {

xcron/service/cron_job_record.go

@@ -3,12 +3,12 @@ package service
 import (
 	"context"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/types"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 type cronJobRecordService struct {

xcron/types/cron_job.go

@@ -2,11 +2,11 @@ package types
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/enums"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 var _ xtime.DateTime

xcron/types/cron_job_log.go

@@ -2,10 +2,10 @@ package types
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 var _ xtime.DateTime

xcron/types/cron_job_record.go

@@ -2,10 +2,10 @@ package types
 
 import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 )
 
 var _ xtime.DateTime

util/cd/init_test.go → xutils/cd/init_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/cd"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/cd"
 )
 
 type Dog struct {

util/cd/password_test.go → xutils/cd/password_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/cd"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/cd"
 )
 
 func TestPassword_Hash(t *testing.T) {

util/csv_exporter/csv_exporter.go → xutils/csv_exporter/csv_exporter.go

@@ -12,8 +12,8 @@ import (
 	"github.com/jinzhu/copier"
 	"gitlab.wanzhuangkj.com/tush/xpkg/config"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/oss"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 type CSVExporter[T any] struct {

util/ctxutils/ctx.go → xutils/ctxutils/ctx.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/cast"

util/dxsf/dxsf.go → xutils/dxsf/dxsf.go

@@ -10,7 +10,7 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/config"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
 )
 
 var (

util/redsyncutils/red_sync_utils.go → xutils/redsyncutils/red_sync_utils.go

@@ -9,7 +9,7 @@ import (
 	"github.com/redis/go-redis/v9"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 var (

util/sliceutils/xslice.go → xutils/sliceutils/xslice.go

@@ -6,7 +6,7 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xtype"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/setutils"
 
 	"github.com/jinzhu/copier"
 	"github.com/spf13/cast"

util/weblogutils/web_log.go → xutils/weblogutils/web_log.go

@@ -15,11 +15,11 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli/entity"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 	merge "gitlab.wanzhuangkj.com/tush/xpkg/pkg/merger"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/jsonutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/retryutils"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
-	"gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/jsonutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/retryutils"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xsf"
+	"gitlab.wanzhuangkj.com/tush/xpkg/xutils/xtime"
 	"gorm.io/gorm"
 	glogger "gorm.io/gorm/logger"
 )

util/wg/wg.go → xutils/wg/wg.go

@@ -6,7 +6,7 @@ import (
 
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
-	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
+	ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/xutils/ctxutils"
 )
 
 func Go(ctx context.Context, n int, fn func() error) error {