apps/x_admin
1
0
Fork 0
mirror of https://gitee.com/xiangheng/x_admin.git synced 2025-10-06 00:27:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

MakeUuidV7

Browse Source
This commit is contained in:
xh
2025-09-17 17:33:31 +08:00
parent 04ad7c6ed9
commit d03972f11a
8 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/.vscode/settings.json vendored
View File

@@ -6,6 +6,7 @@
"dcloudio", "dcloudio",
"endregion", "endregion",
"excelize", "excelize",
"fatih",
"fontsize", "fontsize",
"freetype", "freetype",
"gocode", "gocode",
@@ -31,6 +32,7 @@
"tinyint", "tinyint",
"tinytext", "tinytext",
"typeof", "typeof",
"uaparser",
"uniapp", "uniapp",
"varchar", "varchar",
"Warnf", "Warnf",

2
server/app/service/generatorService/tpl_utils/templates/gocode/controller.go.tpl
View File

@@ -11,6 +11,8 @@ import (
"x_admin/util" "x_admin/util"
"x_admin/util/excel2" "x_admin/util/excel2"
"golang.org/x/sync/singleflight" "golang.org/x/sync/singleflight"
"x_admin/app/schema"
"x_admin/app/service"
) )

11
server/app/service/generatorService/tpl_utils/tpl.go
View File

@@ -189,9 +189,10 @@ func (tu templateUtil) GetTemplatePaths(genTpl string) []string {
"uniapp/search.vue.tpl", "uniapp/search.vue.tpl",
"uniapp/pages.json.tpl", "uniapp/pages.json.tpl",
} }
if genTpl == GenConstants.TplCrud { switch genTpl {
case GenConstants.TplCrud:
tplPaths = append(tplPaths, "vue/index.vue.tpl") tplPaths = append(tplPaths, "vue/index.vue.tpl")
} else if genTpl == GenConstants.TplTree { case GenConstants.TplTree:
tplPaths = append(tplPaths, "vue/index-tree.vue.tpl") tplPaths = append(tplPaths, "vue/index-tree.vue.tpl")
} }
return tplPaths return tplPaths
@@ -233,9 +234,9 @@ func (tu templateUtil) GetFilePaths(tplCodeMap map[string]string, ModuleName str
"gocode/model.go.tpl": strings.Join([]string{"server/model/", ModuleName, ".go"}, ""), "gocode/model.go.tpl": strings.Join([]string{"server/model/", ModuleName, ".go"}, ""),
"gocode/route.go.tpl": strings.Join([]string{"server/router/adminRoute/", ModuleName, "_route.go"}, ""), "gocode/route.go.tpl": strings.Join([]string{"server/router/adminRoute/", ModuleName, "_route.go"}, ""),
"gocode/schema.go.tpl": strings.Join([]string{"server/schema/", ModuleName, "_schema.go"}, ""), //"server/schema/%s_schema.go" "gocode/schema.go.tpl": strings.Join([]string{"server/app/schema/", ModuleName, "_schema.go"}, ""), //"server/app/schema/%s_schema.go"
"gocode/service.go.tpl": strings.Join([]string{"server/service/", ModuleName, "_service.go"}, ""), //"server/service/%s_service.go", "gocode/service.go.tpl": strings.Join([]string{"server/app/service/", ModuleName, "_service.go"}, ""), //"server/app/service/%s_service.go",
"gocode/controller.go.tpl": strings.Join([]string{"server/controller/admin_ctl/", ModuleName, "_ctl.go"}, ""), //"server/controller/admin_ctl/%s_ctl.go", "gocode/controller.go.tpl": strings.Join([]string{"server/app/controller/admin_ctl/", ModuleName, "_ctl.go"}, ""), //"server/app/controller/admin_ctl/%s_ctl.go",
"vue/api.ts.tpl": strings.Join([]string{"admin/src/api/", GenUtil.NameToPath(ModuleName), ".ts"}, ""), // "admin/src/api/%s.ts", "vue/api.ts.tpl": strings.Join([]string{"admin/src/api/", GenUtil.NameToPath(ModuleName), ".ts"}, ""), // "admin/src/api/%s.ts",
"vue/edit.vue.tpl": strings.Join([]string{"admin/src/views/", GenUtil.NameToPath(ModuleName), "/edit.vue"}, ""), // "admin/src/views/%s/edit.vue", "vue/edit.vue.tpl": strings.Join([]string{"admin/src/views/", GenUtil.NameToPath(ModuleName), "/edit.vue"}, ""), // "admin/src/views/%s/edit.vue",

47
server/app/service/generatorService/tpl_utils/utils.go
View File

@@ -219,25 +219,26 @@ func (gu genUtil) GetTablePriCol(columns []gen_model.GenTableColumn) (res gen_mo
* @description: Go类型转TS类型 * @description: Go类型转TS类型
*/ */
func (gu genUtil) GoToTsType(s string) string { func (gu genUtil) GoToTsType(s string) string {
if s == "int" || s == "int8" || s == "int16" || s == "int32" || s == "int64" { switch s {
case "int", "int8", "int16", "int32", "int64":
return "number" return "number"
} else if s == "float" || s == "float32" || s == "float64" { case "float", "float32", "float64":
return "number" return "number"
} else if s == "string" { case "string":
return "string" return "string"
} else if s == "bool" { case "bool":
return "boolean" return "boolean"
} else if s == "time.Time" { case "time.Time":
return "Date" return "Date"
} else if s == "[]byte" { case "[]byte":
return "string" return "string"
} else if s == "[]string" { case "[]string":
return "string[]" return "string[]"
} else if s == "[]int" { case "[]int":
return "number[]" return "number[]"
} else if s == "[]float" { case "[]float":
return "number[]" return "number[]"
} else if s == "core.NullTime" { case "core.NullTime":
return "string" return "string"
} }
return "string" return "string"
@@ -247,17 +248,18 @@ func (gu genUtil) GoToTsType(s string) string {
* @description: Go类型转 添加编辑 类型 * @description: Go类型转 添加编辑 类型
*/ */
func (gu genUtil) GoWithAddEditType(s string) string { func (gu genUtil) GoWithAddEditType(s string) string {
if s == "int" || s == "int8" || s == "int16" || s == "int32" || s == "int64" { switch s {
case "int", "int8", "int16", "int32", "int64":
return "core.NullInt" return "core.NullInt"
} else if s == "float" || s == "float32" || s == "float64" { case "float", "float32", "float64":
return "core.NullFloat" return "core.NullFloat"
} else if s == "string" { case "string":
return "*string" return "*string"
} else if s == "bool" { case "bool":
return "*int" return "*int"
} else if s == "time.Time" { case "time.Time":
return "core.NullTime" return "core.NullTime"
} else if s == "core.NullTime" { case "core.NullTime":
return "core.NullTime" return "core.NullTime"
} }
return "string" return "string"
@@ -267,17 +269,18 @@ func (gu genUtil) GoWithAddEditType(s string) string {
* @description: Go类型转 添加编辑 类型 * @description: Go类型转 添加编辑 类型
*/ */
func (gu genUtil) GoWithRespType(s string) string { func (gu genUtil) GoWithRespType(s string) string {
if s == "int" || s == "int8" || s == "int16" || s == "int32" || s == "int64" { switch s {
case "int", "int8", "int16", "int32", "int64":
return "core.NullInt" return "core.NullInt"
} else if s == "float" || s == "float32" || s == "float64" { case "float", "float32", "float64":
return "core.NullFloat" return "core.NullFloat"
} else if s == "string" { case "string":
return "string" return "string"
} else if s == "bool" { case "bool":
return "int" return "int"
} else if s == "time.Time" { case "time.Time":
return "core.NullTime" return "core.NullTime"
} else if s == "core.NullTime" { case "core.NullTime":
return "core.NullTime" return "core.NullTime"
} }
return "string" return "string"

2
server/app/service/monitorService/monitor_project_service.go
View File

@@ -128,7 +128,7 @@ func (service monitorProjectService) Detail(Id int) (res monitorSchema.MonitorPr
func (service monitorProjectService) Add(addReq monitorSchema.MonitorProjectAddReq) (createId int, e error) { func (service monitorProjectService) Add(addReq monitorSchema.MonitorProjectAddReq) (createId int, e error) {
var obj model.MonitorProject var obj model.MonitorProject
convert_util.StructToStruct(addReq, &obj) convert_util.StructToStruct(addReq, &obj)
obj.ProjectKey = util.ToolsUtil.MakeUuid() obj.ProjectKey = util.ToolsUtil.MakeUuidV7()
err := service.db.Create(&obj).Error err := service.db.Create(&obj).Error
e = response.CheckMysqlErr(err) e = response.CheckMysqlErr(err)
if e != nil { if e != nil {

2
server/app/service/systemService/permService.go
View File

@@ -83,7 +83,7 @@ func (service systemAuthPermService) BatchSaveByMenuIds(roleId uint, menuIds str
var perms []system_model.SystemAuthPerm var perms []system_model.SystemAuthPerm
for _, menuIdStr := range strings.Split(menuIds, ",") { for _, menuIdStr := range strings.Split(menuIds, ",") {
menuId, _ := strconv.ParseUint(menuIdStr, 10, 32) menuId, _ := strconv.ParseUint(menuIdStr, 10, 32)
perms = append(perms, system_model.SystemAuthPerm{ID: util.ToolsUtil.MakeUuid(), RoleId: roleId, MenuId: uint(menuId)}) perms = append(perms, system_model.SystemAuthPerm{ID: util.ToolsUtil.MakeUuidV7(), RoleId: roleId, MenuId: uint(menuId)})
} }
txErr := tx.Create(&perms).Error txErr := tx.Create(&perms).Error
var te = response.CheckErr(txErr, "BatchSaveByMenuIds Create in tx err") var te = response.CheckErr(txErr, "BatchSaveByMenuIds Create in tx err")

2
server/plugin/storage.go
View File

@@ -112,7 +112,7 @@ func (sd storageDriver) buildSaveName(file *multipart.FileHeader) string {
name := file.Filename name := file.Filename
ext := strings.ToLower(path.Ext(name)) ext := strings.ToLower(path.Ext(name))
date := time.Now().Format("20060102") date := time.Now().Format("20060102")
return path.Join(date, util.ToolsUtil.MakeUuid()+ext) return path.Join(date, util.ToolsUtil.MakeUuidV7()+ext)
} }
// getFileExt 获取文件扩展名 // getFileExt 获取文件扩展名

12
server/util/tools.go
View File

@@ -36,9 +36,13 @@ func (tu toolsUtil) RandomString(length int) string {
return string(byteList) return string(byteList)
} }
// MakeUuid 制作UUID // MakeUuidV7 制作UUID v7
func (tu toolsUtil) MakeUuid() string { func (tu toolsUtil) MakeUuidV7() string {
return strings.ReplaceAll(uuid.New().String(), "-", "") v7, err := uuid.NewV7()
if err != nil {
return ""
}
return strings.ReplaceAll(v7.String(), "-", "")
} }
// MakeMd5 制作MD5 // MakeMd5 制作MD5
@@ -64,7 +68,7 @@ func (tu toolsUtil) GetFileMD5(file *multipart.FileHeader) (string, error) {
// MakeToken 生成唯一Token // MakeToken 生成唯一Token
func (tu toolsUtil) MakeToken() string { func (tu toolsUtil) MakeToken() string {
ms := time.Now().UnixMilli() ms := time.Now().UnixMilli()
token := tu.MakeMd5(tu.MakeUuid() + strconv.FormatInt(ms, 10) + tu.RandomString(8)) token := tu.MakeMd5(tu.MakeUuidV7() + strconv.FormatInt(ms, 10) + tu.RandomString(8))
tokenSecret := token + config.AppConfig.Secret tokenSecret := token + config.AppConfig.Secret
return tu.MakeMd5(tokenSecret) + tu.RandomString(6) return tu.MakeMd5(tokenSecret) + tu.RandomString(6)
} }