From 5346533b9f5c2953bd76ec13143a4c3a8feb5128 Mon Sep 17 00:00:00 2001 From: JSYOO Date: Thu, 2 Dec 2021 09:47:47 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9B=B9=EC=B7=A8=EC=95=BD=EC=A0=90=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20,css=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nlib/cmm/crypto/AriaCrypto.java | 9 ++++++--- src/main/java/nlib/cmm/crypto/AriaUtil.java | 8 ++++++-- src/main/java/nlib/restful/service/DataApiVO.java | 6 +++--- src/main/webapp/css/default.css | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/nlib/cmm/crypto/AriaCrypto.java b/src/main/java/nlib/cmm/crypto/AriaCrypto.java index 2f2a3479..21cf4eef 100644 --- a/src/main/java/nlib/cmm/crypto/AriaCrypto.java +++ b/src/main/java/nlib/cmm/crypto/AriaCrypto.java @@ -1,5 +1,8 @@ package nlib.cmm.crypto; +import java.io.UnsupportedEncodingException; +import java.security.InvalidKeyException; + import org.apache.commons.codec.binary.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,16 +50,16 @@ public class AriaCrypto { * * @param value * @return + * @throws InvalidKeyException */ - public static String encode(String value) { + public static String encode(String value){ String ret = null; try { ret = AriaUtil.ariaEncrypt(value); - } catch(Exception e) { + } catch(UnsupportedEncodingException | InvalidKeyException e) { log.error("ERROR at AriaCrypto.encode : " + e.toString()); - e.printStackTrace(); ret = null; } diff --git a/src/main/java/nlib/cmm/crypto/AriaUtil.java b/src/main/java/nlib/cmm/crypto/AriaUtil.java index 01783094..85948455 100644 --- a/src/main/java/nlib/cmm/crypto/AriaUtil.java +++ b/src/main/java/nlib/cmm/crypto/AriaUtil.java @@ -12,10 +12,14 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.security.InvalidKeyException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import nlib.cmm.service.NlibProperty; public class AriaUtil { + private static final Logger log = LoggerFactory.getLogger(AriaUtil.class); public static final String PRIVATE_KEY = NlibProperty.getProperty("crypto.aria.defaultKey"); public static String ariaEncrypt(String str, String privateKey) @@ -327,9 +331,9 @@ public class AriaUtil { } }catch(NumberFormatException e){ - // + log.error("ERROR at AriaCrypto.hexToByteArray : " + e.toString()); }catch(Exception e) { - // + log.error("ERROR at AriaCrypto.hexToByteArray : " + e.toString()); } diff --git a/src/main/java/nlib/restful/service/DataApiVO.java b/src/main/java/nlib/restful/service/DataApiVO.java index 8b0d8c02..f69763cc 100644 --- a/src/main/java/nlib/restful/service/DataApiVO.java +++ b/src/main/java/nlib/restful/service/DataApiVO.java @@ -198,7 +198,7 @@ public class DataApiVO { int pageLastIndex = 0; try { pageLastIndex = Integer.parseInt(getInfoItem(XML_EL_NAME_PAGE_LAST_INDEX, "0")); - } catch(Exception e) { + } catch(NumberFormatException e) { log.error("getPageLastIndex > " + e.toString()); return 0; } @@ -214,7 +214,7 @@ public class DataApiVO { int pageSize = 0; try { pageSize = Integer.parseInt(getInfoItem(XML_EL_NAME_PAGE_SIZE, "0")); - } catch(Exception e) { + } catch(NumberFormatException e) { log.error("getPageSize > " + e.toString()); return 0; } @@ -230,7 +230,7 @@ public class DataApiVO { int recordTotCount = 0; try { recordTotCount = Integer.parseInt(getInfoItem(XML_EL_NAME_RECORD_TOT_COUNT, "0")); - } catch(Exception e) { + } catch(NumberFormatException e) { log.error("getRecordTotCount > " + e.toString()); return 0; } diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index df12852f..1d778689 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -1795,7 +1795,7 @@ transform: rotate(45deg); .pop-change .inner .change p.text {font-size:12px;text-align: left;margin:10px 0px 30px;} .pop-change .inner .change p #passwdMatch {width:auto;text-align:left;font-size:12px;display: inline-block;margin:0px 0px 0px 0px;vertical-align: middle;color:#3f8f4a;} .pop-change .inner .change p #passwdMatch-chk {display: inline-block;width:15px;height:15px;position: absolute;top:2px;right:0px;background: url(/images/icon/icon-checked-tab.png) no-repeat center;background-size: 15px;z-index: 99;} -.pop-change .inner .change p #passwdMatch.fail {color:red;} +.pop-change .inner .change p #passwdNotMatch.fail {color:red;} .pop-change .inner .btn {width:70%;padding:20px 15% 40px;line-height: normal} .pop-change .inner .btn-box .btn {width:auto;padding:10px 25px;} .pop-change .inner .btn-box .btn.btn-color {width:170px;}