From e37daba55ccfffcabf916bbcf261db3f7a2dd69e Mon Sep 17 00:00:00 2001 From: keymasroy Date: Mon, 19 Jul 2021 20:34:42 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=83=98=ED=94=8C=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/root/bo/build.gradle | 2 +- .../bo/src/main/resources/application.yml | 4 +- back/root/cmm/build.gradle | 2 +- back/root/fo/build.gradle | 2 +- front/.vscode/nuxt-bo.code-snippets | 11 +-- .../bo/client/assets/font/fontagon-icons.css | 6 +- .../bo/client/assets/font/fontagon-icons.eot | Bin 2128 -> 2128 bytes .../bo/client/assets/font/fontagon-icons.less | 6 +- .../bo/client/assets/font/fontagon-icons.sass | 6 +- .../bo/client/assets/font/fontagon-icons.styl | 6 +- .../bo/client/assets/font/fontagon-icons.ttf | Bin 1936 -> 1936 bytes .../bo/client/assets/font/fontagon-icons.woff | Bin 1204 -> 1204 bytes .../client/assets/font/fontagon-icons.woff2 | Bin 824 -> 816 bytes ...bo-component.ts => sample-bo-component.ts} | 4 +- front/bo/package.json | 6 +- front/cmm/package.json | 2 +- front/fo/package.json | 4 +- front/yarn.lock | 82 +++++++++--------- 18 files changed, 68 insertions(+), 75 deletions(-) rename front/bo/client/components/{custom-bo-component.ts => sample-bo-component.ts} (64%) diff --git a/back/root/bo/build.gradle b/back/root/bo/build.gradle index cb2719e..a3246aa 100644 --- a/back/root/bo/build.gradle +++ b/back/root/bo/build.gradle @@ -7,7 +7,7 @@ repositories { dependencies { - compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-bo:2.0.14.RELEASE' + compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-bo:2.0.15.RELEASE' compile project(":cmm") } diff --git a/back/root/bo/src/main/resources/application.yml b/back/root/bo/src/main/resources/application.yml index 10de979..7a9af5a 100644 --- a/back/root/bo/src/main/resources/application.yml +++ b/back/root/bo/src/main/resources/application.yml @@ -41,13 +41,11 @@ ustra: procedure-manager: enabled: true datasource: - default-datasource-name: rds2 + default-datasource-name: rds1 datasources: rds1: url: jdbc:log4jdbc:sqlserver://framework-sqlserver.c0uiyan5ae24.ap-northeast-2.rds.amazonaws.com:1433;databaseName=USTRA_FW_SPL driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy -# username: gsitm_si_ustra_fw_spl_user -# password: itm@6700 username: ENC(p6rIPoShJklFLPxHKNJYFLooNCd2xnkayNZ2f+GexyA17qEMS77u8g==) password: ENC(ohS/a1/Q/lKriwUq3rqJqht76fQ0Bnge) rds2: diff --git a/back/root/cmm/build.gradle b/back/root/cmm/build.gradle index 6c214e3..c8f46aa 100644 --- a/back/root/cmm/build.gradle +++ b/back/root/cmm/build.gradle @@ -7,7 +7,7 @@ repositories { dependencies { - compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.14.RELEASE' + compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.15.RELEASE' } diff --git a/back/root/fo/build.gradle b/back/root/fo/build.gradle index eb0aaf0..faa6d94 100644 --- a/back/root/fo/build.gradle +++ b/back/root/fo/build.gradle @@ -7,7 +7,7 @@ repositories { dependencies { - compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.14.RELEASE' + compile 'com.gsitm.ustra.java.starter:ustra-starter-vue-front:2.0.15.RELEASE' compile project(":cmm") } diff --git a/front/.vscode/nuxt-bo.code-snippets b/front/.vscode/nuxt-bo.code-snippets index af2a962..ba8ddcb 100644 --- a/front/.vscode/nuxt-bo.code-snippets +++ b/front/.vscode/nuxt-bo.code-snippets @@ -8,7 +8,7 @@ "", "