提交 cdc075ba authored 作者: mooncake's avatar mooncake

update

上级 23e870df
...@@ -17,10 +17,10 @@ import ( ...@@ -17,10 +17,10 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/tracer" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/tracer"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/rd/nacos" "gitlab.wanzhuangkj.com/tush/xpkg/rd/nacos"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/dxsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/dxsf"
goutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/goutils" goutils "gitlab.wanzhuangkj.com/tush/xpkg/util/goutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/app" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/app"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"time" "time"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/eventbus" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/eventbus"
hashutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/hashutils" hashutils "gitlab.wanzhuangkj.com/tush/xpkg/util/hashutils"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
"github.com/spf13/viper" "github.com/spf13/viper"
......
...@@ -3,13 +3,13 @@ package database ...@@ -3,13 +3,13 @@ package database
import ( import (
"time" "time"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/config" "gitlab.wanzhuangkj.com/tush/xpkg/config"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/mysql" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/mysql"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
func InitMysql(dbConfig *config.Database) (*sgorm.DB, error) { func InitMysql(dbConfig *config.Database) (*sgorm.DB, error) {
......
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
// CheckHealthReply check health result // CheckHealthReply check health result
......
...@@ -7,8 +7,8 @@ import ( ...@@ -7,8 +7,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/jwt" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/jwt"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
) )
const ( const (
......
...@@ -15,7 +15,7 @@ import ( ...@@ -15,7 +15,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/container/group" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/container/group"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/shield/circuitbreaker" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/shield/circuitbreaker"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
func runCircuitBreakerHTTPServer() string { func runCircuitBreakerHTTPServer() string {
......
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"time" "time"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli/entity" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli/entity"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/ips" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/ips"
......
...@@ -10,8 +10,8 @@ import ( ...@@ -10,8 +10,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
) )
func init() { func init() {
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gitlab.wanzhuangkj.com/tush/xpkg/gin/handlerfunc" "gitlab.wanzhuangkj.com/tush/xpkg/gin/handlerfunc"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
func TestMetrics(t *testing.T) { func TestMetrics(t *testing.T) {
......
...@@ -14,7 +14,7 @@ import ( ...@@ -14,7 +14,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/eventbus" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/eventbus"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/ips" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/ips"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
) )
var ( var (
......
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
func runRateLimiterHTTPServer() string { func runRateLimiterHTTPServer() string {
......
...@@ -3,7 +3,7 @@ package middleware ...@@ -3,7 +3,7 @@ package middleware
import ( import (
"net/http" "net/http"
ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"go.uber.org/zap" "go.uber.org/zap"
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"go.uber.org/zap" "go.uber.org/zap"
) )
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/goredis" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/goredis"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"go.uber.org/zap" "go.uber.org/zap"
) )
......
...@@ -2,7 +2,7 @@ package sw ...@@ -2,7 +2,7 @@ package sw
import ( import (
"context" "context"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"testing" "testing"
"time" "time"
) )
......
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
......
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
func TestRegister(t *testing.T) { func TestRegister(t *testing.T) {
......
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
) )
const ( const (
......
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli/entity" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli/entity"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
......
...@@ -12,7 +12,7 @@ import ( ...@@ -12,7 +12,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
var ( var (
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
func runHTTPServer(registerSwaggerFn func(r *gin.Engine)) string { func runHTTPServer(registerSwaggerFn func(r *gin.Engine)) string {
......
...@@ -17,7 +17,7 @@ import ( ...@@ -17,7 +17,7 @@ import (
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
func runValidatorHTTPServer() string { func runValidatorHTTPServer() string {
......
...@@ -26,7 +26,7 @@ import ( ...@@ -26,7 +26,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/jwt" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/jwt"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/text" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/text"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/weblogutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/weblogutils"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron" "gitlab.wanzhuangkj.com/tush/xpkg/xcron"
) )
......
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/gotest" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/gotest"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
type cacheUser struct { type cacheUser struct {
......
...@@ -13,8 +13,8 @@ import ( ...@@ -13,8 +13,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
xslice "gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" xslice "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
) )
type memoryCache struct { type memoryCache struct {
......
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/gotest" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/gotest"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
type memoryUser struct { type memoryUser struct {
......
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/gotest" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/gotest"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
type redisUser struct { type redisUser struct {
......
...@@ -2,9 +2,9 @@ package biz ...@@ -2,9 +2,9 @@ package biz
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -2,9 +2,9 @@ package biz ...@@ -2,9 +2,9 @@ package biz
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -2,9 +2,9 @@ package biz ...@@ -2,9 +2,9 @@ package biz
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -2,9 +2,9 @@ package biz ...@@ -2,9 +2,9 @@ package biz
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -2,8 +2,8 @@ package biz ...@@ -2,8 +2,8 @@ package biz
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -2,9 +2,9 @@ package biz ...@@ -2,9 +2,9 @@ package biz
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/service"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -3,7 +3,7 @@ package dao ...@@ -3,7 +3,7 @@ package dao
import ( import (
"context" "context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
) )
......
...@@ -3,7 +3,7 @@ package dao ...@@ -3,7 +3,7 @@ package dao
import ( import (
"context" "context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
) )
......
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"context" "context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
) )
......
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"context" "context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
) )
......
...@@ -3,7 +3,7 @@ package dao ...@@ -3,7 +3,7 @@ package dao
import ( import (
"context" "context"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
) )
......
...@@ -18,7 +18,7 @@ import ( ...@@ -18,7 +18,7 @@ import (
xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils" xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gorm.io/gorm" "gorm.io/gorm"
"gopkg.in/gomail.v2" "gopkg.in/gomail.v2"
......
package models package models
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gorm.io/gorm" "gorm.io/gorm"
) )
......
package models package models
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gorm.io/gorm" "gorm.io/gorm"
) )
......
...@@ -2,9 +2,9 @@ package models ...@@ -2,9 +2,9 @@ package models
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gorm.io/gorm" "gorm.io/gorm"
) )
......
...@@ -2,9 +2,9 @@ package models ...@@ -2,9 +2,9 @@ package models
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/enums"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gorm.io/gorm" "gorm.io/gorm"
) )
......
package models package models
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gorm.io/gorm" "gorm.io/gorm"
) )
......
package models package models
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gorm.io/gorm" "gorm.io/gorm"
) )
......
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/spf13/cast" "github.com/spf13/cast"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
) )
type commonService struct{} type commonService struct{}
......
...@@ -10,8 +10,8 @@ import ( ...@@ -10,8 +10,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils" xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/utils/csv_exporter" csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -10,8 +10,8 @@ import ( ...@@ -10,8 +10,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils" xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/utils/csv_exporter" csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -11,8 +11,8 @@ import ( ...@@ -11,8 +11,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils" xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/utils/csv_exporter" csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -10,8 +10,8 @@ import ( ...@@ -10,8 +10,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils" xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/utils/csv_exporter" csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -10,8 +10,8 @@ import ( ...@@ -10,8 +10,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils" xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/utils/csv_exporter" csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -10,8 +10,8 @@ import ( ...@@ -10,8 +10,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/models"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/types"
xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils" xsfutils "gitlab.wanzhuangkj.com/tush/xpkg/pkg/email/xsf_utils"
csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/utils/csv_exporter" csvexporter "gitlab.wanzhuangkj.com/tush/xpkg/util/csv_exporter"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -6,8 +6,8 @@ import ( ...@@ -6,8 +6,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
) )
var _ xtime.DateTime var _ xtime.DateTime
......
...@@ -6,8 +6,8 @@ import ( ...@@ -6,8 +6,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
) )
var _ xtime.DateTime var _ xtime.DateTime
......
...@@ -7,9 +7,9 @@ import ( ...@@ -7,9 +7,9 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
) )
var _ xtime.DateTime var _ xtime.DateTime
......
...@@ -7,9 +7,9 @@ import ( ...@@ -7,9 +7,9 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
) )
var _ xtime.DateTime var _ xtime.DateTime
......
...@@ -6,8 +6,8 @@ import ( ...@@ -6,8 +6,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
) )
var _ xtime.DateTime var _ xtime.DateTime
......
...@@ -6,8 +6,8 @@ import ( ...@@ -6,8 +6,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
) )
var _ xtime.DateTime var _ xtime.DateTime
......
...@@ -5,9 +5,9 @@ import ( ...@@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/dxsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/dxsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
) )
const ( const (
......
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
var rpcStatus = []*RPCStatus{ var rpcStatus = []*RPCStatus{
......
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"time" "time"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
"go.uber.org/zap" "go.uber.org/zap"
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"github.com/alicebob/miniredis/v2" "github.com/alicebob/miniredis/v2"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
// Cache redis cache // Cache redis cache
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
// Handler info // Handler info
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
// Service info // Service info
......
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
) )
type CopyHttpReq struct { type CopyHttpReq struct {
......
...@@ -18,8 +18,8 @@ import ( ...@@ -18,8 +18,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
retryutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/retryutils" retryutils "gitlab.wanzhuangkj.com/tush/xpkg/util/retryutils"
) )
const defaultTimeout = 30 * time.Second const defaultTimeout = 30 * time.Second
......
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
func TestRegister(t *testing.T) { func TestRegister(t *testing.T) {
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"strings" "strings"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
) )
const ( const (
......
...@@ -13,7 +13,7 @@ import ( ...@@ -13,7 +13,7 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"go.uber.org/zap" "go.uber.org/zap"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
) )
func TestWebSocketServerDefault(t *testing.T) { func TestWebSocketServerDefault(t *testing.T) {
......
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/jwt" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/jwt"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
......
...@@ -5,7 +5,7 @@ import ( ...@@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/cd" "gitlab.wanzhuangkj.com/tush/xpkg/util/cd"
) )
type Dog struct { type Dog struct {
......
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/cd" "gitlab.wanzhuangkj.com/tush/xpkg/util/cd"
) )
func TestPassword_Hash(t *testing.T) { func TestPassword_Hash(t *testing.T) {
......
...@@ -12,7 +12,7 @@ import ( ...@@ -12,7 +12,7 @@ import (
"github.com/jinzhu/copier" "github.com/jinzhu/copier"
"gitlab.wanzhuangkj.com/tush/xpkg/config" "gitlab.wanzhuangkj.com/tush/xpkg/config"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/oss" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/oss"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
) )
......
...@@ -7,7 +7,7 @@ import ( ...@@ -7,7 +7,7 @@ import (
"strings" "strings"
"time" "time"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/spf13/cast" "github.com/spf13/cast"
......
...@@ -10,7 +10,7 @@ import ( ...@@ -10,7 +10,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/config" "gitlab.wanzhuangkj.com/tush/xpkg/config"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
) )
var ( var (
......
...@@ -9,7 +9,7 @@ import ( ...@@ -9,7 +9,7 @@ import (
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
) )
var ( var (
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/errcode"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xtype" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xtype"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"github.com/jinzhu/copier" "github.com/jinzhu/copier"
"github.com/spf13/cast" "github.com/spf13/cast"
......
...@@ -15,11 +15,11 @@ import ( ...@@ -15,11 +15,11 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli/entity" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli/entity"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
merge "gitlab.wanzhuangkj.com/tush/xpkg/pkg/merger" merge "gitlab.wanzhuangkj.com/tush/xpkg/pkg/merger"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/jsonutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/jsonutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/retryutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/retryutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gorm.io/gorm" "gorm.io/gorm"
glogger "gorm.io/gorm/logger" glogger "gorm.io/gorm/logger"
) )
......
...@@ -6,7 +6,7 @@ import ( ...@@ -6,7 +6,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxUtil "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
) )
func Go(ctx context.Context, n int, fn func() error) error { func Go(ctx context.Context, n int, fn func() error) error {
......
...@@ -2,7 +2,7 @@ package xcommon ...@@ -2,7 +2,7 @@ package xcommon
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xtype" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xtype"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
) )
type IConverter[ID xtype.Key, T, B any] interface { type IConverter[ID xtype.Key, T, B any] interface {
......
...@@ -12,7 +12,7 @@ import ( ...@@ -12,7 +12,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/httpcli"
maputils "gitlab.wanzhuangkj.com/tush/xpkg/utils/maputils" maputils "gitlab.wanzhuangkj.com/tush/xpkg/util/maputils"
) )
type IValid interface { type IValid interface {
......
...@@ -11,8 +11,8 @@ import ( ...@@ -11,8 +11,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/cache" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/cache"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/encoding"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
) )
const ( const (
......
...@@ -12,10 +12,10 @@ import ( ...@@ -12,10 +12,10 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils" "gitlab.wanzhuangkj.com/tush/xpkg/util"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
setutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" setutils "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/ocache" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon/ocache"
"golang.org/x/sync/singleflight" "golang.org/x/sync/singleflight"
"gorm.io/gorm" "gorm.io/gorm"
......
package xmodels package xmodels
import ( import (
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
setutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" setutils "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gorm.io/gorm" "gorm.io/gorm"
) )
......
...@@ -5,9 +5,9 @@ import ( ...@@ -5,9 +5,9 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
package biz package biz
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
) )
......
...@@ -3,9 +3,9 @@ package biz ...@@ -3,9 +3,9 @@ package biz
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
) )
......
...@@ -12,9 +12,9 @@ import ( ...@@ -12,9 +12,9 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/gin/response" "gitlab.wanzhuangkj.com/tush/xpkg/gin/response"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/gocron" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/gocron"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/redsyncutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/redsyncutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao"
......
...@@ -7,8 +7,8 @@ import ( ...@@ -7,8 +7,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/config" "gitlab.wanzhuangkj.com/tush/xpkg/config"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/gocron" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/gocron"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxutils" ctxutils "gitlab.wanzhuangkj.com/tush/xpkg/util/ctxutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/controller" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/controller"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/enums" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/enums"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/service" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/service"
......
...@@ -8,7 +8,7 @@ import ( ...@@ -8,7 +8,7 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"golang.org/x/sync/singleflight" "golang.org/x/sync/singleflight"
"gorm.io/gorm" "gorm.io/gorm"
glogger "gorm.io/gorm/logger" glogger "gorm.io/gorm/logger"
......
...@@ -3,7 +3,7 @@ package dao ...@@ -3,7 +3,7 @@ package dao
import ( import (
"context" "context"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
......
...@@ -3,7 +3,7 @@ package dao ...@@ -3,7 +3,7 @@ package dao
import ( import (
"context" "context"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
......
...@@ -5,8 +5,8 @@ import ( ...@@ -5,8 +5,8 @@ import (
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/enums" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/enums"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gorm.io/gorm" "gorm.io/gorm"
) )
......
package models package models
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gorm.io/gorm" "gorm.io/gorm"
) )
......
package models package models
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/utils/setutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/setutils"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gorm.io/gorm" "gorm.io/gorm"
) )
......
...@@ -4,7 +4,7 @@ import ( ...@@ -4,7 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao"
...@@ -15,7 +15,7 @@ import ( ...@@ -15,7 +15,7 @@ import (
"github.com/jinzhu/copier" "github.com/jinzhu/copier"
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/sliceutils" "gitlab.wanzhuangkj.com/tush/xpkg/util/sliceutils"
) )
type cronJobService struct { type cronJobService struct {
......
...@@ -3,7 +3,7 @@ package service ...@@ -3,7 +3,7 @@ package service
import ( import (
"context" "context"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao"
......
...@@ -3,7 +3,7 @@ package service ...@@ -3,7 +3,7 @@ package service
import ( import (
"context" "context"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/xcommon" "gitlab.wanzhuangkj.com/tush/xpkg/xcommon"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/dao"
......
...@@ -2,8 +2,8 @@ package types ...@@ -2,8 +2,8 @@ package types
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/enums" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/enums"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
......
...@@ -2,8 +2,8 @@ package types ...@@ -2,8 +2,8 @@ package types
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
) )
......
...@@ -2,8 +2,8 @@ package types ...@@ -2,8 +2,8 @@ package types
import ( import (
"gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query" "gitlab.wanzhuangkj.com/tush/xpkg/pkg/sgorm/query"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xsf" "gitlab.wanzhuangkj.com/tush/xpkg/util/xsf"
"gitlab.wanzhuangkj.com/tush/xpkg/utils/xtime" "gitlab.wanzhuangkj.com/tush/xpkg/util/xtime"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/biz"
"gitlab.wanzhuangkj.com/tush/xpkg/xcron/models" "gitlab.wanzhuangkj.com/tush/xpkg/xcron/models"
) )
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论