Merge branch 'bzq1/fix_bug_cf' of eta_server/eta_api into debug

controllers/sys_admin.go

@@ -460,7 +460,7 @@ func (this *SysAdminController) Add() {
 			br.Msg = "请输入密码"
 			return
 		}
-		if !utils.CheckPwd(originPass) {
+		if !utils.CheckPwdV2(originPass) {
 			br.Msg = "密码格式错误，请重新输入"
 			return
 		}
@@ -1279,6 +1279,10 @@ func (this *SysAdminController) ResetPass() {
 	}
 	pwd := string(b)
 	//pwd = strings.ToLower(pwd)
+	if !utils.CheckPwdV2(pwd) {
+		br.Msg = "密码格式错误，请重新输入"
+		return
+	}
 	pwd = utils.MD5(pwd)
 
 	adminInfo.Password = pwd

utils/common.go

@@ -683,6 +683,22 @@ func CheckPwd(pwd string) bool {
 	return flag
 }
 
+func CheckPwdV2(pwd string) bool {
+	var patternArr = []string{
+		".*[0-9]+.*", ".*[a-z]+.*", ".*[A-Z]+.*", ".*[@#$%^&+=.]+.*",
+	}
+	num := 0
+	for _, pattern := range patternArr {
+		if regexp.MustCompile(pattern).MatchString(pwd) {
+			num++
+		}
+	}
+	if len(pwd) < 8 {
+		num = 0
+	}
+	return num >= 3
+}
+
 func GetMonthStartAndEnd(myYear string, myMonth string) (startDate, endDate string) {
 	// 数字月份必须前置补零
 	if len(myMonth) == 1 {