diff --git a/.gitignore b/.gitignore index e68ec1da..4bac657b 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ yarn-error.log* /server/log/ /server/gva /server/latest_log +/server/__debug_bin* *.iml web/.pnpm-debug.log diff --git a/README.md b/README.md index 73262956..66fefe31 100644 --- a/README.md +++ b/README.md @@ -331,10 +331,7 @@ swag init ### 7.1 技术群 -### QQ交流群：622360840 -| QQ 群 | -| :---: | -| | +### QQ交流群：470239250 ### 微信交流群 | 微信 | diff --git a/deploy/docker-compose/docker-compose-dev.yaml b/deploy/docker-compose/docker-compose-dev.yaml index 468564ca..8bdb3347 100644 --- a/deploy/docker-compose/docker-compose-dev.yaml +++ b/deploy/docker-compose/docker-compose-dev.yaml @@ -41,8 +41,10 @@ services: ports: - '8888:8888' depends_on: - - mysql - - redis + mysql: + condition: service_healthy + redis: + condition: service_healthy volumes: - ../../server:/server working_dir: /server # 如果docker 设置了workdir 则此处不需要设置 @@ -67,6 +69,11 @@ services: MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称 MYSQL_USER: 'gva' MYSQL_PASSWORD: 'Aa@6447985' + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "gva", "-pAa@6447985"] + interval: 10s + timeout: 5s + retries: 3 volumes: - mysql:/var/lib/mysql networks: @@ -80,6 +87,11 @@ services: restart: always ports: - '16379:6379' + healthcheck: + test: ["CMD-SHELL", "redis-cli ping | grep PONG || exit 1"] + interval: 10s + timeout: 5s + retries: 3 volumes: - redis:/data networks: diff --git a/deploy/docker-compose/docker-compose.yaml b/deploy/docker-compose/docker-compose.yaml index 6c8ae02d..1e304c2e 100644 --- a/deploy/docker-compose/docker-compose.yaml +++ b/deploy/docker-compose/docker-compose.yaml @@ -38,8 +38,10 @@ services: ports: - '8888:8888' depends_on: - - mysql - - redis + mysql: + condition: service_healthy + redis: + condition: service_healthy links: - mysql - redis @@ -59,6 +61,11 @@ services: MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称 MYSQL_USER: 'gva' MYSQL_PASSWORD: 'Aa@6447985' + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "gva", "-pAa@6447985"] + interval: 10s + timeout: 5s + retries: 3 volumes: - mysql:/var/lib/mysql networks: @@ -71,6 +78,11 @@ services: restart: always ports: - '16379:6379' + healthcheck: + test: ["CMD-SHELL", "redis-cli ping | grep PONG || exit 1"] + interval: 10s + timeout: 5s + retries: 3 volumes: - redis:/data networks: diff --git a/server/api/v1/system/sys_auto_code.go b/server/api/v1/system/sys_auto_code.go index 6f0faeb0..3ca49a96 100644 --- a/server/api/v1/system/sys_auto_code.go +++ b/server/api/v1/system/sys_auto_code.go @@ -63,6 +63,7 @@ func (autoApi *AutoCodeApi) CreateTemp(c *gin.Context) { } a.Pretreatment() var apiIds []uint + var menuId uint if a.AutoCreateApiToSql { if ids, err := autoCodeService.AutoCreateApi(&a); err != nil { global.GVA_LOG.Error("自动化创建失败!请自行清空垃圾数据!", zap.Error(err)) @@ -73,8 +74,17 @@ func (autoApi *AutoCodeApi) CreateTemp(c *gin.Context) { apiIds = ids } } + if a.AutoCreateMenuToSql { + if id, err := autoCodeService.AutoCreateMenu(&a); err != nil { + global.GVA_LOG.Error("自动化创建失败!请自行清空垃圾数据!", zap.Error(err)) + c.Writer.Header().Add("success", "false") + c.Writer.Header().Add("msg", url.QueryEscape("自动化创建失败!请自行清空垃圾数据!")) + } else { + menuId = id + } + } a.PackageT = utils.FirstUpper(a.Package) - err := autoCodeService.CreateTemp(a, apiIds...) + err := autoCodeService.CreateTemp(a, menuId, apiIds...) if err != nil { if errors.Is(err, system.ErrAutoMove) { c.Writer.Header().Add("success", "true") diff --git a/server/api/v1/system/sys_export_template.go b/server/api/v1/system/sys_export_template.go index 57da9305..4eaaf47b 100644 --- a/server/api/v1/system/sys_export_template.go +++ b/server/api/v1/system/sys_export_template.go @@ -191,11 +191,12 @@ func (sysExportTemplateApi *SysExportTemplateApi) GetSysExportTemplateList(c *gi // @Router /sysExportTemplate/exportExcel [get] func (sysExportTemplateApi *SysExportTemplateApi) ExportExcel(c *gin.Context) { templateID := c.Query("templateID") + queryParams := c.Request.URL.Query() if templateID == "" { response.FailWithMessage("模板ID不能为空", c) return } - if file, name, err := sysExportTemplateService.ExportExcel(templateID); err != nil { + if file, name, err := sysExportTemplateService.ExportExcel(templateID, queryParams); err != nil { global.GVA_LOG.Error("获取失败!", zap.Error(err)) response.FailWithMessage("获取失败", c) } else { diff --git a/server/config.yaml b/server/config.yaml index ffdb7db5..7ba41f0b 100644 --- a/server/config.yaml +++ b/server/config.yaml @@ -30,6 +30,7 @@ mongo: database: '' username: '' password: '' + auth-source: '' min-pool-size: 0 max-pool-size: 100 socket-timeout-ms: 0 diff --git a/server/config/mongo.go b/server/config/mongo.go index fe4f0e09..2034a3fb 100644 --- a/server/config/mongo.go +++ b/server/config/mongo.go @@ -11,6 +11,7 @@ type Mongo struct { Database string `json:"database" yaml:"database" mapstructure:"database"` // database name Username string `json:"username" yaml:"username" mapstructure:"username"` // 用户名 Password string `json:"password" yaml:"password" mapstructure:"password"` // 密码 + AuthSource string `json:"auth-source" yaml:"auth-source" mapstructure:"auth-source"` // 验证数据库 MinPoolSize uint64 `json:"min-pool-size" yaml:"min-pool-size" mapstructure:"min-pool-size"` // 最小连接池 MaxPoolSize uint64 `json:"max-pool-size" yaml:"max-pool-size" mapstructure:"max-pool-size"` // 最大连接池 SocketTimeoutMs int64 `json:"socket-timeout-ms" yaml:"socket-timeout-ms" mapstructure:"socket-timeout-ms"` // socket超时时间 diff --git a/server/config/system.go b/server/config/system.go index 7ab33876..398bf789 100644 --- a/server/config/system.go +++ b/server/config/system.go @@ -1,7 +1,6 @@ package config type System struct { - Env string `mapstructure:"env" json:"env" yaml:"env"` // 环境值 DbType string `mapstructure:"db-type" json:"db-type" yaml:"db-type"` // 数据库类型:mysql(默认)|sqlite|sqlserver|postgresql OssType string `mapstructure:"oss-type" json:"oss-type" yaml:"oss-type"` // Oss类型 RouterPrefix string `mapstructure:"router-prefix" json:"router-prefix" yaml:"router-prefix"` @@ -10,5 +9,5 @@ type System struct { LimitTimeIP int `mapstructure:"iplimit-time" json:"iplimit-time" yaml:"iplimit-time"` UseMultipoint bool `mapstructure:"use-multipoint" json:"use-multipoint" yaml:"use-multipoint"` // 多点登录拦截 UseRedis bool `mapstructure:"use-redis" json:"use-redis" yaml:"use-redis"` // 使用redis - UseMongo bool `mapstructure:"use-mongo" json:"use-mongo" yaml:"use-mongo"` // 使用redis + UseMongo bool `mapstructure:"use-mongo" json:"use-mongo" yaml:"use-mongo"` // 使用mongo } diff --git a/server/core/server.go b/server/core/server.go index 663aa042..d58626ca 100644 --- a/server/core/server.go +++ b/server/core/server.go @@ -2,8 +2,6 @@ package core import ( "fmt" - "time" - "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/initialize" "github.com/flipped-aurora/gin-vue-admin/server/service/system" @@ -35,15 +33,13 @@ func RunWindowsServer() { address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr) s := initServer(address, Router) - // 保证文本顺序输出 - // In order to ensure that the text order output can be deleted - time.Sleep(10 * time.Microsecond) + global.GVA_LOG.Info("server run success on ", zap.String("address", address)) fmt.Printf(` 欢迎使用 gin-vue-admin - 当前版本:v2.5.9 - 加群方式:微信号：shouzi_1994 QQ群：622360840 + 当前版本:v2.6.1 + 加群方式:微信号：shouzi_1994 QQ群：470239250 插件市场:https://plugin.gin-vue-admin.com GVA讨论社区:https://support.qq.com/products/371961 默认自动化文档地址:http://127.0.0.1%s/swagger/index.html diff --git a/server/core/viper.go b/server/core/viper.go index e4cbc318..42b58932 100644 --- a/server/core/viper.go +++ b/server/core/viper.go @@ -29,13 +29,13 @@ func Viper(path ...string) *viper.Viper { switch gin.Mode() { case gin.DebugMode: config = internal.ConfigDefaultFile - fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.EnvGinMode, internal.ConfigDefaultFile) + fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.Mode(), internal.ConfigDefaultFile) case gin.ReleaseMode: config = internal.ConfigReleaseFile - fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.EnvGinMode, internal.ConfigReleaseFile) + fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.Mode(), internal.ConfigReleaseFile) case gin.TestMode: config = internal.ConfigTestFile - fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.EnvGinMode, internal.ConfigTestFile) + fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.Mode(), internal.ConfigTestFile) } } else { // internal.ConfigEnv 常量存储的环境变量不为空 将值赋值于config config = configEnv diff --git a/server/docs/docs.go b/server/docs/docs.go index ede55e68..323b73e9 100644 --- a/server/docs/docs.go +++ b/server/docs/docs.go @@ -7001,7 +7001,7 @@ const docTemplate = `{ // SwaggerInfo holds exported Swagger Info so clients can modify it var SwaggerInfo = &swag.Spec{ - Version: "v2.5.9", + Version: "v2.6.1", Host: "", BasePath: "", Schemes: []string{}, diff --git a/server/docs/swagger.json b/server/docs/swagger.json index 7d5e4c08..324d491a 100644 --- a/server/docs/swagger.json +++ b/server/docs/swagger.json @@ -4,7 +4,7 @@ "description": "使用gin+vue进行极速开发的全栈开发基础平台", "title": "Gin-Vue-Admin Swagger API接口文档", "contact": {}, - "version": "v2.5.9" + "version": "v2.6.1" }, "paths": { "/api/createApi": { @@ -6989,4 +6989,4 @@ "in": "header" } } -} \ No newline at end of file +} diff --git a/server/docs/swagger.yaml b/server/docs/swagger.yaml index 0e53bb15..d7e5ec12 100644 --- a/server/docs/swagger.yaml +++ b/server/docs/swagger.yaml @@ -1585,7 +1585,7 @@ info: contact: {} description: 使用gin+vue进行极速开发的全栈开发基础平台 title: Gin-Vue-Admin Swagger API接口文档 - version: v2.5.9 + version: v2.6.1 paths: /api/createApi: post: diff --git a/server/go.mod b/server/go.mod index 1452b7fc..f1967622 100644 --- a/server/go.mod +++ b/server/go.mod @@ -123,6 +123,7 @@ require ( github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.uber.org/atomic v1.9.0 // indirect + go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/arch v0.3.0 // indirect golang.org/x/image v0.11.0 // indirect diff --git a/server/go.sum b/server/go.sum index b92c3709..fa4974d0 100644 --- a/server/go.sum +++ b/server/go.sum @@ -459,6 +459,8 @@ go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= +go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= diff --git a/server/initialize/ensure_tables.go b/server/initialize/ensure_tables.go index 780e3555..d49c1a23 100644 --- a/server/initialize/ensure_tables.go +++ b/server/initialize/ensure_tables.go @@ -49,6 +49,7 @@ func (e *ensureTables) MigrateTable(ctx context.Context) (context.Context, error sysModel.SysAuthorityBtn{}, sysModel.SysAutoCode{}, sysModel.SysExportTemplate{}, + sysModel.Condition{}, adapter.CasbinRule{}, @@ -85,6 +86,7 @@ func (e *ensureTables) TableCreated(ctx context.Context) bool { sysModel.SysAuthorityBtn{}, sysModel.SysAutoCode{}, sysModel.SysExportTemplate{}, + sysModel.Condition{}, adapter.CasbinRule{}, diff --git a/server/initialize/gorm.go b/server/initialize/gorm.go index a2886b04..6c309385 100644 --- a/server/initialize/gorm.go +++ b/server/initialize/gorm.go @@ -46,6 +46,7 @@ func RegisterTables() { system.SysAuthorityBtn{}, system.SysAutoCode{}, system.SysExportTemplate{}, + system.Condition{}, example.ExaFile{}, example.ExaCustomer{}, diff --git a/server/initialize/mongo.go b/server/initialize/mongo.go index 1c183b32..d88afaa7 100644 --- a/server/initialize/mongo.go +++ b/server/initialize/mongo.go @@ -54,8 +54,9 @@ func (m *mongo) Initialization() error { SocketTimeoutMS: &global.GVA_CONFIG.Mongo.SocketTimeoutMs, ConnectTimeoutMS: &global.GVA_CONFIG.Mongo.ConnectTimeoutMs, Auth: &qmgo.Credential{ - Username: global.GVA_CONFIG.Mongo.Username, - Password: global.GVA_CONFIG.Mongo.Password, + Username: global.GVA_CONFIG.Mongo.Username, + Password: global.GVA_CONFIG.Mongo.Password, + AuthSource: global.GVA_CONFIG.Mongo.AuthSource, }, }, opts...) if err != nil { diff --git a/server/initialize/router.go b/server/initialize/router.go index 3c369cbe..3b90889b 100644 --- a/server/initialize/router.go +++ b/server/initialize/router.go @@ -1,29 +1,41 @@ package initialize import ( - swaggerFiles "github.com/swaggo/files" - "net/http" - "github.com/flipped-aurora/gin-vue-admin/server/docs" "github.com/flipped-aurora/gin-vue-admin/server/global" "github.com/flipped-aurora/gin-vue-admin/server/middleware" "github.com/flipped-aurora/gin-vue-admin/server/router" "github.com/gin-gonic/gin" + swaggerFiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" + "net/http" + "os" ) +type justFilesFilesystem struct { + fs http.FileSystem +} + +func (fs justFilesFilesystem) Open(name string) (http.File, error) { + f, err := fs.fs.Open(name) + if err != nil { + return nil, err + } + + stat, err := f.Stat() + if stat.IsDir() { + return nil, os.ErrPermission + } + + return f, nil +} + // 初始化总路由 func Routers() *gin.Engine { - - // 设置为发布模式 - if global.GVA_CONFIG.System.Env == "public" { - gin.SetMode(gin.ReleaseMode) //DebugMode ReleaseMode TestMode - } - Router := gin.New() Router.Use(gin.Recovery()) - if global.GVA_CONFIG.System.Env != "public" { + if gin.Mode() == gin.DebugMode { Router.Use(gin.Logger()) } @@ -35,11 +47,10 @@ func Routers() *gin.Engine { // VUE_APP_BASE_PATH = http://localhost // 然后执行打包命令 npm run build。在打开下面3行注释 //Router.Static("/favicon.ico", "./dist/favicon.ico") - //Router.Static("/static", "./dist/static") // dist里面的静态资源 + //Router.Static("/assets", "./dist/assets") // dist里面的静态资源 //Router.StaticFile("/", "./dist/index.html") // 前端网页入口页面 - Router.StaticFS(global.GVA_CONFIG.Local.StorePath, http.Dir(global.GVA_CONFIG.Local.StorePath)) // 为用户头像和文件提供静态地址 - // Router.Use(middleware.LoadTls()) // 如果需要使用https 请打开此中间件 然后前往 core/server.go 将启动模式 更变为 Router.RunTLS("端口","你的cre/pem文件","你的key文件") + Router.StaticFS(global.GVA_CONFIG.Local.StorePath, justFilesFilesystem{http.Dir(global.GVA_CONFIG.Local.StorePath)}) // Router.Use(middleware.LoadTls()) // 如果需要使用https 请打开此中间件 然后前往 core/server.go 将启动模式 更变为 Router.RunTLS("端口","你的cre/pem文件","你的key文件") // 跨域，如需跨域可以打开下面的注释 // Router.Use(middleware.Cors()) // 直接放行全部跨域请求 // Router.Use(middleware.CorsByRules()) // 按照配置的规则放行跨域请求 diff --git a/server/main.go b/server/main.go index ecc56f45..e08c8e00 100644 --- a/server/main.go +++ b/server/main.go @@ -1,6 +1,7 @@ package main import ( + _ "go.uber.org/automaxprocs" "go.uber.org/zap" "github.com/flipped-aurora/gin-vue-admin/server/core" @@ -14,7 +15,7 @@ import ( //go:generate go mod download // @title Gin-Vue-Admin Swagger API接口文档 -// @version v2.5.9 +// @version v2.6.1 // @description 使用gin+vue进行极速开发的全栈开发基础平台 // @securityDefinitions.apikey ApiKeyAuth // @in header diff --git a/server/middleware/casbin_rbac.go b/server/middleware/casbin_rbac.go index 7994db1e..a1ca4c2b 100644 --- a/server/middleware/casbin_rbac.go +++ b/server/middleware/casbin_rbac.go @@ -16,22 +16,20 @@ var casbinService = service.ServiceGroupApp.SystemServiceGroup.CasbinService // CasbinHandler 拦截器 func CasbinHandler() gin.HandlerFunc { return func(c *gin.Context) { - if global.GVA_CONFIG.System.Env != "develop" { - waitUse, _ := utils.GetClaims(c) - //获取请求的PATH - path := c.Request.URL.Path - obj := strings.TrimPrefix(path, global.GVA_CONFIG.System.RouterPrefix) - // 获取请求方法 - act := c.Request.Method - // 获取用户的角色 - sub := strconv.Itoa(int(waitUse.AuthorityId)) - e := casbinService.Casbin() // 判断策略中是否存在 - success, _ := e.Enforce(sub, obj, act) - if !success { - response.FailWithDetailed(gin.H{}, "权限不足", c) - c.Abort() - return - } + waitUse, _ := utils.GetClaims(c) + //获取请求的PATH + path := c.Request.URL.Path + obj := strings.TrimPrefix(path, global.GVA_CONFIG.System.RouterPrefix) + // 获取请求方法 + act := c.Request.Method + // 获取用户的角色 + sub := strconv.Itoa(int(waitUse.AuthorityId)) + e := casbinService.Casbin() // 判断策略中是否存在 + success, _ := e.Enforce(sub, obj, act) + if !success { + response.FailWithDetailed(gin.H{}, "权限不足", c) + c.Abort() + return } c.Next() } diff --git a/server/middleware/jwt.go b/server/middleware/jwt.go index 67ae4dfc..aa7ca37b 100644 --- a/server/middleware/jwt.go +++ b/server/middleware/jwt.go @@ -23,12 +23,12 @@ func JWTAuth() gin.HandlerFunc { // 我们这里jwt鉴权取头部信息 x-token 登录时回返回token信息 这里前端需要把token存储到cookie或者本地localStorage中 不过需要跟后端协商过期时间 可以约定刷新令牌或者重新登录 token := utils.GetToken(c) if token == "" { - response.FailWithDetailed(gin.H{"reload": true}, "未登录或非法访问", c) + response.NoAuth("未登录或非法访问", c) c.Abort() return } if jwtService.IsBlacklist(token) { - response.FailWithDetailed(gin.H{"reload": true}, "您的帐户异地登陆或令牌失效", c) + response.NoAuth("您的帐户异地登陆或令牌失效", c) utils.ClearToken(c) c.Abort() return @@ -38,12 +38,12 @@ func JWTAuth() gin.HandlerFunc { claims, err := j.ParseToken(token) if err != nil { if errors.Is(err, utils.TokenExpired) { - response.FailWithDetailed(gin.H{"reload": true}, "授权已过期", c) + response.NoAuth("授权已过期", c) utils.ClearToken(c) c.Abort() return } - response.FailWithDetailed(gin.H{"reload": true}, err.Error(), c) + response.NoAuth(err.Error(), c) utils.ClearToken(c) c.Abort() return @@ -58,7 +58,6 @@ func JWTAuth() gin.HandlerFunc { // c.Abort() //} c.Set("claims", claims) - c.Next() if claims.ExpiresAt.Unix()-time.Now().Unix() < claims.BufferTime { dr, _ := utils.ParseDuration(global.GVA_CONFIG.JWT.ExpiresTime) claims.ExpiresAt = jwt.NewNumericDate(time.Now().Add(dr)) @@ -78,5 +77,13 @@ func JWTAuth() gin.HandlerFunc { _ = jwtService.SetRedisJWT(newToken, newClaims.Username) } } + c.Next() + + if newToken, exists := c.Get("new-token"); exists { + c.Header("new-token", newToken.(string)) + } + if newExpiresAt, exists := c.Get("new-expires-at"); exists { + c.Header("new-expires-at", newExpiresAt.(string)) + } } } diff --git a/server/middleware/operation.go b/server/middleware/operation.go index 776433a1..f34cf68e 100644 --- a/server/middleware/operation.go +++ b/server/middleware/operation.go @@ -71,14 +71,18 @@ func OperationRecord() gin.HandlerFunc { Method: c.Request.Method, Path: c.Request.URL.Path, Agent: c.Request.UserAgent(), - Body: string(body), + Body: "", UserID: userId, } // 上传文件时候 中间件日志进行裁断操作 if strings.Contains(c.GetHeader("Content-Type"), "multipart/form-data") { - if len(record.Body) > bufferSize { - record.Body = "[文件]" + record.Body = "[文件]" + } else { + if len(body) > bufferSize { + record.Body = "[超出记录长度]" + } else { + record.Body = string(body) } } diff --git a/server/model/common/response/response.go b/server/model/common/response/response.go index 733f7573..fcd69538 100644 --- a/server/model/common/response/response.go +++ b/server/model/common/response/response.go @@ -50,6 +50,14 @@ func FailWithMessage(message string, c *gin.Context) { Result(ERROR, map[string]interface{}{}, message, c) } +func NoAuth(message string, c *gin.Context) { + c.JSON(http.StatusUnauthorized, Response{ + 7, + nil, + message, + }) +} + func FailWithDetailed(data interface{}, message string, c *gin.Context) { Result(ERROR, data, message, c) } diff --git a/server/model/system/request/sys_init.go b/server/model/system/request/sys_init.go index d77a89ac..91b690ce 100644 --- a/server/model/system/request/sys_init.go +++ b/server/model/system/request/sys_init.go @@ -47,6 +47,10 @@ func (i *InitDB) SqliteEmptyDsn() string { return i.DBPath + separator + i.DBName + ".db" } +func (i *InitDB) MssqlEmptyDsn() string { + return "sqlserver://" + i.UserName + ":" + i.Password + "@" + i.Host + ":" + i.Port + "?database=" + i.DBName + "&encrypt=disable" +} + // ToMysqlConfig 转换 config.Mysql // Author [SliverHorn](https://github.com/SliverHorn) func (i *InitDB) ToMysqlConfig() config.Mysql { @@ -100,3 +104,19 @@ func (i *InitDB) ToSqliteConfig() config.Sqlite { }, } } + +func (i *InitDB) ToMssqlConfig() config.Mssql { + return config.Mssql{ + GeneralDB: config.GeneralDB{ + Path: i.DBPath, + Port: i.Port, + Dbname: i.DBName, + Username: i.UserName, + Password: i.Password, + MaxIdleConns: 10, + MaxOpenConns: 100, + LogMode: "error", + Config: "", + }, + } +} diff --git a/server/model/system/response/sys_auto_code.go b/server/model/system/response/sys_auto_code.go index 1e440053..9e99bde3 100644 --- a/server/model/system/response/sys_auto_code.go +++ b/server/model/system/response/sys_auto_code.go @@ -13,4 +13,5 @@ type Column struct { ColumnName string `json:"columnName" gorm:"column:column_name"` DataTypeLong string `json:"dataTypeLong" gorm:"column:data_type_long"` ColumnComment string `json:"columnComment" gorm:"column:column_comment"` + PrimaryKey bool `json:"primaryKey" gorm:"column:primary_key"` } diff --git a/server/model/system/sys_auto_code.go b/server/model/system/sys_auto_code.go index d68b415f..23a7d6f4 100644 --- a/server/model/system/sys_auto_code.go +++ b/server/model/system/sys_auto_code.go @@ -10,26 +10,30 @@ import ( // AutoCodeStruct 初始版本自动化代码工具 type AutoCodeStruct struct { - StructName string `json:"structName"` // Struct名称 - TableName string `json:"tableName"` // 表名 - PackageName string `json:"packageName"` // 文件名称 - HumpPackageName string `json:"humpPackageName"` // go文件名称 - Abbreviation string `json:"abbreviation"` // Struct简称 - Description string `json:"description"` // Struct中文名称 - AutoCreateApiToSql bool `json:"autoCreateApiToSql"` // 是否自动创建api - AutoCreateResource bool `json:"autoCreateResource"` // 是否自动创建资源标识 - AutoMoveFile bool `json:"autoMoveFile"` // 是否自动移动文件 - BusinessDB string `json:"businessDB"` // 业务数据库 - Fields []*Field `json:"fields,omitempty"` - HasTimer bool - DictTypes []string `json:"-"` - Package string `json:"package"` - PackageT string `json:"-"` - NeedSort bool `json:"-"` - HasPic bool `json:"-"` - HasRichText bool `json:"-"` - HasFile bool `json:"-"` - NeedJSON bool `json:"-"` + StructName string `json:"structName"` // Struct名称 + TableName string `json:"tableName"` // 表名 + PackageName string `json:"packageName"` // 文件名称 + HumpPackageName string `json:"humpPackageName"` // go文件名称 + Abbreviation string `json:"abbreviation"` // Struct简称 + Description string `json:"description"` // Struct中文名称 + AutoCreateApiToSql bool `json:"autoCreateApiToSql"` // 是否自动创建api + AutoCreateMenuToSql bool `json:"autoCreateMenuToSql"` // 是否自动创建menu + AutoCreateResource bool `json:"autoCreateResource"` // 是否自动创建资源标识 + AutoMoveFile bool `json:"autoMoveFile"` // 是否自动移动文件 + BusinessDB string `json:"businessDB"` // 业务数据库 + GvaModel bool `json:"gvaModel"` // 是否使用gva默认Model + Fields []*Field `json:"fields"` + PrimaryField *Field `json:"primaryField"` + HasTimer bool `json:"-"` + HasSearchTimer bool `json:"-"` + DictTypes []string `json:"-"` + Package string `json:"package"` + PackageT string `json:"-"` + NeedSort bool `json:"-"` + HasPic bool `json:"-"` + HasRichText bool `json:"-"` + HasFile bool `json:"-"` + NeedJSON bool `json:"-"` } func (a *AutoCodeStruct) Pretreatment() { @@ -67,6 +71,7 @@ type Field struct { ErrorText string `json:"errorText"` // 校验失败文字 Clearable bool `json:"clearable"` // 是否可清空 Sort bool `json:"sort"` // 是否增加排序 + PrimaryKey bool `json:"primaryKey"` // 是否主键 } var ErrAutoMove error = errors.New("创建代码成功并移动文件成功") diff --git a/server/model/system/sys_autocode_history.go b/server/model/system/sys_autocode_history.go index 07cac3bd..60607938 100644 --- a/server/model/system/sys_autocode_history.go +++ b/server/model/system/sys_autocode_history.go @@ -14,6 +14,7 @@ type SysAutoCodeHistory struct { Package string `json:"package"` BusinessDB string `json:"businessDB"` TableName string `json:"tableName"` + MenuID uint `json:"menuID"` RequestMeta string `gorm:"type:text" json:"requestMeta,omitempty"` // 前端传入的结构化信息 AutoCodePath string `gorm:"type:text" json:"autoCodePath,omitempty"` // 其他meta信息 path;path InjectionMeta string `gorm:"type:text" json:"injectionMeta,omitempty"` // 注入的内容 RouterPath@functionName@RouterString; diff --git a/server/model/system/sys_dictionary_detail.go b/server/model/system/sys_dictionary_detail.go index 443f1071..4084136c 100644 --- a/server/model/system/sys_dictionary_detail.go +++ b/server/model/system/sys_dictionary_detail.go @@ -9,7 +9,7 @@ import ( type SysDictionaryDetail struct { global.GVA_MODEL Label string `json:"label" form:"label" gorm:"column:label;comment:展示值"` // 展示值 - Value int `json:"value" form:"value" gorm:"column:value;comment:字典值"` // 字典值 + Value string `json:"value" form:"value" gorm:"column:value;comment:字典值"` // 字典值 Extend string `json:"extend" form:"extend" gorm:"column:extend;comment:扩展值"` // 扩展值 Status *bool `json:"status" form:"status" gorm:"column:status;comment:启用状态"` // 启用状态 Sort int `json:"sort" form:"sort" gorm:"column:sort;comment:排序标记"` // 排序标记 diff --git a/server/model/system/sys_export_template.go b/server/model/system/sys_export_template.go index 94929614..09fea02b 100644 --- a/server/model/system/sys_export_template.go +++ b/server/model/system/sys_export_template.go @@ -8,8 +8,24 @@ import ( // 导出模板 结构体 SysExportTemplate type SysExportTemplate struct { global.GVA_MODEL - Name string `json:"name" form:"name" gorm:"column:name;comment:模板名称;"` //模板名称 - TableName string `json:"tableName" form:"tableName" gorm:"column:table_name;comment:表名称;"` //表名称 - TemplateID string `json:"templateID" form:"templateID" gorm:"column:template_id;comment:模板标识;"` //模板标识 - TemplateInfo string `json:"templateInfo" form:"templateInfo" gorm:"column:template_info;type:text;"` //模板信息 + DBName string `json:"dbName" form:"dbName" gorm:"column:db_name;comment:数据库名称;"` //数据库名称 + Name string `json:"name" form:"name" gorm:"column:name;comment:模板名称;"` //模板名称 + TableName string `json:"tableName" form:"tableName" gorm:"column:table_name;comment:表名称;"` //表名称 + TemplateID string `json:"templateID" form:"templateID" gorm:"column:template_id;comment:模板标识;"` //模板标识 + TemplateInfo string `json:"templateInfo" form:"templateInfo" gorm:"column:template_info;type:text;"` //模板信息 + Limit int `json:"limit" form:"limit" gorm:"column:limit;comment:导出限制"` + Order string `json:"order" form:"order" gorm:"column:order;comment:排序"` + Conditions []Condition `json:"conditions" form:"conditions" gorm:"foreignKey:TemplateID;references:TemplateID;comment:条件"` +} + +type Condition struct { + global.GVA_MODEL + TemplateID string `json:"templateID" form:"templateID" gorm:"column:template_id;comment:模板标识"` + From string `json:"from" form:"from" gorm:"column:from;comment:条件取的key"` + Column string `json:"column" form:"column" gorm:"column:column;comment:作为查询条件的字段"` + Operator string `json:"operator" form:"operator" gorm:"column:operator;comment:操作符"` +} + +func (Condition) TableName() string { + return "sys_export_template_condition" } diff --git a/server/resource/autocode_template/server/api.go.tpl b/server/resource/autocode_template/server/api.go.tpl index 4e2254e1..4229125b 100644 --- a/server/resource/autocode_template/server/api.go.tpl +++ b/server/resource/autocode_template/server/api.go.tpl @@ -57,11 +57,11 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Create{{.StructName}}(c *gin.Con // @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}" // @Router /{{.Abbreviation}}/delete{{.StructName}} [delete] func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}(c *gin.Context) { - id := c.Query("ID") + {{.PrimaryField.FieldJson}} := c.Query("{{.PrimaryField.FieldJson}}") {{- if .AutoCreateResource }} userID := utils.GetUserID(c) {{- end }} - if err := {{.Abbreviation}}Service.Delete{{.StructName}}(id{{- if .AutoCreateResource -}},userID{{- end -}}); err != nil { + if err := {{.Abbreviation}}Service.Delete{{.StructName}}({{.PrimaryField.FieldJson}} {{- if .AutoCreateResource -}},userID{{- end -}}); err != nil { global.GVA_LOG.Error("删除失败!", zap.Error(err)) response.FailWithMessage("删除失败", c) } else { @@ -75,15 +75,14 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}(c *gin.Con // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data body request.IdsReq true "批量删除{{.Description}}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"批量删除成功"}" // @Router /{{.Abbreviation}}/delete{{.StructName}}ByIds [delete] func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}ByIds(c *gin.Context) { - ids := c.QueryArray("ids[]") + {{.PrimaryField.FieldJson}}s := c.QueryArray("{{.PrimaryField.FieldJson}}s[]") {{- if .AutoCreateResource }} userID := utils.GetUserID(c) {{- end }} - if err := {{.Abbreviation}}Service.Delete{{.StructName}}ByIds(ids{{- if .AutoCreateResource }},userID{{- end }}); err != nil { + if err := {{.Abbreviation}}Service.Delete{{.StructName}}ByIds({{.PrimaryField.FieldJson}}s{{- if .AutoCreateResource }},userID{{- end }}); err != nil { global.GVA_LOG.Error("批量删除失败!", zap.Error(err)) response.FailWithMessage("批量删除失败", c) } else { @@ -129,8 +128,8 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Update{{.StructName}}(c *gin.Con // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Router /{{.Abbreviation}}/find{{.StructName}} [get] func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Context) { - id := c.Query("ID") - if re{{.Abbreviation}}, err := {{.Abbreviation}}Service.Get{{.StructName}}(id); err != nil { + {{.PrimaryField.FieldJson}} := c.Query("{{.PrimaryField.FieldJson}}") + if re{{.Abbreviation}}, err := {{.Abbreviation}}Service.Get{{.StructName}}({{.PrimaryField.FieldJson}}); err != nil { global.GVA_LOG.Error("查询失败!", zap.Error(err)) response.FailWithMessage("查询失败", c) } else { diff --git a/server/resource/autocode_template/server/model.go.tpl b/server/resource/autocode_template/server/model.go.tpl index 0906b76a..6d4f5929 100644 --- a/server/resource/autocode_template/server/model.go.tpl +++ b/server/resource/autocode_template/server/model.go.tpl @@ -2,30 +2,33 @@ package {{.Package}} import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - {{ if .HasTimer }}"time"{{ end }} + {{ if .GvaModel }}"github.com/flipped-aurora/gin-vue-admin/server/global"{{ end }} + {{ if or .HasTimer }}"time"{{ end }} {{ if .NeedJSON }}"gorm.io/datatypes"{{ end }} ) // {{.Description}} 结构体 {{.StructName}} type {{.StructName}} struct { - global.GVA_MODEL {{- range .Fields}} +{{ if .GvaModel }} global.GVA_MODEL {{ end }} + {{- range .Fields}} {{- if eq .FieldType "enum" }} - {{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};type:enum({{.DataTypeLong}});comment:{{.Comment}};" {{- if .Require -}}binding:"required"{{- end -}}` + {{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};type:enum({{.DataTypeLong}});comment:{{.Comment}};" {{- if .Require }} binding:"required"{{- end -}}` {{- else if eq .FieldType "picture" }} - {{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}` + {{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}` {{- else if eq .FieldType "video" }} - {{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}` + {{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}` {{- else if eq .FieldType "file" }} - {{.FieldName}} datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}` + {{.FieldName}} datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}` {{- else if eq .FieldType "pictures" }} - {{.FieldName}} datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}` + {{.FieldName}} datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}` {{- else if eq .FieldType "richtext" }} - {{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require -}}binding:"required"{{- end -}}` + {{.FieldName}} string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}` + {{- else if eq .FieldType "json" }} + {{.FieldName}} datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}` {{- else if ne .FieldType "string" }} - {{.FieldName}} *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}` + {{.FieldName}} *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}` {{- else }} - {{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require -}}binding:"required"{{- end -}}` + {{.FieldName}} {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if .PrimaryKey -}}primarykey;{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}` {{- end }} {{ if .FieldDesc }}//{{.FieldDesc}} {{ end }} {{- end }} {{- if .AutoCreateResource }} CreatedBy uint `gorm:"column:created_by;comment:创建者"` diff --git a/server/resource/autocode_template/server/request.go.tpl b/server/resource/autocode_template/server/request.go.tpl index 6483a71b..7acd20ff 100644 --- a/server/resource/autocode_template/server/request.go.tpl +++ b/server/resource/autocode_template/server/request.go.tpl @@ -2,13 +2,15 @@ package request import ( "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" - "time" + {{ if or .HasSearchTimer .GvaModel}}"time"{{ end }} {{ if .NeedJSON }}"gorm.io/datatypes"{{ end }} ) type {{.StructName}}Search struct{ - StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"` - EndCreatedAt *time.Time `json:"endCreatedAt" form:"endCreatedAt"` + {{ if .GvaModel }} + StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"` + EndCreatedAt *time.Time `json:"endCreatedAt" form:"endCreatedAt"` + {{ end }} {{- range .Fields}} {{- if ne .FieldSearchType ""}} {{- if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}} diff --git a/server/resource/autocode_template/server/service.go.tpl b/server/resource/autocode_template/server/service.go.tpl index a9708e6e..6cf5f2af 100644 --- a/server/resource/autocode_template/server/service.go.tpl +++ b/server/resource/autocode_template/server/service.go.tpl @@ -28,38 +28,38 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service) Create{{.StructName}}({{ // Delete{{.StructName}} 删除{{.Description}}记录 // Author [piexlmax](https://github.com/piexlmax) -func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}(id string{{- if .AutoCreateResource -}},userID uint{{- end -}}) (err error) { +func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}({{.PrimaryField.FieldJson}} string{{- if .AutoCreateResource -}},userID uint{{- end -}}) (err error) { {{- if .AutoCreateResource }} err = {{$db}}.Transaction(func(tx *gorm.DB) error { - if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("id = ?", id).Update("deleted_by", userID).Error; err != nil { + if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} = ?", {{.PrimaryField.FieldJson}}).Update("deleted_by", userID).Error; err != nil { return err } - if err = tx.Delete(&{{.Package}}.{{.StructName}}{},"id = ?",id).Error; err != nil { + if err = tx.Delete(&{{.Package}}.{{.StructName}}{},"{{.PrimaryField.ColumnName}} = ?",{{.PrimaryField.FieldJson}}).Error; err != nil { return err } return nil }) {{- else }} - err = {{$db}}.Delete(&{{.Package}}.{{.StructName}}{},"id = ?",id).Error + err = {{$db}}.Delete(&{{.Package}}.{{.StructName}}{},"{{.PrimaryField.ColumnName}} = ?",{{.PrimaryField.FieldJson}}).Error {{- end }} return err } // Delete{{.StructName}}ByIds 批量删除{{.Description}}记录 // Author [piexlmax](https://github.com/piexlmax) -func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}ByIds(ids []string{{- if .AutoCreateResource }},deleted_by uint{{- end}}) (err error) { +func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}ByIds({{.PrimaryField.FieldJson}}s []string {{- if .AutoCreateResource }},deleted_by uint{{- end}}) (err error) { {{- if .AutoCreateResource }} err = {{$db}}.Transaction(func(tx *gorm.DB) error { - if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("id in ?", ids).Update("deleted_by", deleted_by).Error; err != nil { + if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} in ?", {{.PrimaryField.FieldJson}}s).Update("deleted_by", deleted_by).Error; err != nil { return err } - if err := tx.Where("id in ?", ids).Delete(&{{.Package}}.{{.StructName}}{}).Error; err != nil { + if err := tx.Where("{{.PrimaryField.ColumnName}} in ?", {{.PrimaryField.FieldJson}}s).Delete(&{{.Package}}.{{.StructName}}{}).Error; err != nil { return err } return nil }) {{- else}} - err = {{$db}}.Delete(&[]{{.Package}}.{{.StructName}}{},"id in ?",ids).Error + err = {{$db}}.Delete(&[]{{.Package}}.{{.StructName}}{},"{{.PrimaryField.ColumnName}} in ?",{{.PrimaryField.FieldJson}}s).Error {{- end}} return err } @@ -71,10 +71,10 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Update{{.StructName}}({{. return err } -// Get{{.StructName}} 根据id获取{{.Description}}记录 +// Get{{.StructName}} 根据{{.PrimaryField.FieldJson}}获取{{.Description}}记录 // Author [piexlmax](https://github.com/piexlmax) -func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}(id string) ({{.Abbreviation}} {{.Package}}.{{.StructName}}, err error) { - err = {{$db}}.Where("id = ?", id).First(&{{.Abbreviation}}).Error +func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}({{.PrimaryField.FieldJson}} string) ({{.Abbreviation}} {{.Package}}.{{.StructName}}, err error) { + err = {{$db}}.Where("{{.PrimaryField.ColumnName}} = ?", {{.PrimaryField.FieldJson}}).First(&{{.Abbreviation}}).Error return } @@ -87,9 +87,11 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis db := {{$db}}.Model(&{{.Package}}.{{.StructName}}{}) var {{.Abbreviation}}s []{{.Package}}.{{.StructName}} // 如果有条件搜索 下方会自动创建搜索语句 +{{- if .GvaModel }} if info.StartCreatedAt !=nil && info.EndCreatedAt !=nil { db = db.Where("created_at BETWEEN ? AND ?", info.StartCreatedAt, info.EndCreatedAt) } +{{- end }} {{- range .Fields}} {{- if .FieldSearchType}} {{- if or (eq .FieldType "string") (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "richtext") }} diff --git a/server/resource/autocode_template/web/form.vue.tpl b/server/resource/autocode_template/web/form.vue.tpl index ed228741..9510e21c 100644 --- a/server/resource/autocode_template/web/form.vue.tpl +++ b/server/resource/autocode_template/web/form.vue.tpl @@ -8,7 +8,13 @@ {{- end }} {{- if eq .FieldType "string" }} - + {{- if .DictType}} + + + + {{- else }} + + {{- end }} {{- end }} {{- if eq .FieldType "richtext" }} @@ -45,6 +51,10 @@ {{- if eq .FieldType "file" }} {{- end }} + {{- if eq .FieldType "json" }} + // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取 + {{"{{"}} formData.{{.FieldJson}} {{"}}"}} + {{- end }} {{- end }} @@ -123,6 +133,9 @@ const formData = ref({ {{- if eq .FieldType "file" }} {{.FieldJson}}: [], {{- end }} + {{- if eq .FieldType "json" }} + {{.FieldJson}}: {}, + {{- end }} {{- end }} }) // 验证规则 diff --git a/server/resource/autocode_template/web/table.vue.tpl b/server/resource/autocode_template/web/table.vue.tpl index 200166ff..1f79a64b 100644 --- a/server/resource/autocode_template/web/table.vue.tpl +++ b/server/resource/autocode_template/web/table.vue.tpl @@ -2,6 +2,7 @@
+ {{- if .GvaModel }} + {{- else if eq .FieldType "json" }} + + + {{- else }} {{- end }} {{- end }} - + @@ -377,6 +393,9 @@ const formData = ref({ {{- if eq .FieldType "file" }} {{.FieldJson}}: [], {{- end }} + {{- if eq .FieldType "json" }} + {{.FieldJson}}: {}, + {{- end }} {{- end }} }) @@ -448,7 +467,22 @@ const searchInfo = ref({}) {{- if .NeedSort}} // 排序 const sortChange = ({ prop, order }) => { - searchInfo.value.sort = prop + const sortMap = { + {{- range .Fields}} + {{- if and .Sort}} + {{- if not (eq .ColumnName "")}} + {{.FieldJson}}: '{{.ColumnName}}', + {{- end}} + {{- end}} + {{- end}} + } + + let sort = sortMap[prop] + if(!sort){ + sort = prop.replace(/[A-Z]/g, match => `_${match.toLowerCase()}`) + } + + searchInfo.value.sort = sort searchInfo.value.order = order getTableData() } @@ -530,13 +564,14 @@ const deleteRow = (row) => { }) } - -// 批量删除控制标记 -const deleteVisible = ref(false) - // 多选删除 const onDelete = async() => { - const ids = [] + ElMessageBox.confirm('确定要删除吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(async() => { + const {{.PrimaryField.FieldJson}}s = [] if (multipleSelection.value.length === 0) { ElMessage({ type: 'warning', @@ -546,20 +581,20 @@ const onDelete = async() => { } multipleSelection.value && multipleSelection.value.map(item => { - ids.push(item.ID) + {{.PrimaryField.FieldJson}}s.push(item.{{.PrimaryField.FieldJson}}) }) - const res = await delete{{.StructName}}ByIds({ ids }) + const res = await delete{{.StructName}}ByIds({ {{.PrimaryField.FieldJson}}s }) if (res.code === 0) { ElMessage({ type: 'success', message: '删除成功' }) - if (tableData.value.length === ids.length && page.value > 1) { + if (tableData.value.length === {{.PrimaryField.FieldJson}}s.length && page.value > 1) { page.value-- } - deleteVisible.value = false getTableData() } + }) } // 行为控制标记（弹窗内部需要增还是改） @@ -567,7 +602,7 @@ const type = ref('') // 更新行 const update{{.StructName}}Func = async(row) => { - const res = await find{{.StructName}}({ ID: row.ID }) + const res = await find{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} }) type.value = 'update' if (res.code === 0) { formData.value = res.data.re{{.Abbreviation}} @@ -578,7 +613,7 @@ const update{{.StructName}}Func = async(row) => { // 删除行 const delete{{.StructName}}Func = async (row) => { - const res = await delete{{.StructName}}({ ID: row.ID }) + const res = await delete{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} }) if (res.code === 0) { ElMessage({ type: 'success', @@ -608,7 +643,7 @@ const openDetailShow = () => { // 打开详情 const getDetails = async (row) => { // 打开弹窗 - const res = await find{{.StructName}}({ ID: row.ID }) + const res = await find{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} }) if (res.code === 0) { formData.value = res.data.re{{.Abbreviation}} openDetailShow() diff --git a/server/service/system/sys_api.go b/server/service/system/sys_api.go index 5c0d8935..0226bd92 100644 --- a/server/service/system/sys_api.go +++ b/server/service/system/sys_api.go @@ -144,8 +144,15 @@ func (apiService *ApiService) UpdateApi(api system.SysApi) (err error) { var oldA system.SysApi err = global.GVA_DB.Where("id = ?", api.ID).First(&oldA).Error if oldA.Path != api.Path || oldA.Method != api.Method { - if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&system.SysApi{}).Error, gorm.ErrRecordNotFound) { - return errors.New("存在相同api路径") + var duplicateApi system.SysApi + if err := global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&duplicateApi).Error; err != nil { + if !errors.Is(err, gorm.ErrRecordNotFound) { + return err + } + } else { + if duplicateApi.ID != api.ID { + return errors.New("存在相同api路径") + } } } if err != nil { diff --git a/server/service/system/sys_auto_code.go b/server/service/system/sys_auto_code.go index bad4e434..fed72336 100644 --- a/server/service/system/sys_auto_code.go +++ b/server/service/system/sys_auto_code.go @@ -136,6 +136,9 @@ func (autoCodeService *AutoCodeService) PreviewTemp(autoCode system.AutoCodeStru for i := range autoCode.Fields { if autoCode.Fields[i].FieldType == "time.Time" { autoCode.HasTimer = true + if autoCode.Fields[i].FieldSearchType != "" { + autoCode.HasSearchTimer = true + } } if autoCode.Fields[i].Sort { autoCode.NeedSort = true @@ -157,6 +160,21 @@ func (autoCodeService *AutoCodeService) PreviewTemp(autoCode system.AutoCodeStru autoCode.HasFile = true autoCode.NeedJSON = true } + + if autoCode.GvaModel { + autoCode.PrimaryField = &system.Field{ + FieldName: "ID", + FieldType: "uint", + FieldDesc: "ID", + FieldJson: "ID", + DataTypeLong: "20", + Comment: "主键ID", + ColumnName: "id", + } + } + if !autoCode.GvaModel && autoCode.PrimaryField == nil && autoCode.Fields[i].PrimaryKey { + autoCode.PrimaryField = autoCode.Fields[i] + } } dataList, _, needMkdir, err := autoCodeService.getNeedList(&autoCode) if err != nil { @@ -235,11 +253,14 @@ func makeDictTypes(autoCode *system.AutoCodeStruct) { // @param: model.AutoCodeStruct // @return: err error -func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruct, ids ...uint) (err error) { +func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruct, menuID uint, ids ...uint) (err error) { makeDictTypes(&autoCode) for i := range autoCode.Fields { if autoCode.Fields[i].FieldType == "time.Time" { autoCode.HasTimer = true + if autoCode.Fields[i].FieldSearchType != "" { + autoCode.HasSearchTimer = true + } } if autoCode.Fields[i].Sort { autoCode.NeedSort = true @@ -261,6 +282,20 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc autoCode.NeedJSON = true autoCode.HasFile = true } + if autoCode.GvaModel { + autoCode.PrimaryField = &system.Field{ + FieldName: "ID", + FieldType: "uint", + FieldDesc: "ID", + FieldJson: "ID", + DataTypeLong: "20", + Comment: "主键ID", + ColumnName: "id", + } + } + if !autoCode.GvaModel && autoCode.PrimaryField == nil && autoCode.Fields[i].PrimaryKey { + autoCode.PrimaryField = autoCode.Fields[i] + } } // 增加判断: 重复创建struct if autoCode.AutoMoveFile && AutoCodeHistoryServiceApp.Repeat(autoCode.BusinessDB, autoCode.StructName, autoCode.Package) { @@ -354,7 +389,7 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc return err } } - if autoCode.AutoMoveFile || autoCode.AutoCreateApiToSql { + if autoCode.AutoMoveFile || autoCode.AutoCreateApiToSql || autoCode.AutoCreateMenuToSql { if autoCode.TableName != "" { err = AutoCodeHistoryServiceApp.CreateAutoCodeHistory( string(meta), @@ -366,6 +401,7 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc idBf.String(), autoCode.Package, autoCode.BusinessDB, + menuID, ) } else { err = AutoCodeHistoryServiceApp.CreateAutoCodeHistory( @@ -378,6 +414,7 @@ func (autoCodeService *AutoCodeService) CreateTemp(autoCode system.AutoCodeStruc idBf.String(), autoCode.Package, autoCode.BusinessDB, + menuID, ) } } @@ -534,6 +571,21 @@ func (autoCodeService *AutoCodeService) AutoCreateApi(a *system.AutoCodeStruct) return ids, err } +func (autoCodeService *AutoCodeService) AutoCreateMenu(a *system.AutoCodeStruct) (id uint, err error) { + var menu system.SysBaseMenu + err = global.GVA_DB.First(&menu, "name = ?", a.Abbreviation).Error + if err == nil { + return 0, errors.New("存在相同的菜单路由，请关闭自动创建菜单功能") + } + menu.ParentId = "0" + menu.Name = a.Abbreviation + menu.Path = a.Abbreviation + menu.Meta.Title = a.Description + menu.Component = fmt.Sprintf("view/%s/%s.vue", a.PackageName, a.PackageName) + err = global.GVA_DB.Create(&menu).Error + return menu.ID, err +} + func (autoCodeService *AutoCodeService) getNeedList(autoCode *system.AutoCodeStruct) (dataList []tplData, fileList []string, needMkdir []string, err error) { // 去除所有空格 utils.TrimSpace(autoCode) @@ -739,36 +791,44 @@ func (autoCodeService *AutoCodeService) InstallPlugin(file *multipart.FileHeader paths = filterFile(paths) var webIndex = -1 var serverIndex = -1 + webPlugin := "" + serverPlugin := "" + for i := range paths { paths[i] = filepath.ToSlash(paths[i]) pathArr := strings.Split(paths[i], "/") ln := len(pathArr) - if ln < 2 { + + if ln < 4 { continue } - if pathArr[ln-2] == "server" && pathArr[ln-1] == "plugin" { - serverIndex = i + if pathArr[2]+"/"+pathArr[3] == `server/plugin` && len(serverPlugin) == 0 { + serverPlugin = filepath.Join(pathArr[0], pathArr[1], pathArr[2], pathArr[3]) } - if pathArr[ln-2] == "web" && pathArr[ln-1] == "plugin" { - webIndex = i + if pathArr[2]+"/"+pathArr[3] == `web/plugin` && len(webPlugin) == 0 { + webPlugin = filepath.Join(pathArr[0], pathArr[1], pathArr[2], pathArr[3]) } } - if webIndex == -1 && serverIndex == -1 { + if len(serverPlugin) == 0 && len(webPlugin) == 0 { zap.L().Error("非标准插件，请按照文档自动迁移使用") return webIndex, serverIndex, errors.New("非标准插件，请按照文档自动迁移使用") } - if webIndex != -1 { - err = installation(paths[webIndex], global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.Web) + if len(serverPlugin) != 0 { + err = installation(serverPlugin, global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.Server) if err != nil { return webIndex, serverIndex, err } } - if serverIndex != -1 { - err = installation(paths[serverIndex], global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.Server) + if len(webPlugin) != 0 { + err = installation(webPlugin, global.GVA_CONFIG.AutoCode.Server, global.GVA_CONFIG.AutoCode.Web) + if err != nil { + return webIndex, serverIndex, err + } } - return webIndex, serverIndex, err + + return 1, 1, err } func installation(path string, formPath string, toPath string) error { diff --git a/server/service/system/sys_auto_code_interface.go b/server/service/system/sys_auto_code_interface.go index 60818317..1d9ad339 100644 --- a/server/service/system/sys_auto_code_interface.go +++ b/server/service/system/sys_auto_code_interface.go @@ -19,6 +19,10 @@ func (autoCodeService *AutoCodeService) Database(businessDB string) Database { return AutoCodeMysql case "pgsql": return AutoCodePgsql + case "mssql": + return AutoCodeMssql + case "oracle": + return AutoCodeOracle case "sqlite": return AutoCodeSqlite default: diff --git a/server/service/system/sys_auto_code_mssql.go b/server/service/system/sys_auto_code_mssql.go index 834a499b..25e08737 100644 --- a/server/service/system/sys_auto_code_mssql.go +++ b/server/service/system/sys_auto_code_mssql.go @@ -45,8 +45,30 @@ func (s *autoCodeMssql) GetTables(businessDB string, dbName string) (data []resp // Author [SliverHorn](https://github.com/SliverHorn) func (s *autoCodeMssql) GetColumn(businessDB string, tableName string, dbName string) (data []response.Column, err error) { var entities []response.Column - sql := fmt.Sprintf(`select sc.name as column_name,st.name as data_type, sc.length as data_type_long - from %s.DBO.syscolumns sc,systypes st where sc.xtype=st.xtype and st.usertype=0 and sc.id in (select id from %s.DBO.sysobjects where xtype='U' and name='%s');`, dbName, dbName, tableName) + sql := fmt.Sprintf(` +SELECT + sc.name AS column_name, + st.name AS data_type, + sc.max_length AS data_type_long, + CASE + WHEN pk.object_id IS NOT NULL THEN 1 + ELSE 0 + END AS primary_key +FROM + %s.sys.columns sc +JOIN + sys.types st ON sc.user_type_id=st.user_type_id +LEFT JOIN + %s.sys.objects so ON so.name='%s' AND so.type='U' +LEFT JOIN + %s.sys.indexes si ON si.object_id = so.object_id AND si.is_primary_key = 1 +LEFT JOIN + %s.sys.index_columns sic ON sic.object_id = si.object_id AND sic.index_id = si.index_id AND sic.column_id = sc.column_id +LEFT JOIN + %s.sys.key_constraints pk ON pk.object_id = si.object_id +WHERE + st.is_user_defined=0 AND sc.object_id = so.object_id +`, dbName, dbName, tableName, dbName, dbName, dbName) if businessDB == "" { err = global.GVA_DB.Raw(sql).Scan(&entities).Error diff --git a/server/service/system/sys_auto_code_mysql.go b/server/service/system/sys_auto_code_mysql.go index fade82c5..a262a6b6 100644 --- a/server/service/system/sys_auto_code_mysql.go +++ b/server/service/system/sys_auto_code_mysql.go @@ -44,21 +44,32 @@ func (s *autoCodeMysql) GetTables(businessDB string, dbName string) (data []resp func (s *autoCodeMysql) GetColumn(businessDB string, tableName string, dbName string) (data []response.Column, err error) { var entities []response.Column sql := ` - SELECT COLUMN_NAME column_name, - DATA_TYPE data_type, - CASE DATA_TYPE - WHEN 'longtext' THEN c.CHARACTER_MAXIMUM_LENGTH - WHEN 'varchar' THEN c.CHARACTER_MAXIMUM_LENGTH - WHEN 'double' THEN CONCAT_WS(',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE) - WHEN 'decimal' THEN CONCAT_WS(',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE) - WHEN 'int' THEN c.NUMERIC_PRECISION - WHEN 'bigint' THEN c.NUMERIC_PRECISION - ELSE '' END AS data_type_long, - COLUMN_COMMENT column_comment - FROM INFORMATION_SCHEMA.COLUMNS c - WHERE table_name = ? - AND table_schema = ? - ` + SELECT + c.COLUMN_NAME column_name, + c.DATA_TYPE data_type, + CASE c.DATA_TYPE + WHEN 'longtext' THEN c.CHARACTER_MAXIMUM_LENGTH + WHEN 'varchar' THEN c.CHARACTER_MAXIMUM_LENGTH + WHEN 'double' THEN CONCAT_WS(',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE) + WHEN 'decimal' THEN CONCAT_WS(',', c.NUMERIC_PRECISION, c.NUMERIC_SCALE) + WHEN 'int' THEN c.NUMERIC_PRECISION + WHEN 'bigint' THEN c.NUMERIC_PRECISION + ELSE '' + END AS data_type_long, + c.COLUMN_COMMENT column_comment, + CASE WHEN kcu.COLUMN_NAME IS NOT NULL THEN 1 ELSE 0 END AS primary_key +FROM + INFORMATION_SCHEMA.COLUMNS c +LEFT JOIN + INFORMATION_SCHEMA.KEY_COLUMN_USAGE kcu +ON + c.TABLE_SCHEMA = kcu.TABLE_SCHEMA + AND c.TABLE_NAME = kcu.TABLE_NAME + AND c.COLUMN_NAME = kcu.COLUMN_NAME + AND kcu.CONSTRAINT_NAME = 'PRIMARY' +WHERE + c.TABLE_NAME = ? + AND c.TABLE_SCHEMA = ?;` if businessDB == "" { err = global.GVA_DB.Raw(sql, tableName, dbName).Scan(&entities).Error } else { diff --git a/server/service/system/sys_auto_code_oracle.go b/server/service/system/sys_auto_code_oracle.go index 60c48803..5c10b19d 100644 --- a/server/service/system/sys_auto_code_oracle.go +++ b/server/service/system/sys_auto_code_oracle.go @@ -36,16 +36,32 @@ func (s *autoCodeOracle) GetTables(businessDB string, dbName string) (data []res func (s *autoCodeOracle) GetColumn(businessDB string, tableName string, dbName string) (data []response.Column, err error) { var entities []response.Column sql := ` - select lower(a.COLUMN_NAME) as "column_name", - (CASE WHEN a.DATA_TYPE = 'NUMBER' AND a.DATA_SCALE=0 THEN 'int' else lower(a.DATA_TYPE) end) as "data_type", - (CASE WHEN a.DATA_TYPE = 'NUMBER' THEN a.DATA_PRECISION else a.DATA_LENGTH end) as "data_type_long", - b.COMMENTS as "column_comment" - from all_tab_columns a , all_col_comments b - where a.OWNER = b.OWNER - and a.TABLE_NAME = b.TABLE_NAME - and a.COLUMN_NAME = b.COLUMN_NAME - and lower(a.table_name) = ? - and lower(a.OWNER) = ? + SELECT + lower(a.COLUMN_NAME) as "column_name", + (CASE WHEN a.DATA_TYPE = 'NUMBER' AND a.DATA_SCALE=0 THEN 'int' else lower(a.DATA_TYPE) end) as "data_type", + (CASE WHEN a.DATA_TYPE = 'NUMBER' THEN a.DATA_PRECISION else a.DATA_LENGTH end) as "data_type_long", + b.COMMENTS as "column_comment", + (CASE WHEN pk.COLUMN_NAME IS NOT NULL THEN 1 ELSE 0 END) as "primary_key" +FROM + all_tab_columns a +JOIN + all_col_comments b ON a.OWNER = b.OWNER AND a.TABLE_NAME = b.TABLE_NAME AND a.COLUMN_NAME = b.COLUMN_NAME +LEFT JOIN + ( + SELECT + acc.OWNER, + acc.TABLE_NAME, + acc.COLUMN_NAME + FROM + all_cons_columns acc + JOIN + all_constraints ac ON acc.OWNER = ac.OWNER AND acc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME + WHERE + ac.CONSTRAINT_TYPE = 'P' + ) pk ON a.OWNER = pk.OWNER AND a.TABLE_NAME = pk.TABLE_NAME AND a.COLUMN_NAME = pk.COLUMN_NAME +WHERE + lower(a.table_name) = ? + AND lower(a.OWNER) = ?; ` err = global.GVA_DBList[businessDB].Raw(sql, tableName, dbName).Scan(&entities).Error diff --git a/server/service/system/sys_auto_code_pgsql.go b/server/service/system/sys_auto_code_pgsql.go index c73b1c0a..e973f09d 100644 --- a/server/service/system/sys_auto_code_pgsql.go +++ b/server/service/system/sys_auto_code_pgsql.go @@ -46,53 +46,79 @@ func (a *autoCodePgsql) GetTables(businessDB string, dbName string) (data []resp func (a *autoCodePgsql) GetColumn(businessDB string, tableName string, dbName string) (data []response.Column, err error) { // todo 数据获取不全, 待完善sql sql := ` - SELECT psc.COLUMN_NAME AS COLUMN_NAME, - psc.udt_name AS data_type, -CASE - psc.udt_name - WHEN 'text' THEN - concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH ) - WHEN 'varchar' THEN - concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH ) - WHEN 'smallint' THEN - concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE ) - WHEN 'decimal' THEN - concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE ) - WHEN 'integer' THEN - concat_ws ( '', '', psc.NUMERIC_PRECISION ) - WHEN 'int4' THEN - concat_ws ( '', '', psc.NUMERIC_PRECISION ) - WHEN 'int8' THEN - concat_ws ( '', '', psc.NUMERIC_PRECISION ) - WHEN 'bigint' THEN - concat_ws ( '', '', psc.NUMERIC_PRECISION ) - WHEN 'timestamp' THEN - concat_ws ( '', '', psc.datetime_precision ) - ELSE '' - END AS data_type_long, - ( - SELECT - pd.description - FROM - pg_description pd - WHERE - (pd.objoid,pd.objsubid) in ( - SELECT pa.attrelid,pa.attnum - FROM - pg_attribute pa - WHERE pa.attrelid = ( SELECT oid FROM pg_class pc WHERE - pc.relname = psc.table_name +SELECT + psc.COLUMN_NAME AS COLUMN_NAME, + psc.udt_name AS data_type, + CASE + psc.udt_name + WHEN 'text' THEN + concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH ) + WHEN 'varchar' THEN + concat_ws ( '', '', psc.CHARACTER_MAXIMUM_LENGTH ) + WHEN 'smallint' THEN + concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE ) + WHEN 'decimal' THEN + concat_ws ( ',', psc.NUMERIC_PRECISION, psc.NUMERIC_SCALE ) + WHEN 'integer' THEN + concat_ws ( '', '', psc.NUMERIC_PRECISION ) + WHEN 'int4' THEN + concat_ws ( '', '', psc.NUMERIC_PRECISION ) + WHEN 'int8' THEN + concat_ws ( '', '', psc.NUMERIC_PRECISION ) + WHEN 'bigint' THEN + concat_ws ( '', '', psc.NUMERIC_PRECISION ) + WHEN 'timestamp' THEN + concat_ws ( '', '', psc.datetime_precision ) + ELSE '' + END AS data_type_long, + ( + SELECT + pd.description + FROM + pg_description pd + WHERE + (pd.objoid,pd.objsubid) in ( + SELECT pa.attrelid,pa.attnum + FROM + pg_attribute pa + WHERE pa.attrelid = ( SELECT oid FROM pg_class pc WHERE + pc.relname = psc.table_name + ) + and attname = psc.column_name ) - and attname = psc.column_name - ) - ) AS column_comment + ) AS column_comment, + ( + SELECT + COUNT(*) + FROM + pg_constraint + WHERE + contype = 'p' + AND conrelid = ( + SELECT + oid + FROM + pg_class + WHERE + relname = psc.table_name + ) + AND conkey::int[] @> ARRAY[( + SELECT + attnum + FROM + pg_attribute + WHERE + attrelid = conrelid + AND attname = psc.column_name + )] + ) > 0 AS primary_key FROM - INFORMATION_SCHEMA.COLUMNS psc + INFORMATION_SCHEMA.COLUMNS psc WHERE - table_catalog = ? - AND table_schema = 'public' - AND TABLE_NAME = ?; - ` + table_catalog = ? + AND table_schema = 'public' + AND TABLE_NAME = ?; +` var entities []response.Column //sql = strings.ReplaceAll(sql, "@table_catalog", dbName) //sql = strings.ReplaceAll(sql, "@table_name", tableName) diff --git a/server/service/system/sys_auto_code_sqlite.go b/server/service/system/sys_auto_code_sqlite.go index 9cf94ea8..59bcfce7 100644 --- a/server/service/system/sys_auto_code_sqlite.go +++ b/server/service/system/sys_auto_code_sqlite.go @@ -66,6 +66,7 @@ func (a *autoCodeSqlite) GetColumn(businessDB string, tableName string, dbName s var columnInfos []struct { Name string `gorm:"column:name"` Type string `gorm:"column:type"` + Pk int `gorm:"column:pk"` } if businessDB == "" { err = global.GVA_DB.Raw(sql).Scan(&columnInfos).Error @@ -76,6 +77,7 @@ func (a *autoCodeSqlite) GetColumn(businessDB string, tableName string, dbName s entities = append(entities, response.Column{ ColumnName: columnInfo.Name, DataType: columnInfo.Type, + PrimaryKey: columnInfo.Pk == 1, }) } return entities, err diff --git a/server/service/system/sys_autocode_history.go b/server/service/system/sys_autocode_history.go index 9b0b4961..5ba8eb04 100644 --- a/server/service/system/sys_autocode_history.go +++ b/server/service/system/sys_autocode_history.go @@ -30,7 +30,7 @@ var AutoCodeHistoryServiceApp = new(AutoCodeHistoryService) // RouterPath : RouterPath@RouterString;RouterPath2@RouterString2 // Author [SliverHorn](https://github.com/SliverHorn) // Author [songzhibin97](https://github.com/songzhibin97) -func (autoCodeHistoryService *AutoCodeHistoryService) CreateAutoCodeHistory(meta, structName, structCNName, autoCodePath string, injectionMeta string, tableName string, apiIds string, Package string, BusinessDB string) error { +func (autoCodeHistoryService *AutoCodeHistoryService) CreateAutoCodeHistory(meta, structName, structCNName, autoCodePath string, injectionMeta string, tableName string, apiIds string, Package string, BusinessDB string, menuID uint) error { return global.GVA_DB.Create(&system.SysAutoCodeHistory{ Package: Package, RequestMeta: meta, @@ -81,9 +81,17 @@ func (autoCodeHistoryService *AutoCodeHistoryService) RollBack(info *systemReq.R ids.Ids = append(ids.Ids, id) } err := ApiServiceApp.DeleteApisByIds(ids) + if err != nil { global.GVA_LOG.Error("ClearTag DeleteApiByIds:", zap.Error(err)) } + + err = BaseMenuServiceApp.DeleteBaseMenu(int(md.MenuID)) + + if err != nil { + global.GVA_LOG.Error("ClearTag DeleteBaseMenu:", zap.Error(err)) + } + // 删除表 if info.DeleteTable { if err = AutoCodeServiceApp.DropTable(md.BusinessDB, md.TableName); err != nil { diff --git a/server/service/system/sys_base_menu.go b/server/service/system/sys_base_menu.go index d4de3f8c..0addda90 100644 --- a/server/service/system/sys_base_menu.go +++ b/server/service/system/sys_base_menu.go @@ -16,6 +16,8 @@ type BaseMenuService struct{} //@param: id float64 //@return: err error +var BaseMenuServiceApp = new(BaseMenuService) + func (baseMenuService *BaseMenuService) DeleteBaseMenu(id int) (err error) { err = global.GVA_DB.Preload("MenuBtn").Preload("Parameters").Where("parent_id = ?", id).First(&system.SysBaseMenu{}).Error if err != nil { diff --git a/server/service/system/sys_dictionary_detail.go b/server/service/system/sys_dictionary_detail.go index e1cfcabf..e8fdd890 100644 --- a/server/service/system/sys_dictionary_detail.go +++ b/server/service/system/sys_dictionary_detail.go @@ -68,7 +68,7 @@ func (dictionaryDetailService *DictionaryDetailService) GetSysDictionaryDetailIn if info.Label != "" { db = db.Where("label LIKE ?", "%"+info.Label+"%") } - if info.Value != 0 { + if info.Value != "" { db = db.Where("value = ?", info.Value) } if info.Status != nil { @@ -84,3 +84,33 @@ func (dictionaryDetailService *DictionaryDetailService) GetSysDictionaryDetailIn err = db.Limit(limit).Offset(offset).Order("sort").Find(&sysDictionaryDetails).Error return sysDictionaryDetails, total, err } + +// 按照字典id获取字典全部内容的方法 +func (dictionaryDetailService *DictionaryDetailService) GetDictionaryList(dictionaryID uint) (list []system.SysDictionaryDetail, err error) { + var sysDictionaryDetails []system.SysDictionaryDetail + err = global.GVA_DB.Find(&sysDictionaryDetails, "sys_dictionary_id = ?", dictionaryID).Error + return sysDictionaryDetails, err +} + +// 按照字典type获取字典全部内容的方法 +func (dictionaryDetailService *DictionaryDetailService) GetDictionaryListByType(t string) (list []system.SysDictionaryDetail, err error) { + var sysDictionaryDetails []system.SysDictionaryDetail + db := global.GVA_DB.Model(&system.SysDictionaryDetail{}).Joins("JOIN sys_dictionaries ON sys_dictionaries.id = sys_dictionary_details.sys_dictionary_id") + err = db.Debug().Find(&sysDictionaryDetails, "type = ?", t).Error + return sysDictionaryDetails, err +} + +// 按照字典id+字典内容value获取单条字典内容 +func (dictionaryDetailService *DictionaryDetailService) GetDictionaryInfoByValue(dictionaryID uint, value uint) (detail system.SysDictionaryDetail, err error) { + var sysDictionaryDetail system.SysDictionaryDetail + err = global.GVA_DB.First(&sysDictionaryDetail, "sys_dictionary_id = ? and value = ?", dictionaryID, value).Error + return sysDictionaryDetail, err +} + +// 按照字典type+字典内容value获取单条字典内容 +func (dictionaryDetailService *DictionaryDetailService) GetDictionaryInfoByTypeValue(t string, value uint) (detail system.SysDictionaryDetail, err error) { + var sysDictionaryDetails system.SysDictionaryDetail + db := global.GVA_DB.Model(&system.SysDictionaryDetail{}).Joins("JOIN sys_dictionaries ON sys_dictionaries.id = sys_dictionary_details.sys_dictionary_id") + err = db.First(&sysDictionaryDetails, "sys_dictionaries.type = ? and sys_dictionary_details.value = ?", t, value).Error + return sysDictionaryDetails, err +} diff --git a/server/service/system/sys_export_template.go b/server/service/system/sys_export_template.go index a5d39741..bc428462 100644 --- a/server/service/system/sys_export_template.go +++ b/server/service/system/sys_export_template.go @@ -8,10 +8,14 @@ import ( "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" "github.com/flipped-aurora/gin-vue-admin/server/model/system" systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/utils" "github.com/xuri/excelize/v2" "gorm.io/gorm" "mime/multipart" + "net/url" + "strconv" "strings" + "time" ) type SysExportTemplateService struct { @@ -41,14 +45,31 @@ func (sysExportTemplateService *SysExportTemplateService) DeleteSysExportTemplat // UpdateSysExportTemplate 更新导出模板记录 // Author [piexlmax](https://github.com/piexlmax) func (sysExportTemplateService *SysExportTemplateService) UpdateSysExportTemplate(sysExportTemplate system.SysExportTemplate) (err error) { - err = global.GVA_DB.Save(&sysExportTemplate).Error - return err + return global.GVA_DB.Transaction(func(tx *gorm.DB) error { + conditions := sysExportTemplate.Conditions + e := tx.Delete(&[]system.Condition{}, "template_id = ?", sysExportTemplate.TemplateID).Error + if e != nil { + return e + } + sysExportTemplate.Conditions = nil + e = tx.Updates(&sysExportTemplate).Error + if e != nil { + return e + } + if len(conditions) > 0 { + for i := range conditions { + conditions[i].ID = 0 + } + e = tx.Create(&conditions).Error + } + return e + }) } // GetSysExportTemplate 根据id获取导出模板记录 // Author [piexlmax](https://github.com/piexlmax) func (sysExportTemplateService *SysExportTemplateService) GetSysExportTemplate(id uint) (sysExportTemplate system.SysExportTemplate, err error) { - err = global.GVA_DB.Where("id = ?", id).First(&sysExportTemplate).Error + err = global.GVA_DB.Where("id = ?", id).Preload("Conditions").First(&sysExportTemplate).Error return } @@ -88,9 +109,9 @@ func (sysExportTemplateService *SysExportTemplateService) GetSysExportTemplateIn // ExportExcel 导出Excel // Author [piexlmax](https://github.com/piexlmax) -func (sysExportTemplateService *SysExportTemplateService) ExportExcel(templateID string) (file *bytes.Buffer, name string, err error) { +func (sysExportTemplateService *SysExportTemplateService) ExportExcel(templateID string, values url.Values) (file *bytes.Buffer, name string, err error) { var template system.SysExportTemplate - err = global.GVA_DB.First(&template, "template_id = ?", templateID).Error + err = global.GVA_DB.Preload("Conditions").First(&template, "template_id = ?", templateID).Error if err != nil { return nil, "", err } @@ -107,19 +128,71 @@ func (sysExportTemplateService *SysExportTemplateService) ExportExcel(templateID return } var templateInfoMap = make(map[string]string) + columns, err := utils.GetJSONKeys(template.TemplateInfo) + if err != nil { + return nil, "", err + } err = json.Unmarshal([]byte(template.TemplateInfo), &templateInfoMap) if err != nil { return nil, "", err } - var columns []string var tableTitle []string - for key := range templateInfoMap { - columns = append(columns, key) + for _, key := range columns { tableTitle = append(tableTitle, templateInfoMap[key]) } selects := strings.Join(columns, ", ") var tableMap []map[string]interface{} - err = global.GVA_DB.Select(selects).Table(template.TableName).Find(&tableMap).Error + db := global.GVA_DB + if template.DBName != "" { + db = global.MustGetGlobalDBByDBName(template.DBName) + } + db = db.Select(selects).Table(template.TableName) + + if len(template.Conditions) > 0 { + for _, condition := range template.Conditions { + sql := fmt.Sprintf("%s %s ?", condition.Column, condition.Operator) + value := values.Get(condition.From) + if value != "" { + if condition.Operator == "LIKE" { + value = "%" + value + "%" + } + db = db.Where(sql, value) + } + } + } + // 通过参数传入limit + limit := values.Get("limit") + if limit != "" { + l, e := strconv.Atoi(limit) + if e == nil { + db = db.Limit(l) + } + } + // 模板的默认limit + if limit == "" && template.Limit != 0 { + db = db.Limit(template.Limit) + } + + // 通过参数传入offset + offset := values.Get("offset") + if offset != "" { + o, e := strconv.Atoi(offset) + if e == nil { + db = db.Offset(o) + } + } + + // 通过参数传入order + order := values.Get("order") + if order != "" { + db = db.Order(order) + } + // 模板的默认order + if order == "" && template.Order != "" { + db = db.Order(template.Order) + } + + err = db.Find(&tableMap).Error if err != nil { return nil, "", err } @@ -134,7 +207,7 @@ func (sysExportTemplateService *SysExportTemplateService) ExportExcel(templateID } for i, row := range rows { for j, colCell := range row { - err := f.SetCellValue("Sheet1", fmt.Sprintf("%s%d", string('A'+j), i+1), colCell) + err := f.SetCellValue("Sheet1", fmt.Sprintf("%s%d", getColumnName(j+1), i+1), colCell) if err != nil { return nil, "", err } @@ -179,7 +252,7 @@ func (sysExportTemplateService *SysExportTemplateService) ExportTemplate(templat tableTitle = append(tableTitle, templateInfoMap[key]) } for i := range tableTitle { - fErr := f.SetCellValue("Sheet1", fmt.Sprintf("%s%d", string('A'+i), 1), tableTitle[i]) + fErr := f.SetCellValue("Sheet1", fmt.Sprintf("%s%d", getColumnName(i+1), 1), tableTitle[i]) if fErr != nil { return nil, "", fErr } @@ -228,7 +301,13 @@ func (sysExportTemplateService *SysExportTemplateService) ImportExcel(templateID for key, title := range templateInfoMap { titleKeyMap[title] = key } - return global.GVA_DB.Transaction(func(tx *gorm.DB) error { + + db := global.GVA_DB + if template.DBName != "" { + db = global.MustGetGlobalDBByDBName(template.DBName) + } + + return db.Transaction(func(tx *gorm.DB) error { excelTitle := rows[0] values := rows[1:] for _, row := range values { @@ -237,6 +316,15 @@ func (sysExportTemplateService *SysExportTemplateService) ImportExcel(templateID key := titleKeyMap[excelTitle[ii]] item[key] = value } + needCreated := tx.Migrator().HasColumn(template.TableName, "created_at") + needUpdated := tx.Migrator().HasColumn(template.TableName, "updated_at") + if item["created_at"] == nil && needCreated { + item["created_at"] = time.Now() + } + if item["updated_at"] == nil && needUpdated { + item["updated_at"] = time.Now() + } + cErr := tx.Table(template.TableName).Create(&item).Error if cErr != nil { return cErr @@ -245,3 +333,13 @@ func (sysExportTemplateService *SysExportTemplateService) ImportExcel(templateID return nil }) } + +func getColumnName(n int) string { + columnName := "" + for n > 0 { + n-- + columnName = string(rune('A'+n%26)) + columnName + n /= 26 + } + return columnName +} diff --git a/server/service/system/sys_initdb.go b/server/service/system/sys_initdb.go index d511950f..9d636baa 100644 --- a/server/service/system/sys_initdb.go +++ b/server/service/system/sys_initdb.go @@ -15,6 +15,7 @@ const ( Mysql = "mysql" Pgsql = "pgsql" Sqlite = "sqlite" + Mssql = "mssql" InitSuccess = "\n[%v] --> 初始数据成功!\n" InitDataExist = "\n[%v] --> %v 的初始数据已存在!\n" InitDataFailed = "\n[%v] --> %v 初始数据失败! \nerr: %+v\n" @@ -106,6 +107,9 @@ func (initDBService *InitDBService) InitDB(conf request.InitDB) (err error) { case "sqlite": initHandler = NewSqliteInitHandler() ctx = context.WithValue(ctx, "dbtype", "sqlite") + case "mssql": + initHandler = NewMssqlInitHandler() + ctx = context.WithValue(ctx, "dbtype", "mssql") default: initHandler = NewMysqlInitHandler() ctx = context.WithValue(ctx, "dbtype", "mysql") diff --git a/server/service/system/sys_initdb_mssql.go b/server/service/system/sys_initdb_mssql.go new file mode 100644 index 00000000..2bf3f3b0 --- /dev/null +++ b/server/service/system/sys_initdb_mssql.go @@ -0,0 +1,91 @@ +package system + +import ( + "context" + "errors" + "github.com/flipped-aurora/gin-vue-admin/server/config" + "github.com/flipped-aurora/gin-vue-admin/server/global" + "github.com/flipped-aurora/gin-vue-admin/server/model/system/request" + "github.com/flipped-aurora/gin-vue-admin/server/utils" + "github.com/gofrs/uuid/v5" + "github.com/gookit/color" + "gorm.io/driver/sqlserver" + "gorm.io/gorm" + "path/filepath" +) + +type MssqlInitHandler struct{} + +func NewMssqlInitHandler() *MssqlInitHandler { + return &MssqlInitHandler{} +} + +// WriteConfig mssql回写配置 +func (h MssqlInitHandler) WriteConfig(ctx context.Context) error { + c, ok := ctx.Value("config").(config.Mssql) + if !ok { + return errors.New("mssql config invalid") + } + global.GVA_CONFIG.System.DbType = "mssql" + global.GVA_CONFIG.Mssql = c + global.GVA_CONFIG.JWT.SigningKey = uuid.Must(uuid.NewV4()).String() + cs := utils.StructToMap(global.GVA_CONFIG) + for k, v := range cs { + global.GVA_VP.Set(k, v) + } + return global.GVA_VP.WriteConfig() +} + +// EnsureDB 创建数据库并初始化 mssql +func (h MssqlInitHandler) EnsureDB(ctx context.Context, conf *request.InitDB) (next context.Context, err error) { + if s, ok := ctx.Value("dbtype").(string); !ok || s != "mssql" { + return ctx, ErrDBTypeMismatch + } + + c := conf.ToMssqlConfig() + next = context.WithValue(ctx, "config", c) + if c.Dbname == "" { + return ctx, nil + } // 如果没有数据库名, 则跳出初始化数据 + + dsn := conf.MssqlEmptyDsn() + + mssqlConfig := sqlserver.Config{ + DSN: dsn, // DSN data source name + DefaultStringSize: 191, // string 类型字段的默认长度 + } + + var db *gorm.DB + + if db, err = gorm.Open(sqlserver.New(mssqlConfig), &gorm.Config{DisableForeignKeyConstraintWhenMigrating: true}); err != nil { + return nil, err + } + + global.GVA_CONFIG.AutoCode.Root, _ = filepath.Abs("..") + next = context.WithValue(next, "db", db) + return next, err +} + +func (h MssqlInitHandler) InitTables(ctx context.Context, inits initSlice) error { + return createTables(ctx, inits) +} + +func (h MssqlInitHandler) InitData(ctx context.Context, inits initSlice) error { + next, cancel := context.WithCancel(ctx) + defer func(c func()) { c() }(cancel) + for _, init := range inits { + if init.DataInserted(next) { + color.Info.Printf(InitDataExist, Mssql, init.InitializerName()) + continue + } + if n, err := init.InitializeData(next); err != nil { + color.Info.Printf(InitDataFailed, Mssql, init.InitializerName(), err) + return err + } else { + next = n + color.Info.Printf(InitDataSuccess, Mssql, init.InitializerName()) + } + } + color.Info.Printf(InitSuccess, Mssql) + return nil +} diff --git a/server/service/system/sys_menu.go b/server/service/system/sys_menu.go index 604ca9a5..f081918d 100644 --- a/server/service/system/sys_menu.go +++ b/server/service/system/sys_menu.go @@ -64,7 +64,7 @@ func (menuService *MenuService) getMenuTreeMap(authorityId uint) (treeMap map[st btnMap[v.SysMenuID][v.SysBaseMenuBtn.Name] = authorityId } for _, v := range allMenus { - v.Btns = btnMap[v.ID] + v.Btns = btnMap[v.SysBaseMenu.ID] treeMap[v.ParentId] = append(treeMap[v.ParentId], v) } return treeMap, err diff --git a/server/source/system/dictionary_detail.go b/server/source/system/dictionary_detail.go index 4ec234cd..3dea8b70 100644 --- a/server/source/system/dictionary_detail.go +++ b/server/source/system/dictionary_detail.go @@ -50,53 +50,53 @@ func (i *initDictDetail) InitializeData(ctx context.Context) (context.Context, e } True := true dicts[0].SysDictionaryDetails = []sysModel.SysDictionaryDetail{ - {Label: "男", Value: 1, Status: &True, Sort: 1}, - {Label: "女", Value: 2, Status: &True, Sort: 2}, + {Label: "男", Value: "1", Status: &True, Sort: 1}, + {Label: "女", Value: "2", Status: &True, Sort: 2}, } dicts[1].SysDictionaryDetails = []sysModel.SysDictionaryDetail{ - {Label: "smallint", Value: 1, Status: &True, Extend: "mysql", Sort: 1}, - {Label: "mediumint", Value: 2, Status: &True, Extend: "mysql", Sort: 2}, - {Label: "int", Value: 3, Status: &True, Extend: "mysql", Sort: 3}, - {Label: "bigint", Value: 4, Status: &True, Extend: "mysql", Sort: 4}, - {Label: "int2", Value: 5, Status: &True, Extend: "pgsql", Sort: 5}, - {Label: "int4", Value: 6, Status: &True, Extend: "pgsql", Sort: 6}, - {Label: "int6", Value: 7, Status: &True, Extend: "pgsql", Sort: 7}, - {Label: "int8", Value: 8, Status: &True, Extend: "pgsql", Sort: 8}, + {Label: "smallint", Value: "1", Status: &True, Extend: "mysql", Sort: 1}, + {Label: "mediumint", Value: "2", Status: &True, Extend: "mysql", Sort: 2}, + {Label: "int", Value: "3", Status: &True, Extend: "mysql", Sort: 3}, + {Label: "bigint", Value: "4", Status: &True, Extend: "mysql", Sort: 4}, + {Label: "int2", Value: "5", Status: &True, Extend: "pgsql", Sort: 5}, + {Label: "int4", Value: "6", Status: &True, Extend: "pgsql", Sort: 6}, + {Label: "int6", Value: "7", Status: &True, Extend: "pgsql", Sort: 7}, + {Label: "int8", Value: "8", Status: &True, Extend: "pgsql", Sort: 8}, } dicts[2].SysDictionaryDetails = []sysModel.SysDictionaryDetail{ {Label: "date", Status: &True}, - {Label: "time", Value: 1, Status: &True, Extend: "mysql", Sort: 1}, - {Label: "year", Value: 2, Status: &True, Extend: "mysql", Sort: 2}, - {Label: "datetime", Value: 3, Status: &True, Extend: "mysql", Sort: 3}, - {Label: "timestamp", Value: 5, Status: &True, Extend: "mysql", Sort: 5}, - {Label: "timestamptz", Value: 6, Status: &True, Extend: "pgsql", Sort: 5}, + {Label: "time", Value: "1", Status: &True, Extend: "mysql", Sort: 1}, + {Label: "year", Value: "2", Status: &True, Extend: "mysql", Sort: 2}, + {Label: "datetime", Value: "3", Status: &True, Extend: "mysql", Sort: 3}, + {Label: "timestamp", Value: "5", Status: &True, Extend: "mysql", Sort: 5}, + {Label: "timestamptz", Value: "6", Status: &True, Extend: "pgsql", Sort: 5}, } dicts[3].SysDictionaryDetails = []sysModel.SysDictionaryDetail{ {Label: "float", Status: &True}, - {Label: "double", Value: 1, Status: &True, Extend: "mysql", Sort: 1}, - {Label: "decimal", Value: 2, Status: &True, Extend: "mysql", Sort: 2}, - {Label: "numeric", Value: 3, Status: &True, Extend: "pgsql", Sort: 3}, - {Label: "smallserial", Value: 4, Status: &True, Extend: "pgsql", Sort: 4}, + {Label: "double", Value: "1", Status: &True, Extend: "mysql", Sort: 1}, + {Label: "decimal", Value: "2", Status: &True, Extend: "mysql", Sort: 2}, + {Label: "numeric", Value: "3", Status: &True, Extend: "pgsql", Sort: 3}, + {Label: "smallserial", Value: "4", Status: &True, Extend: "pgsql", Sort: 4}, } dicts[4].SysDictionaryDetails = []sysModel.SysDictionaryDetail{ {Label: "char", Status: &True}, - {Label: "varchar", Value: 1, Status: &True, Extend: "mysql", Sort: 1}, - {Label: "tinyblob", Value: 2, Status: &True, Extend: "mysql", Sort: 2}, - {Label: "tinytext", Value: 3, Status: &True, Extend: "mysql", Sort: 3}, - {Label: "text", Value: 4, Status: &True, Extend: "mysql", Sort: 4}, - {Label: "blob", Value: 5, Status: &True, Extend: "mysql", Sort: 5}, - {Label: "mediumblob", Value: 6, Status: &True, Extend: "mysql", Sort: 6}, - {Label: "mediumtext", Value: 7, Status: &True, Extend: "mysql", Sort: 7}, - {Label: "longblob", Value: 8, Status: &True, Extend: "mysql", Sort: 8}, - {Label: "longtext", Value: 9, Status: &True, Extend: "mysql", Sort: 9}, + {Label: "varchar", Value: "1", Status: &True, Extend: "mysql", Sort: 1}, + {Label: "tinyblob", Value: "2", Status: &True, Extend: "mysql", Sort: 2}, + {Label: "tinytext", Value: "3", Status: &True, Extend: "mysql", Sort: 3}, + {Label: "text", Value: "4", Status: &True, Extend: "mysql", Sort: 4}, + {Label: "blob", Value: "5", Status: &True, Extend: "mysql", Sort: 5}, + {Label: "mediumblob", Value: "6", Status: &True, Extend: "mysql", Sort: 6}, + {Label: "mediumtext", Value: "7", Status: &True, Extend: "mysql", Sort: 7}, + {Label: "longblob", Value: "8", Status: &True, Extend: "mysql", Sort: 8}, + {Label: "longtext", Value: "9", Status: &True, Extend: "mysql", Sort: 9}, } dicts[5].SysDictionaryDetails = []sysModel.SysDictionaryDetail{ - {Label: "tinyint", Value: 1, Extend: "mysql", Status: &True}, - {Label: "bool", Value: 2, Extend: "pgsql", Status: &True}, + {Label: "tinyint", Value: "1", Extend: "mysql", Status: &True}, + {Label: "bool", Value: "2", Extend: "pgsql", Status: &True}, } for _, dict := range dicts { if err := db.Model(&dict).Association("SysDictionaryDetails"). diff --git a/server/utils/clamis.go b/server/utils/clamis.go index ec8b29e1..987f311e 100644 --- a/server/utils/clamis.go +++ b/server/utils/clamis.go @@ -14,7 +14,12 @@ func ClearToken(c *gin.Context) { if err != nil { host = c.Request.Host } - c.SetCookie("x-token", "", -1, "/", host, true, false) + + if net.ParseIP(host) != nil { + c.SetCookie("x-token", "", -1, "/", "", false, false) + } else { + c.SetCookie("x-token", "", -1, "/", host, false, false) + } } func SetToken(c *gin.Context, token string, maxAge int) { @@ -23,7 +28,12 @@ func SetToken(c *gin.Context, token string, maxAge int) { if err != nil { host = c.Request.Host } - c.SetCookie("x-token", token, maxAge, "/", host, true, false) + + if net.ParseIP(host) != nil { + c.SetCookie("x-token", token, maxAge, "/", "", false, false) + } else { + c.SetCookie("x-token", token, maxAge, "/", host, false, false) + } } func GetToken(c *gin.Context) string { diff --git a/server/utils/json.go b/server/utils/json.go new file mode 100644 index 00000000..8c4118c7 --- /dev/null +++ b/server/utils/json.go @@ -0,0 +1,34 @@ +package utils + +import ( + "encoding/json" + "strings" +) + +func GetJSONKeys(jsonStr string) (keys []string, err error) { + // 使用json.Decoder，以便在解析过程中记录键的顺序 + dec := json.NewDecoder(strings.NewReader(jsonStr)) + t, err := dec.Token() + if err != nil { + return nil, err + } + // 确保数据是一个对象 + if t != json.Delim('{') { + return nil, err + } + for dec.More() { + t, err = dec.Token() + if err != nil { + return nil, err + } + keys = append(keys, t.(string)) + + // 解析值 + var value interface{} + err = dec.Decode(&value) + if err != nil { + return nil, err + } + } + return keys, nil +} diff --git a/server/utils/json_test.go b/server/utils/json_test.go new file mode 100644 index 00000000..f21a6792 --- /dev/null +++ b/server/utils/json_test.go @@ -0,0 +1,53 @@ +package utils + +import ( + "fmt" + "testing" +) + +func TestGetJSONKeys(t *testing.T) { + var jsonStr = ` + { + "Name": "test", + "TableName": "test", + "TemplateID": "test", + "TemplateInfo": "test", + "Limit": 0 +}` + keys, err := GetJSONKeys(jsonStr) + if err != nil { + t.Errorf("GetJSONKeys failed" + err.Error()) + return + } + if len(keys) != 5 { + t.Errorf("GetJSONKeys failed" + err.Error()) + return + } + if keys[0] != "Name" { + t.Errorf("GetJSONKeys failed" + err.Error()) + + return + } + if keys[1] != "TableName" { + t.Errorf("GetJSONKeys failed" + err.Error()) + + return + } + if keys[2] != "TemplateID" { + t.Errorf("GetJSONKeys failed" + err.Error()) + + return + } + if keys[3] != "TemplateInfo" { + t.Errorf("GetJSONKeys failed" + err.Error()) + + return + } + if keys[4] != "Limit" { + t.Errorf("GetJSONKeys failed" + err.Error()) + + return + } + + fmt.Println(keys) +} diff --git a/web/.env.production b/web/.env.production index eb9b98ad..9345df2d 100644 --- a/web/.env.production +++ b/web/.env.production @@ -1,8 +1,7 @@ ENV = 'production' -VITE_CLI_PORT = 8080 -VITE_SERVER_PORT = 8888 +#下方为上线需要用到的程序代理前缀，一般用于nginx代理转发 VITE_BASE_API = /api VITE_FILE_API = /api -#下方修改为你的线上ip -VITE_BASE_PATH = https://demo.gin-vue-admin.com \ No newline at end of file +#下方修改为你的线上ip（如果需要在线使用表单构建工具时使用，其余情况无需使用以下环境变量） +VITE_BASE_PATH = https://demo.gin-vue-admin.com diff --git a/web/package.json b/web/package.json index 250ca39a..06ea810f 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "gin-vue-admin", - "version": "2.5.9", + "version": "2.6.1", "private": true, "scripts": { "serve": "node openDocument.js && vite --host --mode development", @@ -32,7 +32,7 @@ "screenfull": "^6.0.2", "spark-md5": "^3.0.2", "tailwindcss": "^3.3.3", - "vue": "^3.3.4", + "vue": "^3.4.21", "vue-router": "^4.2.4" }, "devDependencies": { diff --git a/web/src/api/chatgpt.js b/web/src/api/chatgpt.js deleted file mode 100644 index a8a2ddc2..00000000 --- a/web/src/api/chatgpt.js +++ /dev/null @@ -1,31 +0,0 @@ -import service from '@/utils/request' - -export const getTableApi = (data) => { - return service({ - url: '/chatGpt/getTable', - method: 'post', - data - }) -} - -export const createSKApi = (data) => { - return service({ - url: '/chatGpt/createSK', - method: 'post', - data - }) -} - -export const getSKApi = () => { - return service({ - url: '/chatGpt/getSK', - method: 'get', - }) -} - -export const deleteSKApi = () => { - return service({ - url: '/chatGpt/deleteSK', - method: 'delete' - }) -} diff --git a/web/src/api/initdb.js b/web/src/api/initdb.js index ff009c76..f1eb2f4a 100644 --- a/web/src/api/initdb.js +++ b/web/src/api/initdb.js @@ -9,7 +9,8 @@ export const initDB = (data) => { return service({ url: '/init/initdb', method: 'post', - data + data, + donNotShowLoading: true }) } diff --git a/web/src/api/user.js b/web/src/api/user.js index befd20ed..f1f3638a 100644 --- a/web/src/api/user.js +++ b/web/src/api/user.js @@ -15,11 +15,10 @@ export const login = (data) => { // @Produce application/json // @Param data body {username:"string",password:"string"} // @Router /base/captcha [post] -export const captcha = (data) => { +export const captcha = () => { return service({ url: '/base/captcha', - method: 'post', - data: data + method: 'post' }) } diff --git a/web/src/components/chooseImg/index.vue b/web/src/components/chooseImg/index.vue index 71d56dbd..cccd5db5 100644 --- a/web/src/components/chooseImg/index.vue +++ b/web/src/components/chooseImg/index.vue @@ -9,12 +9,12 @@ />
({}) + }, + limit: { + type: Number, + default: 0 + }, + offset: { + type: Number, + default: 0 + }, + order: { + type: String, + default: '' } }) @@ -22,7 +38,21 @@ const exportExcelFunc = async() => { return } const baseUrl = import.meta.env.VITE_BASE_API - const url = `${baseUrl}/sysExportTemplate/exportExcel?templateID=${props.templateId}` + const paramsCopy = JSON.parse(JSON.stringify(props.condition)) + if (props.limit) { + paramsCopy.limit = props.limit + } + if (props.offset) { + paramsCopy.offset = props.offset + } + if (props.order) { + paramsCopy.order = props.order + } + const params = Object.entries(paramsCopy) + .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`) + .join('&') + const url = `${baseUrl}/sysExportTemplate/exportExcel?templateID=${props.templateId}${params ? '&' + params : ''}` + window.open(url, '_blank') } diff --git a/web/src/components/office/docx.vue b/web/src/components/office/docx.vue index 36bba79a..35e3e5a5 100644 --- a/web/src/components/office/docx.vue +++ b/web/src/components/office/docx.vue @@ -1,36 +1,35 @@ \ No newline at end of file + diff --git a/web/src/components/office/index.vue b/web/src/components/office/index.vue index 48a557d8..a6704d6b 100644 --- a/web/src/components/office/index.vue +++ b/web/src/components/office/index.vue @@ -33,16 +33,12 @@ import Excel from '@/components/office/excel.vue' const path = ref(import.meta.env.VITE_BASE_API) -const props = defineProps({ - modelValue: { - type: String, - default: () => '' - } -}) +const model = defineModel({ type: String}) + const fileUrl = ref('') const ext = ref('') watch( - () => props.modelValue, + () => model, val => { fileUrl.value = val const fileExt = val.split('.')[1] || '' diff --git a/web/src/components/selectImage/selectImage.vue b/web/src/components/selectImage/selectImage.vue index 3a9098b3..a08393d0 100644 --- a/web/src/components/selectImage/selectImage.vue +++ b/web/src/components/selectImage/selectImage.vue @@ -1,208 +1,209 @@ - - diff --git a/web/src/view/dashboard/index.vue b/web/src/view/dashboard/index.vue index 1c4afc3a..826c860e 100644 --- a/web/src/view/dashboard/index.vue +++ b/web/src/view/dashboard/index.vue @@ -129,6 +129,7 @@ import DashboardTable from '@/view/dashboard/dashboardTable/dashboardTable.vue' import { ref } from 'vue' import { useRouter } from 'vue-router' import { useWeatherInfo } from '@/view/dashboard/weather.js' +import SelectImage from '@/components/selectImage/selectImage.vue' defineOptions({ name: 'Dashboard' diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue index 14539d8b..fda75eef 100644 --- a/web/src/view/example/customer/customer.vue +++ b/web/src/view/example/customer/customer.vue @@ -59,32 +59,12 @@ icon="edit" @click="updateCustomer(scope.row)" >变更 - -

确定要删除吗？

-
- 取消 - 确定 -
- - + 删除 @@ -146,7 +126,7 @@ import { } from '@/api/customer' import WarningBar from '@/components/warningBar/warningBar.vue' import { ref } from 'vue' -import { ElMessage } from 'element-plus' +import { ElMessage, ElMessageBox } from 'element-plus' import { formatDate } from '@/utils/format' defineOptions({ @@ -205,18 +185,23 @@ const closeDialog = () => { } } const deleteCustomer = async(row) => { - row.visible = false - const res = await deleteExaCustomer({ ID: row.ID }) - if (res.code === 0) { - ElMessage({ - type: 'success', - message: '删除成功' - }) - if (tableData.value.length === 1 && page.value > 1) { - page.value-- + ElMessageBox.confirm('确定要删除吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(async() => { + const res = await deleteExaCustomer({ ID: row.ID }) + if (res.code === 0) { + ElMessage({ + type: 'success', + message: '删除成功' + }) + if (tableData.value.length === 1 && page.value > 1) { + page.value-- + } + getTableData() } - getTableData() - } + }) } const enterDialog = async() => { let res @@ -244,5 +229,4 @@ const openDialog = () => { - diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue index 49a96bc1..8ffe1231 100644 --- a/web/src/view/example/upload/upload.vue +++ b/web/src/view/example/upload/upload.vue @@ -6,11 +6,11 @@ />
@@ -20,13 +20,13 @@ {{ fmtTitle(item.meta.title,item) }} @@ -48,10 +48,9 @@
- @@ -1192,10 +1189,6 @@ if (!metaData.value.icon) { margin-right: 10px; } -.gva-select .el-input__inner { - padding: 0 30px !important -} - .select__option_item { display: flex; align-items: center; diff --git a/web/src/view/superAdmin/operation/sysOperationRecord.vue b/web/src/view/superAdmin/operation/sysOperationRecord.vue index f98e3382..51cdeccc 100644 --- a/web/src/view/superAdmin/operation/sysOperationRecord.vue +++ b/web/src/view/superAdmin/operation/sysOperationRecord.vue @@ -38,33 +38,11 @@
- - -

确定要删除吗？

-
- 取消 - 确定 -
- - + 删除 
{{ fmtBody(scope.row.body) }}
@@ -161,7 +138,6 @@ 
{{ fmtBody(scope.row.resp) }}
@@ -179,32 +155,12 @@ label="操作" > @@ -231,7 +187,7 @@ import { } from '@/api/sysOperationRecord' // 此处请自行替换地址 import { formatDate } from '@/utils/format' import { ref } from 'vue' -import { ElMessage } from 'element-plus' +import { ElMessage, ElMessageBox } from 'element-plus' defineOptions({ name: 'SysOperationRecord' @@ -283,43 +239,52 @@ const getTableData = async() => { getTableData() -const deleteVisible = ref(false) const multipleSelection = ref([]) const handleSelectionChange = (val) => { multipleSelection.value = val } const onDelete = async() => { - const ids = [] - multipleSelection.value && + ElMessageBox.confirm('确定要删除吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(async() => { + const ids = [] + multipleSelection.value && multipleSelection.value.forEach(item => { ids.push(item.ID) }) - const res = await deleteSysOperationRecordByIds({ ids }) - if (res.code === 0) { - ElMessage({ - type: 'success', - message: '删除成功' - }) - if (tableData.value.length === ids.length && page.value > 1) { - page.value-- + const res = await deleteSysOperationRecordByIds({ ids }) + if (res.code === 0) { + ElMessage({ + type: 'success', + message: '删除成功' + }) + if (tableData.value.length === ids.length && page.value > 1) { + page.value-- + } + getTableData() } - deleteVisible.value = false - getTableData() - } + }) } const deleteSysOperationRecordFunc = async(row) => { - row.visible = false - const res = await deleteSysOperationRecord({ ID: row.ID }) - if (res.code === 0) { - ElMessage({ - type: 'success', - message: '删除成功' - }) - if (tableData.value.length === 1 && page.value > 1) { - page.value-- + ElMessageBox.confirm('确定要删除吗?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(async() => { + const res = await deleteSysOperationRecord({ ID: row.ID }) + if (res.code === 0) { + ElMessage({ + type: 'success', + message: '删除成功' + }) + if (tableData.value.length === 1 && page.value > 1) { + page.value-- + } + getTableData() } - getTableData() - } + }) } const fmtBody = (value) => { try { diff --git a/web/src/view/superAdmin/user/user.vue b/web/src/view/superAdmin/user/user.vue index 6dc21c7d..1eae296b 100644 --- a/web/src/view/superAdmin/user/user.vue +++ b/web/src/view/superAdmin/user/user.vue @@ -95,31 +95,12 @@ fixed="right" > -
-