lonelog to record
CI / changes (push) Successful in 36s
CI / ad (push) Successful in 0s
CI / admin (push) Successful in 0s
CI / bff (push) Successful in 18s
CI / chore (push) Successful in 0s
CI / equipment (push) Successful in 0s
CI / express (push) Successful in 0s
CI / product (push) Successful in 0s
CI / record (push) Successful in 20s
CI / sale (push) Successful in 0s
CI / task (push) Successful in 0s
CI / user (push) Successful in 0s
CI / wecom (push) Successful in 1s

This commit is contained in:
2026-09-03 20:40:08 +08:00
parent 322f01998a
commit 04402a8bdf
15 changed files with 255 additions and 264 deletions
@@ -2,7 +2,7 @@ package logic
import (
"context"
lonelog "lone-services/rpc/lonelog/pb"
record "lone-services/rpc/record/pb"
"lone-services/services/record/internal/svc"
"github.com/zeromicro/go-zero/core/logx"
@@ -22,8 +22,8 @@ func NewActionAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ActionA
}
}
func (l *ActionAddLogic) ActionAdd(in *lonelog.ActionLog) (*lonelog.Response, error) {
func (l *ActionAddLogic) ActionAdd(in *record.ActionLog) (*record.Response, error) {
// todo: add your logic here and delete this line
return &lonelog.Response{}, nil
return &record.Response{}, nil
}
+9 -9
View File
@@ -3,7 +3,7 @@ package logic
import (
"lone-services/pkg/utils"
"lone-services/pkg/validate"
lonelog "lone-services/rpc/lonelog/pb"
"lone-services/rpc/record/pb"
"reflect"
jsoniter "github.com/json-iterator/go"
@@ -12,10 +12,10 @@ import (
type BaseLogic struct {
}
func (l *BaseLogic) checkParams(in interface{}, v validate.IValidator) *lonelog.Response {
func (l *BaseLogic) checkParams(in interface{}, v validate.IValidator) *record.Response {
rv := reflect.ValueOf(in)
if rv.Kind() != reflect.Ptr || rv.IsNil() {
return &lonelog.Response{
return &record.Response{
Code: utils.ErrorParams.Code,
Msg: "request must be nonnil proto pointer",
}
@@ -23,7 +23,7 @@ func (l *BaseLogic) checkParams(in interface{}, v validate.IValidator) *lonelog.
resp := validate.ValidateFromProto(in, v)
if resp != utils.StringEmpty {
return &lonelog.Response{
return &record.Response{
Code: utils.ErrorParams.Code,
Msg: resp,
}
@@ -31,14 +31,14 @@ func (l *BaseLogic) checkParams(in interface{}, v validate.IValidator) *lonelog.
return nil
}
func (l *BaseLogic) fail(status utils.Status) (*lonelog.Response, error) {
func (l *BaseLogic) fail(status utils.Status) (*record.Response, error) {
return l.out(status, status.Msg)
}
func (l *BaseLogic) out(status utils.Status, msg string) (*lonelog.Response, error) {
return &lonelog.Response{Code: status.Code, Msg: msg}, nil
func (l *BaseLogic) out(status utils.Status, msg string) (*record.Response, error) {
return &record.Response{Code: status.Code, Msg: msg}, nil
}
func (l *BaseLogic) ok(data any) (*lonelog.Response, error) {
func (l *BaseLogic) ok(data any) (*record.Response, error) {
buf, _ := jsoniter.Marshal(data)
return &lonelog.Response{Code: utils.Ok.Code, Msg: utils.Ok.Msg, Data: string(buf)}, nil
return &record.Response{Code: utils.Ok.Code, Msg: utils.Ok.Msg, Data: string(buf)}, nil
}
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"context"
"lone-services/pkg/modelbase"
"lone-services/pkg/utils"
lonelog "lone-services/rpc/lonelog/pb"
record "lone-services/rpc/record/pb"
"lone-services/services/record/internal/dao"
"lone-services/services/record/internal/model"
"lone-services/services/record/internal/svc"
@@ -29,7 +29,7 @@ func NewItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ItemsLogic
}
}
func (l *ItemsLogic) Items(in *lonelog.ItemsRequest) (*lonelog.Response, error) {
func (l *ItemsLogic) Items(in *record.ItemsRequest) (*record.Response, error) {
modelObj := model.ActionModel{}.Init()
w := modelbase.Params{
Page: int(in.Page),
@@ -8,7 +8,7 @@ import (
"lone-services/services/record/internal/model"
"strconv"
"lone-services/rpc/lonelog/pb"
"lone-services/rpc/record/pb"
"lone-services/services/record/internal/svc"
"github.com/zeromicro/go-zero/core/logx"
@@ -29,7 +29,7 @@ func NewLoginItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LoginI
}
}
func (l *LoginItemsLogic) LoginItems(in *lonelog.ItemsRequest) (*lonelog.Response, error) {
func (l *LoginItemsLogic) LoginItems(in *record.ItemsRequest) (*record.Response, error) {
modelObj := model.LoginModel{}.Init()
w := modelbase.Params{
Page: int(in.Page),
@@ -2,7 +2,7 @@ package logic
import (
"context"
lonelog "lone-services/rpc/lonelog/pb"
record "lone-services/rpc/record/pb"
"lone-services/services/record/internal/svc"
"github.com/zeromicro/go-zero/core/logx"
@@ -22,8 +22,8 @@ func NewLoginAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LoginAdd
}
}
func (l *LoginAddLogic) LoginAdd(in *lonelog.LoginLog) (*lonelog.Response, error) {
func (l *LoginAddLogic) LoginAdd(in *record.LoginLog) (*record.Response, error) {
// todo: add your logic here and delete this line
return &lonelog.Response{}, nil
return &record.Response{}, nil
}
@@ -1,44 +0,0 @@
// Code generated by goctl. DO NOT EDIT.
// goctl 1.10.2
// Source: lonelog.proto
package server
import (
"context"
"lone-services/rpc/lonelog/pb"
"lone-services/services/record/internal/logic"
"lone-services/services/record/internal/svc"
)
type LonelogServer struct {
svcCtx *svc.ServiceContext
lonelog.UnimplementedLonelogServer
}
func NewLonelogServer(svcCtx *svc.ServiceContext) *LonelogServer {
return &LonelogServer{
svcCtx: svcCtx,
}
}
func (s *LonelogServer) Items(ctx context.Context, in *lonelog.ItemsRequest) (*lonelog.Response, error) {
l := logic.NewItemsLogic(ctx, s.svcCtx)
return l.Items(in)
}
func (s *LonelogServer) LoginItems(ctx context.Context, in *lonelog.ItemsRequest) (*lonelog.Response, error) {
l := logic.NewLoginItemsLogic(ctx, s.svcCtx)
return l.LoginItems(in)
}
func (s *LonelogServer) ActionAdd(ctx context.Context, in *lonelog.ActionLog) (*lonelog.Response, error) {
l := logic.NewActionAddLogic(ctx, s.svcCtx)
return l.ActionAdd(in)
}
func (s *LonelogServer) LoginAdd(ctx context.Context, in *lonelog.LoginLog) (*lonelog.Response, error) {
l := logic.NewLoginAddLogic(ctx, s.svcCtx)
return l.LoginAdd(in)
}
@@ -0,0 +1,44 @@
// Code generated by goctl. DO NOT EDIT.
// goctl 1.10.2
// Source: record.proto
package server
import (
"context"
"lone-services/rpc/record/pb"
"lone-services/services/record/internal/logic"
"lone-services/services/record/internal/svc"
)
type RecordServer struct {
svcCtx *svc.ServiceContext
record.UnimplementedRecordServer
}
func NewRecordServer(svcCtx *svc.ServiceContext) *RecordServer {
return &RecordServer{
svcCtx: svcCtx,
}
}
func (s *RecordServer) Items(ctx context.Context, in *record.ItemsRequest) (*record.Response, error) {
l := logic.NewItemsLogic(ctx, s.svcCtx)
return l.Items(in)
}
func (s *RecordServer) LoginItems(ctx context.Context, in *record.ItemsRequest) (*record.Response, error) {
l := logic.NewLoginItemsLogic(ctx, s.svcCtx)
return l.LoginItems(in)
}
func (s *RecordServer) ActionAdd(ctx context.Context, in *record.ActionLog) (*record.Response, error) {
l := logic.NewActionAddLogic(ctx, s.svcCtx)
return l.ActionAdd(in)
}
func (s *RecordServer) LoginAdd(ctx context.Context, in *record.LoginLog) (*record.Response, error) {
l := logic.NewLoginAddLogic(ctx, s.svcCtx)
return l.LoginAdd(in)
}
-59
View File
@@ -1,59 +0,0 @@
// Code generated by goctl. DO NOT EDIT.
// goctl 1.10.2
// Source: lonelog.proto
package lonelogClient
import (
"context"
"lone-services/rpc/lonelog/pb"
"github.com/zeromicro/go-zero/zrpc"
"google.golang.org/grpc"
)
type (
ActionLog = lonelog.ActionLog
ItemsLoginRequest = lonelog.ItemsLoginRequest
ItemsRequest = lonelog.ItemsRequest
LoginLog = lonelog.LoginLog
Response = lonelog.Response
Lonelog interface {
Items(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error)
LoginItems(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error)
ActionAdd(ctx context.Context, in *ActionLog, opts ...grpc.CallOption) (*Response, error)
LoginAdd(ctx context.Context, in *LoginLog, opts ...grpc.CallOption) (*Response, error)
}
defaultLonelog struct {
cli zrpc.Client
}
)
func NewLonelog(cli zrpc.Client) Lonelog {
return &defaultLonelog{
cli: cli,
}
}
func (m *defaultLonelog) Items(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error) {
client := lonelog.NewLonelogClient(m.cli.Conn())
return client.Items(ctx, in, opts...)
}
func (m *defaultLonelog) LoginItems(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error) {
client := lonelog.NewLonelogClient(m.cli.Conn())
return client.LoginItems(ctx, in, opts...)
}
func (m *defaultLonelog) ActionAdd(ctx context.Context, in *ActionLog, opts ...grpc.CallOption) (*Response, error) {
client := lonelog.NewLonelogClient(m.cli.Conn())
return client.ActionAdd(ctx, in, opts...)
}
func (m *defaultLonelog) LoginAdd(ctx context.Context, in *LoginLog, opts ...grpc.CallOption) (*Response, error) {
client := lonelog.NewLonelogClient(m.cli.Conn())
return client.LoginAdd(ctx, in, opts...)
}
@@ -8,15 +8,16 @@ import (
"lone-services/pkg/mysql"
"lone-services/pkg/utils"
"lone-services/pkg/validate"
lonelog "lone-services/rpc/lonelog/pb"
"lone-services/services/record/internal/config"
"lone-services/services/record/internal/server"
"lone-services/rpc/record/pb"
service2 "lone-services/services/record/internal/service"
"lone-services/services/record/internal/svc"
"net"
"os"
"strconv"
"lone-services/services/record/internal/config"
"lone-services/services/record/internal/server"
"lone-services/services/record/internal/svc"
"github.com/zeromicro/go-zero/core/conf"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/core/service"
@@ -25,7 +26,7 @@ import (
"google.golang.org/grpc/reflection"
)
var configFile = flag.String("f", "etc/lonelog.yaml", "the config file")
var configFile = flag.String("f", "etc/record.yaml", "the config file")
func main() {
flag.Parse()
@@ -130,7 +131,7 @@ func main() {
ctx := svc.NewServiceContext(c, db)
s := zrpc.MustNewServer(rpcConf, func(grpcServer *grpc.Server) {
lonelog.RegisterLonelogServer(grpcServer, server.NewLonelogServer(ctx))
record.RegisterRecordServer(grpcServer, server.NewRecordServer(ctx))
if mode == service.DevMode || mode == service.TestMode {
reflection.Register(grpcServer)
}
+59
View File
@@ -0,0 +1,59 @@
// Code generated by goctl. DO NOT EDIT.
// goctl 1.10.2
// Source: record.proto
package recordClient
import (
"context"
"lone-services/rpc/record/pb"
"github.com/zeromicro/go-zero/zrpc"
"google.golang.org/grpc"
)
type (
ActionLog = record.ActionLog
ItemsLoginRequest = record.ItemsLoginRequest
ItemsRequest = record.ItemsRequest
LoginLog = record.LoginLog
Response = record.Response
Record interface {
Items(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error)
LoginItems(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error)
ActionAdd(ctx context.Context, in *ActionLog, opts ...grpc.CallOption) (*Response, error)
LoginAdd(ctx context.Context, in *LoginLog, opts ...grpc.CallOption) (*Response, error)
}
defaultRecord struct {
cli zrpc.Client
}
)
func NewRecord(cli zrpc.Client) Record {
return &defaultRecord{
cli: cli,
}
}
func (m *defaultRecord) Items(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error) {
client := record.NewRecordClient(m.cli.Conn())
return client.Items(ctx, in, opts...)
}
func (m *defaultRecord) LoginItems(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error) {
client := record.NewRecordClient(m.cli.Conn())
return client.LoginItems(ctx, in, opts...)
}
func (m *defaultRecord) ActionAdd(ctx context.Context, in *ActionLog, opts ...grpc.CallOption) (*Response, error) {
client := record.NewRecordClient(m.cli.Conn())
return client.ActionAdd(ctx, in, opts...)
}
func (m *defaultRecord) LoginAdd(ctx context.Context, in *LoginLog, opts ...grpc.CallOption) (*Response, error) {
client := record.NewRecordClient(m.cli.Conn())
return client.LoginAdd(ctx, in, opts...)
}