|
@@ -1,35 +1,31 @@
|
|
package guid
|
|
package guid
|
|
|
|
|
|
import (
|
|
import (
|
|
- "fmt"
|
|
|
|
- "log"
|
|
|
|
- "math/rand"
|
|
|
|
- "time"
|
|
|
|
|
|
+ "strings"
|
|
|
|
+
|
|
|
|
+ "github.com/google/uuid"
|
|
)
|
|
)
|
|
|
|
|
|
func Gen() string {
|
|
func Gen() string {
|
|
- rand.Seed(time.Now().UnixNano())
|
|
|
|
- b := make([]byte, 16)
|
|
|
|
- _, err := rand.Read(b)
|
|
|
|
- if err != nil {
|
|
|
|
- log.Fatal(err)
|
|
|
|
- }
|
|
|
|
- uuid := fmt.Sprintf("%x-%x-%x-%x-%x",
|
|
|
|
- b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
|
|
|
|
-
|
|
|
|
- return uuid
|
|
|
|
|
|
+ id := uuid.New()
|
|
|
|
+
|
|
|
|
+ return id.String()
|
|
}
|
|
}
|
|
|
|
|
|
func GenNoSplit() string {
|
|
func GenNoSplit() string {
|
|
- rand.Seed(time.Now().UnixNano()) //设置随机数种子
|
|
|
|
|
|
+ id := uuid.New()
|
|
|
|
+ idStr := strings.ReplaceAll(id.String(), "-", "")
|
|
|
|
+
|
|
|
|
+ return idStr
|
|
|
|
+ // rand.Seed(time.Now().UnixNano()) //设置随机数种子
|
|
|
|
|
|
- b := make([]byte, 16)
|
|
|
|
- _, err := rand.Read(b)
|
|
|
|
- if err != nil {
|
|
|
|
- log.Fatal(err)
|
|
|
|
- }
|
|
|
|
- uuid := fmt.Sprintf("%x%x%x%x%x",
|
|
|
|
- b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
|
|
|
|
|
|
+ // b := make([]byte, 16)
|
|
|
|
+ // _, err := rand.Read(b)
|
|
|
|
+ // if err != nil {
|
|
|
|
+ // log.Fatal(err)
|
|
|
|
+ // }
|
|
|
|
+ // uuid := fmt.Sprintf("%x%x%x%x%x",
|
|
|
|
+ // b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
|
|
|
|
|
|
- return uuid
|
|
|
|
|
|
+ // return uuid
|
|
}
|
|
}
|