Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理问题

Browse Source
This commit is contained in:
WenG 2021-03-28 22:41:05 +08:00
parent 22d3562890
commit 4b2a9155de
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/ink/wgink/common/config/BeanConfig.java
View File

@ -56,6 +56,11 @@ public class BeanConfig {
@Bean @Bean
public PasswordEncoder passwordEncoder() { public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
@Bean
public PasswordEncoder customPasswordEncoder() {
return new PasswordEncoder() { return new PasswordEncoder() {
@Override @Override
public String encode(CharSequence charSequence) { public String encode(CharSequence charSequence) {

11
login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
View File

@ -13,7 +13,6 @@ import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
/** /**
@ -32,6 +31,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
private UserDetailServiceImpl userDetailService; private UserDetailServiceImpl userDetailService;
@Autowired @Autowired
private UserLoginService userLoginService; private UserLoginService userLoginService;
@Autowired
private PasswordEncoder passwordEncoder;
@Override @Override
protected void configure(HttpSecurity http) throws Exception { protected void configure(HttpSecurity http) throws Exception {
@ -79,12 +80,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
addUserAuthenticationFilter(http, loginFailureHandler); addUserAuthenticationFilter(http, loginFailureHandler);
} }
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
@Bean @Bean
@Override @Override
public AuthenticationManager authenticationManagerBean() throws Exception { public AuthenticationManager authenticationManagerBean() throws Exception {
@ -100,7 +95,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
private void addUserAuthenticationFilter(HttpSecurity http, LoginFailureHandler loginFailureHandler) throws Exception { private void addUserAuthenticationFilter(HttpSecurity http, LoginFailureHandler loginFailureHandler) throws Exception {
UserSecurityConfig userSecurityConfig = new UserSecurityConfig(); UserSecurityConfig userSecurityConfig = new UserSecurityConfig();
userSecurityConfig.setUserDetailService(userDetailService); userSecurityConfig.setUserDetailService(userDetailService);
userSecurityConfig.setPasswordEncoder(passwordEncoder()); userSecurityConfig.setPasswordEncoder(passwordEncoder);
userSecurityConfig.setLoginProcessUrl(baseConfig.getLoginProcess()); userSecurityConfig.setLoginProcessUrl(baseConfig.getLoginProcess());
userSecurityConfig.setLoginFailureHandler(loginFailureHandler); userSecurityConfig.setLoginFailureHandler(loginFailureHandler);
userSecurityConfig.setUserLoginService(userLoginService); userSecurityConfig.setUserLoginService(userLoginService);

6
module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java
View File

@ -113,11 +113,11 @@ public class DataController extends DefaultBaseController {
@GetMapping("listpage") @GetMapping("listpage")
public SuccessResultList<List<DataDTO>> listPage(ListPage page) { public SuccessResultList<List<DataDTO>> listPage(ListPage page) {
Map<String, Object> params = requestParams(); Map<String, Object> params = requestParams();
String ParentId = "0"; String parentId = "0";
if (!StringUtils.isBlank(params.get(ISystemConstant.PARAMS_PARENT_ID) == null ? null : params.get(ISystemConstant.PARAMS_PARENT_ID).toString())) { if (!StringUtils.isBlank(params.get(ISystemConstant.PARAMS_PARENT_ID) == null ? null : params.get(ISystemConstant.PARAMS_PARENT_ID).toString())) {
ParentId = params.get(ISystemConstant.PARAMS_PARENT_ID).toString(); parentId = params.get(ISystemConstant.PARAMS_PARENT_ID).toString();
} }
params.put("ParentId", ParentId); params.put("dataParentId", parentId);
page.setParams(params); page.setParams(params);
return dataService.listPage(page); return dataService.listPage(page);
} }