kjb-safedb 적용 및 개인사용자 가입 절차 문제 수정

WebContent/WEB-INF/applicationContext.xml

@@ -54,6 +54,8 @@
 <!--		  class="org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder" />-->
 	<bean id="passwordEncoder"
 		  class="org.springframework.security.crypto.password.StandardPasswordEncoder" />
+	<bean id="kjbSafedbPasswordEncoder"
+		  class="com.eactive.eai.custom.kjb.common.spring.KjbSafedbPasswordEncoder" />
 
   <import resource="applicationContext-datasource-${eai.datasource.type}.xml"/>
   <import resource="applicationContext-jdbc-${eai.datasource.type}.xml"/>

src/main/java/com/eactive/eai/custom/kjb/common/spring/KjbSafedbPasswordEncoder.java

@@ -0,0 +1,21 @@
+package com.eactive.eai.custom.kjb.common.spring;
+
+import com.eactive.ext.kjb.safedb.KjbSafedbWrapper;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+
+public class KjbSafedbPasswordEncoder implements PasswordEncoder {
+    @Override
+    public String encode(CharSequence rawPassword) {
+        KjbSafedbWrapper safedb = KjbSafedbWrapper.getInstance();
+        return safedb.encryptPassword(rawPassword.toString());
+    }
+
+    @Override
+    public boolean matches(CharSequence rawPassword, String encodedPassword) {
+        KjbSafedbWrapper safedb = KjbSafedbWrapper.getInstance();
+        String encoded = safedb.encryptPassword(rawPassword.toString());
+        return encoded.equals(encodedPassword);
+    }
+
+}

src/main/java/com/eactive/eai/rms/onl/apim/portaluser/PortalUserManService.java

@@ -41,9 +41,11 @@ public class PortalUserManService extends BaseService {
 	private final PortalOrgService portalOrgService;
 	private final FileService fileService;
 	private final PortalOrgManService portalOrgManService;
-	private final PasswordEncoder passwordEncoder;
+//	private final PasswordEncoder passwordEncoder;
+	private final PasswordEncoder kjbSafedbPasswordEncoder;
 	private final PortalUserTermsService portalUserTermsService;
 
+
 	public Page<PortalUserUI> selectList(Pageable pageable, PortalUserUISearch portalUserUISearch) {
 		Page<PortalUser> portalUser = portalUserService.findAll(pageable, portalUserUISearch);
 		return portalUser.map(entity -> {
@@ -122,7 +124,7 @@ public class PortalUserManService extends BaseService {
 		}
 
 		PortalUser portalUser = portalUserUIMapper.toEntity(portalUserUI);
-		portalUser.setPasswordHash(passwordEncoder.encode("!" + portalUserUI.getLoginId()));
+		portalUser.setPasswordHash(kjbSafedbPasswordEncoder.encode("!" + portalUserUI.getLoginId()));
 		portalUser.setLoginFailureCount(0);
 		portalUser.setAccountLockYn("N");
 		portalUser.setEmailAddr(portalUserUI.getLoginId());