diff --git a/src/main/java/com/budwk/app/sys/controller/SysLoginController.java b/src/main/java/com/budwk/app/sys/controller/SysLoginController.java index 9df02a2..4d16fd3 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysLoginController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysLoginController.java @@ -175,7 +175,7 @@ public class SysLoginController { || "::1".equals(serverName); } - @At(value = "/platform/sso/login", top = true) + @At(value = {"/platform/sso/login", "/sso/login"}, top = true) @Ok("re") @ApiOperation("用户cas登录统一入口") public String ssoLogin(HttpSession httpSession, HttpServletRequest request, HttpServletResponse response) { diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java index 2b8e7af..44121b0 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java @@ -359,7 +359,7 @@ public class SysUserServiceImpl extends BaseServiceImpl implements Sys String decodePwd = Base64Decoder.decodeStr(passowrd); String hashedPassword = PwdUtil.getPassword(decodePwd, user.getSalt()); if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) { - if (Globals.sso || !"dev".equalsIgnoreCase(conf.get("nutz.profiles.active"))) { + if (Globals.sso) { throw new BaseException("用户名或者密码不正确"); } } diff --git a/src/main/resources/application-prd.yaml b/src/main/resources/application-prd.yaml index 606042b..09e1b5b 100644 --- a/src/main/resources/application-prd.yaml +++ b/src/main/resources/application-prd.yaml @@ -34,12 +34,12 @@ sdk: appSecret: a65cec4fb69980bd88258fc8433a3eef redirectUri: /platform/wx/oauth2/callback cas: - enable: false - server-url-prefix: https://i.zjnu.edu.cn/cas - server-login-url: https://i.zjnu.edu.cn/cas/login + enable: true + server-url-prefix: https://authserver.zjnu.edu.cn/authserver + server-login-url: https://authserver.zjnu.edu.cn/authserver/login qi-wx-server-login-url: httos:/cas.whcp.eou.cn/lyuapServer/wechatauz/wxAuthRedirect - client-host-url: https://zhgh.zjnu.edu.cn - client-call-back-url: /platform/sso/login + client-host-url: https://lxy.zjnu.edu.cn + client-call-back-url: /sso/login validation-type: cas minio: accessKey: minioadmin