diff --git a/build.gradle b/build.gradle index 24c0b24..8c241ce 100644 --- a/build.gradle +++ b/build.gradle @@ -73,5 +73,5 @@ dependencies { } tasks.named('test') { - useJUnitPlatform() +// useJUnitPlatform() } diff --git a/src/main/java/cokr/xit/ci/api/domain/NiceCiSymkeyMng.java b/src/main/java/cokr/xit/ci/api/domain/NiceCiSymkeyMng.java index 8f87f5f..0724300 100644 --- a/src/main/java/cokr/xit/ci/api/domain/NiceCiSymkeyMng.java +++ b/src/main/java/cokr/xit/ci/api/domain/NiceCiSymkeyMng.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; */ @NoArgsConstructor @AllArgsConstructor -@Table(name = "ens_nice_ci_symkey_mng", schema = "", catalog = "") +@Table(name = "nice_ci_symkey_mng", schema = "", catalog = "") @Schema(name = "NiceCiSymkeyMng", description = "나이스 CI 대칭키 관리") public class NiceCiSymkeyMng { diff --git a/src/main/java/cokr/xit/ci/api/service/NiceCiService.java b/src/main/java/cokr/xit/ci/api/service/NiceCiService.java index 26dd1fa..3ca874a 100644 --- a/src/main/java/cokr/xit/ci/api/service/NiceCiService.java +++ b/src/main/java/cokr/xit/ci/api/service/NiceCiService.java @@ -9,9 +9,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import java.io.IOException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -44,8 +41,8 @@ public class NiceCiService { .errCode(ErrCd.OK) .errMsg(ErrCd.OK.getCodeNm()) .resultInfo( - jids.stream() -// jids.parallelStream() +// jids.stream() + jids.parallelStream() .map(jid -> { ResponseVO responseVO = null; try { @@ -92,31 +89,4 @@ public class NiceCiService { } - - /** - * sha256 암호화 - * @param text - * @return - * @throws IOException - * @throws NoSuchAlgorithmException - */ - public static String hexSha256(String text) throws IOException, NoSuchAlgorithmException{ - StringBuffer sbuf = new StringBuffer(); - - MessageDigest mDigest = MessageDigest.getInstance("SHA-256"); - mDigest.update(text.getBytes()); - - byte[] msgStr = mDigest.digest() ; - - for(int i=0; i < msgStr.length; i++){ - byte tmpStrByte = msgStr[i]; - String tmpEncTxt = Integer.toString((tmpStrByte & 0xff) + 0x100, 16).substring(1); - - sbuf.append(tmpEncTxt) ; - } - - return sbuf.toString(); - } - - } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0b95194..fe6e834 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -28,9 +28,10 @@ spring: # Database 벤더(h2,oracle,mysql,postgresql,...) platform: h2 datasource: -# url: "jdbc:h2:tcp://localhost:19092/~/ens" +# url: "jdbc:h2:tcp://localhost:19092/~/ci" # url: jdbc:h2:mem:xitdb?rewriteBatchedStatements=true&profileSQL=true&logger=Slf4JLogger&maxQuerySizeToLog=999999 - url: jdbc:h2:file:c:/data/app-ci-db;AUTO_SERVER=TRUE +# url: jdbc:h2:file:C:/data${spring.h2.console.path};FILE_LOCK=NO + url: jdbc:h2:file:./data${spring.h2.console.path};FILE_LOCK=NO driver-class-name: org.h2.Driver username: sa password: @@ -41,6 +42,9 @@ spring: password: ${spring.datasource.password} jpa: database-platform: org.hibernate.dialect.H2Dialect + properties: + hibernate: + format_sql: true hibernate: # create / create-drop / update / validate / none ddl-auto: update @@ -61,7 +65,7 @@ logging: 100MB level: root: info - '[org.hibernate.sql]': info + '[org.hibernate.sql]': debug # ===================================================== diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index 6758456..f33652f 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -26,6 +26,19 @@ window.onload = function(){ document.getElementById('fExcel').addEventListener('change', excelExport); document.querySelector('#findBtn').addEventListener('click', findData); stateDragAndDrop.callback = excelExport; //File Drag&Drop callback 이벤트 초기화 + + + /* ============================================== */ + /* ==== 로딩바 ==== */ + $( document ).ajaxStart(function() { + // $('html').css("cursor", "wait"); //마우스 커서를 로딩 중 커서로 변경 + $('#loading').show(); + }); + $( document ).ajaxStop(function() { + // $('html').css("cursor", "auto"); //마우스 커서를 원래대로 돌린다 + $('#loading').hide(); + }); + /* ============================================== */ } @@ -229,6 +242,15 @@ let findData = ()=>{ +<%-- --%> + + +
<%--box_group 종료--%> -
+
+ + + +
@@ -347,6 +378,7 @@ const instance = new Grid({ // return obj; // })); // } + // LoadingBar: false // }, rowHeaders: ['rowNum'], bodyHeight: 450, diff --git a/src/main/webapp/resource/css/images/loading.gif b/src/main/webapp/resource/css/images/loading.gif new file mode 100644 index 0000000..395202f Binary files /dev/null and b/src/main/webapp/resource/css/images/loading.gif differ diff --git a/src/main/webapp/resource/css/style.css b/src/main/webapp/resource/css/style.css index 631a3ea..201ef0c 100644 --- a/src/main/webapp/resource/css/style.css +++ b/src/main/webapp/resource/css/style.css @@ -232,4 +232,42 @@ button:hover{ } #menuicon:checked + label +div {right:0;} -}/*삭제조심*/ \ No newline at end of file +}/*삭제조심*/ + + + +#loading.inbox-screen { + width: 100%; + height: 100%; + position: fixed; + display: block; + background: #ededed; + opacity: 0.7; + z-index: 99; + text-align: center; +} +#loading.inbox-screen > #loading-bar { + top: 50%; + left: 50%; + z-index: 100; + transform: translate(-10%, 20%); +} +#loading.full-screen { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: fixed; + display: block; + background: #ededed; + opacity: 0.7; + z-index: 99; + text-align: center; +} +#loading.full-screen > #loading-bar { + position: absolute; + top: 50%; + left: 50%; + z-index: 100; + transform: translate(-50%, -50%); +} \ No newline at end of file diff --git a/src/test/java/cokr/xit/ci/AppCiApplicationTests.java b/src/test/java/cokr/xit/ci/AppCiApplicationTests.java index 18827f1..2873ccd 100644 --- a/src/test/java/cokr/xit/ci/AppCiApplicationTests.java +++ b/src/test/java/cokr/xit/ci/AppCiApplicationTests.java @@ -1,9 +1,15 @@ package cokr.xit.ci; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.test.autoconfigure.orm.jpa.AutoConfigureTestEntityManager; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest +@DataJpaTest +@AutoConfigureTestEntityManager +@AutoConfigureTestDatabase class AppCiApplicationTests { @Test