diff --git a/ruoyi-auth/ruoyi-tfa-email/src/main/java/com/ruoyi/tfa/email/service/impl/MailServiceImpl.java b/ruoyi-auth/ruoyi-tfa-email/src/main/java/com/ruoyi/tfa/email/service/impl/MailServiceImpl.java index c2c65f9..5b8a0a6 100644 --- a/ruoyi-auth/ruoyi-tfa-email/src/main/java/com/ruoyi/tfa/email/service/impl/MailServiceImpl.java +++ b/ruoyi-auth/ruoyi-tfa-email/src/main/java/com/ruoyi/tfa/email/service/impl/MailServiceImpl.java @@ -33,7 +33,7 @@ public class MailServiceImpl implements IMailService { private TokenService tokenService; @Autowired private UserDetailsServiceImpl userDetailsServiceImpl; - + private static final Logger log = LoggerFactory.getLogger(MailServiceImpl.class); @Override @@ -54,12 +54,14 @@ public class MailServiceImpl implements IMailService { @Override public boolean checkCode(String email, String code, OauthVerificationUse use) { - if (StringUtils.isEmpty(code)) + if (StringUtils.isEmpty(code)) { return false; + } String cachedCode = CacheUtils.get(CacheConstants.EMAIL_CODES, use.getValue() + email, String.class); // 从缓存中获取验证码 boolean isValid = code.equals(cachedCode); - if (isValid) + if (isValid) { CacheUtils.remove(CacheConstants.EMAIL_CODES, use.getValue() + email); + } return isValid; } diff --git a/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/service/Impl/DySmsServiceImpl.java b/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/service/Impl/DySmsServiceImpl.java index 8f74795..720bd27 100644 --- a/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/service/Impl/DySmsServiceImpl.java +++ b/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/service/Impl/DySmsServiceImpl.java @@ -64,12 +64,14 @@ public class DySmsServiceImpl implements DySmsService { @Override public boolean checkCode(String phone, String code, OauthVerificationUse use) { - if (StringUtils.isEmpty(code)) + if (StringUtils.isEmpty(code)) { return false; + } String cachedCode = CacheUtils.get(CacheConstants.PHONE_CODES, use.getValue() + phone, String.class); // 从缓存中获取验证码 boolean isValid = code.equals(cachedCode); - if (isValid) + if (isValid) { CacheUtils.remove(CacheConstants.PHONE_CODES, use.getValue() + phone); + } return isValid; } diff --git a/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnLineController.java b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnLineController.java index 4eb976a..187d4f0 100644 --- a/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnLineController.java +++ b/ruoyi-models/ruoyi-online/src/main/java/com/ruoyi/online/controller/OnLineController.java @@ -73,8 +73,9 @@ public class OnLineController extends BaseController { } public Boolean checkPermission(String permissionType, String permissionValue) { - if (permissionType == null) + if (permissionType == null) { return true; + } return switch (permissionType) { case "hasPermi" -> permissionService.hasPermi(permissionValue); case "lacksPermi" -> permissionService.lacksPermi(permissionValue); @@ -124,16 +125,15 @@ public class OnLineController extends BaseController { return AjaxResult.error(500, "系统错误,在线接口重复"); } else { OnlineMb onlineMb = selectOnlineMbList.get(0); - if (!checkPermission(onlineMb.getPermissionType(), onlineMb.getPermissionValue())) + if (!checkPermission(onlineMb.getPermissionType(), onlineMb.getPermissionValue())) { return AjaxResult.error(403, "没有权限,请联系管理员授权"); - + } if (onlineMb.getDeptId() != null && onlineMb.getDeptId().equals("1")) { object.put("deptId", SecurityUtils.getDeptId()); } if (onlineMb.getUserId() != null && onlineMb.getUserId().equals("1")) { object.put("userId", SecurityUtils.getUserId()); } - return processingMapper(onlineMb.getSql(), onlineMb.getActuator(), object); } } diff --git a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/service/Impl/SQBServiceImpl.java b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/service/Impl/SQBServiceImpl.java index 99ef6fd..6d624ac 100644 --- a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/service/Impl/SQBServiceImpl.java +++ b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/service/Impl/SQBServiceImpl.java @@ -84,12 +84,14 @@ public class SQBServiceImpl { String result = httpPost(url, params.toString(), sign, sqbConfig.getVendorSn()); JSONObject retObj = JSON.parseObject(result); String resCode = retObj.get("result_code").toString(); - if (!"200".equals(resCode)) + if (!"200".equals(resCode)) { return null; + } String responseStr = retObj.get("biz_response").toString(); JSONObject terminal = JSON.parseObject(responseStr); - if (terminal.get("terminal_sn") == null || terminal.get("terminal_key") == null) + if (terminal.get("terminal_sn") == null || terminal.get("terminal_key") == null) { return null; + } return terminal; } catch (Exception e) { return null; @@ -113,12 +115,14 @@ public class SQBServiceImpl { String result = httpPost(url, params.toString(), sign, sqbConfig.getTerminalSn()); JSONObject retObj = JSON.parseObject(result); String resCode = retObj.get("result_code").toString(); - if (!"200".equals(resCode)) + if (!"200".equals(resCode)){ return null; + } String responseStr = retObj.get("biz_response").toString(); JSONObject terminal = JSON.parseObject(responseStr); - if (terminal.get("terminal_sn") == null || terminal.get("terminal_key") == null) + if (terminal.get("terminal_sn") == null || terminal.get("terminal_key") == null){ return null; + } return terminal; } catch (Exception e) { return null; @@ -166,8 +170,9 @@ public class SQBServiceImpl { String result = httpPost(url, params, sign, sqbConfig.getTerminalSn()); JSONObject retObj = JSON.parseObject(result); String resCode = retObj.get("result_code").toString(); - if (!"200".equals(resCode)) + if (!"200".equals(resCode)){ return null; + } String responseStr = retObj.get("biz_response").toString(); return JSONObject.parseObject(responseStr); } catch (Exception e) {