From 38a8a5cafbe346d76b85a85be82cc3fcc65b9ab5 Mon Sep 17 00:00:00 2001 From: gjs Date: Sat, 8 Aug 2026 16:06:36 +0800 Subject: [PATCH] admin add edit status password items info --- .gitignore | 3 +- admin/admin/admin.pb.go | 92 ++++----- admin/admin/admin_grpc.pb.go | 40 +--- admin/etc/admin.yaml | 4 +- admin/internal/dao/admin.go | 22 +- admin/internal/dao/authority.go | 8 +- admin/internal/dao/login.go | 22 ++ admin/internal/dao/role.go | 8 +- admin/internal/dao/servers.go | 17 +- admin/internal/logic/adminaddlogic.go | 125 ----------- admin/internal/logic/admineditlogic.go | 99 ++++++++- admin/internal/logic/admininfologic.go | 41 +++- admin/internal/logic/adminitemslogic.go | 100 ++++++++- admin/internal/logic/adminloginlogic.go | 72 ++++++- admin/internal/logic/adminstatuslogic.go | 38 +++- admin/internal/logic/base.go | 28 ++- admin/internal/logic/passwordlogic.go | 38 +++- admin/internal/model/authority.go | 24 +++ admin/internal/model/role.go | 24 +++ admin/internal/model/services.go | 24 +++ admin/internal/server/adminserver.go | 5 - admin/proto/admin.proto | 55 +++-- admin/validator/validator.go | 31 ++- bff/etc/admin.pb | Bin 15179 -> 14709 bytes pkg/go.mod | 19 +- pkg/go.sum | 251 +---------------------- pkg/modelbase/base.go | 3 +- pkg/utils/config.go | 6 +- pkg/utils/encrypt.go | 2 +- pkg/utils/status.go | 33 ++- 30 files changed, 655 insertions(+), 579 deletions(-) create mode 100644 admin/internal/dao/login.go delete mode 100644 admin/internal/logic/adminaddlogic.go create mode 100644 admin/internal/model/authority.go create mode 100644 admin/internal/model/role.go create mode 100644 admin/internal/model/services.go diff --git a/.gitignore b/.gitignore index 2fac70b..a7fa598 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,6 @@ deploy/redis/data **/logs/ deploy/docker-compose.override.yml -fresh.conf +runner.conf +Dockerfile.dev */tmp \ No newline at end of file diff --git a/admin/admin/admin.pb.go b/admin/admin/admin.pb.go index 1e5a6fb..58dc8cf 100644 --- a/admin/admin/admin.pb.go +++ b/admin/admin/admin.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.36.11 -// protoc v3.19.4 +// protoc v4.25.8 // source: proto/admin.proto package admin @@ -10,7 +10,6 @@ import ( _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" - anypb "google.golang.org/protobuf/types/known/anypb" reflect "reflect" sync "sync" unsafe "unsafe" @@ -179,7 +178,7 @@ type Response struct { state protoimpl.MessageState `protogen:"open.v1"` Code int32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Data *anypb.Any `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` + Data string `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -228,11 +227,11 @@ func (x *Response) GetMsg() string { return "" } -func (x *Response) GetData() *anypb.Any { +func (x *Response) GetData() string { if x != nil { return x.Data } - return nil + return "" } type PasswordRequest struct { @@ -461,8 +460,8 @@ func (x *AdminItemsRequest) GetStatus() int32 { type AdminLoginRequest struct { state protoimpl.MessageState `protogen:"open.v1"` - Username int32 `protobuf:"varint,1,opt,name=username,proto3" json:"username,omitempty"` - Password int32 `protobuf:"varint,2,opt,name=password,proto3" json:"password,omitempty"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + Password string `protobuf:"bytes,2,opt,name=password,proto3" json:"password,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -497,25 +496,25 @@ func (*AdminLoginRequest) Descriptor() ([]byte, []int) { return file_proto_admin_proto_rawDescGZIP(), []int{7} } -func (x *AdminLoginRequest) GetUsername() int32 { +func (x *AdminLoginRequest) GetUsername() string { if x != nil { return x.Username } - return 0 + return "" } -func (x *AdminLoginRequest) GetPassword() int32 { +func (x *AdminLoginRequest) GetPassword() string { if x != nil { return x.Password } - return 0 + return "" } var File_proto_admin_proto protoreflect.FileDescriptor const file_proto_admin_proto_rawDesc = "" + "\n" + - "\x11proto/admin.proto\x12\x05admin\x1a\x19google/protobuf/any.proto\x1a\x1cgoogle/api/annotations.proto\"\xac\x01\n" + + "\x11proto/admin.proto\x12\x05admin\x1a\x1cgoogle/api/annotations.proto\"\xac\x01\n" + "\x10AdminEditRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x12\n" + "\x04name\x18\x02 \x01(\tR\x04name\x12\x1a\n" + @@ -527,11 +526,11 @@ const file_proto_admin_proto_rawDesc = "" + "\rStatusRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x16\n" + "\x06status\x18\x02 \x01(\x05R\x06status\x12\x16\n" + - "\x06reason\x18\x03 \x01(\tR\x06reason\"Z\n" + + "\x06reason\x18\x03 \x01(\tR\x06reason\"D\n" + "\bResponse\x12\x12\n" + "\x04code\x18\x01 \x01(\x05R\x04code\x12\x10\n" + - "\x03msg\x18\x02 \x01(\tR\x03msg\x12(\n" + - "\x04data\x18\x03 \x01(\v2\x14.google.protobuf.AnyR\x04data\"=\n" + + "\x03msg\x18\x02 \x01(\tR\x03msg\x12\x12\n" + + "\x04data\x18\x03 \x01(\tR\x04data\"=\n" + "\x0fPasswordRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\bpassword\x18\x02 \x01(\tR\bpassword\"0\n" + @@ -547,19 +546,18 @@ const file_proto_admin_proto_rawDesc = "" + "\x05email\x18\x06 \x01(\tR\x05email\x12\x16\n" + "\x06status\x18\a \x01(\x05R\x06status\"K\n" + "\x11AdminLoginRequest\x12\x1a\n" + - "\busername\x18\x01 \x01(\x05R\busername\x12\x1a\n" + - "\bpassword\x18\x02 \x01(\x05R\bpassword2\xe3\x03\n" + - "\x05Admin\x12T\n" + - "\bAdminAdd\x12\x17.admin.AdminEditRequest\x1a\x0f.admin.Response\"\x1e\x82\xd3\xe4\x93\x02\x18:\x01*\"\x13/admin/v3/admin/add\x125\n" + - "\tAdminEdit\x12\x17.admin.AdminEditRequest\x1a\x0f.admin.Response\x124\n" + - "\vAdminStatus\x12\x14.admin.StatusRequest\x1a\x0f.admin.Response\x123\n" + - "\bPassword\x12\x16.admin.PasswordRequest\x1a\x0f.admin.Response\x129\n" + - "\vOwnPassword\x12\x19.admin.OwnPasswordRequest\x1a\x0f.admin.Response\x125\n" + - "\tAdminInfo\x12\x17.admin.AdminInfoRequest\x1a\x0f.admin.Response\x127\n" + + "\busername\x18\x01 \x01(\tR\busername\x12\x1a\n" + + "\bpassword\x18\x02 \x01(\tR\bpassword2\xfe\x04\n" + + "\x05Admin\x12V\n" + + "\tAdminEdit\x12\x17.admin.AdminEditRequest\x1a\x0f.admin.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\"\x14/admin/v3/admin/edit\x12W\n" + + "\vAdminStatus\x12\x14.admin.StatusRequest\x1a\x0f.admin.Response\"!\x82\xd3\xe4\x93\x02\x1b:\x01*\"\x16/admin/v3/admin/status\x12X\n" + + "\bPassword\x12\x16.admin.PasswordRequest\x1a\x0f.admin.Response\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/admin/v3/admin/password\x12b\n" + + "\vOwnPassword\x12\x19.admin.OwnPasswordRequest\x1a\x0f.admin.Response\"'\x82\xd3\xe4\x93\x02!:\x01*\"\x1c/admin/v3/admin/own-password\x12V\n" + + "\tAdminInfo\x12\x17.admin.AdminInfoRequest\x1a\x0f.admin.Response\"\x1f\x82\xd3\xe4\x93\x02\x19:\x01*\x12\x14/admin/v3/admin/info\x12Y\n" + "\n" + - "AdminItems\x12\x18.admin.AdminItemsRequest\x1a\x0f.admin.Response\x127\n" + + "AdminItems\x12\x18.admin.AdminItemsRequest\x1a\x0f.admin.Response\" \x82\xd3\xe4\x93\x02\x1a:\x01*\x12\x15/admin/v3/admin/items\x12S\n" + "\n" + - "AdminLogin\x12\x18.admin.AdminLoginRequest\x1a\x0f.admin.ResponseB\tZ\a./adminb\x06proto3" + "AdminLogin\x12\x18.admin.AdminLoginRequest\x1a\x0f.admin.Response\"\x1a\x82\xd3\xe4\x93\x02\x14:\x01*\"\x0f/admin/v3/loginB\tZ\a./adminb\x06proto3" var ( file_proto_admin_proto_rawDescOnce sync.Once @@ -583,31 +581,27 @@ var file_proto_admin_proto_goTypes = []any{ (*AdminInfoRequest)(nil), // 5: admin.AdminInfoRequest (*AdminItemsRequest)(nil), // 6: admin.AdminItemsRequest (*AdminLoginRequest)(nil), // 7: admin.AdminLoginRequest - (*anypb.Any)(nil), // 8: google.protobuf.Any } var file_proto_admin_proto_depIdxs = []int32{ - 8, // 0: admin.Response.data:type_name -> google.protobuf.Any - 0, // 1: admin.Admin.AdminAdd:input_type -> admin.AdminEditRequest - 0, // 2: admin.Admin.AdminEdit:input_type -> admin.AdminEditRequest - 1, // 3: admin.Admin.AdminStatus:input_type -> admin.StatusRequest - 3, // 4: admin.Admin.Password:input_type -> admin.PasswordRequest - 4, // 5: admin.Admin.OwnPassword:input_type -> admin.OwnPasswordRequest - 5, // 6: admin.Admin.AdminInfo:input_type -> admin.AdminInfoRequest - 6, // 7: admin.Admin.AdminItems:input_type -> admin.AdminItemsRequest - 7, // 8: admin.Admin.AdminLogin:input_type -> admin.AdminLoginRequest - 2, // 9: admin.Admin.AdminAdd:output_type -> admin.Response - 2, // 10: admin.Admin.AdminEdit:output_type -> admin.Response - 2, // 11: admin.Admin.AdminStatus:output_type -> admin.Response - 2, // 12: admin.Admin.Password:output_type -> admin.Response - 2, // 13: admin.Admin.OwnPassword:output_type -> admin.Response - 2, // 14: admin.Admin.AdminInfo:output_type -> admin.Response - 2, // 15: admin.Admin.AdminItems:output_type -> admin.Response - 2, // 16: admin.Admin.AdminLogin:output_type -> admin.Response - 9, // [9:17] is the sub-list for method output_type - 1, // [1:9] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 0, // 0: admin.Admin.AdminEdit:input_type -> admin.AdminEditRequest + 1, // 1: admin.Admin.AdminStatus:input_type -> admin.StatusRequest + 3, // 2: admin.Admin.Password:input_type -> admin.PasswordRequest + 4, // 3: admin.Admin.OwnPassword:input_type -> admin.OwnPasswordRequest + 5, // 4: admin.Admin.AdminInfo:input_type -> admin.AdminInfoRequest + 6, // 5: admin.Admin.AdminItems:input_type -> admin.AdminItemsRequest + 7, // 6: admin.Admin.AdminLogin:input_type -> admin.AdminLoginRequest + 2, // 7: admin.Admin.AdminEdit:output_type -> admin.Response + 2, // 8: admin.Admin.AdminStatus:output_type -> admin.Response + 2, // 9: admin.Admin.Password:output_type -> admin.Response + 2, // 10: admin.Admin.OwnPassword:output_type -> admin.Response + 2, // 11: admin.Admin.AdminInfo:output_type -> admin.Response + 2, // 12: admin.Admin.AdminItems:output_type -> admin.Response + 2, // 13: admin.Admin.AdminLogin:output_type -> admin.Response + 7, // [7:14] is the sub-list for method output_type + 0, // [0:7] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name } func init() { file_proto_admin_proto_init() } diff --git a/admin/admin/admin_grpc.pb.go b/admin/admin/admin_grpc.pb.go index 7f3c8bb..43d80cd 100644 --- a/admin/admin/admin_grpc.pb.go +++ b/admin/admin/admin_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.6.2 -// - protoc v3.19.4 +// - protoc v4.25.8 // source: proto/admin.proto package admin @@ -19,7 +19,6 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - Admin_AdminAdd_FullMethodName = "/admin.Admin/AdminAdd" Admin_AdminEdit_FullMethodName = "/admin.Admin/AdminEdit" Admin_AdminStatus_FullMethodName = "/admin.Admin/AdminStatus" Admin_Password_FullMethodName = "/admin.Admin/Password" @@ -33,7 +32,6 @@ const ( // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type AdminClient interface { - AdminAdd(ctx context.Context, in *AdminEditRequest, opts ...grpc.CallOption) (*Response, error) AdminEdit(ctx context.Context, in *AdminEditRequest, opts ...grpc.CallOption) (*Response, error) AdminStatus(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*Response, error) Password(ctx context.Context, in *PasswordRequest, opts ...grpc.CallOption) (*Response, error) @@ -51,16 +49,6 @@ func NewAdminClient(cc grpc.ClientConnInterface) AdminClient { return &adminClient{cc} } -func (c *adminClient) AdminAdd(ctx context.Context, in *AdminEditRequest, opts ...grpc.CallOption) (*Response, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - out := new(Response) - err := c.cc.Invoke(ctx, Admin_AdminAdd_FullMethodName, in, out, cOpts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *adminClient) AdminEdit(ctx context.Context, in *AdminEditRequest, opts ...grpc.CallOption) (*Response, error) { cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(Response) @@ -135,7 +123,6 @@ func (c *adminClient) AdminLogin(ctx context.Context, in *AdminLoginRequest, opt // All implementations must embed UnimplementedAdminServer // for forward compatibility. type AdminServer interface { - AdminAdd(context.Context, *AdminEditRequest) (*Response, error) AdminEdit(context.Context, *AdminEditRequest) (*Response, error) AdminStatus(context.Context, *StatusRequest) (*Response, error) Password(context.Context, *PasswordRequest) (*Response, error) @@ -153,9 +140,6 @@ type AdminServer interface { // pointer dereference when methods are called. type UnimplementedAdminServer struct{} -func (UnimplementedAdminServer) AdminAdd(context.Context, *AdminEditRequest) (*Response, error) { - return nil, status.Error(codes.Unimplemented, "method AdminAdd not implemented") -} func (UnimplementedAdminServer) AdminEdit(context.Context, *AdminEditRequest) (*Response, error) { return nil, status.Error(codes.Unimplemented, "method AdminEdit not implemented") } @@ -198,24 +182,6 @@ func RegisterAdminServer(s grpc.ServiceRegistrar, srv AdminServer) { s.RegisterService(&Admin_ServiceDesc, srv) } -func _Admin_AdminAdd_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(AdminEditRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(AdminServer).AdminAdd(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: Admin_AdminAdd_FullMethodName, - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AdminServer).AdminAdd(ctx, req.(*AdminEditRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Admin_AdminEdit_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(AdminEditRequest) if err := dec(in); err != nil { @@ -349,10 +315,6 @@ var Admin_ServiceDesc = grpc.ServiceDesc{ ServiceName: "admin.Admin", HandlerType: (*AdminServer)(nil), Methods: []grpc.MethodDesc{ - { - MethodName: "AdminAdd", - Handler: _Admin_AdminAdd_Handler, - }, { MethodName: "AdminEdit", Handler: _Admin_AdminEdit_Handler, diff --git a/admin/etc/admin.yaml b/admin/etc/admin.yaml index 01d7477..93b4693 100644 --- a/admin/etc/admin.yaml +++ b/admin/etc/admin.yaml @@ -36,9 +36,9 @@ Mysql: # ReadDatabase: dms-admin BizRedis: - Host: "host.docker.internal" + Host: "39.106.171.204" Port: 6379 - Password: "admin20190227Redis" + Password: "lLMLcuPpzSj" DB: 0 AppLog: diff --git a/admin/internal/dao/admin.go b/admin/internal/dao/admin.go index f2f600f..43a1f29 100644 --- a/admin/internal/dao/admin.go +++ b/admin/internal/dao/admin.go @@ -44,22 +44,20 @@ type AdminStatus struct { // AdminInfo 管理员详情 type AdminInfo struct { - Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT;comment:ID" json:"id"` - Avatar string `gorm:"column:avatar;type:varchar(255);comment:头像" json:"avatar"` - Name string `gorm:"column:name;type:varchar(30);comment:真实姓名;NOT NULL" json:"name"` - Phone string `gorm:"column:phone;type:char(12);comment:电话" json:"phone"` - Status uint8 `gorm:"column:status;type:tinyint(1);default:1;comment:状态，1为正常，2为禁用;NOT NULL" json:"status"` - DepartmentId string `gorm:"column:department_id;type:varchar(255);default:0;comment:部门ID" json:"department_id"` - Email string `gorm:"column:email;type:varchar(255);comment:邮箱" json:"email"` - Roles string `gorm:"column:roles;type:varchar(255);comment:角色" json:"roles"` - LastTime utils.CustomTime `gorm:"column:last_time;type:datetime;comment:最后一次登录时间" json:"last_time"` - FailNumber int `gorm:"column:fail_number;type:tinyint(2);default:0;comment:连续登录失败次数" json:"fail_number"` + Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT;comment:ID" json:"id"` + Avatar string `gorm:"column:avatar;type:varchar(255);comment:头像" json:"avatar"` + Name string `gorm:"column:name;type:varchar(30);comment:真实姓名;NOT NULL" json:"name"` + Phone string `gorm:"column:phone;type:char(12);comment:电话" json:"phone"` + Status uint8 `gorm:"column:status;type:tinyint(1);default:1;comment:状态，1为正常，2为禁用;NOT NULL" json:"status"` + Email string `gorm:"column:email;type:varchar(255);comment:邮箱" json:"email"` + Roles string `gorm:"column:roles;type:varchar(255);comment:角色" json:"roles"` + LastTime utils.CustomTime `gorm:"column:last_time;type:datetime;comment:最后一次登录时间" json:"last_time"` + FailNumber int `gorm:"column:fail_number;type:tinyint(2);default:0;comment:连续登录失败次数" json:"fail_number"` } type AdminInfoRet struct { AdminInfo - Roles []int `json:"roles"` - DepartmentId []int `json:"department_id"` + Roles []int `json:"roles"` } type AdminItemsRet struct { diff --git a/admin/internal/dao/authority.go b/admin/internal/dao/authority.go index 0d91ca5..c260e97 100644 --- a/admin/internal/dao/authority.go +++ b/admin/internal/dao/authority.go @@ -25,7 +25,7 @@ type Authority struct { ParentIds string `gorm:"column:parent_ids;type:varchar(255);comment:多级父级菜单;NOT NULL" json:"parent_ids"` Level uint8 `gorm:"column:level;type:tinyint(2);default:0;comment:级别;NOT NULL" json:"level"` Type uint8 `gorm:"column:type;type:tinyint(2);comment:类型，1目录，2页面，3按钮;NOT NULL" json:"type"` - ProjectId int `gorm:"column:project_id;type:int(11);comment:项目ID;NOT NULL" json:"project_id"` + ServiceId int `gorm:"column:service_id;type:int(11);comment:项目ID;NOT NULL" json:"service_id"` Path string `gorm:"column:path;type:varchar(255);comment:页面请求地址;NOT NULL" json:"path"` Api string `gorm:"column:api;type:varchar(255);comment:接口地址" json:"api"` ViewPath string `gorm:"column:view_path;type:varchar(255);comment:页面文件路径" json:"view_path"` @@ -51,7 +51,7 @@ type AuthorityStatus struct { Id int `json:"id"` Status uint8 `json:"status"` Reason string `gorm:"column:reason;type:varchar(255);comment:原因" json:"reason"` - ProjectId int `gorm:"column:project_id;type:int(11);comment:项目ID;NOT NULL" json:"project_id"` + ServiceId int `gorm:"column:service_id;type:int(11);comment:项目ID;NOT NULL" json:"service_id"` AdminId int `json:"admin_id"` AdminName string `gorm:"column:admin_name;type:varchar(100);comment:操作人姓名" json:"admin_name"` UpdateTime utils.CustomTime `gorm:"column:update_time;type:datetime;default:NULL;comment:更新时间" json:"update_time"` @@ -70,7 +70,7 @@ type AuthorityItems struct { ParentIds string `json:"parent_ids"` Level uint8 `json:"level"` Type uint8 `json:"type"` - ProjectId int `json:"project_id"` + ServiceId int `json:"service_id"` Path string `json:"path"` Api string `json:"api"` ViewPath string `json:"view_path"` @@ -140,7 +140,7 @@ type AuthorityInfoNew struct { type AuthoritySort struct { Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT;comment:ID" json:"id"` ParentId int `gorm:"column:parent_id;type:int(11);default:0;comment:父级菜单;NOT NULL" json:"parent_id"` - ProjectId int `gorm:"column:project_id;type:int(11);comment:项目ID;NOT NULL" json:"project_id"` + ServiceId int `gorm:"column:service_id;type:int(11);comment:项目ID;NOT NULL" json:"service_id"` Sort uint8 `gorm:"column:sort;type:smallint(3);default:1;comment:排序" json:"sort"` AdminId int `gorm:"column:admin_id;type:int(11);comment:操作人ID" json:"admin_id"` AdminName string `gorm:"column:admin_name;type:varchar(255);comment:操作人员姓名" json:"admin_name"` diff --git a/admin/internal/dao/login.go b/admin/internal/dao/login.go new file mode 100644 index 0000000..de67e26 --- /dev/null +++ b/admin/internal/dao/login.go @@ -0,0 +1,22 @@ +package dao + +import ( + "github.com/golang-jwt/jwt/v4" + "pkg.local/utils" +) + +type JwtInfo struct { + Id int64 `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` + Avatar string `gorm:"column:avatar;type:varchar(255);comment:头像" json:"avatar"` + Name string `gorm:"column:name;type:varchar(30);comment:真实姓名;NOT NULL" json:"name"` + Phone string `gorm:"column:phone;type:char(12);comment:电话" json:"phone"` + Email string `gorm:"column:email;type:varchar(255);comment:邮箱" json:"email"` + Roles string `gorm:"column:roles;type:varchar(255);comment:角色" json:"roles"` + LastTime utils.CustomTime `gorm:"column:last_time;type:datetime;comment:最后一次登录时间" json:"last_time"` + Time int `json:"time"` + jwt.RegisteredClaims +} + +type Token struct { + Token string `json:"token"` +} diff --git a/admin/internal/dao/role.go b/admin/internal/dao/role.go index 129a64c..19fa01f 100644 --- a/admin/internal/dao/role.go +++ b/admin/internal/dao/role.go @@ -6,7 +6,7 @@ import "pkg.local/utils" type Role struct { Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT;comment:ID" json:"id"` Name string `gorm:"column:name;type:varchar(255);comment:名称;NOT NULL" json:"name"` - ProjectId int `gorm:"column:project_id;type:int(11);comment:项目ID;NOT NULL" json:"project_id"` + ServiceId int `gorm:"column:service_id;type:int(11);comment:项目ID;NOT NULL" json:"service_id"` Status uint8 `gorm:"column:status;type:tinyint(1);default:1;comment:状态，1为正常，2为禁用;NOT NULL" json:"status"` Rules string `gorm:"column:rules;type:text;comment:权限内容" json:"rules"` Reason string `gorm:"column:reason;type:varchar(255);comment:原因" json:"reason"` @@ -43,10 +43,10 @@ type RoleItems struct { type RoleNameItems struct { Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` Name string `gorm:"column:name;type:varchar(255);comment:项目描述;NOT NULL" json:"name"` - ProjectId int `json:"project_id"` + ServiceId int `json:"service_id"` } -type RoleProjectNameItems struct { +type RoleServiceNameItems struct { Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` Name string `gorm:"column:name;type:varchar(255);comment:项目描述;NOT NULL" json:"name"` Items []RoleNameItems `json:"items"` @@ -61,7 +61,7 @@ type RoleRulesItems struct { type RoleInfo struct { Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT;comment:ID" json:"id"` Name string `gorm:"column:name;type:varchar(255);comment:名称;NOT NULL" json:"name"` - ProjectId int `gorm:"column:project_id;type:int(11);comment:项目ID;NOT NULL" json:"project_id"` + ServiceId int `gorm:"column:service_id;type:int(11);comment:项目ID;NOT NULL" json:"service_id"` Status uint8 `gorm:"column:status;type:tinyint(1);default:1;comment:状态，1为正常，2为禁用;NOT NULL" json:"status"` Rules []int `gorm:"column:rules;type:text;comment:权限内容" json:"rules"` Reason string `gorm:"column:reason;type:varchar(255);comment:原因" json:"reason"` diff --git a/admin/internal/dao/servers.go b/admin/internal/dao/servers.go index 20286f7..2f887fe 100644 --- a/admin/internal/dao/servers.go +++ b/admin/internal/dao/servers.go @@ -2,13 +2,12 @@ package dao import "pkg.local/utils" -// Project 项目表 -type Project struct { +// Services 项目表 +type Services struct { Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` Name string `gorm:"column:name;type:varchar(255);comment:项目描述;NOT NULL" json:"name"` Status uint8 `gorm:"column:status;type:tinyint(1);default:1;comment:状态，1为正常，2为禁用;NOT NULL" json:"status"` Remarks string `gorm:"column:remarks;type:varchar(255);default:'';comment:描述;NOT NULL" json:"remarks"` - Logo string `gorm:"column:logo;type:varchar(255);default:'';comment:logo;NOT NULL" json:"logo"` Reason string `gorm:"column:reason;type:varchar(255);comment:原因" json:"reason"` AdminId int `gorm:"column:admin_id;type:int(11);comment:操作人员ID" json:"admin_id"` AdminName string `gorm:"column:admin_name;type:varchar(255);comment:操作人员姓名" json:"admin_name"` @@ -16,13 +15,13 @@ type Project struct { UpdateTime utils.CustomTime `gorm:"column:update_time;type:datetime" json:"update_time"` } -type ProjectItems struct { - Items []Project `json:"items"` - Count int64 `json:"count"` +type ServicesItems struct { + Items []Services `json:"items"` + Count int64 `json:"count"` } -// ProjectStatus 修改状态 -type ProjectStatus struct { +// ServicesStatus 修改状态 +type ServicesStatus struct { Id int `json:"id"` Status uint8 `json:"status"` Reason string `gorm:"column:reason;type:varchar(255);comment:原因" json:"reason"` @@ -31,7 +30,7 @@ type ProjectStatus struct { UpdateTime utils.CustomTime `gorm:"column:update_time;type:datetime" json:"update_time"` } -type ProjectNameItems struct { +type ServicesNameItems struct { Id int `gorm:"column:id;type:int(11);primary_key;AUTO_INCREMENT" json:"id"` Name string `gorm:"column:name;type:varchar(255);comment:项目描述;NOT NULL" json:"name"` Logo string `gorm:"column:logo;type:varchar(255);default:'';comment:logo;NOT NULL" json:"logo"` diff --git a/admin/internal/logic/adminaddlogic.go b/admin/internal/logic/adminaddlogic.go deleted file mode 100644 index 0d55e4d..0000000 --- a/admin/internal/logic/adminaddlogic.go +++ /dev/null @@ -1,125 +0,0 @@ -package logic - -import ( - "admin/admin" - "admin/internal/dao" - "admin/internal/model" - "admin/internal/svc" - "admin/validator" - "context" - "fmt" - "strconv" - "strings" - - "github.com/zeromicro/go-zero/core/logx" - "pkg.local/modelbase" - "pkg.local/utils" -) - -type AdminAddLogic struct { - ctx context.Context - svcCtx *svc.ServiceContext - logx.Logger - BaseLogic -} - -func NewAdminAddLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminAddLogic { - return &AdminAddLogic{ - ctx: ctx, - svcCtx: svcCtx, - Logger: logx.WithContext(ctx), - } -} - -func (l *AdminAddLogic) AdminAdd(in *admin.AdminEditRequest) (*admin.Response, error) { - var v validator.AdminEditValidator - if fail := l.checkParams(in, &v); fail != nil { - return fail, nil - } - - encryPhone, cErr := utils.EncryptPhone(in.Phone) - if cErr != nil { - l.Logger.Error(cErr) - return l.fail(utils.ErrorEncryptAesError), nil - } - - info, check := l.checkPhone(encryPhone) - if !check { - return l.fail(utils.ErrorEncryptAesError), nil - } - modelObj := model.AdminModel{}.Init() - if in.Id > utils.NumberZero && info.Id < utils.NumberOne { - w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}} - info = dao.Admin{} - err := modelObj.GetOne(w, &info) - if err != nil { - l.Logger.Error(cErr) - return l.fail(utils.Fail), nil - - } - if info.Id < utils.NumberZero { - return l.fail(utils.ErrorNotFund), nil - } - } - //编辑 - if in.Id > utils.NumberZero { - if info.Id < utils.NumberOne { - return l.fail(utils.ErrorNotFund), nil - } - if info.Id != in.Id { - return l.fail(utils.ErrorExistUser), nil - } - } else { - if len(in.Password) < utils.NumberOne { - return l.out(utils.ErrorParams, "密码不能为空"), nil - - } - if info.Id > utils.NumberZero { - return l.fail(utils.ErrorExistUser), nil - } - } - //adminId, _ := c.Get(utils.USERID) - //adminName, _ := c.Get(utils.USERNAME) - var roles []string - if len(in.Roles) > utils.NumberZero { - for _, role := range in.Roles { - roles = append(roles, strconv.Itoa(int(role))) - } - } - - info.Name = in.Name - info.Phone = encryPhone - info.Roles = strings.Join(roles, ",") - info.Email = in.Email - info.Avatar = in.Avatar - var err error - if info.Id > utils.NumberZero { - w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(info.Id))}} - _, err = modelObj.Edit(w, info) - } else { - salt := utils.GetRandstring(utils.NumberFive) - pwd := fmt.Sprintf("%s%s", salt, in.Password) - pwd, _ = utils.EncryptPassword(pwd) - info.Password = pwd - info.Salt = salt - err = modelObj.Init().Create(&info) - } - - if err != nil { - l.Logger.Error(err) - return l.fail(utils.Fail), nil - } - return l.ok(info.Id), nil -} - -func (l *AdminAddLogic) checkPhone(phone string) (dao.Admin, bool) { - w := modelbase.Params{Eq: map[string]string{"phone": phone}} - info := dao.Admin{} - err := model.AdminModel{}.Init().GetOne(w, &info) - if err != nil { - l.Logger.Error(err) - return info, false - } - - return info, true -} diff --git a/admin/internal/logic/admineditlogic.go b/admin/internal/logic/admineditlogic.go index b52cf63..2ffe51f 100644 --- a/admin/internal/logic/admineditlogic.go +++ b/admin/internal/logic/admineditlogic.go @@ -1,18 +1,26 @@ package logic import ( + "admin/internal/dao" + "admin/internal/model" + "admin/validator" "context" + "strconv" + "strings" "admin/admin" "admin/internal/svc" "github.com/zeromicro/go-zero/core/logx" + "pkg.local/modelbase" + "pkg.local/utils" ) type AdminEditLogic struct { ctx context.Context svcCtx *svc.ServiceContext logx.Logger + BaseLogic } func NewAdminEditLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminEditLogic { @@ -24,7 +32,94 @@ func NewAdminEditLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminEd } func (l *AdminEditLogic) AdminEdit(in *admin.AdminEditRequest) (*admin.Response, error) { - // todo: add your logic here and delete this line + var v validator.AdminEditValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } - return &admin.Response{}, nil + encryPhone, cErr := utils.EncryptPhone(in.Phone) + if cErr != nil { + l.Logger.Error(cErr) + return l.fail(utils.ErrorEncryptAesError), nil + } + + info, check := l.checkPhone(encryPhone) + if !check { + return l.fail(utils.ErrorEncryptAesError), nil + } + modelObj := model.AdminModel{}.Init() + if in.Id > utils.NumberZero && info.Id < utils.NumberOne { + w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}} + info = dao.Admin{} + err := modelObj.GetOne(w, &info) + if err != nil { + l.Logger.Error(cErr) + return l.fail(utils.Fail), nil + + } + if info.Id < utils.NumberZero { + return l.fail(utils.ErrorNotFund), nil + } + } + //编辑 + if in.Id > utils.NumberZero { + if info.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund), nil + } + if info.Id != in.Id { + return l.fail(utils.ErrorExistUser), nil + } + } else { + if len(in.Password) < utils.NumberOne { + return l.out(utils.ErrorParams, "密码不能为空"), nil + + } + if info.Id > utils.NumberZero { + return l.fail(utils.ErrorExistUser), nil + } + } + //adminId, _ := c.Get(utils.USERID) + //adminName, _ := c.Get(utils.USERNAME) + var roles []string + if len(in.Roles) > utils.NumberZero { + for _, role := range in.Roles { + roles = append(roles, strconv.Itoa(int(role))) + } + } + + info.Name = in.Name + info.Phone = encryPhone + info.Roles = strings.Join(roles, utils.DecollatorComma) + info.Email = in.Email + info.Avatar = in.Avatar + var err error + if info.Id > utils.NumberZero { + w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(info.Id))}} + _, err = modelObj.Edit(w, info) + } else { + salt := utils.GetRandstring(utils.NumberFive) + pwd := utils.GetSaltPassword(salt, in.Password) + pwd, _ = utils.EncryptPassword(pwd) + info.Password = pwd + info.Salt = salt + err = modelObj.Init().Create(&info) + } + + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail), nil + } + return l.ok(info.Id), nil +} + +func (l *AdminEditLogic) checkPhone(phone string) (dao.Admin, bool) { + w := modelbase.Params{Eq: map[string]string{"phone": phone}} + info := dao.Admin{} + err := model.AdminModel{}.Init().GetOne(w, &info) + if err != nil { + l.Logger.Error(err) + return info, false + } + + return info, true } diff --git a/admin/internal/logic/admininfologic.go b/admin/internal/logic/admininfologic.go index 674437c..a61925d 100644 --- a/admin/internal/logic/admininfologic.go +++ b/admin/internal/logic/admininfologic.go @@ -1,18 +1,26 @@ package logic import ( + "admin/internal/dao" + "admin/internal/model" + "admin/validator" "context" + "strconv" + "strings" "admin/admin" "admin/internal/svc" "github.com/zeromicro/go-zero/core/logx" + "pkg.local/modelbase" + "pkg.local/utils" ) type AdminInfoLogic struct { ctx context.Context svcCtx *svc.ServiceContext logx.Logger + BaseLogic } func NewAdminInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminInfoLogic { @@ -24,7 +32,36 @@ func NewAdminInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminIn } func (l *AdminInfoLogic) AdminInfo(in *admin.AdminInfoRequest) (*admin.Response, error) { - // todo: add your logic here and delete this line + var v validator.AdminInfoValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } - return &admin.Response{}, nil + info := dao.AdminInfo{} + modelObj := model.AdminModel{}.Init() + w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}} + err := modelObj.GetOne(w, &info) + if err != nil { + + } + if info.Id > utils.NumberZero { + mobile, dErr := utils.DecryptPhone(info.Phone) + if dErr == nil { + info.Phone = mobile + } + } + + var roles []int + if len(roles) > utils.NumberZero { + for _, role := range strings.Split(info.Roles, utils.DecollatorComma) { + r, _ := strconv.Atoi(role) + roles = append(roles, r) + } + } + retData := dao.AdminInfoRet{ + AdminInfo: info, + Roles: roles, + } + + return l.ok(retData), nil } diff --git a/admin/internal/logic/adminitemslogic.go b/admin/internal/logic/adminitemslogic.go index 77a69bc..2c7166d 100644 --- a/admin/internal/logic/adminitemslogic.go +++ b/admin/internal/logic/adminitemslogic.go @@ -1,18 +1,25 @@ package logic import ( + "admin/internal/dao" + "admin/internal/model" "context" + "strconv" + "strings" "admin/admin" "admin/internal/svc" "github.com/zeromicro/go-zero/core/logx" + "pkg.local/modelbase" + "pkg.local/utils" ) type AdminItemsLogic struct { ctx context.Context svcCtx *svc.ServiceContext logx.Logger + BaseLogic } func NewAdminItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminItemsLogic { @@ -24,7 +31,96 @@ func NewAdminItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminI } func (l *AdminItemsLogic) AdminItems(in *admin.AdminItemsRequest) (*admin.Response, error) { - // todo: add your logic here and delete this line + modelObj := model.AdminModel{}.Init() + w := modelbase.Params{ + Page: int(in.Page), + Size: int(in.Size), + Order: "id desc", + } - return &admin.Response{}, nil + w.Like = make(map[string]string) + eq := make(map[string]string) + if len(in.Name) > utils.NumberZero { + w.Like["name LIKE ? "] = "%%" + in.Name + "%%" + } + if len(in.Phone) > utils.NumberZero { + phone := utils.GetSearchPhone(in.Phone) + if len(phone) > utils.NumberZero { + w.Like["phone LIKE ? "] = "%%" + phone + "%%" + } + } + if len(in.Email) > utils.NumberZero { + w.Like["email LIKE ? "] = "%%" + in.Email + "%%" + } + if in.Status > utils.NumberZero { + eq["status"] = strconv.Itoa(int(in.Status)) + } + + if len(eq) > utils.NumberZero { + w.Eq = eq + } + + var data []dao.AdminInfo + var list []dao.AdminItemsRet + items, _ := modelObj.Page(w, &data) + roleInfos := l.getRoleInfos(data) + for _, item := range data { + var roles []dao.RoleNameItems + for _, role := range strings.Split(item.Roles, utils.DecollatorComma) { + if _, ok := roleInfos[role]; ok { + roles = append(roles, roleInfos[role]) + } + } + + mobile, dErr := utils.DecryptPhone(item.Phone) + if dErr == nil { + item.Phone = mobile + } + + list = append(list, dao.AdminItemsRet{ + AdminInfo: item, + RoleInfo: roles, + }) + } + items.Items = list + + return l.ok(items), nil +} + +func (l *AdminItemsLogic) getRoleInfos(data []dao.AdminInfo) map[string]dao.RoleNameItems { + var ids []string + for _, item := range data { + ids = append(ids, strings.Split(item.Roles, utils.DecollatorComma)...) + } + + w := modelbase.Params{In: map[string][]string{"id in ?": ids}} + var items []dao.RoleNameItems + retData := make(map[string]dao.RoleNameItems) + + err := model.RoleModel{}.Init().Items(w, &items) + if err != nil { + return retData + } + + w = modelbase.Params{} + var serversItems []dao.ServicesNameItems + pErr := model.ServicesModel{}.Init().Items(w, &serversItems) + serverIds := make(map[int]string) + if pErr == nil { + for _, item := range serversItems { + serverIds[item.Id] = item.Name + } + } + for i := utils.NumberZero; i < len(items); i++ { + serverName := utils.StringEmpty + if _, ok := serverIds[items[i].ServiceId]; ok { + serverName = serverIds[items[i].ServiceId] + utils.DecollatorColon + } + retData[strconv.Itoa(items[i].Id)] = dao.RoleNameItems{ + Id: items[i].Id, + Name: serverName + items[i].Name, + } + } + + return retData } diff --git a/admin/internal/logic/adminloginlogic.go b/admin/internal/logic/adminloginlogic.go index 1ce4fa7..2e15d1f 100644 --- a/admin/internal/logic/adminloginlogic.go +++ b/admin/internal/logic/adminloginlogic.go @@ -1,18 +1,23 @@ package logic import ( + "admin/admin" + "admin/internal/dao" + "admin/internal/model" + "admin/internal/svc" + "admin/validator" "context" - "admin/admin" - "admin/internal/svc" - "github.com/zeromicro/go-zero/core/logx" + "pkg.local/modelbase" + "pkg.local/utils" ) type AdminLoginLogic struct { ctx context.Context svcCtx *svc.ServiceContext logx.Logger + BaseLogic } func NewAdminLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminLoginLogic { @@ -24,7 +29,64 @@ func NewAdminLoginLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminL } func (l *AdminLoginLogic) AdminLogin(in *admin.AdminLoginRequest) (*admin.Response, error) { - // todo: add your logic here and delete this line + var v validator.LoginValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } - return &admin.Response{}, nil + phone, dErr := utils.DecryptPhone(in.Username) + if dErr != nil { + l.Logger.Error(dErr) + return l.fail(utils.Fail), nil + } + + var info dao.Admin + w := modelbase.Params{Eq: map[string]string{"phone": phone}} + modelObj := model.AdminModel{}.Init() + err := modelObj.GetOne(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail), nil + } + if info.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund), nil + } + + pwd := utils.GetSaltPassword(info.Salt, in.Password) + eq := utils.EqualsPassword(pwd, info.Password) + if !eq { + return l.fail(utils.ErrorPwdError), nil + } + + data := dao.JwtInfo{ + Id: info.Id, + Name: info.Name, + Email: info.Email, + Phone: info.Phone, + Avatar: info.Avatar, + Roles: info.Roles, + LastTime: utils.Now(), + } + retData := dao.Token{ + Token: utils.MD5Encrypt(data.Phone + utils.Now().String()), + } + + l.setLogin(retData.Token, data) + + return l.ok(retData), nil +} + +func (l *AdminLoginLogic) setLogin(token string, data dao.JwtInfo) { + //duration := utils.GetConfigInt("base.login_out_time") + //if data.Time > utils.NumberZero { + // duration = int(time.Minute * time.Duration(int64(data.Time))) + //} + //redisKey := utils.GetLoginKey(utils.LoginUser, token) + //userStr, _ := jsoniter.Marshal(data) + //redis.New().Set(redisKey, string(userStr), duration).Result() + //oldAuth, oldErr := utils.Redis.HGet(utils.GetRedisKey(utils.LoginUserKey), strconv.Itoa(data.Id)).Result() + //if oldErr == nil { + // utils.Redis.Del(utils.GetRedisKey(utils.LoginUser + oldAuth)).Result() + //} + //utils.Redis.HSet(utils.GetRedisKey(utils.LoginUserKey), strconv.Itoa(data.Id), token).Result() } diff --git a/admin/internal/logic/adminstatuslogic.go b/admin/internal/logic/adminstatuslogic.go index 15be1a1..1a4d54f 100644 --- a/admin/internal/logic/adminstatuslogic.go +++ b/admin/internal/logic/adminstatuslogic.go @@ -1,18 +1,25 @@ package logic import ( + "admin/internal/dao" + "admin/internal/model" + "admin/validator" "context" + "strconv" "admin/admin" "admin/internal/svc" "github.com/zeromicro/go-zero/core/logx" + "pkg.local/modelbase" + "pkg.local/utils" ) type AdminStatusLogic struct { ctx context.Context svcCtx *svc.ServiceContext logx.Logger + BaseLogic } func NewAdminStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminStatusLogic { @@ -24,7 +31,34 @@ func NewAdminStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Admin } func (l *AdminStatusLogic) AdminStatus(in *admin.StatusRequest) (*admin.Response, error) { - // todo: add your logic here and delete this line + var v validator.AdminStatusValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + var info dao.AdminStatus + w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}} + modelObj := model.AdminModel{}.Init() + err := modelObj.GetOne(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail), nil + } - return &admin.Response{}, nil + if info.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund), nil + } + + info.Status = uint8(in.Status) + info.Reason = in.Reason + info.UpdateTime = utils.Now() + //adminId, _ := c.Get(utils.USERID) + //adminName, _ := c.Get(utils.USERNAME) + //info.AdminId = adminId.(int) + //info.AdminName = adminName.(string) + _, editErr := modelObj.Edit(w, info) + if editErr != nil { + l.Logger.Error(editErr) + return l.fail(utils.Fail), nil + } + return l.ok(utils.NumberOne), nil } diff --git a/admin/internal/logic/base.go b/admin/internal/logic/base.go index 9ea58aa..7413964 100644 --- a/admin/internal/logic/base.go +++ b/admin/internal/logic/base.go @@ -2,6 +2,8 @@ package logic import ( "admin/admin" + "encoding/json" + "reflect" "pkg.local/utils" validateService "pkg.local/validate" @@ -10,22 +12,34 @@ import ( type BaseLogic struct { } -func (l *BaseLogic) checkParams(in *admin.AdminEditRequest, v validateService.IValidator) *admin.Response { +func (l *BaseLogic) checkParams(in interface{}, v validateService.IValidator) *admin.Response { + rv := reflect.ValueOf(in) + if rv.Kind() != reflect.Ptr || rv.IsNil() { + return &admin.Response{ + Code: utils.ErrorParams.Code, + Msg: "request must be non‑nil proto pointer", + } + } - if resp := validateService.ValidateFromProto(in, v); resp != utils.StringEmpty { - return &admin.Response{Code: utils.ErrorParams.Code, Msg: resp} + resp := validateService.ValidateFromProto(in, v) + if resp != utils.StringEmpty { + return &admin.Response{ + Code: utils.ErrorParams.Code, + Msg: resp, + } } return nil } -func (l *AdminAddLogic) fail(status utils.Status) *admin.Response { +func (l *BaseLogic) fail(status utils.Status) *admin.Response { return &admin.Response{Code: status.Code, Msg: status.Msg} } -func (l *AdminAddLogic) out(status utils.Status, msg string) *admin.Response { +func (l *BaseLogic) out(status utils.Status, msg string) *admin.Response { return &admin.Response{Code: status.Code, Msg: msg} } -func (l *AdminAddLogic) ok(data any) *admin.Response { - return &admin.Response{Code: utils.Ok.Code, Msg: utils.Ok.Msg} +func (l *BaseLogic) ok(data any) *admin.Response { + buf, _ := json.Marshal(data) + return &admin.Response{Code: utils.Ok.Code, Msg: utils.Ok.Msg, Data: string(buf)} } diff --git a/admin/internal/logic/passwordlogic.go b/admin/internal/logic/passwordlogic.go index ae98967..e080c26 100644 --- a/admin/internal/logic/passwordlogic.go +++ b/admin/internal/logic/passwordlogic.go @@ -1,18 +1,25 @@ package logic import ( + "admin/internal/dao" + "admin/internal/model" + "admin/validator" "context" + "strconv" "admin/admin" "admin/internal/svc" "github.com/zeromicro/go-zero/core/logx" + "pkg.local/modelbase" + "pkg.local/utils" ) type PasswordLogic struct { ctx context.Context svcCtx *svc.ServiceContext logx.Logger + BaseLogic } func NewPasswordLogic(ctx context.Context, svcCtx *svc.ServiceContext) *PasswordLogic { @@ -24,7 +31,34 @@ func NewPasswordLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Password } func (l *PasswordLogic) Password(in *admin.PasswordRequest) (*admin.Response, error) { - // todo: add your logic here and delete this line + var v validator.AdminPasswordValidator + if fail := l.checkParams(in, &v); fail != nil { + return fail, nil + } + var info dao.AdminPassword + w := modelbase.Params{Eq: map[string]string{"id": strconv.Itoa(int(in.Id))}} + modelObj := model.AdminModel{}.Init() + err := modelObj.GetOne(w, &info) + if err != nil { + l.Logger.Error(err) + return l.fail(utils.Fail), nil + } + if info.Id < utils.NumberOne { + return l.fail(utils.ErrorNotFund), nil + } - return &admin.Response{}, nil + pwd := utils.GetSaltPassword(info.Salt, in.Password) + pwd, _ = utils.EncryptPassword(pwd) + info.Password = pwd + info.UpdateTime = utils.Now() + //adminId, _ := c.Get(utils.USERID) + //adminName, _ := c.Get(utils.USERNAME) + //info.AdminId = adminId.(int) + //info.AdminName = adminName.(string) + _, editErr := modelObj.Edit(w, info) + if editErr != nil { + l.Logger.Error(err) + return l.fail(utils.Fail), nil + } + return l.ok(utils.NumberOne), nil } diff --git a/admin/internal/model/authority.go b/admin/internal/model/authority.go new file mode 100644 index 0000000..d796b9c --- /dev/null +++ b/admin/internal/model/authority.go @@ -0,0 +1,24 @@ +package model + +import ( + "admin/internal/dao" + + "pkg.local/modelbase" +) + +type AuthorityModel struct { + modelbase.Base +} + +func (m AuthorityModel) TableName() string { + return modelbase.Prefix() + "authority" +} + +func (m AuthorityModel) Init() AuthorityModel { + m.Table = m.TableName() + return m +} + +func (m AuthorityModel) Create(data *dao.Authority) error { + return m.Base.Create(data) +} diff --git a/admin/internal/model/role.go b/admin/internal/model/role.go new file mode 100644 index 0000000..7820513 --- /dev/null +++ b/admin/internal/model/role.go @@ -0,0 +1,24 @@ +package model + +import ( + "admin/internal/dao" + + "pkg.local/modelbase" +) + +type RoleModel struct { + modelbase.Base +} + +func (m RoleModel) TableName() string { + return modelbase.Prefix() + "role" +} + +func (m RoleModel) Init() RoleModel { + m.Table = m.TableName() + return m +} + +func (m RoleModel) Create(data *dao.Role) error { + return m.Base.Create(data) +} diff --git a/admin/internal/model/services.go b/admin/internal/model/services.go new file mode 100644 index 0000000..772c532 --- /dev/null +++ b/admin/internal/model/services.go @@ -0,0 +1,24 @@ +package model + +import ( + "admin/internal/dao" + + "pkg.local/modelbase" +) + +type ServicesModel struct { + modelbase.Base +} + +func (m ServicesModel) TableName() string { + return modelbase.Prefix() + "services" +} + +func (m ServicesModel) Init() ServicesModel { + m.Table = m.TableName() + return m +} + +func (m ServicesModel) Create(data *dao.Admin) error { + return m.Base.Create(data) +} diff --git a/admin/internal/server/adminserver.go b/admin/internal/server/adminserver.go index b16ddfb..71edd44 100644 --- a/admin/internal/server/adminserver.go +++ b/admin/internal/server/adminserver.go @@ -23,11 +23,6 @@ func NewAdminServer(svcCtx *svc.ServiceContext) *AdminServer { } } -func (s *AdminServer) AdminAdd(ctx context.Context, in *admin.AdminEditRequest) (*admin.Response, error) { - l := logic.NewAdminAddLogic(ctx, s.svcCtx) - return l.AdminAdd(in) -} - func (s *AdminServer) AdminEdit(ctx context.Context, in *admin.AdminEditRequest) (*admin.Response, error) { l := logic.NewAdminEditLogic(ctx, s.svcCtx) return l.AdminEdit(in) diff --git a/admin/proto/admin.proto b/admin/proto/admin.proto index 6b1d89a..69cc4f5 100644 --- a/admin/proto/admin.proto +++ b/admin/proto/admin.proto @@ -3,7 +3,6 @@ syntax = "proto3"; package admin; option go_package="./admin"; -import "google/protobuf/any.proto"; import "google/api/annotations.proto"; message AdminEditRequest { @@ -26,7 +25,7 @@ message StatusRequest { message Response { int32 code = 1; string msg = 2; - google.protobuf.Any data = 3; + string data = 3; } message PasswordRequest { @@ -52,23 +51,51 @@ message AdminItemsRequest { } message AdminLoginRequest { - int32 username = 1; - int32 password = 2; + string username = 1; + string password = 2; } service Admin { - rpc AdminAdd(AdminEditRequest) returns(Response){ + rpc AdminEdit(AdminEditRequest) returns(Response){ option (google.api.http) = { - post: "/admin/v3/admin/add" + post: "/admin/v3/admin/edit" + body: "*" + }; + }; + rpc AdminStatus(StatusRequest) returns(Response){ + option (google.api.http) = { + post: "/admin/v3/admin/status" + body: "*" + }; + }; + rpc Password(PasswordRequest) returns(Response){ + option (google.api.http) = { + post: "/admin/v3/admin/password" + body: "*" + }; + }; + rpc OwnPassword(OwnPasswordRequest) returns(Response){ + option (google.api.http) = { + post: "/admin/v3/admin/own-password" + body: "*" + }; + }; + rpc AdminInfo(AdminInfoRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/admin/info" + body: "*" + }; + }; + rpc AdminItems(AdminItemsRequest) returns(Response){ + option (google.api.http) = { + get: "/admin/v3/admin/items" + body: "*" + }; + }; + rpc AdminLogin(AdminLoginRequest) returns(Response){ + option (google.api.http) = { + post: "/admin/v3/login" body: "*" }; }; - - rpc AdminEdit(AdminEditRequest) returns(Response); - rpc AdminStatus(StatusRequest) returns(Response); - rpc Password(PasswordRequest) returns(Response); - rpc OwnPassword(OwnPasswordRequest) returns(Response); - rpc AdminInfo(AdminInfoRequest) returns(Response); - rpc AdminItems(AdminItemsRequest) returns(Response); - rpc AdminLogin(AdminLoginRequest) returns(Response); } \ No newline at end of file diff --git a/admin/validator/validator.go b/admin/validator/validator.go index 553d84c..ea3ee33 100644 --- a/admin/validator/validator.go +++ b/admin/validator/validator.go @@ -6,7 +6,7 @@ import ( // AdminEditValidator 创建/编辑 type AdminEditValidator struct { - Id int + Id64 int64 Name string `validate:"required"` Password string Avatar string @@ -28,7 +28,7 @@ func (p AdminEditValidator) GetMessage() validate.ValidatorMessages { // AdminPasswordValidator 修改所有管理员密码 type AdminPasswordValidator struct { - Id int `validate:"required"` + Id int64 `validate:"required"` Password string `validate:"required"` } @@ -54,7 +54,7 @@ func (p AdminOwnPasswordValidator) GetMessage() validate.ValidatorMessages { // AdminInfoValidator 查看信息 type AdminInfoValidator struct { - Id int `validate:"required"` + Id int64 `validate:"required"` } // GetMessage 查看信息 - 提示消息 @@ -66,13 +66,13 @@ func (p AdminInfoValidator) GetMessage() validate.ValidatorMessages { // AdminItemsValidator 查看列表 type AdminItemsValidator struct { - Page int - Size int + Page int32 + Size int32 Phone string Username string Name string Email string - Status uint8 + Status int32 } // GetMessage 查看列表 - 提示消息 @@ -82,9 +82,9 @@ func (p AdminItemsValidator) GetMessage() validate.ValidatorMessages { // AdminStatusValidator 修改状态 type AdminStatusValidator struct { - Id int `validate:"required"` - Status uint8 `validate:"required,oneof=1 2"` - Reason string `validate:"required_if=Status 1"` + Id int64 `validate:"required"` + Status int32 `validate:"required,oneof=1 2"` + Reason string `validate:"required_if=Status 2"` } // GetMessage 修改状态 - 提示消息 @@ -96,3 +96,16 @@ func (p AdminStatusValidator) GetMessage() validate.ValidatorMessages { "Reason.required_if": "理由不能为空", } } + +type LoginValidator struct { + Username string `validate:"required"` + Password string `validate:"required"` +} + +// GetMessage 提示消息 +func (p LoginValidator) GetMessage() validate.ValidatorMessages { + return validate.ValidatorMessages{ + "Username.required": "账号不能为空", + "Password.required": "密码不能为空", + } +} diff --git a/bff/etc/admin.pb b/bff/etc/admin.pb index 294d3509a3633aff4b0d4a16543b26c850618fc1..ab7893b98c5dfd538fe60a0634985dd426c60e96 100644 GIT binary patch delta 558 zcmX?I_O)o^^R-M&9SM`CF`F<(Pd>x!$IHXf@aEKiMuA2Uxp^9kh6>YiuE_^9q9-eA z8nA3)WagOcuNgXdm8KLci1T9dVa;siMU1>c9Ig=oj(#q#E)p&5ix|0u*a94#y@9;v z>=1QPhq zoMfQEi0ZgaMw%>46Sya9n@Mj@G?QawbeY^>ZpbUd#gdX(k|@Efz^K8w`HFcxBXk>z5fr8L26mC02}DLgABNTbigUDT38W zD~X}2D=tYaDJ=%6jF_xwWvs5G3|1+tB!RB7AhEc(JijOfq&8`Cn3birk~&zeqLK`{ z+Whi7U1arPlP6jsTq}g(+RVJPe2}@3lTTQgt0*ae&6N@oMK?FIBsCZ8*vQF@*5;-# fg-RF-bMn(O^MEEgaYnK0K}<Z;ZH0KK z5cI;$xo|RuqX}y4pP(nan0W9Hkcb*jBwqA@J6j4$@G|p#?|t*$OTIThwfB`Oy9L$aDlXvkonZRP+Vx zN|*!krqGyzzl{rpYg9LBG%aOp=CHxn8xU@1$SW9vn}BS=Wc4BQ=*Q+RXkDTwS48u5 zjzT=GBH>b2%d5Jg@s$9L2($SD77oHf3F`u0(6L;~D>8TSh*xpr#n^tG39QE&@}4zo zEowP;7H&96-gD3P23VM{cJj`1iTv_RH0TX4M~dFL2L0siBEP*kcU`;=9H=RIGZ}NO z*w=v**`{LY@%UZWHd#8KJ=M^3pqA^gWMcA)kV?nm<9A|Xu9c_0nMTPOpQpC!`vR(~ z!06w)n&g%NI&DB?=hY0KRaLHqf>BkCV^J?_xP;uyH#=fzbWW^@Tq{La4YV&f$$YmX z8x7|au9@BmWk1==JV_#!22EcA9HO|{bT80Q)fW1k5I(ci9`jyME&pRw4&gncOk0jH zs-%>)EEckggoV63tNi7X?+BMBO!=sx9yi1X7JYzhTLR0t_SWCs6nW0FZRW&&Q7Y!; zy)R%j3HSd`Qriu>0hlK4aG=-AHc6r`x-7=-JNr8h?>ld7d+mO>3Ql~su+|aU1x>Py z2}UG|>LS7C==;auSv_~D&cD`Ps@lpN&--uQ_ diff --git a/pkg/go.mod b/pkg/go.mod index 08c1b8d..66f47ea 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -4,14 +4,10 @@ go 1.26 require ( buf.build/go/protovalidate v0.14.0 - github.com/alibabacloud-go/darabonba-openapi/v2 v2.2.4 - github.com/alibabacloud-go/dysmsapi-20170525/v3 v3.0.6 - github.com/alibabacloud-go/tea v1.5.3 github.com/fsnotify/fsnotify v1.10.1 github.com/gin-gonic/gin v1.12.0 github.com/go-playground/validator/v10 v10.30.3 github.com/golang-jwt/jwt/v4 v4.5.2 - github.com/joho/godotenv v1.5.1 github.com/json-iterator/go v1.1.12 github.com/redis/go-redis/v9 v9.19.0 github.com/spf13/viper v1.21.0 @@ -22,27 +18,19 @@ require ( google.golang.org/protobuf v1.36.11 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gorm.io/driver/mysql v1.6.0 - gorm.io/gorm v1.31.2 - gorm.io/plugin/dbresolver v1.6.2 + gorm.io/gorm v1.30.0 + gorm.io/plugin/dbresolver v1.6.0 ) require ( buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250717165733-d22d418d82d8.1 // indirect cel.dev/expr v0.25.1 // indirect filippo.io/edwards25519 v1.1.0 // indirect - github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 // indirect - github.com/alibabacloud-go/debug v1.0.1 // indirect - github.com/alibabacloud-go/endpoint-util v1.1.0 // indirect - github.com/alibabacloud-go/openapi-util v0.1.0 // indirect - github.com/alibabacloud-go/tea-utils v1.3.1 // indirect - github.com/alibabacloud-go/tea-utils/v2 v2.0.9 // indirect - github.com/aliyun/credentials-go v1.4.5 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect github.com/bytedance/gopkg v0.1.3 // indirect github.com/bytedance/sonic v1.15.0 // indirect github.com/bytedance/sonic/loader v0.5.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/clbanning/mxj/v2 v2.7.0 // indirect github.com/cloudwego/base64x v0.1.6 // indirect github.com/gabriel-vasile/mimetype v1.4.13 // indirect github.com/gin-contrib/sse v1.1.0 // indirect @@ -53,7 +41,6 @@ require ( github.com/goccy/go-json v0.10.5 // indirect github.com/goccy/go-yaml v1.19.2 // indirect github.com/google/cel-go v0.25.0 // indirect - github.com/gorilla/websocket v1.5.3 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/klauspost/cpuid/v2 v2.3.0 // indirect @@ -74,7 +61,6 @@ require ( github.com/stoewer/go-strcase v1.3.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/tiendc/go-deepcopy v1.7.2 // indirect - github.com/tjfoc/gmsm v1.4.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.3.1 // indirect github.com/xuri/efp v0.0.1 // indirect @@ -90,5 +76,4 @@ require ( golang.org/x/text v0.38.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect - gopkg.in/ini.v1 v1.67.0 // indirect ) diff --git a/pkg/go.sum b/pkg/go.sum index 0ea7e16..f1efb8d 100644 --- a/pkg/go.sum +++ b/pkg/go.sum @@ -4,63 +4,8 @@ buf.build/go/protovalidate v0.14.0 h1:kr/rC/no+DtRyYX+8KXLDxNnI1rINz0imk5K44ZpZ3 buf.build/go/protovalidate v0.14.0/go.mod h1:+F/oISho9MO7gJQNYC2VWLzcO1fTPmaTA08SDYJZncA= cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4= cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6 h1:eIf+iGJxdU4U9ypaUfbtOWCsZSbTb8AUHvyPrxu6mAA= -github.com/alibabacloud-go/alibabacloud-gateway-pop v0.0.6/go.mod h1:4EUIoxs/do24zMOGGqYVWgw0s9NtiylnJglOeEB5UJo= -github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.4/go.mod h1:sCavSAvdzOjul4cEqeVtvlSaSScfNsTQ+46HwlTL1hc= -github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 h1:zE8vH9C7JiZLNJJQ5OwjU9mSi4T9ef9u3BURT6LCLC8= -github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5/go.mod h1:tWnyE9AjF8J8qqLk645oUmVUnFybApTQWklQmi5tY6g= -github.com/alibabacloud-go/darabonba-array v0.1.0 h1:vR8s7b1fWAQIjEjWnuF0JiKsCvclSRTfDzZHTYqfufY= -github.com/alibabacloud-go/darabonba-array v0.1.0/go.mod h1:BLKxr0brnggqOJPqT09DFJ8g3fsDshapUD3C3aOEFaI= -github.com/alibabacloud-go/darabonba-encode-util v0.0.2 h1:1uJGrbsGEVqWcWxrS9MyC2NG0Ax+GpOM5gtupki31XE= -github.com/alibabacloud-go/darabonba-encode-util v0.0.2/go.mod h1:JiW9higWHYXm7F4PKuMgEUETNZasrDM6vqVr/Can7H8= -github.com/alibabacloud-go/darabonba-map v0.0.2 h1:qvPnGB4+dJbJIxOOfawxzF3hzMnIpjmafa0qOTp6udc= -github.com/alibabacloud-go/darabonba-map v0.0.2/go.mod h1:28AJaX8FOE/ym8OUFWga+MtEzBunJwQGceGQlvaPGPc= -github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.2/go.mod h1:5JHVmnHvGzR2wNdgaW1zDLQG8kOC4Uec8ubkMogW7OQ= -github.com/alibabacloud-go/darabonba-openapi/v2 v2.2.4 h1:o6veen0IZ/Fe1JawwhwQMZcbw67CVDY1pQwXcNWPyQo= -github.com/alibabacloud-go/darabonba-openapi/v2 v2.2.4/go.mod h1:eHjVxrT9g8uVYN/nyAwOFQEfkVA154ChiqRc2XnNKYU= -github.com/alibabacloud-go/darabonba-signature-util v0.0.7 h1:UzCnKvsjPFzApvODDNEYqBHMFt1w98wC7FOo0InLyxg= -github.com/alibabacloud-go/darabonba-signature-util v0.0.7/go.mod h1:oUzCYV2fcCH797xKdL6BDH8ADIHlzrtKVjeRtunBNTQ= -github.com/alibabacloud-go/darabonba-string v1.0.2 h1:E714wms5ibdzCqGeYJ9JCFywE5nDyvIXIIQbZVFkkqo= -github.com/alibabacloud-go/darabonba-string v1.0.2/go.mod h1:93cTfV3vuPhhEwGGpKKqhVW4jLe7tDpo3LUM0i0g6mA= -github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68/go.mod h1:6pb/Qy8c+lqua8cFpEy7g39NRRqOWc3rOwAy8m5Y2BY= -github.com/alibabacloud-go/debug v1.0.0/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc= -github.com/alibabacloud-go/debug v1.0.1 h1:MsW9SmUtbb1Fnt3ieC6NNZi6aEwrXfDksD4QA6GSbPg= -github.com/alibabacloud-go/debug v1.0.1/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc= -github.com/alibabacloud-go/dysmsapi-20170525/v3 v3.0.6 h1:UTl97mt2qfavxveqCkaVg4tKaZUPzA9RKbFIRaIdtdg= -github.com/alibabacloud-go/dysmsapi-20170525/v3 v3.0.6/go.mod h1:UWpcGrWwTbES9QW7OQ7xDffukMJ/l7lzioixIz8+lgY= -github.com/alibabacloud-go/endpoint-util v1.1.0 h1:r/4D3VSw888XGaeNpP994zDUaxdgTSHBbVfZlzf6b5Q= -github.com/alibabacloud-go/endpoint-util v1.1.0/go.mod h1:O5FuCALmCKs2Ff7JFJMudHs0I5EBgecXXxZRyswlEjE= -github.com/alibabacloud-go/openapi-util v0.0.11/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws= -github.com/alibabacloud-go/openapi-util v0.1.0 h1:0z75cIULkDrdEhkLWgi9tnLe+KhAFE/r5Pb3312/eAY= -github.com/alibabacloud-go/openapi-util v0.1.0/go.mod h1:sQuElr4ywwFRlCCberQwKRFhRzIyG4QTP/P4y1CJ6Ws= -github.com/alibabacloud-go/tea v1.1.0/go.mod h1:IkGyUSX4Ba1V+k4pCtJUc6jDpZLFph9QMy2VUPTwukg= -github.com/alibabacloud-go/tea v1.1.7/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= -github.com/alibabacloud-go/tea v1.1.8/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= -github.com/alibabacloud-go/tea v1.1.11/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/KeGOFfwYm3N/p4= -github.com/alibabacloud-go/tea v1.1.17/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A= -github.com/alibabacloud-go/tea v1.1.19/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A= -github.com/alibabacloud-go/tea v1.1.20/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A= -github.com/alibabacloud-go/tea v1.2.2/go.mod h1:CF3vOzEMAG+bR4WOql8gc2G9H3EkH3ZLAQdpmpXMgwk= -github.com/alibabacloud-go/tea v1.5.2/go.mod h1:hgSs82CkOiehSQMoiFN79dL6zsGX7pVGvnn9SIEs8/0= -github.com/alibabacloud-go/tea v1.5.3 h1:UMJTBcO48w7Zz1nlFe9bmRsHwgB7AjF8DBQzcvHhIp8= -github.com/alibabacloud-go/tea v1.5.3/go.mod h1:hgSs82CkOiehSQMoiFN79dL6zsGX7pVGvnn9SIEs8/0= -github.com/alibabacloud-go/tea-utils v1.3.1 h1:iWQeRzRheqCMuiF3+XkfybB3kTgUXkXX+JMrqfLeB2I= -github.com/alibabacloud-go/tea-utils v1.3.1/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE= -github.com/alibabacloud-go/tea-utils/v2 v2.0.0/go.mod h1:U5MTY10WwlquGPS34DOeomUGBB0gXbLueiq5Trwu0C4= -github.com/alibabacloud-go/tea-utils/v2 v2.0.3/go.mod h1:sj1PbjPodAVTqGTA3olprfeeqqmwD0A5OQz94o9EuXQ= -github.com/alibabacloud-go/tea-utils/v2 v2.0.5/go.mod h1:dL6vbUT35E4F4bFTHL845eUloqaerYBYPsdWR2/jhe4= -github.com/alibabacloud-go/tea-utils/v2 v2.0.9 h1:y6pUIlhjxbZl9ObDAcmA1H3c21eaAxADHTDQmBnAIgA= -github.com/alibabacloud-go/tea-utils/v2 v2.0.9/go.mod h1:qxn986l+q33J5VkialKMqT/TTs3E+U9MJpd001iWQ9I= -github.com/alibabacloud-go/tea-xml v1.1.2/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= -github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw= -github.com/aliyun/credentials-go v1.3.1/go.mod h1:8jKYhQuDawt8x2+fusqa1Y6mPxemTsBEN04dgcAcYz0= -github.com/aliyun/credentials-go v1.3.6/go.mod h1:1LxUuX7L5YrZUWzBrRyk0SwSdH4OmPrib8NVePL3fxM= -github.com/aliyun/credentials-go v1.4.5 h1:O76WYKgdy1oQYYiJkERjlA2dxGuvLRrzuO2ScrtGWSk= -github.com/aliyun/credentials-go v1.4.5/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U= github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= @@ -75,22 +20,13 @@ github.com/bytedance/sonic v1.15.0 h1:/PXeWFaR5ElNcVE84U0dOHjiMHQOwNIx3K4ymzh/uS github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9VduqpJh0k= github.com/bytedance/sonic/loader v0.5.0 h1:gXH3KVnatgY7loH5/TkeVyXPfESoqSBSBEiDd5VjlgE= github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= -github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME= -github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho= @@ -123,74 +59,42 @@ github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/cel-go v0.25.0 h1:jsFw9Fhn+3y2kBbltZR4VEz5xKkcIFRPDnuEzAGv5GY= github.com/google/cel-go v0.25.0/go.mod h1:hjEb6r5SuOSlhCHmFoLzu8HGCERvIsDAbxDAyNU/MmI= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= -github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= -github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= -github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw= @@ -205,9 +109,6 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc= github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.1.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw= github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U= github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I= @@ -221,12 +122,10 @@ github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjb github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= @@ -238,9 +137,6 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tiendc/go-deepcopy v1.7.2 h1:Ut2yYR7W9tWjTQitganoIue4UGxZwCcJy3orjrrIj44= github.com/tiendc/go-deepcopy v1.7.2/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ= -github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= -github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= -github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= @@ -251,9 +147,6 @@ github.com/xuri/excelize/v2 v2.11.0 h1:HxaEFl6sRN2+8J5a8HaKq+0M4FsjBGMnWWtjOCPSG github.com/xuri/excelize/v2 v2.11.0/go.mod h1:jxFLbzaIwGQ5ufFNvYfUOHqXhfPaNmP14KWfmNz2Uak= github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 h1:+C0TIdyyYmzadGaL/HBLbf3WdLgC29pgyhTjAT/0nuE= github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9/go.mod h1:WwHg+CVyzlv/TX9xqBFXEZAuxOPxn2k1GNHwG41IIUQ= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= go.mongodb.org/mongo-driver/v2 v2.5.0 h1:yXUhImUjjAInNcpTcAlPHiT7bIXhshCTL3jVBkF3xaE= @@ -285,176 +178,40 @@ go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/arch v0.22.0 h1:c/Zle32i5ttqRXjdLyyHZESLD/bB90DCU1g9l/0YBDI= golang.org/x/arch v0.22.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto= golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= golang.org/x/image v0.38.0 h1:5l+q+Y9JDC7mBOMjo4/aPhMDcxEptsX+Tt3GgRQRPuE= golang.org/x/image v0.38.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o= golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw= golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE= golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 h1:vmC/ws+pLzWjj/gzApyoZuSVrDtF1aod4u/+bbj8hgM= google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:p3MLuOwURrGBRoEyFHBT3GjUwaCQVKeNqqWxlcISGdw= google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 h1:sNrWoksmOyF5bvJUcnmbeAmQi8baNhqg5IWaI3llQqU= google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM= google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= -gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= -gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= -gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= -gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= -gorm.io/plugin/dbresolver v1.6.2 h1:F4b85TenghUeITqe3+epPSUtHH7RIk3fXr5l83DF8Pc= -gorm.io/plugin/dbresolver v1.6.2/go.mod h1:tctw63jdrOezFR9HmrKnPkmig3m5Edem9fdxk9bQSzM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs= +gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= +gorm.io/plugin/dbresolver v1.6.0 h1:XvKDeOtTn1EIX6s4SrKpEH82q0gXVemhYjbYZFGFVcw= +gorm.io/plugin/dbresolver v1.6.0/go.mod h1:tctw63jdrOezFR9HmrKnPkmig3m5Edem9fdxk9bQSzM= diff --git a/pkg/modelbase/base.go b/pkg/modelbase/base.go index f1f1ac1..b118c52 100644 --- a/pkg/modelbase/base.go +++ b/pkg/modelbase/base.go @@ -6,6 +6,7 @@ import ( "fmt" "gorm.io/gorm" + "pkg.local/utils" ) const ( @@ -205,7 +206,7 @@ func (m Base) Page(w Params, retData interface{}) (PageResult, error) { if w.Page < DefaultPage { w.Page = DefaultPage } - if w.Size < DefaultPage { + if w.Size < utils.NumberOne { w.Size = DefaultSize } err = o.Offset((w.Page - 1) * w.Size).Limit(w.Size).Order(w.Order).Find(retData).Error diff --git a/pkg/utils/config.go b/pkg/utils/config.go index fb2a43f..8f1c757 100644 --- a/pkg/utils/config.go +++ b/pkg/utils/config.go @@ -32,7 +32,11 @@ func GetConfigString(key string) string { data["encrypt_key"] = "M17fcaPeHDr05H17fcaPH1deDH17l3Bd" return data[key] } -func GetConfigInt(key string) int { return runViper.GetInt(key) } +func GetConfigInt(key string) int { + data := make(map[string]int) + data["base.login_out_time"] = 86400 + return data[key] +} func GetConfigInt64(key string) int64 { return runViper.GetInt64(key) } func GetConfigBool(key string) bool { return runViper.GetBool(key) } diff --git a/pkg/utils/encrypt.go b/pkg/utils/encrypt.go index e4e3852..fc82112 100644 --- a/pkg/utils/encrypt.go +++ b/pkg/utils/encrypt.go @@ -124,7 +124,7 @@ func DecryptPhone(phone string) (string, Error) { return newPhone, nil } -func getSearchPhone(mobile string) string { +func GetSearchPhone(mobile string) string { phone := StringEmpty if len(mobile) == 11 { prefix := mobile[NumberZero:3] // 前三位 diff --git a/pkg/utils/status.go b/pkg/utils/status.go index 693af50..84c7744 100644 --- a/pkg/utils/status.go +++ b/pkg/utils/status.go @@ -1,5 +1,7 @@ package utils +import "fmt" + type Status struct { Code int32 `json:"code"` Msg string `json:"message"` @@ -31,6 +33,7 @@ const ( ProjectPrintId = 9 DecollatorComma = "," //逗号分割符 + DecollatorColon = ":" CentralHorizontalLine = " - " DecollatorEqual = "=" StringEmpty = "" @@ -40,18 +43,10 @@ const ( ) const ( - UserInfo = "sale_store_info" - AdminInfo = "admin_info" - CustomerInfo = "customer_info" - - AdminToken = "admin_token" - - LoginSaleStore = "login:sale_store:key:" //用户登录 - LoginWorker = "login:worker:" //工厂人员登录 - LoginCustomer = "login:customer:" //用户端登录 - LoginCustomerMap = "login:customer:keys" //用户端登录map - LoginAdmin = "login:admin:" //后台用户登录 - LoginAdminMap = "login:admin:keys" //后台用户登录map（uid -> login:token） + // LoginUser 所有的登录 加上服务名:id + // %s 为，admin,user ,... + LoginUser = "login:service:%s:" + LoginUserKey = "login:service:%s:keys" CodeKey = "code:" ) @@ -64,6 +59,9 @@ var ( ErrorEncryptAesError = Status{Code: 10001, Msg: "加密失败"} ErrorNotFund = Status{Code: 11001, Msg: "not fund"} ErrorExistUser = Status{Code: 10009, Msg: "账号或手机号已存在"} + ErrorPwdError = Status{Code: 10002, Msg: "密码错误"} + ErrorNoLogin = Status{Code: 10003, Msg: "没有登录"} + ErrorAuthority = Status{Code: 10008, Msg: "没有权限"} // 基础类 ErrorExist = NewError(998, "已存在") @@ -74,13 +72,10 @@ var ( // 参数类 ErrorReasonParams = NewError(10001, "原因不能为空") - ErrorPwdError = NewError(10002, "密码错误") - ErrorNoLogin = NewError(10003, "没有登录") ErrorDefaultError = NewError(10004, "默认地址不能删除") ErrorJwtExpired = NewError(10005, "jwt过期") ErrorMissingProjectId = NewError(10006, "缺少权限项目ID") ErrorMissingIdentification = NewError(10007, "缺少权限标识") - ErrorAuthority = NewError(10008, "没有权限") ErrorMobileError = NewError(10009, "手机号不对") ErrorEncryptMissingKey = NewError(10010, "加密密钥错误") ErrorDecryptAesError = NewError(10012, "解密失败") @@ -105,6 +100,10 @@ var ( func SetError(error Error, msg string) Error { return NewError(error.GetCode(), msg) } -func GetRedisKey(key string) string { - return "" + key +func GetLoginKey(Type, key string) string { + return fmt.Sprintf(LoginUser, Type) + key +} + +func GetLoginKeysKey(Type string) string { + return fmt.Sprintf(LoginUserKey, Type) }