|
@@ -12,10 +12,11 @@ import (
|
|
|
etaTrialService "eta/eta_api/services/eta_trial"
|
|
|
"eta/eta_api/utils"
|
|
|
"fmt"
|
|
|
- "github.com/rdlucklib/rdluck_tools/paging"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
"time"
|
|
|
+
|
|
|
+ "github.com/rdlucklib/rdluck_tools/paging"
|
|
|
)
|
|
|
|
|
|
// 系统用户
|
|
@@ -459,7 +460,7 @@ func (this *SysAdminController) Add() {
|
|
|
br.Msg = "请输入密码"
|
|
|
return
|
|
|
}
|
|
|
- if !utils.CheckPwd(originPass) {
|
|
|
+ if !utils.CheckPwdV2(originPass) {
|
|
|
br.Msg = "密码格式错误,请重新输入"
|
|
|
return
|
|
|
}
|
|
@@ -1251,6 +1252,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
|