diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/CustInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/CustInfoServiceImpl.java index 3fc81bd8..a26a6cad 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/CustInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/CustInfoServiceImpl.java @@ -237,30 +237,36 @@ public class CustInfoServiceImpl extends ServiceImpl i public AjaxResult validatePassword(String oldPassword, String newPassword) { // 1. 检查密码长度 + log.error("开始验证密码长度"); if (!isPasswordLengthValid(newPassword)) { return AjaxResult.error("密码长度应为6至16位!"); } // 2. 检查密码字符类型 + log.error("开始验证密码字符"); if (!isPasswordCharacterValid(newPassword)) { return AjaxResult.error("密码必须包含大、小字母、数字、特殊字符!"); } // 3. 检查常见弱密码 + log.error("开始验证弱密码片段"); if (containsWeakPassword(newPassword.toLowerCase())) { return AjaxResult.error("密码包含常见的弱密码片段!"); } // 4. 检查连续字符 + log.error("开始验证密码连续字符"); if (containsConsecutiveCharacters(newPassword.toLowerCase(), 3)) { return AjaxResult.error("密码不能包含超过3位连续字符!"); } // 5. 检查新旧密码是否相同 + log.error("开始验证新旧密码"); if (StringUtils.isNotEmpty(oldPassword) && SecurityUtils.matchesPassword(newPassword, oldPassword)) { return AjaxResult.error("新密码不能与原密码相同!"); } + log.error("完成密码复杂度验证"); return AjaxResult.success(); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/channel/ali/service/AliPayServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/channel/ali/service/AliPayServiceImpl.java index ebd3a8e7..c041f39b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/channel/ali/service/AliPayServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/pay/channel/ali/service/AliPayServiceImpl.java @@ -863,7 +863,7 @@ public class AliPayServiceImpl implements AliPayExtension { createModel.setTimeExpire(timeFormat); //定制结束 request.setNotifyUrl(this.queryUnifyNotifyHost() + notifyUrl); - request.setReturnUrl(this.queryUnifyNotifyHost() + "/h5pro/#/pages/index"); + request.setReturnUrl(this.queryUnifyNotifyHost() + "/h5pro/#/pages/remainingSum/payLoding"); request.setBizModel(createModel); try {