diff --git a/framework/src/main/java/com/yfd/platform/config/SecurityConfig.java b/framework/src/main/java/com/yfd/platform/config/SecurityConfig.java index fe6003d..211e1fc 100644 --- a/framework/src/main/java/com/yfd/platform/config/SecurityConfig.java +++ b/framework/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -62,11 +62,15 @@ public class SecurityConfig { auth.requestMatchers("/user/login").anonymous() .requestMatchers("/user/code").permitAll() .requestMatchers(HttpMethod.GET, + "/", + "/index.html", + "/favicon.ico", "/*.html", "/webSocket/**", "/ws/**", "/assets/**", - "/icon/**").permitAll() + "/icon/**", + "/models/**").permitAll() .requestMatchers( "/swagger-ui.html", "/swagger-ui/**", diff --git a/framework/src/main/java/com/yfd/platform/system/controller/LoginController.java b/framework/src/main/java/com/yfd/platform/system/controller/LoginController.java index ac08378..a2ca4ac 100644 --- a/framework/src/main/java/com/yfd/platform/system/controller/LoginController.java +++ b/framework/src/main/java/com/yfd/platform/system/controller/LoginController.java @@ -71,6 +71,7 @@ public class LoginController { // 密码解密 String password = RsaUtils.decryptByPrivateKey(privateKey, user.getPassword()); + // 是否需要验证码不需要改成false boolean hascode = true; diff --git a/framework/src/main/java/com/yfd/platform/system/service/impl/SysLogServiceImpl.java b/framework/src/main/java/com/yfd/platform/system/service/impl/SysLogServiceImpl.java index ee671bf..0b9d3bb 100644 --- a/framework/src/main/java/com/yfd/platform/system/service/impl/SysLogServiceImpl.java +++ b/framework/src/main/java/com/yfd/platform/system/service/impl/SysLogServiceImpl.java @@ -150,12 +150,16 @@ public class SysLogServiceImpl extends ServiceImpl impleme log.setRequestip(ip); log.setMethod(methodName); log.setUsername(nickname); - log.setParams(getParameter(method, joinPoint.getArgs())); + log.setParams(truncateWithMark(getParameter(method, joinPoint.getArgs()), 1000, "...")); log.setBrowser(browser); String operationtype = getOperationtype(signature.getName()); log.setOpttype(operationtype); log.setLogtime(new Timestamp(System.currentTimeMillis())); - sysLogMapper.insert(log); + try { + sysLogMapper.insert(log); + } catch (Exception e) { + // ignore + } } /** @@ -216,4 +220,22 @@ public class SysLogServiceImpl extends ServiceImpl impleme return type; } + private String truncateWithMark(String s, int maxLen, String mark) { + if (StrUtil.isBlank(s)) { + return s; + } + if (maxLen <= 0) { + return ""; + } + if (s.length() <= maxLen) { + return s; + } + String safeMark = (mark == null) ? "" : mark; + if (safeMark.length() >= maxLen) { + return safeMark.substring(0, maxLen); + } + int keepLen = maxLen - safeMark.length(); + return s.substring(0, keepLen) + safeMark; + } + }