diff --git a/go.mod b/go.mod index d764dff..c4b8dc4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module servicebase +module gitea.ddegame.cn/open/servicebase go 1.24.0 diff --git a/pkg/cache/redis_client.go b/pkg/cache/redis_client.go index 5737354..8e87a5b 100644 --- a/pkg/cache/redis_client.go +++ b/pkg/cache/redis_client.go @@ -2,7 +2,8 @@ package cache import ( "context" - logs "servicebase/pkg/log" + + logs "gitea.ddegame.cn/open/servicebase/pkg/log" redis "github.com/redis/go-redis/v9" "github.com/spf13/viper" diff --git a/pkg/cache/redis_lock.go b/pkg/cache/redis_lock.go index 95c9a82..454d9bb 100644 --- a/pkg/cache/redis_lock.go +++ b/pkg/cache/redis_lock.go @@ -2,8 +2,9 @@ package cache import ( "errors" - "servicebase/pkg/log" "time" + + "gitea.ddegame.cn/open/servicebase/pkg/log" ) func Lock(key string) (e error) { diff --git a/pkg/cache/user/user.go b/pkg/cache/user/user.go index fbb5a92..ae9df48 100644 --- a/pkg/cache/user/user.go +++ b/pkg/cache/user/user.go @@ -2,11 +2,12 @@ package cache_user import ( "fmt" - "servicebase/pkg/cache" - "servicebase/pkg/tools" "strings" "time" + "gitea.ddegame.cn/open/servicebase/pkg/cache" + "gitea.ddegame.cn/open/servicebase/pkg/tools" + "github.com/anxpp/beego/logs" "github.com/anxpp/common-utils/str" ) diff --git a/pkg/client/http_api/user.go b/pkg/client/http_api/user.go index 4230117..a1e4122 100644 --- a/pkg/client/http_api/user.go +++ b/pkg/client/http_api/user.go @@ -1,11 +1,12 @@ package http_api import ( - "servicebase/pkg/log" - "servicebase/pkg/res" - "servicebase/pkg/utils" "errors" + "gitea.ddegame.cn/open/servicebase/pkg/log" + "gitea.ddegame.cn/open/servicebase/pkg/res" + "gitea.ddegame.cn/open/servicebase/pkg/utils" + "github.com/go-resty/resty/v2" ) diff --git a/pkg/client/mongo.go b/pkg/client/mongo.go index efbfdb1..3369efd 100644 --- a/pkg/client/mongo.go +++ b/pkg/client/mongo.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "servicebase/pkg/common/req" + "gitea.ddegame.cn/open/servicebase/pkg/common/req" "github.com/spf13/viper" "go.mongodb.org/mongo-driver/bson" diff --git a/pkg/client/netease/IMService.go b/pkg/client/netease/IMService.go index 736157a..e64fae1 100644 --- a/pkg/client/netease/IMService.go +++ b/pkg/client/netease/IMService.go @@ -1,12 +1,13 @@ package Netease import ( - "servicebase/pkg/common/HyTools" "encoding/json" "net/url" "time" - Netease "servicebase/pkg/common/netease" + "gitea.ddegame.cn/open/servicebase/pkg/common/HyTools" + + Netease "gitea.ddegame.cn/open/servicebase/pkg/common/netease" "github.com/anxpp/beego" "github.com/anxpp/beego/logs" diff --git a/pkg/client/netease/captcha.go b/pkg/client/netease/captcha.go index 53a215a..3a51cd0 100644 --- a/pkg/client/netease/captcha.go +++ b/pkg/client/netease/captcha.go @@ -2,7 +2,8 @@ package Netease import ( "encoding/json" - "servicebase/pkg/log" + + "gitea.ddegame.cn/open/servicebase/pkg/log" "github.com/pkg/errors" "github.com/spf13/viper" diff --git a/pkg/client/netease/live_person.go b/pkg/client/netease/live_person.go index f1028af..201164c 100644 --- a/pkg/client/netease/live_person.go +++ b/pkg/client/netease/live_person.go @@ -10,12 +10,13 @@ import ( "math/rand" "net/http" "net/url" - "servicebase/pkg/log" "sort" "strconv" "strings" "time" + "gitea.ddegame.cn/open/servicebase/pkg/log" + "github.com/pkg/errors" "github.com/spf13/viper" "github.com/tjfoc/gmsm/sm3" diff --git a/pkg/client/shengwang_client.go b/pkg/client/shengwang_client.go index 661f9ea..b233c95 100644 --- a/pkg/client/shengwang_client.go +++ b/pkg/client/shengwang_client.go @@ -2,7 +2,8 @@ package client import ( "fmt" - "servicebase/pkg/tools" + + "gitea.ddegame.cn/open/servicebase/pkg/tools" rtctokenbuilder "github.com/AgoraIO/Tools/DynamicKey/AgoraDynamicKey/go/src/rtctokenbuilder2" "github.com/spf13/viper" diff --git a/pkg/client/sms_client.go b/pkg/client/sms_client.go index 14c5313..f2fe58b 100644 --- a/pkg/client/sms_client.go +++ b/pkg/client/sms_client.go @@ -3,10 +3,11 @@ package client import ( "errors" "fmt" - "servicebase/pkg/helper" - "servicebase/pkg/log" "sync" + "gitea.ddegame.cn/open/servicebase/pkg/helper" + "gitea.ddegame.cn/open/servicebase/pkg/log" + openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client" dysmsapi20170525 "github.com/alibabacloud-go/dysmsapi-20170525/v3/client" util "github.com/alibabacloud-go/tea-utils/v2/service" diff --git a/pkg/common/es/es_client.go b/pkg/common/es/es_client.go index 20bdb03..6a52546 100644 --- a/pkg/common/es/es_client.go +++ b/pkg/common/es/es_client.go @@ -1,13 +1,14 @@ package ess import ( - "servicebase/pkg/common/es/document" - "servicebase/pkg/common/messages" "context" "encoding/json" "reflect" "time" + "gitea.ddegame.cn/open/servicebase/pkg/common/es/document" + "gitea.ddegame.cn/open/servicebase/pkg/common/messages" + "github.com/anxpp/beego/logs" "github.com/olivere/elastic/v7" "github.com/spf13/viper" diff --git a/pkg/common/es/es_client_test.go b/pkg/common/es/es_client_test.go index ceb82ff..22306a1 100644 --- a/pkg/common/es/es_client_test.go +++ b/pkg/common/es/es_client_test.go @@ -1,11 +1,12 @@ package ess import ( - "servicebase/pkg/common/messages" "context" "testing" "time" + "gitea.ddegame.cn/open/servicebase/pkg/common/messages" + "github.com/anxpp/beego/logs" "github.com/olivere/elastic/v7" "github.com/spf13/viper" diff --git a/pkg/common/http/response/Activity.go b/pkg/common/http/response/Activity.go index cd42ba3..30bc083 100644 --- a/pkg/common/http/response/Activity.go +++ b/pkg/common/http/response/Activity.go @@ -1,6 +1,6 @@ package response -import "servicebase/pkg/common/http/dto" +import "gitea.ddegame.cn/open/servicebase/pkg/common/http/dto" type CommonResponse struct { Code string @@ -15,7 +15,7 @@ type UserInfoResponse struct { Msg string } -//获取用户邀请汇总数据返回 +// 获取用户邀请汇总数据返回 type UserInviteSummaryResponse struct { Code string Result dto.UserInviteSummaryDTO diff --git a/pkg/common/netease/ImClient.go b/pkg/common/netease/ImClient.go index 0bf274f..d742985 100644 --- a/pkg/common/netease/ImClient.go +++ b/pkg/common/netease/ImClient.go @@ -4,13 +4,14 @@ import ( "context" "encoding/json" "fmt" - "servicebase/pkg/common" - "servicebase/pkg/common/HyTools" - yunxin "servicebase/pkg/common/netease/dto" - "servicebase/pkg/htools" - "servicebase/pkg/log" "strings" + "gitea.ddegame.cn/open/servicebase/pkg/common" + "gitea.ddegame.cn/open/servicebase/pkg/common/HyTools" + yunxin "gitea.ddegame.cn/open/servicebase/pkg/common/netease/dto" + "gitea.ddegame.cn/open/servicebase/pkg/htools" + "gitea.ddegame.cn/open/servicebase/pkg/log" + "github.com/pkg/errors" "github.com/spf13/cast" @@ -501,7 +502,6 @@ func (client *ImClient) ChangeChatroomStat(parameters map[string]string) error { return err } - //{"desc":"parameter roomid should be long","code":414} var resData struct { Code int `json:"code"` Desc string `json:"desc"` diff --git a/pkg/common/util/string_util_test.go b/pkg/common/util/string_util_test.go index 9346136..c38cdd0 100644 --- a/pkg/common/util/string_util_test.go +++ b/pkg/common/util/string_util_test.go @@ -1,9 +1,10 @@ package util import ( - "servicebase/pkg/common" "fmt" "testing" + + "gitea.ddegame.cn/open/servicebase/pkg/common" ) func Test_processTimeStr(t *testing.T) { diff --git a/pkg/datasource/mysql.go b/pkg/datasource/mysql.go index da0504c..873deed 100644 --- a/pkg/datasource/mysql.go +++ b/pkg/datasource/mysql.go @@ -1,12 +1,13 @@ package datasource import ( - "servicebase/pkg/log" - "servicebase/pkg/repo" - "servicebase/pkg/utils" "strings" "time" + "gitea.ddegame.cn/open/servicebase/pkg/log" + "gitea.ddegame.cn/open/servicebase/pkg/repo" + "gitea.ddegame.cn/open/servicebase/pkg/utils" + "github.com/spf13/viper" "gorm.io/driver/mysql" "gorm.io/gorm" diff --git a/pkg/partner/Apple/AppleClient.go b/pkg/partner/Apple/AppleClient.go index e41b753..d83a173 100644 --- a/pkg/partner/Apple/AppleClient.go +++ b/pkg/partner/Apple/AppleClient.go @@ -8,9 +8,10 @@ import ( "errors" "fmt" "net/http" - "servicebase/pkg/common/HyTools" "time" + "gitea.ddegame.cn/open/servicebase/pkg/common/HyTools" + "github.com/anxpp/beego/logs" "github.com/dgrijalva/jwt-go" "github.com/spf13/viper" diff --git a/pkg/partner/WxPay/WxPayClient.go b/pkg/partner/WxPay/WxPayClient.go index 25f129b..8f8ea9b 100644 --- a/pkg/partner/WxPay/WxPayClient.go +++ b/pkg/partner/WxPay/WxPayClient.go @@ -6,15 +6,16 @@ import ( "encoding/xml" "errors" "net/http" - "servicebase/pkg/common" - "servicebase/pkg/htools" - "servicebase/pkg/log" - "servicebase/pkg/partner/wxpay_utility" "sort" "strconv" "strings" "time" + "gitea.ddegame.cn/open/servicebase/pkg/common" + "gitea.ddegame.cn/open/servicebase/pkg/htools" + "gitea.ddegame.cn/open/servicebase/pkg/log" + "gitea.ddegame.cn/open/servicebase/pkg/partner/wxpay_utility" + "github.com/spf13/viper" "github.com/wechatpay-apiv3/wechatpay-go/core" "github.com/wechatpay-apiv3/wechatpay-go/core/auth/verifiers" diff --git a/pkg/partner/YiDun/YiDunClient.go b/pkg/partner/YiDun/YiDunClient.go index 5a43f66..4861cd6 100644 --- a/pkg/partner/YiDun/YiDunClient.go +++ b/pkg/partner/YiDun/YiDunClient.go @@ -7,11 +7,12 @@ import ( "errors" "fmt" "net/http" - "servicebase/pkg/common/HyTools" "sort" "strconv" "time" + "gitea.ddegame.cn/open/servicebase/pkg/common/HyTools" + "github.com/anxpp/beego/logs" "github.com/spf13/viper" ) diff --git a/pkg/partner/ZhimaCertify/ZhimaCertifyClient.go b/pkg/partner/ZhimaCertify/ZhimaCertifyClient.go index 54a3f04..fb8797d 100644 --- a/pkg/partner/ZhimaCertify/ZhimaCertifyClient.go +++ b/pkg/partner/ZhimaCertify/ZhimaCertifyClient.go @@ -4,7 +4,8 @@ import ( "encoding/json" "errors" "net/url" - "servicebase/pkg/htools" + + "gitea.ddegame.cn/open/servicebase/pkg/htools" "github.com/anxpp/beego/logs" ) diff --git a/pkg/partner/ali_auth/client.go b/pkg/partner/ali_auth/client.go index 78c9eea..b95a6c5 100644 --- a/pkg/partner/ali_auth/client.go +++ b/pkg/partner/ali_auth/client.go @@ -2,9 +2,10 @@ package ali_auth import ( "fmt" - "servicebase/pkg/log" "strings" + "gitea.ddegame.cn/open/servicebase/pkg/log" + "github.com/pkg/errors" "github.com/spf13/viper" diff --git a/pkg/partner/mq/http/client.go b/pkg/partner/mq/http/client.go index 04200c2..ca3cad9 100644 --- a/pkg/partner/mq/http/client.go +++ b/pkg/partner/mq/http/client.go @@ -1,12 +1,13 @@ package mq_http import ( - "servicebase/pkg/htools" - "servicebase/pkg/partner/mq/message" - "servicebase/pkg/partner/mq/pusher" "encoding/json" "fmt" + "gitea.ddegame.cn/open/servicebase/pkg/htools" + "gitea.ddegame.cn/open/servicebase/pkg/partner/mq/message" + "gitea.ddegame.cn/open/servicebase/pkg/partner/mq/pusher" + "github.com/spf13/viper" ) diff --git a/pkg/partner/mq/message_client.go b/pkg/partner/mq/message_client.go index 424dcb5..a58d138 100644 --- a/pkg/partner/mq/message_client.go +++ b/pkg/partner/mq/message_client.go @@ -1,14 +1,15 @@ package mq import ( - "servicebase/pkg/common/HyTools" - mq_http "servicebase/pkg/partner/mq/http" - message2 "servicebase/pkg/partner/mq/message" - "servicebase/pkg/partner/mq/pusher" "encoding/json" "errors" "strconv" "strings" + + "gitea.ddegame.cn/open/servicebase/pkg/common/HyTools" + mq_http "gitea.ddegame.cn/open/servicebase/pkg/partner/mq/http" + message2 "gitea.ddegame.cn/open/servicebase/pkg/partner/mq/message" + "gitea.ddegame.cn/open/servicebase/pkg/partner/mq/pusher" ) var ( diff --git a/pkg/partner/mq/pusher/push_client.go b/pkg/partner/mq/pusher/push_client.go index 246a65d..6906481 100644 --- a/pkg/partner/mq/pusher/push_client.go +++ b/pkg/partner/mq/pusher/push_client.go @@ -1,6 +1,6 @@ package pusher -import "servicebase/pkg/partner/mq/message" +import "gitea.ddegame.cn/open/servicebase/pkg/partner/mq/message" type PushClient interface { PushRegisterMessage(m message.RegisterMessage) (e error) diff --git a/pkg/partner/mq/rocket/client.go b/pkg/partner/mq/rocket/client.go index 4eebc65..1af6575 100644 --- a/pkg/partner/mq/rocket/client.go +++ b/pkg/partner/mq/rocket/client.go @@ -1,15 +1,16 @@ package rocket import ( - "servicebase/pkg/common" - "servicebase/pkg/partner/mq/message" - "servicebase/pkg/partner/mq/pusher" "context" "encoding/json" "fmt" "strings" "sync" + "gitea.ddegame.cn/open/servicebase/pkg/common" + "gitea.ddegame.cn/open/servicebase/pkg/partner/mq/message" + "gitea.ddegame.cn/open/servicebase/pkg/partner/mq/pusher" + "github.com/anxpp/beego/logs" "github.com/apache/rocketmq-client-go/v2" "github.com/apache/rocketmq-client-go/v2/primitive" diff --git a/pkg/partner/mq/rocket_test.go b/pkg/partner/mq/rocket_test.go index f3f6147..42ae1f3 100644 --- a/pkg/partner/mq/rocket_test.go +++ b/pkg/partner/mq/rocket_test.go @@ -1,11 +1,12 @@ package mq import ( - "servicebase/pkg/common" - "servicebase/pkg/partner/mq/message" "testing" "time" + "gitea.ddegame.cn/open/servicebase/pkg/common" + "gitea.ddegame.cn/open/servicebase/pkg/partner/mq/message" + "github.com/anxpp/beego" ) diff --git a/pkg/partner/recommend/client.go b/pkg/partner/recommend/client.go index 03687d3..3eb12de 100644 --- a/pkg/partner/recommend/client.go +++ b/pkg/partner/recommend/client.go @@ -1,13 +1,14 @@ package recommend import ( - "servicebase/pkg/cache" "bytes" "encoding/json" "fmt" "io/ioutil" "net/http" + "gitea.ddegame.cn/open/servicebase/pkg/cache" + "github.com/anxpp/beego" "github.com/anxpp/beego/logs" redis "github.com/redis/go-redis/v9" diff --git a/pkg/partner/submail/submail_client.go b/pkg/partner/submail/submail_client.go index 50f1c64..858b4c7 100644 --- a/pkg/partner/submail/submail_client.go +++ b/pkg/partner/submail/submail_client.go @@ -2,9 +2,10 @@ package submail import ( "encoding/json" - "servicebase/pkg/utils" "sort" + "gitea.ddegame.cn/open/servicebase/pkg/utils" + "github.com/spf13/viper" ) diff --git a/pkg/repo/admin_privilege.gen.go b/pkg/repo/admin_privilege.gen.go index 306bb44..c1a8c0a 100644 --- a/pkg/repo/admin_privilege.gen.go +++ b/pkg/repo/admin_privilege.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newAdminPrivilege(db *gorm.DB, opts ...gen.DOOption) adminPrivilege { diff --git a/pkg/repo/admin_role.gen.go b/pkg/repo/admin_role.gen.go index 85353db..27ad61c 100644 --- a/pkg/repo/admin_role.gen.go +++ b/pkg/repo/admin_role.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newAdminRole(db *gorm.DB, opts ...gen.DOOption) adminRole { diff --git a/pkg/repo/admin_role_privilege.gen.go b/pkg/repo/admin_role_privilege.gen.go index b0dd672..38e8c68 100644 --- a/pkg/repo/admin_role_privilege.gen.go +++ b/pkg/repo/admin_role_privilege.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newAdminRolePrivilege(db *gorm.DB, opts ...gen.DOOption) adminRolePrivilege { diff --git a/pkg/repo/admin_user.gen.go b/pkg/repo/admin_user.gen.go index 8b7b6a6..c9df333 100644 --- a/pkg/repo/admin_user.gen.go +++ b/pkg/repo/admin_user.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newAdminUser(db *gorm.DB, opts ...gen.DOOption) adminUser { diff --git a/pkg/repo/admin_user_role.gen.go b/pkg/repo/admin_user_role.gen.go index 9a4557b..a23eda6 100644 --- a/pkg/repo/admin_user_role.gen.go +++ b/pkg/repo/admin_user_role.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newAdminUserRole(db *gorm.DB, opts ...gen.DOOption) adminUserRole { diff --git a/pkg/repo/data_attach.gen.go b/pkg/repo/data_attach.gen.go index 4dafe38..d6dbf02 100644 --- a/pkg/repo/data_attach.gen.go +++ b/pkg/repo/data_attach.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newDataAttach(db *gorm.DB, opts ...gen.DOOption) dataAttach { diff --git a/pkg/repo/game.gen.go b/pkg/repo/game.gen.go index f8667b7..16fdc8c 100644 --- a/pkg/repo/game.gen.go +++ b/pkg/repo/game.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newGame(db *gorm.DB, opts ...gen.DOOption) game { diff --git a/pkg/repo/trade_commodity.gen.go b/pkg/repo/trade_commodity.gen.go index 2f9ce52..168318f 100644 --- a/pkg/repo/trade_commodity.gen.go +++ b/pkg/repo/trade_commodity.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newTradeCommodity(db *gorm.DB, opts ...gen.DOOption) tradeCommodity { diff --git a/pkg/repo/user.gen.go b/pkg/repo/user.gen.go index 17d4853..e30795b 100644 --- a/pkg/repo/user.gen.go +++ b/pkg/repo/user.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newUser(db *gorm.DB, opts ...gen.DOOption) user { diff --git a/pkg/repo/user_game_role.gen.go b/pkg/repo/user_game_role.gen.go index d7259ec..63dd60c 100644 --- a/pkg/repo/user_game_role.gen.go +++ b/pkg/repo/user_game_role.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newUserGameRole(db *gorm.DB, opts ...gen.DOOption) userGameRole { diff --git a/pkg/repo/user_game_role_prop.gen.go b/pkg/repo/user_game_role_prop.gen.go index 0d93df6..dce2c78 100644 --- a/pkg/repo/user_game_role_prop.gen.go +++ b/pkg/repo/user_game_role_prop.gen.go @@ -16,7 +16,7 @@ import ( "gorm.io/plugin/dbresolver" - "servicebase/pkg/model" + "gitea.ddegame.cn/open/servicebase/pkg/model" ) func newUserGameRoleProp(db *gorm.DB, opts ...gen.DOOption) userGameRoleProp { diff --git a/pkg/req/abstract.go b/pkg/req/abstract.go index 9319600..21caccb 100644 --- a/pkg/req/abstract.go +++ b/pkg/req/abstract.go @@ -1,10 +1,11 @@ package req import ( - "servicebase/pkg/constant" - "servicebase/pkg/tools" "errors" + "gitea.ddegame.cn/open/servicebase/pkg/constant" + "gitea.ddegame.cn/open/servicebase/pkg/tools" + "github.com/gin-gonic/gin" ) diff --git a/pkg/req/admin_act.go b/pkg/req/admin_act.go index cbc9f16..f2043d8 100644 --- a/pkg/req/admin_act.go +++ b/pkg/req/admin_act.go @@ -1,6 +1,6 @@ package req -import "servicebase/pkg/datasource/fields" +import "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" type News struct { ID string `gorm:"column:id;type:char(32);not null;uniqueIndex:id,priority:1;comment:业务ID" json:"id"` // 业务ID diff --git a/pkg/req/admin_system.go b/pkg/req/admin_system.go index 15cfb05..f447984 100644 --- a/pkg/req/admin_system.go +++ b/pkg/req/admin_system.go @@ -2,7 +2,8 @@ package req import ( "errors" - "servicebase/pkg/datasource/fields" + + "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" ) type SystemSettingPageReq struct { diff --git a/pkg/req/app_user.go b/pkg/req/app_user.go index 04e55d5..725ef36 100644 --- a/pkg/req/app_user.go +++ b/pkg/req/app_user.go @@ -2,7 +2,8 @@ package req import ( "errors" - "servicebase/pkg/datasource/fields" + + "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" ) // 登录请求对象 diff --git a/pkg/req/app_user_order.go b/pkg/req/app_user_order.go index 19aec3d..384a87e 100644 --- a/pkg/req/app_user_order.go +++ b/pkg/req/app_user_order.go @@ -2,7 +2,8 @@ package req import ( "errors" - "servicebase/pkg/datasource/fields" + + "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" "github.com/shopspring/decimal" ) diff --git a/pkg/req/common_auth.go b/pkg/req/common_auth.go index ae16ed4..9e374aa 100644 --- a/pkg/req/common_auth.go +++ b/pkg/req/common_auth.go @@ -3,7 +3,8 @@ package req import ( "context" "errors" - "servicebase/pkg/log" + + "gitea.ddegame.cn/open/servicebase/pkg/log" ) type CommonAuthReq struct { diff --git a/pkg/res/abstract.go b/pkg/res/abstract.go index 9065ef8..fef531d 100644 --- a/pkg/res/abstract.go +++ b/pkg/res/abstract.go @@ -3,9 +3,10 @@ package res import ( "fmt" "net/http" - "servicebase/pkg/cerrors" - "servicebase/pkg/log" - "servicebase/pkg/req" + + "gitea.ddegame.cn/open/servicebase/pkg/cerrors" + "gitea.ddegame.cn/open/servicebase/pkg/log" + "gitea.ddegame.cn/open/servicebase/pkg/req" "github.com/gin-gonic/gin" ) diff --git a/pkg/res/act_news.go b/pkg/res/act_news.go index b88552e..135c69e 100644 --- a/pkg/res/act_news.go +++ b/pkg/res/act_news.go @@ -1,6 +1,6 @@ package res -import "servicebase/pkg/datasource/fields" +import "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" type ActNewsAll struct { ListType []ActNewsType `gorm:"-" json:"list_type"` diff --git a/pkg/res/admin_act.go b/pkg/res/admin_act.go index fd910d1..c04c690 100644 --- a/pkg/res/admin_act.go +++ b/pkg/res/admin_act.go @@ -1,6 +1,6 @@ package res -import "servicebase/pkg/datasource/fields" +import "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" type News struct { ID string `gorm:"column:id;type:char(32);not null;uniqueIndex:id,priority:1;comment:业务ID" json:"id"` // 业务ID diff --git a/pkg/res/admin_trade.go b/pkg/res/admin_trade.go index 3748908..c05a6c9 100644 --- a/pkg/res/admin_trade.go +++ b/pkg/res/admin_trade.go @@ -1,6 +1,6 @@ package res -import "servicebase/pkg/datasource/fields" +import "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" type UserGameRole struct { ID string `gorm:"column:id;type:char(32);not null;uniqueIndex:id,priority:1;comment:业务ID" json:"id"` // 业务ID diff --git a/pkg/res/app_user.go b/pkg/res/app_user.go index f069fa5..c3d8ec8 100644 --- a/pkg/res/app_user.go +++ b/pkg/res/app_user.go @@ -1,6 +1,6 @@ package res -import "servicebase/pkg/datasource/fields" +import "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" type UserRes struct { IDBody diff --git a/pkg/res/app_user_clan.go b/pkg/res/app_user_clan.go index 43423df..1d2de4d 100644 --- a/pkg/res/app_user_clan.go +++ b/pkg/res/app_user_clan.go @@ -1,6 +1,6 @@ package res -import "servicebase/pkg/datasource/fields" +import "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" type UserClanRes struct { ID string `gorm:"column:id;type:char(32);not null;uniqueIndex:id,priority:1;comment:ID" json:"id"` diff --git a/pkg/res/app_user_content.go b/pkg/res/app_user_content.go index 195531e..778e3b3 100644 --- a/pkg/res/app_user_content.go +++ b/pkg/res/app_user_content.go @@ -1,7 +1,7 @@ package res import ( - "servicebase/pkg/datasource/fields" + "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" "github.com/shopspring/decimal" ) diff --git a/pkg/res/app_user_friend.go b/pkg/res/app_user_friend.go index 9646619..5971258 100644 --- a/pkg/res/app_user_friend.go +++ b/pkg/res/app_user_friend.go @@ -1,6 +1,6 @@ package res -import "servicebase/pkg/datasource/fields" +import "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" type UserFriendRes struct { ID string `gorm:"column:id;type:char(32);not null;uniqueIndex:id,priority:1;comment:ID" json:"id"` diff --git a/pkg/res/app_user_moment.go b/pkg/res/app_user_moment.go index ff37d30..9c6910d 100644 --- a/pkg/res/app_user_moment.go +++ b/pkg/res/app_user_moment.go @@ -1,6 +1,6 @@ package res -import "servicebase/pkg/datasource/fields" +import "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" type UserMomentRes struct { ID string `gorm:"column:id;type:char(32);not null;uniqueIndex:id,priority:1;comment:ID" json:"id"` diff --git a/pkg/res/app_user_order.go b/pkg/res/app_user_order.go index 2d49223..6d51d87 100644 --- a/pkg/res/app_user_order.go +++ b/pkg/res/app_user_order.go @@ -1,7 +1,7 @@ package res import ( - "servicebase/pkg/datasource/fields" + "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" "github.com/shopspring/decimal" ) diff --git a/pkg/res/app_user_shop.go b/pkg/res/app_user_shop.go index 343c8c3..c0da9fb 100644 --- a/pkg/res/app_user_shop.go +++ b/pkg/res/app_user_shop.go @@ -1,6 +1,6 @@ package res -import "servicebase/pkg/datasource/fields" +import "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" type CategoryTreeRes struct { IDBody diff --git a/pkg/res/common_auth.go b/pkg/res/common_auth.go index 6a07405..4a31d7b 100644 --- a/pkg/res/common_auth.go +++ b/pkg/res/common_auth.go @@ -1,7 +1,7 @@ package res import ( - "servicebase/pkg/datasource/fields" + "gitea.ddegame.cn/open/servicebase/pkg/datasource/fields" ) type AdminUserAuthRes struct { diff --git a/pkg/tools/picture/thumb_task.go b/pkg/tools/picture/thumb_task.go index e159965..e26e045 100644 --- a/pkg/tools/picture/thumb_task.go +++ b/pkg/tools/picture/thumb_task.go @@ -3,16 +3,17 @@ package picture import ( "context" //cache "ServiceAll/modules/company/internal/client/redis" - "servicebase/pkg/datasource" - "servicebase/pkg/log" - "servicebase/pkg/repo" - "servicebase/pkg/tools" "fmt" "path/filepath" "strconv" "strings" "time" + "gitea.ddegame.cn/open/servicebase/pkg/datasource" + "gitea.ddegame.cn/open/servicebase/pkg/log" + "gitea.ddegame.cn/open/servicebase/pkg/repo" + "gitea.ddegame.cn/open/servicebase/pkg/tools" + "github.com/disintegration/imaging" "github.com/pkg/errors" "github.com/spf13/viper" diff --git a/pkg/tools/picture/thumb_task_test.go b/pkg/tools/picture/thumb_task_test.go index 6d5de98..5d10b56 100644 --- a/pkg/tools/picture/thumb_task_test.go +++ b/pkg/tools/picture/thumb_task_test.go @@ -1,11 +1,12 @@ package picture import ( - "servicebase/pkg/datasource" - "servicebase/pkg/log" "fmt" "testing" + "gitea.ddegame.cn/open/servicebase/pkg/datasource" + "gitea.ddegame.cn/open/servicebase/pkg/log" + "github.com/disintegration/imaging" "github.com/spf13/viper" ) diff --git a/pkg/tools/safe.go b/pkg/tools/safe.go index 98a95da..d32cb61 100644 --- a/pkg/tools/safe.go +++ b/pkg/tools/safe.go @@ -2,7 +2,8 @@ package tools import ( "runtime/debug" - "servicebase/pkg/log" + + "gitea.ddegame.cn/open/servicebase/pkg/log" ) func Recover(cleanups ...func()) { diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 3ed0e93..6f3459d 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -5,11 +5,12 @@ import ( "encoding/json" "fmt" "io" - "servicebase/pkg/constant" "strconv" "strings" "time" + "gitea.ddegame.cn/open/servicebase/pkg/constant" + "github.com/anxpp/common-utils/str" "github.com/gin-gonic/gin" )