重置密码

controllers/sys_user.go

@@ -529,40 +529,41 @@ func (this *SysUserController) ResetMyPass() {
 
 	sysUser := this.SysUser
 	// 校验系统用户的密码
-	var pwd string
-	{
-		pwdByte, err := base64.StdEncoding.DecodeString(req.Password)
-		if err != nil {
-			br.Msg = "解析数据失败"
-			br.ErrMsg = "解析数据失败，Err:" + err.Error()
-			return
-		}
-		originPwd := string(pwdByte)
-		//if !utils.CheckPwd(originPwd) {
-		//	br.Msg = "密码格式错误，请重新输入"
-		//	return
-		//}
-		//前端直接加密，后端不做处理
-		//pwd = utils.MD5(originPwd)
-		pwd = originPwd
-		originPwdByte, err := base64.StdEncoding.DecodeString(req.OriginPassword)
-		if err != nil {
-			br.Msg = "解析数据失败"
-			br.ErrMsg = "解析数据失败，Err:" + err.Error()
-			return
-		}
-		stringPwd := string(originPwdByte)
-		//if sysUser.Password != utils.MD5(stringPwd) {
-		//	br.Msg = "原密码错误"
-		//	return
-		//}
-		if sysUser.Password != stringPwd {
-			br.Msg = "原密码错误"
-			return
-		}
+	//var pwd string
+	//{
+	//pwdByte, err := base64.StdEncoding.DecodeString(req.Password)
+	//if err != nil {
+	//	br.Msg = "解析数据失败"
+	//	br.ErrMsg = "解析数据失败，Err:" + err.Error()
+	//	return
+	//}
+	//originPwd := string(pwdByte)
+	//if !utils.CheckPwd(originPwd) {
+	//	br.Msg = "密码格式错误，请重新输入"
+	//	return
+	//}
+	//前端直接加密，后端不做处理
+	//pwd = utils.MD5(originPwd)
+	//pwd = originPwd
+	//originPwdByte, err := base64.StdEncoding.DecodeString(req.OriginPassword)
+	//if err != nil {
+	//	br.Msg = "解析数据失败"
+	//	br.ErrMsg = "解析数据失败，Err:" + err.Error()
+	//	return
+	//}
+	//stringPwd := string(originPwdByte)
+	//if sysUser.Password != utils.MD5(stringPwd) {
+	//	br.Msg = "原密码错误"
+	//	return
+	//}
+	stringPwd := req.OriginPassword
+	if sysUser.Password != stringPwd {
+		br.Msg = "原密码错误"
+		return
 	}
+	//}
 
-	sysUser.Password = pwd
+	sysUser.Password = req.Password
 	sysUser.ModifyTime = time.Now()
 	err = sysUser.Update([]string{"password", "modify_time"})
 	if err != nil {