diff --git a/pb/organize.pb.go b/pb/organize.pb.go index ccc1a5c..ccd8622 100644 --- a/pb/organize.pb.go +++ b/pb/organize.pb.go @@ -31,17 +31,16 @@ type Menu struct { Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` CreatedAt int64 `protobuf:"varint,2,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` UpdatedAt int64 `protobuf:"varint,3,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"` - Domain string `protobuf:"bytes,4,opt,name=domain,proto3" json:"domain,omitempty"` - Parent string `protobuf:"bytes,5,opt,name=parent,proto3" json:"parent,omitempty"` - Name string `protobuf:"bytes,6,opt,name=name,proto3" json:"name,omitempty"` - Label string `protobuf:"bytes,7,opt,name=label,proto3" json:"label,omitempty"` - Uri string `protobuf:"bytes,8,opt,name=uri,proto3" json:"uri,omitempty"` - ViewPath string `protobuf:"bytes,9,opt,name=view_path,json=viewPath,proto3" json:"view_path,omitempty"` - Icon string `protobuf:"bytes,10,opt,name=icon,proto3" json:"icon,omitempty"` - Hidden bool `protobuf:"varint,11,opt,name=hidden,proto3" json:"hidden,omitempty"` - Public bool `protobuf:"varint,12,opt,name=public,proto3" json:"public,omitempty"` - Description string `protobuf:"bytes,13,opt,name=description,proto3" json:"description,omitempty"` - Position int64 `protobuf:"varint,14,opt,name=position,proto3" json:"position,omitempty"` + Parent string `protobuf:"bytes,4,opt,name=parent,proto3" json:"parent,omitempty"` + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` + Label string `protobuf:"bytes,6,opt,name=label,proto3" json:"label,omitempty"` + Uri string `protobuf:"bytes,7,opt,name=uri,proto3" json:"uri,omitempty"` + ViewPath string `protobuf:"bytes,8,opt,name=view_path,json=viewPath,proto3" json:"view_path,omitempty"` + Icon string `protobuf:"bytes,9,opt,name=icon,proto3" json:"icon,omitempty"` + Hidden bool `protobuf:"varint,10,opt,name=hidden,proto3" json:"hidden,omitempty"` + Public bool `protobuf:"varint,11,opt,name=public,proto3" json:"public,omitempty"` + Description string `protobuf:"bytes,12,opt,name=description,proto3" json:"description,omitempty"` + Position int64 `protobuf:"varint,13,opt,name=position,proto3" json:"position,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -97,13 +96,6 @@ func (x *Menu) GetUpdatedAt() int64 { return 0 } -func (x *Menu) GetDomain() string { - if x != nil { - return x.Domain - } - return "" -} - func (x *Menu) GetParent() string { if x != nil { return x.Parent @@ -273,10 +265,9 @@ type Permission struct { Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` CreatedAt int64 `protobuf:"varint,2,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"` UpdatedAt int64 `protobuf:"varint,3,opt,name=updated_at,json=updatedAt,proto3" json:"updated_at,omitempty"` - Domain string `protobuf:"bytes,4,opt,name=domain,proto3" json:"domain,omitempty"` - Menu string `protobuf:"bytes,5,opt,name=menu,proto3" json:"menu,omitempty"` - Permission string `protobuf:"bytes,6,opt,name=permission,proto3" json:"permission,omitempty"` - Label string `protobuf:"bytes,7,opt,name=label,proto3" json:"label,omitempty"` + Menu string `protobuf:"bytes,4,opt,name=menu,proto3" json:"menu,omitempty"` + Permission string `protobuf:"bytes,5,opt,name=permission,proto3" json:"permission,omitempty"` + Label string `protobuf:"bytes,6,opt,name=label,proto3" json:"label,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -332,13 +323,6 @@ func (x *Permission) GetUpdatedAt() int64 { return 0 } -func (x *Permission) GetDomain() string { - if x != nil { - return x.Domain - } - return "" -} - func (x *Permission) GetMenu() string { if x != nil { return x.Menu @@ -3052,7 +3036,7 @@ var File_organize_proto protoreflect.FileDescriptor const file_organize_proto_rawDesc = "" + "\n" + - "\x0eorganize.proto\x12\borganize\x1a\x0faeus/rest.proto\x1a\x17validate/validate.proto\x1a google/protobuf/descriptor.proto\x1a\x1cgoogle/api/annotations.proto\"\x90\t\n" + + "\x0eorganize.proto\x12\borganize\x1a\x0faeus/rest.proto\x1a\x17validate/validate.proto\x1a google/protobuf/descriptor.proto\x1a\x1cgoogle/api/annotations.proto\"\xc2\b\n" + "\x04Menu\x12*\n" + "\x02id\x18\x01 \x01(\x03B\x1a\xb2\xb9\x19\x16\n" + "\n" + @@ -3061,27 +3045,25 @@ const file_organize_proto_rawDesc = "" + "created_at\x18\x02 \x01(\x03B\x1f\xb2\xb9\x19\x1b\x12\f创建时间\x1a\vview;exportR\tcreatedAt\x12E\n" + "\n" + "updated_at\x18\x03 \x01(\x03B&\xb2\xb9\x19\"\n" + - "\x05index\x12\f更新时间\x1a\vview;exportR\tupdatedAt\x12L\n" + - "\x06domain\x18\x04 \x01(\tB4\xb2\xb9\x190\n" + - "!index;size:60;not null;default:''\x12\x03域\x1a\x06exportR\x06domain\x12\x91\x01\n" + - "\x06parent\x18\x05 \x01(\tBy\xb2\xb9\x19u\n" + + "\x05index\x12\f更新时间\x1a\vview;exportR\tupdatedAt\x12\x91\x01\n" + + "\x06parent\x18\x04 \x01(\tBy\xb2\xb9\x19u\n" + "\rindex;size:60\x12\f父级菜单\x1a\x19create;update;view;export*\x04menu2\x0freadonly:updateB$type:dropdown;url:/menu/level-labelsR\x06parent\x12^\n" + - "\x04name\x18\x06 \x01(\tBJ\xfaB\x04r\x02\x18<\xb2\xb9\x19?\n" + + "\x04name\x18\x05 \x01(\tBJ\xfaB\x04r\x02\x18<\xb2\xb9\x19?\n" + "\rindex;size:60\x12\f组件名称2\x0freadonly:update:\x0funique;requiredR\x04name\x12C\n" + - "\x05label\x18\a \x01(\tB-\xfaB\x04r\x02\x18x\xb2\xb9\x19\"\n" + + "\x05label\x18\x06 \x01(\tB-\xfaB\x04r\x02\x18x\xb2\xb9\x19\"\n" + "\bsize:120\x12\f菜单标题:\brequiredR\x05label\x12[\n" + - "\x03uri\x18\b \x01(\tBI\xfaB\x05r\x03\x18\x80\x04\xb2\xb9\x19=\n" + + "\x03uri\x18\a \x01(\tBI\xfaB\x05r\x03\x18\x80\x04\xb2\xb9\x19=\n" + "\bsize:512\x12\f菜单链接\x1a\x19create;update;view;export:\brequiredR\x03uri\x12\\\n" + - "\tview_path\x18\t \x01(\tB?\xfaB\x05r\x03\x18\x80\x04\xb2\xb9\x193\n" + + "\tview_path\x18\b \x01(\tB?\xfaB\x05r\x03\x18\x80\x04\xb2\xb9\x193\n" + "\bsize:512\x12\f视图路径\x1a\x19create;update;view;exportR\bviewPath\x12Q\n" + - "\x04icon\x18\n" + - " \x01(\tB=\xfaB\x04r\x02\x18<\xb2\xb9\x192\n" + + "\x04icon\x18\t \x01(\tB=\xfaB\x04r\x02\x18<\xb2\xb9\x192\n" + "\asize:60\x12\f菜单图标\x1a\x19create;update;view;exportR\x04icon\x12E\n" + - "\x06hidden\x18\v \x01(\bB-\xb2\xb9\x19)\x12\f是否隐藏\x1a\x19create;update;view;exportR\x06hidden\x12E\n" + - "\x06public\x18\f \x01(\bB-\xb2\xb9\x19)\x12\f是否公开\x1a\x19create;update;view;exportR\x06public\x12l\n" + - "\vdescription\x18\r \x01(\tBJ\xfaB\x05r\x03\x18\x80\b\xb2\xb9\x19>\n" + + "\x06hidden\x18\n" + + " \x01(\bB-\xb2\xb9\x19)\x12\f是否隐藏\x1a\x19create;update;view;exportR\x06hidden\x12E\n" + + "\x06public\x18\v \x01(\bB-\xb2\xb9\x19)\x12\f是否公开\x1a\x19create;update;view;exportR\x06public\x12l\n" + + "\vdescription\x18\f \x01(\tBJ\xfaB\x05r\x03\x18\x80\b\xb2\xb9\x19>\n" + "\tsize:1024\x12\f备注说明\x1a\x19create;update;view;export*\btextareaR\vdescription\x127\n" + - "\bposition\x18\x0e \x01(\x03B\x1b\xb2\xb9\x19\x17\x12\x06排序\x1a\rcreate;updateR\bposition:\v\xba\xb9\x19\a\n" + + "\bposition\x18\r \x01(\x03B\x1b\xb2\xb9\x19\x17\x12\x06排序\x1a\rcreate;updateR\bposition:\v\xba\xb9\x19\a\n" + "\x05menus\"\x9f\x04\n" + "\x04Role\x12*\n" + "\x02id\x18\x01 \x01(\x03B\x1a\xb2\xb9\x19\x16\n" + @@ -3100,7 +3082,7 @@ const file_organize_proto_rawDesc = "" + "\asize:60\x12\f角色标题:\brequiredR\x05label\x12l\n" + "\vdescription\x18\a \x01(\tBJ\xfaB\x05r\x03\x18\x80\b\xb2\xb9\x19>\n" + "\tsize:1024\x12\f备注说明\x1a\x19list;create;update;export*\btextareaR\vdescription:\v\xba\xb9\x19\a\n" + - "\x05roles\"\xff\x03\n" + + "\x05roles\"\xb1\x03\n" + "\n" + "Permission\x12*\n" + "\x02id\x18\x01 \x01(\x03B\x1a\xb2\xb9\x19\x16\n" + @@ -3110,16 +3092,14 @@ const file_organize_proto_rawDesc = "" + "created_at\x18\x02 \x01(\x03B\x1f\xb2\xb9\x19\x1b\x12\f创建时间\x1a\vview;exportR\tcreatedAt\x12E\n" + "\n" + "updated_at\x18\x03 \x01(\x03B&\xb2\xb9\x19\"\n" + - "\x05index\x12\f更新时间\x1a\vview;exportR\tupdatedAt\x12L\n" + - "\x06domain\x18\x04 \x01(\tB4\xb2\xb9\x190\n" + - "!index;size:60;not null;default:''\x12\x03域\x1a\x06exportR\x06domain\x12E\n" + - "\x04menu\x18\x05 \x01(\tB1\xb2\xb9\x19-\n" + + "\x05index\x12\f更新时间\x1a\vview;exportR\tupdatedAt\x12E\n" + + "\x04menu\x18\x04 \x01(\tB1\xb2\xb9\x19-\n" + "\rindex;size:60\x12\f所属菜单*\x04menu:\brequiredR\x04menu\x12R\n" + "\n" + - "permission\x18\x06 \x01(\tB2\xfaB\x04r\x02\x18<\xb2\xb9\x19'\n" + + "permission\x18\x05 \x01(\tB2\xfaB\x04r\x02\x18<\xb2\xb9\x19'\n" + "\rindex;size:60\x12\f权限名称:\brequiredR\n" + "permission\x12B\n" + - "\x05label\x18\a \x01(\tB,\xfaB\x04r\x02\x18<\xb2\xb9\x19!\n" + + "\x05label\x18\x06 \x01(\tB,\xfaB\x04r\x02\x18<\xb2\xb9\x19!\n" + "\asize:60\x12\f权限标题:\brequiredR\x05label:\x11\xba\xb9\x19\r\n" + "\vpermissions\"\xd1\x01\n" + "\x0eRolePermission\x12$\n" + diff --git a/pb/organize.pb.validate.go b/pb/organize.pb.validate.go index ad77d99..6559e75 100644 --- a/pb/organize.pb.validate.go +++ b/pb/organize.pb.validate.go @@ -62,8 +62,6 @@ func (m *Menu) validate(all bool) error { // no validation rules for UpdatedAt - // no validation rules for Domain - // no validation rules for Parent if utf8.RuneCountInString(m.GetName()) > 60 { @@ -382,8 +380,6 @@ func (m *Permission) validate(all bool) error { // no validation rules for UpdatedAt - // no validation rules for Domain - // no validation rules for Menu if utf8.RuneCountInString(m.GetPermission()) > 60 { diff --git a/pb/organize_http.pb.go b/pb/organize_http.pb.go index adead60..9da705d 100644 --- a/pb/organize_http.pb.go +++ b/pb/organize_http.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-aeus. DO NOT EDIT. // source: organize.proto -// date: 2025-07-23 17:11:27 +// date: 2025-07-23 17:37:42 package pb diff --git a/pb/organize_model.pb.go b/pb/organize_model.pb.go index 400c661..8fb99cd 100644 --- a/pb/organize_model.pb.go +++ b/pb/organize_model.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-aeus. DO NOT EDIT. // source: organize.proto -// date: 2025-07-23 17:11:27 +// date: 2025-07-23 17:37:42 package pb @@ -12,7 +12,6 @@ type MenuModel struct { Id int64 `json:"id" yaml:"id" xml:"id" gorm:"primaryKey;column:id" comment:"菜单ID"` CreatedAt int64 `json:"created_at" yaml:"createdAt" xml:"createdAt" gorm:"column:created_at" comment:"创建时间" scenarios:"view;export"` UpdatedAt int64 `json:"updated_at" yaml:"updatedAt" xml:"updatedAt" gorm:"index;column:updated_at" comment:"更新时间" scenarios:"view;export"` - Domain string `json:"domain" yaml:"domain" xml:"domain" gorm:"index;size:60;not null;default:'';column:domain" comment:"域" scenarios:"export"` Parent string `json:"parent" yaml:"parent" xml:"parent" gorm:"index;size:60;column:parent" comment:"父级菜单" scenarios:"create;update;view;export" format:"menu" props:"readonly:update" live:"type:dropdown;url:/menu/level-labels"` Name string `json:"name" yaml:"name" xml:"name" gorm:"index;size:60;column:name" comment:"组件名称" props:"readonly:update" rule:"unique;required"` Label string `json:"label" yaml:"label" xml:"label" gorm:"size:120;column:label" comment:"菜单标题" rule:"required"` @@ -33,7 +32,6 @@ func (m *MenuModel) FromValue(x *Menu) { m.Id = x.Id m.CreatedAt = x.CreatedAt m.UpdatedAt = x.UpdatedAt - m.Domain = x.Domain m.Parent = x.Parent m.Name = x.Name m.Label = x.Label @@ -51,7 +49,6 @@ func (m *MenuModel) ToValue() (x *Menu) { x.Id = m.Id x.CreatedAt = m.CreatedAt x.UpdatedAt = m.UpdatedAt - x.Domain = m.Domain x.Parent = m.Parent x.Name = m.Name x.Label = m.Label @@ -169,7 +166,6 @@ type PermissionModel struct { Id int64 `json:"id" yaml:"id" xml:"id" gorm:"primaryKey;column:id" comment:"权限ID"` CreatedAt int64 `json:"created_at" yaml:"createdAt" xml:"createdAt" gorm:"column:created_at" comment:"创建时间" scenarios:"view;export"` UpdatedAt int64 `json:"updated_at" yaml:"updatedAt" xml:"updatedAt" gorm:"index;column:updated_at" comment:"更新时间" scenarios:"view;export"` - Domain string `json:"domain" yaml:"domain" xml:"domain" gorm:"index;size:60;not null;default:'';column:domain" comment:"域" scenarios:"export"` Menu string `json:"menu" yaml:"menu" xml:"menu" gorm:"index;size:60;column:menu" comment:"所属菜单" format:"menu" rule:"required"` Permission string `json:"permission" yaml:"permission" xml:"permission" gorm:"index;size:60;column:permission" comment:"权限名称" rule:"required"` Label string `json:"label" yaml:"label" xml:"label" gorm:"size:60;column:label" comment:"权限标题" rule:"required"` @@ -183,7 +179,6 @@ func (m *PermissionModel) FromValue(x *Permission) { m.Id = x.Id m.CreatedAt = x.CreatedAt m.UpdatedAt = x.UpdatedAt - m.Domain = x.Domain m.Menu = x.Menu m.Permission = x.Permission m.Label = x.Label @@ -194,7 +189,6 @@ func (m *PermissionModel) ToValue() (x *Permission) { x.Id = m.Id x.CreatedAt = m.CreatedAt x.UpdatedAt = m.UpdatedAt - x.Domain = m.Domain x.Menu = m.Menu x.Permission = m.Permission x.Label = m.Label diff --git a/pb/system_http.pb.go b/pb/system_http.pb.go index d0a9dab..62c8efc 100644 --- a/pb/system_http.pb.go +++ b/pb/system_http.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-aeus. DO NOT EDIT. // source: system.proto -// date: 2025-07-23 17:11:27 +// date: 2025-07-23 17:37:42 package pb diff --git a/pb/system_model.pb.go b/pb/system_model.pb.go index b2b74c8..51aa329 100644 --- a/pb/system_model.pb.go +++ b/pb/system_model.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-aeus. DO NOT EDIT. // source: system.proto -// date: 2025-07-23 17:11:27 +// date: 2025-07-23 17:37:42 package pb