shengji

api/etc/jyorder-api.yaml

@@ -5,4 +5,9 @@ JyOrder:
   Etcd:
     Hosts:
       - 127.0.0.1:2379
-    Key: jyorder.rpc
+    Key: jyorder.rpc
+Logx:
+  Mode: console #console|file|volume
+  Path: logs
+  Level: info #info|error|severe
+  KeepDays: 100

api/internal/config/config.go

@@ -1,11 +1,13 @@
 package config
 
 import (
-	"github.com/tal-tech/go-zero/rest"
-	"github.com/tal-tech/go-zero/zrpc"
+	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/rest"
+	"github.com/zeromicro/go-zero/zrpc"
 )
 
 type Config struct {
 	rest.RestConf
 	JyOrder zrpc.RpcClientConf
+	Logx    logx.LogConf
 }

api/internal/handler/createorderdetailedhandler.go

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

api/internal/handler/createorderhandler.go

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

api/internal/handler/routes.go

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

api/internal/handler/updateorderhandler.go

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

api/internal/logic/createorderdetailedlogic.go

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

api/internal/logic/createorderlogic.go

@@ -9,7 +9,7 @@ import (
 	"app.yhyue.com/moapp/jyOrder/api/internal/svc"
 	"app.yhyue.com/moapp/jyOrder/api/internal/types"
 
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type CreateOrderLogic struct {

api/internal/logic/updateorderlogic.go

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

api/internal/svc/servicecontext.go

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

api/jyorder.go

@@ -7,9 +7,9 @@ import (
 	"app.yhyue.com/moapp/jyOrder/api/internal/config"
 	"app.yhyue.com/moapp/jyOrder/api/internal/handler"
 	"app.yhyue.com/moapp/jyOrder/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/core/logx"
+	"github.com/zeromicro/go-zero/rest"
 )
 
 var configFile = flag.String("f", "etc/jyOrder-api.yaml", "the config file")
@@ -25,7 +25,7 @@ func main() {
 	defer server.Stop()
 
 	handler.RegisterHandlers(server, ctx)
-
+	logx.MustSetup(c.Logx)
 	fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)
 	server.Start()
 }

go.mod

@@ -3,11 +3,10 @@ module app.yhyue.com/moapp/jyOrder
 go 1.13
 
 require (
-	app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20210926093749-157e648bb0ac
-	github.com/go-sql-driver/mysql v1.5.0
+	app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20231104081431-a82b9cacca83
+	github.com/go-sql-driver/mysql v1.7.1
 	github.com/go-xorm/xorm v0.7.9
-	github.com/golang/protobuf v1.5.2
-	github.com/tal-tech/go-zero v1.1.10
-	google.golang.org/grpc v1.40.0
-	google.golang.org/protobuf v1.27.1
-)
+	github.com/zeromicro/go-zero v1.6.1
+	google.golang.org/grpc v1.60.0
+	google.golang.org/protobuf v1.31.1-0.20231027082548-f4a6c1f6e5c1
+)

rpc/etc/jyorder.yaml

@@ -11,4 +11,9 @@ FileSystemConf:
       - 127.0.0.1:2379
     Key: jyorder.rpc
 CalleeId: jyorder.rpc
-Node: 1
+Node: 1
+Logx:
+  Mode: console #console|file|volume
+  Path: logs
+  Level: info #info|error|severe
+  KeepDays: 100

rpc/internal/config/config.go

@@ -2,7 +2,8 @@ package config
 
 import (
 	"app.yhyue.com/moapp/jyResourcesCenter/rpc/resourcesCenterclient"
-	"github.com/tal-tech/go-zero/zrpc"
+	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/zrpc"
 )
 
 type Config struct {
@@ -11,6 +12,7 @@ type Config struct {
 	Node           int    // 节点
 	CalleeId       string // 服务名字
 	FileSystemConf zrpc.RpcClientConf
+	Logx           logx.LogConf
 }
 
 var ConfigJson Config

rpc/internal/logic/createorderdetailedlogic.go

@@ -6,7 +6,7 @@ import (
 	"app.yhyue.com/moapp/jyOrder/rpc/internal/svc"
 	"app.yhyue.com/moapp/jyOrder/rpc/jyOrder"
 
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type CreateOrderDetailedLogic struct {
@@ -27,7 +27,7 @@ func NewCreateOrderDetailedLogic(ctx context.Context, svcCtx *svc.ServiceContext
 func (l *CreateOrderDetailedLogic) CreateOrderDetailed(in *jyOrder.RequestDetailed) (*jyOrder.Response, error) {
 	// todo: add your logic here and delete this line
 	result := &jyOrder.Response{}
-	code,msg,data := orderService.CreateOrderDetailed(in)
+	code, msg, data := orderService.CreateOrderDetailed(in)
 	result.Code = code
 	result.Message = msg
 	result.Data = data

rpc/internal/logic/createorderlogic.go

@@ -1,12 +1,13 @@
 package logic
 
 import (
+	"context"
+
 	"app.yhyue.com/moapp/jyOrder/rpc/internal/svc"
 	"app.yhyue.com/moapp/jyOrder/rpc/jyOrder"
 	"app.yhyue.com/moapp/jyOrder/service"
-	"context"
 
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 var orderService = &service.OrderService{}
@@ -28,7 +29,7 @@ func NewCreateOrderLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Creat
 func (l *CreateOrderLogic) CreateOrder(in *jyOrder.Request) (*jyOrder.Response, error) {
 	// todo: add your logic here and delete this line
 	result := &jyOrder.Response{}
-	code,msg,data := orderService.CreateOrder(in)
+	code, msg, data := orderService.CreateOrder(in)
 	result.Code = code
 	result.Message = msg
 	result.Data = data

rpc/internal/logic/updateorderlogic.go

@@ -6,7 +6,7 @@ import (
 	"app.yhyue.com/moapp/jyOrder/rpc/internal/svc"
 	"app.yhyue.com/moapp/jyOrder/rpc/jyOrder"
 
-	"github.com/tal-tech/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type UpdateOrderLogic struct {
@@ -28,9 +28,9 @@ func (l *UpdateOrderLogic) UpdateOrder(in *jyOrder.Request) (*jyOrder.Response,
 	// todo: add your logic here and delete this line
 	// todo: add your logic here and delete this line
 	result := &jyOrder.Response{}
-	code,msg := orderService.UpdateOrder(in)
+	code, msg := orderService.UpdateOrder(in)
 	result.Code = code
 	result.Message = msg
-	result.Data=code
+	result.Data = code
 	return result, nil
 }

rpc/jyorder.go

@@ -1,20 +1,22 @@
 package main
 
 import (
-	"app.yhyue.com/moapp/jyOrder/entity"
 	"flag"
 	"fmt"
-	"github.com/go-xorm/xorm"
 	"log"
 
+	"app.yhyue.com/moapp/jyOrder/entity"
+	"github.com/go-xorm/xorm"
+
 	"app.yhyue.com/moapp/jyOrder/rpc/internal/config"
 	"app.yhyue.com/moapp/jyOrder/rpc/internal/server"
 	"app.yhyue.com/moapp/jyOrder/rpc/internal/svc"
 	"app.yhyue.com/moapp/jyOrder/rpc/jyOrder"
 	_ "github.com/go-sql-driver/mysql"
 
-	"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/core/logx"
+	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
 )
 
@@ -31,12 +33,12 @@ func main() {
 		jyOrder.RegisterJyOrderServer(grpcServer, srv)
 	})
 	defer s.Stop()
-
+	logx.MustSetup(config.ConfigJson.Logx)
 	fmt.Printf("Starting rpc server at %s...\n", config.ConfigJson.ListenOn)
 	s.Start()
 }
 
-//创建orm引擎
+// 创建orm引擎
 func init() {
 	conf.MustLoad(*configFile, &config.ConfigJson)
 	var err error

rpc/jyorderclient/jyorder.go

@@ -8,7 +8,7 @@ import (
 
 	"app.yhyue.com/moapp/jyOrder/rpc/jyOrder"
 
-	"github.com/tal-tech/go-zero/zrpc"
+	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
 )