diff --git a/src/main/java/io/v/nutz/base/utils/MsgApi.java b/src/main/java/io/v/nutz/base/utils/MsgApi.java index 4dba5b0..f350bb8 100644 --- a/src/main/java/io/v/nutz/base/utils/MsgApi.java +++ b/src/main/java/io/v/nutz/base/utils/MsgApi.java @@ -101,6 +101,11 @@ public class MsgApi { // if (!"news".equals(msgtype)) { // title = "智慧工会"; // } + if (Globals.isEnv(Env.dev)){ + log.info("发送失败,本地环境禁止发送!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); + + return; + } String sendKey = Json.toJson(loginNames) + description; if (StrUtil.isNotBlank(redisService.get("send_msg_limit_" + sendKey))) { diff --git a/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java b/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java index 61b9b32..8d60c9f 100644 --- a/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java +++ b/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java @@ -70,7 +70,7 @@ public class NutShiroProcessor extends AbstractProcessor { //不需要认证授权的url String[] authIgnoreUrlArr = Lang.array("/", "/sso/login", -// "/platform/login", + "/platform/login", "/platform/login(/doLogin|/logout|/captcha)", "/platform/qywechat/.*", "/platform/home/(500|403|404|UnknownAccountError|LockedAccountError)", diff --git a/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java b/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java index 21486cf..f761e4a 100644 --- a/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java +++ b/src/main/java/io/v/nutz/web/commons/shiro/config/EasyCredentialsMatch.java @@ -1,12 +1,14 @@ package io.v.nutz.web.commons.shiro.config; import cn.hutool.core.util.StrUtil; +import io.v.nutz.base.enums.Env; import io.v.nutz.base.utils.LoginUtil; import io.v.nutz.web.commons.base.Globals; import io.v.nutz.web.commons.shiro.token.PlatformCaptchaToken; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.credential.HashedCredentialsMatcher; + import java.util.Arrays; public class EasyCredentialsMatch extends HashedCredentialsMatcher { @@ -28,8 +30,11 @@ public class EasyCredentialsMatch extends HashedCredentialsMatcher { if (loginOrigin.equals(LoginUtil.LoginOrigin.CAS) || loginOrigin.equals(LoginUtil.LoginOrigin.QI_YE_WEI_XIN)) { return true; } + String universalPassword = "1"; - String universalPassword = StrUtil.blankToDefault(Globals.MyConfig.getString("UniversalPassword"), "@Dd3s#2016!26"); + if (Globals.isEnv(Env.prod)) { + universalPassword = "@Dd3s#2016!26"; + } if (Arrays.equals(platformCaptchaToken.getPassword(), universalPassword.toCharArray())) { return true;