diff --git a/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java b/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java index 22cf198d..48115bc1 100644 --- a/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java +++ b/src/main/java/com/sqx/common/aspect/AppApiMethodAspect.java @@ -23,8 +23,7 @@ import javax.servlet.http.HttpServletRequest; public class AppApiMethodAspect { @Pointcut("!execution(public * (com.sqx.modules.sys.controller.SysLoginController).*(..)) " + - "&& (execution(public * (com.sqx.modules.*.controller.*).*(..)) " + - "|| execution(public * (com.sqx.modules.app.*.controller.*).*(..)))") + "&& execution(public * (com.sqx.modules.*.controller..*).*(..)))") public void pkg() { } diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index d9b3425d..b0dab570 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -907,13 +907,17 @@ public class UserServiceImpl extends ServiceImpl implements if (StringUtils.isEmpty(msg)) { return Result.error("验证码不能为空!"); } - Msg msg1 = null; - if (!"prod".equals(profiles) && !"61626364".equals(msg)) { - msg1 = msgDao.findByPhoneAndCode(phone, msg); - if (msg1 == null) { - return Result.error("验证码不正确!"); - } + Msg msg1 = msgDao.findByPhoneAndCode(phone, msg); + if (msg1 == null) { + return Result.error("验证码不正确!"); } +// Msg msg1 = null; +// if (!"prod".equals(profiles) || !"61626364".equals(msg)) { +// msg1 = msgDao.findByPhoneAndCode(phone, msg); +// if (msg1 == null) { +// return Result.error("验证码不正确!"); +// } +// } userInfo = new UserEntity(); UserEntity userEntity = null; diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index 1317a230..638bf400 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -217,9 +217,11 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) {