Эх сурвалжийг харах

chore:微服务 基础服务 结构调整

wangshan 1 жил өмнө
parent
commit
d771784aa2
57 өөрчлөгдсөн 344 нэмэгдсэн , 760 устгасан
  1. 140 0
      go.mod
  2. 46 578
      go.sum
  3. 4 4
      jyBXBase/api/bxbase.go
  4. 1 1
      jyBXBase/api/init/db.go
  5. 1 1
      jyBXBase/api/init/init.go
  6. 1 1
      jyBXBase/api/internal/config/config.go
  7. 3 3
      jyBXBase/api/internal/handler/addLabelHandler.go
  8. 3 3
      jyBXBase/api/internal/handler/addSearchScreenHandler.go
  9. 3 3
      jyBXBase/api/internal/handler/bcactionhandler.go
  10. 3 3
      jyBXBase/api/internal/handler/checkSearchScreenHandler.go
  11. 3 3
      jyBXBase/api/internal/handler/delSearchScreenHandler.go
  12. 3 3
      jyBXBase/api/internal/handler/getlabelactionhandler.go
  13. 3 3
      jyBXBase/api/internal/handler/includedHandler.go
  14. 3 3
      jyBXBase/api/internal/handler/iscollactionhandler.go
  15. 3 3
      jyBXBase/api/internal/handler/labelactionhandler.go
  16. 3 3
      jyBXBase/api/internal/handler/listhandler.go
  17. 3 3
      jyBXBase/api/internal/handler/newestBiddingHandler.go
  18. 1 1
      jyBXBase/api/internal/handler/routes.go
  19. 3 3
      jyBXBase/api/internal/handler/showSearchScreenHandler.go
  20. 3 3
      jyBXBase/api/internal/logic/addSearchScreenLogic.go
  21. 3 3
      jyBXBase/api/internal/logic/addlabellogic.go
  22. 3 3
      jyBXBase/api/internal/logic/bcactionlogic.go
  23. 3 3
      jyBXBase/api/internal/logic/checkSearchScreenLogic.go
  24. 3 3
      jyBXBase/api/internal/logic/delSearchScreenLogic.go
  25. 3 3
      jyBXBase/api/internal/logic/getlabelactionlogic.go
  26. 3 3
      jyBXBase/api/internal/logic/includedLogic.go
  27. 3 3
      jyBXBase/api/internal/logic/iscollactionlogic.go
  28. 3 3
      jyBXBase/api/internal/logic/labelactionlogic.go
  29. 3 3
      jyBXBase/api/internal/logic/listlogic.go
  30. 3 3
      jyBXBase/api/internal/logic/newestBiddingLogic.go
  31. 3 3
      jyBXBase/api/internal/logic/showSearchScreenLogic.go
  32. 2 2
      jyBXBase/api/internal/svc/servicecontext.go
  33. 0 24
      jyBXBase/go.mod
  34. 4 4
      jyBXBase/rpc/bxbase.go
  35. 1 1
      jyBXBase/rpc/bxbase/bxbase.go
  36. 1 1
      jyBXBase/rpc/bxbaseclient/bxbase.go
  37. 1 1
      jyBXBase/rpc/init/db.go
  38. 2 2
      jyBXBase/rpc/init/init.go
  39. 3 3
      jyBXBase/rpc/internal/config/config.go
  40. 3 3
      jyBXBase/rpc/internal/logic/addlabellogic.go
  41. 4 4
      jyBXBase/rpc/internal/logic/addsearchlogic.go
  42. 4 4
      jyBXBase/rpc/internal/logic/bcactionlogic.go
  43. 4 4
      jyBXBase/rpc/internal/logic/checksearchlogic.go
  44. 3 3
      jyBXBase/rpc/internal/logic/delsearchlogic.go
  45. 3 3
      jyBXBase/rpc/internal/logic/getlabelactionlogic.go
  46. 4 4
      jyBXBase/rpc/internal/logic/includedlogic.go
  47. 4 4
      jyBXBase/rpc/internal/logic/iscollactionlogic.go
  48. 4 4
      jyBXBase/rpc/internal/logic/labelactionlogic.go
  49. 4 4
      jyBXBase/rpc/internal/logic/listlogic.go
  50. 3 3
      jyBXBase/rpc/internal/logic/newestbiddinglogic.go
  51. 8 8
      jyBXBase/rpc/internal/logic/newestbiddinglogic_test.go
  52. 3 3
      jyBXBase/rpc/internal/logic/showsearchlogic.go
  53. 3 3
      jyBXBase/rpc/internal/server/bxbaseserver.go
  54. 1 1
      jyBXBase/rpc/internal/svc/servicecontext.go
  55. 2 2
      jyBXBase/rpc/model/collectionInfo.go
  56. 5 5
      jyBXBase/rpc/model/newestBidding.go
  57. 2 2
      jyBXBase/rpc/util/common.go

+ 140 - 0
go.mod

@@ -0,0 +1,140 @@
+module bp.jydev.jianyu360.cn/BaseService/jyMicroservices
+
+go 1.20
+
+require (
+	app.yhyue.com/moapp/jybase v0.0.0-20240226084952-7e7b38ef8a66
+	app.yhyue.com/moapp/jylogx v0.0.0-20230522075659-ae6fbedb92bc
+	app.yhyue.com/moapp/jypkg v1.15.7
+	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
+	github.com/go-sql-driver/mysql v1.8.1
+	github.com/gogf/gf/v2 v2.7.0
+	github.com/randolphcyg/gozeropprof v1.0.2
+	github.com/zeromicro/go-zero v1.6.4
+	go.mongodb.org/mongo-driver v1.14.0
+	google.golang.org/grpc v1.63.2
+	google.golang.org/protobuf v1.33.0
+)
+
+require (
+	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d // indirect
+	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547 // indirect
+	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 // indirect
+	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e // indirect
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a // indirect
+	bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.8 // indirect
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.15-0.20230925060020-8e4db0f1e13e // indirect
+	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/fatih/color v1.16.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/garyburd/redigo v1.6.2 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
+	github.com/golang/mock v1.6.0 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/gomodule/redigo v2.0.0+incompatible // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/olivere/elastic v6.2.37+incompatible // indirect
+	github.com/olivere/elastic/v7 v7.0.22 // indirect
+	github.com/openzipkin/zipkin-go v0.4.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.18.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/redis/go-redis/v9 v9.4.0 // indirect
+	github.com/sirupsen/logrus v1.8.3 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/spf13/afero v1.9.3 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.15.0 // indirect
+	github.com/subosito/gotenv v1.4.2 // indirect
+	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
+	github.com/xdg-go/scram v1.1.2 // indirect
+	github.com/xdg-go/stringprep v1.0.4 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
+	go.etcd.io/etcd/api/v3 v3.5.13 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.13 // indirect
+	go.opentelemetry.io/otel v1.19.0 // indirect
+	go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.19.0 // indirect
+	go.opentelemetry.io/otel/metric v1.19.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
+	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/automaxprocs v1.5.3 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/zap v1.24.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
+	golang.org/x/net v0.24.0 // indirect
+	golang.org/x/oauth2 v0.17.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gorm.io/driver/mysql v1.0.5 // indirect
+	gorm.io/gorm v1.21.3 // indirect
+	jygit.jydev.jianyu360.cn/ApplicationCenter/publicService v0.0.0-20231017031425-45003ca9f35a // indirect
+	k8s.io/api v0.29.3 // indirect
+	k8s.io/apimachinery v0.29.3 // indirect
+	k8s.io/client-go v0.29.3 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 46 - 578
go.sum


+ 4 - 4
jyBXBase/api/bxbase.go

@@ -4,9 +4,9 @@ import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/endless"
 	logrusx "app.yhyue.com/moapp/jylogx/logx"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/init"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
-	IC "jyBXBase/api/init"
 	"log"
 	"net/http"
 	"os"
@@ -14,10 +14,10 @@ import (
 	"syscall"
 
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/handler"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
 	"github.com/randolphcyg/gozeropprof"
 	"github.com/zeromicro/go-zero/rest"
-	"jyBXBase/api/internal/handler"
-	"jyBXBase/api/internal/svc"
 )
 
 func main() {
@@ -25,7 +25,7 @@ func main() {
 	//注册代理服务
 	closeNotify, err := node.NewNode(IC.C.Gateway.Etcd...).Register(IC.C.Gateway.ServerCode, MC.InterfaceToStr(IC.C.Port))
 	if err != nil {
-		panic(err)
+		panic(err.(interface{}))
 	}
 	go func() {
 		err := endless.ListenAndServe(":"+MC.InterfaceToStr(IC.C.Webrpcport), nil, func() {})

+ 1 - 1
jyBXBase/api/init/db.go

@@ -6,7 +6,7 @@ package init
 import (
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBase/entity"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/entity"
 )
 
 var (

+ 1 - 1
jyBXBase/api/init/init.go

@@ -2,9 +2,9 @@ package init
 
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/config"
 	"flag"
 	"github.com/zeromicro/go-zero/core/conf"
-	"jyBXBase/api/internal/config"
 	"log"
 	"regexp"
 )

+ 1 - 1
jyBXBase/api/internal/config/config.go

@@ -3,7 +3,7 @@ package config
 import (
 	"github.com/zeromicro/go-zero/rest"
 	"github.com/zeromicro/go-zero/zrpc"
-	"jyBXBase/entity"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/entity"
 )
 
 type Config struct {

+ 3 - 3
jyBXBase/api/internal/handler/addLabelHandler.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 )
 
 func AddLabelHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/handler/addSearchScreenHandler.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 )
 
 func AddSearchScreenHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/handler/bcactionhandler.go

@@ -1,12 +1,12 @@
 package handler
 
 import (
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
 )
 
 func BCActionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/handler/checkSearchScreenHandler.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 )
 
 func CheckSearchScreenHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/handler/delSearchScreenHandler.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 )
 
 func DelSearchScreenHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/handler/getlabelactionhandler.go

@@ -1,12 +1,12 @@
 package handler
 
 import (
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
 )
 
 func GetLabelActionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/handler/includedHandler.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 )
 
 func IncludedHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/handler/iscollactionhandler.go

@@ -1,12 +1,12 @@
 package handler
 
 import (
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
 )
 
 func IsCollActionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/handler/labelactionhandler.go

@@ -1,12 +1,12 @@
 package handler
 
 import (
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
 )
 
 func LabelActionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/handler/listhandler.go

@@ -1,12 +1,12 @@
 package handler
 
 import (
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
 )
 
 func ListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/handler/newestBiddingHandler.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 )
 
 func NewestBiddingHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

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

@@ -4,7 +4,7 @@ package handler
 import (
 	"net/http"
 
-	"jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
 
 	"github.com/zeromicro/go-zero/rest"
 )

+ 3 - 3
jyBXBase/api/internal/handler/showSearchScreenHandler.go

@@ -4,9 +4,9 @@ import (
 	"net/http"
 
 	"github.com/zeromicro/go-zero/rest/httpx"
-	"jyBXBase/api/internal/logic"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 )
 
 func ShowSearchScreenHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

+ 3 - 3
jyBXBase/api/internal/logic/addSearchScreenLogic.go

@@ -3,11 +3,11 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	"jyBXBase/rpc/type/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 	"net/http"
 
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
jyBXBase/api/internal/logic/addlabellogic.go

@@ -3,11 +3,11 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	"jyBXBase/api/internal/types"
-	"jyBXBase/rpc/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
 
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
 )
 
 type AddLabelLogic struct {

+ 3 - 3
jyBXBase/api/internal/logic/bcactionlogic.go

@@ -2,11 +2,11 @@ package logic
 
 import (
 	"app.yhyue.com/moapp/jybase/common"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
-	"jyBXBase/rpc/type/bxbase"
 )
 
 type BCActionLogic struct {

+ 3 - 3
jyBXBase/api/internal/logic/checkSearchScreenLogic.go

@@ -3,11 +3,11 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	"jyBXBase/rpc/type/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 	"net/http"
 
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
jyBXBase/api/internal/logic/delSearchScreenLogic.go

@@ -3,11 +3,11 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	"jyBXBase/rpc/type/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 	"net/http"
 
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
jyBXBase/api/internal/logic/getlabelactionlogic.go

@@ -4,9 +4,9 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
-	"jyBXBase/rpc/type/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 )
 
 type GetLabelActionLogic struct {

+ 3 - 3
jyBXBase/api/internal/logic/includedLogic.go

@@ -2,10 +2,10 @@ package logic
 
 import (
 	"context"
-	"jyBXBase/rpc/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
 
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
 
 	"app.yhyue.com/moapp/jybase/common"
 

+ 3 - 3
jyBXBase/api/internal/logic/iscollactionlogic.go

@@ -3,11 +3,11 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	"jyBXBase/api/internal/types"
-	"jyBXBase/rpc/type/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
 )
 
 type IsCollActionLogic struct {

+ 3 - 3
jyBXBase/api/internal/logic/labelactionlogic.go

@@ -2,11 +2,11 @@ package logic
 
 import (
 	"app.yhyue.com/moapp/jybase/common"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
-	"jyBXBase/rpc/type/bxbase"
 )
 
 type LabelActionLogic struct {

+ 3 - 3
jyBXBase/api/internal/logic/listlogic.go

@@ -3,11 +3,11 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	"jyBXBase/api/internal/types"
-	"jyBXBase/rpc/type/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
 )
 
 type ListLogic struct {

+ 3 - 3
jyBXBase/api/internal/logic/newestBiddingLogic.go

@@ -3,9 +3,9 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
-	"jyBXBase/rpc/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
 	"log"
 	"net/http"
 	"time"

+ 3 - 3
jyBXBase/api/internal/logic/showSearchScreenLogic.go

@@ -2,10 +2,10 @@ package logic
 
 import (
 	"app.yhyue.com/moapp/jybase/common"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/types"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 	"context"
-	"jyBXBase/api/internal/svc"
-	"jyBXBase/api/internal/types"
-	"jyBXBase/rpc/type/bxbase"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/core/logx"

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

@@ -2,8 +2,8 @@ package svc
 
 import (
 	"github.com/zeromicro/go-zero/zrpc"
-	"jyBXBase/api/internal/config"
-	"jyBXBase/rpc/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/api/internal/config"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
 )
 
 type ServiceContext struct {

+ 0 - 24
jyBXBase/go.mod

@@ -1,24 +0,0 @@
-module jyBXBase
-
-go 1.16
-
-require (
-	github.com/go-sql-driver/mysql v1.7.0
-	github.com/zeromicro/go-zero v1.5.2
-	go.mongodb.org/mongo-driver v1.11.4
-	google.golang.org/grpc v1.54.0
-	google.golang.org/protobuf v1.30.0
-)
-
-require (
-	app.yhyue.com/moapp/jybase v0.0.0-20230420060106-a9c3f4187463
-	app.yhyue.com/moapp/jylogx v0.0.0-20230522075659-ae6fbedb92bc
-	app.yhyue.com/moapp/jypkg v0.0.0-20230420060744-ff53e7ca6f47
-	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
-	github.com/gogf/gf/v2 v2.5.7
-	github.com/randolphcyg/gozeropprof v1.0.2
-	go.opentelemetry.io/otel/exporters/jaeger v1.15.1 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.15.1 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.15.1 // indirect
-	go.opentelemetry.io/otel/exporters/zipkin v1.15.1 // indirect
-)

+ 4 - 4
jyBXBase/rpc/bxbase.go

@@ -9,11 +9,11 @@ import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/endless"
 
-	"jyBXBase/rpc/internal/server"
-	"jyBXBase/rpc/internal/svc"
-	"jyBXBase/rpc/type/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/server"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 
-	IC "jyBXBase/rpc/init"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
 
 	"github.com/zeromicro/go-zero/core/service"
 	"github.com/zeromicro/go-zero/zrpc"

+ 1 - 1
jyBXBase/rpc/bxbase/bxbase.go

@@ -6,7 +6,7 @@ package bxbase
 import (
 	"context"
 
-	"jyBXBase/rpc/type/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"

+ 1 - 1
jyBXBase/rpc/bxbaseclient/bxbase.go

@@ -6,7 +6,7 @@ package bxbaseclient
 import (
 	"context"
 
-	"jyBXBase/rpc/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
 
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"

+ 1 - 1
jyBXBase/rpc/init/db.go

@@ -4,7 +4,7 @@
 package init
 
 import (
-	"jyBXBase/entity"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/entity"
 	"strings"
 
 	. "app.yhyue.com/moapp/jybase/es"

+ 2 - 2
jyBXBase/rpc/init/init.go

@@ -7,8 +7,8 @@ import (
 	"flag"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/zeromicro/go-zero/core/conf"
-	"jyBXBase/entity"
-	"jyBXBase/rpc/internal/config"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/entity"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/config"
 )
 
 var configFile = flag.String("cf", "etc/bxbase.yaml", "the config file")

+ 3 - 3
jyBXBase/rpc/internal/config/config.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"jyBXBase/entity"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/entity"
 
 	"github.com/zeromicro/go-zero/zrpc"
 )
@@ -15,8 +15,8 @@ type Config struct {
 	UserCenterKey         string
 	PowerCheckCenterKey   string
 	EntManageApplication  string
-	NewsLimitNum          int64    // 移动端首页最新标讯数量限制
-	NewsTimeOut           int64    //更新数据时间
+	NewsLimitNum          int64 // 移动端首页最新标讯数量限制
+	NewsTimeOut           int64 //更新数据时间
 	NewsCache             struct { // 最新标讯缓存配置
 		NoLogin   CacheConfig // 未登录用户缓存key
 		LoginUser CacheConfig // 登录用户有推送数据使用的key

+ 3 - 3
jyBXBase/rpc/internal/logic/addlabellogic.go

@@ -4,9 +4,9 @@ import (
 	se "app.yhyue.com/moapp/jybase/encrypt"
 	"context"
 	"fmt"
-	"jyBXBase/rpc/bxbase"
-	IC "jyBXBase/rpc/init"
-	"jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 	"log"
 	"strconv"
 	"time"

+ 4 - 4
jyBXBase/rpc/internal/logic/addsearchlogic.go

@@ -2,14 +2,14 @@ package logic
 
 import (
 	"context"
-	"jyBXBase/rpc/bxbase"
-	IC "jyBXBase/rpc/init"
-	"jyBXBase/rpc/util"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/util"
 	"log"
 	"strings"
 	"time"
 
-	"jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 4 - 4
jyBXBase/rpc/internal/logic/bcactionlogic.go

@@ -3,13 +3,13 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
-	IC "jyBXBase/rpc/init"
-	util2 "jyBXBase/rpc/util"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	util2 "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/util"
 	"log"
 	"time"
 
-	"jyBXBase/rpc/bxbase"
-	"jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 4 - 4
jyBXBase/rpc/internal/logic/checksearchlogic.go

@@ -6,15 +6,15 @@ import (
 	"context"
 	"crypto/md5"
 	"fmt"
-	IC "jyBXBase/rpc/init"
-	"jyBXBase/rpc/util"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/util"
 	"log"
 	"net/url"
 	"sort"
 	"strings"
 
-	"jyBXBase/rpc/bxbase"
-	"jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
jyBXBase/rpc/internal/logic/delsearchlogic.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"jyBXBase/rpc/bxbase"
-	IC "jyBXBase/rpc/init"
-	"jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 	"log"
 	"strings"
 )

+ 3 - 3
jyBXBase/rpc/internal/logic/getlabelactionlogic.go

@@ -5,11 +5,11 @@ import (
 	se "app.yhyue.com/moapp/jybase/encrypt"
 	"context"
 	"fmt"
-	IC "jyBXBase/rpc/init"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
 	"strconv"
 
-	"jyBXBase/rpc/bxbase"
-	"jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 4 - 4
jyBXBase/rpc/internal/logic/includedlogic.go

@@ -3,10 +3,10 @@ package logic
 import (
 	"context"
 	"fmt"
-	IC "jyBXBase/rpc/init"
-	"jyBXBase/rpc/internal/svc"
-	"jyBXBase/rpc/model"
-	"jyBXBase/rpc/type/bxbase"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/model"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/redis"

+ 4 - 4
jyBXBase/rpc/internal/logic/iscollactionlogic.go

@@ -6,13 +6,13 @@ import (
 	"app.yhyue.com/moapp/jybase/redis"
 	"context"
 	"fmt"
-	IC "jyBXBase/rpc/init"
-	util2 "jyBXBase/rpc/util"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	util2 "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/util"
 	"strconv"
 	"strings"
 
-	"jyBXBase/rpc/bxbase"
-	"jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 4 - 4
jyBXBase/rpc/internal/logic/labelactionlogic.go

@@ -5,15 +5,15 @@ import (
 	se "app.yhyue.com/moapp/jybase/encrypt"
 	"context"
 	"fmt"
-	IC "jyBXBase/rpc/init"
-	util2 "jyBXBase/rpc/util"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	util2 "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/util"
 	"log"
 	"strconv"
 	"strings"
 	"time"
 
-	"jyBXBase/rpc/bxbase"
-	"jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 4 - 4
jyBXBase/rpc/internal/logic/listlogic.go

@@ -4,10 +4,10 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"context"
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBase/rpc/bxbase"
-	IC "jyBXBase/rpc/init"
-	"jyBXBase/rpc/internal/svc"
-	"jyBXBase/rpc/util"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/util"
 )
 
 type ListLogic struct {

+ 3 - 3
jyBXBase/rpc/internal/logic/newestbiddinglogic.go

@@ -2,12 +2,12 @@ package logic
 
 import (
 	"context"
-	"jyBXBase/rpc/model"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/model"
 	"log"
 	"time"
 
-	"jyBXBase/rpc/internal/svc"
-	"jyBXBase/rpc/type/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 8 - 8
jyBXBase/rpc/internal/logic/newestbiddinglogic_test.go

@@ -1,12 +1,12 @@
 package logic
 
 import (
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/entity"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/config"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 	"context"
-	"jyBXBase/entity"
-	"jyBXBase/rpc/bxbase"
-	IC "jyBXBase/rpc/init"
-	"jyBXBase/rpc/internal/config"
-	"jyBXBase/rpc/internal/svc"
 	"reflect"
 	"strings"
 	"testing"
@@ -72,7 +72,7 @@ func init() {
 	redis.InitRedisBySize(strings.Join([]string{"other=192.168.3.206:1712", "push=192.168.3.206:1712", "pushcache_1=192.168.3.206:5000", "pushcache_2_a=192.168.3.206:5001", "pushcache_2_b=192.168.3.206:5002"}, ","), 100, 30, 300)
 	//初始化 elasticsearch
 	logx.Info("--初始化 elasticsearch--")
-	elastic.InitElasticSize("http://192.168.3.206:9800", 5)
+	elastic.NewEs("v7", "http://192.168.3.206:9800", 10, "", "").Init()
 }
 
 func TestNewestBiddingLogic_NewestBidding(t *testing.T) {
@@ -99,9 +99,9 @@ func TestNewestBiddingLogic_NewestBidding(t *testing.T) {
 					IsSearch:  0,
 					UserId:    "5e8eb60ae138234b4f91aacf",
 					AppId:     "10000",
-					EntUserId: "4530",
+					EntUserId: 4530,
 					NewUserId: 11111,
-					EntId:     "15232",
+					EntId:     15232,
 				},
 			}},
 	}

+ 3 - 3
jyBXBase/rpc/internal/logic/showsearchlogic.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXBase/rpc/bxbase"
-	IC "jyBXBase/rpc/init"
-	"jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
 	"log"
 	"strconv"
 	"strings"

+ 3 - 3
jyBXBase/rpc/internal/server/bxbaseserver.go

@@ -6,9 +6,9 @@ package server
 import (
 	"context"
 
-	"jyBXBase/rpc/internal/logic"
-	"jyBXBase/rpc/internal/svc"
-	"jyBXBase/rpc/type/bxbase"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/logic"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/svc"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/type/bxbase"
 )
 
 type BxbaseServer struct {

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

@@ -1,6 +1,6 @@
 package svc
 
-import "jyBXBase/rpc/internal/config"
+import "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/config"
 
 type ServiceContext struct {
 	Config config.Config

+ 2 - 2
jyBXBase/rpc/model/collectionInfo.go

@@ -3,8 +3,8 @@ package model
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	ME "app.yhyue.com/moapp/jybase/encrypt"
-	"jyBXBase/rpc/bxbase"
-	IC "jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
 	"strings"
 )
 

+ 5 - 5
jyBXBase/rpc/model/newestBidding.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"jyBXBase/entity"
-	"jyBXBase/rpc/bxbase"
-	IC "jyBXBase/rpc/init"
-	"jyBXBase/rpc/internal/config"
-	"jyBXBase/rpc/util"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/entity"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/internal/config"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/util"
 	"log"
 	"sort"
 	"strings"

+ 2 - 2
jyBXBase/rpc/util/common.go

@@ -2,8 +2,8 @@ package util
 
 import (
 	"fmt"
-	"jyBXBase/rpc/bxbase"
-	IC "jyBXBase/rpc/init"
+	"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/bxbase"
+	IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXBase/rpc/init"
 	"log"
 	"strconv"
 	"strings"

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно