diff --git a/common/src/main/java/ink/wgink/common/config/BeanConfig.java b/common/src/main/java/ink/wgink/common/config/BeanConfig.java
index 40207d7d..b0bdbca2 100644
--- a/common/src/main/java/ink/wgink/common/config/BeanConfig.java
+++ b/common/src/main/java/ink/wgink/common/config/BeanConfig.java
@@ -56,6 +56,11 @@ public class BeanConfig {
 
     @Bean
     public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    @Bean
+    public PasswordEncoder customPasswordEncoder() {
         return new PasswordEncoder() {
             @Override
             public String encode(CharSequence charSequence) {
diff --git a/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java b/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
index efe21f38..eecdfd65 100644
--- a/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
+++ b/login-base/src/main/java/ink/wgink/login/base/security/WebSecurityConfig.java
@@ -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.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 /**
@@ -32,6 +31,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     private UserDetailServiceImpl userDetailService;
     @Autowired
     private UserLoginService userLoginService;
+    @Autowired
+    private PasswordEncoder passwordEncoder;
 
     @Override
     protected void configure(HttpSecurity http) throws Exception {
@@ -79,12 +80,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         addUserAuthenticationFilter(http, loginFailureHandler);
     }
 
-
-    @Bean
-    public PasswordEncoder passwordEncoder() {
-        return new BCryptPasswordEncoder();
-    }
-
     @Bean
     @Override
     public AuthenticationManager authenticationManagerBean() throws Exception {
@@ -100,7 +95,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     private void addUserAuthenticationFilter(HttpSecurity http, LoginFailureHandler loginFailureHandler) throws Exception {
         UserSecurityConfig userSecurityConfig = new UserSecurityConfig();
         userSecurityConfig.setUserDetailService(userDetailService);
-        userSecurityConfig.setPasswordEncoder(passwordEncoder());
+        userSecurityConfig.setPasswordEncoder(passwordEncoder);
         userSecurityConfig.setLoginProcessUrl(baseConfig.getLoginProcess());
         userSecurityConfig.setLoginFailureHandler(loginFailureHandler);
         userSecurityConfig.setUserLoginService(userLoginService);
diff --git a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java
index 09d3bdcf..5a1f3068 100644
--- a/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java
+++ b/module-dictionary/src/main/java/ink/wgink/module/dictionary/controller/api/DataController.java
@@ -113,11 +113,11 @@ public class DataController extends DefaultBaseController {
     @GetMapping("listpage")
     public SuccessResultList<List<DataDTO>> listPage(ListPage page) {
         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())) {
-            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);
         return dataService.listPage(page);
     }