diff --git a/api/v1/system/tools_gen_table.go b/api/v1/system/tools_gen_table.go index 1fa409c..be9739d 100644 --- a/api/v1/system/tools_gen_table.go +++ b/api/v1/system/tools_gen_table.go @@ -110,6 +110,7 @@ type ToolsGenTableColumnsEditReq struct { UseSnowId string `p:"useSnowId"` UseVirtual string `p:"useVirtual"` OverwriteInfo []*entity.OverwriteInfo `p:"overwriteInfo"` + MenuPid uint `p:"menuPid"` } type ToolsGenTableColumnsEditRes struct { diff --git a/go.mod b/go.mod index b455474..75238c1 100644 --- a/go.mod +++ b/go.mod @@ -1,19 +1,19 @@ module github.com/tiger1103/gfast/v3 -go 1.21 +go 1.23 -toolchain go1.23.0 +toolchain go1.23.2 require ( - github.com/ArtisanCloud/PowerWeChat/v3 v3.2.23 + github.com/ArtisanCloud/PowerWeChat/v3 v3.2.45 github.com/aliyun/aliyun-oss-go-sdk v2.2.8+incompatible github.com/apache/rocketmq-client-go/v2 v2.1.1 github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef github.com/casbin/casbin/v2 v2.42.0 - github.com/gogf/gf/contrib/drivers/mysql/v2 v2.7.2 - github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.7.2 - github.com/gogf/gf/contrib/nosql/redis/v2 v2.7.2 - github.com/gogf/gf/v2 v2.7.2 + github.com/gogf/gf/contrib/drivers/mysql/v2 v2.7.4 + github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.7.4 + github.com/gogf/gf/contrib/nosql/redis/v2 v2.7.4 + github.com/gogf/gf/v2 v2.7.4 github.com/gorilla/websocket v1.5.3 github.com/mojocn/base64Captcha v1.3.6 github.com/mssola/user_agent v0.5.3 @@ -31,7 +31,7 @@ require ( require ( filippo.io/edwards25519 v1.1.0 // indirect - github.com/ArtisanCloud/PowerLibs/v3 v3.2.3 // indirect + github.com/ArtisanCloud/PowerLibs/v3 v3.2.6 // indirect github.com/BurntSushi/toml v1.4.0 // indirect github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -101,14 +101,14 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.26.0 // indirect + golang.org/x/crypto v0.27.0 // indirect golang.org/x/image v0.16.0 // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/term v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/text v0.18.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect diff --git a/go.sum b/go.sum index 7c866bc..f033908 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,10 @@ 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/ArtisanCloud/PowerLibs/v3 v3.2.3 h1:B3IMBnn1IskBYte+7IIfKOcxjHVAm3hWvkkE/g3YiQo= -github.com/ArtisanCloud/PowerLibs/v3 v3.2.3/go.mod h1:XFRnJA+D0b0IoeSk2ceZzBp9qxatMHOGtWdZCa/r/3U= -github.com/ArtisanCloud/PowerWeChat/v3 v3.2.23 h1:QzmI/7OKyzAhg/H0o/mwut+oaNhVm1zXCsSRpU7TC1w= -github.com/ArtisanCloud/PowerWeChat/v3 v3.2.23/go.mod h1:mJssuwvXsKmAfT9+YobJsb1V2qHoJOhrLNmEwomFL+0= +github.com/ArtisanCloud/PowerLibs/v3 v3.2.6 h1:xNDXBJ1VNYAEgs4UG/lSygzU66/XG3mTA7mm/qE//NY= +github.com/ArtisanCloud/PowerLibs/v3 v3.2.6/go.mod h1:xFGsskCnzAu+6rFEJbGVAlwhrwZPXAny6m7j71S/B5k= +github.com/ArtisanCloud/PowerWeChat/v3 v3.2.45 h1:Wi8+OTRowLI82kBZfTg9DMyiZKWuUalU7B2BkshsQHE= +github.com/ArtisanCloud/PowerWeChat/v3 v3.2.45/go.mod h1:HgdxYE6yV9OAMKIvHNRHUShq6auhFK0T2sIpUd1dG5o= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= @@ -69,14 +69,14 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl github.com/go-playground/validator/v10 v10.8.0/go.mod h1:9JhgTzTaE31GZDpH/HSvHiRJrJ3iKAgqqH0Bl/Ocjdk= github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= -github.com/gogf/gf/contrib/drivers/mysql/v2 v2.7.2 h1:GpE2JuHVoNJD4lNP1omC1+TKXNCSvXr5oil1bNULYd0= -github.com/gogf/gf/contrib/drivers/mysql/v2 v2.7.2/go.mod h1:0h3UmNAmA8hnjvTyozZelSWWxiAjGDQttzZqMhkCkJo= -github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.7.2 h1:tI4V57XyvKIpCX8WUtyGlh6aN+rFcg2reKnDqbhxuLA= -github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.7.2/go.mod h1:IB+g+oXMF6SZQQY4Ec8Kh3c3LddfEkgIsmYBAc3CsKM= -github.com/gogf/gf/contrib/nosql/redis/v2 v2.7.2 h1:V1hdGnyjU9kT0I3DDDFDl6Ll8yC6aAIFJa/lMQwB8V4= -github.com/gogf/gf/contrib/nosql/redis/v2 v2.7.2/go.mod h1:XzkPv3G8TdKczqoB/ydR3bxvBRdQLQNCOCEgxso/c3o= -github.com/gogf/gf/v2 v2.7.2 h1:uZDfyblasI12lZUtFd1mfxsIr8b14cd/F88DJUTCSDM= -github.com/gogf/gf/v2 v2.7.2/go.mod h1:EBXneAg/wes86rfeh68XC0a2JBNQylmT7Sp6/8Axk88= +github.com/gogf/gf/contrib/drivers/mysql/v2 v2.7.4 h1:Rhv48tVnl+o5qyd1hTLxKStWT7MEqP0zrEXKa/t4VLg= +github.com/gogf/gf/contrib/drivers/mysql/v2 v2.7.4/go.mod h1:V6eAZVlFWv4AgDK7VzLbwMZiOygcu/374Rcyhv9hSEM= +github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.7.4 h1:6eaV81MUtE7NUqYR95wOLQcdZ+OlLxn2GEs+rN+wtrM= +github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.7.4/go.mod h1:JjZO8Ic5UxnFVtEY4cDkpFQQ1tx7pX7ZAQnlJ8ux0Kc= +github.com/gogf/gf/contrib/nosql/redis/v2 v2.7.4 h1:7KS3/mBBLfROPUKjIa8M7umxzajqBA27/CIhWdKAxNc= +github.com/gogf/gf/contrib/nosql/redis/v2 v2.7.4/go.mod h1:B1/0sQcdCpGfpiljng2osL2hoGZkpOXPa+CAvzdoYMw= +github.com/gogf/gf/v2 v2.7.4 h1:cGHUBO5Jr8ty21GN5EO+S2rFYhprdcqnwS7PnWL7+t4= +github.com/gogf/gf/v2 v2.7.4/go.mod h1:EBXneAg/wes86rfeh68XC0a2JBNQylmT7Sp6/8Axk88= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= @@ -284,8 +284,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4= @@ -348,14 +348,14 @@ golang.org/x/sys v0.2.0/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.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= -golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= 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= @@ -364,8 +364,8 @@ 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.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/internal/app/system/dao/internal/tools_gen_table.go b/internal/app/system/dao/internal/tools_gen_table.go index 6055c04..2d02edd 100644 --- a/internal/app/system/dao/internal/tools_gen_table.go +++ b/internal/app/system/dao/internal/tools_gen_table.go @@ -43,6 +43,7 @@ type ToolsGenTableColumns struct { UseSnowId string //主键是否使用雪花ID UseVirtual string // 树表是否使用虚拟表 OverwriteInfo string // 覆盖文件信息 + MenuPid string // 父级菜单ID } // toolsGenTableColumns holds the columns for table tools_gen_table. @@ -69,7 +70,8 @@ var toolsGenTableColumns = ToolsGenTableColumns{ ExcelImp: "excel_imp", UseSnowId: "use_snow_id", UseVirtual: "use_virtual", - OverwriteInfo:"overwrite_info", + OverwriteInfo: "overwrite_info", + MenuPid: "menu_pid", } // NewToolsGenTableDao creates and returns a new DAO object for table data access. diff --git a/internal/app/system/logic/sysRole/sys_role.go b/internal/app/system/logic/sysRole/sys_role.go index 3c144ee..1433dbc 100644 --- a/internal/app/system/logic/sysRole/sys_role.go +++ b/internal/app/system/logic/sysRole/sys_role.go @@ -68,7 +68,7 @@ func (s *sSysRole) GetRoleListSearch(ctx context.Context, req *system.RoleListRe model = model.LeftJoin("sys_user", "u", "CONCAT('u_',u.id) = b.v0") } model = model.Group("a.id") - err = model.Order("id asc").Fields("a.*, count(u.id) user_cnt").Scan(&res.List) + err = model.Order("list_order asc,id asc").Fields("a.*, count(u.id) user_cnt").Scan(&res.List) liberr.ErrIsNil(ctx, err, "获取数据失败") }) return diff --git a/internal/app/system/logic/toolsGenTable/tools_gen_table.go b/internal/app/system/logic/toolsGenTable/tools_gen_table.go index 4a3d4df..60e82da 100644 --- a/internal/app/system/logic/toolsGenTable/tools_gen_table.go +++ b/internal/app/system/logic/toolsGenTable/tools_gen_table.go @@ -477,6 +477,7 @@ func (s *sToolsGenTable) SaveEdit(ctx context.Context, req *system.ToolsGenTable } else { table.Options = "" } + table.MenuPid = req.MenuPid err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) (err error) { err = g.Try(ctx, func(ctx context.Context) { diff --git a/internal/app/system/model/do/tools_gen_table.go b/internal/app/system/model/do/tools_gen_table.go index b1ee064..968a15c 100644 --- a/internal/app/system/model/do/tools_gen_table.go +++ b/internal/app/system/model/do/tools_gen_table.go @@ -31,8 +31,9 @@ type ToolsGenTable struct { SortType interface{} // 排序方式 (asc顺序 desc倒序) ShowDetail interface{} // 是否有查看详情功能 ExcelPort interface{} // 是否有导出excel功能 - ExcelImp interface{} // 是否有导入excel功能 + ExcelImp interface{} // 是否有导入excel功能 UseSnowId interface{} //主键是否使用雪花ID UseVirtual interface{} //树表是否使用虚拟表 - OverwriteInfo interface{} //覆盖文件信息 + OverwriteInfo interface{} //覆盖文件信息 + MenuPid interface{} //父级菜单ID } diff --git a/internal/app/system/model/entity/tools_gen_table.go b/internal/app/system/model/entity/tools_gen_table.go index 962ecf8..6c301c0 100644 --- a/internal/app/system/model/entity/tools_gen_table.go +++ b/internal/app/system/model/entity/tools_gen_table.go @@ -10,27 +10,28 @@ import ( // ToolsGenTable is the golang structure for table tools_gen_table. type ToolsGenTable struct { - TableId int64 `json:"tableId" description:"编号"` - TableName string `json:"tableName" description:"表名称"` - TableComment string `json:"tableComment" description:"表描述"` - ClassName string `json:"className" description:"实体类名称"` - TplCategory string `json:"tplCategory" description:"使用的模板（crud单表操作 tree树表操作）"` - PackageName string `json:"packageName" description:"生成包路径"` - ModuleName string `json:"moduleName" description:"生成模块名"` - BusinessName string `json:"businessName" description:"生成业务名"` - FunctionName string `json:"functionName" description:"生成功能名"` - FunctionAuthor string `json:"functionAuthor" description:"生成功能作者"` - Options string `json:"options" description:"其它生成选项"` - CreateTime *gtime.Time `json:"createTime" description:"创建时间"` - UpdateTime *gtime.Time `json:"updateTime" description:"更新时间"` - Remark string `json:"remark" description:"备注"` - Overwrite bool `json:"overwrite" description:"是否覆盖原有文件"` - SortColumn string `json:"sortColumn" description:"排序字段名"` - SortType string `json:"sortType" description:"排序方式 (asc顺序 desc倒序)"` - ShowDetail bool `json:"showDetail" description:"是否有查看详情功能"` - ExcelPort bool `json:"excelPort" description:"是否有excel导出功能"` - ExcelImp bool `json:"excelImp" description:"是否有excel导入功能"` - UseSnowId bool `json:"useSnowId" description:"主键是否使用雪花ID"` - UseVirtual bool `json:"useVirtual" orm:"use_virtual" description:"树表是否使用虚拟表"` + TableId int64 `json:"tableId" description:"编号"` + TableName string `json:"tableName" description:"表名称"` + TableComment string `json:"tableComment" description:"表描述"` + ClassName string `json:"className" description:"实体类名称"` + TplCategory string `json:"tplCategory" description:"使用的模板（crud单表操作 tree树表操作）"` + PackageName string `json:"packageName" description:"生成包路径"` + ModuleName string `json:"moduleName" description:"生成模块名"` + BusinessName string `json:"businessName" description:"生成业务名"` + FunctionName string `json:"functionName" description:"生成功能名"` + FunctionAuthor string `json:"functionAuthor" description:"生成功能作者"` + Options string `json:"options" description:"其它生成选项"` + CreateTime *gtime.Time `json:"createTime" description:"创建时间"` + UpdateTime *gtime.Time `json:"updateTime" description:"更新时间"` + Remark string `json:"remark" description:"备注"` + Overwrite bool `json:"overwrite" description:"是否覆盖原有文件"` + SortColumn string `json:"sortColumn" description:"排序字段名"` + SortType string `json:"sortType" description:"排序方式 (asc顺序 desc倒序)"` + ShowDetail bool `json:"showDetail" description:"是否有查看详情功能"` + ExcelPort bool `json:"excelPort" description:"是否有excel导出功能"` + ExcelImp bool `json:"excelImp" description:"是否有excel导入功能"` + UseSnowId bool `json:"useSnowId" description:"主键是否使用雪花ID"` + UseVirtual bool `json:"useVirtual" orm:"use_virtual" description:"树表是否使用虚拟表"` OverwriteInfo []*OverwriteInfo `json:"overwriteInfo" orm:"overwrite_info" description:"覆盖文件信息"` + MenuPid uint `json:"menuPid" orm:"menu_pid" description:"父级菜单ID"` } diff --git a/internal/app/system/model/tools_gen_table.go b/internal/app/system/model/tools_gen_table.go index bd864fc..9f60026 100644 --- a/internal/app/system/model/tools_gen_table.go +++ b/internal/app/system/model/tools_gen_table.go @@ -57,6 +57,7 @@ type ToolsGenTableEx struct { QueryColumns []*ToolsGenTableColumnEx // 查询表单列信息 PkColumn *ToolsGenTableColumnEx // 主键列信息 LinkedTables []*ToolsGenTableLinked // 关联表信息 + MenuPid uint // 父级菜单ID } // ToolsGenTableLinked 关联表 diff --git a/internal/consts/version.go b/internal/consts/version.go index ac57950..698c2e0 100644 --- a/internal/consts/version.go +++ b/internal/consts/version.go @@ -9,5 +9,5 @@ package consts const ( Logo = `CiAgIF9fX19fX19fX19fXyAgICAgICAgICAgX18gCiAgLyBfX19fLyBfX19fL19fXyBfX19fX18vIC9fCiAvIC8gX18vIC9fICAvIF9fIGAvIF9fXy8gX18vCi8gL18vIC8gX18vIC8gL18vIChfXyAgKSAvXyAgClxfX19fL18vICAgIFxfXyxfL19fX18vXF9fLyAg` - Version = "3.2.31" + Version = "3.2.32" ) diff --git a/library/libUtils/utils.go b/library/libUtils/utils.go index d922d3a..cf58ecd 100644 --- a/library/libUtils/utils.go +++ b/library/libUtils/utils.go @@ -34,12 +34,18 @@ func EncryptPassword(password, salt string) string { // GetDomain 获取当前请求接口域名 func GetDomain(ctx context.Context) string { r := g.RequestFromCtx(ctx) - pathInfo, err := gurl.ParseURL(r.GetUrl(), -1) - if err != nil { - g.Log().Error(ctx, err) - return "" + host := r.Header.Get("X-Forwarded-Host") + if host == "" { + host = r.Header.Get("X-Host") } - return fmt.Sprintf("%s://%s:%s/", pathInfo["scheme"], pathInfo["host"], pathInfo["port"]) + if host == "" { + host = r.Host + } + scheme := r.Header.Get("X-Scheme") + if scheme == "" { + scheme = r.GetSchema() + } + return fmt.Sprintf("%s://%s", scheme, host) } // GetClientIp 获取客户端IP diff --git a/resource/data/gfast-v32-pg.sql b/resource/data/gfast-v32-pg.sql index ba1fa55..418cf14 100644 --- a/resource/data/gfast-v32-pg.sql +++ b/resource/data/gfast-v32-pg.sql @@ -1,21 +1,3 @@ -/* - Navicat Premium Data Transfer - - Source Server : centos-pg - Source Server Type : PostgreSQL - Source Server Version : 140010 - Source Host : 192.168.0.214:5432 - Source Catalog : gfast-v32 - Source Schema : public - - Target Server Type : PostgreSQL - Target Server Version : 140010 - File Encoding : 65001 - - Date: 12/04/2024 17:11:52 -*/ - - -- ---------------------------- -- Sequence structure for big_file_id_seq -- ---------------------------- @@ -5273,7 +5255,8 @@ CREATE TABLE "tools_gen_table" ( "use_snow_id" bool NOT NULL DEFAULT false, "use_virtual" bool NOT NULL DEFAULT false, "excel_imp" bool NOT NULL DEFAULT false, - "overwrite_info" json + "overwrite_info" json, + "menu_pid" int4 NOT NULL DEFAULT 0 ) ; COMMENT ON COLUMN "tools_gen_table"."table_id" IS '编号'; @@ -5299,17 +5282,18 @@ COMMENT ON COLUMN "tools_gen_table"."use_snow_id" IS '主键是否雪花ID'; COMMENT ON COLUMN "tools_gen_table"."use_virtual" IS '树表是否使用虚拟表'; COMMENT ON COLUMN "tools_gen_table"."excel_imp" IS '是否导入excel'; COMMENT ON COLUMN "tools_gen_table"."overwrite_info" IS '生成覆盖的文件'; +COMMENT ON COLUMN "tools_gen_table"."menu_pid" IS '父级菜单ID'; COMMENT ON TABLE "tools_gen_table" IS '代码生成业务表'; -- ---------------------------- -- Records of tools_gen_table -- ---------------------------- -INSERT INTO "tools_gen_table" VALUES (91, 'demo_gen', '代码生成测试表', 'DemoGen', 'crud', 'internal/app/demo', 'demo', 'demo_gen', '代码生成测试', 'gfast', '', '2022-11-01 17:27:43', '2023-08-22 11:46:58', '', 't', 'id', 'asc', 't', 't', 'f', 'f', 'f', NULL); -INSERT INTO "tools_gen_table" VALUES (92, 'demo_gen_class', '代码生成关联测试表', 'DemoGenClass', 'crud', 'internal/app/demo', 'demo', 'demo_gen_class', '分类信息', 'gfast', '', '2022-11-03 06:36:57', '2023-08-18 15:33:30', '分类', 't', 'id', 'asc', 't', 't', 'f', 'f', 'f', NULL); -INSERT INTO "tools_gen_table" VALUES (93, 'demo_gen_tree', '代码生成树形结构测试表', 'DemoGenTree', 'tree', 'internal/app/demo', 'demo', 'demo_gen_tree', '代码生成树形结构测试', 'gfast', '{"treeCode":"id","treeName":"demoName","treeParentCode":"parentId"}', '2022-11-29 15:11:34', '2023-11-02 18:16:23', '', 't', 'id', 'asc', 't', 'f', 'f', 't', 'f', NULL); -INSERT INTO "tools_gen_table" VALUES (94, 'demo_data_auth', '数据权限测试', 'DemoDataAuth', 'crud', 'internal/app/demo', 'de_mo', 'demo_data_auth', '数据权限测试', 'gfast', '', '2023-02-12 11:18:42', '2023-07-18 15:22:28', '', 't', 'id', 'asc', 'f', 'f', 'f', 'f', 'f', NULL); -INSERT INTO "tools_gen_table" VALUES (95, 'demo_snow_id', '雪花ID测试', 'DemoSnowId', 'crud', 'internal/app/demo', 'demo', 'demo_snow_id', '雪花ID测试', 'gfast', '', '2023-09-19 15:34:46', '2023-09-20 14:48:07', '', 't', 'id', 'asc', 't', 't', 't', 'f', 'f', NULL); -INSERT INTO "tools_gen_table" VALUES (96, 'demo_city_code', '省市区县和天气预报编码', 'DemoCityCode', 'tree', 'internal/app/demo', 'demo', 'demo_city_code', '省市区县', 'gfast', '{"treeCode":"id","treeName":"name","treeParentCode":"pid"}', '2023-11-02 10:38:51', '2023-11-03 09:39:49', '', 't', 'id', 'asc', 't', 'f', 'f', 't', 'f', NULL); +INSERT INTO "tools_gen_table" VALUES (91, 'demo_gen', '代码生成测试表', 'DemoGen', 'crud', 'internal/app/demo', 'demo', 'demo_gen', '代码生成测试', 'gfast', '', '2022-11-01 17:27:43', '2023-08-22 11:46:58', '', 'f', 'id', 'asc', 'f', 'f', 'f', 'f', 'f', NULL, 0); +INSERT INTO "tools_gen_table" VALUES (92, 'demo_gen_class', '代码生成关联测试表', 'DemoGenClass', 'crud', 'internal/app/demo', 'demo', 'demo_gen_class', '分类信息', 'gfast', '', '2022-11-03 06:36:57', '2023-08-18 15:33:30', '分类', 'f', 'id', 'asc', 'f', 'f', 'f', 'f', 'f', NULL, 0); +INSERT INTO "tools_gen_table" VALUES (93, 'demo_gen_tree', '代码生成树形结构测试表', 'DemoGenTree', 'tree', 'internal/app/demo', 'demo', 'demo_gen_tree', '代码生成树形结构测试', 'gfast', '{"treeCode":"id","treeName":"demoName","treeParentCode":"parentId"}', '2022-11-29 15:11:34', '2023-11-02 18:16:23', '', 'f', 'id', 'asc', 'f', 'f', 'f', 'f', 'f', NULL, 0); +INSERT INTO "tools_gen_table" VALUES (94, 'demo_data_auth', '数据权限测试', 'DemoDataAuth', 'crud', 'internal/app/demo', 'de_mo', 'demo_data_auth', '数据权限测试', 'gfast', '', '2023-02-12 11:18:42', '2023-07-18 15:22:28', '', 'f', 'id', 'asc', 'f', 'f', 'f', 'f', 'f', NULL, 0); +INSERT INTO "tools_gen_table" VALUES (95, 'demo_snow_id', '雪花ID测试', 'DemoSnowId', 'crud', 'internal/app/demo', 'demo', 'demo_snow_id', '雪花ID测试', 'gfast', '', '2023-09-19 15:34:46', '2023-09-20 14:48:07', '', 'f', 'id', 'asc', 'f', 'f', 'f', 'f', 'f', NULL, 0); +INSERT INTO "tools_gen_table" VALUES (96, 'demo_city_code', '省市区县和天气预报编码', 'DemoCityCode', 'tree', 'internal/app/demo', 'demo', 'demo_city_code', '省市区县', 'gfast', '{"treeCode":"id","treeName":"name","treeParentCode":"pid"}', '2023-11-02 10:38:51', '2023-11-03 09:39:49', '', 'f', 'id', 'asc', 'f', 'f', 'f', 'f', 'f', NULL, 0); -- ---------------------------- -- Table structure for tools_gen_table_column @@ -5401,62 +5385,62 @@ COMMENT ON TABLE "tools_gen_table_column" IS '代码生成业务表字段'; -- ---------------------------- -- Records of tools_gen_table_column -- ---------------------------- -INSERT INTO "tools_gen_table_column" VALUES (944, 91, 'id', 'ID', 'int(11) unsigned', 'uint', 'number', 'Id', 'id', 't', 't', 't', 'f', 't', 'f', 'f', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (945, 91, 'demo_name', '姓名', 'varchar(20)', 'string', 'string', 'DemoName', 'demoName', 'f', 'f', 't', 't', 't', 'f', 't', 2, 2, 2, 2, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (946, 91, 'demo_age', '年龄', 'int(10) unsigned', 'uint', 'number', 'DemoAge', 'demoAge', 'f', 'f', 'f', 't', 't', 't', 't', 3, 3, 3, 3, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (947, 91, 'classes', '班级', 'varchar(30)', 'string', 'string', 'Classes', 'classes', 'f', 'f', 'f', 't', 't', 't', 't', 4, 4, 4, 4, 'EQ', 'radio', '', 'demo_gen_class', 'DemoGenClass', 'demo', 'demo_gen_class', 'internal/app/demo', 'id', 'class_name', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (948, 91, 'demo_born', '出生年月', 'datetime', 'Time', 'string', 'DemoBorn', 'demoBorn', 'f', 'f', 'f', 't', 't', 't', 't', 5, 5, 5, 5, 'BETWEEN', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (949, 91, 'demo_gender', '性别', 'tinyint(3) unsigned', 'uint', 'number', 'DemoGender', 'demoGender', 'f', 'f', 'f', 't', 't', 't', 't', 6, 6, 6, 6, 'EQ', 'radio', 'sys_user_sex', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (950, 91, 'created_at', '创建日期', 'datetime', 'Time', 'string', 'CreatedAt', 'createdAt', 'f', 'f', 'f', 'f', 't', 't', 't', 7, 7, 7, 7, 'BETWEEN', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (944, 91, 'id', 'ID', 'int(11) unsigned', 'uint', 'number', 'Id', 'id', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (945, 91, 'demo_name', '姓名', 'varchar(20)', 'string', 'string', 'DemoName', 'demoName', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 2, 2, 2, 2, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (946, 91, 'demo_age', '年龄', 'int(10) unsigned', 'uint', 'number', 'DemoAge', 'demoAge', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 3, 3, 3, 3, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (947, 91, 'classes', '班级', 'varchar(30)', 'string', 'string', 'Classes', 'classes', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 4, 4, 4, 4, 'EQ', 'radio', '', 'demo_gen_class', 'DemoGenClass', 'demo', 'demo_gen_class', 'internal/app/demo', 'id', 'class_name', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (948, 91, 'demo_born', '出生年月', 'datetime', 'Time', 'string', 'DemoBorn', 'demoBorn', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 5, 5, 5, 5, 'BETWEEN', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (949, 91, 'demo_gender', '性别', 'tinyint(3) unsigned', 'uint', 'number', 'DemoGender', 'demoGender', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 6, 6, 6, 6, 'EQ', 'radio', 'sys_user_sex', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (950, 91, 'created_at', '创建日期', 'datetime', 'Time', 'string', 'CreatedAt', 'createdAt', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 7, 7, 7, 7, 'BETWEEN', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); INSERT INTO "tools_gen_table_column" VALUES (951, 91, 'updated_at', '修改日期', 'datetime', 'Time', 'string', 'UpdatedAt', 'updatedAt', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 8, 8, 8, 8, 'EQ', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); INSERT INTO "tools_gen_table_column" VALUES (952, 91, 'deleted_at', '删除日期', 'datetime', 'Time', 'string', 'DeletedAt', 'deletedAt', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 9, 9, 9, 9, 'EQ', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (953, 91, 'created_by', '创建人', 'bigint(20) unsigned', 'uint64', 'number', 'CreatedBy', 'createdBy', 'f', 'f', 'f', 'f', 't', 't', 'f', 10, 10, 10, 10, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (954, 91, 'updated_by', '修改人', 'bigint(20) unsigned', 'uint64', 'number', 'UpdatedBy', 'updatedBy', 'f', 'f', 'f', 'f', 'f', 't', 'f', 11, 11, 11, 11, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (955, 91, 'demo_status', '状态', 'tinyint(4)', 'int', 'number', 'DemoStatus', 'demoStatus', 'f', 'f', 't', 't', 't', 't', 't', 12, 12, 12, 12, 'EQ', 'radio', 'sys_normal_disable', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (956, 91, 'demo_cate', '分类', 'varchar(30)', 'string', 'string', 'DemoCate', 'demoCate', 'f', 'f', 'f', 't', 't', 't', 't', 13, 13, 13, 13, 'EQ', 'checkbox', 'cms_article_type', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (957, 91, 'demo_thumb', '头像', 'text', 'string', 'string', 'DemoThumb', 'demoThumb', 'f', 'f', 'f', 't', 't', 't', 'f', 14, 14, 14, 14, 'EQ', 'imagefile', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (958, 91, 'demo_photo', '相册', 'text', 'string', 'string', 'DemoPhoto', 'demoPhoto', 'f', 'f', 'f', 't', 'f', 't', 'f', 15, 15, 15, 15, 'EQ', 'images', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (959, 91, 'demo_info', '个人描述', 'text', 'string', 'string', 'DemoInfo', 'demoInfo', 'f', 'f', 'f', 't', 'f', 't', 'f', 16, 16, 16, 16, 'EQ', 'richtext', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (960, 91, 'demo_file', '相关附件', 'text', 'string', 'string', 'DemoFile', 'demoFile', 'f', 'f', 'f', 't', 'f', 't', 'f', 17, 17, 17, 17, 'EQ', 'files', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (961, 92, 'id', '分类id', 'int(10) unsigned', 'uint', 'number', 'Id', 'id', 't', 't', 't', 'f', 't', 't', 'f', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (962, 92, 'class_name', '分类名', 'varchar(30)', 'string', 'string', 'ClassName', 'className', 'f', 'f', 't', 't', 't', 't', 't', 2, 2, 2, 2, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (963, 93, 'id', '', 'int(11) unsigned', 'uint', 'number', 'Id', 'id', 't', 't', 't', 'f', 't', 'f', 'f', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (964, 93, 'parent_id', '父级ID', 'int(10) unsigned', 'uint', 'number', 'ParentId', 'parentId', 'f', 'f', 'f', 't', 'f', 't', 'f', 2, 2, 2, 2, 'EQ', 'treeSelect', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (965, 93, 'demo_name', '姓名', 'varchar(20)', 'string', 'string', 'DemoName', 'demoName', 'f', 'f', 't', 't', 't', 't', 't', 3, 3, 3, 3, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (966, 93, 'demo_age', '年龄', 'int(10) unsigned', 'uint', 'number', 'DemoAge', 'demoAge', 'f', 'f', 'f', 't', 't', 't', 't', 4, 4, 4, 4, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (967, 93, 'classes', '班级', 'varchar(30)', 'string', 'string', 'Classes', 'classes', 'f', 'f', 'f', 't', 't', 't', 't', 5, 5, 5, 5, 'EQ', 'select', '', 'demo_gen_class', 'DemoGenClass', 'demo', 'demo_gen_class', 'internal/app/demo', 'id', 'class_name', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (968, 93, 'demo_born', '出生年月', 'datetime', 'Time', 'string', 'DemoBorn', 'demoBorn', 'f', 'f', 'f', 't', 't', 't', 't', 6, 6, 6, 6, 'EQ', 'date', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (969, 93, 'demo_gender', '性别', 'tinyint(3) unsigned', 'uint', 'number', 'DemoGender', 'demoGender', 'f', 'f', 'f', 't', 't', 't', 't', 7, 7, 7, 7, 'EQ', 'radio', 'sys_user_sex', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (970, 93, 'created_at', '创建日期', 'datetime', 'Time', 'string', 'CreatedAt', 'createdAt', 'f', 'f', 'f', 'f', 't', 't', 'f', 8, 8, 8, 8, 'EQ', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 200, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (953, 91, 'created_by', '创建人', 'bigint(20) unsigned', 'uint64', 'number', 'CreatedBy', 'createdBy', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 10, 10, 10, 10, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (954, 91, 'updated_by', '修改人', 'bigint(20) unsigned', 'uint64', 'number', 'UpdatedBy', 'updatedBy', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 11, 11, 11, 11, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (955, 91, 'demo_status', '状态', 'tinyint(4)', 'int', 'number', 'DemoStatus', 'demoStatus', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 12, 12, 12, 12, 'EQ', 'radio', 'sys_normal_disable', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (956, 91, 'demo_cate', '分类', 'varchar(30)', 'string', 'string', 'DemoCate', 'demoCate', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 13, 13, 13, 13, 'EQ', 'checkbox', 'cms_article_type', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (957, 91, 'demo_thumb', '头像', 'text', 'string', 'string', 'DemoThumb', 'demoThumb', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 14, 14, 14, 14, 'EQ', 'imagefile', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (958, 91, 'demo_photo', '相册', 'text', 'string', 'string', 'DemoPhoto', 'demoPhoto', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 15, 15, 15, 15, 'EQ', 'images', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (959, 91, 'demo_info', '个人描述', 'text', 'string', 'string', 'DemoInfo', 'demoInfo', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 16, 16, 16, 16, 'EQ', 'richtext', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (960, 91, 'demo_file', '相关附件', 'text', 'string', 'string', 'DemoFile', 'demoFile', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 17, 17, 17, 17, 'EQ', 'files', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (961, 92, 'id', '分类id', 'int(10) unsigned', 'uint', 'number', 'Id', 'id', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (962, 92, 'class_name', '分类名', 'varchar(30)', 'string', 'string', 'ClassName', 'className', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 2, 2, 2, 2, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (963, 93, 'id', '', 'int(11) unsigned', 'uint', 'number', 'Id', 'id', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (964, 93, 'parent_id', '父级ID', 'int(10) unsigned', 'uint', 'number', 'ParentId', 'parentId', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 2, 2, 2, 2, 'EQ', 'treeSelect', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (965, 93, 'demo_name', '姓名', 'varchar(20)', 'string', 'string', 'DemoName', 'demoName', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 3, 3, 3, 3, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (966, 93, 'demo_age', '年龄', 'int(10) unsigned', 'uint', 'number', 'DemoAge', 'demoAge', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 4, 4, 4, 4, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (967, 93, 'classes', '班级', 'varchar(30)', 'string', 'string', 'Classes', 'classes', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 5, 5, 5, 5, 'EQ', 'select', '', 'demo_gen_class', 'DemoGenClass', 'demo', 'demo_gen_class', 'internal/app/demo', 'id', 'class_name', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (968, 93, 'demo_born', '出生年月', 'datetime', 'Time', 'string', 'DemoBorn', 'demoBorn', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 6, 6, 6, 6, 'EQ', 'date', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (969, 93, 'demo_gender', '性别', 'tinyint(3) unsigned', 'uint', 'number', 'DemoGender', 'demoGender', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 7, 7, 7, 7, 'EQ', 'radio', 'sys_user_sex', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (970, 93, 'created_at', '创建日期', 'datetime', 'Time', 'string', 'CreatedAt', 'createdAt', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 8, 8, 8, 8, 'EQ', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 200, 'f', 'f', 'f', '', ''); INSERT INTO "tools_gen_table_column" VALUES (971, 93, 'updated_at', '修改日期', 'datetime', 'Time', 'string', 'UpdatedAt', 'updatedAt', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 9, 9, 9, 9, 'EQ', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); INSERT INTO "tools_gen_table_column" VALUES (972, 93, 'deleted_at', '删除日期', 'datetime', 'Time', 'string', 'DeletedAt', 'deletedAt', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 10, 10, 10, 10, 'EQ', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (973, 93, 'created_by', '创建人', 'bigint(20) unsigned', 'uint64', 'number', 'CreatedBy', 'createdBy', 'f', 'f', 'f', 'f', 't', 't', 'f', 11, 11, 11, 11, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (973, 93, 'created_by', '创建人', 'bigint(20) unsigned', 'uint64', 'number', 'CreatedBy', 'createdBy', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 11, 11, 11, 11, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); INSERT INTO "tools_gen_table_column" VALUES (974, 93, 'updated_by', '修改人', 'bigint(20) unsigned', 'uint64', 'number', 'UpdatedBy', 'updatedBy', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 12, 12, 12, 12, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (975, 93, 'demo_status', '状态', 'tinyint(4)', 'int', 'number', 'DemoStatus', 'demoStatus', 'f', 'f', 't', 't', 't', 't', 't', 13, 13, 13, 13, 'EQ', 'radio', 'sys_normal_disable', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (976, 93, 'demo_cate', '分类', 'varchar(30)', 'string', 'string', 'DemoCate', 'demoCate', 'f', 'f', 'f', 't', 't', 't', 'f', 14, 14, 14, 14, 'EQ', 'select', 'sys_oper_log_status', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (977, 91, 'classes_two', '班级2', 'varchar(30)', 'string', 'string', 'ClassesTwo', 'classesTwo', 'f', 'f', 'f', 't', 't', 't', 't', 4, 4, 4, 4, 'EQ', 'checkbox', '', 'demo_gen_class', 'DemoGenClass', 'demo', 'demo_gen_class', 'internal/app/demo', 'id', 'class_name', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (978, 94, 'id', '', 'int(11) unsigned', 'uint', 'number', 'Id', 'id', 't', 't', 't', 'f', 't', 't', 't', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (979, 94, 'title', '标题', 'varchar(255)', 'string', 'string', 'Title', 'title', 'f', 'f', 'f', 't', 't', 't', 't', 2, 2, 2, 2, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (980, 94, 'created_by', '创建人', 'int(10) unsigned', 'uint', 'number', 'CreatedBy', 'createdBy', 'f', 'f', 'f', 'f', 't', 't', 'f', 3, 3, 3, 3, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (981, 94, 'updated_by', '修改人', 'int(10) unsigned', 'uint', 'number', 'UpdatedBy', 'updatedBy', 'f', 'f', 'f', 'f', 'f', 't', 'f', 4, 4, 4, 4, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (982, 94, 'created_at', '创建时间', 'datetime', 'Time', 'string', 'CreatedAt', 'createdAt', 'f', 'f', 'f', 'f', 't', 't', 'f', 5, 5, 5, 5, 'EQ', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (975, 93, 'demo_status', '状态', 'tinyint(4)', 'int', 'number', 'DemoStatus', 'demoStatus', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 13, 13, 13, 13, 'EQ', 'radio', 'sys_normal_disable', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (976, 93, 'demo_cate', '分类', 'varchar(30)', 'string', 'string', 'DemoCate', 'demoCate', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 14, 14, 14, 14, 'EQ', 'select', 'sys_oper_log_status', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (977, 91, 'classes_two', '班级2', 'varchar(30)', 'string', 'string', 'ClassesTwo', 'classesTwo', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 4, 4, 4, 4, 'EQ', 'checkbox', '', 'demo_gen_class', 'DemoGenClass', 'demo', 'demo_gen_class', 'internal/app/demo', 'id', 'class_name', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (978, 94, 'id', '', 'int(11) unsigned', 'uint', 'number', 'Id', 'id', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (979, 94, 'title', '标题', 'varchar(255)', 'string', 'string', 'Title', 'title', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 2, 2, 2, 2, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (980, 94, 'created_by', '创建人', 'int(10) unsigned', 'uint', 'number', 'CreatedBy', 'createdBy', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 3, 3, 3, 3, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (981, 94, 'updated_by', '修改人', 'int(10) unsigned', 'uint', 'number', 'UpdatedBy', 'updatedBy', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 4, 4, 4, 4, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (982, 94, 'created_at', '创建时间', 'datetime', 'Time', 'string', 'CreatedAt', 'createdAt', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 5, 5, 5, 5, 'EQ', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); INSERT INTO "tools_gen_table_column" VALUES (983, 94, 'updated_at', '修改时间', 'datetime', 'Time', 'string', 'UpdatedAt', 'updatedAt', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 6, 6, 6, 6, 'EQ', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); INSERT INTO "tools_gen_table_column" VALUES (984, 94, 'deleted_at', '删除时间', 'datetime', 'Time', 'string', 'DeletedAt', 'deletedAt', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 7, 7, 7, 7, 'EQ', 'datetime', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (994, 91, 'cate_trees', '树型结构', 'varchar(10)', 'uint', 'number', 'CateTrees', 'cateTrees', 'f', 'f', 'f', 't', 'f', 't', 't', 19, 19, 19, 19, 'EQ', 'treeSelect', '', 'demo_gen_tree', 'DemoGenTree', 'demo', 'demo_gen_tree', 'internal/app/demo', 'id', 'demo_name', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (995, 91, 'cate_trees_two', '树形多选', 'varchar(255)', 'string', 'string', 'CateTreesTwo', 'cateTreesTwo', 'f', 'f', 'f', 't', 't', 't', 't', 20, 20, 20, 20, 'EQ', 'treeSelects', '', 'demo_gen_tree', 'DemoGenTree', 'demo', 'demo_gen_tree', 'internal/app/demo', 'id', 'demo_name', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (996, 91, 'options', '其他选项', 'text', 'string', 'string', 'Options', 'options', 'f', 'f', 'f', 't', 'f', 't', 'f', 21, 21, 21, 21, 'EQ', 'keyValue', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (997, 95, 'id', 'ID', 'bigint(20) unsigned', 'uint64', 'number', 'Id', 'id', 't', 'f', 't', 'f', 't', 't', 't', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (998, 95, 'name', '姓名', 'varchar(30)', 'string', 'string', 'Name', 'name', 'f', 'f', 't', 't', 't', 't', 't', 2, 2, 2, 2, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (999, 95, 'age', '年龄', 'int(10) unsigned', 'uint', 'number', 'Age', 'age', 'f', 'f', 't', 't', 't', 't', 't', 3, 3, 3, 3, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (1000, 96, 'id', '城市ID', 'varchar(255)', 'string', 'string', 'Id', 'id', 't', 'f', 't', 'f', 't', 't', 'f', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (1001, 96, 'pid', '城市父ID', 'varchar(255)', 'string', 'string', 'Pid', 'pid', 'f', 'f', 'f', 't', 'f', 't', 'f', 2, 2, 2, 2, 'EQ', 'treeSelect', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (1002, 96, 'deep', '级别', 'varchar(255)', 'string', 'string', 'Deep', 'deep', 'f', 'f', 'f', 't', 't', 't', 'f', 3, 3, 3, 3, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (1003, 96, 'name', '城市名称', 'varchar(255)', 'string', 'string', 'Name', 'name', 'f', 'f', 't', 't', 't', 't', 't', 4, 4, 4, 4, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (1004, 96, 'pinyin_prefix', '城市拼音头', 'varchar(255)', 'string', 'string', 'PinyinPrefix', 'pinyinPrefix', 'f', 'f', 'f', 't', 't', 't', 'f', 5, 5, 5, 5, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (1005, 96, 'pinyin', '城市拼音', 'varchar(255)', 'string', 'string', 'Pinyin', 'pinyin', 'f', 'f', 'f', 't', 't', 't', 'f', 6, 6, 6, 6, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (1006, 96, 'ext_id', '完整ID', 'varchar(255)', 'string', 'string', 'ExtId', 'extId', 'f', 'f', 'f', 't', 'f', 't', 'f', 7, 7, 7, 7, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (1007, 96, 'ext_name', '城市全称', 'varchar(255)', 'string', 'string', 'ExtName', 'extName', 'f', 'f', 't', 't', 't', 't', 'f', 8, 8, 8, 8, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -INSERT INTO "tools_gen_table_column" VALUES (1008, 96, 'weathercode', '天气预报的编码', 'varchar(255)', 'string', 'string', 'Weathercode', 'weathercode', 'f', 'f', 'f', 't', 'f', 't', 'f', 9, 9, 9, 9, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (994, 91, 'cate_trees', '树型结构', 'varchar(10)', 'uint', 'number', 'CateTrees', 'cateTrees', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 19, 19, 19, 19, 'EQ', 'treeSelect', '', 'demo_gen_tree', 'DemoGenTree', 'demo', 'demo_gen_tree', 'internal/app/demo', 'id', 'demo_name', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (995, 91, 'cate_trees_two', '树形多选', 'varchar(255)', 'string', 'string', 'CateTreesTwo', 'cateTreesTwo', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 20, 20, 20, 20, 'EQ', 'treeSelects', '', 'demo_gen_tree', 'DemoGenTree', 'demo', 'demo_gen_tree', 'internal/app/demo', 'id', 'demo_name', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (996, 91, 'options', '其他选项', 'text', 'string', 'string', 'Options', 'options', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 21, 21, 21, 21, 'EQ', 'keyValue', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (997, 95, 'id', 'ID', 'bigint(20) unsigned', 'uint64', 'number', 'Id', 'id', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (998, 95, 'name', '姓名', 'varchar(30)', 'string', 'string', 'Name', 'name', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 2, 2, 2, 2, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (999, 95, 'age', '年龄', 'int(10) unsigned', 'uint', 'number', 'Age', 'age', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 3, 3, 3, 3, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (1000, 96, 'id', '城市ID', 'varchar(255)', 'string', 'string', 'Id', 'id', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 1, 1, 1, 1, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (1001, 96, 'pid', '城市父ID', 'varchar(255)', 'string', 'string', 'Pid', 'pid', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 2, 2, 2, 2, 'EQ', 'treeSelect', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (1002, 96, 'deep', '级别', 'varchar(255)', 'string', 'string', 'Deep', 'deep', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 3, 3, 3, 3, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (1003, 96, 'name', '城市名称', 'varchar(255)', 'string', 'string', 'Name', 'name', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 4, 4, 4, 4, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (1004, 96, 'pinyin_prefix', '城市拼音头', 'varchar(255)', 'string', 'string', 'PinyinPrefix', 'pinyinPrefix', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 5, 5, 5, 5, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (1005, 96, 'pinyin', '城市拼音', 'varchar(255)', 'string', 'string', 'Pinyin', 'pinyin', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 6, 6, 6, 6, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (1006, 96, 'ext_id', '完整ID', 'varchar(255)', 'string', 'string', 'ExtId', 'extId', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 7, 7, 7, 7, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (1007, 96, 'ext_name', '城市全称', 'varchar(255)', 'string', 'string', 'ExtName', 'extName', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 8, 8, 8, 8, 'LIKE', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); +INSERT INTO "tools_gen_table_column" VALUES (1008, 96, 'weathercode', '天气预报的编码', 'varchar(255)', 'string', 'string', 'Weathercode', 'weathercode', 'f', 'f', 'f', 'f', 'f', 'f', 'f', 9, 9, 9, 9, 'EQ', 'input', '', '', '', '', '', '', '', '', 12, 1, 'f', 100, 'f', 'f', 'f', '', ''); -- ---------------------------- -- Alter sequences owned by diff --git a/resource/data/gfast-v32.sql b/resource/data/gfast-v32.sql index 1f31f6a..5cbff0a 100644 --- a/resource/data/gfast-v32.sql +++ b/resource/data/gfast-v32.sql @@ -11,7 +11,7 @@ Target Server Version : 50736 (5.7.36) File Encoding : 65001 - Date: 13/09/2024 16:59:47 + Date: 22/10/2024 11:49:00 */ SET NAMES utf8mb4; @@ -103,7 +103,6 @@ CREATE TABLE `casbin_rule` ( -- ---------------------------- -- Records of casbin_rule -- ---------------------------- -INSERT INTO `casbin_rule` VALUES ('g', 'u_3', '1', '', '', '', ''); INSERT INTO `casbin_rule` VALUES ('g', 'u_1', '1', '', '', '', ''); INSERT INTO `casbin_rule` VALUES ('g', 'u_43', '1', '', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '1', '27', 'All', '', '', ''); @@ -168,10 +167,11 @@ INSERT INTO `casbin_rule` VALUES ('p', '9', '23', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '9', '24', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '9', '25', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '9', '26', 'All', '', '', ''); -INSERT INTO `casbin_rule` VALUES ('g', 'u_3', '2', '', '', '', ''); INSERT INTO `casbin_rule` VALUES ('g', 'u_5', '2', '', '', '', ''); INSERT INTO `casbin_rule` VALUES ('g', 'u_31', '2', '', '', '', ''); INSERT INTO `casbin_rule` VALUES ('g', 'u_6', '2', '', '', '', ''); +INSERT INTO `casbin_rule` VALUES ('g', 'u_16', '2', '', '', '', ''); +INSERT INTO `casbin_rule` VALUES ('g', 'u_3', '2', '', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '1', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '2', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '3', 'All', '', '', ''); @@ -181,6 +181,8 @@ INSERT INTO `casbin_rule` VALUES ('p', '2', '10', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '12', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '13', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '14', 'All', '', '', ''); +INSERT INTO `casbin_rule` VALUES ('p', '2', '114', 'All', '', '', ''); +INSERT INTO `casbin_rule` VALUES ('p', '2', '115', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '15', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '19', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '20', 'All', '', '', ''); @@ -190,11 +192,15 @@ INSERT INTO `casbin_rule` VALUES ('p', '2', '23', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '24', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '25', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '26', 'All', '', '', ''); +INSERT INTO `casbin_rule` VALUES ('p', '2', '116', 'All', '', '', ''); +INSERT INTO `casbin_rule` VALUES ('p', '2', '117', 'All', '', '', ''); +INSERT INTO `casbin_rule` VALUES ('p', '2', '118', 'All', '', '', ''); +INSERT INTO `casbin_rule` VALUES ('p', '2', '119', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '31', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '32', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '34', 'All', '', '', ''); INSERT INTO `casbin_rule` VALUES ('p', '2', '33', 'All', '', '', ''); -INSERT INTO `casbin_rule` VALUES ('g', 'u_16', '2', '', '', '', ''); +INSERT INTO `casbin_rule` VALUES ('g', 'u_10', '2', '', '', '', ''); -- ---------------------------- -- Table structure for demo_city_code @@ -4116,27 +4122,6 @@ INSERT INTO `sys_auth_rule` VALUES (116, 26, 'api/v1/system/user/add', '新增 INSERT INTO `sys_auth_rule` VALUES (117, 26, 'api/v1/system/user/edit', '修改用户', '', '', '', 2, 0, 0, '', '', 0, '', 0, 0, 1, '', 0, '', '2024-04-11 11:16:45', '2024-04-11 11:19:25'); INSERT INTO `sys_auth_rule` VALUES (118, 26, 'api/v1/system/user/getEdit', '用户信息', '', '', '', 2, 0, 0, '', '', 0, '', 0, 0, 1, '', 0, '', '2024-04-11 11:17:21', '2024-04-11 11:19:30'); INSERT INTO `sys_auth_rule` VALUES (119, 26, 'api/v1/system/user/delete', '删除用户', '', '', '', 2, 0, 0, '', '', 0, '', 0, 0, 1, '', 0, '', '2024-04-11 11:17:39', '2024-04-11 11:19:34'); -INSERT INTO `sys_auth_rule` VALUES (120, 0, 'api/v1/demo/demoGen', '代码生成测试表管理', 'iconfont icon-fuwenbenkuang', '', '代码生成测试表管理', 0, 0, 0, '/demo/demoGen', 'layout/routerView/parent', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (121, 120, 'api/v1/demo/demoGen/list', '代码生成测试表列表', 'ele-Fold', '', '代码生成测试表列表', 1, 0, 0, '/demo/demoGen/list', 'demo/demoGen/list/index', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (122, 121, 'api/v1/demo/demoGen/get', '代码生成测试表查询', '', '', '代码生成测试表查询', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (123, 121, 'api/v1/demo/demoGen/add', '代码生成测试表添加', '', '', '代码生成测试表添加', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (124, 121, 'api/v1/demo/demoGen/edit', '代码生成测试表修改', '', '', '代码生成测试表修改', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (125, 121, 'api/v1/demo/demoGen/delete', '代码生成测试表删除', '', '', '代码生成测试表删除', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (126, 121, 'api/v1/demo/demoGen/export', '代码生成测试表导出', '', '', '代码生成测试表导出', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (127, 121, 'api/v1/demo/demoGen/import', '代码生成测试表导入', '', '', '代码生成测试表导入', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (128, 0, 'api/v1/demo/demoGenClass', '代码生成关联测试表管理', 'iconfont icon-fuwenbenkuang', '', '代码生成关联测试表管理', 0, 0, 0, '/demo/demoGenClass', 'layout/routerView/parent', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (129, 128, 'api/v1/demo/demoGenClass/list', '代码生成关联测试表列表', 'ele-Fold', '', '代码生成关联测试表列表', 1, 0, 0, '/demo/demoGenClass/list', 'demo/demoGenClass/list/index', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (130, 129, 'api/v1/demo/demoGenClass/get', '代码生成关联测试表查询', '', '', '代码生成关联测试表查询', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (131, 129, 'api/v1/demo/demoGenClass/add', '代码生成关联测试表添加', '', '', '代码生成关联测试表添加', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (132, 129, 'api/v1/demo/demoGenClass/edit', '代码生成关联测试表修改', '', '', '代码生成关联测试表修改', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (133, 129, 'api/v1/demo/demoGenClass/delete', '代码生成关联测试表删除', '', '', '代码生成关联测试表删除', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (134, 129, 'api/v1/demo/demoGenClass/export', '代码生成关联测试表导出', '', '', '代码生成关联测试表导出', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (135, 0, 'api/v1/demo/demoGenTree', '代码生成树形结构测试表管理', 'iconfont icon-fuwenbenkuang', '', '代码生成树形结构测试表管理', 0, 0, 0, '/demo/demoGenTree', 'layout/routerView/parent', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (136, 135, 'api/v1/demo/demoGenTree/list', '代码生成树形结构测试表列表', 'ele-Fold', '', '代码生成树形结构测试表列表', 1, 0, 0, '/demo/demoGenTree/list', 'demo/demoGenTree/list/index', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (137, 136, 'api/v1/demo/demoGenTree/get', '代码生成树形结构测试表查询', '', '', '代码生成树形结构测试表查询', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (138, 136, 'api/v1/demo/demoGenTree/add', '代码生成树形结构测试表添加', '', '', '代码生成树形结构测试表添加', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (139, 136, 'api/v1/demo/demoGenTree/edit', '代码生成树形结构测试表修改', '', '', '代码生成树形结构测试表修改', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); -INSERT INTO `sys_auth_rule` VALUES (140, 136, 'api/v1/demo/demoGenTree/delete', '代码生成树形结构测试表删除', '', '', '代码生成树形结构测试表删除', 2, 0, 0, '', '', 0, 'sys_admin', 0, 0, 1, '', 0, '', NULL, NULL); INSERT INTO `sys_auth_rule` VALUES (141, 26, 'api/v1/system/user/all', '管理所有', '', '', '', 2, 0, 0, '', '', 0, '', 0, 0, 1, '', 0, '', '2024-09-13 16:57:13', '2024-09-13 16:57:13'); INSERT INTO `sys_auth_rule` VALUES (142, 15, 'api/v1/system/dept/all', '管理所有', '', '', '', 2, 0, 0, '', '', 0, '', 0, 0, 1, '', 0, '', '2024-09-13 16:57:49', '2024-09-13 16:57:49'); @@ -4398,7 +4383,7 @@ CREATE TABLE `sys_job_log` ( `created_at` datetime NULL DEFAULT NULL COMMENT '执行日期', `result` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '执行结果', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 228 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务日志表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 288 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '任务日志表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_job_log @@ -4630,6 +4615,66 @@ INSERT INTO `sys_job_log` VALUES (224, 'checkUserOnline', '2024-07-23 18:00:06', INSERT INTO `sys_job_log` VALUES (225, 'checkUserOnline', '2024-07-27 11:10:05', '在线用户定时更新，执行成功'); INSERT INTO `sys_job_log` VALUES (226, 'checkUserOnline', '2024-07-27 11:20:05', '在线用户定时更新，执行成功'); INSERT INTO `sys_job_log` VALUES (227, 'checkUserOnline', '2024-07-29 08:50:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (228, 'checkUserOnline', '2024-09-13 17:00:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (229, 'checkUserOnline', '2024-09-13 17:10:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (230, 'checkUserOnline', '2024-09-13 17:20:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (231, 'checkUserOnline', '2024-09-13 17:30:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (232, 'checkUserOnline', '2024-09-13 17:40:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (233, 'checkUserOnline', '2024-09-13 17:50:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (234, 'checkUserOnline', '2024-09-13 18:00:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (235, 'checkUserOnline', '2024-09-13 18:10:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (236, 'checkUserOnline', '2024-09-13 18:20:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (237, 'checkUserOnline', '2024-09-13 18:30:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (238, 'checkUserOnline', '2024-09-13 18:40:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (239, 'checkUserOnline', '2024-09-13 18:50:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (240, 'checkUserOnline', '2024-09-13 19:00:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (241, 'checkUserOnline', '2024-09-13 19:10:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (242, 'checkUserOnline', '2024-09-13 19:20:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (243, 'checkUserOnline', '2024-09-13 19:30:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (244, 'checkUserOnline', '2024-09-13 19:40:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (245, 'checkUserOnline', '2024-09-13 19:50:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (246, 'checkUserOnline', '2024-09-13 20:00:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (247, 'checkUserOnline', '2024-09-13 20:10:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (248, 'checkUserOnline', '2024-09-13 20:20:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (249, 'checkUserOnline', '2024-09-13 20:30:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (250, 'checkUserOnline', '2024-09-13 20:40:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (251, 'checkUserOnline', '2024-09-13 20:50:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (252, 'checkUserOnline', '2024-09-13 21:00:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (253, 'checkUserOnline', '2024-09-13 21:10:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (254, 'checkUserOnline', '2024-09-13 21:20:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (255, 'checkUserOnline', '2024-09-13 21:30:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (256, 'checkUserOnline', '2024-09-13 21:40:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (257, 'checkUserOnline', '2024-09-13 21:50:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (258, 'checkUserOnline', '2024-09-13 22:00:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (259, 'checkUserOnline', '2024-09-13 22:10:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (260, 'checkUserOnline', '2024-09-13 22:20:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (261, 'checkUserOnline', '2024-09-14 08:30:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (262, 'checkUserOnline', '2024-09-14 09:10:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (263, 'checkUserOnline', '2024-09-14 09:20:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (264, 'checkUserOnline', '2024-09-14 09:30:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (265, 'checkUserOnline', '2024-09-14 09:40:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (266, 'checkUserOnline', '2024-09-14 09:50:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (267, 'checkUserOnline', '2024-09-14 10:00:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (268, 'checkUserOnline', '2024-09-14 10:10:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (269, 'checkUserOnline', '2024-09-14 10:20:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (270, 'checkUserOnline', '2024-09-14 10:30:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (271, 'checkUserOnline', '2024-09-14 10:40:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (272, 'checkUserOnline', '2024-09-14 10:50:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (273, 'checkUserOnline', '2024-09-14 11:00:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (274, 'checkUserOnline', '2024-09-14 11:10:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (275, 'checkUserOnline', '2024-09-14 11:20:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (276, 'checkUserOnline', '2024-09-14 11:30:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (277, 'checkUserOnline', '2024-09-14 11:40:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (278, 'checkUserOnline', '2024-09-30 18:00:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (279, 'checkUserOnline', '2024-10-08 16:30:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (280, 'checkUserOnline', '2024-10-08 16:40:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (281, 'checkUserOnline', '2024-10-08 16:50:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (282, 'checkUserOnline', '2024-10-08 17:00:05', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (283, 'checkUserOnline', '2024-10-22 11:00:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (284, 'checkUserOnline', '2024-10-22 11:10:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (285, 'checkUserOnline', '2024-10-22 11:20:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (286, 'checkUserOnline', '2024-10-22 11:30:06', '在线用户定时更新，执行成功'); +INSERT INTO `sys_job_log` VALUES (287, 'checkUserOnline', '2024-10-22 11:40:06', '在线用户定时更新，执行成功'); -- ---------------------------- -- Table structure for sys_login_log @@ -4647,11 +4692,15 @@ CREATE TABLE `sys_login_log` ( `login_time` datetime NULL DEFAULT NULL COMMENT '登录时间', `module` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '登录模块', PRIMARY KEY (`info_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统访问记录' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of sys_login_log -- ---------------------------- +INSERT INTO `sys_login_log` VALUES (1, 'demo', '::1', '内网IP', 'Chrome', 'Windows 10', 1, '登录成功', '2024-10-08 16:29:51', '系统后台'); +INSERT INTO `sys_login_log` VALUES (2, 'demo', '::1', '内网IP', 'Chrome', 'Windows 10', 1, '登录成功', '2024-10-08 16:36:28', '系统后台'); +INSERT INTO `sys_login_log` VALUES (3, 'demo', '::1', '内网IP', 'Chrome', 'Windows 10', 1, '登录成功', '2024-10-08 16:41:28', '系统后台'); +INSERT INTO `sys_login_log` VALUES (4, 'demo', '::1', '内网IP', 'Chrome', 'Windows 10', 1, '登录成功', '2024-10-22 11:18:23', '系统后台'); -- ---------------------------- -- Table structure for sys_notice @@ -4721,13 +4770,19 @@ CREATE TABLE `sys_oper_log` ( `error_msg` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '错误消息', `oper_time` datetime NULL DEFAULT NULL COMMENT '操作时间', PRIMARY KEY (`oper_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作日志记录' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of sys_oper_log -- ---------------------------- -INSERT INTO `sys_oper_log` VALUES (1, '', 0, '/api/v1/system/operLog/clear', 'DELETE', 1, 'demo', '财务部门', '/api/v1/system/operLog/clear', '::1', '内网IP', '{}', NULL, '2024-09-13 16:58:31'); -INSERT INTO `sys_oper_log` VALUES (2, '操作日志', 0, '/api/v1/system/operLog/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/operLog/list?pageNum=1&pageSize=10', '::1', '内网IP', '{\"pageNum\":\"1\",\"pageSize\":\"10\"}', NULL, '2024-09-13 16:58:31'); +INSERT INTO `sys_oper_log` VALUES (1, '', 0, '/api/v1/system/operLog/clear', 'DELETE', 1, 'demo', '财务部门', '/api/v1/system/operLog/clear', '::1', '内网IP', '{}', NULL, '2024-09-30 17:53:53'); +INSERT INTO `sys_oper_log` VALUES (2, '操作日志', 0, '/api/v1/system/operLog/list', 'GET', 1, 'demo', '财务部门', '/api/v1/system/operLog/list?pageNum=1&pageSize=10', '::1', '内网IP', '{\"pageNum\":\"1\",\"pageSize\":\"10\"}', NULL, '2024-09-30 17:53:53'); +INSERT INTO `sys_oper_log` VALUES (3, '代码生成', 0, '/api/v1/system/tools/gen/tableList', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/tableList?tableName=&tableComment=&pageNum=1&pageSize=10', '::1', '内网IP', '{\"pageNum\":\"1\",\"pageSize\":\"10\",\"tableComment\":\"\",\"tableName\":\"\"}', NULL, '2024-10-08 16:41:33'); +INSERT INTO `sys_oper_log` VALUES (4, '', 0, '/api/v1/system/uEditor/action', 'GET', 1, 'demo', '财务部门', '/api/v1/system/uEditor/action?token=7ZUSfVIf2HyYjcv86SKPPs29v003ECPEScsdYsYYqO19hXR08cH2krzoofUnh0LLNfQyIK3vS%2BTPQPEerFUaG0%2B5dRoBc7B1epQB60kvPXIV4O1b8epw2kLHmzgZuUf1F6nB8awRbTSwhZLCHC3qdg%3D%3D&action=config&callback=bd__editor__s1bfa0', '::1', '内网IP', '{\"action\":\"config\",\"callback\":\"bd__editor__s1bfa0\",\"token\":\"7ZUSfVIf2HyYjcv86SKPPs29v003ECPEScsdYsYYqO19hXR08cH2krzoofUnh0LLNfQyIK3vS+TPQPEerFUaG0+5dRoBc7B1epQB60kvPXIV4O1b8epw2kLHmzgZuUf1F6nB8awRbTSwhZLCHC3qdg==\"}', NULL, '2024-10-22 11:18:30'); +INSERT INTO `sys_oper_log` VALUES (5, '代码生成', 0, '/api/v1/system/tools/gen/tableList', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/tableList?tableName=&tableComment=&pageNum=1&pageSize=10', '::1', '内网IP', '{\"pageNum\":\"1\",\"pageSize\":\"10\",\"tableComment\":\"\",\"tableName\":\"\"}', NULL, '2024-10-22 11:38:13'); +INSERT INTO `sys_oper_log` VALUES (6, '代码生成配置', 0, '/api/v1/system/tools/gen/columnList', 'GET', 1, 'demo', '财务部门', '/api/v1/system/tools/gen/columnList?tableId=91', '::1', '内网IP', '{\"tableId\":\"91\"}', NULL, '2024-10-22 11:38:15'); +INSERT INTO `sys_oper_log` VALUES (7, '', 0, '/api/v1/system/menu/getParams', 'GET', 1, 'demo', '财务部门', '/api/v1/system/menu/getParams', '::1', '内网IP', '{}', NULL, '2024-10-22 11:38:15'); +INSERT INTO `sys_oper_log` VALUES (8, '', 0, '/api/v1/system/dict/type/optionSelect', 'GET', 1, 'demo', '财务部门', '/api/v1/system/dict/type/optionSelect', '::1', '内网IP', '{}', NULL, '2024-10-22 11:38:15'); -- ---------------------------- -- Table structure for sys_post @@ -4785,7 +4840,7 @@ CREATE TABLE `sys_role` ( -- Records of sys_role -- ---------------------------- INSERT INTO `sys_role` VALUES (1, 0, 1, 0, '超级管理员', '备注', 2, '2022-04-01 11:38:39', '2023-09-28 10:27:55', 0, NULL); -INSERT INTO `sys_role` VALUES (2, 1, 1, 0, '普通管理员', '备注', 5, '2022-04-01 11:38:39', '2024-05-07 10:09:13', 0, '{\"effectiveType\":2,\"weekDay\":[1,2,3,4,5],\"dayRange\":[\"2024-04-12 08:00:00\",\"2024-04-12 18:00:00\"],\"dateRange\":null}'); +INSERT INTO `sys_role` VALUES (2, 1, 1, 0, '普通管理员', '备注', 5, '2022-04-01 11:38:39', '2024-09-14 09:10:55', 0, '{\"effectiveType\":0,\"weekDay\":[1,2,3,4,5],\"dayRange\":[\"2024-04-12 08:00:00\",\"2024-04-12 18:00:00\"],\"dateRange\":null}'); INSERT INTO `sys_role` VALUES (3, 0, 1, 0, '站点管理员', '站点管理人员', 3, '2022-04-01 11:38:39', '2022-04-01 11:38:39', 0, NULL); INSERT INTO `sys_role` VALUES (4, 5, 1, 0, '初级管理员', '初级管理员', 3, '2022-04-01 11:38:39', '2024-03-18 10:16:15', 0, '{\"effectiveType\":0,\"weekDay\":null,\"dayRange\":null,\"dateRange\":null}'); INSERT INTO `sys_role` VALUES (5, 0, 1, 0, '高级管理员', '高级管理员', 2, '2022-04-01 11:38:39', '2022-04-01 11:38:39', 0, NULL); @@ -4829,24 +4884,30 @@ CREATE TABLE `sys_role_scope` ( `dept_ids` json NULL COMMENT '扩展数据', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `role_id`(`role_id`, `menu_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 80 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色数据权限' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 99 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色数据权限' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sys_role_scope -- ---------------------------- -INSERT INTO `sys_role_scope` VALUES (67, 2, 59, 5, '[]'); -INSERT INTO `sys_role_scope` VALUES (68, 2, 60, 5, '[]'); -INSERT INTO `sys_role_scope` VALUES (69, 2, 61, 5, '[101, 103, 104, 105, 106, 107]'); -INSERT INTO `sys_role_scope` VALUES (70, 2, 62, 5, '[]'); -INSERT INTO `sys_role_scope` VALUES (71, 2, 63, 5, '[]'); -INSERT INTO `sys_role_scope` VALUES (72, 2, 64, 5, '[]'); -INSERT INTO `sys_role_scope` VALUES (73, 2, 65, 5, '[]'); -INSERT INTO `sys_role_scope` VALUES (74, 2, 120, 1, '[]'); -INSERT INTO `sys_role_scope` VALUES (75, 2, 121, 1, '[]'); -INSERT INTO `sys_role_scope` VALUES (76, 2, 122, 1, '[]'); -INSERT INTO `sys_role_scope` VALUES (77, 2, 123, 1, '[]'); -INSERT INTO `sys_role_scope` VALUES (78, 2, 124, 1, '[]'); -INSERT INTO `sys_role_scope` VALUES (79, 2, 125, 1, '[]'); +INSERT INTO `sys_role_scope` VALUES (80, 2, 59, 5, '[]'); +INSERT INTO `sys_role_scope` VALUES (81, 2, 60, 5, '[]'); +INSERT INTO `sys_role_scope` VALUES (82, 2, 61, 5, '[101, 103, 104, 105, 106, 107]'); +INSERT INTO `sys_role_scope` VALUES (83, 2, 62, 5, '[]'); +INSERT INTO `sys_role_scope` VALUES (84, 2, 63, 5, '[]'); +INSERT INTO `sys_role_scope` VALUES (85, 2, 64, 5, '[]'); +INSERT INTO `sys_role_scope` VALUES (86, 2, 65, 5, '[]'); +INSERT INTO `sys_role_scope` VALUES (87, 2, 120, 1, '[]'); +INSERT INTO `sys_role_scope` VALUES (88, 2, 121, 1, '[]'); +INSERT INTO `sys_role_scope` VALUES (89, 2, 122, 1, '[]'); +INSERT INTO `sys_role_scope` VALUES (90, 2, 123, 1, '[]'); +INSERT INTO `sys_role_scope` VALUES (91, 2, 124, 1, '[]'); +INSERT INTO `sys_role_scope` VALUES (92, 2, 125, 1, '[]'); +INSERT INTO `sys_role_scope` VALUES (93, 2, 26, 4, '[]'); +INSERT INTO `sys_role_scope` VALUES (94, 2, 116, 4, '[]'); +INSERT INTO `sys_role_scope` VALUES (95, 2, 117, 4, '[]'); +INSERT INTO `sys_role_scope` VALUES (96, 2, 118, 4, '[]'); +INSERT INTO `sys_role_scope` VALUES (97, 2, 119, 4, '[]'); +INSERT INTO `sys_role_scope` VALUES (98, 2, 141, 4, '[]'); -- ---------------------------- -- Table structure for sys_user @@ -4887,22 +4948,22 @@ CREATE TABLE `sys_user` ( -- ---------------------------- INSERT INTO `sys_user` VALUES (1, 'admin', '13578342363', '超级管理员', 0, 'c567ae329f9929b518759d3bea13f492', 'f9aZTAa8yz', 1, 'yxh669@qq.com', 1, 'https://yxh-1301841944.cos.ap-chongqing.myqcloud.com/gfast/2021-07-19/ccwpeuqz1i2s769hua.jpeg', 101, '', 1, 'asdasfdsaf大发放打发士大夫发按时', '描述信息', '::1', '2023-10-31 11:22:06', '2021-06-22 17:58:00', '2023-04-22 14:39:18', NULL, ''); INSERT INTO `sys_user` VALUES (2, 'yixiaohu', '13699885599', '奈斯', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, 'yxh@qq.com', 1, 'upload_file/2022-11-04/co3e5ljknns8jhlp8s.jpg', 102, '备注', 1, '', '', '::1', '2022-11-04 09:54:56', '2021-06-22 17:58:00', '2022-11-04 17:54:56', NULL, ''); -INSERT INTO `sys_user` VALUES (3, 'zs', '16399669855', '张三', 0, '41e3778c20338f4d7d6cc886fd3b2a52', 'redoHIj524', 1, 'zs@qq.com', 0, 'https://yxh-1301841944.cos.ap-chongqing.myqcloud.com/gfast/2021-08-02/cd8nif79egjg9kbkgk.jpeg', 101, '', 1, '', '', '::1', '2023-05-22 22:24:27', '2021-06-22 17:58:00', '2022-04-28 10:01:47', NULL, ''); +INSERT INTO `sys_user` VALUES (3, 'zs', '16399669855', '张三', 0, '41e3778c20338f4d7d6cc886fd3b2a52', 'redoHIj524', 1, 'zs@qq.com', 0, 'https://yxh-1301841944.cos.ap-chongqing.myqcloud.com/gfast/2021-08-02/cd8nif79egjg9kbkgk.jpeg', 101, '', 1, '', '', '::1', '2024-09-14 09:08:53', '2021-06-22 17:58:00', '2024-09-14 09:08:10', NULL, ''); INSERT INTO `sys_user` VALUES (4, 'qlgl', '13758596696', '测试c', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, 'qlgl@qq.com', 0, '', 102, '', 1, '', '', '127.0.0.1', NULL, '2021-06-22 17:58:00', '2022-11-03 15:44:20', NULL, ''); INSERT INTO `sys_user` VALUES (5, 'test', '13845696696', '测试2', 0, '5f79ce5a3804f28e5c2c1162aaa66c86', 'OsSecLdLvK', 1, '123@qq.com', 0, '', 101, '', 0, '', '', '::1', '2023-10-26 14:59:59', '2021-06-22 17:58:00', '2024-07-22 11:35:51', NULL, ''); INSERT INTO `sys_user` VALUES (6, '18999998889', '13755866654', '刘大大', 0, '5df78d20315a5af61f45d20f72c184fc', 'lC6OoXDCbM', 1, '1223@qq.com', 0, '', 103, '', 1, '', '', '[::1]', '2022-02-25 14:29:22', '2021-06-22 17:58:00', '2022-11-03 17:05:07', NULL, ''); INSERT INTO `sys_user` VALUES (7, 'zmm', '13788566696', '张明明', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '11123@qq.com', 0, '', 104, '', 1, '', '', '127.0.0.1', NULL, '2021-06-22 17:58:00', '2022-04-12 17:55:42', NULL, ''); INSERT INTO `sys_user` VALUES (8, 'lxx', '13756566696', '李小小', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '123333@qq.com', 0, '', 101, '', 1, '', '', '127.0.0.1', NULL, '2021-06-22 17:58:00', '2024-07-22 11:35:44', NULL, ''); -INSERT INTO `sys_user` VALUES (10, 'xmm', '13588999969', '小秘密', 0, '2de2a8df703bfc634cfda2cb2f6a59be', 'Frz7LJY7SE', 1, '696@qq.com', 0, '', 101, '', 1, '', '', '[::1]', '2021-07-22 17:08:53', '2021-06-22 17:58:00', '2022-04-12 17:55:50', NULL, ''); +INSERT INTO `sys_user` VALUES (10, 'xmm', '13588999969', '小秘密', 0, '2de2a8df703bfc634cfda2cb2f6a59be', 'Frz7LJY7SE', 1, '696@qq.com', 0, '', 102, '', 1, '', '', '::1', '2024-09-14 10:02:18', '2021-06-22 17:58:00', '2024-09-14 09:16:27', NULL, ''); INSERT INTO `sys_user` VALUES (14, 'cd_19', '13699888899', '看金利科技', 0, '1169d5fe4119fd4277a95f02d7036171', '7paigEoedh', 1, '', 0, '', 102, '', 1, '', '', '', NULL, '2021-06-22 17:58:00', '2022-04-12 18:13:22', '2024-07-22 11:35:58', ''); -INSERT INTO `sys_user` VALUES (15, 'lmm', '13587754545', '刘敏敏', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, 'a@coc.com', 0, '', 201, '', 1, '', '', '127.0.0.1', NULL, '2021-06-22 17:58:00', '2022-04-12 17:56:23', NULL, ''); +INSERT INTO `sys_user` VALUES (15, 'lmm', '13587754545', '刘敏敏', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, 'a@coc.com', 0, '', 102, '', 1, '', '', '127.0.0.1', NULL, '2021-06-22 17:58:00', '2024-09-14 09:20:21', NULL, ''); INSERT INTO `sys_user` VALUES (16, 'ldn', '13899658874', '李大牛', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, 'a@ll.con', 0, '', 102, '', 1, '', '', '::1', '2024-05-07 10:09:35', '2021-06-22 17:58:00', '2024-05-07 10:09:58', NULL, ''); INSERT INTO `sys_user` VALUES (20, 'dbc', '13877555566', '大百词', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '', 0, '', 0, '', 1, '', '', '', NULL, '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); INSERT INTO `sys_user` VALUES (22, 'yxfmlbb', '15969423326', '大数据部门测试', 0, '66f89b40ee4a10aabaf70c15756429ea', 'mvd2OtUe8f', 1, 'yxh6691@qq.com', 0, 'https://yxh-1301841944.cos.ap-chongqing.myqcloud.com/gfast/2021-09-29/cem20k3fdciosy7nwo.jpeg', 200, '', 1, '2222233', '1222', '[::1]', '2021-10-28 11:36:07', '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); INSERT INTO `sys_user` VALUES (23, 'wangming', '18687460581', '王明', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '', 0, '', 0, '', 1, '', '', '::1', '2023-11-03 16:03:56', '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, 'oHUVQ6CKETZ7gvqkHdJqdlw2WXNE'); INSERT INTO `sys_user` VALUES (24, 'zhk', '13699885591', '综合科', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '', 0, '', 0, '', 1, '', '', '192.168.0.146', NULL, '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); INSERT INTO `sys_user` VALUES (28, 'demo3', '18699888855', '测试账号1', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '123132@qq.com', 0, '', 109, '', 1, '', '', '192.168.0.229', NULL, '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); -INSERT INTO `sys_user` VALUES (31, 'demo', '15334455789', '李四', 0, '6dd68eea81e0fca319add0bd58c3fdf6', '46PvWe1Sl7', 1, '123@qq.com', 2, 'upload_file/2024-07-29/d31lsrb6o3rgmrdiih.jpg', 109, '3', 1, '云南省曲靖市22223', '生活变的再糟糕，也不妨碍我变得更好', '::1', '2024-09-13 16:56:26', '2021-06-22 17:58:00', '2024-07-29 08:41:22', NULL, ''); +INSERT INTO `sys_user` VALUES (31, 'demo', '15334455789', '李四', 0, '6dd68eea81e0fca319add0bd58c3fdf6', '46PvWe1Sl7', 1, '123@qq.com', 2, 'upload_file/2024-07-29/d31lsrb6o3rgmrdiih.jpg', 109, '3', 1, '云南省曲靖市22223', '生活变的再糟糕，也不妨碍我变得更好', '::1', '2024-10-22 11:18:23', '2021-06-22 17:58:00', '2024-07-29 08:41:22', NULL, ''); INSERT INTO `sys_user` VALUES (32, 'demo100', '18699888859', '测试账号1', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '', 0, '', 0, '', 1, '', '', '[::1]', '2021-11-24 18:01:21', '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); INSERT INTO `sys_user` VALUES (33, 'demo110', '18699888853', '测试账号1', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '', 0, '', 0, '', 1, '', '', '', NULL, '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); INSERT INTO `sys_user` VALUES (34, 'yxfmlbb2', '15969423327', '研发部门测试', 0, '542a6e44dbac171f260fc4a032cd5522', 'dlqVVBTADg', 1, '1111@qqq.com', 1, '', 103, '', 0, '', '', '127.0.0.1', NULL, '2021-06-22 17:58:00', '2021-06-22 17:58:00', NULL, ''); @@ -4931,13 +4992,12 @@ CREATE TABLE `sys_user_online` ( `os` varchar(150) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '操作系统', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uni_token`(`token`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户在线状态表' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户在线状态表' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of sys_user_online -- ---------------------------- -INSERT INTO `sys_user_online` VALUES (2, 'e3223745692d1b9e3feeb6bbe76b2588', '7ZUSfVIf2HyYjcv86SKPPs29v003ECPEScsdYsYYqO18wiZnzzNgaflwAAoMs5TdmCP8MetIzZAqtFT9OoqVkTllE5tPuZ/pdzd8VJX+Jz6zx92AvUGvHHeO5gclourM0OYdO/BRU8/a47TDRQc0Ug==', '2024-07-29 08:40:53', 'demo', '::1', 'Chrome', 'Windows 10'); -INSERT INTO `sys_user_online` VALUES (3, '197491023ea37023583f6b1a4dd05803', '7ZUSfVIf2HyYjcv86SKPPs29v003ECPEScsdYsYYqO3IENBH1+IJoLHKLRUw7Q4IUWJDs/rOmJgOsvXDr/VdBiHYfqxCbcczyDP6rhkKkega89HcAhd1vkQ+tcciWN119WKH31CL9LOzvvbrS0BgQw==', '2024-09-13 16:56:26', 'demo', '::1', 'Chrome', 'Windows 10'); +INSERT INTO `sys_user_online` VALUES (1, 'cac721838a886ca73c8db1f1e9b4d464', '7ZUSfVIf2HyYjcv86SKPPs29v003ECPEScsdYsYYqO19hXR08cH2krzoofUnh0LLNfQyIK3vS+TPQPEerFUaG0+5dRoBc7B1epQB60kvPXIV4O1b8epw2kLHmzgZuUf1F6nB8awRbTSwhZLCHC3qdg==', '2024-10-22 11:18:23', 'demo', '::1', 'Chrome', 'Windows 10'); -- ---------------------------- -- Table structure for sys_user_post @@ -5007,20 +5067,21 @@ CREATE TABLE `tools_gen_table` ( `use_virtual` bit(1) NOT NULL DEFAULT b'0' COMMENT '树表是否使用虚拟表', `excel_imp` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否导入excel', `overwrite_info` json NULL COMMENT '生成覆盖的文件', + `menu_pid` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '父级菜单ID', PRIMARY KEY (`table_id`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 99 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '代码生成业务表' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of tools_gen_table -- ---------------------------- -INSERT INTO `tools_gen_table` VALUES (91, 'demo_gen', '代码生成测试表', 'DemoGen', 'crud', 'internal/app/demo', 'demo', 'demo_gen', '代码生成测试', 'gfast', '', '2022-11-01 17:27:43', '2024-07-22 09:24:46', '', b'1', 'id', 'asc', b'1', b'1', b'0', b'0', b'1', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]'); -INSERT INTO `tools_gen_table` VALUES (92, 'demo_gen_class', '代码生成关联测试表', 'DemoGenClass', 'crud', 'internal/app/demo', 'demo', 'demo_gen_class', '分类信息', 'gfast', '', '2022-11-03 06:36:57', '2024-03-19 09:29:18', '分类', b'1', 'id', 'asc', b'1', b'1', b'0', b'0', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]'); -INSERT INTO `tools_gen_table` VALUES (93, 'demo_gen_tree', '代码生成树形结构测试表', 'DemoGenTree', 'tree', 'internal/app/demo', 'demo', 'demo_gen_tree', '代码生成树形结构测试', 'gfast', '{\"treeCode\":\"id\",\"treeName\":\"demoName\",\"treeParentCode\":\"parentId\"}', '2022-11-29 15:11:34', '2024-03-18 10:17:50', '', b'1', 'id', 'asc', b'1', b'0', b'0', b'1', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]'); -INSERT INTO `tools_gen_table` VALUES (94, 'demo_data_auth', '数据权限测试', 'DemoDataAuth', 'crud', 'internal/app/demo', 'demo', 'demo_data_auth', '数据权限测试', 'gfast', '', '2023-02-12 11:18:42', '2024-03-18 10:18:00', '', b'1', 'id', 'asc', b'0', b'0', b'0', b'0', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]'); -INSERT INTO `tools_gen_table` VALUES (95, 'demo_snow_id', '雪花ID测试', 'DemoSnowId', 'crud', 'internal/app/demo', 'demo', 'demo_snow_id', '雪花ID测试', 'gfast', '', '2023-09-19 15:34:46', '2024-03-18 10:16:51', '', b'1', 'id', 'asc', b'1', b'1', b'1', b'0', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]'); -INSERT INTO `tools_gen_table` VALUES (96, 'demo_city_code', '省市区县和天气预报编码', 'DemoCityCode', 'tree', 'internal/app/demo', 'demo', 'demo_city_code', '省市区县', 'gfast', '{\"treeCode\":\"id\",\"treeName\":\"name\",\"treeParentCode\":\"pid\"}', '2023-11-02 10:38:51', '2024-04-07 09:30:57', '', b'1', 'id', 'asc', b'1', b'0', b'0', b'1', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]'); -INSERT INTO `tools_gen_table` VALUES (97, 'product_category', '商品分类表', 'ProductCategory', 'tree', 'internal/app/demo', 'demo', 'product_category', '商品分类表', 'gfast', '{\"treeCode\":\"categoryId\",\"treeName\":\"categoryName\",\"treeParentCode\":\"parentId\"}', '2024-04-07 09:08:30', '2024-04-07 10:08:26', '', b'1', 'category_id', 'asc', b'0', b'0', b'0', b'1', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]'); -INSERT INTO `tools_gen_table` VALUES (98, 'demo_gen_other', '特殊字段测试', 'DemoGenOther', 'crud', 'internal/app/system', 'system', 'demo_gen_other', '特殊字段测试', 'gfast', '', '2024-07-22 15:26:47', '2024-07-22 15:26:47', '', b'0', 'id', 'asc', b'0', b'0', b'0', b'0', b'0', 'null'); +INSERT INTO `tools_gen_table` VALUES (91, 'demo_gen', '代码生成测试表', 'DemoGen', 'crud', 'internal/app/demo', 'demo', 'demo_gen', '代码生成测试', 'gfast', '', '2022-11-01 17:27:43', '2024-07-22 09:24:46', '', b'1', 'id', 'asc', b'1', b'1', b'0', b'0', b'1', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]', 0); +INSERT INTO `tools_gen_table` VALUES (92, 'demo_gen_class', '代码生成关联测试表', 'DemoGenClass', 'crud', 'internal/app/demo', 'demo', 'demo_gen_class', '分类信息', 'gfast', '', '2022-11-03 06:36:57', '2024-03-19 09:29:18', '分类', b'1', 'id', 'asc', b'1', b'1', b'0', b'0', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]', 0); +INSERT INTO `tools_gen_table` VALUES (93, 'demo_gen_tree', '代码生成树形结构测试表', 'DemoGenTree', 'tree', 'internal/app/demo', 'demo', 'demo_gen_tree', '代码生成树形结构测试', 'gfast', '{\"treeCode\":\"id\",\"treeName\":\"demoName\",\"treeParentCode\":\"parentId\"}', '2022-11-29 15:11:34', '2024-03-18 10:17:50', '', b'1', 'id', 'asc', b'1', b'0', b'0', b'1', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]', 0); +INSERT INTO `tools_gen_table` VALUES (94, 'demo_data_auth', '数据权限测试', 'DemoDataAuth', 'crud', 'internal/app/demo', 'demo', 'demo_data_auth', '数据权限测试', 'gfast', '', '2023-02-12 11:18:42', '2024-03-18 10:18:00', '', b'1', 'id', 'asc', b'0', b'0', b'0', b'0', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]', 0); +INSERT INTO `tools_gen_table` VALUES (95, 'demo_snow_id', '雪花ID测试', 'DemoSnowId', 'crud', 'internal/app/demo', 'demo', 'demo_snow_id', '雪花ID测试', 'gfast', '', '2023-09-19 15:34:46', '2024-03-18 10:16:51', '', b'1', 'id', 'asc', b'1', b'1', b'1', b'0', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]', 0); +INSERT INTO `tools_gen_table` VALUES (96, 'demo_city_code', '省市区县和天气预报编码', 'DemoCityCode', 'tree', 'internal/app/demo', 'demo', 'demo_city_code', '省市区县', 'gfast', '{\"treeCode\":\"id\",\"treeName\":\"name\",\"treeParentCode\":\"pid\"}', '2023-11-02 10:38:51', '2024-04-07 09:30:57', '', b'1', 'id', 'asc', b'1', b'0', b'0', b'1', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]', 0); +INSERT INTO `tools_gen_table` VALUES (97, 'product_category', '商品分类表', 'ProductCategory', 'tree', 'internal/app/demo', 'demo', 'product_category', '商品分类表', 'gfast', '{\"treeCode\":\"categoryId\",\"treeName\":\"categoryName\",\"treeParentCode\":\"parentId\"}', '2024-04-07 09:08:30', '2024-04-07 10:08:26', '', b'1', 'category_id', 'asc', b'0', b'0', b'0', b'1', b'0', '[{\"key\": \"api\", \"value\": true}, {\"key\": \"controller\", \"value\": true}, {\"key\": \"dao\", \"value\": true}, {\"key\": \"dao_internal\", \"value\": true}, {\"key\": \"logic\", \"value\": true}, {\"key\": \"model\", \"value\": true}, {\"key\": \"model_do\", \"value\": true}, {\"key\": \"model_entity\", \"value\": true}, {\"key\": \"router\", \"value\": true}, {\"key\": \"router_func\", \"value\": true}, {\"key\": \"service\", \"value\": true}, {\"key\": \"sql\", \"value\": true}, {\"key\": \"tsApi\", \"value\": true}, {\"key\": \"tsModel\", \"value\": true}, {\"key\": \"vue\", \"value\": true}, {\"key\": \"vueDetail\", \"value\": true}, {\"key\": \"vueEdit\", \"value\": true}]', 0); +INSERT INTO `tools_gen_table` VALUES (98, 'demo_gen_other', '特殊字段测试', 'DemoGenOther', 'crud', 'internal/app/system', 'system', 'demo_gen_other', '特殊字段测试', 'gfast', '', '2024-07-22 15:26:47', '2024-07-22 15:26:47', '', b'0', 'id', 'asc', b'0', b'0', b'0', b'0', b'0', 'null', 0); -- ---------------------------- -- Table structure for tools_gen_table_column @@ -5067,7 +5128,7 @@ CREATE TABLE `tools_gen_table_column` ( `parent_column_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级字段名', `cascade_column_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '级联查询字段', PRIMARY KEY (`column_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1030 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 1030 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成业务表字段' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of tools_gen_table_column diff --git a/resource/template/vm/go/api.template b/resource/template/vm/go/api.template index 6cbe462..2dba30a 100644 --- a/resource/template/vm/go/api.template +++ b/resource/template/vm/go/api.template @@ -138,14 +138,14 @@ type {{.table.ClassName}}DeleteRes struct { {{range $index,$column:= .table.Columns}} {{if eq $column.HtmlType "switch"}} // {{$.table.FunctionName}}{{$column.ColumnComment}}修改（状态） -type {{$column.GoField}}SwitchReq struct { +type {{$.table.ClassName}}{{$column.GoField}}SwitchReq struct { g.Meta `path:"/change{{$column.GoField}}" tags:"{{$.table.FunctionName}}" method:"put" summary:"修改{{$column.ColumnComment}}"` commonApi.Author {{$.table.PkColumn.GoField}} {{$.table.PkColumn.GoType}} `p:"{{$.table.PkColumn.HtmlField}}" v:"required#主键必须"` //通过主键修改 {{$column.GoField}} {{$column.GoType}} `p:"{{$column.HtmlField}}" v:"required#状态必须"` //通过主键获取 } -type {{$column.GoField}}SwitchRes struct { +type {{$.table.ClassName}}{{$column.GoField}}SwitchRes struct { commonApi.EmptyRes } {{end}} diff --git a/resource/template/vm/go/controller.template b/resource/template/vm/go/controller.template index b3cd7de..13e69b5 100644 --- a/resource/template/vm/go/controller.template +++ b/resource/template/vm/go/controller.template @@ -377,7 +377,7 @@ func (c *{{$structName}}Controller) Delete(ctx context.Context, req *{{.table.Mo {{range $index,$column:= .table.Columns}} {{if eq $column.HtmlType "switch"}} // {{$.table.FunctionName}}{{$column.ColumnComment}}修改（状态） -func(c *{{$structName}}Controller)Change{{$column.GoField}}(ctx context.Context, req *{{$.table.ModuleName}}.{{$column.GoField}}SwitchReq)(res *{{$.table.ModuleName}}.{{$column.GoField}}SwitchRes,err error){ +func(c *{{$structName}}Controller)Change{{$column.GoField}}(ctx context.Context, req *{{$.table.ModuleName}}.{{$.table.ClassName}}{{$column.GoField}}SwitchReq)(res *{{$.table.ModuleName}}.{{$.table.ClassName}}{{$column.GoField}}SwitchRes,err error){ if !{{$serviceVal}}.SysUser().AccessRule(ctx, {{$serviceVal}}.Context().GetUserId(ctx), "{{$.apiVersion}}/{{$.modulePath}}/{{$.table.BusinessName | CaseCamelLower}}/edit") { err = errors.New("没有修改权限") return diff --git a/resource/template/vm/sql/mysql.template b/resource/template/vm/sql/mysql.template index ef215c1..cae7d66 100644 --- a/resource/template/vm/sql/mysql.template +++ b/resource/template/vm/sql/mysql.template @@ -29,7 +29,7 @@ select @now := now(); -- 目录 SQL INSERT INTO `sys_auth_rule` (`pid`,`name`,`title`,`icon`,`condition`,`remark`,`menu_type`,`weigh`,`is_cached`,`is_hide`,`path`,`link_url`,`component`,`is_iframe`,`module_type`,`model_id`,`created_at`,`updated_at` ) -VALUES(0,'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}','{{.table.TableComment}}管理','iconfont icon-fuwenbenkuang','','{{.table.TableComment}}管理',0,0,1,0,'/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}','','layout/routerView/parent',0,'sys_admin',0,@now,@now); +VALUES({{.table.MenuPid}},'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}','{{.table.TableComment}}管理','iconfont icon-fuwenbenkuang','','{{.table.TableComment}}管理',0,0,1,0,'/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}','','layout/routerView/parent',0,'sys_admin',0,@now,@now); -- 菜单父目录ID SELECT @parentId := LAST_INSERT_ID(); diff --git a/resource/template/vm/sql/pgsql.template b/resource/template/vm/sql/pgsql.template index 0289f78..9f84f9c 100644 --- a/resource/template/vm/sql/pgsql.template +++ b/resource/template/vm/sql/pgsql.template @@ -32,7 +32,7 @@ DELETE FROM sys_auth_rule WHERE name = '{{.apiVersion}}/{{.modulePath}}/{{$.tabl -- 目录 SQL INSERT INTO sys_auth_rule (pid,name,title,icon,condition,remark,menu_type,weigh,is_cached,is_hide,path,link_url,component,is_iframe,module_type,model_id,created_at,updated_at ) -VALUES(0,'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}','{{.table.TableComment}}管理','iconfont icon-fuwenbenkuang','','{{.table.TableComment}}管理',0,0,1,0,'/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}','','layout/routerView/parent',0,'sys_admin',0,v_time,v_time) RETURNING id INTO parentId; +VALUES({{.table.MenuPid}},'{{.apiVersion}}/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}','{{.table.TableComment}}管理','iconfont icon-fuwenbenkuang','','{{.table.TableComment}}管理',0,0,1,0,'/{{.modulePath}}/{{.table.BusinessName | CaseCamelLower}}','','layout/routerView/parent',0,'sys_admin',0,v_time,v_time) RETURNING id INTO parentId; -- 菜单 SQL INSERT INTO sys_auth_rule (pid,name,title,icon,condition,remark,menu_type,weigh,is_cached,is_hide,path,link_url,component,is_iframe,module_type,model_id,created_at,updated_at)