diff --git a/common/model/approval_checkin.go b/common/model/approval_checkin.go index 451dfa5..bd17aa3 100644 --- a/common/model/approval_checkin.go +++ b/common/model/approval_checkin.go @@ -1,9 +1,9 @@ package model import ( + "git.u8t.cn/open/gosdk/qyweixin" "github.com/smbrave/goutil" "github.com/spf13/cast" - "gitlab.batiao8.com/open/gosdk/qyweixin" "strings" "time" ) diff --git a/common/model/approval_payment.go b/common/model/approval_payment.go index 1d80312..0ffe5db 100644 --- a/common/model/approval_payment.go +++ b/common/model/approval_payment.go @@ -1,9 +1,9 @@ package model import ( + "git.u8t.cn/open/gosdk/qyweixin" "github.com/smbrave/goutil" "github.com/spf13/cast" - "gitlab.batiao8.com/open/gosdk/qyweixin" "strings" "time" ) diff --git a/common/model/approval_refund.go b/common/model/approval_refund.go index 64ec3cc..0ff83c1 100644 --- a/common/model/approval_refund.go +++ b/common/model/approval_refund.go @@ -1,9 +1,9 @@ package model import ( + "git.u8t.cn/open/gosdk/qyweixin" "github.com/smbrave/goutil" "github.com/spf13/cast" - "gitlab.batiao8.com/open/gosdk/qyweixin" "time" ) diff --git a/common/model/approval_vacation.go b/common/model/approval_vacation.go index cd8b64d..4f79e20 100644 --- a/common/model/approval_vacation.go +++ b/common/model/approval_vacation.go @@ -1,9 +1,9 @@ package model import ( + "git.u8t.cn/open/gosdk/qyweixin" "github.com/smbrave/goutil" "github.com/spf13/cast" - "gitlab.batiao8.com/open/gosdk/qyweixin" "strings" "time" ) diff --git a/go.mod b/go.mod index b0be5ad..a039b8b 100644 --- a/go.mod +++ b/go.mod @@ -1,53 +1,56 @@ module enterprise -go 1.18 +go 1.21.6 require ( - github.com/ArtisanCloud/PowerWeChat/v3 v3.0.56 + git.u8t.cn/open/gosdk v0.0.0-20240807044703-ac33837a7820 + github.com/ArtisanCloud/PowerWeChat/v3 v3.2.27 github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 - github.com/gin-gonic/gin v1.9.1 - github.com/go-co-op/gocron v1.31.0 + github.com/gin-gonic/gin v1.10.0 + github.com/go-co-op/gocron v1.37.0 github.com/gogap/errors v0.0.0-20210818113853-edfbba0ddea9 - github.com/gomodule/redigo v1.8.9 + github.com/gomodule/redigo v1.9.2 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/mitchellh/mapstructure v1.5.0 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 github.com/sirupsen/logrus v1.9.3 - github.com/smbrave/goutil v0.0.0-20240307100306-1a2edd79979d - github.com/spf13/cast v1.6.0 - github.com/spf13/viper v1.16.0 - github.com/wechatpay-apiv3/wechatpay-go v0.2.18 - github.com/xuri/excelize/v2 v2.8.0 - golang.org/x/crypto v0.18.0 - gorm.io/driver/mysql v1.5.1 - gorm.io/gorm v1.25.7 + github.com/smbrave/goutil v0.0.0-20240724121721-dd5a9ae0b015 + github.com/spf13/cast v1.7.0 + github.com/spf13/viper v1.19.0 + github.com/xuri/excelize/v2 v2.8.1 + golang.org/x/crypto v0.26.0 + gorm.io/driver/mysql v1.5.7 + gorm.io/gorm v1.25.11 ) require ( - github.com/ArtisanCloud/PowerLibs/v3 v3.0.12 // indirect - github.com/ArtisanCloud/PowerSocialite/v3 v3.0.6 // indirect - github.com/bytedance/sonic v1.10.2 // indirect + github.com/ArtisanCloud/PowerLibs/v3 v3.2.3 // indirect + github.com/ArtisanCloud/PowerSocialite/v3 v3.0.7 // indirect + github.com/bytedance/sonic v1.11.6 // indirect + github.com/bytedance/sonic/loader v0.1.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect - github.com/chenzhuoyu/iasm v0.9.1 // indirect + github.com/clbanning/mxj/v2 v2.7.0 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.17.0 // indirect + github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/gogap/stack v0.0.0-20150131034635-fef68dddd4f8 // indirect + github.com/google/uuid v1.4.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/jonboulle/clockwork v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.6 // indirect - github.com/leodido/go-urn v1.2.4 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/leodido/go-urn v1.4.0 // indirect github.com/lestrrat-go/strftime v1.0.6 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -55,29 +58,33 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect - github.com/pelletier/go-toml/v2 v2.1.1 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/redis/go-redis/v9 v9.0.3 // indirect github.com/richardlehane/mscfb v1.0.4 // indirect github.com/richardlehane/msoleps v1.0.3 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect - github.com/spf13/afero v1.9.5 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect + github.com/speps/go-hashids v2.0.0+incompatible // indirect + github.com/spf13/afero v1.11.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/subosito/gotenv v1.4.2 // indirect + github.com/subosito/gotenv v1.6.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect - github.com/xuri/efp v0.0.0-20230802181842-ad255f2331ca // indirect - github.com/xuri/nfp v0.0.0-20230819163627-dc951e3ffe1a // indirect - gitlab.batiao8.com/open/gosdk v0.0.0-20240704102626-1f3492205d16 // indirect + github.com/wechatpay-apiv3/wechatpay-go v0.2.18 // indirect + github.com/xuri/efp v0.0.0-20231025114914-d1ff6096ae53 // indirect + github.com/xuri/nfp v0.0.0-20230919160717-d98342af3f05 // indirect go.uber.org/atomic v1.9.0 // indirect - go.uber.org/multierr v1.8.0 // indirect + go.uber.org/multierr v1.9.0 // indirect go.uber.org/zap v1.21.0 // indirect - golang.org/x/arch v0.7.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect + golang.org/x/arch v0.8.0 // indirect + golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect + golang.org/x/net v0.27.0 // indirect + golang.org/x/sys v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/server/controller/qyweixin.go b/server/controller/qyweixin.go index f508aa5..c6ad052 100644 --- a/server/controller/qyweixin.go +++ b/server/controller/qyweixin.go @@ -6,11 +6,11 @@ import ( "enterprise/server/service" "enterprise/server/session" "fmt" + "git.u8t.cn/open/gosdk/qyweixin" "github.com/gin-gonic/gin" log "github.com/sirupsen/logrus" "github.com/smbrave/goutil" "github.com/spf13/cast" - "gitlab.batiao8.com/open/gosdk/qyweixin" "net/http" "strings" "time" diff --git a/server/service/qyweixin_approve.go b/server/service/qyweixin_approve.go index 04be9e1..6a49196 100644 --- a/server/service/qyweixin_approve.go +++ b/server/service/qyweixin_approve.go @@ -7,10 +7,10 @@ import ( "enterprise/common/global" "enterprise/common/model" "fmt" + "git.u8t.cn/open/gosdk/qyweixin" + "git.u8t.cn/open/gosdk/wechat/message" log "github.com/sirupsen/logrus" "github.com/smbrave/goutil" - "gitlab.batiao8.com/open/gosdk/qyweixin" - "gitlab.batiao8.com/open/gosdk/wechat/message" "strings" ) diff --git a/worker/approval.go b/worker/approval.go index 57f736a..3badd8c 100644 --- a/worker/approval.go +++ b/worker/approval.go @@ -4,8 +4,8 @@ import ( "enterprise/common/config" "enterprise/common/dao" "enterprise/common/model" + "git.u8t.cn/open/gosdk/qyweixin" log "github.com/sirupsen/logrus" - "gitlab.batiao8.com/open/gosdk/qyweixin" "time" ) diff --git a/worker/checkin.go b/worker/checkin.go index e3c90f9..3219091 100644 --- a/worker/checkin.go +++ b/worker/checkin.go @@ -6,9 +6,9 @@ import ( "enterprise/common/global" "enterprise/common/model" "fmt" + "git.u8t.cn/open/gosdk/qyweixin" log "github.com/sirupsen/logrus" "github.com/smbrave/goutil" - "gitlab.batiao8.com/open/gosdk/qyweixin" "strings" "time" ) diff --git a/worker/staff.go b/worker/staff.go index 2b4a4d4..1f505c5 100644 --- a/worker/staff.go +++ b/worker/staff.go @@ -7,10 +7,10 @@ import ( "enterprise/common/global" "enterprise/common/model" "fmt" + "git.u8t.cn/open/gosdk/qyweixin" log "github.com/sirupsen/logrus" "github.com/smbrave/goutil" "github.com/spf13/cast" - "gitlab.batiao8.com/open/gosdk/qyweixin" "strings" "time" )