fix: 修复若干BUG

1. 修复登陆后无法记录IP问题
2. 优化白名单URL
3. 去除登陆校验密码安全度选项
pull/20/head
Parker 3 years ago
parent 6092b3336c
commit f5e716f518

@ -82,15 +82,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
* @param http http
*/
private void initAuthorizeRequests(HttpSecurity http) throws Exception {
// 设置URL 未登陆前可访问URL
List<String> anonymousList = authProperties.getUrlExclusion().getAnonymous();
if(null != anonymousList){
String[] urlExclusionArray = anonymousList.toArray(new String[0]);
http.authorizeRequests()
// URL 未登陆前可访问
.antMatchers(urlExclusionArray).anonymous();
}
// 设置URL白名单
List<String> permitAll = authProperties.getUrlExclusion().getPermitAll();
if(null != permitAll){

@ -35,7 +35,7 @@ public class LoginModel {
private String principal;
/** 密码 */
@Validator({ValidatorType.IS_NOT_NULL, ValidatorType.IS_SECURITY_PASSWORD})
@Validator({ValidatorType.IS_NOT_NULL})
@ValidatorLenMin(6)
private String password;

@ -5,6 +5,7 @@ import org.opsli.api.wrapper.system.logs.LoginLogsModel;
import org.opsli.api.wrapper.system.user.UserModel;
import org.opsli.api.wrapper.system.user.UserOrgRefModel;
import org.opsli.common.enums.DictType;
import org.opsli.common.utils.IPUtil;
import org.opsli.core.utils.UserUtil;
import org.springframework.util.ObjectUtils;
@ -27,7 +28,7 @@ public final class UserLoginLogFactory {
loginInfo.setUsername(user.getUsername());
loginInfo.setRealName(user.getRealName());
// *** 需要确保 user对象的ip信息是有值的
loginInfo.setRemoteAddr(user.getLoginIp());
loginInfo.setRemoteAddr(IPUtil.getClientAddressBySingle(request));
String header = request.getHeader("User-Agent");
loginInfo.setUserAgent(header);

@ -45,9 +45,6 @@ public class AuthProperties {
@Data
public static class UrlExclusion {
/** 未登陆状态下可以访问 */
private List<String> anonymous;
/** 无限制 */
private List<String> permitAll;

@ -165,13 +165,6 @@ opsli:
# 排除过滤URL
url-exclusion:
permit-all:
- "/captcha"
- "/system/slipCount"
- "/system/login"
- "/system/login-by-code"
- "/api/*/common/public-key"
- "/api/*/common/email/create-code"
- "/api/*/common/mobile/create-code"
- "/swagger-ui.html"
- "/doc.html"
- "/swagger-resources/**"
@ -180,6 +173,13 @@ opsli:
- "/swagger/**"
- "/v2/api-docs"
- "/druid/**"
- "/captcha"
- "/system/slipCount"
- "/system/login"
- "/system/login-by-code"
- "/api/*/common/public-key"
- "/api/*/common/email/create-code"
- "/api/*/common/mobile/create-code"
# 超级管理员账号
super-admin: system

Loading…
Cancel
Save