diff --git a/src/main/java/com/eactive/ext/kjb/common/KjbProperty.java b/src/main/java/com/eactive/ext/kjb/common/KjbProperty.java index 8e14209..4762ff0 100644 --- a/src/main/java/com/eactive/ext/kjb/common/KjbProperty.java +++ b/src/main/java/com/eactive/ext/kjb/common/KjbProperty.java @@ -115,9 +115,13 @@ public class KjbProperty { @NotEmpty private String ssoAscpUri = "/sso/login.do"; -// @KjbPropertyValue(key = "kjb.sso.domain", defaultValue = "sso.kjbank.com") -// @NotEmpty -// private String ssoDomain = "sso.kjbank.com"; + @KjbPropertyValue(key = "kjb.sso.domain", defaultValue = "sso.kjbank.com") + @NotEmpty + private String ssoDomain = "sso.kjbank.com"; + + @KjbPropertyValue(key = "kjb.sso.domain", defaultValue = "13890") + @Min(1024) @Max(65535) + private int ssoNlsPort = 13890; // // @KjbPropertyValue(key = "kjb.sso.nd_server", defaultValue = "http://sso.kjbank.com:5480") // @NotEmpty diff --git a/src/main/java/com/eactive/ext/kjb/sso/KjbSsoModule.java b/src/main/java/com/eactive/ext/kjb/sso/KjbSsoModule.java index 7d1b6df..1efc4fc 100644 --- a/src/main/java/com/eactive/ext/kjb/sso/KjbSsoModule.java +++ b/src/main/java/com/eactive/ext/kjb/sso/KjbSsoModule.java @@ -32,11 +32,11 @@ public class KjbSsoModule { private final String ascpUrl; /***[SSO CONFIGURATION]**]***********************************************************************/ - private final String NLS_URL = "http://sso.kjbank.com"; - private final String NLS_PORT = "13890"; - private final String NLS_LOGIN_URL = NLS_URL + ":" + NLS_PORT + "/nls3/clientLogin.jsp"; - private final String NLS_LOGOUT_URL= NLS_URL + ":" + NLS_PORT + "/nls3/NCLogout.jsp"; - private final String NLS_ERROR_URL = NLS_URL + ":" + NLS_PORT + "/nls3/error.jsp"; + private final String NLS_URL; + private final String NLS_PORT; + private final String NLS_LOGIN_URL; + private final String NLS_LOGOUT_URL; + private final String NLS_ERROR_URL; /***[SSO ND LIST 운영]**]***********************************************************************/ private final static String ND_URL1 = "http://sso.kjbank.com:5480"; @@ -45,7 +45,7 @@ public class KjbSsoModule { // 인증 타입 (ID/PW 방식 : 1, 인증서 : 3) private final String TOA = "1"; - private final String PROVIDER_DOMAIN = "sso.kjbank.com"; + private final String PROVIDER_DOMAIN; private final String SSO_DOMAIN = ".kjbank.com"; private final String COOKIE_PADDING = "_V42"; @@ -65,12 +65,23 @@ public class KjbSsoModule { context = new NXContext(Collections.singletonList(ND_URL1), timeout); ascpUrl = prop.getUrl() + prop.getSsoAscpUri(); + + NLS_URL = "http://" + prop.getSsoDomain(); + NLS_PORT = String.valueOf(prop.getSsoNlsPort()); + NLS_LOGIN_URL = NLS_URL + ":" + NLS_PORT + "/nls3/clientLogin.jsp"; + NLS_LOGOUT_URL = NLS_URL + ":" + NLS_PORT + "/nls3/NCLogout.jsp"; + NLS_ERROR_URL = NLS_URL + ":" + NLS_PORT + "/nls3/error.jsp"; + + PROVIDER_DOMAIN = prop.getSsoDomain(); this.providerList = new Vector<>(); providerList.add(PROVIDER_DOMAIN); CookieManager.setEncStatus(true); SECode.setCookiePadding(COOKIE_PADDING); + + + log.debug("KjbProperty : {}", prop.toString()); } @@ -222,7 +233,7 @@ public class KjbSsoModule { String userInfo = ""; - try{ + try { Properties propt = getUserInfos(userid); userInfo = propt.getProperty(key); } catch (Exception e) { diff --git a/src/main/java/com/eactive/ext/kjb/utils/KjbPropertyUtil.java b/src/main/java/com/eactive/ext/kjb/utils/KjbPropertyUtil.java index 39f836a..4fb4359 100644 --- a/src/main/java/com/eactive/ext/kjb/utils/KjbPropertyUtil.java +++ b/src/main/java/com/eactive/ext/kjb/utils/KjbPropertyUtil.java @@ -11,11 +11,16 @@ public class KjbPropertyUtil { Class clazz = KjbProperty.class; StringBuilder sb = new StringBuilder(); + StringBuilder sbDelete = new StringBuilder(); for (Field field : clazz.getDeclaredFields()) { KjbPropertyValue anno = field.getAnnotation(KjbPropertyValue.class); if (anno != null) { + sbDelete.append("DELETE FROM EMSADM.TSEAIRM24 WHERE PRPTYGROUPNAME = 'Monitoring' AND PRPTYNAME = '"); + sbDelete.append(anno.key()); + sbDelete.append("';\n"); + sb.append("insert into EMSADM.TSEAIRM24 (PRPTYGROUPNAME, PRPTYNAME, PRPTY2VAL) values ('Monitoring', "); String key = anno.key(); @@ -27,6 +32,9 @@ public class KjbPropertyUtil { } System.out.println(sb); + System.out.println(); + System.out.println(); + System.out.println(sbDelete); } private static String addQuote(String str) {