diff --git a/build.gradle b/build.gradle
index 86d76b8..e1b77c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -146,4 +146,15 @@ war {
 	from('src/main/resources/jeus-web-dd.xml') { into 'WEB-INF' }
     from('src/main/resources/weblogic.xml') { into 'WEB-INF' }
 
+}
+
+task printSourceSets {
+    doLast {
+        sourceSets.each { srcSet ->
+            println "SourceSet: ${srcSet.name}"
+            println "  Java srcDirs : ${srcSet.allJava.srcDirs}"
+            println "  Resources    : ${srcSet.resources.srcDirs}"
+            println "  Output dir   : ${srcSet.output.classesDirs.asPath}"
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/eactive/apim/portal/config/PasswordEncoderConfig.java b/src/main/java/com/eactive/apim/portal/config/PasswordEncoderConfig.java
index fc96d69..8e77a31 100644
--- a/src/main/java/com/eactive/apim/portal/config/PasswordEncoderConfig.java
+++ b/src/main/java/com/eactive/apim/portal/config/PasswordEncoderConfig.java
@@ -1,5 +1,6 @@
 package com.eactive.apim.portal.config;
 
+import com.eactive.apim.portal.custom.config.KjbPasswordEncoder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -10,6 +11,7 @@ public class PasswordEncoderConfig {
 
     @Bean
     public PasswordEncoder passwordEncoder() {
-        return new StandardPasswordEncoder();
+//        return new StandardPasswordEncoder();
+        return new KjbPasswordEncoder();
     }
 }
diff --git a/src/main/java/com/eactive/apim/portal/custom/config/KjbPasswordEncoder.java b/src/main/java/com/eactive/apim/portal/custom/config/KjbPasswordEncoder.java
new file mode 100644
index 0000000..1f3bff0
--- /dev/null
+++ b/src/main/java/com/eactive/apim/portal/custom/config/KjbPasswordEncoder.java
@@ -0,0 +1,19 @@
+package com.eactive.apim.portal.custom.config;
+
+import com.eactive.ext.kjb.safedb.SafeDBWrapper;
+import org.springframework.security.crypto.password.PasswordEncoder;
+
+public class KjbPasswordEncoder implements PasswordEncoder {
+    @Override
+    public String encode(CharSequence rawPassword) {
+        SafeDBWrapper safedb = SafeDBWrapper.getInstance();
+        return safedb.encryptPswd(rawPassword.toString());
+    }
+
+    @Override
+    public boolean matches(CharSequence rawPassword, String encodedPassword) {
+        SafeDBWrapper safedb = SafeDBWrapper.getInstance();
+        String encoded = safedb.encryptPswd(rawPassword.toString());
+        return encoded.equals(encodedPassword);
+    }
+}
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index d075bcf..60fdd20 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,11 +1,11 @@
-<configuration>
+<configuration scan="true" scanPeriod="5 seconds">
     <property name="LOG_PATH" value="/Log/App/eapim/${inst.Name:-devSvr00}"/>
-    <property name="LOG_FILE" value="${LOG_PATH}/portal.log"/>
-    <property name="CONSOLE_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %magenta([%thread]) %highlight([%-3level]) %logger{5} - %msg %n" />
+<!--    <property name="CONSOLE_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %magenta([%thread]) %highlight([%-3level]) %logger{5} - %msg %n" />-->
+    <property name="CONSOLE_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %magenta([%thread]) %highlight([%-3level]) %logger - %msg %n" />
 
 
     <appender name="ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE}</file>
+        <file>${LOG_PATH}/portal.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <fileNamePattern>${LOG_PATH}/portal.%d{yyyy-MM-dd}.log</fileNamePattern>
             <maxHistory>7</maxHistory>
@@ -15,12 +15,21 @@
         </encoder>
     </appender>
 
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="HIBERNATE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_PATH}/hibernate.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH}/hibernate.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>7</maxHistory>
+        </rollingPolicy>
         <encoder>
-            <Pattern>${CONSOLE_PATTERN}</Pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
         </encoder>
     </appender>
 
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder><Pattern>${CONSOLE_PATTERN}</Pattern></encoder>
+    </appender>
+
 
 
     <root level="INFO">
@@ -35,16 +44,31 @@
     </springProfile>
 
     <springProfile name="dev,gf63">
-        <logger name="org.springframework" level="WARN" additivity="false"/>
-        <logger name="org.hibernate" level="INFO" additivity="false"/>
-        <logger name="org.apache" level="INFO" additivity="false"/>
-        <logger name="sun.rmi" level="WARN" additivity="false"/>
-        <logger name="javax" level="WARN" additivity="false"/>
-        <logger name="jdk.event.security" level="WARN" additivity="false"/>
+        <logger name="sun.rmi" level="INFO" additivity="false"/>
+
+        <logger name="javax" level="INFO" additivity="false"/>
+
+        <logger name="jdk.event.security" level="INFO" additivity="false"/>
+
         <logger name="com.zaxxer.hikari" level="INFO" additivity="false"/>
-        <logger name="_org.springframework.web" level="INFO" additivity="false"/>
         <logger name="com.atomikos" level="INFO" additivity="false"/>
 
+        <logger name="org.apache" level="INFO" additivity="false"/>
+        <logger name="org.codehaus.groovy.vmplugin.VMPluginFactory" level="INFO" additivity="false"/>
+        <!--        <logger name="org.hibernate" level="INFO" additivity="false"/>-->
+        <logger name="org.thymeleaf.TemplateEngine" level="INFO" additivity="false"/>
+        <logger name="org.springframework" level="INFO" additivity="false"/>
+        <logger name="_org.springframework.web" level="INFO" additivity="false"/>
+
+
+        <logger name="org.hibernate.SQL" level="DEBUG" additivity="false">
+            <appender-ref ref="HIBERNATE_APPENDER" />
+        </logger>
+        <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE" additivity="false">
+            <appender-ref ref="HIBERNATE_APPENDER" />
+        </logger>
+
+
         <root level="DEBUG">
             <appender-ref ref="ROLLING"/>
             <appender-ref ref="CONSOLE"/>