diff --git a/controllers/base.go b/controllers/base.go index 6bbaf2c..29899f6 100644 --- a/controllers/base.go +++ b/controllers/base.go @@ -10,7 +10,7 @@ import ( "go.uber.org/zap" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) //解析page、pageSize diff --git a/controllers/client/good.go b/controllers/client/good.go index 8496ddc..e04b095 100644 --- a/controllers/client/good.go +++ b/controllers/client/good.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type GoodCtl struct { diff --git a/controllers/client/live.go b/controllers/client/live.go index 5e4c947..07c15e1 100644 --- a/controllers/client/live.go +++ b/controllers/client/live.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) // 轮询接口 diff --git a/controllers/client/order_entry.go b/controllers/client/order_entry.go index 136799b..40f8a2f 100644 --- a/controllers/client/order_entry.go +++ b/controllers/client/order_entry.go @@ -10,7 +10,7 @@ import ( "hudongzhuanjia/utils/define" "strings" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type OrderEntryCtl struct { diff --git a/controllers/client/vote.go b/controllers/client/vote.go index 4d03d83..a72deb6 100644 --- a/controllers/client/vote.go +++ b/controllers/client/vote.go @@ -6,7 +6,7 @@ import ( "hudongzhuanjia/models" "hudongzhuanjia/utils/code" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type VoteCtl struct { diff --git a/controllers/common/annex.go b/controllers/common/annex.go index 63ffc32..a09c59a 100644 --- a/controllers/common/annex.go +++ b/controllers/common/annex.go @@ -1,9 +1,9 @@ package common import ( - "github.com/ouxuanserver/osmanthuswine/src/helper" "context" "fmt" + "git.ouxuan.net/tommy/osmanthuswine/src/helper" "hudongzhuanjia/controllers" "net/http" "net/url" diff --git a/controllers/pc/activity.go b/controllers/pc/activity.go index 0a8a6c5..b99a7fc 100644 --- a/controllers/pc/activity.go +++ b/controllers/pc/activity.go @@ -6,6 +6,7 @@ import ( "hudongzhuanjia/models" "hudongzhuanjia/utils/code" "hudongzhuanjia/utils/define" + "time" ) //活动 diff --git a/controllers/pc/order_draw.go b/controllers/pc/order_draw.go index 400fce4..bd69272 100644 --- a/controllers/pc/order_draw.go +++ b/controllers/pc/order_draw.go @@ -11,7 +11,7 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) // 订单 diff --git a/controllers/pc/shake_red_envelope.go b/controllers/pc/shake_red_envelope.go index c070855..b9e9286 100644 --- a/controllers/pc/shake_red_envelope.go +++ b/controllers/pc/shake_red_envelope.go @@ -11,7 +11,7 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type ShakeRedEnvelopeCtl struct { diff --git a/controllers/pc/tug_war.go b/controllers/pc/tug_war.go index eebb758..f876c07 100644 --- a/controllers/pc/tug_war.go +++ b/controllers/pc/tug_war.go @@ -9,7 +9,7 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type TugOfWarCtl struct { diff --git a/controllers/pc/upper_wall.go b/controllers/pc/upper_wall.go index 3773e60..8deb2ad 100644 --- a/controllers/pc/upper_wall.go +++ b/controllers/pc/upper_wall.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type UpperWallCtl struct { diff --git a/controllers/pc/vote.go b/controllers/pc/vote.go index f576784..0bc8394 100644 --- a/controllers/pc/vote.go +++ b/controllers/pc/vote.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type VoteCtl struct { diff --git a/go.mod b/go.mod index 5f8ea19..d49f3dc 100644 --- a/go.mod +++ b/go.mod @@ -3,33 +3,40 @@ module hudongzhuanjia go 1.12 require ( + git.ouxuan.net/tommy/osmanthuswine v0.0.0-20201020034611-74eaaf1ba57d + github.com/Chronokeeper/anyxml v0.0.0-20160530174208-54457d8e98c6 // indirect github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect + github.com/CloudyKit/jet v2.1.2+incompatible // indirect + github.com/agrison/go-tablib v0.0.0-20160310143025-4930582c22ee // indirect + github.com/agrison/mxj v0.0.0-20160310142625-1269f8afb3b4 // indirect github.com/aws/aws-sdk-go v1.35.10 // indirect + github.com/bndr/gotabulate v1.1.2 // indirect github.com/chanxuehong/wechat v0.0.0-20200409104612-0a1fd76d7a3a github.com/dgrijalva/jwt-go v3.2.0+incompatible + github.com/fatih/structs v1.1.0 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-chi/chi v4.1.2+incompatible // indirect github.com/go-errors/errors v1.1.1 // indirect github.com/go-redis/redis v6.15.9+incompatible // indirect github.com/go-stack/stack v1.8.0 github.com/golang/snappy v0.0.2 // indirect - github.com/gorilla/websocket v1.4.2 + github.com/google/uuid v1.1.2 // indirect + github.com/gorilla/securecookie v1.1.1 // indirect + github.com/gorilla/websocket v1.4.2 // indirect github.com/importcjj/sensitive v0.0.0-20200106142752-42d1c505be7b github.com/jinzhu/gorm v1.9.16 // indirect + github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect github.com/kirinlabs/HttpRequest v1.0.5 - github.com/mattn/go-sqlite3 v2.0.1+incompatible // indirect - github.com/ouxuanserver/osmanthuswine v0.0.0-20190916032555-480efadf4941 - github.com/panjf2000/ants v4.0.2+incompatible github.com/pkg/errors v0.9.1 - github.com/rs/zerolog v1.19.0 - github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 + github.com/rs/zerolog v1.20.0 + github.com/satori/go.uuid v1.2.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e - github.com/smartystreets/goconvey v1.6.4 - github.com/stretchr/testify v1.5.1 // indirect github.com/syndtr/goleveldb v1.0.0 github.com/tealeg/xlsx v1.0.5 // indirect github.com/tencentyun/cos-go-sdk-v5 v0.7.10 github.com/tencentyun/tls-sig-api-v2-golang v1.0.0 + github.com/wailovet/db2struct v0.0.0-20190220022639-a297dc96489a // indirect + github.com/wailovet/overseer v0.0.0-20190412102736-c280479fa09f // indirect github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be // indirect github.com/xormplus/core v0.0.0-20200308074340-f3bce19d5f31 // indirect github.com/xormplus/xorm v0.0.0-20200912034818-5d90dcd4e3d6 @@ -37,6 +44,7 @@ require ( go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13 // indirect + gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/olahol/melody.v1 v1.0.0-20170518105555-d52139073376 gopkg.in/yaml.v2 v2.3.0 // indirect diff --git a/go.sum b/go.sum index 917b2dc..bef86bc 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,10 @@ cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU= cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= git.apache.org/thrift.git v0.12.0/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= +git.ouxuan.net/tommy/osmanthuswine v0.0.0-20190916032555-480efadf4941 h1:MpkZbGXvxwbsYNTtDphTCsGMi//M2ija6LJr3N6/DpI= +git.ouxuan.net/tommy/osmanthuswine v0.0.0-20190916032555-480efadf4941/go.mod h1:lIF2zcUhvVpFuLKpEYh3ArHRoZsGNo3PZS7FYqmQBXI= +git.ouxuan.net/tommy/osmanthuswine v0.0.0-20201020034611-74eaaf1ba57d h1:1zlMe02FiDq905xAi5eyIfvHdp9tYwdqqbSEevFugtc= +git.ouxuan.net/tommy/osmanthuswine v0.0.0-20201020034611-74eaaf1ba57d/go.mod h1:wETwSXOB70gozV7Xx7bUBrRZX9mVvuQiqqUJgAJzHao= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= @@ -61,6 +65,7 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190418034912-35416408c946 h1:xn+jBHAqN github.com/denisenkom/go-mssqldb v0.0.0-20190418034912-35416408c946/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6ROGeiHFAP8WJdI2RoxALQYgdllERc3N5N2DM= github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/dgrijalva/jwt-go v1.0.2 h1:KPldsxuKGsS2FPWsNeg9ZO18aCrGKujPoWXn2yo+KQM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= @@ -76,6 +81,7 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-chi/chi v1.0.0 h1:s/kv1cTXfivYjdKJdyUzNGyAWZ/2t7duW1gKn5ivu+c= github.com/go-chi/chi v4.0.2+incompatible h1:maB6vn6FqCxrpz4FqWdh4+lwpyZIQS7YEAUcHlgXVRs= github.com/go-chi/chi v4.0.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec= @@ -125,6 +131,8 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -152,18 +160,36 @@ github.com/jackc/pgx v3.3.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGk github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jinzhu/gorm v1.9.4 h1:3KDoUjMEfH58nweXdD5Dng222YiwOVUNFShENhehJyQ= github.com/jinzhu/gorm v1.9.4/go.mod h1:7ZYqlk/T0SqZip7ZOIL1aC/sjDj+dJo6sN98WljHFXY= +github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= +github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= +github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= +github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= +github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/kirinlabs/HttpRequest v1.0.5 h1:1bWj23Tzxm5Zyzm3YURa+ujnBXoXiIbsQq3K9U4SP8s= +github.com/kirinlabs/HttpRequest v1.0.5/go.mod h1:XV38fA4rXZox83tlEV9KIQ7Cdsut319x6NGzVLuRlB8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/ouxuanserver/osmanthuswine v0.0.0-20190916032555-480efadf4941 h1:MpkZbGXvxwbsYNTtDphTCsGMi//M2ija6LJr3N6/DpI= -github.com/ouxuanserver/osmanthuswine v0.0.0-20190916032555-480efadf4941/go.mod h1:lIF2zcUhvVpFuLKpEYh3ArHRoZsGNo3PZS7FYqmQBXI= github.com/panjf2000/ants v4.0.2+incompatible h1:6K9b4YyUmbTvfxGm2YZgmDgIiCEyP1x+gewN+tBr/8U= github.com/panjf2000/ants v4.0.2+incompatible/go.mod h1:AaACblRPzq35m1g3enqYcxspbbiOJJYaxU2wMpm1cXY= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -188,7 +214,11 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.19.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= +github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= +github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= github.com/satori/go.uuid v0.0.0-20190313024323-b2ce2384e17b h1:PB8A682UQ6pwoFhkszETBsYw3B9Ze9FEA4cf9H9O3f8= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -209,6 +239,13 @@ github.com/tealeg/xlsx v1.0.3/go.mod h1:uxu5UY2ovkuRPWKQ8Q7JG0JbSivrISjdPzZQKeo7 github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE= github.com/tealeg/xlsx v1.0.5/go.mod h1:btRS8dz54TDnvKNosuAqxrM1QgN1udgk9O34bDCnORM= github.com/tencentyun/cos-go-sdk-v5 v0.7.10 h1:hJPLdR4RPsnubB3M9qXNBeUbcOJMVANnO/L6Att/PZU= +github.com/tencentyun/cos-go-sdk-v5 v0.7.10/go.mod h1:wQBO5HdAkLjj2q6XQiIfDSP8DXDNrppDRw2Kp/1BODA= +github.com/tencentyun/tls-sig-api-v2-golang v1.0.0 h1:NavMw9XO2iCLv8hTKaJW2kTaGR2SdNljMABbe39yu6Q= +github.com/tencentyun/tls-sig-api-v2-golang v1.0.0/go.mod h1:u7WiArmCTXTaQAHJwAOaLgpJ5e2xdY5/cgMEy3ubL60= +github.com/wailovet/db2struct v0.0.0-20190220022639-a297dc96489a h1:RndWCoBQ9Ltyj1m46BmGexEv3ZU8hPjV3fGo1xxh07A= +github.com/wailovet/db2struct v0.0.0-20190220022639-a297dc96489a/go.mod h1:Dqil0kg+pAM/6QVGUG6LY9EVUtT/SJqpXsaklNalmz0= +github.com/wailovet/overseer v0.0.0-20190412102736-c280479fa09f h1:N69pQZKxZw3tUsnCWJSw4dG+t4lbb4mCLbiHz1sHfMk= +github.com/wailovet/overseer v0.0.0-20190412102736-c280479fa09f/go.mod h1:IE0ZeKrlRAFsChkP21Tg3CKgybYJ7qiHHJAcH/xB4Sg= github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be h1:HTSana2sMSKVze3XXYrF89w2tw835Fh+7xX5KPvAkuo= github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be/go.mod h1:PgBA7NoHtnttVkWModa/qpvIWkX6MpOKgyRCWsSKSB0= github.com/xormplus/core v0.0.0-20190120064039-da7907271e2f h1:RTzjDWlXKTcurd/cWTOuaxTACdWw+gs7HaNCLaK1PJQ= @@ -217,7 +254,42 @@ github.com/xormplus/core v0.0.0-20200308074340-f3bce19d5f31 h1:Xc/TNcIKyvLIp1Y9K github.com/xormplus/core v0.0.0-20200308074340-f3bce19d5f31/go.mod h1:V3p6iAR/MaICgU6GJqxGQxspfljTyfOTv4Czz0B5atU= github.com/xormplus/xorm v0.0.0-20190419084314-284871d688a4 h1:7cw+J6ScPpTq9QgHSS4wrGUkrbCE2oVL/dct7YP4d+M= github.com/xormplus/xorm v0.0.0-20190419084314-284871d688a4/go.mod h1:+v6b10b4x5IcQmp1/Cbo9IqaknxVeuhQng+fhya6bdI= +github.com/xormplus/xorm v0.0.0-20200912034818-5d90dcd4e3d6 h1:8wMAe6KZ0YOG1RvjxyK5VhB29grvQbhb6MZTDIdpSd4= +github.com/xormplus/xorm v0.0.0-20200912034818-5d90dcd4e3d6/go.mod h1:+v6b10b4x5IcQmp1/Cbo9IqaknxVeuhQng+fhya6bdI= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM= +go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13 h1:5jaG59Zhd+8ZXe8C+lgiAGqkOaZBruqrWclLkgAww34= +golang.org/x/sys v0.0.0-20201018230417-eeed37f84f13/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= diff --git a/hdws/main.go b/hdws/main.go index df6dbd0..3e7c7f4 100644 --- a/hdws/main.go +++ b/hdws/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/ouxuanserver/osmanthuswine" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine" + "git.ouxuan.net/tommy/osmanthuswine/src/core" "hudongzhuanjia/hdws/ws" ) diff --git a/hdws/ws/http.go b/hdws/ws/http.go index 0ae6efb..b9a4047 100644 --- a/hdws/ws/http.go +++ b/hdws/ws/http.go @@ -2,7 +2,7 @@ package ws import ( "fmt" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" "time" ) diff --git a/hdws/ws/jwt_go.go b/hdws/ws/jwt_go.go index faec3fd..dd6f0b1 100644 --- a/hdws/ws/jwt_go.go +++ b/hdws/ws/jwt_go.go @@ -5,8 +5,8 @@ import ( "fmt" "time" + "git.ouxuan.net/tommy/osmanthuswine/src/helper" "github.com/dgrijalva/jwt-go" - "github.com/ouxuanserver/osmanthuswine/src/helper" ) type Claims struct { diff --git a/hdws/ws/ws.go b/hdws/ws/ws.go index 7f0acde..ff65408 100644 --- a/hdws/ws/ws.go +++ b/hdws/ws/ws.go @@ -2,7 +2,7 @@ package ws import ( "encoding/json" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" "gopkg.in/olahol/melody.v1" "math" ) diff --git a/libs/jwt/jwt_go.go b/libs/jwt/jwt_go.go index fdbbefd..5fc8ce4 100644 --- a/libs/jwt/jwt_go.go +++ b/libs/jwt/jwt_go.go @@ -5,8 +5,8 @@ import ( "fmt" "time" + "git.ouxuan.net/tommy/osmanthuswine/src/helper" "github.com/dgrijalva/jwt-go" - "github.com/ouxuanserver/osmanthuswine/src/helper" ) type Claims struct { diff --git a/libs/qq/qq.go b/libs/qq/qq.go index 3c5de7e..80f6d44 100644 --- a/libs/qq/qq.go +++ b/libs/qq/qq.go @@ -7,7 +7,7 @@ import ( "net/http" "net/url" - "github.com/ouxuanserver/osmanthuswine/src/helper" + "git.ouxuan.net/tommy/osmanthuswine/src/helper" ) var ( @@ -50,7 +50,7 @@ func GetUserInfoUrl(accessToken, openid string) string { type Token struct { AccessToken string `json:"access_token"` - ExpiresIn int `json:"expires_in"` + ExpiresIn int `json:"expires_in"` RefreshToken string `json:"refresh_token"` } diff --git a/libs/wx/wx.go b/libs/wx/wx.go index b186410..5d32ce1 100644 --- a/libs/wx/wx.go +++ b/libs/wx/wx.go @@ -5,8 +5,8 @@ import ( "hudongzhuanjia/utils/define" "net/url" + "git.ouxuan.net/tommy/osmanthuswine/src/helper" "github.com/kirinlabs/HttpRequest" - "github.com/ouxuanserver/osmanthuswine/src/helper" ) func GetCodeUrl() string { diff --git a/main.go b/main.go index 7dba7cd..1e3282d 100644 --- a/main.go +++ b/main.go @@ -1,12 +1,13 @@ package main import ( - "github.com/ouxuanserver/osmanthuswine" - "github.com/ouxuanserver/osmanthuswine/src/core" "hudongzhuanjia/controllers/client" "hudongzhuanjia/controllers/common" "hudongzhuanjia/controllers/pc" "hudongzhuanjia/utils/define" + + "git.ouxuan.net/tommy/osmanthuswine" + "git.ouxuan.net/tommy/osmanthuswine/src/core" //_ "net/http/pprof" ) diff --git a/models/CalorieUser.go b/models/CalorieUser.go index 404db26..8ee7fe5 100644 --- a/models/CalorieUser.go +++ b/models/CalorieUser.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const CalorieUserTableName = TableNamePrefix + "calorie_user" diff --git a/models/activity_module_service.go b/models/activity_module_service.go index 6df031e..6ac29cd 100644 --- a/models/activity_module_service.go +++ b/models/activity_module_service.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const ActivityModuleServiceTableName = TableNamePrefix + "activity_module_service" diff --git a/models/arch.go b/models/arch.go index 4b8235a..cbb3c8c 100644 --- a/models/arch.go +++ b/models/arch.go @@ -1,9 +1,7 @@ package models import ( - "time" - - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const ArchTableName = TableNamePrefix + "arch" diff --git a/models/area_store.go b/models/area_store.go index cecdb85..345293e 100644 --- a/models/area_store.go +++ b/models/area_store.go @@ -1,8 +1,8 @@ package models import ( - "github.com/ouxuanserver/osmanthuswine/src/core" - "github.com/ouxuanserver/osmanthuswine/src/helper" + "git.ouxuan.net/tommy/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/helper" ) const AreaStoreTableName = TableNamePrefix + "area_store" diff --git a/models/auction_history.go b/models/auction_history.go index 8f6b788..59e0325 100644 --- a/models/auction_history.go +++ b/models/auction_history.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const AuctionHistoryTableName = TableNamePrefix + "auction_history" diff --git a/models/auction_player.go b/models/auction_player.go index 9aea020..b5ebb7e 100644 --- a/models/auction_player.go +++ b/models/auction_player.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const AuctionPlayerTableName = TableNamePrefix + "auction_player" diff --git a/models/auction_result_record.go b/models/auction_result_record.go index eba62eb..bb28969 100644 --- a/models/auction_result_record.go +++ b/models/auction_result_record.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const AuctionResultRecordTableName = TableNamePrefix + "auction_result_record" diff --git a/models/bahe_team.go b/models/bahe_team.go index a402e11..9eab61d 100644 --- a/models/bahe_team.go +++ b/models/bahe_team.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const BaheTeamTable = TableNamePrefix + "bahe_team" diff --git a/models/bahe_team_member.go b/models/bahe_team_member.go index 751c321..6a4369e 100644 --- a/models/bahe_team_member.go +++ b/models/bahe_team_member.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const BaheTeamMemberTableName = TableNamePrefix + "bahe_team_member" diff --git a/models/base.go b/models/base.go index 43ba729..5ce5814 100644 --- a/models/base.go +++ b/models/base.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" "github.com/xormplus/xorm" ) diff --git a/models/bully_screen_history.go b/models/bully_screen_history.go index 1ab665a..49832bd 100644 --- a/models/bully_screen_history.go +++ b/models/bully_screen_history.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const BullyScreenHistoryTableName = TableNamePrefix + "bully_screen_history" diff --git a/models/bully_screen_server.go b/models/bully_screen_server.go index 68c1af8..950f295 100644 --- a/models/bully_screen_server.go +++ b/models/bully_screen_server.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const BullyScreenServerTableName = TableNamePrefix + "bully_screen_server" diff --git a/models/bully_screen_wallet.go b/models/bully_screen_wallet.go index 928b925..2124e0a 100644 --- a/models/bully_screen_wallet.go +++ b/models/bully_screen_wallet.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const BSWalletTableName = TableNamePrefix + "bully_screen_wallet" diff --git a/models/calorie.go b/models/calorie.go index 83cf045..8769445 100644 --- a/models/calorie.go +++ b/models/calorie.go @@ -4,7 +4,7 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const CalorieTableName = TableNamePrefix + "calorie" diff --git a/models/customer.go b/models/customer.go index 737381e..7947e44 100644 --- a/models/customer.go +++ b/models/customer.go @@ -2,8 +2,9 @@ package models import ( "fmt" - "github.com/ouxuanserver/osmanthuswine/src/core" - "github.com/ouxuanserver/osmanthuswine/src/helper" + + "git.ouxuan.net/tommy/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/helper" "github.com/pkg/errors" ) diff --git a/models/customer_goods.go b/models/customer_goods.go index 49b6966..2ab911a 100644 --- a/models/customer_goods.go +++ b/models/customer_goods.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const CustomerGoodsTableName = TableNamePrefix + "customer_goods" diff --git a/models/customer_operation.go b/models/customer_operation.go index 7640fa2..74293cb 100644 --- a/models/customer_operation.go +++ b/models/customer_operation.go @@ -4,7 +4,7 @@ import ( "hudongzhuanjia/logger" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) // 用户操作, 主从账号同步信息 diff --git a/models/customer_order.go b/models/customer_order.go index 420af3e..b6cdc8a 100644 --- a/models/customer_order.go +++ b/models/customer_order.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const CustomerOrderTableName = TableNamePrefix + "customer_order" diff --git a/models/customer_order_option.go b/models/customer_order_option.go index 3102644..9408f00 100644 --- a/models/customer_order_option.go +++ b/models/customer_order_option.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const CustomerOrderOptionTableName = TableNamePrefix + "customer_order_option" diff --git a/models/customer_order_sub.go b/models/customer_order_sub.go index c41257c..c171c6e 100644 --- a/models/customer_order_sub.go +++ b/models/customer_order_sub.go @@ -2,10 +2,11 @@ package models import ( "fmt" - "github.com/xormplus/xorm" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "github.com/xormplus/xorm" + + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const CustomerOrderSubTN = TableNamePrefix + "customer_order_sub" diff --git a/models/dan_mu_server.go b/models/dan_mu_server.go index 17c2e00..3fd4a71 100644 --- a/models/dan_mu_server.go +++ b/models/dan_mu_server.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const DanMuServerTableName = TableNamePrefix + "dan_mu_server" diff --git a/models/invitation.go b/models/invitation.go index 5b84560..0feac04 100644 --- a/models/invitation.go +++ b/models/invitation.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type Invitation struct { diff --git a/models/invitation_letter.go b/models/invitation_letter.go index e7ab3d7..d3c805d 100644 --- a/models/invitation_letter.go +++ b/models/invitation_letter.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const InvitationLetterTableName = TableNamePrefix + "invitation_letter" diff --git a/models/live_config.go b/models/live_config.go index abaad85..2877357 100644 --- a/models/live_config.go +++ b/models/live_config.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const LiveConfigTN = TableNamePrefix + "live_config" diff --git a/models/live_config_area.go b/models/live_config_area.go index 968c965..ee3dfc0 100644 --- a/models/live_config_area.go +++ b/models/live_config_area.go @@ -3,18 +3,18 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const LiveConfigAreaTN = TableNamePrefix + "live_config_area" type LiveConfigArea struct { - Id int `json:"id" xorm:"not null pk autoincr INT(11)"` + Id int `json:"id" xorm:"not null pk autoincr INT(11)"` IsDelete bool `json:"-" xorm:"not null default 0 comment('是否删除') TINYINT(1)"` CreatedAt time.Time `json:"created_at" xorm:"not null created comment('创建时间') DATETIME"` UpdatedAt time.Time `json:"updated_at" xorm:"not null updated default CURRENT_TIMESTAMP comment('更新时间') TIMESTAMP"` - ActivityId int `json:"activity_id" xorm:"not null default 0 comment('互动id') INT(11)"` - AreaId int `json:"area_id" xorm:"not null default 0 comment('地区id') INT(11)"` + ActivityId int `json:"activity_id" xorm:"not null default 0 comment('互动id') INT(11)"` + AreaId int `json:"area_id" xorm:"not null default 0 comment('地区id') INT(11)"` LiveH5Url string `json:"live_h5_url" xorm:"not null default '' comment('h5直播地址') VARCHAR(255)"` LiveH5Qrcode string `json:"live_h5_qrcode" xorm:"not null default '' comment('h5直播地址二维码') VARCHAR(255)"` AdminLiveUrl string `json:"admin_live_url" xorm:"not null default '' comment('管理员直播地址,即直播页面中管理员登录页面') VARCHAR(255)"` diff --git a/models/live_red_envelope_rule.go b/models/live_red_envelope_rule.go index 44632b9..1b969ec 100644 --- a/models/live_red_envelope_rule.go +++ b/models/live_red_envelope_rule.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const LiveRedPackInfoTN = TableNamePrefix + "live_red_envelope_rule" diff --git a/models/live_viewer.go b/models/live_viewer.go index 120d471..958bb59 100644 --- a/models/live_viewer.go +++ b/models/live_viewer.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const LiveViewerTN = TableNamePrefix + "live_viewer" diff --git a/models/lottery_draw_activity.go b/models/lottery_draw_activity.go index d1f308a..1c67453 100644 --- a/models/lottery_draw_activity.go +++ b/models/lottery_draw_activity.go @@ -3,16 +3,16 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const LotteryDrawActivityTableName = TableNamePrefix + "lottery_draw_activity" //抽奖活动 type LotteryDrawActivity struct { - Id int `json:"id" xorm:"not null pk autoincr INT(11)"` - ActivityId int `json:"activity_id" description:"主活动的id"` - CreatorId int `json:"creator_id" description:"创建者id"` + Id int `json:"id" xorm:"not null pk autoincr INT(11)"` + ActivityId int `json:"activity_id" description:"主活动的id"` + CreatorId int `json:"creator_id" description:"创建者id"` LotteryDrawActivityName string `json:"lottery_draw_activity_name" description:"抽奖轮次名称"` LotteryDrawRule *LotteryDrawRule `json:"lottery_draw_rule" xorm:"-" description:"抽奖活动规则"` IsDelete bool `json:"-" xorm:"default(0)"` diff --git a/models/lottery_draw_record.go b/models/lottery_draw_record.go index e55be2c..a829c3d 100644 --- a/models/lottery_draw_record.go +++ b/models/lottery_draw_record.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const LotteryDrawRecordTableName = TableNamePrefix + "lottery_draw_record" diff --git a/models/lottery_draw_rule.go b/models/lottery_draw_rule.go index e08959f..0f46e44 100644 --- a/models/lottery_draw_rule.go +++ b/models/lottery_draw_rule.go @@ -1,7 +1,7 @@ package models import ( - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const LotteryDrawRuleTableName = TableNamePrefix + "lottery_draw_rule" diff --git a/models/lottery_draw_rule_ladder.go b/models/lottery_draw_rule_ladder.go index a6c3f0a..3dd1cce 100644 --- a/models/lottery_draw_rule_ladder.go +++ b/models/lottery_draw_rule_ladder.go @@ -4,7 +4,7 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const LotteryDrawRuleLadderTableName = TableNamePrefix + "lottery_draw_rule_ladder" diff --git a/models/module_service.go b/models/module_service.go index aaad34c..27a2b3b 100644 --- a/models/module_service.go +++ b/models/module_service.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) //模块服务表 diff --git a/models/module_service_history.go b/models/module_service_history.go index 89038b0..5bab876 100644 --- a/models/module_service_history.go +++ b/models/module_service_history.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const ModuleServiceHistoryTableName = TableNamePrefix + "module_service_history" diff --git a/models/msg_wall_server.go b/models/msg_wall_server.go index 7042e2e..c16faaf 100644 --- a/models/msg_wall_server.go +++ b/models/msg_wall_server.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type MsgWallServer struct { diff --git a/models/new_auction_activity.go b/models/new_auction_activity.go index 36ef4be..c9c33bd 100644 --- a/models/new_auction_activity.go +++ b/models/new_auction_activity.go @@ -4,7 +4,7 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const NewAuctionActivityTableName = TableNamePrefix + "new_auction_activity" diff --git a/models/new_vote_activity.go b/models/new_vote_activity.go index 48f92a6..76fd536 100644 --- a/models/new_vote_activity.go +++ b/models/new_vote_activity.go @@ -4,7 +4,7 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const NewVoteActivityTableName = TableNamePrefix + "new_vote_activity" diff --git a/models/new_vote_activity_history.go b/models/new_vote_activity_history.go index 4a573e1..fbc8bee 100644 --- a/models/new_vote_activity_history.go +++ b/models/new_vote_activity_history.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const VoteActivityHistoryTableName = TableNamePrefix + "new_vote_activity_history" diff --git a/models/new_vote_activity_ladder.go b/models/new_vote_activity_ladder.go index 70eccc1..e484282 100644 --- a/models/new_vote_activity_ladder.go +++ b/models/new_vote_activity_ladder.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const VoteActivityLadderTableName = TableNamePrefix + "new_vote_activity_ladder" diff --git a/models/order_draw_activity.go b/models/order_draw_activity.go index b44c4dd..16da584 100644 --- a/models/order_draw_activity.go +++ b/models/order_draw_activity.go @@ -1,7 +1,7 @@ package models import ( - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const OrderDrawActivityTableName = TableNamePrefix + "order_draw_activity" diff --git a/models/order_draw_record.go b/models/order_draw_record.go index 57fdad9..645773a 100644 --- a/models/order_draw_record.go +++ b/models/order_draw_record.go @@ -1,8 +1,9 @@ package models import ( - "github.com/ouxuanserver/osmanthuswine/src/core" "time" + + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const OrderDrawRecordTableName = TableNamePrefix + "order_draw_record" diff --git a/models/order_draw_rule.go b/models/order_draw_rule.go index 59a6429..2fe03b9 100644 --- a/models/order_draw_rule.go +++ b/models/order_draw_rule.go @@ -3,17 +3,17 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const OrderDrawRuleTableName = TableNamePrefix + "order_draw_rule" //订单抽奖抽奖规则 type OrderDrawRule struct { - Id int `json:"id" xorm:"not null autoincr pk INT(11)"` - OrderDrawActivityId int `json:"order_lottery_draw_activity_id" description:"订单抽奖活动的的id"` + Id int `json:"id" xorm:"not null autoincr pk INT(11)"` + OrderDrawActivityId int `json:"order_lottery_draw_activity_id" description:"订单抽奖活动的的id"` OrderDrawRuleLadders []*OrderDrawRuleLadder `json:"order_draw_rule_ladders" xorm:"-"` - AreaId int `json:"area_id" description:"地区id"` + AreaId int `json:"area_id" description:"地区id"` UseTimes int `json:"use_times" description:"使用次数"` Name string `json:"name"` PrizeNum int `json:"prize_num" xorm:"-"` diff --git a/models/order_draw_rule_ladder.go b/models/order_draw_rule_ladder.go index 0cd8212..591bf11 100644 --- a/models/order_draw_rule_ladder.go +++ b/models/order_draw_rule_ladder.go @@ -4,7 +4,7 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const OrderDrawRuleLadderTableName = TableNamePrefix + "order_draw_rule_ladder" diff --git a/models/order_entry_person.go b/models/order_entry_person.go index 1900c17..b7a6b9f 100644 --- a/models/order_entry_person.go +++ b/models/order_entry_person.go @@ -2,7 +2,8 @@ package models import ( "errors" - "github.com/ouxuanserver/osmanthuswine/src/core" + + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const OrderEntryPersonTableName = TableNamePrefix + "order_entry_person" diff --git a/models/order_gift.go b/models/order_gift.go index 790ba16..cbdc99f 100644 --- a/models/order_gift.go +++ b/models/order_gift.go @@ -4,14 +4,14 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const OrderGiftTableName = TableNamePrefix + "order_gift" type OrderGift struct { - Id int `json:"id" xorm:"not null pk autoincr INT(11)"` - ActivityId int `json:"activity_id" xorm:"not null default(0) comment('互动id') INT(11)"` + Id int `json:"id" xorm:"not null pk autoincr INT(11)"` + ActivityId int `json:"activity_id" xorm:"not null default(0) comment('互动id') INT(11)"` OrderGiftSwitch string `json:"order_gift_switch" xorm:"not null default('关闭') comment('订单送礼开关[开启|关闭]') VARCHAR(2)"` Num int `json:"num" xorm:"not null default(0) comment('前多少人下单有礼0不限制') INT(11)"` GiftName string `json:"gift_name" xorm:"not null default('') comment('礼品名字') VARCHAR(255)"` diff --git a/models/pad_signer.go b/models/pad_signer.go index 85597a0..10c7b50 100644 --- a/models/pad_signer.go +++ b/models/pad_signer.go @@ -1,6 +1,6 @@ package models -import "github.com/ouxuanserver/osmanthuswine/src/core" +import "git.ouxuan.net/tommy/osmanthuswine/src/core" const PadSignerTN = TableNamePrefix + "pad_signer" diff --git a/models/pad_signing.go b/models/pad_signing.go index fcdbdce..74c03ef 100644 --- a/models/pad_signing.go +++ b/models/pad_signing.go @@ -1,6 +1,6 @@ package models -import "github.com/ouxuanserver/osmanthuswine/src/core" +import "git.ouxuan.net/tommy/osmanthuswine/src/core" const PadSigningTN = TableNamePrefix + "pad_signing" diff --git a/models/real_sign_list.go b/models/real_sign_list.go index 4185037..291cb45 100644 --- a/models/real_sign_list.go +++ b/models/real_sign_list.go @@ -1,7 +1,7 @@ package models import ( - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const RealSignListTN = TableNamePrefix + "real_sign_list" diff --git a/models/reward_history.go b/models/reward_history.go index f03723e..535ed17 100644 --- a/models/reward_history.go +++ b/models/reward_history.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const ReWardHistoryTableName = TableNamePrefix + "reward_history" diff --git a/models/reward_server.go b/models/reward_server.go index f392c8c..47acc4f 100644 --- a/models/reward_server.go +++ b/models/reward_server.go @@ -3,15 +3,15 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const RewardServerTableName = TableNamePrefix + "reward_server" //打赏服务 type RewardServer struct { - Id int `json:"id" xorm:"not null pk autoincr INT(11)"` - ActivityId int `json:"activity_id" xorm:"not null comment('主活动id')" description:"主活动id"` + Id int `json:"id" xorm:"not null pk autoincr INT(11)"` + ActivityId int `json:"activity_id" xorm:"not null comment('主活动id')" description:"主活动id"` ServerStartTime time.Time `json:"server_start_time" xorm:"not null comment('服务开始时间')" description:"服务开始时间"` ServerEndTime time.Time `json:"server_end_time" xorm:"not null comment('服务结束时间')" description:"服务结束时间"` ServerDisplay string `json:"server_display" xorm:"not null comment('霸屏展示的方式 [消息界面|互动界面]')" description:"霸屏展示的方式 [消息界面|互动界面]"` diff --git a/models/reward_wallet.go b/models/reward_wallet.go index b4a4271..abcd4cd 100644 --- a/models/reward_wallet.go +++ b/models/reward_wallet.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const RewardWalletTableName = TableNamePrefix + "reward_wallet" diff --git a/models/sensitive.go b/models/sensitive.go index 90ed72f..6f077ba 100644 --- a/models/sensitive.go +++ b/models/sensitive.go @@ -4,11 +4,11 @@ import ( "strings" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type Sensitive struct { - Id int `json:"id" xorm:"not null autoincr pk INT(11)"` + Id int `json:"id" xorm:"not null autoincr pk INT(11)"` Keyword string `json:"keyword" description:"关键字"` Host string `json:"host" description:"二级域名"` Category string `json:"category" description:"类别"` diff --git a/models/shake_red_envelope_activity.go b/models/shake_red_envelope_activity.go index 51896d4..84cbb10 100644 --- a/models/shake_red_envelope_activity.go +++ b/models/shake_red_envelope_activity.go @@ -3,15 +3,15 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const ShakeRedEnvelopeActivityTableName = TableNamePrefix + "shake_red_envelope_activity" //摇红包活动 type ShakeRedEnvelopeActivity struct { - Id int `json:"id" xorm:"pk autoincr BIGINT(20)"` - ActivityId int `json:"activity_id" xorm:"not null comment('主活动id') BIGINT(20)" description:"活动的id"` + Id int `json:"id" xorm:"pk autoincr BIGINT(20)"` + ActivityId int `json:"activity_id" xorm:"not null comment('主活动id') BIGINT(20)" description:"活动的id"` RedEnvelopeActivityName string `json:"red_envelope_activity_name" xorm:"not null default('') comment('红包活动名字') VARCHAR(255)"` ShakeRedEnvelopeRule *ShakeRedEnvelopeRule `json:"shake_red_envelope_rule" xorm:"-" description:"规则"` MoreAreaMode string `json:"more_area_mode" xorm:"not null default('') comment('多地区') VARCHAR(125)"` diff --git a/models/shake_red_envelope_record.go b/models/shake_red_envelope_record.go index edf2b0d..df36a39 100644 --- a/models/shake_red_envelope_record.go +++ b/models/shake_red_envelope_record.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const ShakeRedEnvelopeRecordTableName = TableNamePrefix + "shake_red_envelope_record" diff --git a/models/shake_red_envelope_rule.go b/models/shake_red_envelope_rule.go index 2ebf0f4..0cebf7d 100644 --- a/models/shake_red_envelope_rule.go +++ b/models/shake_red_envelope_rule.go @@ -4,7 +4,7 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const ShakeRedEnvelopeRuleTableName = TableNamePrefix + "shake_red_envelope_rule" diff --git a/models/shake_red_envelope_user.go b/models/shake_red_envelope_user.go index a4509e8..fa62114 100644 --- a/models/shake_red_envelope_user.go +++ b/models/shake_red_envelope_user.go @@ -3,18 +3,18 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const ShakeRedEnvelopeUserTableName = TableNamePrefix + "shake_red_envelope_user" type ShakeRedEnvelopeUser struct { - Id int `json:"id" xorm:"not null pk autoincr INT(11)"` - RehearsalId int `json:"rehearsal_id" xorm:"not null default(0) comment('彩排id/0正式') INT(11)"` + Id int `json:"id" xorm:"not null pk autoincr INT(11)"` + RehearsalId int `json:"rehearsal_id" xorm:"not null default(0) comment('彩排id/0正式') INT(11)"` ArchId int `json:"arch_id" xorm:"not null default 0 comment('归档id') INT(11)"` - ShakeRedEnvelopeActivityId int `json:"shake_red_envelope_activity_id" xrom:"not null comment('摇红包活动id') INT(11)"` - ShakeRedEnvelopeRuleId int `json:"shake_red_envelope_rule_id" xorm:"not null comment('轮次id') INT(11)"` - UserId int `json:"user_id" xorm:"not null comment('用户id') INT(11)"` + ShakeRedEnvelopeActivityId int `json:"shake_red_envelope_activity_id" xrom:"not null comment('摇红包活动id') INT(11)"` + ShakeRedEnvelopeRuleId int `json:"shake_red_envelope_rule_id" xorm:"not null comment('轮次id') INT(11)"` + UserId int `json:"user_id" xorm:"not null comment('用户id') INT(11)"` IsDelete int `json:"is_delete" xorm:"not null default(0) comment('软删除') TINYINT(1)"` CreatedAt time.Time `json:"created_at" xorm:"not null created comment('创建时间')"` UpdateAt time.Time `json:"update_at" xorm:"not null updated comment('更新时间')"` diff --git a/models/sign_history.go b/models/sign_history.go index c41b411..f32d3ae 100644 --- a/models/sign_history.go +++ b/models/sign_history.go @@ -1,7 +1,7 @@ package models import ( - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const SignHistoryTN = TableNamePrefix + "sign_history" diff --git a/models/sign_up.go b/models/sign_up.go index c426da3..3581373 100644 --- a/models/sign_up.go +++ b/models/sign_up.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const SignUpTN = TableNamePrefix + "sign_up" diff --git a/models/tug_of_war.go b/models/tug_of_war.go index 50a5c2c..e0a19a6 100644 --- a/models/tug_of_war.go +++ b/models/tug_of_war.go @@ -4,7 +4,7 @@ import ( "hudongzhuanjia/utils/define" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type TugOfWar struct { diff --git a/models/user.go b/models/user.go index 8f44283..8edd36e 100644 --- a/models/user.go +++ b/models/user.go @@ -2,7 +2,8 @@ package models import ( "errors" - "github.com/ouxuanserver/osmanthuswine/src/core" + + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const UserTN = TableNamePrefix + "user" diff --git a/models/user_order.go b/models/user_order.go index fb4e4cf..0f44871 100644 --- a/models/user_order.go +++ b/models/user_order.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const UserOrderTableName = TableNamePrefix + "user_order" diff --git a/models/user_prize.go b/models/user_prize.go index f3b10ea..2e0b486 100644 --- a/models/user_prize.go +++ b/models/user_prize.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const UserPrizeTableName = TableNamePrefix + "user_prize" diff --git a/models/user_red_pack.go b/models/user_red_pack.go index f07c947..18e3c84 100644 --- a/models/user_red_pack.go +++ b/models/user_red_pack.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const UserRedPackTableName = TableNamePrefix + "user_red_pack" diff --git a/models/user_transfer.go b/models/user_transfer.go index 4035d63..6bafabd 100644 --- a/models/user_transfer.go +++ b/models/user_transfer.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) const UserTransferTN = TableNamePrefix + "user_transfer" diff --git a/services/activity/activity.go b/services/activity/activity.go index 1668112..09beb3e 100644 --- a/services/activity/activity.go +++ b/services/activity/activity.go @@ -5,7 +5,7 @@ import ( "hudongzhuanjia/models" "hudongzhuanjia/utils/define" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) func GetActivitiesByCustomerId(cid int) ([]*models.Activity, error) { diff --git a/services/activity/module.go b/services/activity/module.go index c2abfdc..eb027e7 100644 --- a/services/activity/module.go +++ b/services/activity/module.go @@ -3,7 +3,7 @@ package activity_service import ( "hudongzhuanjia/models" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) //func GetModuleService(moduleName string, activityId int) (*models.ActivityModuleService, bool, error) { diff --git a/services/auction/auction.go b/services/auction/auction.go index 916e571..b71fbc2 100644 --- a/services/auction/auction.go +++ b/services/auction/auction.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) func GetCurrentAuction(aid, rid, uid int, archId int) (map[string]interface{}, error) { diff --git a/services/bahe/score.go b/services/bahe/score.go index f1b3489..572a4e1 100644 --- a/services/bahe/score.go +++ b/services/bahe/score.go @@ -3,7 +3,7 @@ package bahe_service import ( "hudongzhuanjia/models" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) func GetScoreByTeamId(tid, rid int) (int64, error) { diff --git a/services/bahe/tug_war.go b/services/bahe/tug_war.go index bb1662a..12edd86 100644 --- a/services/bahe/tug_war.go +++ b/services/bahe/tug_war.go @@ -5,7 +5,7 @@ import ( "hudongzhuanjia/models" "hudongzhuanjia/utils/define" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type CountMembersResult struct { diff --git a/services/balance/balance.go b/services/balance/balance.go index 90be56b..2ecb44f 100644 --- a/services/balance/balance.go +++ b/services/balance/balance.go @@ -3,7 +3,7 @@ package balance_service import ( "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) func IncrUserBalance(id int, balance float64) (int64, error) { diff --git a/services/bully_reward/dao.go b/services/bully_reward/dao.go index 6dc39e6..b750139 100644 --- a/services/bully_reward/dao.go +++ b/services/bully_reward/dao.go @@ -3,7 +3,7 @@ package bully_reward_service import ( "hudongzhuanjia/models" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type BullyListResult struct { diff --git a/services/calorie/calorie.go b/services/calorie/calorie.go index adf5919..c4ad3c1 100644 --- a/services/calorie/calorie.go +++ b/services/calorie/calorie.go @@ -5,7 +5,7 @@ import ( "hudongzhuanjia/models" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) func GetCurrentCalorie(aid, uid, rid int, archId int) (map[string]interface{}, error) { diff --git a/services/lottery/lottery.go b/services/lottery/lottery.go index f68fde6..24056a9 100644 --- a/services/lottery/lottery.go +++ b/services/lottery/lottery.go @@ -6,7 +6,7 @@ import ( "math/rand" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type LotteryUser struct { diff --git a/services/lottery/order.go b/services/lottery/order.go index e89e986..2e8a3d7 100644 --- a/services/lottery/order.go +++ b/services/lottery/order.go @@ -4,7 +4,7 @@ import ( "hudongzhuanjia/models" "hudongzhuanjia/utils/define" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) func GetOrderLotteryUserIds(repeat string, activityId, ruleId, ladderId, rehearsalId, areaId, archId interface{}) ([]int, error) { diff --git a/services/lottery/order_special.go b/services/lottery/order_special.go index 99a3dd9..e3bf22f 100644 --- a/services/lottery/order_special.go +++ b/services/lottery/order_special.go @@ -6,7 +6,7 @@ import ( "math/rand" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type SpecialOrderLotteryUser struct { diff --git a/services/pay/handle.go b/services/pay/handle.go index ca2536a..04eed61 100644 --- a/services/pay/handle.go +++ b/services/pay/handle.go @@ -2,7 +2,7 @@ package pay_service import ( "errors" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" "github.com/xormplus/xorm" "hudongzhuanjia/models" "hudongzhuanjia/services/im" diff --git a/services/red_envelope/red_envelop.go b/services/red_envelope/red_envelop.go index 89db942..1166c15 100644 --- a/services/red_envelope/red_envelop.go +++ b/services/red_envelope/red_envelop.go @@ -8,7 +8,7 @@ import ( "math/rand" "time" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) func GetCurrentRB(aid, uid, rid int, archId int) (map[string]interface{}, error) { diff --git a/services/upper_wall/upper_wall.go b/services/upper_wall/upper_wall.go index 6299e24..bfcfa75 100644 --- a/services/upper_wall/upper_wall.go +++ b/services/upper_wall/upper_wall.go @@ -3,11 +3,11 @@ package upper_wall import ( "hudongzhuanjia/models" - "github.com/ouxuanserver/osmanthuswine/src/core" + "git.ouxuan.net/tommy/osmanthuswine/src/core" ) type UpperWallResult struct { - Id int `json:"id"` + Id int `json:"id"` Content string `json:"content"` Img string `json:"img"` Category string `json:"category"` diff --git a/test/config_test.go b/test/config_test.go index 2627f65..eaa4f9d 100644 --- a/test/config_test.go +++ b/test/config_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" + "git.ouxuan.net/tommy/osmanthuswine/src/helper" "github.com/gorilla/websocket" - "github.com/ouxuanserver/osmanthuswine/src/helper" "github.com/panjf2000/ants" . "github.com/smartystreets/goconvey/convey" ) diff --git a/utils/utils.go b/utils/utils.go index 2ee0e90..51ac64a 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -4,7 +4,7 @@ import ( "crypto/sha1" "encoding/base64" "fmt" - "github.com/ouxuanserver/osmanthuswine/src/helper" + "git.ouxuan.net/tommy/osmanthuswine/src/helper" "hudongzhuanjia/logger" "hudongzhuanjia/utils/define" "io/ioutil"