becomer/likedream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 菜单修复

Browse Source
This commit is contained in:
sugarBecomer
2025-11-07 14:00:45 +08:00
parent 0d7d4c11a0
commit dcb5cd8a4e
14 changed files with 212 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/v1/menu_req.go
+1
View File
@@ -31,6 +31,7 @@ type MenuAddReq struct {
Route string `json:"route"`
Component string `json:"component"`
Hidden bool `json:"hidden"`
KeepAlive bool `json:"keepAlive"`
Icon string `json:"icon"`
Order uint `json:"order"`
ParentId int64 `json:"parentId"`
internal/application/classifier/classifier.go
+1 -1
View File
@@ -42,10 +42,10 @@ func NewImageClassifier(modelPath, classesPath string) (*ImageClassifier, error)
dir = filepath.Join(dir, "onnxruntime.so")
break
}
logger.Logger.Info("初始化onnx：", zap.String("绝对路径", absPath), zap.String("父文件夹", dir))
ort.SetSharedLibraryPath(dir)
err = ort.InitializeEnvironment()
if err != nil {
logger.Logger.Info("初始化onnx：", zap.String("绝对路径", absPath), zap.String("父文件夹", dir))
return nil, fmt.Errorf("初始化ONNX Runtime失败: %v", err)
}
internal/ent/entql.go
+6
View File
@@ -186,6 +186,7 @@ var schemaGraph = func() *sqlgraph.Schema {
sysmenu.FieldPermission: {Type: field.TypeString, Column: sysmenu.FieldPermission},
sysmenu.FieldRoute: {Type: field.TypeString, Column: sysmenu.FieldRoute},
sysmenu.FieldComponent: {Type: field.TypeString, Column: sysmenu.FieldComponent},
sysmenu.FieldKeepAlive: {Type: field.TypeBool, Column: sysmenu.FieldKeepAlive},
sysmenu.FieldHidden: {Type: field.TypeBool, Column: sysmenu.FieldHidden},
sysmenu.FieldIcon: {Type: field.TypeString, Column: sysmenu.FieldIcon},
sysmenu.FieldOrder: {Type: field.TypeUint, Column: sysmenu.FieldOrder},
@@ -1477,6 +1478,11 @@ func (f *SysMenuFilter) WhereComponent(p entql.StringP) {
f.Where(p.Field(sysmenu.FieldComponent))
}
// WhereKeepAlive applies the entql bool predicate on the keep_alive field.
func (f *SysMenuFilter) WhereKeepAlive(p entql.BoolP) {
f.Where(p.Field(sysmenu.FieldKeepAlive))
}
// WhereHidden applies the entql bool predicate on the hidden field.
func (f *SysMenuFilter) WhereHidden(p entql.BoolP) {
f.Where(p.Field(sysmenu.FieldHidden))
internal/ent/internal/schema.go
+1 -1
View File
File diff suppressed because one or more lines are too long
internal/ent/migrate/schema.go
+2 -1
View File
@@ -226,6 +226,7 @@ var (
{Name: "permission", Type: field.TypeString},
{Name: "route", Type: field.TypeString, Nullable: true},
{Name: "component", Type: field.TypeString, Nullable: true},
{Name: "keep_alive", Type: field.TypeBool, Default: false},
{Name: "hidden", Type: field.TypeBool, Default: false},
{Name: "icon", Type: field.TypeString, Nullable: true},
{Name: "order", Type: field.TypeUint},
@@ -239,7 +240,7 @@ var (
ForeignKeys: []*schema.ForeignKey{
{
Symbol: "sys_menu_sys_menu_children",
Columns: []*schema.Column{SysMenuColumns[13]},
Columns: []*schema.Column{SysMenuColumns[14]},
RefColumns: []*schema.Column{SysMenuColumns[0]},
OnDelete: schema.SetNull,
},
internal/ent/mutation.go
+55 -1
View File
@@ -6199,6 +6199,7 @@ type SysMenuMutation struct {
permission *string
route *string
component *string
keep_alive *bool
hidden *bool
icon *string
_order *uint
@@ -6678,6 +6679,42 @@ func (m *SysMenuMutation) ResetComponent() {
delete(m.clearedFields, sysmenu.FieldComponent)
}
// SetKeepAlive sets the "keep_alive" field.
func (m *SysMenuMutation) SetKeepAlive(b bool) {
m.keep_alive = &b
}
// KeepAlive returns the value of the "keep_alive" field in the mutation.
func (m *SysMenuMutation) KeepAlive() (r bool, exists bool) {
v := m.keep_alive
if v == nil {
return
}
return *v, true
}
// OldKeepAlive returns the old "keep_alive" field's value of the SysMenu entity.
// If the SysMenu object wasn't provided to the builder, the object is fetched from the database.
// An error is returned if the mutation operation is not UpdateOne, or the database query fails.
func (m *SysMenuMutation) OldKeepAlive(ctx context.Context) (v bool, err error) {
if !m.op.Is(OpUpdateOne) {
return v, errors.New("OldKeepAlive is only allowed on UpdateOne operations")
}
if m.id == nil || m.oldValue == nil {
return v, errors.New("OldKeepAlive requires an ID field in the mutation")
}
oldValue, err := m.oldValue(ctx)
if err != nil {
return v, fmt.Errorf("querying old value for OldKeepAlive: %w", err)
}
return oldValue.KeepAlive, nil
}
// ResetKeepAlive resets all changes to the "keep_alive" field.
func (m *SysMenuMutation) ResetKeepAlive() {
m.keep_alive = nil
}
// SetHidden sets the "hidden" field.
func (m *SysMenuMutation) SetHidden(b bool) {
m.hidden = &b
@@ -7000,7 +7037,7 @@ func (m *SysMenuMutation) Type() string {
// order to get all numeric fields that were incremented/decremented, call
// AddedFields().
func (m *SysMenuMutation) Fields() []string {
fields := make([]string, 0, 12)
fields := make([]string, 0, 13)
if m.create_time != nil {
fields = append(fields, sysmenu.FieldCreateTime)
}
@@ -7028,6 +7065,9 @@ func (m *SysMenuMutation) Fields() []string {
if m.component != nil {
fields = append(fields, sysmenu.FieldComponent)
}
if m.keep_alive != nil {
fields = append(fields, sysmenu.FieldKeepAlive)
}
if m.hidden != nil {
fields = append(fields, sysmenu.FieldHidden)
}
@@ -7063,6 +7103,8 @@ func (m *SysMenuMutation) Field(name string) (ent.Value, bool) {
return m.Route()
case sysmenu.FieldComponent:
return m.Component()
case sysmenu.FieldKeepAlive:
return m.KeepAlive()
case sysmenu.FieldHidden:
return m.Hidden()
case sysmenu.FieldIcon:
@@ -7096,6 +7138,8 @@ func (m *SysMenuMutation) OldField(ctx context.Context, name string) (ent.Value,
return m.OldRoute(ctx)
case sysmenu.FieldComponent:
return m.OldComponent(ctx)
case sysmenu.FieldKeepAlive:
return m.OldKeepAlive(ctx)
case sysmenu.FieldHidden:
return m.OldHidden(ctx)
case sysmenu.FieldIcon:
@@ -7174,6 +7218,13 @@ func (m *SysMenuMutation) SetField(name string, value ent.Value) error {
}
m.SetComponent(v)
return nil
case sysmenu.FieldKeepAlive:
v, ok := value.(bool)
if !ok {
return fmt.Errorf("unexpected type %T for field %s", value, name)
}
m.SetKeepAlive(v)
return nil
case sysmenu.FieldHidden:
v, ok := value.(bool)
if !ok {
@@ -7313,6 +7364,9 @@ func (m *SysMenuMutation) ResetField(name string) error {
case sysmenu.FieldComponent:
m.ResetComponent()
return nil
case sysmenu.FieldKeepAlive:
m.ResetKeepAlive()
return nil
case sysmenu.FieldHidden:
m.ResetHidden()
return nil
internal/ent/runtime/runtime.go
+5 -1
View File
@@ -134,8 +134,12 @@ func init() {
sysmenuDescUpdateTime := sysmenuMixinFields0[1].Descriptor()
// sysmenu.DefaultUpdateTime holds the default value on creation for the update_time field.
sysmenu.DefaultUpdateTime = sysmenuDescUpdateTime.Default.(func() *ent2.CustomTime)
// sysmenuDescKeepAlive is the schema descriptor for keep_alive field.
sysmenuDescKeepAlive := sysmenuFields[7].Descriptor()
// sysmenu.DefaultKeepAlive holds the default value on creation for the keep_alive field.
sysmenu.DefaultKeepAlive = sysmenuDescKeepAlive.Default.(bool)
// sysmenuDescHidden is the schema descriptor for hidden field.
sysmenuDescHidden := sysmenuFields[7].Descriptor()
sysmenuDescHidden := sysmenuFields[8].Descriptor()
// sysmenu.DefaultHidden holds the default value on creation for the hidden field.
sysmenu.DefaultHidden = sysmenuDescHidden.Default.(bool)
sysroleMixin := schema.SysRole{}.Mixin()
internal/ent/schema/sys_menu.go
+3 -1
View File
@@ -1,12 +1,13 @@
package schema
import (
"likedream-goframe/internal/ent/schema/mix"
"entgo.io/ent"
"entgo.io/ent/dialect/entsql"
"entgo.io/ent/schema"
"entgo.io/ent/schema/edge"
"entgo.io/ent/schema/field"
"likedream-goframe/internal/ent/schema/mix"
)
type SysMenu struct {
@@ -23,6 +24,7 @@ func (SysMenu) Fields() []ent.Field {
field.String("permission"),
field.String("route").Optional(),
field.String("component").Optional(),
field.Bool("keep_alive").Default(false),
field.Bool("hidden").Default(false),
field.String("icon").Optional(),
field.Uint("order"),
internal/ent/sysmenu.go
+12 -1
View File
@@ -35,6 +35,8 @@ type SysMenu struct {
Route string `json:"route,omitempty"`
// Component holds the value of the "component" field.
Component string `json:"component,omitempty"`
// KeepAlive holds the value of the "keep_alive" field.
KeepAlive bool `json:"keep_alive,omitempty"`
// Hidden holds the value of the "hidden" field.
Hidden bool `json:"hidden,omitempty"`
// Icon holds the value of the "icon" field.
@@ -99,7 +101,7 @@ func (*SysMenu) scanValues(columns []string) ([]any, error) {
switch columns[i] {
case sysmenu.FieldCreateTime, sysmenu.FieldUpdateTime:
values[i] = new(ent2.CustomTime)
case sysmenu.FieldHidden:
case sysmenu.FieldKeepAlive, sysmenu.FieldHidden:
values[i] = new(sql.NullBool)
case sysmenu.FieldID, sysmenu.FieldOrder:
values[i] = new(sql.NullInt64)
@@ -182,6 +184,12 @@ func (_m *SysMenu) assignValues(columns []string, values []any) error {
} else if value.Valid {
_m.Component = value.String
}
case sysmenu.FieldKeepAlive:
if value, ok := values[i].(*sql.NullBool); !ok {
return fmt.Errorf("unexpected type %T for field keep_alive", values[i])
} else if value.Valid {
_m.KeepAlive = value.Bool
}
case sysmenu.FieldHidden:
if value, ok := values[i].(*sql.NullBool); !ok {
return fmt.Errorf("unexpected type %T for field hidden", values[i])
@@ -285,6 +293,9 @@ func (_m *SysMenu) String() string {
builder.WriteString("component=")
builder.WriteString(_m.Component)
builder.WriteString(", ")
builder.WriteString("keep_alive=")
builder.WriteString(fmt.Sprintf("%v", _m.KeepAlive))
builder.WriteString(", ")
builder.WriteString("hidden=")
builder.WriteString(fmt.Sprintf("%v", _m.Hidden))
builder.WriteString(", ")
internal/ent/sysmenu/sysmenu.go
+10
View File
@@ -34,6 +34,8 @@ const (
FieldRoute = "route"
// FieldComponent holds the string denoting the component field in the database.
FieldComponent = "component"
// FieldKeepAlive holds the string denoting the keep_alive field in the database.
FieldKeepAlive = "keep_alive"
// FieldHidden holds the string denoting the hidden field in the database.
FieldHidden = "hidden"
// FieldIcon holds the string denoting the icon field in the database.
@@ -75,6 +77,7 @@ var Columns = []string{
FieldPermission,
FieldRoute,
FieldComponent,
FieldKeepAlive,
FieldHidden,
FieldIcon,
FieldOrder,
@@ -118,6 +121,8 @@ var (
DefaultCreateTime func() *ent2.CustomTime
// DefaultUpdateTime holds the default value on creation for the "update_time" field.
DefaultUpdateTime func() *ent2.CustomTime
// DefaultKeepAlive holds the default value on creation for the "keep_alive" field.
DefaultKeepAlive bool
// DefaultHidden holds the default value on creation for the "hidden" field.
DefaultHidden bool
)
@@ -201,6 +206,11 @@ func ByComponent(opts ...sql.OrderTermOption) OrderOption {
return sql.OrderByField(FieldComponent, opts...).ToFunc()
}
// ByKeepAlive orders the results by the keep_alive field.
func ByKeepAlive(opts ...sql.OrderTermOption) OrderOption {
return sql.OrderByField(FieldKeepAlive, opts...).ToFunc()
}
// ByHidden orders the results by the hidden field.
func ByHidden(opts ...sql.OrderTermOption) OrderOption {
return sql.OrderByField(FieldHidden, opts...).ToFunc()
internal/ent/sysmenu/where.go
+15
View File
@@ -91,6 +91,11 @@ func Component(v string) predicate.SysMenu {
return predicate.SysMenu(sql.FieldEQ(FieldComponent, v))
}
// KeepAlive applies equality check predicate on the "keep_alive" field. It's identical to KeepAliveEQ.
func KeepAlive(v bool) predicate.SysMenu {
return predicate.SysMenu(sql.FieldEQ(FieldKeepAlive, v))
}
// Hidden applies equality check predicate on the "hidden" field. It's identical to HiddenEQ.
func Hidden(v bool) predicate.SysMenu {
return predicate.SysMenu(sql.FieldEQ(FieldHidden, v))
@@ -686,6 +691,16 @@ func ComponentContainsFold(v string) predicate.SysMenu {
return predicate.SysMenu(sql.FieldContainsFold(FieldComponent, v))
}
// KeepAliveEQ applies the EQ predicate on the "keep_alive" field.
func KeepAliveEQ(v bool) predicate.SysMenu {
return predicate.SysMenu(sql.FieldEQ(FieldKeepAlive, v))
}
// KeepAliveNEQ applies the NEQ predicate on the "keep_alive" field.
func KeepAliveNEQ(v bool) predicate.SysMenu {
return predicate.SysMenu(sql.FieldNEQ(FieldKeepAlive, v))
}
// HiddenEQ applies the EQ predicate on the "hidden" field.
func HiddenEQ(v bool) predicate.SysMenu {
return predicate.SysMenu(sql.FieldEQ(FieldHidden, v))
internal/ent/sysmenu_create.go
+65
View File
@@ -101,6 +101,20 @@ func (_c *SysMenuCreate) SetNillableComponent(v *string) *SysMenuCreate {
return _c
}
// SetKeepAlive sets the "keep_alive" field.
func (_c *SysMenuCreate) SetKeepAlive(v bool) *SysMenuCreate {
_c.mutation.SetKeepAlive(v)
return _c
}
// SetNillableKeepAlive sets the "keep_alive" field if the given value is not nil.
func (_c *SysMenuCreate) SetNillableKeepAlive(v *bool) *SysMenuCreate {
if v != nil {
_c.SetKeepAlive(*v)
}
return _c
}
// SetHidden sets the "hidden" field.
func (_c *SysMenuCreate) SetHidden(v bool) *SysMenuCreate {
_c.mutation.SetHidden(v)
@@ -235,6 +249,10 @@ func (_c *SysMenuCreate) defaults() error {
v := sysmenu.DefaultUpdateTime()
_c.mutation.SetUpdateTime(v)
}
if _, ok := _c.mutation.KeepAlive(); !ok {
v := sysmenu.DefaultKeepAlive
_c.mutation.SetKeepAlive(v)
}
if _, ok := _c.mutation.Hidden(); !ok {
v := sysmenu.DefaultHidden
_c.mutation.SetHidden(v)
@@ -267,6 +285,9 @@ func (_c *SysMenuCreate) check() error {
if _, ok := _c.mutation.Permission(); !ok {
return &ValidationError{Name: "permission", err: errors.New(`ent: missing required field "SysMenu.permission"`)}
}
if _, ok := _c.mutation.KeepAlive(); !ok {
return &ValidationError{Name: "keep_alive", err: errors.New(`ent: missing required field "SysMenu.keep_alive"`)}
}
if _, ok := _c.mutation.Hidden(); !ok {
return &ValidationError{Name: "hidden", err: errors.New(`ent: missing required field "SysMenu.hidden"`)}
}
@@ -337,6 +358,10 @@ func (_c *SysMenuCreate) createSpec() (*SysMenu, *sqlgraph.CreateSpec) {
_spec.SetField(sysmenu.FieldComponent, field.TypeString, value)
_node.Component = value
}
if value, ok := _c.mutation.KeepAlive(); ok {
_spec.SetField(sysmenu.FieldKeepAlive, field.TypeBool, value)
_node.KeepAlive = value
}
if value, ok := _c.mutation.Hidden(); ok {
_spec.SetField(sysmenu.FieldHidden, field.TypeBool, value)
_node.Hidden = value
@@ -567,6 +592,18 @@ func (u *SysMenuUpsert) ClearComponent() *SysMenuUpsert {
return u
}
// SetKeepAlive sets the "keep_alive" field.
func (u *SysMenuUpsert) SetKeepAlive(v bool) *SysMenuUpsert {
u.Set(sysmenu.FieldKeepAlive, v)
return u
}
// UpdateKeepAlive sets the "keep_alive" field to the value that was provided on create.
func (u *SysMenuUpsert) UpdateKeepAlive() *SysMenuUpsert {
u.SetExcluded(sysmenu.FieldKeepAlive)
return u
}
// SetHidden sets the "hidden" field.
func (u *SysMenuUpsert) SetHidden(v bool) *SysMenuUpsert {
u.Set(sysmenu.FieldHidden, v)
@@ -793,6 +830,20 @@ func (u *SysMenuUpsertOne) ClearComponent() *SysMenuUpsertOne {
})
}
// SetKeepAlive sets the "keep_alive" field.
func (u *SysMenuUpsertOne) SetKeepAlive(v bool) *SysMenuUpsertOne {
return u.Update(func(s *SysMenuUpsert) {
s.SetKeepAlive(v)
})
}
// UpdateKeepAlive sets the "keep_alive" field to the value that was provided on create.
func (u *SysMenuUpsertOne) UpdateKeepAlive() *SysMenuUpsertOne {
return u.Update(func(s *SysMenuUpsert) {
s.UpdateKeepAlive()
})
}
// SetHidden sets the "hidden" field.
func (u *SysMenuUpsertOne) SetHidden(v bool) *SysMenuUpsertOne {
return u.Update(func(s *SysMenuUpsert) {
@@ -1193,6 +1244,20 @@ func (u *SysMenuUpsertBulk) ClearComponent() *SysMenuUpsertBulk {
})
}
// SetKeepAlive sets the "keep_alive" field.
func (u *SysMenuUpsertBulk) SetKeepAlive(v bool) *SysMenuUpsertBulk {
return u.Update(func(s *SysMenuUpsert) {
s.SetKeepAlive(v)
})
}
// UpdateKeepAlive sets the "keep_alive" field to the value that was provided on create.
func (u *SysMenuUpsertBulk) UpdateKeepAlive() *SysMenuUpsertBulk {
return u.Update(func(s *SysMenuUpsert) {
s.UpdateKeepAlive()
})
}
// SetHidden sets the "hidden" field.
func (u *SysMenuUpsertBulk) SetHidden(v bool) *SysMenuUpsertBulk {
return u.Update(func(s *SysMenuUpsert) {
internal/ent/sysmenu_update.go
+34
View File
@@ -153,6 +153,20 @@ func (_u *SysMenuUpdate) ClearComponent() *SysMenuUpdate {
return _u
}
// SetKeepAlive sets the "keep_alive" field.
func (_u *SysMenuUpdate) SetKeepAlive(v bool) *SysMenuUpdate {
_u.mutation.SetKeepAlive(v)
return _u
}
// SetNillableKeepAlive sets the "keep_alive" field if the given value is not nil.
func (_u *SysMenuUpdate) SetNillableKeepAlive(v *bool) *SysMenuUpdate {
if v != nil {
_u.SetKeepAlive(*v)
}
return _u
}
// SetHidden sets the "hidden" field.
func (_u *SysMenuUpdate) SetHidden(v bool) *SysMenuUpdate {
_u.mutation.SetHidden(v)
@@ -398,6 +412,9 @@ func (_u *SysMenuUpdate) sqlSave(ctx context.Context) (_node int, err error) {
if _u.mutation.ComponentCleared() {
_spec.ClearField(sysmenu.FieldComponent, field.TypeString)
}
if value, ok := _u.mutation.KeepAlive(); ok {
_spec.SetField(sysmenu.FieldKeepAlive, field.TypeBool, value)
}
if value, ok := _u.mutation.Hidden(); ok {
_spec.SetField(sysmenu.FieldHidden, field.TypeBool, value)
}
@@ -686,6 +703,20 @@ func (_u *SysMenuUpdateOne) ClearComponent() *SysMenuUpdateOne {
return _u
}
// SetKeepAlive sets the "keep_alive" field.
func (_u *SysMenuUpdateOne) SetKeepAlive(v bool) *SysMenuUpdateOne {
_u.mutation.SetKeepAlive(v)
return _u
}
// SetNillableKeepAlive sets the "keep_alive" field if the given value is not nil.
func (_u *SysMenuUpdateOne) SetNillableKeepAlive(v *bool) *SysMenuUpdateOne {
if v != nil {
_u.SetKeepAlive(*v)
}
return _u
}
// SetHidden sets the "hidden" field.
func (_u *SysMenuUpdateOne) SetHidden(v bool) *SysMenuUpdateOne {
_u.mutation.SetHidden(v)
@@ -961,6 +992,9 @@ func (_u *SysMenuUpdateOne) sqlSave(ctx context.Context) (_node *SysMenu, err er
if _u.mutation.ComponentCleared() {
_spec.ClearField(sysmenu.FieldComponent, field.TypeString)
}
if value, ok := _u.mutation.KeepAlive(); ok {
_spec.SetField(sysmenu.FieldKeepAlive, field.TypeBool, value)
}
if value, ok := _u.mutation.Hidden(); ok {
_spec.SetField(sysmenu.FieldHidden, field.TypeBool, value)
}
internal/service/menu/menu_service.go
+2
View File
@@ -61,6 +61,7 @@ func (s *MenuServiceV1) Add(ctx context.Context, req *v1.MenuAddReq) *utils.Resp
SetRoute(req.Route).
SetComponent(req.Component).
SetHidden(req.Hidden).
SetKeepAlive(req.KeepAlive).
SetIcon(req.Icon).
SetOrder(req.Order)
if req.ParentId != 0 {
@@ -80,6 +81,7 @@ func (s *MenuServiceV1) Update(ctx context.Context, req *v1.MenuUpdateReq) *util
SetComponent(req.Component).
SetRoute(req.Route).
SetHidden(req.Hidden).
SetKeepAlive(req.KeepAlive).
SetIcon(req.Icon).
SetOrder(req.Order)
if req.ParentId != 0 {