wangchuanjin 1 жил өмнө
parent
commit
480c270480
33 өөрчлөгдсөн 1990 нэмэгдсэн , 219 устгасан
  1. 2 2
      api/filesystem.go
  2. 2 2
      api/internal/config/config.go
  3. 1 1
      api/internal/handler/createdomainhandler.go
  4. 1 1
      api/internal/handler/deletedomainhandler.go
  5. 1 1
      api/internal/handler/deletefilehandler.go
  6. 1 1
      api/internal/handler/getfilehandler.go
  7. 1 1
      api/internal/handler/getfilemetahandler.go
  8. 1 1
      api/internal/handler/routes.go
  9. 1 1
      api/internal/handler/updatefilemetahandler.go
  10. 1 1
      api/internal/handler/uploadfilehandler.go
  11. 1 1
      api/internal/logic/createdomainlogic.go
  12. 1 1
      api/internal/logic/deletedomainlogic.go
  13. 1 1
      api/internal/logic/deletefilelogic.go
  14. 1 1
      api/internal/logic/getfilelogic.go
  15. 1 1
      api/internal/logic/getfilemetalogic.go
  16. 1 1
      api/internal/logic/updatefilemetalogic.go
  17. 1 1
      api/internal/logic/uploadfilelogic.go
  18. 1 1
      api/internal/svc/servicecontext.go
  19. 4 6
      go.mod
  20. 1951 178
      go.sum
  21. 2 2
      rpc/filesystem.go
  22. 1 1
      rpc/filesystemclient/filesystem.go
  23. 1 1
      rpc/internal/config/config.go
  24. 1 1
      rpc/internal/logic/createdomainlogic.go
  25. 1 1
      rpc/internal/logic/deletedomainlogic.go
  26. 1 1
      rpc/internal/logic/deletefilelogic.go
  27. 1 1
      rpc/internal/logic/getfilelogic.go
  28. 1 1
      rpc/internal/logic/getfilemetalogic.go
  29. 1 1
      rpc/internal/logic/getossurillogic.go
  30. 1 1
      rpc/internal/logic/savefilelogic.go
  31. 1 1
      rpc/internal/logic/updatedomainmetalogic.go
  32. 1 1
      rpc/internal/logic/updatefilemetalogic.go
  33. 2 2
      rpc/test/jyfs_rpc_test.go

+ 2 - 2
api/filesystem.go

@@ -8,8 +8,8 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/handler"
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 
-	"github.com/tal-tech/go-zero/core/conf"
-	"github.com/tal-tech/go-zero/rest"
+	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/rest"
 )
 
 var configFile = flag.String("f", "etc/filesystem-api.yaml", "the config file")

+ 2 - 2
api/internal/config/config.go

@@ -1,8 +1,8 @@
 package config
 
 import (
-	"github.com/tal-tech/go-zero/rest"
-	"github.com/tal-tech/go-zero/zrpc"
+	"github.com/zeromicro/go-zero/rest"
+	"github.com/zeromicro/go-zero/zrpc"
 )
 
 type Config struct {

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

@@ -7,7 +7,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 
-	"github.com/tal-tech/go-zero/rest/httpx"
+	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func CreateDomainHandler(ctx *svc.ServiceContext) http.HandlerFunc {

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

@@ -7,7 +7,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 
-	"github.com/tal-tech/go-zero/rest/httpx"
+	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func DeleteDomainHandler(ctx *svc.ServiceContext) http.HandlerFunc {

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

@@ -7,7 +7,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 
-	"github.com/tal-tech/go-zero/rest/httpx"
+	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func DeleteFileHandler(ctx *svc.ServiceContext) http.HandlerFunc {

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

@@ -7,7 +7,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 
-	"github.com/tal-tech/go-zero/rest/httpx"
+	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func GetFileHandler(ctx *svc.ServiceContext) http.HandlerFunc {

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

@@ -7,7 +7,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 
-	"github.com/tal-tech/go-zero/rest/httpx"
+	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func GetFileMetaHandler(ctx *svc.ServiceContext) http.HandlerFunc {

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

@@ -6,7 +6,7 @@ import (
 
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 
-	"github.com/tal-tech/go-zero/rest"
+	"github.com/zeromicro/go-zero/rest"
 )
 
 func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) {

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

@@ -7,7 +7,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 
-	"github.com/tal-tech/go-zero/rest/httpx"
+	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func UpdateFileMetaHandler(ctx *svc.ServiceContext) http.HandlerFunc {

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

@@ -7,7 +7,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 
-	"github.com/tal-tech/go-zero/rest/httpx"
+	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func UploadFileHandler(ctx *svc.ServiceContext) http.HandlerFunc {

+ 1 - 1
api/internal/logic/createdomainlogic.go

@@ -8,7 +8,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 
 	fsc "app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type CreateDomainLogic struct {

+ 1 - 1
api/internal/logic/deletedomainlogic.go

@@ -6,7 +6,7 @@ import (
 	"context"
 
 	fsc "app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type DeleteDomainLogic struct {

+ 1 - 1
api/internal/logic/deletefilelogic.go

@@ -6,7 +6,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 	fsc "app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type DeleteFileLogic struct {

+ 1 - 1
api/internal/logic/getfilelogic.go

@@ -6,7 +6,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 	fsc "app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type GetFileLogic struct {

+ 1 - 1
api/internal/logic/getfilemetalogic.go

@@ -6,7 +6,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 	fsc "app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type GetFileMetaLogic struct {

+ 1 - 1
api/internal/logic/updatefilemetalogic.go

@@ -6,7 +6,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 	fsc "app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UpdateFileMetaLogic struct {

+ 1 - 1
api/internal/logic/uploadfilelogic.go

@@ -8,7 +8,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/api/internal/svc"
 	"app.yhyue.com/moapp/jyfs/api/internal/types"
 	fsc "app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UploadFileLogic struct {

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

@@ -3,7 +3,7 @@ package svc
 import (
 	"app.yhyue.com/moapp/jyfs/api/internal/config"
 	"app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
-	"github.com/tal-tech/go-zero/zrpc"
+	"github.com/zeromicro/go-zero/zrpc"
 )
 
 type ServiceContext struct {

+ 4 - 6
go.mod

@@ -6,12 +6,10 @@ require (
 	github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/garyburd/redigo v1.6.2
-	github.com/golang/protobuf v1.4.2
+	github.com/golang/protobuf v1.5.3
 	github.com/gomodule/redigo v1.8.4
 	github.com/satori/go.uuid v1.2.0 // indirect
-	github.com/tal-tech/go-zero v1.1.2
-	google.golang.org/grpc v1.29.1
-	google.golang.org/protobuf v1.25.0
+	github.com/zeromicro/go-zero v1.5.6
+	google.golang.org/grpc v1.59.0
+	google.golang.org/protobuf v1.31.0
 )
-
-replace google.golang.org/grpc => google.golang.org/grpc v1.29.1

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


+ 2 - 2
rpc/filesystem.go

@@ -10,8 +10,8 @@ import (
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
 	"flag"
 	"fmt"
-	"github.com/tal-tech/go-zero/core/conf"
-	"github.com/tal-tech/go-zero/zrpc"
+	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
 )
 

+ 1 - 1
rpc/filesystemclient/filesystem.go

@@ -10,7 +10,7 @@ import (
 
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
 
-	"github.com/tal-tech/go-zero/zrpc"
+	"github.com/zeromicro/go-zero/zrpc"
 )
 
 type (

+ 1 - 1
rpc/internal/config/config.go

@@ -1,6 +1,6 @@
 package config
 
-import "github.com/tal-tech/go-zero/zrpc"
+import "github.com/zeromicro/go-zero/zrpc"
 
 type Config struct {
 	zrpc.RpcServerConf

+ 1 - 1
rpc/internal/logic/createdomainlogic.go

@@ -7,7 +7,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/redis"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type CreateDomainLogic struct {

+ 1 - 1
rpc/internal/logic/deletedomainlogic.go

@@ -8,7 +8,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
 
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type DeleteDomainLogic struct {

+ 1 - 1
rpc/internal/logic/deletefilelogic.go

@@ -6,7 +6,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
 
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type DeleteFileLogic struct {

+ 1 - 1
rpc/internal/logic/getfilelogic.go

@@ -8,7 +8,7 @@ import (
 
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type GetFileLogic struct {

+ 1 - 1
rpc/internal/logic/getfilemetalogic.go

@@ -8,7 +8,7 @@ import (
 
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type GetFileMetaLogic struct {

+ 1 - 1
rpc/internal/logic/getossurillogic.go

@@ -7,7 +7,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type GetOssUrilLogic struct {

+ 1 - 1
rpc/internal/logic/savefilelogic.go

@@ -13,7 +13,7 @@ import (
 
 	// "app.yhyue.com/moapp/jyfs/rpc/internal/redis"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type SaveFileLogic struct {

+ 1 - 1
rpc/internal/logic/updatedomainmetalogic.go

@@ -10,7 +10,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
 
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UpdateDomainMetaLogic struct {

+ 1 - 1
rpc/internal/logic/updatefilemetalogic.go

@@ -11,7 +11,7 @@ import (
 	"app.yhyue.com/moapp/jyfs/rpc/internal/redis"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/svc"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UpdateFileMetaLogic struct {

+ 2 - 2
rpc/test/jyfs_rpc_test.go

@@ -11,8 +11,8 @@ import (
 	"app.yhyue.com/moapp/jyfs/rpc/filesystem"
 	"app.yhyue.com/moapp/jyfs/rpc/filesystemclient"
 	"app.yhyue.com/moapp/jyfs/rpc/internal/config"
-	"github.com/tal-tech/go-zero/core/conf"
-	"github.com/tal-tech/go-zero/zrpc"
+	"github.com/zeromicro/go-zero/core/conf"
+	"github.com/zeromicro/go-zero/zrpc"
 )
 
 var C config.Config

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