WH01243 4 years ago
parent
commit
afaec87a98

+ 3 - 3
api/integral.go

@@ -4,9 +4,9 @@ import (
 	"flag"
 	"fmt"
 
-	"points_service/api/internal/config"
-	"points_service/api/internal/handler"
-	"points_service/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/config"
+	"app.yhyue.com/moapp/jyPoints/api/internal/handler"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
 
 	"github.com/tal-tech/go-zero/core/conf"
 	"github.com/tal-tech/go-zero/rest"

+ 3 - 3
api/internal/handler/integralbalancecheckhandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"points_service/api/internal/logic"
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/logic"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/rest/httpx"
 )

+ 3 - 3
api/internal/handler/integralconsumehandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"points_service/api/internal/logic"
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/logic"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/rest/httpx"
 )

+ 3 - 3
api/internal/handler/integraldetailedcheckhandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"points_service/api/internal/logic"
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/logic"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/rest/httpx"
 )

+ 3 - 3
api/internal/handler/integralexpirecheckhandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"points_service/api/internal/logic"
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/logic"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/rest/httpx"
 )

+ 3 - 3
api/internal/handler/integralguardhandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"points_service/api/internal/logic"
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/logic"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/rest/httpx"
 )

+ 3 - 3
api/internal/handler/integralharvesthandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"points_service/api/internal/logic"
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/logic"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/rest/httpx"
 )

+ 1 - 1
api/internal/handler/routes.go

@@ -4,7 +4,7 @@ package handler
 import (
 	"net/http"
 
-	"points_service/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
 
 	"github.com/tal-tech/go-zero/rest"
 )

+ 3 - 3
api/internal/logic/integralbalancechecklogic.go

@@ -2,10 +2,10 @@ package logic
 
 import (
 	"context"
-	"points_service/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
 
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 3
api/internal/logic/integralconsumelogic.go

@@ -2,10 +2,10 @@ package logic
 
 import (
 	"context"
-	"points_service/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
 
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 3
api/internal/logic/integraldetailedchecklogic.go

@@ -2,10 +2,10 @@ package logic
 
 import (
 	"context"
-	"points_service/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
 
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 3
api/internal/logic/integralexpirechecklogic.go

@@ -2,10 +2,10 @@ package logic
 
 import (
 	"context"
-	"points_service/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
 
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 3
api/internal/logic/integralguardlogic.go

@@ -2,10 +2,10 @@ package logic
 
 import (
 	"context"
-	"points_service/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
 
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 4
api/internal/logic/integralharvestlogic.go

@@ -2,10 +2,9 @@ package logic
 
 import (
 	"context"
-	"points_service/rpc/integral"
-
-	"points_service/api/internal/svc"
-	"points_service/api/internal/types"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/api/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/api/internal/types"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 2 - 2
api/internal/svc/servicecontext.go

@@ -2,8 +2,8 @@ package svc
 
 import (
 	"github.com/tal-tech/go-zero/zrpc"
-	"points_service/api/internal/config"
-	"points_service/rpc/integralclient"
+	"app.yhyue.com/moapp/jyPoints/api/internal/config"
+	"app.yhyue.com/moapp/jyPoints/rpc/integralclient"
 )
 
 type ServiceContext struct {

+ 5 - 2
go.mod

@@ -1,12 +1,15 @@
-module points_service
+module app.yhyue.com/moapp/jyPoints
 
 go 1.13
 
 require (
+	github.com/antlr/antlr4 v0.0.0-20210311224141-c2f104cd0810 // indirect
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/go-xorm/xorm v0.7.9
-	github.com/golang/protobuf v1.4.2
+	github.com/golang/protobuf v1.4.3
+	github.com/iancoleman/strcase v0.1.3 // indirect
 	github.com/tal-tech/go-zero v1.1.5
+	go.uber.org/automaxprocs v1.4.0 // indirect
 	google.golang.org/grpc v1.29.1
 	google.golang.org/protobuf v1.25.0
 

+ 18 - 0
go.sum

@@ -18,7 +18,10 @@ github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGn
 github.com/alicebob/miniredis/v2 v2.14.1 h1:GjlbSeoJ24bzdLRs13HoMEeaRZx9kg5nHoRW7QV/nCs=
 github.com/alicebob/miniredis/v2 v2.14.1/go.mod h1:uS970Sw5Gs9/iK3yBg0l9Uj9s25wXxSpQUE9EaJ/Blg=
 github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
+github.com/antlr/antlr4 v0.0.0-20210105212045-464bcbc32de2 h1:rL2miklL5rhxUaZO7hntBcy/VHaiyuPQ4EJoy/NMwaM=
 github.com/antlr/antlr4 v0.0.0-20210105212045-464bcbc32de2/go.mod h1:T7PbCXFs94rrTttyxjbyT5+/1V8T2TYDejxUfHJjw1Y=
+github.com/antlr/antlr4 v0.0.0-20210311224141-c2f104cd0810 h1:iMdMSccAX8Q3nt1yKAbtbKYL0gPO7jpnxEPefGujrO4=
+github.com/antlr/antlr4 v0.0.0-20210311224141-c2f104cd0810/go.mod h1:T7PbCXFs94rrTttyxjbyT5+/1V8T2TYDejxUfHJjw1Y=
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -43,6 +46,7 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
 github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28=
 github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -57,6 +61,7 @@ github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:Htrtb
 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=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/emicklei/proto v1.9.0 h1:l0QiNT6Qs7Yj0Mb4X6dnWBQer4ebei2BFcgQLbGqUDc=
 github.com/emicklei/proto v1.9.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -64,6 +69,7 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
+github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
@@ -115,6 +121,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
@@ -150,7 +158,10 @@ github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplb
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/iancoleman/strcase v0.1.2 h1:gnomlvw9tnV3ITTAxzKSgTF+8kFWcU/f+TgttpXGz1U=
 github.com/iancoleman/strcase v0.1.2/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
+github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw=
+github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
 github.com/jackc/pgx v3.6.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
@@ -163,6 +174,7 @@ github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGn
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/justinas/alice v1.2.0 h1:+MHSA/vccVCF4Uq37S42jwlkvI2Xzl7zTPCN5BnZNVo=
 github.com/justinas/alice v1.2.0/go.mod h1:fN5HRH/reO/zrUflLfTN43t3vXvKzvZIENsNEe7i7qA=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
@@ -180,6 +192,7 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -247,6 +260,7 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
@@ -273,9 +287,11 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1
 github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 h1:lYIiVDtZnyTWlNwiAxLj0bbpTcx1BWCFhXjfsvmPdNc=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU=
 github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2 h1:zzrxE1FKn5ryBNl9eKOeqQ58Y/Qpo3Q9QNxKHX5uzzQ=
 github.com/xwb1989/sqlparser v0.0.0-20180606152119-120387863bf2/go.mod h1:hzfGeIUDq/j97IG+FhNqkowIyEcD88LrW6fyU3K3WqY=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0=
@@ -291,6 +307,8 @@ go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/automaxprocs v1.3.0 h1:II28aZoGdaglS5vVNnspf28lnZpXScxtIozx1lAjdb0=
 go.uber.org/automaxprocs v1.3.0/go.mod h1:9CWT6lKIep8U41DDaPiH6eFscnTyjfTANNQNx6LrIcA=
+go.uber.org/automaxprocs v1.4.0 h1:CpDZl6aOlLhReez+8S3eEotD7Jx0Os++lemPlMULQP0=
+go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q=
 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/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=

+ 7 - 10
rpc/integral.go

@@ -1,21 +1,20 @@
 package main
 
 import (
+	"app.yhyue.com/moapp/jyPoints/entity"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/config"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/server"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/service"
 	"flag"
 	"fmt"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/go-xorm/xorm"
-	"log"
-	"points_service/entity"
-	"points_service/service"
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/config"
-	"points_service/rpc/internal/server"
-	"points_service/rpc/internal/svc"
-
 	"github.com/tal-tech/go-zero/core/conf"
 	"github.com/tal-tech/go-zero/zrpc"
 	"google.golang.org/grpc"
+	"log"
 )
 
 var configFile = flag.String("f", "etc/integral.yaml", "the config file")
@@ -29,12 +28,10 @@ func main() {
 	conf.MustLoad(*configFile, &c)
 	ctx := svc.NewServiceContext(c)
 	srv := server.NewIntegralServer(ctx)
-
 	s := zrpc.MustNewServer(c.RpcServerConf, func(grpcServer *grpc.Server) {
 		integral.RegisterIntegralServer(grpcServer, srv)
 	})
 	defer s.Stop()
-
 	fmt.Printf("Starting rpc server at %s...\n", c.ListenOn)
 	s.Start()
 }

+ 1 - 1
rpc/integralclient/integral.go

@@ -8,7 +8,7 @@ package integralclient
 import (
 	"context"
 
-	"points_service/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
 
 	"github.com/tal-tech/go-zero/zrpc"
 )

+ 2 - 2
rpc/internal/logic/integralbalancechecklogic.go

@@ -2,8 +2,8 @@ package logic
 
 import (
 	"context"
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/svc"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 4 - 4
rpc/internal/logic/integralconsumelogic.go

@@ -2,11 +2,11 @@ package logic
 
 import (
 	"context"
-	"points_service/entity"
-	"points_service/service"
+	"app.yhyue.com/moapp/jyPoints/entity"
+	"app.yhyue.com/moapp/jyPoints/service"
 
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/svc"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 3
rpc/internal/logic/integraldetailedchecklogic.go

@@ -3,10 +3,10 @@ package logic
 import (
 	"context"
 	"fmt"
-	"points_service/entity"
+	"app.yhyue.com/moapp/jyPoints/entity"
 
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/svc"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 3
rpc/internal/logic/integralexpirechecklogic.go

@@ -2,10 +2,10 @@ package logic
 
 import (
 	"context"
-	"points_service/entity"
+	"app.yhyue.com/moapp/jyPoints/entity"
 
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/svc"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 3
rpc/internal/logic/integralguardlogic.go

@@ -2,10 +2,10 @@ package logic
 
 import (
 	"context"
-	"points_service/entity"
+	"app.yhyue.com/moapp/jyPoints/entity"
 
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/svc"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 3
rpc/internal/logic/integralharvestlogic.go

@@ -3,9 +3,9 @@ package logic
 import (
 	"context"
 	"fmt"
-	"points_service/entity"
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/entity"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/svc"
 
 	"github.com/tal-tech/go-zero/core/logx"
 )

+ 3 - 3
rpc/internal/server/integralserver.go

@@ -6,9 +6,9 @@ package server
 import (
 	"context"
 
-	"points_service/rpc/integral"
-	"points_service/rpc/internal/logic"
-	"points_service/rpc/internal/svc"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/logic"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/svc"
 )
 
 type IntegralServer struct {

+ 1 - 1
rpc/internal/svc/servicecontext.go

@@ -1,6 +1,6 @@
 package svc
 
-import "points_service/rpc/internal/config"
+import "app.yhyue.com/moapp/jyPoints/rpc/internal/config"
 
 type ServiceContext struct {
 	Config config.Config

+ 7 - 9
rpc/test/consume_test.go

@@ -1,6 +1,12 @@
 package test
 
 import (
+	"app.yhyue.com/moapp/jyPoints/entity"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/integralclient"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/config"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/server"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/svc"
 	"context"
 	"fmt"
 	_ "github.com/go-sql-driver/mysql"
@@ -8,12 +14,6 @@ import (
 	"github.com/tal-tech/go-zero/core/conf"
 	"github.com/tal-tech/go-zero/zrpc"
 	"log"
-	"points_service/entity"
-	"points_service/rpc/integral"
-	"points_service/rpc/integralclient"
-	"points_service/rpc/internal/config"
-	"points_service/rpc/internal/server"
-	"points_service/rpc/internal/svc"
 	"testing"
 	"time"
 )
@@ -50,14 +50,12 @@ func  Test_Add(t *testing.T)  {
 func  Test_serach(t *testing.T)  {
 	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
 	FileSystem :=integralclient.NewIntegral(zrpc.MustNewClient(c.FileSystemConf))
-	req := &integral.Req{UserId: "111111", Page:1,PageSize:2,AppId:10000,EndDate:"2021-03",S}
+	req := &integral.Req{UserId: "111111", Page:1,PageSize:2,AppId:10000,EndDate:"2021-03",}
 	res, err := FileSystem.IntegralDetailedCheck(ctx, req)
 	log.Println("err ", err)
 	log.Println("req ", res)
 }
 
-
-
 func  Test_Ad(t *testing.T)  {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)

+ 3 - 3
rpc/test/test1_test.go

@@ -6,9 +6,9 @@ import (
 	"github.com/tal-tech/go-zero/core/conf"
 	"github.com/tal-tech/go-zero/zrpc"
 	"log"
-	"points_service/rpc/integral"
-	"points_service/rpc/integralclient"
-	"points_service/rpc/internal/config"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/rpc/integralclient"
+	"app.yhyue.com/moapp/jyPoints/rpc/internal/config"
 	"testing"
 	"time"
 )

+ 2 - 2
service/integralService.go

@@ -3,8 +3,8 @@ package service
 import (
 	"fmt"
 	"log"
-	"points_service/entity"
-	"points_service/rpc/integral"
+	"app.yhyue.com/moapp/jyPoints/entity"
+	"app.yhyue.com/moapp/jyPoints/rpc/integral"
 	"time"
 )