From 7e2e40df56e8fe4c1eaa97604e4b60f1353d0553 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Wed, 23 Sep 2020 22:26:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=8F=E6=9C=BA=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E7=94=9F=E6=88=90=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/security.go | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkg/security.go b/pkg/security.go index 3f0f162..dcb030e 100644 --- a/pkg/security.go +++ b/pkg/security.go @@ -7,8 +7,13 @@ import ( "golang.org/x/crypto/scrypt" ) -func generateRandString(length int) string { - var chars = []byte("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_=+,.?/:;{}[]`~") +const ( + symbol = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()-_=+,.?/:;{}[]`~" + letter = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" +) + +func generateRandString(length int, s string) string { + var chars = []byte(s) clen := len(chars) if clen < 2 || clen > 256 { panic("Wrong charset length for NewLenChars()") @@ -37,12 +42,17 @@ func generateRandString(length int) string { // GenerateRandomKey20 生成20位随机字符串 func GenerateRandomKey20() string { - return generateRandString(20) + return generateRandString(20, symbol) } -// GenerateRandomKey16 生成6为随机字符串 +// GenerateRandomKey16 生成16为随机字符串 func GenerateRandomKey16() string { - return generateRandString(6) + return generateRandString(16, symbol) +} + +// GenerateRandomKey6 生成6为随机字符串 +func GenerateRandomKey6() string { + return generateRandString(6, letter) } // SetPassword 根据明文密码和加盐值生成密码