diff --git a/.gitignore b/.gitignore index afbd3b9..17e8cca 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,7 @@ TODO.txt *.zip /src/docs/ /docs/ + + +*.lck +*.log diff --git a/settings.gradle b/settings.gradle index 330c133..43bae24 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,3 +5,7 @@ include 'elink-portal-common' project (':elink-online-core-jpa').projectDir = new File(settingsDir, "../eapim-online/elink-online-core-jpa") project (':elink-portal-common').projectDir = new File(settingsDir, "../elink-portal-common") + + +include 'kjb-safedb' +project (':kjb-safedb').projectDir = new File(settingsDir, "../kjb-safedb") \ No newline at end of file diff --git a/src/main/java/com/eactive/apim/portal/apps/auth/service/AuthNumberGenerator.java b/src/main/java/com/eactive/apim/portal/apps/auth/service/AuthNumberGenerator.java index f7cc450..59c9bca 100644 --- a/src/main/java/com/eactive/apim/portal/apps/auth/service/AuthNumberGenerator.java +++ b/src/main/java/com/eactive/apim/portal/apps/auth/service/AuthNumberGenerator.java @@ -1,30 +1,34 @@ package com.eactive.apim.portal.apps.auth.service; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; +import com.eactive.apim.portal.config.PortalProperties; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; import java.security.SecureRandom; -import java.util.Arrays; @Component +@Slf4j public class AuthNumberGenerator { - private final Environment env; + private final PortalProperties portalProperties; - @Autowired - public AuthNumberGenerator(Environment env) { - this.env = env; + + public AuthNumberGenerator(PortalProperties portalProperties) { + this.portalProperties = portalProperties; } + public String generateAuthNumber() { - if (isDevProfile()) { - return "123456"; + if (StringUtils.hasLength(portalProperties.getAuthVirtualCode())) { + log.info("가상 인증코드 활성화 상태 - {}", portalProperties.getAuthVirtualCode()); + return portalProperties.getAuthVirtualCode(); } + SecureRandom rand = new SecureRandom(); return String.format("%06d", 100000 + rand.nextInt(900000)); } - private boolean isDevProfile() { - return Arrays.asList(env.getActiveProfiles()).contains("dev"); - } +// private boolean isDevProfile() { +// return Arrays.asList(env.getActiveProfiles()).contains("dev"); +// } } diff --git a/src/main/java/com/eactive/apim/portal/config/PortalProperties.java b/src/main/java/com/eactive/apim/portal/config/PortalProperties.java index dc99536..51beca9 100644 --- a/src/main/java/com/eactive/apim/portal/config/PortalProperties.java +++ b/src/main/java/com/eactive/apim/portal/config/PortalProperties.java @@ -23,5 +23,7 @@ public class PortalProperties { private int authTtl = 300; // 인증번호 만료시간, 초단위 + private String authVirtualCode = ""; + private Map> portalSecurity; } 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 index 1f3bff0..2be694d 100644 --- a/src/main/java/com/eactive/apim/portal/custom/config/KjbPasswordEncoder.java +++ b/src/main/java/com/eactive/apim/portal/custom/config/KjbPasswordEncoder.java @@ -1,19 +1,19 @@ package com.eactive.apim.portal.custom.config; -import com.eactive.ext.kjb.safedb.SafeDBWrapper; +import com.eactive.ext.kjb.safedb.KjbSafedbWrapper; 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()); + KjbSafedbWrapper safedb = KjbSafedbWrapper.getInstance(); + return safedb.encryptPassword(rawPassword.toString()); } @Override public boolean matches(CharSequence rawPassword, String encodedPassword) { - SafeDBWrapper safedb = SafeDBWrapper.getInstance(); - String encoded = safedb.encryptPswd(rawPassword.toString()); + KjbSafedbWrapper safedb = KjbSafedbWrapper.getInstance(); + String encoded = safedb.encryptPassword(rawPassword.toString()); return encoded.equals(encodedPassword); } } diff --git a/src/main/resources/application-apipod01.yml b/src/main/resources/application-apipod01.yml deleted file mode 100644 index be77f8d..0000000 --- a/src/main/resources/application-apipod01.yml +++ /dev/null @@ -1,58 +0,0 @@ -spring: - jta: - enabled: true - - - jpa: - properties: - hibernate: - show_sql: true - format_sql: true - use_sql_comments: true - devtools: - restart: - enabled: false - livereload: - enabled: true - thymeleaf: - cache: false - -ems: - datasource: - serverName: 192.168.240.177 - portNumber: 3306 - databaseName: apims - username: apims - password: apims - -# serverName: 172.20.160.59 -# portNumber: 3317 -# databaseName: ndapims -# username: api_app -# password: Tapiapp*17 - -gateway: - datasource: - serverName: 192.168.240.177 - portNumber: 3306 - databaseName: apigw - username: apigw - password: apigw - -# serverName: 172.20.160.59 -# portNumber: 3317 -# databaseName: ndapigw -# username: api_app -# password: Tapiapp*17 - - -proxy: - targets: - stg: http://localhost:10000/monitoring - prod: http://localhost:10000/monitoring - - # stg: http://inter-ndapiap01.k-bank.com:7090/monitoring - # prod: http://inter-ndapiap01.k-bank.com:7090/monitoring - timeout: - connect: 5000 - read: 5000 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index cc482c1..cb8bb91 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -34,6 +34,9 @@ gateway: username: AGWAPP password: AGWAPP123! +portal: + auth-virtual-code: 654321 + proxy: targets: stg: http://localhost:10000/monitoring diff --git a/src/main/resources/application-gf63.yml b/src/main/resources/application-gf63.yml index 2a8eeaf..d1f7b7e 100644 --- a/src/main/resources/application-gf63.yml +++ b/src/main/resources/application-gf63.yml @@ -1,3 +1,5 @@ +server.port: '30200' + spring: jta: enabled: true @@ -33,6 +35,8 @@ gateway: password: AGWAPP123! schema: AGWADM +portal: + auth-virtual-code: 654321 proxy: targets: diff --git a/src/main/resources/application-stage.yml b/src/main/resources/application-stage.yml index 5312d47..62aca9a 100644 --- a/src/main/resources/application-stage.yml +++ b/src/main/resources/application-stage.yml @@ -24,6 +24,9 @@ ems: password: EMSAPP123! schema: EMSADM +portal: + auth-virtual-code: 654321 + gateway: datasource: serverName: 192.168.240.177 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1005670..aa74b84 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -52,6 +52,7 @@ sample-code-path: classpath:/templates/sample_code portal: auth-ttl: 300 + user-approval: true password-expiration-days: 90 diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 60fdd20..5f10942 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -36,14 +36,21 @@ - - + - + + + + + + + + + @@ -69,7 +76,7 @@ - +