c-zhangr1/zhgh_hrbnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
Paidax
2024-12-09 08:49:40 +08:00
parent f7dd11b067
commit 1211e93a26
5 changed files with 528 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/sys/controllers/platform/sys/SysLoginController.java
+7 -8
View File
@@ -1,8 +1,8 @@
package io.v.nutz.sys.controllers.platform.sys;
import io.v.nutz.base.enums.Env;
import io.v.nutz.base.result.Result;
import io.v.nutz.base.utils.LoginUtil;
import io.v.nutz.base.enums.Env;
import io.v.nutz.sys.models.Sys_log;
import io.v.nutz.sys.models.Sys_role;
import io.v.nutz.sys.models.Sys_unit;
@@ -24,7 +24,10 @@ import io.v.nutz.web.commons.utils.ShiroUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.*;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.AuthenticationToken;
import org.apache.shiro.authc.LockedAccountException;
import org.apache.shiro.authc.UnknownAccountException;
import org.apache.shiro.authz.annotation.RequiresAuthentication;
import org.apache.shiro.crypto.hash.Sha256Hash;
import org.apache.shiro.session.SessionException;
@@ -189,11 +192,7 @@ public class SysLoginController {
public Object doLogin(@Attr("platformLoginToken") AuthenticationToken token,String loginType, HttpServletRequest req, HttpSession session) {
int errCount = NumberUtils.toInt(Strings.sNull(SecurityUtils.getSubject().getSession(true).getAttribute("platformErrCount")));
try {
if ("SMS_CODE".equals(loginType)){
loginUtil.doLogin(token, req, session, LoginUtil.LoginOrigin.SMS_CODE);
} else {
loginUtil.doLogin(token, req, session, LoginUtil.LoginOrigin.WEB);
}
loginUtil.doLogin(token, req, session, LoginUtil.LoginOrigin.WEB);
return Result.success("login.success");
} catch (CaptchaIncorrectException e) {
return Result.error(1, "login.error.captcha");
@@ -208,7 +207,7 @@ public class SysLoginController {
} catch (AuthenticationException e) {
errCount++;
SecurityUtils.getSubject().getSession(true).setAttribute("platformErrCount", errCount);
return Result.error(5, e.getMessage());
return Result.error(5, "login.error.user");
} catch (Exception e) {
errCount++;
SecurityUtils.getSubject().getSession(true).setAttribute("platformErrCount", errCount);
src/main/java/io/v/nutz/sys/controllers/platform/sys/SysUnitMangeController.java
+4 -4
View File
@@ -2,17 +2,17 @@ package io.v.nutz.sys.controllers.platform.sys;
import cn.wizzer.framework.base.Result;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.base.dao.CndPlus;
import io.v.nutz.base.query.PageForm;
import io.v.nutz.zhgh.proposal.models.ProposalConfig;
import io.v.nutz.zhgh.proposal.models.ProposalUndertake;
import io.v.nutz.base.service.AsyncService;
import io.v.nutz.base.service.ViService;
import io.v.nutz.base.utils.Roles;
import io.v.nutz.sys.models.Sys_unit;
import io.v.nutz.sys.models.Sys_user_role;
import io.v.nutz.sys.services.SysUnitClassService;
import io.v.nutz.sys.services.SysUserService;
import io.v.nutz.zhgh.proposal.models.ProposalConfig;
import io.v.nutz.zhgh.proposal.models.ProposalUndertake;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.nutz.aop.interceptor.ioc.TransAop;
@@ -195,7 +195,7 @@ public class SysUnitMangeController {
try {
List list = new ArrayList();
Sys_unit school = sysUnitService.fetch("1");
Sys_unit school = sysUnitService.fetch("100");
school.setChild(child(school.getId()));
list.add(school);