提交 7514df3a 编写于 作者: 何秀钢

modified 统一代码风格

上级 5955071f
package v1
import (
"fmt"
"gin-vue-admin/global"
"gin-vue-admin/model"
"gin-vue-admin/model/request"
......@@ -81,7 +80,7 @@ func UpdateExaCustomer(c *gin.Context) {
}
if err := service.UpdateExaCustomer(&customer); err != nil {
global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
response.FailWithMessage("更新失败!", c)
response.FailWithMessage("更新失败", c)
} else {
response.OkWithMessage("更新成功", c)
}
......@@ -129,7 +128,7 @@ func GetExaCustomerList(c *gin.Context) {
err, customerList, total := service.GetCustomerInfoList(getUserAuthorityId(c), pageInfo)
if err != nil {
global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
response.FailWithMessage(fmt.Sprintf("获取失败:%v", err), c)
response.FailWithMessage("获取失败"+err.Error(), c)
} else {
response.OkWithDetailed(response.PageResult{
List: customerList,
......
......@@ -65,7 +65,7 @@ func ImportExcel(c *gin.Context) {
func LoadExcel(c *gin.Context) {
menus, err := service.ParseExcel2InfoList()
if err != nil {
global.GVA_LOG.Error("加载数据失败", zap.Any("err", err))
global.GVA_LOG.Error("加载数据失败!", zap.Any("err", err))
response.FailWithMessage("加载数据失败", c)
return
}
......@@ -90,7 +90,7 @@ func DownloadTemplate(c *gin.Context) {
filePath := global.GVA_CONFIG.Excel.Dir + fileName
ok, err := utils.PathExists(filePath)
if !ok || err != nil {
global.GVA_LOG.Error("文件不存在", zap.Any("err", err))
global.GVA_LOG.Error("文件不存在!", zap.Any("err", err))
response.FailWithMessage("文件不存在", c)
return
}
......
......@@ -73,7 +73,6 @@ func CreateTemp(c *gin.Context) {
c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
_ = os.Remove("./ginvueadmin.zip")
}
} else {
c.Writer.Header().Add("Content-Disposition", fmt.Sprintf("attachment; filename=%s", "ginvueadmin.zip")) // fmt.Sprintf("attachment; filename=%s", filename)对下载的文件重命名
c.Writer.Header().Add("Content-Type", "application/json")
......
......@@ -18,7 +18,7 @@ var store = base64Captcha.DefaultMemStore
// @Success 200 {string} string "{"success":true,"data":{},"msg":"验证码获取成功"}"
// @Router /base/captcha [post]
func Captcha(c *gin.Context) {
//字符,公式,验证码配置
// 字符,公式,验证码配置
// 生成默认数字的driver
driver := base64Captcha.NewDriverDigit(global.GVA_CONFIG.Captcha.ImgHeight, global.GVA_CONFIG.Captcha.ImgWidth, global.GVA_CONFIG.Captcha.KeyLong, 0.7, 80)
cp := base64Captcha.NewCaptcha(driver, store)
......
......@@ -18,18 +18,18 @@ import (
// @Router /init/initdb [post]
func InitDB(c *gin.Context) {
if global.GVA_DB != nil {
global.GVA_LOG.Error("非法访问")
global.GVA_LOG.Error("非法访问!")
response.FailWithMessage("非法访问", c)
return
}
var dbInfo request.InitDB
if err := c.ShouldBindJSON(&dbInfo); err != nil {
global.GVA_LOG.Error("参数校验不通过", zap.Any("err", err))
global.GVA_LOG.Error("参数校验不通过!", zap.Any("err", err))
response.FailWithMessage("参数校验不通过", c)
return
}
if err := service.InitDB(dbInfo); err != nil {
global.GVA_LOG.Error("自动创建数据库失败", zap.Any("err", err))
global.GVA_LOG.Error("自动创建数据库失败!", zap.Any("err", err))
response.FailWithMessage("自动创建数据库失败,请查看后台日志", c)
return
}
......@@ -44,15 +44,11 @@ func InitDB(c *gin.Context) {
func CheckDB(c *gin.Context) {
if global.GVA_DB != nil {
global.GVA_LOG.Info("数据库无需初始化")
response.OkWithDetailed(gin.H{
"needInit": false,
}, "数据库无需初始化", c)
response.OkWithDetailed(gin.H{"needInit": false}, "数据库无需初始化", c)
return
} else {
global.GVA_LOG.Info("前往初始化数据库")
response.OkWithDetailed(gin.H{
"needInit": true,
}, "前往初始化数据库", c)
response.OkWithDetailed(gin.H{"needInit": true}, "前往初始化数据库", c)
return
}
}
......@@ -55,10 +55,9 @@ func ReloadSystem(c *gin.Context) {
if err != nil {
global.GVA_LOG.Error("重启系统失败!", zap.Any("err", err))
response.FailWithMessage("重启系统失败", c)
return
} else {
response.OkWithMessage("重启系统成功", c)
}
response.OkWithMessage("重启系统成功", c)
return
}
// @Tags System
......@@ -71,9 +70,7 @@ func GetServerInfo(c *gin.Context) {
if server, err := service.GetServerInfo(); err != nil {
global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
response.FailWithMessage("获取失败", c)
return
} else {
response.OkWithDetailed(gin.H{"server": server}, "获取成功", c)
}
}
......@@ -32,7 +32,7 @@ func Login(c *gin.Context) {
if store.Verify(L.CaptchaId, L.Captcha, true) {
U := &model.SysUser{Username: L.Username, Password: L.Password}
if err, user := service.Login(U); err != nil {
global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误", zap.Any("err", err))
global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Any("err", err))
response.FailWithMessage("用户名不存在或者密码错误", c)
} else {
tokenNext(c, *user)
......@@ -60,7 +60,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
}
token, err := j.CreateToken(claims)
if err != nil {
global.GVA_LOG.Error("获取token失败", zap.Any("err", err))
global.GVA_LOG.Error("获取token失败!", zap.Any("err", err))
response.FailWithMessage("获取token失败", c)
return
}
......@@ -74,7 +74,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
}
if err, jwtStr := service.GetRedisJWT(user.Username); err == redis.Nil {
if err := service.SetRedisJWT(token, user.Username); err != nil {
global.GVA_LOG.Error("设置登录状态失败", zap.Any("err", err))
global.GVA_LOG.Error("设置登录状态失败!", zap.Any("err", err))
response.FailWithMessage("设置登录状态失败", c)
return
}
......@@ -84,7 +84,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
ExpiresAt: claims.StandardClaims.ExpiresAt * 1000,
}, "登录成功", c)
} else if err != nil {
global.GVA_LOG.Error("设置登录状态失败", zap.Any("err", err))
global.GVA_LOG.Error("设置登录状态失败!", zap.Any("err", err))
response.FailWithMessage("设置登录状态失败", c)
} else {
var blackJWT model.JwtBlacklist
......@@ -121,7 +121,7 @@ func Register(c *gin.Context) {
user := &model.SysUser{Username: R.Username, NickName: R.NickName, Password: R.Password, HeaderImg: R.HeaderImg, AuthorityId: R.AuthorityId}
err, userReturn := service.Register(*user)
if err != nil {
global.GVA_LOG.Error("注册失败", zap.Any("err", err))
global.GVA_LOG.Error("注册失败!", zap.Any("err", err))
response.FailWithDetailed(response.SysUserResponse{User: userReturn}, "注册失败", c)
} else {
response.OkWithDetailed(response.SysUserResponse{User: userReturn}, "注册成功", c)
......@@ -144,7 +144,7 @@ func ChangePassword(c *gin.Context) {
}
U := &model.SysUser{Username: user.Username, Password: user.Password}
if err, _ := service.ChangePassword(U, user.NewPassword); err != nil {
global.GVA_LOG.Error("修改失败", zap.Any("err", err))
global.GVA_LOG.Error("修改失败!", zap.Any("err", err))
response.FailWithMessage("修改失败,原密码与当前账户不符", c)
} else {
response.OkWithMessage("修改成功", c)
......@@ -167,7 +167,7 @@ func GetUserList(c *gin.Context) {
return
}
if err, list, total := service.GetUserInfoList(pageInfo); err != nil {
global.GVA_LOG.Error("获取失败", zap.Any("err", err))
global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
response.FailWithMessage("获取失败", c)
} else {
response.OkWithDetailed(response.PageResult{
......@@ -195,7 +195,7 @@ func SetUserAuthority(c *gin.Context) {
return
}
if err := service.SetUserAuthority(sua.UUID, sua.AuthorityId); err != nil {
global.GVA_LOG.Error("修改失败", zap.Any("err", err))
global.GVA_LOG.Error("修改失败!", zap.Any("err", err))
response.FailWithMessage("修改失败", c)
} else {
response.OkWithMessage("修改成功", c)
......@@ -246,7 +246,7 @@ func SetUserInfo(c *gin.Context) {
return
}
if err, ReqUser := service.SetUserInfo(user); err != nil {
global.GVA_LOG.Error("设置失败", zap.Any("err", err))
global.GVA_LOG.Error("设置失败!", zap.Any("err", err))
response.FailWithMessage("设置失败", c)
} else {
response.OkWithDetailed(gin.H{"userInfo": ReqUser}, "设置成功", c)
......@@ -256,7 +256,7 @@ func SetUserInfo(c *gin.Context) {
// 从Gin的Context中获取从jwt解析出来的用户ID
func getUserID(c *gin.Context) uint {
if claims, exists := c.Get("claims"); !exists {
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户ID失败, 请检查路由是否使用jwt中间件")
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户ID失败, 请检查路由是否使用jwt中间件!")
return 0
} else {
waitUse := claims.(*request.CustomClaims)
......@@ -267,7 +267,7 @@ func getUserID(c *gin.Context) uint {
// 从Gin的Context中获取从jwt解析出来的用户UUID
func getUserUuid(c *gin.Context) string {
if claims, exists := c.Get("claims"); !exists {
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件")
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件!")
return ""
} else {
waitUse := claims.(*request.CustomClaims)
......@@ -278,7 +278,7 @@ func getUserUuid(c *gin.Context) string {
// 从Gin的Context中获取从jwt解析出来的用户角色id
func getUserAuthorityId(c *gin.Context) string {
if claims, exists := c.Get("claims"); !exists {
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件")
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析出来的用户UUID失败, 请检查路由是否使用jwt中间件!")
return ""
} else {
waitUse := claims.(*request.CustomClaims)
......
......@@ -59,7 +59,6 @@ func MysqlTables(db *gorm.DB) {
global.GVA_LOG.Info("register table success")
}
//
//@author: SliverHorn
//@function: GormMysql
//@description: 初始化Mysql数据库
......
......@@ -117,7 +117,7 @@ func Get{{.StructName}}List(c *gin.Context) {
var pageInfo request.{{.StructName}}Search
_ = c.ShouldBindQuery(&pageInfo)
if err, list, total := service.Get{{.StructName}}InfoList(pageInfo); err != nil {
global.GVA_LOG.Error("获取失败", zap.Any("err", err))
global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
response.FailWithMessage("获取失败", c)
} else {
response.OkWithDetailed(response.PageResult{
......
......@@ -7,12 +7,12 @@ import (
)
func InitCustomerRouter(Router *gin.RouterGroup) {
ApiRouter := Router.Group("customer").Use(middleware.OperationRecord())
CustomerRouter := Router.Group("customer").Use(middleware.OperationRecord())
{
ApiRouter.POST("customer", v1.CreateExaCustomer) // 创建客户
ApiRouter.PUT("customer", v1.UpdateExaCustomer) // 更新客户
ApiRouter.DELETE("customer", v1.DeleteExaCustomer) // 删除客户
ApiRouter.GET("customer", v1.GetExaCustomer) // 获取单一客户信息
ApiRouter.GET("customerList", v1.GetExaCustomerList) // 获取客户列表
CustomerRouter.POST("customer", v1.CreateExaCustomer) // 创建客户
CustomerRouter.PUT("customer", v1.UpdateExaCustomer) // 更新客户
CustomerRouter.DELETE("customer", v1.DeleteExaCustomer) // 删除客户
CustomerRouter.GET("customer", v1.GetExaCustomer) // 获取单一客户信息
CustomerRouter.GET("customerList", v1.GetExaCustomerList) // 获取客户列表
}
}
......@@ -6,11 +6,11 @@ import (
)
func InitExcelRouter(Router *gin.RouterGroup) {
FileUploadAndDownloadGroup := Router.Group("excel")
ExcelRouter := Router.Group("excel")
{
FileUploadAndDownloadGroup.POST("/importExcel", v1.ImportExcel) // 导入Excel
FileUploadAndDownloadGroup.GET("/loadExcel", v1.LoadExcel) // 加载Excel数据
FileUploadAndDownloadGroup.POST("/exportExcel", v1.ExportExcel) // 导出Excel
FileUploadAndDownloadGroup.GET("/downloadTemplate", v1.DownloadTemplate) // 下载模板文件
ExcelRouter.POST("/importExcel", v1.ImportExcel) // 导入Excel
ExcelRouter.GET("/loadExcel", v1.LoadExcel) // 加载Excel数据
ExcelRouter.POST("/exportExcel", v1.ExportExcel) // 导出Excel
ExcelRouter.GET("/downloadTemplate", v1.DownloadTemplate) // 下载模板文件
}
}
......@@ -6,14 +6,14 @@ import (
)
func InitFileUploadAndDownloadRouter(Router *gin.RouterGroup) {
FileUploadAndDownloadGroup := Router.Group("fileUploadAndDownload")
FileUploadAndDownloadRouter := Router.Group("fileUploadAndDownload")
{
FileUploadAndDownloadGroup.POST("/upload", v1.UploadFile) // 上传文件
FileUploadAndDownloadGroup.POST("/getFileList", v1.GetFileList) // 获取上传文件列表
FileUploadAndDownloadGroup.POST("/deleteFile", v1.DeleteFile) // 删除指定文件
FileUploadAndDownloadGroup.POST("/breakpointContinue", v1.BreakpointContinue) // 断点续传
FileUploadAndDownloadGroup.GET("/findFile", v1.FindFile) // 查询当前文件成功的切片
FileUploadAndDownloadGroup.POST("/breakpointContinueFinish", v1.BreakpointContinueFinish) // 查询当前文件成功的切片
FileUploadAndDownloadGroup.POST("/removeChunk", v1.RemoveChunk) // 查询当前文件成功的切片
FileUploadAndDownloadRouter.POST("/upload", v1.UploadFile) // 上传文件
FileUploadAndDownloadRouter.POST("/getFileList", v1.GetFileList) // 获取上传文件列表
FileUploadAndDownloadRouter.POST("/deleteFile", v1.DeleteFile) // 删除指定文件
FileUploadAndDownloadRouter.POST("/breakpointContinue", v1.BreakpointContinue) // 断点续传
FileUploadAndDownloadRouter.GET("/findFile", v1.FindFile) // 查询当前文件成功的切片
FileUploadAndDownloadRouter.POST("/breakpointContinueFinish", v1.BreakpointContinueFinish) // 查询当前文件成功的切片
FileUploadAndDownloadRouter.POST("/removeChunk", v1.RemoveChunk) // 查询当前文件成功的切片
}
}
......@@ -6,10 +6,10 @@ import (
)
func InitSimpleUploaderRouter(Router *gin.RouterGroup) {
ApiRouter := Router.Group("simpleUploader")
SimpleUploaderRouter := Router.Group("simpleUploader")
{
ApiRouter.POST("upload", v1.SimpleUploaderUpload) // 上传功能
ApiRouter.GET("checkFileMd5", v1.CheckFileMd5) // 文件完整度验证
ApiRouter.GET("mergeFileMd5", v1.MergeFileMd5) // 合并文件
SimpleUploaderRouter.POST("upload", v1.SimpleUploaderUpload) // 上传功能
SimpleUploaderRouter.GET("checkFileMd5", v1.CheckFileMd5) // 文件完整度验证
SimpleUploaderRouter.GET("mergeFileMd5", v1.MergeFileMd5) // 合并文件
}
}
......@@ -7,8 +7,8 @@ import (
)
func InitEmailRouter(Router *gin.RouterGroup) {
UserRouter := Router.Group("email").Use(middleware.OperationRecord())
EmailRouter := Router.Group("email").Use(middleware.OperationRecord())
{
UserRouter.POST("emailTest", v1.EmailTest) // 发送测试邮件
EmailRouter.POST("emailTest", v1.EmailTest) // 发送测试邮件
}
}
......@@ -6,9 +6,9 @@ import (
)
func InitInitRouter(Router *gin.RouterGroup) {
ApiRouter := Router.Group("init")
InitRouter := Router.Group("init")
{
ApiRouter.POST("initdb", v1.InitDB) // 创建Api
ApiRouter.POST("checkdb", v1.CheckDB) // 创建Api
InitRouter.POST("initdb", v1.InitDB) // 创建Api
InitRouter.POST("checkdb", v1.CheckDB) // 创建Api
}
}
......@@ -7,8 +7,8 @@ import (
)
func InitJwtRouter(Router *gin.RouterGroup) {
ApiRouter := Router.Group("jwt").Use(middleware.OperationRecord())
JwtRouter := Router.Group("jwt").Use(middleware.OperationRecord())
{
ApiRouter.POST("jsonInBlacklist", v1.JsonInBlacklist) // jwt加入黑名单
JwtRouter.POST("jsonInBlacklist", v1.JsonInBlacklist) // jwt加入黑名单
}
}
......@@ -9,8 +9,8 @@ import (
func InitUserRouter(Router *gin.RouterGroup) {
UserRouter := Router.Group("user").Use(middleware.OperationRecord())
{
UserRouter.POST("register", v1.Register)
UserRouter.POST("changePassword", v1.ChangePassword) // 修改密码
UserRouter.POST("register", v1.Register) // 用户注册账号
UserRouter.POST("changePassword", v1.ChangePassword) // 用户修改密码
UserRouter.POST("getUserList", v1.GetUserList) // 分页获取用户列表
UserRouter.POST("setUserAuthority", v1.SetUserAuthority) // 设置用户权限
UserRouter.DELETE("deleteUser", v1.DeleteUser) // 删除用户
......
......@@ -42,22 +42,22 @@ func CheckFileMd5(md5 string) (err error, uploads []model.ExaSimpleUploader, isD
func MergeFileMd5(md5 string, fileName string) (err error) {
finishDir := "./finish/"
dir := "./chunk/" + md5
//如果文件上传成功 不做后续操作 通知成功即可
// 如果文件上传成功 不做后续操作 通知成功即可
if !errors.Is(global.GVA_DB.First(&model.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, true).Error, gorm.ErrRecordNotFound) {
return nil
}
//打开切片文件夹
// 打开切片文件夹
rd, err := ioutil.ReadDir(dir)
_ = os.MkdirAll(finishDir, os.ModePerm)
//创建目标文件
// 创建目标文件
fd, err := os.OpenFile(finishDir+fileName, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
if err != nil {
return
}
//关闭文件
// 关闭文件
defer fd.Close()
//将切片文件按照顺序写入
// 将切片文件按照顺序写入
for k := range rd {
content, _ := ioutil.ReadFile(dir + "/" + fileName + strconv.Itoa(k+1))
_, err = fd.Write(content)
......@@ -70,7 +70,7 @@ func MergeFileMd5(md5 string, fileName string) (err error) {
return err
}
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
//删除切片信息
// 删除切片信息
if err = tx.Delete(&model.ExaSimpleUploader{}, "identifier = ? AND is_done = ?", md5, false).Error; err != nil {
fmt.Println(err)
return err
......@@ -89,6 +89,6 @@ func MergeFileMd5(md5 string, fileName string) (err error) {
return nil
})
err = os.RemoveAll(dir) //清除切片
err = os.RemoveAll(dir) // 清除切片
return err
}
......@@ -44,8 +44,8 @@ func GetRedisJWT(userName string) (err error, redisJWT string) {
//@author: [piexlmax](https://github.com/piexlmax)
//@function: SetRedisJWT
//@description: jwt存入redis并设置过期时间
//@param: userName string
//@return: err error, redisJWT string
//@param: jwt string, userName string
//@return: err error
func SetRedisJWT(jwt string, userName string) (err error) {
// 此处过期时间等于jwt过期时间
......
......@@ -59,7 +59,7 @@ func CopyAuthority(copyInfo response.SysAuthorityCopyResponse) (err error, autho
//@function: UpdateAuthority
//@description: 更改一个角色
//@param: auth model.SysAuthority
//@return:err error, authority model.SysAuthority
//@return: err error, authority model.SysAuthority
func UpdateAuthority(auth model.SysAuthority) (err error, authority model.SysAuthority) {
err = global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&model.SysAuthority{}).Updates(&auth).Error
......@@ -126,7 +126,7 @@ func GetAuthorityInfo(auth model.SysAuthority) (err error, sa model.SysAuthority
//@function: SetDataAuthority
//@description: 设置角色资源权限
//@param: auth model.SysAuthority
//@return:error
//@return: error
func SetDataAuthority(auth model.SysAuthority) error {
var s model.SysAuthority
......
......@@ -96,7 +96,7 @@ func PreviewTemp(autoCode model.AutoCodeStruct) (map[string]string, error) {
//@function: CreateTemp
//@description: 创建代码
//@param: model.AutoCodeStruct
//@return: error
//@return: err error
func CreateTemp(autoCode model.AutoCodeStruct) (err error) {
dataList, fileList, needMkdir, err := getNeedList(&autoCode)
......@@ -186,9 +186,8 @@ func GetAllTplFile(pathName string, fileList []string) ([]string, error) {
//@author: [piexlmax](https://github.com/piexlmax)
//@function: GetTables
//@description: 获取数据库的所有表名
//@param: pathName string
//@param: fileList []string
//@return: []string, error
//@param: dbName string
//@return: err error, TableNames []request.TableReq
func GetTables(dbName string) (err error, TableNames []request.TableReq) {
err = global.GVA_DB.Raw("select table_name as table_name from information_schema.tables where table_schema = ?", dbName).Scan(&TableNames).Error
......@@ -198,9 +197,7 @@ func GetTables(dbName string) (err error, TableNames []request.TableReq) {
//@author: [piexlmax](https://github.com/piexlmax)
//@function: GetDB
//@description: 获取数据库的所有数据库名
//@param: pathName string
//@param: fileList []string
//@return: []string, error
//@return: err error, DBNames []request.DBReq
func GetDB() (err error, DBNames []request.DBReq) {
err = global.GVA_DB.Raw("SELECT SCHEMA_NAME AS `database` FROM INFORMATION_SCHEMA.SCHEMATA;").Scan(&DBNames).Error
......@@ -210,9 +207,8 @@ func GetDB() (err error, DBNames []request.DBReq) {
//@author: [piexlmax](https://github.com/piexlmax)
//@function: GetDB
//@description: 获取指定数据库和指定数据表的所有字段名,类型值等
//@param: pathName string
//@param: fileList []string
//@return: []string, error
//@param: tableName string, dbName string
//@return: err error, Columns []request.ColumnReq
func GetColumn(tableName string, dbName string) (err error, Columns []request.ColumnReq) {
err = global.GVA_DB.Raw("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 = ?", tableName, dbName).Scan(&Columns).Error
......@@ -269,7 +265,7 @@ func addAutoMoveFile(data *tplData) {
//@function: CreateApi
//@description: 自动创建api数据,
//@param: a *model.AutoCodeStruct
//@return: error
//@return: err error
func AutoCreateApi(a *model.AutoCodeStruct) (err error) {
var apiList = []model.SysApi{
......
......@@ -34,7 +34,7 @@ func DeleteBaseMenu(id float64) (err error) {
//@function: UpdateBaseMenu
//@description: 更新路由
//@param: menu model.SysBaseMenu
//@return:err error
//@return: err error
func UpdateBaseMenu(menu model.SysBaseMenu) (err error) {
var oldMenu model.SysBaseMenu
......
......@@ -54,7 +54,7 @@ func GetSysDictionaryDetail(id uint) (err error, sysDictionaryDetail model.SysDi
//@function: GetSysDictionaryDetailInfoList
//@description: 分页获取字典详情列表
//@param: info request.SysDictionaryDetailSearch
//@return: err error
//@return: err error, list interface{}, total int64
func GetSysDictionaryDetailInfoList(info request.SysDictionaryDetailSearch) (err error, list interface{}, total int64) {
limit := info.PageSize
......
......@@ -18,7 +18,7 @@ import (
//@author: [songzhibin97](https://github.com/songzhibin97)
//@function: writeConfig
//@description: 回写配置
//@param:
//@param: viper *viper.Viper, mysql config.Mysql
//@return: error
func writeConfig(viper *viper.Viper, mysql config.Mysql) error {
......@@ -67,8 +67,8 @@ func initDB(InitDBFunctions ...model.InitDBFunc) (err error) {
//@author: [songzhibin97](https://github.com/songzhibin97)
//@function: InitDB
//@description: 创建数据库并初始化
//@param: authorityId string
//@return: err error, treeMap map[string][]model.SysMenu
//@param: conf request.InitDB
//@return: error
func InitDB(conf request.InitDB) error {
BaseMysql := config.Mysql{
......@@ -118,7 +118,7 @@ func InitDB(conf request.InitDB) error {
SkipInitializeWithVersion: false, // 根据版本自动配置
}
if db, err := gorm.Open(mysql.New(mysqlConfig), &gorm.Config{DisableForeignKeyConstraintWhenMigrating: true}); err != nil {
//global.GVA_LOG.Error("MySQL启动异常", zap.Any("err", err))
//global.GVA_LOG.Error("MySQL启动异常!", zap.Any("err", err))
//os.Exit(0)
//return nil
_ = writeConfig(global.GVA_VP, BaseMysql)
......
......@@ -87,7 +87,7 @@ func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.Sys
//@function: AddBaseMenu
//@description: 添加基础路由
//@param: menu model.SysBaseMenu
//@return: err error
//@return: error
func AddBaseMenu(menu model.SysBaseMenu) error {
if !errors.Is(global.GVA_DB.Where("name = ?", menu.Name).First(&model.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
......
......@@ -42,15 +42,15 @@ func GetServerInfo() (server *utils.Server, err error) {
var s utils.Server
s.Os = utils.InitOS()
if s.Cpu, err = utils.InitCPU(); err != nil {
global.GVA_LOG.Error("func utils.InitCPU() Failed!", zap.String("err", err.Error()))
global.GVA_LOG.Error("func utils.InitCPU() Failed", zap.String("err", err.Error()))
return &s, err
}
if s.Rrm, err = utils.InitRAM(); err != nil {
global.GVA_LOG.Error("func utils.InitRAM() Failed!", zap.String("err", err.Error()))
global.GVA_LOG.Error("func utils.InitRAM() Failed", zap.String("err", err.Error()))
return &s, err
}
if s.Disk, err = utils.InitDisk(); err != nil {
global.GVA_LOG.Error("func utils.InitDisk() Failed!", zap.String("err", err.Error()))
global.GVA_LOG.Error("func utils.InitDisk() Failed", zap.String("err", err.Error()))
return &s, err
}
......
......@@ -40,9 +40,9 @@ func BreakPointContinue(content []byte, fileName string, contentNumber int, cont
func CheckMd5(content []byte, chunkMd5 string) (CanUpload bool) {
fileMd5 := MD5V(content)
if fileMd5 == chunkMd5 {
return true // "可以继续上传"
return true // 可以继续上传
} else {
return false // "切片不完整,废弃"
return false // 切片不完整,废弃
}
}
......@@ -92,7 +92,6 @@ func MakeFile(fileName string, FileMd5 string) (error, string) {
return err, finishDir + fileName
}
}
return nil, finishDir + fileName
}
......
......@@ -11,8 +11,8 @@ import (
//@author: [songzhibin97](https://github.com/songzhibin97)
//@function: ClearTable
//@description: 清理数据库表数据
//@param: target db(数据库对象) *gorm.DB,tableName(表名) string,compareField(比较字段) string , interval string 间隔
//@return: err
//@param: db(数据库对象) *gorm.DB, tableName(表名) string, compareField(比较字段) string, interval(间隔) string
//@return: error
func ClearTable(db *gorm.DB, tableName string, compareField string, interval string) error {
if db == nil {
......
......@@ -46,7 +46,7 @@ Redirect:
//@function: TrimSpace
//@description: 去除结构体空格
//@param: target interface (target: 目标结构体,传入必须是指针类型)
//@return: err error
//@return: null
func TrimSpace(target interface{}) {
t := reflect.TypeOf(target)
......
......@@ -13,7 +13,7 @@ import (
//@function: AutoInjectionCode
//@description: 向文件中固定注释位置写入代码
//@param: filepath string, funcName string, codeData string
//@return: err error
//@return: error
func AutoInjectionCode(filepath string, funcName string, codeData string) error {
startComment := "Code generated by gin-vue-admin Begin; DO NOT EDIT."
......
......@@ -26,7 +26,7 @@ func (*AliyunOSS) UploadFile(file *multipart.FileHeader) (string, string, error)
return "", "", errors.New("function file.Open() Failed, err:" + openError.Error())
}
//上传阿里云路径 文件名格式 自己可以改 建议保证唯一性
// 上传阿里云路径 文件名格式 自己可以改 建议保证唯一性
yunFileTmpPath := filepath.Join("uploads", time.Now().Format("2006-01-02")) + "/" + file.Filename
// 上传文件流。
......
......@@ -71,8 +71,7 @@ func (*Qiniu) DeleteFile(key string) error {
//@object: *Qiniu
//@function: qiniuConfig
//@description: 根据配置文件进行返回七牛云的配置
//@param: key string
//@return: error
//@return: *storage.Config
func qiniuConfig() *storage.Config {
cfg := storage.Config{
......
......@@ -31,8 +31,7 @@ func RegisterRule(key string, rule Rules) (err error) {
//@author: [piexlmax](https://github.com/piexlmax)
//@function: NotEmpty
//@description: 非空 不能为其对应类型的0值
//@param: key string, rule Rules
//@return: err error
//@return: string
func NotEmpty() string {
return "notEmpty"
......
......@@ -10,7 +10,7 @@ import (
//@author: [piexlmax](https://github.com/piexlmax)
//@function: ZipFiles
//@description: 压缩文件
//@param: filename string, files []string, oldform, newform string
//@param: filename string, files []string, oldForm, newForm string
//@return: error
func ZipFiles(filename string, files []string, oldForm, newForm string) error {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册