发布v2.12.1版本，更新内容请查看：https://github.com/bufanyun/hotgo/blob/v2.0/docs/guide-zh-CN/start-update-log.md

2025-08-27 19:35:49 +08:00 · 2023-12-29 20:08:00 +08:00
parent c68004b6da
commit b54055810b
52 changed files with 1468 additions and 1325 deletions
--- a/server/go.mod
+++ b/server/go.mod
@@ -13,15 +13,15 @@ require (
 	github.com/casbin/casbin/v2 v2.55.0
 	github.com/forgoer/openssl v1.4.0
 	github.com/go-pay/gopay v1.5.91
-	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.7
-	github.com/gogf/gf/contrib/nosql/redis/v2 v2.5.7
-	github.com/gogf/gf/contrib/trace/jaeger/v2 v2.5.7
-	github.com/gogf/gf/v2 v2.5.7
+	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.1
+	github.com/gogf/gf/contrib/nosql/redis/v2 v2.6.1
+	github.com/gogf/gf/contrib/trace/jaeger/v2 v2.6.1
+	github.com/gogf/gf/v2 v2.6.1
+	github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f
 	github.com/golang-jwt/jwt/v5 v5.0.0
 	github.com/gorilla/websocket v1.5.1
 	github.com/kayon/iploc v0.0.0-20200312105652-bda3e968a794
 	github.com/minio/minio-go/v7 v7.0.63
-	github.com/minio/selfupdate v0.6.0
 	github.com/mojocn/base64Captcha v1.3.5
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/qiniu/go-sdk/v7 v7.14.0
@@ -63,7 +63,7 @@ require (
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-redis/redis/v8 v8.11.5 // indirect
@@ -102,7 +102,7 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
-	github.com/redis/go-redis/v9 v9.3.0 // indirect
+	github.com/redis/go-redis/v9 v9.3.1 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
@@ -124,11 +124,11 @@ require (
 	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
-	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
 	golang.org/x/image v0.1.0 // indirect
-	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
--- a/server/go.sum
+++ b/server/go.sum
@@ -150,8 +150,8 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
-github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
@@ -170,14 +170,16 @@ github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrt
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.7 h1:S6r4QJSoqmOv/Vqhu/gHt4if4dHrNyaQIUbjWc4W7sg=
-github.com/gogf/gf/contrib/drivers/mysql/v2 v2.5.7/go.mod h1:1/X4iVHxtSHjOMGYvnmFMTdk5zLLhQ6PEkslKTBcTSI=
-github.com/gogf/gf/contrib/nosql/redis/v2 v2.5.7 h1:HgOudyYp8F6iVC6YgbqKhPMKgxQJj4MO8VBdJEMPTpk=
-github.com/gogf/gf/contrib/nosql/redis/v2 v2.5.7/go.mod h1:jiRz86SerTb+z4KD4LtxgVw3IEcsWRBnL40FvIAg/sY=
-github.com/gogf/gf/contrib/trace/jaeger/v2 v2.5.7 h1:ipIYW9q+Olkg9s86WpdPQ+wTFi1v6rsTiYAZ2ekqxH8=
-github.com/gogf/gf/contrib/trace/jaeger/v2 v2.5.7/go.mod h1:KhUqGtEifCUd9pI274UkgSCMByof3aq2nW9GJRbwcOk=
-github.com/gogf/gf/v2 v2.5.7 h1:h+JSoD6z3d2q0uGszvtahrSm4DiM2ECyNjyTwKIo8wE=
-github.com/gogf/gf/v2 v2.5.7/go.mod h1:x2XONYcI4hRQ/4gMNbWHmZrNzSEIg20s2NULbzom5k0=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.1 h1:5VW1vlaFNSHHhMliRkGTcDshMeA52Il8T+gffJJaVMc=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.6.1/go.mod h1:jxCa1WV/W+q0F4ILebakUsqRrl7iL3qvP+Uci0eXAew=
+github.com/gogf/gf/contrib/nosql/redis/v2 v2.6.1 h1:5NWx7rZa8CbPNw1vbLzIXQFEMbKvoJVQM0GyReBRvJ8=
+github.com/gogf/gf/contrib/nosql/redis/v2 v2.6.1/go.mod h1:iy1Dwp5xWfGfuWixCgGQ06ZX6lp+d9onbmSWWzi111A=
+github.com/gogf/gf/contrib/trace/jaeger/v2 v2.6.1 h1:d3/8lWFWmaQ/8mzJ5GxyRpO4racPpZ3yZ8kCuejhhiY=
+github.com/gogf/gf/contrib/trace/jaeger/v2 v2.6.1/go.mod h1:O0nzQLfNJtRApGHJluraTy41jc3LIvTsSkR8WAHb4f0=
+github.com/gogf/gf/v2 v2.6.1 h1:n/cfXM506WjhPa6Z1CEDuHNM1XZ7C8JzSDPn2AfuxgQ=
+github.com/gogf/gf/v2 v2.6.1/go.mod h1:x2XONYcI4hRQ/4gMNbWHmZrNzSEIg20s2NULbzom5k0=
+github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f h1:7xfXR/BhG3JDqO1s45n65Oyx9t4E/UqDOXep6jXdLCM=
+github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f/go.mod h1:HnYoio6S7VaFJdryKcD/r9HgX+4QzYfr00XiXUo/xz0=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
 github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
@@ -335,8 +337,6 @@ github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
 github.com/minio/minio-go/v7 v7.0.63 h1:GbZ2oCvaUdgT5640WJOpyDhhDxvknAJU2/T3yurwcbQ=
 github.com/minio/minio-go/v7 v7.0.63/go.mod h1:Q6X7Qjb7WMhvG65qKf4gUgA5XaiSox74kR1uAEjxRS4=
-github.com/minio/selfupdate v0.6.0 h1:i76PgT0K5xO9+hjzKcacQtO7+MjJ4JKA8Ak8XQ9DDwU=
-github.com/minio/selfupdate v0.6.0/go.mod h1:bO02GTIPCMQFTEvE5h4DjYB58bCoZ35XLeBf0buTDdM=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
@@ -410,8 +410,8 @@ github.com/qiniu/go-sdk/v7 v7.14.0/go.mod h1:btsaOc8CA3hdVloULfFdDgDc+g4f3TDZEFs
 github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/redis/go-redis/v9 v9.3.0 h1:RiVDjmig62jIWp7Kk4XVLs0hzV6pI3PyTnnL0cnn0u0=
-github.com/redis/go-redis/v9 v9.3.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
+github.com/redis/go-redis/v9 v9.3.1 h1:KqdY8U+3X6z+iACvumCNxnoluToB+9Me+TvyFa21Mds=
+github.com/redis/go-redis/v9 v9.3.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
 github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM=
 github.com/richardlehane/mscfb v1.0.4/go.mod h1:YzVpcZg9czvAuhk9T+a3avCpcFPMUWm7gK3DypaEsUk=
 github.com/richardlehane/msoleps v1.0.1 h1:RfrALnSNXzmXLbGct/P2b4xkFz4e8Gmj/0Vj9M9xC1o=
@@ -541,12 +541,11 @@ golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 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.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -624,8 +623,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -706,8 +705,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 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.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 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=
--- a/server/internal/consts/upload.go
+++ b/server/internal/consts/upload.go
@@ -12,5 +12,5 @@ const (
 	UploadDriveCos    = "cos"    // 腾讯云cos
 	UploadDriveOss    = "oss"    // 阿里云oss
 	UploadDriveQiNiu  = "qiniu"  // 七牛云对象存储
-	UploadDriveMinio  = "minio"  // minio
+	UploadDriveMinio  = "minio"  // minio对象存储
 )
--- a/server/internal/consts/version.go
+++ b/server/internal/consts/version.go
@@ -7,5 +7,5 @@ package consts

 // VersionApp HotGo版本
 const (
-	VersionApp = "2.11.5"
+	VersionApp = "2.12.1"
 )
--- a/server/internal/library/hggen/internal/cmd/cmd_run.go
+++ b/server/internal/library/hggen/internal/cmd/cmd_run.go
@@ -82,11 +82,11 @@ func init() {
 type (
 	cRunInput struct {
 		g.Meta     `name:"run"`
-		File       string `name:"FILE"       arg:"true" brief:"{cRunFileBrief}" v:"required"`
-		Path       string `name:"path"       short:"p"  brief:"{cRunPathBrief}" d:"./"`
-		Extra      string `name:"extra"      short:"e"  brief:"{cRunExtraBrief}"`
-		Args       string `name:"args"       short:"a"  brief:"{cRunArgsBrief}"`
-		WatchPaths string `name:"watchPaths" short:"w"  brief:"{cRunWatchPathsBrief}"`
+		File       string   `name:"FILE"       arg:"true" brief:"{cRunFileBrief}" v:"required"`
+		Path       string   `name:"path"       short:"p"  brief:"{cRunPathBrief}" d:"./"`
+		Extra      string   `name:"extra"      short:"e"  brief:"{cRunExtraBrief}"`
+		Args       string   `name:"args"       short:"a"  brief:"{cRunArgsBrief}"`
+		WatchPaths []string `name:"watchPaths" short:"w"  brief:"{cRunWatchPathsBrief}"`
 	}
 	cRunOutput struct{}
 )
@@ -97,12 +97,16 @@ func (c cRun) Index(ctx context.Context, in cRunInput) (out *cRunOutput, err err
 		mlog.Fatalf(`command "go" not found in your environment, please install golang first to proceed this command`)
 	}

+	if len(in.WatchPaths) == 1 {
+		in.WatchPaths = strings.Split(in.WatchPaths[0], ",")
+	}
+
 	app := &cRunApp{
 		File:       in.File,
 		Path:       in.Path,
 		Options:    in.Extra,
 		Args:       in.Args,
-		WatchPaths: strings.Split(in.WatchPaths, ","),
+		WatchPaths: in.WatchPaths,
 	}
 	dirty := gtype.NewBool()
 	_, err = gfsnotify.Add(gfile.RealPath("."), func(event *gfsnotify.Event) {
--- a/server/internal/library/hggen/internal/cmd/cmd_up.go
+++ b/server/internal/library/hggen/internal/cmd/cmd_up.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"runtime"

-	"github.com/minio/selfupdate"
+	"github.com/gogf/selfupdate"

 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
--- a/server/internal/library/hggen/internal/cmd/cmd_z_init_test.go
+++ b/server/internal/library/hggen/internal/cmd/cmd_z_init_test.go
@@ -6,6 +6,33 @@

 package cmd

-import "context"
+import (
+	"context"
+	"fmt"

-var ctx = context.Background()
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/test/gtest"
+)
+
+var (
+	ctx    = context.Background()
+	testDB gdb.DB
+	link   = "mysql:root:12345678@tcp(127.0.0.1:3306)/test?loc=Local&parseTime=true"
+)
+
+func init() {
+	var err error
+	testDB, err = gdb.New(gdb.ConfigNode{
+		Link: link,
+	})
+	if err != nil {
+		panic(err)
+	}
+}
+
+func dropTableWithDb(db gdb.DB, table string) {
+	dropTableStmt := fmt.Sprintf("DROP TABLE IF EXISTS `%s`", table)
+	if _, err := db.Exec(ctx, dropTableStmt); err != nil {
+		gtest.Error(err)
+	}
+}
--- a/server/internal/library/hggen/internal/cmd/cmd_z_unit_gen_dao_test.go
+++ b/server/internal/library/hggen/internal/cmd/cmd_z_unit_gen_dao_test.go
@@ -11,7 +11,6 @@ import (
 	"path/filepath"
 	"testing"

-	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/text/gstr"
@@ -20,22 +19,11 @@ import (
 	"hotgo/internal/library/hggen/internal/cmd/gendao"
 )

-func dropTableWithDb(db gdb.DB, table string) {
-	dropTableStmt := fmt.Sprintf("DROP TABLE IF EXISTS `%s`", table)
-	if _, err := db.Exec(ctx, dropTableStmt); err != nil {
-		gtest.Error(err)
-	}
-}
-
 func Test_Gen_Dao_Default(t *testing.T) {
-	link := "mysql:root:12345678@tcp(127.0.0.1:3306)/test?loc=Local&parseTime=true"
-	db, err := gdb.New(gdb.ConfigNode{
-		Link: link,
-	})
-	gtest.AssertNil(err)
-
 	gtest.C(t, func(t *gtest.T) {
 		var (
+			err        error
+			db         = testDB
 			table      = "table_user"
 			sqlContent = fmt.Sprintf(
 				gtest.DataContent(`gendao`, `user.tpl.sql`),
@@ -123,14 +111,10 @@ func Test_Gen_Dao_Default(t *testing.T) {
 }

 func Test_Gen_Dao_TypeMapping(t *testing.T) {
-	link := "mysql:root:12345678@tcp(127.0.0.1:3306)/test?loc=Local&parseTime=true"
-	db, err := gdb.New(gdb.ConfigNode{
-		Link: link,
-	})
-	gtest.AssertNil(err)
-
 	gtest.C(t, func(t *gtest.T) {
 		var (
+			err        error
+			db         = testDB
 			table      = "table_user"
 			sqlContent = fmt.Sprintf(
 				gtest.DataContent(`gendao`, `user.tpl.sql`),
--- a/server/internal/library/hggen/internal/cmd/cmd_z_unit_gen_pbentity_test.go
+++ b/server/internal/library/hggen/internal/cmd/cmd_z_unit_gen_pbentity_test.go
@@ -0,0 +1,70 @@
+// Copyright GoFrame gf Author(https://goframe.org). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/gogf/gf/v2/os/gcmd"
+	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/guid"
+)
+
+func Test_Gen_Pbentity_NameCase(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			err        error
+			db         = testDB
+			table      = "table_user"
+			sqlContent = fmt.Sprintf(
+				gtest.DataContent(`genpbentity`, `user.tpl.sql`),
+				table,
+			)
+		)
+		dropTableWithDb(db, table)
+		array := gstr.SplitAndTrim(sqlContent, ";")
+		for _, v := range array {
+			if _, err = db.Exec(ctx, v); err != nil {
+				t.AssertNil(err)
+			}
+		}
+		defer dropTableWithDb(db, table)
+		var path = gfile.Temp(guid.S())
+		err = gfile.Mkdir(path)
+		t.AssertNil(err)
+		defer gfile.Remove(path)
+
+		root, err := gcmd.NewFromObject(GF)
+		t.AssertNil(err)
+		err = root.AddObject(
+			Gen,
+		)
+		t.AssertNil(err)
+		os.Args = []string{"gf", "gen", "pbentity", "-l", link, "-p", path, "-package=unittest", "-nameCase=SnakeScreaming"}
+
+		err = root.RunWithError(ctx)
+		t.AssertNil(err)
+
+		files := []string{
+			filepath.FromSlash(path + "/table_user.proto"),
+		}
+
+		testPath := gtest.DataPath("genpbentity", "generated_user")
+		expectFiles := []string{
+			filepath.FromSlash(testPath + "/table_user.proto"),
+		}
+		// check files content
+		for i := range files {
+			t.Assert(gfile.GetContents(files[i]), gfile.GetContents(expectFiles[i]))
+		}
+	})
+}
--- a/server/internal/library/hggen/internal/cmd/genctrl/genctrl.go
+++ b/server/internal/library/hggen/internal/cmd/genctrl/genctrl.go
@@ -74,7 +74,7 @@ type (
 		SdkStdVersion bool   `short:"v" name:"sdkStdVersion" brief:"{CGenCtrlBriefSdkStdVersion}" orphan:"true"`
 		SdkNoV1       bool   `short:"n" name:"sdkNoV1"       brief:"{CGenCtrlBriefSdkNoV1}" orphan:"true"`
 		Clear         bool   `short:"c" name:"clear"         brief:"{CGenCtrlBriefClear}" orphan:"true"`
-		Merge         bool   `short:"m" name:"merge"        brief:"{CGenCtrlControllerMerge}" orphan:"true"`
+		Merge         bool   `short:"m" name:"merge"         brief:"{CGenCtrlControllerMerge}" orphan:"true"`
 	}
 	CGenCtrlOutput struct{}
 )
--- a/server/internal/library/hggen/internal/cmd/gendao/gendao.go
+++ b/server/internal/library/hggen/internal/cmd/gendao/gendao.go
@@ -59,28 +59,29 @@ CONFIGURATION SUPPORT
 			numeric:
 			  type: string
 `
-	CGenDaoBriefPath            = `directory path for generated files`
-	CGenDaoBriefLink            = `database configuration, the same as the ORM configuration of GoFrame`
-	CGenDaoBriefTables          = `generate models only for given tables, multiple table names separated with ','`
-	CGenDaoBriefTablesEx        = `generate models excluding given tables, multiple table names separated with ','`
-	CGenDaoBriefPrefix          = `add prefix for all table of specified link/database tables`
-	CGenDaoBriefRemovePrefix    = `remove specified prefix of the table, multiple prefix separated with ','`
-	CGenDaoBriefStdTime         = `use time.Time from stdlib instead of gtime.Time for generated time/date fields of tables`
-	CGenDaoBriefWithTime        = `add created time for auto produced go files`
-	CGenDaoBriefGJsonSupport    = `use gJsonSupport to use *gjson.Json instead of string for generated json fields of tables`
-	CGenDaoBriefImportPrefix    = `custom import prefix for generated go files`
-	CGenDaoBriefDaoPath         = `directory path for storing generated dao files under path`
-	CGenDaoBriefDoPath          = `directory path for storing generated do files under path`
-	CGenDaoBriefEntityPath      = `directory path for storing generated entity files under path`
-	CGenDaoBriefOverwriteDao    = `overwrite all dao files both inside/outside internal folder`
-	CGenDaoBriefModelFile       = `custom file name for storing generated model content`
-	CGenDaoBriefModelFileForDao = `custom file name generating model for DAO operations like Where/Data. It's empty in default`
-	CGenDaoBriefDescriptionTag  = `add comment to description tag for each field`
-	CGenDaoBriefNoJsonTag       = `no json tag will be added for each field`
-	CGenDaoBriefNoModelComment  = `no model comment will be added for each field`
-	CGenDaoBriefClear           = `delete all generated go files that do not exist in database`
-	CGenDaoBriefTypeMapping     = `custom local type mapping for generated struct attributes relevant to fields of table`
-	CGenDaoBriefGroup           = `
+	CGenDaoBriefPath              = `directory path for generated files`
+	CGenDaoBriefLink              = `database configuration, the same as the ORM configuration of GoFrame`
+	CGenDaoBriefTables            = `generate models only for given tables, multiple table names separated with ','`
+	CGenDaoBriefTablesEx          = `generate models excluding given tables, multiple table names separated with ','`
+	CGenDaoBriefPrefix            = `add prefix for all table of specified link/database tables`
+	CGenDaoBriefRemovePrefix      = `remove specified prefix of the table, multiple prefix separated with ','`
+	CGenDaoBriefRemoveFieldPrefix = `remove specified prefix of the field, multiple prefix separated with ','`
+	CGenDaoBriefStdTime           = `use time.Time from stdlib instead of gtime.Time for generated time/date fields of tables`
+	CGenDaoBriefWithTime          = `add created time for auto produced go files`
+	CGenDaoBriefGJsonSupport      = `use gJsonSupport to use *gjson.Json instead of string for generated json fields of tables`
+	CGenDaoBriefImportPrefix      = `custom import prefix for generated go files`
+	CGenDaoBriefDaoPath           = `directory path for storing generated dao files under path`
+	CGenDaoBriefDoPath            = `directory path for storing generated do files under path`
+	CGenDaoBriefEntityPath        = `directory path for storing generated entity files under path`
+	CGenDaoBriefOverwriteDao      = `overwrite all dao files both inside/outside internal folder`
+	CGenDaoBriefModelFile         = `custom file name for storing generated model content`
+	CGenDaoBriefModelFileForDao   = `custom file name generating model for DAO operations like Where/Data. It's empty in default`
+	CGenDaoBriefDescriptionTag    = `add comment to description tag for each field`
+	CGenDaoBriefNoJsonTag         = `no json tag will be added for each field`
+	CGenDaoBriefNoModelComment    = `no model comment will be added for each field`
+	CGenDaoBriefClear             = `delete all generated go files that do not exist in database`
+	CGenDaoBriefTypeMapping       = `custom local type mapping for generated struct attributes relevant to fields of table`
+	CGenDaoBriefGroup             = `
 specifying the configuration group name of database for generated ORM instance,
 it's not necessary and the default value is "default"
 `
@@ -145,6 +146,7 @@ func init() {
 		`CGenDaoBriefTablesEx`:           CGenDaoBriefTablesEx,
 		`CGenDaoBriefPrefix`:             CGenDaoBriefPrefix,
 		`CGenDaoBriefRemovePrefix`:       CGenDaoBriefRemovePrefix,
+		`CGenDaoBriefRemoveFieldPrefix`:  CGenDaoBriefRemoveFieldPrefix,
 		`CGenDaoBriefStdTime`:            CGenDaoBriefStdTime,
 		`CGenDaoBriefWithTime`:           CGenDaoBriefWithTime,
 		`CGenDaoBriefDaoPath`:            CGenDaoBriefDaoPath,
@@ -180,6 +182,7 @@ type (
 		Group              string `name:"group"               short:"g"  brief:"{CGenDaoBriefGroup}" d:"default"`
 		Prefix             string `name:"prefix"              short:"f"  brief:"{CGenDaoBriefPrefix}"`
 		RemovePrefix       string `name:"removePrefix"        short:"r"  brief:"{CGenDaoBriefRemovePrefix}"`
+		RemoveFieldPrefix  string `name:"removeFieldPrefix"   short:"rf" brief:"{CGenDaoBriefRemoveFieldPrefix}"`
 		JsonCase           string `name:"jsonCase"            short:"j"  brief:"{CGenDaoBriefJsonCase}" d:"CamelLower"`
 		ImportPrefix       string `name:"importPrefix"        short:"i"  brief:"{CGenDaoBriefImportPrefix}"`
 		DaoPath            string `name:"daoPath"             short:"d"  brief:"{CGenDaoBriefDaoPath}" d:"dao"`
--- a/server/internal/library/hggen/internal/cmd/gendao/gendao_dao.go
+++ b/server/internal/library/hggen/internal/cmd/gendao/gendao_dao.go
@@ -138,6 +138,7 @@ type generateDaoInternalInput struct {

 func generateDaoInternal(in generateDaoInternalInput) {
 	path := filepath.FromSlash(gfile.Join(in.DirPathDaoInternal, in.FileName+".go"))
+	removeFieldPrefixArray := gstr.SplitAndTrim(in.RemoveFieldPrefix, ",")
 	modelContent := gstr.ReplaceByMap(
 		getTemplateFromPathOrDefault(in.TplDaoInternalPath, consts.TemplateGenDaoInternalContent),
 		g.MapStrStr{
@@ -146,8 +147,8 @@ func generateDaoInternal(in generateDaoInternalInput) {
 			tplVarGroupName:               in.Group,
 			tplVarTableNameCamelCase:      in.TableNameCamelCase,
 			tplVarTableNameCamelLowerCase: in.TableNameCamelLowerCase,
-			tplVarColumnDefine:            gstr.Trim(generateColumnDefinitionForDao(in.FieldMap)),
-			tplVarColumnNames:             gstr.Trim(generateColumnNamesForDao(in.FieldMap)),
+			tplVarColumnDefine:            gstr.Trim(generateColumnDefinitionForDao(in.FieldMap, removeFieldPrefixArray)),
+			tplVarColumnNames:             gstr.Trim(generateColumnNamesForDao(in.FieldMap, removeFieldPrefixArray)),
 		})
 	modelContent = replaceDefaultVar(in.CGenDaoInternalInput, modelContent)
 	if err := gfile.PutContents(path, strings.TrimSpace(modelContent)); err != nil {
@@ -160,16 +161,23 @@ func generateDaoInternal(in generateDaoInternalInput) {

 // generateColumnNamesForDao generates and returns the column names assignment content of column struct
 // for specified table.
-func generateColumnNamesForDao(fieldMap map[string]*gdb.TableField) string {
+func generateColumnNamesForDao(fieldMap map[string]*gdb.TableField, removeFieldPrefixArray []string) string {
 	var (
 		buffer = bytes.NewBuffer(nil)
 		array  = make([][]string, len(fieldMap))
 		names  = sortFieldKeyForDao(fieldMap)
 	)
+
 	for index, name := range names {
 		field := fieldMap[name]
+
+		newFiledName := field.Name
+		for _, v := range removeFieldPrefixArray {
+			newFiledName = gstr.TrimLeftStr(newFiledName, v, 1)
+		}
+
 		array[index] = []string{
-			"            #" + gstr.CaseCamel(field.Name) + ":",
+			"            #" + gstr.CaseCamel(newFiledName) + ":",
 			fmt.Sprintf(` #"%s",`, field.Name),
 		}
 	}
@@ -189,12 +197,13 @@ func generateColumnNamesForDao(fieldMap map[string]*gdb.TableField) string {
 }

 // generateColumnDefinitionForDao generates and returns the column names definition for specified table.
-func generateColumnDefinitionForDao(fieldMap map[string]*gdb.TableField) string {
+func generateColumnDefinitionForDao(fieldMap map[string]*gdb.TableField, removeFieldPrefixArray []string) string {
 	var (
 		buffer = bytes.NewBuffer(nil)
 		array  = make([][]string, len(fieldMap))
 		names  = sortFieldKeyForDao(fieldMap)
 	)
+
 	for index, name := range names {
 		var (
 			field   = fieldMap[name]
@@ -203,8 +212,12 @@ func generateColumnDefinitionForDao(fieldMap map[string]*gdb.TableField) string
 				"\r", " ",
 			}))
 		)
+		newFiledName := field.Name
+		for _, v := range removeFieldPrefixArray {
+			newFiledName = gstr.TrimLeftStr(newFiledName, v, 1)
+		}
 		array[index] = []string{
-			"    #" + gstr.CaseCamel(field.Name),
+			"    #" + gstr.CaseCamel(newFiledName),
 			" # " + "string",
 			" #" + fmt.Sprintf(`// %s`, comment),
 		}
--- a/server/internal/library/hggen/internal/cmd/gendao/gendao_structure.go
+++ b/server/internal/library/hggen/internal/cmd/gendao/gendao_structure.go
@@ -126,8 +126,13 @@ func generateStructFieldDefinition(
 		tagKey         = "`"
 		descriptionTag = gstr.Replace(formatComment(field.Comment), `"`, `\"`)
 	)
+	removeFieldPrefixArray := gstr.SplitAndTrim(in.RemoveFieldPrefix, ",")
+	newFiledName := field.Name
+	for _, v := range removeFieldPrefixArray {
+		newFiledName = gstr.TrimLeftStr(newFiledName, v, 1)
+	}
 	attrLines = []string{
-		"    #" + gstr.CaseCamel(field.Name),
+		"    #" + gstr.CaseCamel(newFiledName),
 		" #" + localTypeNameStr,
 	}
 	attrLines = append(attrLines, " #"+fmt.Sprintf(tagKey+`json:"%s"`, jsonTag))
--- a/server/internal/library/hggen/internal/cmd/genpbentity/genpbentity.go
+++ b/server/internal/library/hggen/internal/cmd/genpbentity/genpbentity.go
@@ -31,16 +31,17 @@ import (
 type (
 	CGenPbEntity      struct{}
 	CGenPbEntityInput struct {
-		g.Meta       `name:"pbentity" config:"{CGenPbEntityConfig}" brief:"{CGenPbEntityBrief}" eg:"{CGenPbEntityEg}" ad:"{CGenPbEntityAd}"`
-		Path         string `name:"path"         short:"p" brief:"{CGenPbEntityBriefPath}" d:"manifest/protobuf/pbentity"`
-		Package      string `name:"package"      short:"k" brief:"{CGenPbEntityBriefPackage}"`
-		Link         string `name:"link"         short:"l" brief:"{CGenPbEntityBriefLink}"`
-		Tables       string `name:"tables"       short:"t" brief:"{CGenPbEntityBriefTables}"`
-		Prefix       string `name:"prefix"       short:"f" brief:"{CGenPbEntityBriefPrefix}"`
-		RemovePrefix string `name:"removePrefix" short:"r" brief:"{CGenPbEntityBriefRemovePrefix}"`
-		NameCase     string `name:"nameCase"     short:"n" brief:"{CGenPbEntityBriefNameCase}" d:"Camel"`
-		JsonCase     string `name:"jsonCase"     short:"j" brief:"{CGenPbEntityBriefJsonCase}" d:"CamelLower"`
-		Option       string `name:"option"       short:"o" brief:"{CGenPbEntityBriefOption}"`
+		g.Meta            `name:"pbentity" config:"{CGenPbEntityConfig}" brief:"{CGenPbEntityBrief}" eg:"{CGenPbEntityEg}" ad:"{CGenPbEntityAd}"`
+		Path              string `name:"path"              short:"p"  brief:"{CGenPbEntityBriefPath}" d:"manifest/protobuf/pbentity"`
+		Package           string `name:"package"           short:"k"  brief:"{CGenPbEntityBriefPackage}"`
+		Link              string `name:"link"              short:"l"  brief:"{CGenPbEntityBriefLink}"`
+		Tables            string `name:"tables"            short:"t"  brief:"{CGenPbEntityBriefTables}"`
+		Prefix            string `name:"prefix"            short:"f"  brief:"{CGenPbEntityBriefPrefix}"`
+		RemovePrefix      string `name:"removePrefix"      short:"r"  brief:"{CGenPbEntityBriefRemovePrefix}"`
+		RemoveFieldPrefix string `name:"removeFieldPrefix" short:"rf" brief:"{CGenPbEntityBriefRemoveFieldPrefix}"`
+		NameCase          string `name:"nameCase"          short:"n"  brief:"{CGenPbEntityBriefNameCase}" d:"Camel"`
+		JsonCase          string `name:"jsonCase"          short:"j"  brief:"{CGenPbEntityBriefJsonCase}" d:"none"`
+		Option            string `name:"option"            short:"o"  brief:"{CGenPbEntityBriefOption}"`
 	}
 	CGenPbEntityOutput struct{}

@@ -87,14 +88,15 @@ CONFIGURATION SUPPORT
 			  option java_package  = "protobuf/demos";
 			  option php_namespace = "protobuf/demos";
 `
-	CGenPbEntityBriefPath         = `directory path for generated files storing`
-	CGenPbEntityBriefPackage      = `package path for all entity proto files`
-	CGenPbEntityBriefLink         = `database configuration, the same as the ORM configuration of GoFrame`
-	CGenPbEntityBriefTables       = `generate models only for given tables, multiple table names separated with ','`
-	CGenPbEntityBriefPrefix       = `add specified prefix for all entity names and entity proto files`
-	CGenPbEntityBriefRemovePrefix = `remove specified prefix of the table, multiple prefix separated with ','`
-	CGenPbEntityBriefOption       = `extra protobuf options`
-	CGenPbEntityBriefGroup        = `
+	CGenPbEntityBriefPath              = `directory path for generated files storing`
+	CGenPbEntityBriefPackage           = `package path for all entity proto files`
+	CGenPbEntityBriefLink              = `database configuration, the same as the ORM configuration of GoFrame`
+	CGenPbEntityBriefTables            = `generate models only for given tables, multiple table names separated with ','`
+	CGenPbEntityBriefPrefix            = `add specified prefix for all entity names and entity proto files`
+	CGenPbEntityBriefRemovePrefix      = `remove specified prefix of the table, multiple prefix separated with ','`
+	CGenPbEntityBriefRemoveFieldPrefix = `remove specified prefix of the field, multiple prefix separated with ','`
+	CGenPbEntityBriefOption            = `extra protobuf options`
+	CGenPbEntityBriefGroup             = `
 specifying the configuration group name of database for generated ORM instance,
 it's not necessary and the default value is "default"
 `
@@ -120,20 +122,21 @@ set it to "none" to ignore json tag generating.

 func init() {
 	gtag.Sets(g.MapStrStr{
-		`CGenPbEntityConfig`:            CGenPbEntityConfig,
-		`CGenPbEntityBrief`:             CGenPbEntityBrief,
-		`CGenPbEntityEg`:                CGenPbEntityEg,
-		`CGenPbEntityAd`:                CGenPbEntityAd,
-		`CGenPbEntityBriefPath`:         CGenPbEntityBriefPath,
-		`CGenPbEntityBriefPackage`:      CGenPbEntityBriefPackage,
-		`CGenPbEntityBriefLink`:         CGenPbEntityBriefLink,
-		`CGenPbEntityBriefTables`:       CGenPbEntityBriefTables,
-		`CGenPbEntityBriefPrefix`:       CGenPbEntityBriefPrefix,
-		`CGenPbEntityBriefRemovePrefix`: CGenPbEntityBriefRemovePrefix,
-		`CGenPbEntityBriefGroup`:        CGenPbEntityBriefGroup,
-		`CGenPbEntityBriefNameCase`:     CGenPbEntityBriefNameCase,
-		`CGenPbEntityBriefJsonCase`:     CGenPbEntityBriefJsonCase,
-		`CGenPbEntityBriefOption`:       CGenPbEntityBriefOption,
+		`CGenPbEntityConfig`:                 CGenPbEntityConfig,
+		`CGenPbEntityBrief`:                  CGenPbEntityBrief,
+		`CGenPbEntityEg`:                     CGenPbEntityEg,
+		`CGenPbEntityAd`:                     CGenPbEntityAd,
+		`CGenPbEntityBriefPath`:              CGenPbEntityBriefPath,
+		`CGenPbEntityBriefPackage`:           CGenPbEntityBriefPackage,
+		`CGenPbEntityBriefLink`:              CGenPbEntityBriefLink,
+		`CGenPbEntityBriefTables`:            CGenPbEntityBriefTables,
+		`CGenPbEntityBriefPrefix`:            CGenPbEntityBriefPrefix,
+		`CGenPbEntityBriefRemovePrefix`:      CGenPbEntityBriefRemovePrefix,
+		`CGenPbEntityBriefRemoveFieldPrefix`: CGenPbEntityBriefRemoveFieldPrefix,
+		`CGenPbEntityBriefGroup`:             CGenPbEntityBriefGroup,
+		`CGenPbEntityBriefNameCase`:          CGenPbEntityBriefNameCase,
+		`CGenPbEntityBriefJsonCase`:          CGenPbEntityBriefJsonCase,
+		`CGenPbEntityBriefOption`:            CGenPbEntityBriefOption,
 	})
 }

@@ -339,6 +342,7 @@ func generateMessageFieldForPbEntity(index int, field *gdb.TableField, in CGenPb
 	comment = gstr.Replace(comment, `\n`, " ")
 	comment, _ = gregex.ReplaceString(`\s{2,}`, ` `, comment)
 	if jsonTagName := formatCase(field.Name, in.JsonCase); jsonTagName != "" {
+		jsonTagStr = fmt.Sprintf(`[json_name = "%s"]`, jsonTagName)
 		// beautiful indent.
 		if index < 10 {
 			// 3 spaces
@@ -351,9 +355,16 @@ func generateMessageFieldForPbEntity(index int, field *gdb.TableField, in CGenPb
 			jsonTagStr = " " + jsonTagStr
 		}
 	}
+
+	removeFieldPrefixArray := gstr.SplitAndTrim(in.RemoveFieldPrefix, ",")
+	newFiledName := field.Name
+	for _, v := range removeFieldPrefixArray {
+		newFiledName = gstr.TrimLeftStr(newFiledName, v, 1)
+	}
+
 	return []string{
 		"    #" + localTypeNameStr,
-		" #" + formatCase(field.Name, in.NameCase),
+		" #" + formatCase(newFiledName, in.NameCase),
 		" #= " + gconv.String(index) + jsonTagStr + ";",
 		" #" + fmt.Sprintf(`// %s`, comment),
 	}
@@ -368,32 +379,10 @@ func getTplPbEntityContent(tplEntityPath string) string {

 // formatCase call gstr.Case* function to convert the s to specified case.
 func formatCase(str, caseStr string) string {
-	switch gstr.ToLower(caseStr) {
-	case gstr.ToLower("Camel"):
-		return gstr.CaseCamel(str)
-
-	case gstr.ToLower("CamelLower"):
-		return gstr.CaseCamelLower(str)
-
-	case gstr.ToLower("Kebab"):
-		return gstr.CaseKebab(str)
-
-	case gstr.ToLower("KebabScreaming"):
-		return gstr.CaseKebabScreaming(str)
-
-	case gstr.ToLower("Snake"):
-		return gstr.CaseSnake(str)
-
-	case gstr.ToLower("SnakeFirstUpper"):
-		return gstr.CaseSnakeFirstUpper(str)
-
-	case gstr.ToLower("SnakeScreaming"):
-		return gstr.CaseSnakeScreaming(str)
-
-	case "none":
+	if caseStr == "none" {
 		return ""
 	}
-	return str
+	return gstr.CaseConvert(str, gstr.CaseTypeMatch(caseStr))
 }

 func sortFieldKeyForPbEntity(fieldMap map[string]*gdb.TableField) []string {
--- a/server/internal/library/hggen/internal/cmd/testdata/genpbentity/generated_user/table_user.proto
+++ b/server/internal/library/hggen/internal/cmd/testdata/genpbentity/generated_user/table_user.proto
@@ -0,0 +1,21 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+syntax = "proto3";
+
+package unittest;
+
+option go_package = "unittest";
+
+import "google/protobuf/timestamp.proto";
+
+message TableUser {
+    uint32                    ID        = 1; // User ID              
+    string                    PASSPORT  = 2; // User Passport        
+    string                    PASSWORD  = 3; // User Password        
+    string                    NICKNAME  = 4; // User Nickname        
+    string                    SCORE     = 5; // Total score amount.  
+    google.protobuf.Timestamp CREATE_AT = 6; // Created Time         
+    google.protobuf.Timestamp UPDATE_AT = 7; // Updated Time         
+}
--- a/server/internal/library/hggen/internal/cmd/testdata/genpbentity/user.tpl.sql
+++ b/server/internal/library/hggen/internal/cmd/testdata/genpbentity/user.tpl.sql
@@ -0,0 +1,10 @@
+CREATE TABLE `%s` (
+    `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
+    `passport` varchar(45) NOT NULL COMMENT 'User Passport',
+    `password` varchar(45) NOT NULL COMMENT 'User Password',
+    `nickname` varchar(45) NOT NULL COMMENT 'User Nickname',
+    `score` decimal(10,2) unsigned DEFAULT NULL COMMENT 'Total score amount.',
+    `create_at` datetime DEFAULT NULL COMMENT 'Created Time',
+    `update_at` datetime DEFAULT NULL COMMENT 'Updated Time',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
--- a/server/internal/library/hggen/internal/utility/mlog/mlog.go
+++ b/server/internal/library/hggen/internal/utility/mlog/mlog.go
@@ -24,15 +24,19 @@ var (
 )

 func init() {
-	logger.SetStack(false)
 	if genv.Get(headerPrintEnvName).String() == "1" {
 		logger.SetHeaderPrint(true)
 	} else {
 		logger.SetHeaderPrint(false)
 	}
+
 	if gcmd.GetOpt("debug") != nil || gcmd.GetOpt("gf.debug") != nil {
+		logger.SetHeaderPrint(true)
+		logger.SetStackSkip(4)
+		logger.SetFlags(logger.GetFlags() | glog.F_FILE_LONG)
 		logger.SetDebug(true)
 	} else {
+		logger.SetStack(false)
 		logger.SetDebug(false)
 	}
 }
--- a/server/internal/library/hggen/views/curd.go
+++ b/server/internal/library/hggen/views/curd.go
@@ -14,8 +14,10 @@ import (
 	"github.com/gogf/gf/v2/os/gview"
 	"github.com/gogf/gf/v2/text/gstr"
 	"hotgo/internal/consts"
+	"hotgo/internal/dao"
 	"hotgo/internal/library/hggen/internal/cmd/gendao"
 	"hotgo/internal/library/hggen/internal/utility/utils"
+	"hotgo/internal/library/hgorm"
 	"hotgo/internal/model"
 	"hotgo/internal/model/input/sysin"
 	"hotgo/utility/convert"
@@ -668,6 +670,15 @@ func (l *gCurd) generateSqlContent(ctx context.Context, in *CurdPreviewInput) (e
 		genFile = new(sysin.GenFile)
 	)

+	tplData["dirPid"], tplData["dirLevel"], tplData["dirTree"], err = hgorm.AutoUpdateTree(ctx, &dao.AdminMenu, 0, int64(in.options.Menu.Pid))
+	if err != nil {
+		return err
+	}
+
+	tplData["listLevel"] = tplData["dirLevel"].(int) + 1
+	tplData["btnLevel"] = tplData["dirLevel"].(int) + 2
+	tplData["sortLevel"] = tplData["dirLevel"].(int) + 3
+
 	if in.options.Menu.Pid > 0 {
 		tplData["mainComponent"] = "ParentLayout"
 	}
--- a/server/internal/library/hggen/views/curd_generate_web_edit.go
+++ b/server/internal/library/hggen/views/curd_generate_web_edit.go
@@ -32,7 +32,7 @@ func (l *gCurd) generateWebEditFormItem(ctx context.Context, in *CurdPreviewInpu
 		}

 		var (
-			defaultComponent = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n          <n-input placeholder=\"请输入%s\" v-model:value=\"params.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.Dc, field.TsName)
+			defaultComponent = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n          <n-input placeholder=\"请输入%s\" v-model:value=\"formValue.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.Dc, field.TsName)
 			component        string
 		)

@@ -41,63 +41,63 @@ func (l *gCurd) generateWebEditFormItem(ctx context.Context, in *CurdPreviewInpu
 			component = defaultComponent

 		case FormModeInputNumber:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-input-number placeholder=\"请输入%s\" v-model:value=\"params.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.Dc, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-input-number placeholder=\"请输入%s\" v-model:value=\"formValue.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.Dc, field.TsName)

 		case FormModeInputTextarea:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-input type=\"textarea\" placeholder=\"%s\" v-model:value=\"params.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.Dc, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-input type=\"textarea\" placeholder=\"%s\" v-model:value=\"formValue.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.Dc, field.TsName)

 		case FormModeInputEditor:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <Editor style=\"height: 450px\" id=\"%s\" v-model:value=\"params.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <Editor style=\"height: 450px\" id=\"%s\" v-model:value=\"formValue.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName, field.TsName)

 		case FormModeInputDynamic:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-dynamic-input\n            v-model:value=\"params.%s\"\n            preset=\"pair\"\n            key-placeholder=\"键名\"\n            value-placeholder=\"键值\"\n          />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-dynamic-input\n            v-model:value=\"formValue.%s\"\n            preset=\"pair\"\n            key-placeholder=\"键名\"\n            value-placeholder=\"键值\"\n          />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

 		case FormModeDate:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <DatePicker v-model:formValue=\"params.%s\" type=\"date\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <DatePicker v-model:formValue=\"formValue.%s\" type=\"date\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

 		// case FormModeDateRange:  // 必须要有两个字段，后面优化下

 		case FormModeTime:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <DatePicker v-model:formValue=\"params.%s\" type=\"datetime\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <DatePicker v-model:formValue=\"formValue.%s\" type=\"datetime\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

 		// case FormModeTimeRange: // 必须要有两个字段，后面优化下

 		case FormModeRadio:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-radio-group v-model:value=\"params.%s\" name=\"%s\">\n            <n-radio-button\n              v-for=\"%s in options.%s\"\n              :key=\"%s.value\"\n              :value=\"%s.value\"\n              :label=\"%s.label\"\n            />\n          </n-radio-group>\n          </n-form-item>", field.Dc, field.TsName, field.TsName, field.TsName, field.TsName, in.options.dictMap[field.TsName], field.TsName, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-radio-group v-model:value=\"formValue.%s\" name=\"%s\">\n            <n-radio-button\n              v-for=\"%s in options.%s\"\n              :key=\"%s.value\"\n              :value=\"%s.value\"\n              :label=\"%s.label\"\n            />\n          </n-radio-group>\n          </n-form-item>", field.Dc, field.TsName, field.TsName, field.TsName, field.TsName, in.options.dictMap[field.TsName], field.TsName, field.TsName, field.TsName)

 		case FormModeCheckbox:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-checkbox-group v-model:value=\"params.%s\">\n            <n-space>\n              <n-checkbox\n                v-for=\"item in options.%s\"\n                :key=\"item.value\"\n                :value=\"item.value\"\n                :label=\"item.label\"\n              />\n            </n-space>\n          </n-checkbox-group>\n          </n-form-item>", field.Dc, field.TsName, field.TsName, in.options.dictMap[field.TsName])
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-checkbox-group v-model:value=\"formValue.%s\">\n            <n-space>\n              <n-checkbox\n                v-for=\"item in options.%s\"\n                :key=\"item.value\"\n                :value=\"item.value\"\n                :label=\"item.label\"\n              />\n            </n-space>\n          </n-checkbox-group>\n          </n-form-item>", field.Dc, field.TsName, field.TsName, in.options.dictMap[field.TsName])

 		case FormModeSelect:
 			if in.options.dictMap[field.TsName] != nil {
-				component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-select v-model:value=\"params.%s\" :options=\"options.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName, in.options.dictMap[field.TsName])
+				component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-select v-model:value=\"formValue.%s\" :options=\"options.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName, in.options.dictMap[field.TsName])
 			} else {
-				component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-select v-model:value=\"params.%s\" options=\"\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
+				component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-select v-model:value=\"formValue.%s\" options=\"\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
 			}

 		case FormModeSelectMultiple:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-select multiple v-model:value=\"params.%s\" :options=\"options.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName, in.options.dictMap[field.TsName])
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-select multiple v-model:value=\"formValue.%s\" :options=\"options.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName, in.options.dictMap[field.TsName])

 		case FormModeUploadImage:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <UploadImage :maxNumber=\"1\" v-model:value=\"params.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <UploadImage :maxNumber=\"1\" v-model:value=\"formValue.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

 		case FormModeUploadImages:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <UploadImage :maxNumber=\"10\" v-model:value=\"params.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <UploadImage :maxNumber=\"10\" v-model:value=\"formValue.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

 		case FormModeUploadFile:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <UploadFile :maxNumber=\"1\" v-model:value=\"params.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <UploadFile :maxNumber=\"1\" v-model:value=\"formValue.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

 		case FormModeUploadFiles:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <UploadFile :maxNumber=\"10\" v-model:value=\"params.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <UploadFile :maxNumber=\"10\" v-model:value=\"formValue.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

 		case FormModeSwitch:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-switch :unchecked-value=\"2\" :checked-value=\"1\" v-model:value=\"params.%s\"\n        />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-switch :unchecked-value=\"2\" :checked-value=\"1\" v-model:value=\"formValue.%s\"\n        />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

 		case FormModeRate:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-rate allow-half :default-value=\"params.%s\" :on-update:value=\"update%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName, field.GoName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <n-rate allow-half :default-value=\"formValue.%s\" :on-update:value=\"update%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName, field.GoName)

 		case FormModeCitySelector:
-			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <CitySelector v-model:value=\"params.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)
+			component = fmt.Sprintf("<n-form-item label=\"%s\" path=\"%s\">\n            <CitySelector v-model:value=\"formValue.%s\" />\n          </n-form-item>", field.Dc, field.TsName, field.TsName)

 		default:
 			component = defaultComponent
@@ -120,21 +120,21 @@ func (l *gCurd) generateWebEditScript(ctx context.Context, in *CurdPreviewInput)
 	)

 	if in.options.Step.HasMaxSort {
-		importBuffer.WriteString("  import { onMounted, ref, computed, watch } from 'vue';\n")
+		importBuffer.WriteString("  import { ref } from 'vue';\n")
 		if in.Config.Application.Crud.Templates[in.In.GenTemplate].IsAddon {
 			importBuffer.WriteString("  import { Edit, MaxSort, View } from '@/api/addons/" + in.In.AddonName + "/" + gstr.LcFirst(in.In.VarName) + "';\n")
 		} else {
 			importBuffer.WriteString("  import { Edit, MaxSort, View } from '@/api/" + gstr.LcFirst(in.In.VarName) + "';\n")
 		}
-		setupBuffer.WriteString("  function loadForm(value) {\n    loading.value = true;\n\n    // 新增\n    if (value.id < 1) {\n      params.value = newState(value);\n      MaxSort()\n        .then((res) => {\n          params.value.sort = res.sort;\n        })\n        .finally(() => {\n          loading.value = false;\n        });\n      return;\n    }\n\n    // 编辑\n    View({ id: value.id })\n      .then((res) => {\n        params.value = res;\n      })\n      .finally(() => {\n        loading.value = false;\n      });\n  }\n\n  watch(\n    () => props.formParams,\n    (value) => {\n      loadForm(value);\n    }\n  );")
+		setupBuffer.WriteString("  function openModal(state: State) {\n    adaModalWidth(dialogWidth);\n    showModal.value = true;\n    loading.value = true;\n\n    // 新增\n    if (!state || state.id < 1) {\n      formValue.value = newState(state);\n      MaxSort()\n        .then((res) => {\n          formValue.value.sort = res.sort;\n        })\n        .finally(() => {\n          loading.value = false;\n        });\n      return;\n    }\n\n    // 编辑\n    View({ id: state.id })\n      .then((res) => {\n        formValue.value = res;\n      })\n      .finally(() => {\n        loading.value = false;\n      });\n  }")
 	} else {
-		importBuffer.WriteString("  import { onMounted, ref, computed, watch } from 'vue';\n")
+		importBuffer.WriteString("  import { ref } from 'vue';\n")
 		if in.Config.Application.Crud.Templates[in.In.GenTemplate].IsAddon {
 			importBuffer.WriteString("  import { Edit, View } from '@/api/addons/" + in.In.AddonName + "/" + gstr.LcFirst(in.In.VarName) + "';\n")
 		} else {
 			importBuffer.WriteString("  import { Edit, View } from '@/api/" + gstr.LcFirst(in.In.VarName) + "';\n")
 		}
-		setupBuffer.WriteString("  function loadForm(value) {\n    // 新增\n    if (value.id < 1) {\n      params.value = newState(value);\n      loading.value = false;\n      return;\n    }\n\n    loading.value = true;\n    // 编辑\n    View({ id: value.id })\n      .then((res) => {\n        params.value = res;\n      })\n      .finally(() => {\n        loading.value = false;\n      });\n  }\n\n  watch(\n    () => props.formParams,\n    (value) => {\n      loadForm(value);\n    }\n  );")
+		setupBuffer.WriteString("  function openModal(state: State) {\n    adaModalWidth(dialogWidth);\n    showModal.value = true;\n    loading.value = true;\n\n    // 新增\n    if (!state || state.id < 1) {\n      formValue.value = newState(state);\n      return;\n    }\n\n    // 编辑\n    View({ id: state.id })\n      .then((res) => {\n        formValue.value = res;\n      })\n      .finally(() => {\n        loading.value = false;\n      });\n  }")
 	}

 	for _, field := range in.masterFields {
@@ -159,7 +159,7 @@ func (l *gCurd) generateWebEditScript(ctx context.Context, in *CurdPreviewInput)
 				importBuffer.WriteString("  import UploadFile from '@/components/Upload/uploadFile.vue';\n")
 			}
 		case FormModeRate:
-			setupBuffer.WriteString(fmt.Sprintf("  function update%s(num) {\n    params.value.%s = num;\n  }\n", field.GoName, field.TsName))
+			setupBuffer.WriteString(fmt.Sprintf("  function update%s(num) {\n    formValue.value.%s = num;\n  }\n", field.GoName, field.TsName))
 		case FormModeCitySelector:
 			if !gstr.Contains(importBuffer.String(), `import CitySelector`) {
 				importBuffer.WriteString("  import CitySelector from '@/components/CitySelector/citySelector.vue';\n")
--- a/server/internal/library/hggen/views/curd_generate_web_model.go
+++ b/server/internal/library/hggen/views/curd_generate_web_model.go
@@ -22,7 +22,6 @@ const (
 func (l *gCurd) webModelTplData(ctx context.Context, in *CurdPreviewInput) (data g.Map, err error) {
 	data = make(g.Map)
 	data["state"] = l.generateWebModelState(ctx, in)
-	data["defaultState"] = l.generateWebModelDefaultState(ctx, in)
 	data["rules"] = l.generateWebModelRules(ctx, in)
 	data["formSchema"] = l.generateWebModelFormSchema(ctx, in)
 	if data["columns"], err = l.generateWebModelColumns(ctx, in); err != nil {
@@ -33,18 +32,7 @@ func (l *gCurd) webModelTplData(ctx context.Context, in *CurdPreviewInput) (data

 func (l *gCurd) generateWebModelState(ctx context.Context, in *CurdPreviewInput) string {
 	buffer := bytes.NewBuffer(nil)
-	buffer.WriteString("export interface State {\n")
-	for _, field := range in.masterFields {
-		buffer.WriteString(fmt.Sprintf("  %s: %s;\n", field.TsName, field.TsType))
-	}
-	buffer.WriteString("}")
-
-	return buffer.String()
-}
-
-func (l *gCurd) generateWebModelDefaultState(ctx context.Context, in *CurdPreviewInput) string {
-	buffer := bytes.NewBuffer(nil)
-	buffer.WriteString("export const defaultState: State = {\n")
+	buffer.WriteString("export class State {\n")
 	for _, field := range in.masterFields {
 		var value = field.DefaultValue
 		if value == nil {
@@ -56,10 +44,9 @@ func (l *gCurd) generateWebModelDefaultState(ctx context.Context, in *CurdPrevie
 		if field.Name == "status" {
 			value = 1
 		}
-		buffer.WriteString(fmt.Sprintf("  %s: %v,\n", field.TsName, value))
+		buffer.WriteString(fmt.Sprintf("  public %s = %v; // %s\n", field.TsName, value, field.Dc))
 	}
-	buffer.WriteString("};")
-
+	buffer.WriteString("}")
 	return buffer.String()
 }

@@ -107,8 +94,10 @@ func (l *gCurd) generateWebModelDictOptions(ctx context.Context, in *CurdPreview
 		switchLoadOptions string
 	)

+	interfaceOptionsBuffer := bytes.NewBuffer(nil)
+	interfaceOptionsBuffer.WriteString("export interface IOptions extends Options {\n")
 	constOptionsBuffer := bytes.NewBuffer(nil)
-	constOptionsBuffer.WriteString("export const options = ref<Options>({\n")
+	constOptionsBuffer.WriteString("export const options = ref<IOptions>({\n")

 	for _, v := range dictTypeList {
 		// 字段映射字典
@@ -120,14 +109,17 @@ func (l *gCurd) generateWebModelDictOptions(ctx context.Context, in *CurdPreview
 		}

 		awaitLoadOptions = fmt.Sprintf("%s    '%s',\n", awaitLoadOptions, v.Type)
+		interfaceOptionsBuffer.WriteString("  " + v.Type + ": Option[]; \n")
 		constOptionsBuffer.WriteString("  " + v.Type + ": [],\n")
 	}

+	interfaceOptionsBuffer.WriteString("};\n")
 	constOptionsBuffer.WriteString("});\n")

 	loadOptionsBuffer := bytes.NewBuffer(nil)
 	loadOptionsBuffer.WriteString(fmt.Sprintf(ModelLoadOptionsTemplate, awaitLoadOptions, switchLoadOptions))

+	options["interface"] = interfaceOptionsBuffer.String()
 	options["const"] = constOptionsBuffer.String()
 	options["load"] = loadOptionsBuffer.String()

--- a/server/internal/logic/admin/role.go
+++ b/server/internal/logic/admin/role.go
@@ -197,7 +197,7 @@ func (s *sAdminRole) Edit(ctx context.Context, in *adminin.RoleEditInp) (err err
 }

 func updateRoleChildrenTree(ctx context.Context, _id int64, _level int, _tree string) (err error) {
-	var list []*entity.AdminDept
+	var list []*entity.AdminRole
 	if err = dao.AdminRole.Ctx(ctx).Where("pid", _id).Scan(&list); err != nil {
 		return
 	}
--- a/server/internal/logic/sys/dict_data.go
+++ b/server/internal/logic/sys/dict_data.go
@@ -147,10 +147,6 @@ func (s *sSysDictData) GetTypes(ctx context.Context, id int64) (types []string,
 // Select 获取列表
 func (s *sSysDictData) Select(ctx context.Context, in *sysin.DataSelectInp) (list sysin.DataSelectModel, err error) {
 	mod := dao.SysDictData.Ctx(ctx).Where("type", in.Type)
-	if in.Type != "" {
-		mod = mod.Where("type", in.Type)
-	}
-
 	if err = mod.Order("sort asc,id desc").Scan(&list); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
--- a/server/internal/logic/sys/log.go
+++ b/server/internal/logic/sys/log.go
@@ -18,6 +18,7 @@ import (
 	"hotgo/internal/consts"
 	"hotgo/internal/dao"
 	"hotgo/internal/library/contexts"
+	"hotgo/internal/library/hgorm/handler"
 	"hotgo/internal/library/hgorm/hook"
 	"hotgo/internal/library/location"
 	"hotgo/internal/library/queue"
@@ -236,7 +237,7 @@ func (s *sSysLog) AnalysisLog(ctx context.Context) entity.SysLog {

 // View 获取指定字典类型信息
 func (s *sSysLog) View(ctx context.Context, in *sysin.LogViewInp) (res *sysin.LogViewModel, err error) {
-	if err = dao.SysLog.Ctx(ctx).Hook(hook.CityLabel).Where("id", in.Id).Scan(&res); err != nil {
+	if err = dao.SysLog.Ctx(ctx).Handler(handler.FilterAuth).Hook(hook.CityLabel).Where("id", in.Id).Scan(&res); err != nil {
 		err = gerror.Wrap(err, consts.ErrorORM)
 		return
 	}
@@ -253,13 +254,13 @@ func (s *sSysLog) View(ctx context.Context, in *sysin.LogViewInp) (res *sysin.Lo

 // Delete 删除
 func (s *sSysLog) Delete(ctx context.Context, in *sysin.LogDeleteInp) (err error) {
-	_, err = dao.SysLog.Ctx(ctx).Where("id", in.Id).Delete()
+	_, err = dao.SysLog.Ctx(ctx).Handler(handler.FilterAuth).Where("id", in.Id).Delete()
 	return
 }

 // List 列表
 func (s *sSysLog) List(ctx context.Context, in *sysin.LogListInp) (list []*sysin.LogListModel, totalCount int, err error) {
-	mod := dao.SysLog.Ctx(ctx).FieldsEx("get_data", "header_data", "post_data")
+	mod := dao.SysLog.Ctx(ctx).Handler(handler.FilterAuth).FieldsEx("get_data", "header_data", "post_data")

 	// 访问路径
 	if in.Url != "" {
--- a/server/internal/service/sys.go
+++ b/server/internal/service/sys.go
@@ -18,6 +18,167 @@ import (
 )

 type (
+	ISysCurdDemo interface {
+		// Model 生成演示ORM模型
+		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
+		// List 获取生成演示列表
+		List(ctx context.Context, in *sysin.CurdDemoListInp) (list []*sysin.CurdDemoListModel, totalCount int, err error)
+		// Export 导出生成演示
+		Export(ctx context.Context, in *sysin.CurdDemoListInp) (err error)
+		// Edit 修改/新增生成演示
+		Edit(ctx context.Context, in *sysin.CurdDemoEditInp) (err error)
+		// Delete 删除生成演示
+		Delete(ctx context.Context, in *sysin.CurdDemoDeleteInp) (err error)
+		// MaxSort 获取生成演示最大排序
+		MaxSort(ctx context.Context, in *sysin.CurdDemoMaxSortInp) (res *sysin.CurdDemoMaxSortModel, err error)
+		// View 获取生成演示指定信息
+		View(ctx context.Context, in *sysin.CurdDemoViewInp) (res *sysin.CurdDemoViewModel, err error)
+		// Status 更新生成演示状态
+		Status(ctx context.Context, in *sysin.CurdDemoStatusInp) (err error)
+		// Switch 更新生成演示开关
+		Switch(ctx context.Context, in *sysin.CurdDemoSwitchInp) (err error)
+	}
+	ISysDictData interface {
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.DictDataDeleteInp) error
+		// Edit 修改/新增
+		Edit(ctx context.Context, in *sysin.DictDataEditInp) (err error)
+		// List 获取列表
+		List(ctx context.Context, in *sysin.DictDataListInp) (list []*sysin.DictDataListModel, totalCount int, err error)
+		// GetId 获取指定类型的ID
+		GetId(ctx context.Context, t string) (id int64, err error)
+		// GetType 获取指定ID的类型标识
+		GetType(ctx context.Context, id int64) (types string, err error)
+		// GetTypes 获取指定ID的所有类型标识，包含下级
+		GetTypes(ctx context.Context, id int64) (types []string, err error)
+		// Select 获取列表
+		Select(ctx context.Context, in *sysin.DataSelectInp) (list sysin.DataSelectModel, err error)
+	}
+	ISysEmsLog interface {
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.EmsLogDeleteInp) (err error)
+		// Edit 修改/新增
+		Edit(ctx context.Context, in *sysin.EmsLogEditInp) (err error)
+		// Status 更新部门状态
+		Status(ctx context.Context, in *sysin.EmsLogStatusInp) (err error)
+		// View 获取指定字典类型信息
+		View(ctx context.Context, in *sysin.EmsLogViewInp) (res *sysin.EmsLogViewModel, err error)
+		// List 获取列表
+		List(ctx context.Context, in *sysin.EmsLogListInp) (list []*sysin.EmsLogListModel, totalCount int, err error)
+		// Send 发送邮件
+		Send(ctx context.Context, in *sysin.SendEmsInp) (err error)
+		// GetTemplate 获取指定邮件模板
+		GetTemplate(ctx context.Context, template string, config *model.EmailConfig) (val string, err error)
+		// AllowSend 是否允许发送
+		AllowSend(ctx context.Context, models *entity.SysEmsLog, config *model.EmailConfig) (err error)
+		// NowDayCount 当天发送次数
+		NowDayCount(ctx context.Context, event, email string) (count int, err error)
+		// VerifyCode 效验验证码
+		VerifyCode(ctx context.Context, in *sysin.VerifyEmsCodeInp) (err error)
+	}
+	ISysLoginLog interface {
+		// Model 登录日志Orm模型
+		Model(ctx context.Context) *gdb.Model
+		// List 获取登录日志列表
+		List(ctx context.Context, in *sysin.LoginLogListInp) (list []*sysin.LoginLogListModel, totalCount int, err error)
+		// Export 导出登录日志
+		Export(ctx context.Context, in *sysin.LoginLogListInp) (err error)
+		// Delete 删除登录日志
+		Delete(ctx context.Context, in *sysin.LoginLogDeleteInp) (err error)
+		// View 获取登录日志指定信息
+		View(ctx context.Context, in *sysin.LoginLogViewInp) (res *sysin.LoginLogViewModel, err error)
+		// Push 推送登录日志
+		Push(ctx context.Context, in *sysin.LoginLogPushInp)
+		// RealWrite 真实写入
+		RealWrite(ctx context.Context, models entity.SysLoginLog) (err error)
+	}
+	ISysAddons interface {
+		// List 获取列表
+		List(ctx context.Context, in *sysin.AddonsListInp) (list []*sysin.AddonsListModel, totalCount int, err error)
+		// Selects 选项
+		Selects(ctx context.Context, in *sysin.AddonsSelectsInp) (res *sysin.AddonsSelectsModel, err error)
+		// Build 提交生成
+		Build(ctx context.Context, in *sysin.AddonsBuildInp) (err error)
+		// Install 安装模块
+		Install(ctx context.Context, in *sysin.AddonsInstallInp) (err error)
+		// Upgrade 更新模块
+		Upgrade(ctx context.Context, in *sysin.AddonsUpgradeInp) (err error)
+		// UnInstall 卸载模块
+		UnInstall(ctx context.Context, in *sysin.AddonsUnInstallInp) (err error)
+	}
+	ISysAttachment interface {
+		// Model ORM模型
+		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
+		// Delete 删除附件
+		Delete(ctx context.Context, in *sysin.AttachmentDeleteInp) (err error)
+		// View 获取附件信息
+		View(ctx context.Context, in *sysin.AttachmentViewInp) (res *sysin.AttachmentViewModel, err error)
+		// List 获取附件列表
+		List(ctx context.Context, in *sysin.AttachmentListInp) (list []*sysin.AttachmentListModel, totalCount int, err error)
+		// ClearKind 清空上传类型
+		ClearKind(ctx context.Context, in *sysin.AttachmentClearKindInp) (err error)
+	}
+	ISysCron interface {
+		StartCron(ctx context.Context)
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.CronDeleteInp) (err error)
+		// Edit 修改/新增
+		Edit(ctx context.Context, in *sysin.CronEditInp) (err error)
+		// Status 更新状态
+		Status(ctx context.Context, in *sysin.CronStatusInp) (err error)
+		// MaxSort 最大排序
+		MaxSort(ctx context.Context, in *sysin.CronMaxSortInp) (res *sysin.CronMaxSortModel, err error)
+		// View 获取指定信息
+		View(ctx context.Context, in *sysin.CronViewInp) (res *sysin.CronViewModel, err error)
+		// List 获取列表
+		List(ctx context.Context, in *sysin.CronListInp) (list []*sysin.CronListModel, totalCount int, err error)
+		// GetName 获取分组名称
+		GetName(ctx context.Context, id int64) (name string, err error)
+		// OnlineExec 在线执行
+		OnlineExec(ctx context.Context, in *sysin.OnlineExecInp) (err error)
+		// DispatchLog 查看指定任务的调度日志
+		DispatchLog(ctx context.Context, in *sysin.DispatchLogInp) (res *sysin.DispatchLogModel, err error)
+	}
+	ISysServeLicense interface {
+		// Model 服务许可证ORM模型
+		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
+		// List 获取服务许可证列表
+		List(ctx context.Context, in *sysin.ServeLicenseListInp) (list []*sysin.ServeLicenseListModel, totalCount int, err error)
+		// Export 导出服务许可证
+		Export(ctx context.Context, in *sysin.ServeLicenseListInp) (err error)
+		// Edit 修改/新增服务许可证
+		Edit(ctx context.Context, in *sysin.ServeLicenseEditInp) (err error)
+		// Delete 删除服务许可证
+		Delete(ctx context.Context, in *sysin.ServeLicenseDeleteInp) (err error)
+		// View 获取服务许可证指定信息
+		View(ctx context.Context, in *sysin.ServeLicenseViewInp) (res *sysin.ServeLicenseViewModel, err error)
+		// Status 更新服务许可证状态
+		Status(ctx context.Context, in *sysin.ServeLicenseStatusInp) (err error)
+		// AssignRouter 分配服务许可证路由
+		AssignRouter(ctx context.Context, in *sysin.ServeLicenseAssignRouterInp) (err error)
+	}
+	ISysSmsLog interface {
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.SmsLogDeleteInp) (err error)
+		// Edit 修改/新增
+		Edit(ctx context.Context, in *sysin.SmsLogEditInp) (err error)
+		// Status 更新短信状态
+		Status(ctx context.Context, in *sysin.SmsLogStatusInp) (err error)
+		// View 获取指定字典类型信息
+		View(ctx context.Context, in *sysin.SmsLogViewInp) (res *sysin.SmsLogViewModel, err error)
+		// List 获取列表
+		List(ctx context.Context, in *sysin.SmsLogListInp) (list []*sysin.SmsLogListModel, totalCount int, err error)
+		// SendCode 发送验证码
+		SendCode(ctx context.Context, in *sysin.SendCodeInp) (err error)
+		// GetTemplate 获取指定短信模板
+		GetTemplate(ctx context.Context, template string, config *model.SmsConfig) (val string, err error)
+		// AllowSend 是否允许发送
+		AllowSend(ctx context.Context, models *entity.SysSmsLog, config *model.SmsConfig) (err error)
+		// NowDayCount 当天发送次数
+		NowDayCount(ctx context.Context, event, mobile string) (count int, err error)
+		// VerifyCode 效验验证码
+		VerifyCode(ctx context.Context, in *sysin.VerifyCodeInp) (err error)
+	}
 	ISysAddonsConfig interface {
 		// GetConfigByGroup 获取指定分组的配置
 		GetConfigByGroup(ctx context.Context, in *sysin.GetAddonsConfigInp) (res *sysin.GetAddonsConfigModel, err error)
@@ -46,6 +207,58 @@ type (
 		// ClusterSync 集群同步
 		ClusterSync(ctx context.Context, message *gredis.Message)
 	}
+	ISysLog interface {
+		// Export 导出
+		Export(ctx context.Context, in *sysin.LogListInp) (err error)
+		// RealWrite 真实写入
+		RealWrite(ctx context.Context, log entity.SysLog) (err error)
+		// AutoLog 根据配置自动记录请求日志
+		AutoLog(ctx context.Context) error
+		// AnalysisLog 解析日志数据
+		AnalysisLog(ctx context.Context) entity.SysLog
+		// View 获取指定字典类型信息
+		View(ctx context.Context, in *sysin.LogViewInp) (res *sysin.LogViewModel, err error)
+		// Delete 删除
+		Delete(ctx context.Context, in *sysin.LogDeleteInp) (err error)
+		// List 列表
+		List(ctx context.Context, in *sysin.LogListInp) (list []*sysin.LogListModel, totalCount int, err error)
+	}
+	ISysProvinces interface {
+		// Tree 关系树选项列表
+		Tree(ctx context.Context) (list []*sysin.ProvincesTree, err error)
+		// Delete 删除省市区数据
+		Delete(ctx context.Context, in *sysin.ProvincesDeleteInp) (err error)
+		// Edit 修改/新增省市区数据
+		Edit(ctx context.Context, in *sysin.ProvincesEditInp) (err error)
+		// Status 更新省市区状态
+		Status(ctx context.Context, in *sysin.ProvincesStatusInp) (err error)
+		// MaxSort 最大排序
+		MaxSort(ctx context.Context, in *sysin.ProvincesMaxSortInp) (res *sysin.ProvincesMaxSortModel, err error)
+		// View 获取省市区信息
+		View(ctx context.Context, in *sysin.ProvincesViewInp) (res *sysin.ProvincesViewModel, err error)
+		// List 获取列表
+		List(ctx context.Context, in *sysin.ProvincesListInp) (list []*sysin.ProvincesListModel, totalCount int, err error)
+		// ChildrenList 获取省市区下级列表
+		ChildrenList(ctx context.Context, in *sysin.ProvincesChildrenListInp) (list []*sysin.ProvincesChildrenListModel, totalCount int, err error)
+		// UniqueId 获取省市区下级列表
+		UniqueId(ctx context.Context, in *sysin.ProvincesUniqueIdInp) (res *sysin.ProvincesUniqueIdModel, err error)
+		// Select 省市区选项
+		Select(ctx context.Context, in *sysin.ProvincesSelectInp) (res *sysin.ProvincesSelectModel, err error)
+	}
+	ISysServeLog interface {
+		// Model 服务日志Orm模型
+		Model(ctx context.Context) *gdb.Model
+		// List 获取服务日志列表
+		List(ctx context.Context, in *sysin.ServeLogListInp) (list []*sysin.ServeLogListModel, totalCount int, err error)
+		// Export 导出服务日志
+		Export(ctx context.Context, in *sysin.ServeLogListInp) (err error)
+		// Delete 删除服务日志
+		Delete(ctx context.Context, in *sysin.ServeLogDeleteInp) (err error)
+		// View 获取服务日志指定信息
+		View(ctx context.Context, in *sysin.ServeLogViewInp) (res *sysin.ServeLogViewModel, err error)
+		// RealWrite 真实写入
+		RealWrite(ctx context.Context, models entity.SysServeLog) (err error)
+	}
 	ISysConfig interface {
 		// InitConfig 初始化系统配置
 		InitConfig(ctx context.Context)
@@ -104,64 +317,6 @@ type (
 		// Select 选项
 		Select(ctx context.Context, in *sysin.CronGroupSelectInp) (res *sysin.CronGroupSelectModel, err error)
 	}
-	ISysCurdDemo interface {
-		// Model 生成演示ORM模型
-		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
-		// List 获取生成演示列表
-		List(ctx context.Context, in *sysin.CurdDemoListInp) (list []*sysin.CurdDemoListModel, totalCount int, err error)
-		// Export 导出生成演示
-		Export(ctx context.Context, in *sysin.CurdDemoListInp) (err error)
-		// Edit 修改/新增生成演示
-		Edit(ctx context.Context, in *sysin.CurdDemoEditInp) (err error)
-		// Delete 删除生成演示
-		Delete(ctx context.Context, in *sysin.CurdDemoDeleteInp) (err error)
-		// MaxSort 获取生成演示最大排序
-		MaxSort(ctx context.Context, in *sysin.CurdDemoMaxSortInp) (res *sysin.CurdDemoMaxSortModel, err error)
-		// View 获取生成演示指定信息
-		View(ctx context.Context, in *sysin.CurdDemoViewInp) (res *sysin.CurdDemoViewModel, err error)
-		// Status 更新生成演示状态
-		Status(ctx context.Context, in *sysin.CurdDemoStatusInp) (err error)
-		// Switch 更新生成演示开关
-		Switch(ctx context.Context, in *sysin.CurdDemoSwitchInp) (err error)
-	}
-	ISysLog interface {
-		// Export 导出
-		Export(ctx context.Context, in *sysin.LogListInp) (err error)
-		// RealWrite 真实写入
-		RealWrite(ctx context.Context, log entity.SysLog) (err error)
-		// AutoLog 根据配置自动记录请求日志
-		AutoLog(ctx context.Context) error
-		// AnalysisLog 解析日志数据
-		AnalysisLog(ctx context.Context) entity.SysLog
-		// View 获取指定字典类型信息
-		View(ctx context.Context, in *sysin.LogViewInp) (res *sysin.LogViewModel, err error)
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.LogDeleteInp) (err error)
-		// List 列表
-		List(ctx context.Context, in *sysin.LogListInp) (list []*sysin.LogListModel, totalCount int, err error)
-	}
-	ISysSmsLog interface {
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.SmsLogDeleteInp) (err error)
-		// Edit 修改/新增
-		Edit(ctx context.Context, in *sysin.SmsLogEditInp) (err error)
-		// Status 更新短信状态
-		Status(ctx context.Context, in *sysin.SmsLogStatusInp) (err error)
-		// View 获取指定字典类型信息
-		View(ctx context.Context, in *sysin.SmsLogViewInp) (res *sysin.SmsLogViewModel, err error)
-		// List 获取列表
-		List(ctx context.Context, in *sysin.SmsLogListInp) (list []*sysin.SmsLogListModel, totalCount int, err error)
-		// SendCode 发送验证码
-		SendCode(ctx context.Context, in *sysin.SendCodeInp) (err error)
-		// GetTemplate 获取指定短信模板
-		GetTemplate(ctx context.Context, template string, config *model.SmsConfig) (val string, err error)
-		// AllowSend 是否允许发送
-		AllowSend(ctx context.Context, models *entity.SysSmsLog, config *model.SmsConfig) (err error)
-		// NowDayCount 当天发送次数
-		NowDayCount(ctx context.Context, event, mobile string) (count int, err error)
-		// VerifyCode 效验验证码
-		VerifyCode(ctx context.Context, in *sysin.VerifyCodeInp) (err error)
-	}
 	ISysDictType interface {
 		// Tree 树
 		Tree(ctx context.Context) (list []*sysin.DictTypeTree, err error)
@@ -172,28 +327,6 @@ type (
 		// TreeSelect 获取类型关系树选项
 		TreeSelect(ctx context.Context, in *sysin.DictTreeSelectInp) (list []*sysin.DictTypeTree, err error)
 	}
-	ISysEmsLog interface {
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.EmsLogDeleteInp) (err error)
-		// Edit 修改/新增
-		Edit(ctx context.Context, in *sysin.EmsLogEditInp) (err error)
-		// Status 更新部门状态
-		Status(ctx context.Context, in *sysin.EmsLogStatusInp) (err error)
-		// View 获取指定字典类型信息
-		View(ctx context.Context, in *sysin.EmsLogViewInp) (res *sysin.EmsLogViewModel, err error)
-		// List 获取列表
-		List(ctx context.Context, in *sysin.EmsLogListInp) (list []*sysin.EmsLogListModel, totalCount int, err error)
-		// Send 发送邮件
-		Send(ctx context.Context, in *sysin.SendEmsInp) (err error)
-		// GetTemplate 获取指定邮件模板
-		GetTemplate(ctx context.Context, template string, config *model.EmailConfig) (val string, err error)
-		// AllowSend 是否允许发送
-		AllowSend(ctx context.Context, models *entity.SysEmsLog, config *model.EmailConfig) (err error)
-		// NowDayCount 当天发送次数
-		NowDayCount(ctx context.Context, event, email string) (count int, err error)
-		// VerifyCode 效验验证码
-		VerifyCode(ctx context.Context, in *sysin.VerifyEmsCodeInp) (err error)
-	}
 	ISysGenCodes interface {
 		// Delete 删除
 		Delete(ctx context.Context, in *sysin.GenCodesDeleteInp) (err error)
@@ -220,206 +353,29 @@ type (
 		// Build 提交生成
 		Build(ctx context.Context, in *sysin.GenCodesBuildInp) (err error)
 	}
-	ISysProvinces interface {
-		// Tree 关系树选项列表
-		Tree(ctx context.Context) (list []*sysin.ProvincesTree, err error)
-		// Delete 删除省市区数据
-		Delete(ctx context.Context, in *sysin.ProvincesDeleteInp) (err error)
-		// Edit 修改/新增省市区数据
-		Edit(ctx context.Context, in *sysin.ProvincesEditInp) (err error)
-		// Status 更新省市区状态
-		Status(ctx context.Context, in *sysin.ProvincesStatusInp) (err error)
-		// MaxSort 最大排序
-		MaxSort(ctx context.Context, in *sysin.ProvincesMaxSortInp) (res *sysin.ProvincesMaxSortModel, err error)
-		// View 获取省市区信息
-		View(ctx context.Context, in *sysin.ProvincesViewInp) (res *sysin.ProvincesViewModel, err error)
-		// List 获取列表
-		List(ctx context.Context, in *sysin.ProvincesListInp) (list []*sysin.ProvincesListModel, totalCount int, err error)
-		// ChildrenList 获取省市区下级列表
-		ChildrenList(ctx context.Context, in *sysin.ProvincesChildrenListInp) (list []*sysin.ProvincesChildrenListModel, totalCount int, err error)
-		// UniqueId 获取省市区下级列表
-		UniqueId(ctx context.Context, in *sysin.ProvincesUniqueIdInp) (res *sysin.ProvincesUniqueIdModel, err error)
-		// Select 省市区选项
-		Select(ctx context.Context, in *sysin.ProvincesSelectInp) (res *sysin.ProvincesSelectModel, err error)
-	}
-	ISysServeLog interface {
-		// Model 服务日志Orm模型
-		Model(ctx context.Context) *gdb.Model
-		// List 获取服务日志列表
-		List(ctx context.Context, in *sysin.ServeLogListInp) (list []*sysin.ServeLogListModel, totalCount int, err error)
-		// Export 导出服务日志
-		Export(ctx context.Context, in *sysin.ServeLogListInp) (err error)
-		// Delete 删除服务日志
-		Delete(ctx context.Context, in *sysin.ServeLogDeleteInp) (err error)
-		// View 获取服务日志指定信息
-		View(ctx context.Context, in *sysin.ServeLogViewInp) (res *sysin.ServeLogViewModel, err error)
-		// RealWrite 真实写入
-		RealWrite(ctx context.Context, models entity.SysServeLog) (err error)
-	}
-	ISysAddons interface {
-		// List 获取列表
-		List(ctx context.Context, in *sysin.AddonsListInp) (list []*sysin.AddonsListModel, totalCount int, err error)
-		// Selects 选项
-		Selects(ctx context.Context, in *sysin.AddonsSelectsInp) (res *sysin.AddonsSelectsModel, err error)
-		// Build 提交生成
-		Build(ctx context.Context, in *sysin.AddonsBuildInp) (err error)
-		// Install 安装模块
-		Install(ctx context.Context, in *sysin.AddonsInstallInp) (err error)
-		// Upgrade 更新模块
-		Upgrade(ctx context.Context, in *sysin.AddonsUpgradeInp) (err error)
-		// UnInstall 卸载模块
-		UnInstall(ctx context.Context, in *sysin.AddonsUnInstallInp) (err error)
-	}
-	ISysAttachment interface {
-		// Model ORM模型
-		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
-		// Delete 删除附件
-		Delete(ctx context.Context, in *sysin.AttachmentDeleteInp) (err error)
-		// View 获取附件信息
-		View(ctx context.Context, in *sysin.AttachmentViewInp) (res *sysin.AttachmentViewModel, err error)
-		// List 获取附件列表
-		List(ctx context.Context, in *sysin.AttachmentListInp) (list []*sysin.AttachmentListModel, totalCount int, err error)
-		// ClearKind 清空上传类型
-		ClearKind(ctx context.Context, in *sysin.AttachmentClearKindInp) (err error)
-	}
-	ISysCron interface {
-		StartCron(ctx context.Context)
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.CronDeleteInp) (err error)
-		// Edit 修改/新增
-		Edit(ctx context.Context, in *sysin.CronEditInp) (err error)
-		// Status 更新状态
-		Status(ctx context.Context, in *sysin.CronStatusInp) (err error)
-		// MaxSort 最大排序
-		MaxSort(ctx context.Context, in *sysin.CronMaxSortInp) (res *sysin.CronMaxSortModel, err error)
-		// View 获取指定信息
-		View(ctx context.Context, in *sysin.CronViewInp) (res *sysin.CronViewModel, err error)
-		// List 获取列表
-		List(ctx context.Context, in *sysin.CronListInp) (list []*sysin.CronListModel, totalCount int, err error)
-		// GetName 获取分组名称
-		GetName(ctx context.Context, id int64) (name string, err error)
-		// OnlineExec 在线执行
-		OnlineExec(ctx context.Context, in *sysin.OnlineExecInp) (err error)
-		// DispatchLog 查看指定任务的调度日志
-		DispatchLog(ctx context.Context, in *sysin.DispatchLogInp) (res *sysin.DispatchLogModel, err error)
-	}
-	ISysDictData interface {
-		// Delete 删除
-		Delete(ctx context.Context, in *sysin.DictDataDeleteInp) error
-		// Edit 修改/新增
-		Edit(ctx context.Context, in *sysin.DictDataEditInp) (err error)
-		// List 获取列表
-		List(ctx context.Context, in *sysin.DictDataListInp) (list []*sysin.DictDataListModel, totalCount int, err error)
-		// GetId 获取指定类型的ID
-		GetId(ctx context.Context, t string) (id int64, err error)
-		// GetType 获取指定ID的类型标识
-		GetType(ctx context.Context, id int64) (types string, err error)
-		// GetTypes 获取指定ID的所有类型标识，包含下级
-		GetTypes(ctx context.Context, id int64) (types []string, err error)
-		// Select 获取列表
-		Select(ctx context.Context, in *sysin.DataSelectInp) (list sysin.DataSelectModel, err error)
-	}
-	ISysLoginLog interface {
-		// Model 登录日志Orm模型
-		Model(ctx context.Context) *gdb.Model
-		// List 获取登录日志列表
-		List(ctx context.Context, in *sysin.LoginLogListInp) (list []*sysin.LoginLogListModel, totalCount int, err error)
-		// Export 导出登录日志
-		Export(ctx context.Context, in *sysin.LoginLogListInp) (err error)
-		// Delete 删除登录日志
-		Delete(ctx context.Context, in *sysin.LoginLogDeleteInp) (err error)
-		// View 获取登录日志指定信息
-		View(ctx context.Context, in *sysin.LoginLogViewInp) (res *sysin.LoginLogViewModel, err error)
-		// Push 推送登录日志
-		Push(ctx context.Context, in *sysin.LoginLogPushInp)
-		// RealWrite 真实写入
-		RealWrite(ctx context.Context, models entity.SysLoginLog) (err error)
-	}
-	ISysServeLicense interface {
-		// Model 服务许可证ORM模型
-		Model(ctx context.Context, option ...*handler.Option) *gdb.Model
-		// List 获取服务许可证列表
-		List(ctx context.Context, in *sysin.ServeLicenseListInp) (list []*sysin.ServeLicenseListModel, totalCount int, err error)
-		// Export 导出服务许可证
-		Export(ctx context.Context, in *sysin.ServeLicenseListInp) (err error)
-		// Edit 修改/新增服务许可证
-		Edit(ctx context.Context, in *sysin.ServeLicenseEditInp) (err error)
-		// Delete 删除服务许可证
-		Delete(ctx context.Context, in *sysin.ServeLicenseDeleteInp) (err error)
-		// View 获取服务许可证指定信息
-		View(ctx context.Context, in *sysin.ServeLicenseViewInp) (res *sysin.ServeLicenseViewModel, err error)
-		// Status 更新服务许可证状态
-		Status(ctx context.Context, in *sysin.ServeLicenseStatusInp) (err error)
-		// AssignRouter 分配服务许可证路由
-		AssignRouter(ctx context.Context, in *sysin.ServeLicenseAssignRouterInp) (err error)
-	}
 )

 var (
+	localSysAddons       ISysAddons
+	localSysAttachment   ISysAttachment
 	localSysCurdDemo     ISysCurdDemo
-	localSysLog          ISysLog
+	localSysDictData     ISysDictData
+	localSysEmsLog       ISysEmsLog
+	localSysLoginLog     ISysLoginLog
+	localSysAddonsConfig ISysAddonsConfig
+	localSysBlacklist    ISysBlacklist
+	localSysCron         ISysCron
+	localSysServeLicense ISysServeLicense
 	localSysSmsLog       ISysSmsLog
+	localSysConfig       ISysConfig
+	localSysCronGroup    ISysCronGroup
+	localSysLog          ISysLog
 	localSysProvinces    ISysProvinces
 	localSysServeLog     ISysServeLog
 	localSysDictType     ISysDictType
-	localSysEmsLog       ISysEmsLog
 	localSysGenCodes     ISysGenCodes
-	localSysDictData     ISysDictData
-	localSysLoginLog     ISysLoginLog
-	localSysServeLicense ISysServeLicense
-	localSysAddons       ISysAddons
-	localSysAttachment   ISysAttachment
-	localSysCron         ISysCron
-	localSysCronGroup    ISysCronGroup
-	localSysAddonsConfig ISysAddonsConfig
-	localSysBlacklist    ISysBlacklist
-	localSysConfig       ISysConfig
 )

-func SysDictData() ISysDictData {
-	if localSysDictData == nil {
-		panic("implement not found for interface ISysDictData, forgot register?")
-	}
-	return localSysDictData
-}
-
-func RegisterSysDictData(i ISysDictData) {
-	localSysDictData = i
-}
-
-func SysLoginLog() ISysLoginLog {
-	if localSysLoginLog == nil {
-		panic("implement not found for interface ISysLoginLog, forgot register?")
-	}
-	return localSysLoginLog
-}
-
-func RegisterSysLoginLog(i ISysLoginLog) {
-	localSysLoginLog = i
-}
-
-func SysServeLicense() ISysServeLicense {
-	if localSysServeLicense == nil {
-		panic("implement not found for interface ISysServeLicense, forgot register?")
-	}
-	return localSysServeLicense
-}
-
-func RegisterSysServeLicense(i ISysServeLicense) {
-	localSysServeLicense = i
-}
-
-func SysAddons() ISysAddons {
-	if localSysAddons == nil {
-		panic("implement not found for interface ISysAddons, forgot register?")
-	}
-	return localSysAddons
-}
-
-func RegisterSysAddons(i ISysAddons) {
-	localSysAddons = i
-}
-
 func SysAttachment() ISysAttachment {
 	if localSysAttachment == nil {
 		panic("implement not found for interface ISysAttachment, forgot register?")
@@ -431,61 +387,6 @@ func RegisterSysAttachment(i ISysAttachment) {
 	localSysAttachment = i
 }

-func SysCron() ISysCron {
-	if localSysCron == nil {
-		panic("implement not found for interface ISysCron, forgot register?")
-	}
-	return localSysCron
-}
-
-func RegisterSysCron(i ISysCron) {
-	localSysCron = i
-}
-
-func SysCronGroup() ISysCronGroup {
-	if localSysCronGroup == nil {
-		panic("implement not found for interface ISysCronGroup, forgot register?")
-	}
-	return localSysCronGroup
-}
-
-func RegisterSysCronGroup(i ISysCronGroup) {
-	localSysCronGroup = i
-}
-
-func SysAddonsConfig() ISysAddonsConfig {
-	if localSysAddonsConfig == nil {
-		panic("implement not found for interface ISysAddonsConfig, forgot register?")
-	}
-	return localSysAddonsConfig
-}
-
-func RegisterSysAddonsConfig(i ISysAddonsConfig) {
-	localSysAddonsConfig = i
-}
-
-func SysBlacklist() ISysBlacklist {
-	if localSysBlacklist == nil {
-		panic("implement not found for interface ISysBlacklist, forgot register?")
-	}
-	return localSysBlacklist
-}
-
-func RegisterSysBlacklist(i ISysBlacklist) {
-	localSysBlacklist = i
-}
-
-func SysConfig() ISysConfig {
-	if localSysConfig == nil {
-		panic("implement not found for interface ISysConfig, forgot register?")
-	}
-	return localSysConfig
-}
-
-func RegisterSysConfig(i ISysConfig) {
-	localSysConfig = i
-}
-
 func SysCurdDemo() ISysCurdDemo {
 	if localSysCurdDemo == nil {
 		panic("implement not found for interface ISysCurdDemo, forgot register?")
@@ -497,15 +398,81 @@ func RegisterSysCurdDemo(i ISysCurdDemo) {
 	localSysCurdDemo = i
 }

-func SysLog() ISysLog {
-	if localSysLog == nil {
-		panic("implement not found for interface ISysLog, forgot register?")
+func SysDictData() ISysDictData {
+	if localSysDictData == nil {
+		panic("implement not found for interface ISysDictData, forgot register?")
 	}
-	return localSysLog
+	return localSysDictData
 }

-func RegisterSysLog(i ISysLog) {
-	localSysLog = i
+func RegisterSysDictData(i ISysDictData) {
+	localSysDictData = i
+}
+
+func SysEmsLog() ISysEmsLog {
+	if localSysEmsLog == nil {
+		panic("implement not found for interface ISysEmsLog, forgot register?")
+	}
+	return localSysEmsLog
+}
+
+func RegisterSysEmsLog(i ISysEmsLog) {
+	localSysEmsLog = i
+}
+
+func SysLoginLog() ISysLoginLog {
+	if localSysLoginLog == nil {
+		panic("implement not found for interface ISysLoginLog, forgot register?")
+	}
+	return localSysLoginLog
+}
+
+func RegisterSysLoginLog(i ISysLoginLog) {
+	localSysLoginLog = i
+}
+
+func SysAddons() ISysAddons {
+	if localSysAddons == nil {
+		panic("implement not found for interface ISysAddons, forgot register?")
+	}
+	return localSysAddons
+}
+
+func RegisterSysAddons(i ISysAddons) {
+	localSysAddons = i
+}
+
+func SysBlacklist() ISysBlacklist {
+	if localSysBlacklist == nil {
+		panic("implement not found for interface ISysBlacklist, forgot register?")
+	}
+	return localSysBlacklist
+}
+
+func RegisterSysBlacklist(i ISysBlacklist) {
+	localSysBlacklist = i
+}
+
+func SysCron() ISysCron {
+	if localSysCron == nil {
+		panic("implement not found for interface ISysCron, forgot register?")
+	}
+	return localSysCron
+}
+
+func RegisterSysCron(i ISysCron) {
+	localSysCron = i
+}
+
+func SysServeLicense() ISysServeLicense {
+	if localSysServeLicense == nil {
+		panic("implement not found for interface ISysServeLicense, forgot register?")
+	}
+	return localSysServeLicense
+}
+
+func RegisterSysServeLicense(i ISysServeLicense) {
+	localSysServeLicense = i
 }

 func SysSmsLog() ISysSmsLog {
@@ -519,6 +486,39 @@ func RegisterSysSmsLog(i ISysSmsLog) {
 	localSysSmsLog = i
 }

+func SysAddonsConfig() ISysAddonsConfig {
+	if localSysAddonsConfig == nil {
+		panic("implement not found for interface ISysAddonsConfig, forgot register?")
+	}
+	return localSysAddonsConfig
+}
+
+func RegisterSysAddonsConfig(i ISysAddonsConfig) {
+	localSysAddonsConfig = i
+}
+
+func SysCronGroup() ISysCronGroup {
+	if localSysCronGroup == nil {
+		panic("implement not found for interface ISysCronGroup, forgot register?")
+	}
+	return localSysCronGroup
+}
+
+func RegisterSysCronGroup(i ISysCronGroup) {
+	localSysCronGroup = i
+}
+
+func SysLog() ISysLog {
+	if localSysLog == nil {
+		panic("implement not found for interface ISysLog, forgot register?")
+	}
+	return localSysLog
+}
+
+func RegisterSysLog(i ISysLog) {
+	localSysLog = i
+}
+
 func SysProvinces() ISysProvinces {
 	if localSysProvinces == nil {
 		panic("implement not found for interface ISysProvinces, forgot register?")
@@ -541,26 +541,15 @@ func RegisterSysServeLog(i ISysServeLog) {
 	localSysServeLog = i
 }

-func SysDictType() ISysDictType {
-	if localSysDictType == nil {
-		panic("implement not found for interface ISysDictType, forgot register?")
+func SysConfig() ISysConfig {
+	if localSysConfig == nil {
+		panic("implement not found for interface ISysConfig, forgot register?")
 	}
-	return localSysDictType
+	return localSysConfig
 }

-func RegisterSysDictType(i ISysDictType) {
-	localSysDictType = i
-}
-
-func SysEmsLog() ISysEmsLog {
-	if localSysEmsLog == nil {
-		panic("implement not found for interface ISysEmsLog, forgot register?")
-	}
-	return localSysEmsLog
-}
-
-func RegisterSysEmsLog(i ISysEmsLog) {
-	localSysEmsLog = i
+func RegisterSysConfig(i ISysConfig) {
+	localSysConfig = i
 }

 func SysGenCodes() ISysGenCodes {
@@ -573,3 +562,14 @@ func SysGenCodes() ISysGenCodes {
 func RegisterSysGenCodes(i ISysGenCodes) {
 	localSysGenCodes = i
 }
+
+func SysDictType() ISysDictType {
+	if localSysDictType == nil {
+		panic("implement not found for interface ISysDictType, forgot register?")
+	}
+	return localSysDictType
+}
+
+func RegisterSysDictType(i ISysDictType) {
+	localSysDictType = i
+}
--- a/server/resource/generate/default/curd/source.sql.template
+++ b/server/resource/generate/default/curd/source.sql.template
@@ -23,7 +23,7 @@ SET @now := now();


 -- 菜单目录
-INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, '@{.options.Menu.Pid}', '@{.tableComment}', '@{.varName | LcFirst}', '/@{.varName | LcFirst}', '@{.options.Menu.Icon}', '1', '', '', '', '@{.mainComponent}', '1', '', '0', '0', '', '0', '0', '0', '1', '', '@{.options.Menu.Sort}', '', '1', @now, @now);
+INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, '@{.options.Menu.Pid}', '@{.tableComment}', '@{.varName | LcFirst}', '/@{.varName | LcFirst}', '@{.options.Menu.Icon}', '1', '', '', '', '@{.mainComponent}', '1', '', '0', '0', '', '0', '0', '0', '@{.dirLevel}', '@{.dirTree}', '@{.options.Menu.Sort}', '', '1', @now, @now);


 SET @dirId = LAST_INSERT_ID();
@@ -31,41 +31,41 @@ SET @dirId = LAST_INSERT_ID();

 -- 菜单页面
 -- 列表
-INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @dirId, '@{.tableComment}列表', '@{.varName | LcFirst}Index', 'index', '', '2', '', '/@{.apiPrefix}/list', '', '/@{.componentPrefix}/index', '1', '', '0', '0', '', '0', '0', '0', '2', '', '10', '', '1', @now, @now);
+INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @dirId, '@{.tableComment}列表', '@{.varName | LcFirst}Index', 'index', '', '2', '', '/@{.apiPrefix}/list', '', '/@{.componentPrefix}/index', '1', '', '0', '0', '', '0', '0', '0', '@{.listLevel}', CONCAT('@{.dirTree}tr_', @dirId,' '), '10', '', '1', @now, @now);


 SET @listId = LAST_INSERT_ID();
@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }
 -- 详情
-INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @dirId, '@{.tableComment}详情', '@{.varName | LcFirst}View', 'view/:id?', '', '2', '', '/@{.apiPrefix}/view', '', '/@{.componentPrefix}/view', '0', '@{.varName | LcFirst}Index', '0', '0', '', '0', '1', '0', '2', '', '20', '', '1', @now, @now);
+INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '@{.tableComment}详情', '@{.varName | LcFirst}View', '', '', '3', '', '/@{.apiPrefix}/view', '', '', '1', '', '0', '0', '', '0', '1', '0', '@{.btnLevel}', CONCAT('@{.dirTree}tr_', @dirId, ' tr_', @listId,' '), '10', '', '1', @now, @now);
@{end}

 -- 菜单按钮
@{ if eq .options.Step.HasEdit true }
 -- 编辑
-INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '编辑/新增@{.tableComment}', '@{.varName | LcFirst}Edit', '', '', '3', '', '/@{.apiPrefix}/edit', '', '', '1', '', '0', '0', '', '0', '1', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '编辑/新增@{.tableComment}', '@{.varName | LcFirst}Edit', '', '', '3', '', '/@{.apiPrefix}/edit', '', '', '1', '', '0', '0', '', '0', '1', '0', '@{.btnLevel}', CONCAT('@{.dirTree}tr_', @dirId, ' tr_', @listId,' '), '20', '', '1', @now, @now);
@{end}

 SET @editId = LAST_INSERT_ID();
@{ if and (eq .options.Step.HasEdit true) (eq .options.Step.HasMaxSort true) }
 -- 获取最大排序
-INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @editId, '获取@{.tableComment}最大排序', '@{.varName | LcFirst}MaxSort', '', '', '3', '', '/@{.apiPrefix}/maxSort', '', '', '1', '', '0', '0', '', '0', '0', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @editId, '获取@{.tableComment}最大排序', '@{.varName | LcFirst}MaxSort', '', '', '3', '', '/@{.apiPrefix}/maxSort', '', '', '1', '', '0', '0', '', '0', '0', '0', '@{.sortLevel}', CONCAT('@{.dirTree}tr_', @dirId, ' tr_', @listId, ' tr_', @editId,' '), '30', '', '1', @now, @now);
@{end}
@{ if eq .options.Step.HasDel true }
 -- 删除
-INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '删除@{.tableComment}', '@{.varName | LcFirst}Delete', '', '', '3', '', '/@{.apiPrefix}/delete', '', '', '1', '', '0', '0', '', '0', '0', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '删除@{.tableComment}', '@{.varName | LcFirst}Delete', '', '', '3', '', '/@{.apiPrefix}/delete', '', '', '1', '', '0', '0', '', '0', '0', '0', '@{.btnLevel}', CONCAT('@{.dirTree}tr_', @dirId, ' tr_', @listId,' '), '40', '', '1', @now, @now);
@{end}
@{ if eq .options.Step.HasStatus true }
 -- 更新状态
-INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '修改@{.tableComment}状态', '@{.varName | LcFirst}Status', '', '', '3', '', '/@{.apiPrefix}/status', '', '', '1', '', '0', '0', '', '0', '0', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '修改@{.tableComment}状态', '@{.varName | LcFirst}Status', '', '', '3', '', '/@{.apiPrefix}/status', '', '', '1', '', '0', '0', '', '0', '0', '0', '@{.btnLevel}', CONCAT('@{.dirTree}tr_', @dirId, ' tr_', @listId,' '), '50', '', '1', @now, @now);
@{end}
@{ if eq .options.Step.HasSwitch true }
 -- 操作开关
-INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '操作@{.tableComment}开关', '@{.varName | LcFirst}Switch', '', '', '3', '', '/@{.apiPrefix}/switch', '', '', '1', '', '0', '0', '', '0', '0', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '操作@{.tableComment}开关', '@{.varName | LcFirst}Switch', '', '', '3', '', '/@{.apiPrefix}/switch', '', '', '1', '', '0', '0', '', '0', '0', '0', '@{.btnLevel}', CONCAT('@{.dirTree}tr_', @dirId, ' tr_', @listId,' '), '60', '', '1', @now, @now);
@{end}
@{ if eq .options.Step.HasExport true }
 -- 导出
-INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '导出@{.tableComment}', '@{.varName | LcFirst}Export', '', '', '3', '', '/@{.apiPrefix}/export', '', '', '1', '', '0', '0', '', '0', '0', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `@{.menuTable}` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '导出@{.tableComment}', '@{.varName | LcFirst}Export', '', '', '3', '', '/@{.apiPrefix}/export', '', '', '1', '', '0', '0', '', '0', '0', '0', '@{.btnLevel}', CONCAT('@{.dirTree}tr_', @dirId, ' tr_', @listId,' '), '70', '', '1', @now, @now);
@{end}

 COMMIT;
--- a/server/resource/generate/default/curd/web.edit.vue.template
+++ b/server/resource/generate/default/curd/web.edit.vue.template
@@ -2,24 +2,28 @@
  <div>
    <n-spin :show="loading" description="请稍候...">
      <n-modal
-        v-model:show="isShowModal"
+        v-model:show="showModal"
+        :mask-closable="false"
        :show-icon="false"
        preset="dialog"
-       :title="params?.@{.pk.TsName} > 0 ? '编辑 #' + params?.@{.pk.TsName} : '添加'"
+        transform-origin="center"
+        :title="formValue.@{.pk.TsName} > 0 ? '编辑 #' + formValue.@{.pk.TsName} : '添加'"
        :style="{
          width: dialogWidth,
        }"
      >
-        <n-form
-          :model="params"
-          :rules="rules"
-          ref="formRef"
-          label-placement="left"
-          :label-width="100"
-          class="py-4"
-        >
-@{.formItem}
-        </n-form>
+        <n-scrollbar style="max-height: 87vh" class="pr-5">
+          <n-form
+            :model="formValue"
+            :rules="rules"
+            ref="formRef"
+            :label-placement="settingStore.isMobile ? 'top' : 'left'"
+            :label-width="100"
+            class="py-4"
+          >
+  @{.formItem}
+          </n-form>
+        </n-scrollbar>
        <template #action>
          <n-space>
            <n-button @click="closeForm">取消</n-button>
@@ -33,37 +37,18 @@

 <script lang="ts" setup>
@{.script.import}  import { rules, options, State, newState } from './model';
+  import { useProjectSettingStore } from '@/store/modules/projectSetting';
  import { useMessage } from 'naive-ui';
  import { adaModalWidth } from '@/utils/hotgo';

-  const emit = defineEmits(['reloadTable', 'updateShowModal']);
-
-  interface Props {
-    showModal: boolean;
-    formParams?: State;
-  }
-
-  const props = withDefaults(defineProps<Props>(), {
-    showModal: false,
-    formParams: () => {
-      return newState(null);
-    },
-  });
-
-  const isShowModal = computed({
-    get: () => {
-      return props.showModal;
-    },
-    set: (value) => {
-      emit('updateShowModal', value);
-    },
-  });
-
-  const loading = ref(false);
-  const params = ref<State>(props.formParams);
+  const emit = defineEmits(['reloadTable']);
  const message = useMessage();
-  const formRef = ref<any>({});
+  const settingStore = useProjectSettingStore();
  const dialogWidth = ref('75%');
+  const loading = ref(false);
+  const showModal = ref(false);
+  const formValue = ref<State>(newState(null));
+  const formRef = ref<any>({});
  const formBtnLoading = ref(false);

  function confirmForm(e) {
@@ -71,10 +56,10 @@
    formBtnLoading.value = true;
    formRef.value.validate((errors) => {
      if (!errors) {
-        Edit(params.value).then((_res) => {
+        Edit(formValue.value).then((_res) => {
          message.success('操作成功');
          setTimeout(() => {
-            isShowModal.value = false;
+            showModal.value = false;
            emit('reloadTable');
          });
        });
@@ -85,15 +70,16 @@
    });
  }

-  onMounted(async () => {
-    adaModalWidth(dialogWidth);
-  });
-
  function closeForm() {
-    isShowModal.value = false;
+    showModal.value = false;
+    loading.value = false;
  }

@{.script.setup}
+
+  defineExpose({
+    openModal,
+  });
 </script>

 <style lang="less"></style>
--- a/server/resource/generate/default/curd/web.index.vue.template
+++ b/server/resource/generate/default/curd/web.index.vue.template
@@ -76,12 +76,8 @@
        </template>
      </BasicTable>
    </n-card>
-@{ if eq .options.Step.HasEdit true }    <Edit
-      @reloadTable="reloadTable"
-      @updateShowModal="updateShowModal"
-      :showModal="showModal"
-      :formParams="formParams"
-    />@{end}
+@{ if eq .options.Step.HasEdit true }    <Edit @reloadTable="reloadTable" ref="editRef" />@{end}
+@{ if eq .options.Step.HasView true }    <View ref="viewRef" />@{end}
  </div>
 </template>

@@ -92,21 +88,21 @@
  import { BasicForm, useForm } from '@/components/Form/index';
  import { usePermission } from '@/hooks/web/usePermission';
@{.apiImport}
-  import { State, columns, schemas, options, newState } from './model';
+  import { columns, schemas, options } from './model';
@{.iconsImport}
-@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }  import { useRouter } from 'vue-router';@{end}
  import { getOptionLabel } from '@/utils/hotgo';
@{ if eq .options.Step.HasEdit true }  import Edit from './edit.vue';@{end}
-  const { hasPermission } = usePermission();
-@{ if or (eq .options.Step.HasView true) (eq .options.Step.HasEdit true) }  const router = useRouter();@{end}
-  const actionRef = ref();
+@{ if eq .options.Step.HasView true }  import View from './view.vue';@{end}
+
  const dialog = useDialog();
  const message = useMessage();
+  const { hasPermission } = usePermission();
+  const actionRef = ref();
  const searchFormRef = ref<any>({});
+  const viewRef = ref();
+  const editRef = ref();
  const batchDeleteDisabled = ref(true);
  const checkedIds = ref([]);
-  const showModal = ref(false);
-  const formParams = ref<State>();

  const actionColumn = reactive({
    width: 300,
@@ -169,15 +165,6 @@
  const loadDataTable = async (res) => {
    return await List({ ...searchFormRef.value?.formModel, ...res });
  };
-@{ if eq .options.Step.HasAdd true }
-  function addTable() {
-    showModal.value = true;
-    formParams.value = newState(null);
-  }@{end}
-@{ if or (eq .options.Step.HasAdd true) (eq .options.Step.HasEdit true) }
-  function updateShowModal(value) {
-    showModal.value = value;
-  }@{end}

@{ if eq .options.Step.HasCheck true }  function onCheckedRow(rowKeys) {
    batchDeleteDisabled.value = rowKeys.length <= 0;
@@ -187,14 +174,17 @@
  function reloadTable() {
    actionRef.value.reload();
  }
-@{ if eq .options.Step.HasView true }
-  function handleView(record: Recordable) {
-    router.push({ name: '@{.varName | LcFirst}View', params: { id: record.@{.pk.TsName} } });
+@{ if eq .options.Step.HasAdd true }
+  function addTable() {
+    editRef.value.openModal(null);
  }@{end}
@{ if eq .options.Step.HasEdit true }
  function handleEdit(record: Recordable) {
-    showModal.value = true;
-    formParams.value = newState(record as State);
+    editRef.value.openModal(record);
+  }@{end}
+@{ if eq .options.Step.HasView true }
+  function handleView(record: Recordable) {
+    viewRef.value.openModal(record);
  }@{end}

@{ if eq .options.Step.HasDel true }  function handleDelete(record: Recordable) {
@@ -209,9 +199,6 @@
          reloadTable();
        });
      },
-      onNegativeClick: () => {
-        // message.error('取消');
-      },
    });
  }@{end}

@@ -229,9 +216,6 @@
          reloadTable();
        });
      },
-      onNegativeClick: () => {
-        // message.error('取消');
-      },
    });
  }@{end}

--- a/server/resource/generate/default/curd/web.model.ts.template
+++ b/server/resource/generate/default/curd/web.model.ts.template
@@ -8,24 +8,25 @@ import { isArray, isNullObject } from '@/utils/is';
 import { getFileExt } from '@/utils/urlUtils';
 import { defRangeShortcuts, defShortcuts, formatToDate } from '@/utils/dateUtil';
 import { validate } from '@/utils/validateUtil';
-import { getOptionLabel, getOptionTag, Options, errorImg } from '@/utils/hotgo';
+import { getOptionLabel, getOptionTag, Option, Options, errorImg } from '@/utils/hotgo';
@{ if eq .options.Step.HasSwitch true }
 import { usePermission } from '@/hooks/web/usePermission';
 const { hasPermission } = usePermission();
 const $message = window['$message'];
@{end}
-
@{.state}

-@{.defaultState}
-
-export function newState(state: State | null): State {
+export function newState(state: State | Record<string, any> | null): State {
  if (state !== null) {
-    return cloneDeep(state);
+    if (state instanceof State) {
+      return cloneDeep(state);
+    }
+    return new State(state);
  }
-  return cloneDeep(defaultState);
+  return new State();
 }

+@{.dictOptions.interface}
@{.dictOptions.const}
@{.rules}
@{.formSchema}
--- a/server/resource/generate/default/curd/web.view.vue.template
+++ b/server/resource/generate/default/curd/web.view.vue.template
@@ -1,28 +1,33 @@
 <template>
  <div>
-    <div class="n-layout-page-header">
-      <n-card :bordered="false" title="@{.tableComment}详情"> <!-- CURD详情页--> </n-card>
-    </div>
-    <n-card :bordered="false" class="proCard mt-4" size="small" :segmented="{ content: true }">
-      <n-descriptions label-placement="left" class="py-2" column="4">
-@{.item}
-      </n-descriptions>
-    </n-card>
+    <n-spin :show="loading" description="请稍候...">
+      <n-drawer v-model:show="showModal" :width="dialogWidth">
+        <n-drawer-content>
+          <template #header> 生成演示详情 </template>
+          <template #footer>
+            <n-button @click="showModal = false"> 关闭 </n-button>
+          </template>
+          <n-descriptions label-placement="left" class="py-2" column="1">
+        @{.item}
+          </n-descriptions>
+        </n-drawer-content>
+      </n-drawer>
+    </n-spin>
  </div>
 </template>

 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue';
-  import { useRouter } from 'vue-router';
+  import { computed, ref } from 'vue';
  import { useMessage } from 'naive-ui';
  import { View } from '@{.importWebApi}';
-  import { newState, options } from './model';
-  import { getOptionLabel, getOptionTag } from '@/utils/hotgo';
+  import { State, newState, options } from './model';
+  import { adaModalWidth, getOptionLabel, getOptionTag } from '@/utils/hotgo';
  import { getFileExt } from '@/utils/urlUtils';

  const message = useMessage();
-  const router = useRouter();
-  const id = Number(router.currentRoute.value.params.id);
+  const dialogWidth = ref('75%');
+  const loading = ref(false);
+  const showModal = ref(false);
  const formValue = ref(newState(null));
  const fileAvatarCSS = computed(() => {
    return {
@@ -36,12 +41,21 @@
    window.open(url);
  }

-  onMounted(async () => {
-    if (id < 1) {
-      message.error('@{.pk.Dc}不正确，请检查！');
-      return;
-    }
-    formValue.value = await View({ @{.pk.TsName}: id });
+  function openModal(state: State) {
+    adaModalWidth(dialogWidth, 580);
+    showModal.value = true;
+    loading.value = true;
+    View({ id: state.id })
+      .then((res) => {
+        formValue.value = res;
+      })
+      .finally(() => {
+        loading.value = false;
+      });
+  }
+
+  defineExpose({
+    openModal,
  });
 </script>

--- a/server/storage/data/generate/curd_demo_menu.sql
+++ b/server/storage/data/generate/curd_demo_menu.sql
@@ -1,7 +1,7 @@
 -- hotgo自动生成菜单权限SQL 通常情况下只在首次生成代码时自动执行一次
-- 如需再次执行请先手动删除生成的菜单权限和在SQL文件：E:\Users\Administrator\Desktop\gosrc\hotgo\server\resource\data\generate\curd_demo_menu.sql
-- Version: 2.1.0
-- Date: 2023-01-18 15:19:42
+-- 如需再次执行请先手动删除生成的菜单权限和在SQL文件：C:\Users\Administrator\Desktop\gosrc\hotgo_dev\server\storage\data\generate\curd_demo_menu.sql
+-- Version: 2.11.5
+-- Date: 2023-12-29 18:18:21
 -- Link https://github.com/bufanyun/hotgo

 SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
@@ -23,7 +23,7 @@ SET @now := now();


 -- 菜单目录
-INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, '2097', '生成演示', 'curdDemo', '/curdDemo', 'MenuOutlined', '1', '', '', '', 'ParentLayout', '1', '', '0', '0', '', '0', '0', '0', '1', '', '200', '', '1', @now, @now);
+INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, '2097', '生成演示', 'curdDemo', '/curdDemo', 'MenuOutlined', '1', '', '', '', 'ParentLayout', '1', '', '0', '0', '', '0', '0', '0', '2', 'tr_2097 ', '200', '', '1', @now, @now);


 SET @dirId = LAST_INSERT_ID();
@@ -31,41 +31,41 @@ SET @dirId = LAST_INSERT_ID();

 -- 菜单页面
 -- 列表
-INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @dirId, '生成演示列表', 'curdDemoIndex', 'index', '', '2', '', '/curdDemo/list', '', '/curdDemo/index', '1', '', '0', '0', '', '0', '0', '0', '2', '', '10', '', '1', @now, @now);
+INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @dirId, '生成演示列表', 'curdDemoIndex', 'index', '', '2', '', '/curdDemo/list', '', '/curdDemo/index', '1', '', '0', '0', '', '0', '0', '0', '3', CONCAT('tr_2097 tr_', @dirId,' '), '10', '', '1', @now, @now);


 SET @listId = LAST_INSERT_ID();

 -- 详情
-INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @dirId, '生成演示详情', 'curdDemoView', 'view/:id?', '', '2', '', '/curdDemo/view', '', '/curdDemo/view', '0', 'curdDemoIndex', '0', '0', '', '0', '1', '0', '2', '', '20', '', '1', @now, @now);
+INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '生成演示详情', 'curdDemoView', '', '', '3', '', '/curdDemo/view', '', '', '1', '', '0', '0', '', '0', '1', '0', '4', CONCAT('tr_2097 tr_', @dirId, ' tr_', @listId,' '), '10', '', '1', @now, @now);


 -- 菜单按钮

 -- 编辑
-INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '编辑/新增生成演示', 'curdDemoEdit', '', '', '3', '', '/curdDemo/edit', '', '', '1', '', '0', '0', '', '0', '1', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '编辑/新增生成演示', 'curdDemoEdit', '', '', '3', '', '/curdDemo/edit', '', '', '1', '', '0', '0', '', '0', '1', '0', '4', CONCAT('tr_2097 tr_', @dirId, ' tr_', @listId,' '), '20', '', '1', @now, @now);


 SET @editId = LAST_INSERT_ID();

 -- 获取最大排序
-INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @editId, '获取生成演示最大排序', 'curdDemoMaxSort', '', '', '3', '', '/curdDemo/maxSort', '', '', '1', '', '0', '0', '', '0', '0', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @editId, '获取生成演示最大排序', 'curdDemoMaxSort', '', '', '3', '', '/curdDemo/maxSort', '', '', '1', '', '0', '0', '', '0', '0', '0', '5', CONCAT('tr_2097 tr_', @dirId, ' tr_', @listId, ' tr_', @editId,' '), '30', '', '1', @now, @now);


 -- 删除
-INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '删除生成演示', 'curdDemoDelete', '', '', '3', '', '/curdDemo/delete', '', '', '1', '', '0', '0', '', '0', '0', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '删除生成演示', 'curdDemoDelete', '', '', '3', '', '/curdDemo/delete', '', '', '1', '', '0', '0', '', '0', '0', '0', '4', CONCAT('tr_2097 tr_', @dirId, ' tr_', @listId,' '), '40', '', '1', @now, @now);


 -- 更新状态
-INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '修改生成演示状态', 'curdDemoStatus', '', '', '3', '', '/curdDemo/status', '', '', '1', '', '0', '0', '', '0', '0', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '修改生成演示状态', 'curdDemoStatus', '', '', '3', '', '/curdDemo/status', '', '', '1', '', '0', '0', '', '0', '0', '0', '4', CONCAT('tr_2097 tr_', @dirId, ' tr_', @listId,' '), '50', '', '1', @now, @now);


 -- 操作开关
-INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '操作生成演示开关', 'curdDemoSwitch', '', '', '3', '', '/curdDemo/switch', '', '', '1', '', '0', '0', '', '0', '0', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '操作生成演示开关', 'curdDemoSwitch', '', '', '3', '', '/curdDemo/switch', '', '', '1', '', '0', '0', '', '0', '0', '0', '4', CONCAT('tr_2097 tr_', @dirId, ' tr_', @listId,' '), '60', '', '1', @now, @now);


 -- 导出
-INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '导出生成演示', 'curdDemoExport', '', '', '3', '', '/curdDemo/export', '', '', '1', '', '0', '0', '', '0', '0', '0', '3', '', '10', '', '1', @now, @now);
+INSERT INTO `hg_admin_menu` (`id`, `pid`, `title`, `name`, `path`, `icon`, `type`, `redirect`, `permissions`, `permission_name`, `component`, `always_show`, `active_menu`, `is_root`, `is_frame`, `frame_src`, `keep_alive`, `hidden`, `affix`, `level`, `tree`, `sort`, `remark`, `status`, `created_at`, `updated_at`) VALUES (NULL, @listId, '导出生成演示', 'curdDemoExport', '', '', '3', '', '/curdDemo/export', '', '', '1', '', '0', '0', '', '0', '0', '0', '4', CONCAT('tr_2097 tr_', @dirId, ' tr_', @listId,' '), '70', '', '1', @now, @now);


 COMMIT;