From 0a9086312169ec73430af42d9b31f505fca697d2 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Mon, 8 Sep 2025 18:01:41 +0900 Subject: [PATCH 01/17] =?UTF-8?q?-=20context.xml=20=EB=B0=B1=EC=97=85=20?= =?UTF-8?q?=EB=B0=8F=20=EC=82=AD=EC=A0=9C=20-=20mysql=20->=20oracle=20?= =?UTF-8?q?=EB=B3=80=ED=99=98=20=EC=9E=91=EC=97=85=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91=20-=20=EA=B0=9C=EB=B0=9C=EC=9A=A9=20logback-dev.xml?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20-=20ms949=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{context.xml => context-kbank-mysql.xml} | 0 WebContent/META-INF/context-kjb-mysql.xml | 22 +++++++++++ .../applicationContext-datasource-DEV.xml | 20 +++++----- WebContent/WEB-INF/applicationContext-jpa.xml | 2 +- build.gradle | 6 +-- src/main/resources/logback-dev.xml | 37 +++++++------------ src/main/resources/logback.xml | 24 +----------- 7 files changed, 51 insertions(+), 60 deletions(-) rename WebContent/META-INF/{context.xml => context-kbank-mysql.xml} (100%) create mode 100644 WebContent/META-INF/context-kjb-mysql.xml diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context-kbank-mysql.xml similarity index 100% rename from WebContent/META-INF/context.xml rename to WebContent/META-INF/context-kbank-mysql.xml diff --git a/WebContent/META-INF/context-kjb-mysql.xml b/WebContent/META-INF/context-kjb-mysql.xml new file mode 100644 index 0000000..04cbfb2 --- /dev/null +++ b/WebContent/META-INF/context-kjb-mysql.xml @@ -0,0 +1,22 @@ + + + + + + + + + + \ No newline at end of file diff --git a/WebContent/WEB-INF/applicationContext-datasource-DEV.xml b/WebContent/WEB-INF/applicationContext-datasource-DEV.xml index 45b8991..5f0bf5c 100644 --- a/WebContent/WEB-INF/applicationContext-datasource-DEV.xml +++ b/WebContent/WEB-INF/applicationContext-datasource-DEV.xml @@ -24,15 +24,15 @@ class="com.eactive.eai.rms.common.datasource.DataSourceType" p:name="APIGW" p:text="APIGW" - p:schema="ndapigw" + p:schema="AGWADM" p:dynamic="true" p:online="true" - p:jndiName="NDAPIGW_APP_NXA" + p:jndiName="jdbc/dsDOBP_AGW" p:render="ONL,COM" /> - + /> --> - + /> --> - + /> --> diff --git a/WebContent/WEB-INF/applicationContext-jpa.xml b/WebContent/WEB-INF/applicationContext-jpa.xml index 753b9a0..287b55e 100644 --- a/WebContent/WEB-INF/applicationContext-jpa.xml +++ b/WebContent/WEB-INF/applicationContext-jpa.xml @@ -93,7 +93,7 @@ none true true - ${hibernate.dialect:org.hibernate.dialect.PostgreSQL10Dialect} + ${hibernate.dialect:org.hibernate.dialect.Oracle12cDialect} 100 100 diff --git a/build.gradle b/build.gradle index 9a73829..2405bbe 100644 --- a/build.gradle +++ b/build.gradle @@ -16,17 +16,17 @@ def quartzVersion = "2.2.1" def queryDslVersion = "5.0.0" def hibernateVersion = "5.6.15.Final" -def nexusUrl = "https://nexus.eactive.synology.me:8090" +/*def nexusUrl = "https://nexus.eactive.synology.me:8090"*/ //def useOnJboss = false def generatedJavaDir = "$buildDir/generated/java" -repositories { +/*repositories { maven { url "${nexusUrl}/repository/maven-public/" allowInsecureProtocol = true } -} +}*/ project.webAppDirName = 'WebContent' diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml index 520fcbe..a41f15a 100644 --- a/src/main/resources/logback-dev.xml +++ b/src/main/resources/logback-dev.xml @@ -2,8 +2,16 @@ - + + + + + + + %d{yyyy-MM-dd HH:mm:ss} %-5level [%thread] %logger{36} - %msg%n + + @@ -15,10 +23,6 @@ 10 - - MS949 - ${LOG_PATTERN} - - - MS949 - ${LOG_PATTERN} - @@ -45,10 +45,6 @@ 10 - - MS949 - -%msg%n - @@ -60,10 +56,6 @@ 10 - - MS949 - ${LOG_PATTERN} - @@ -74,19 +66,15 @@ ${LOG_HOME}/${PREFIX}_dynamic.log-%d{yyyy-MM-dd} 10 - - - MS949 - ${LOG_PATTERN} - + - - + + @@ -152,5 +140,6 @@ + \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index d8e7a3e..3857c3a 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - + @@ -16,10 +16,6 @@ 10 - - MS949 - ${LOG_PATTERN} - - - MS949 - ${LOG_PATTERN} - @@ -46,10 +38,6 @@ 10 - - MS949 - -%msg%n - @@ -61,10 +49,6 @@ 10 - - MS949 - ${LOG_PATTERN} - @@ -75,11 +59,7 @@ ${LOG_HOME}/${PREFIX}_dynamic.log-%d{yyyy-MM-dd} 10 - - - MS949 - ${LOG_PATTERN} - + From aab57cdae59a74029dc612a39e0268b8936db97f Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Sep 2025 16:05:56 +0900 Subject: [PATCH 02/17] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EA=B2=BD=EB=A1=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 ++++- src/main/resources/.gitignore | 1 + src/main/resources/logback-dev.xml | 7 ++++--- src/main/resources/logback.xml | 6 +++--- 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/.gitignore diff --git a/.gitignore b/.gitignore index b520596..546de91 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ WebContent/generated/ bin/ tmp/ *.iml +*.ipr *.tmp *.bak *.swp @@ -236,4 +237,6 @@ gradle-app.setting *.patch Doc/ -docs \ No newline at end of file +docs +build-gf63.sh +gradle-gf63.sh \ No newline at end of file diff --git a/src/main/resources/.gitignore b/src/main/resources/.gitignore new file mode 100644 index 0000000..bf62d4f --- /dev/null +++ b/src/main/resources/.gitignore @@ -0,0 +1 @@ +/logback-rinjae.xml diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml index 520fcbe..e240849 100644 --- a/src/main/resources/logback-dev.xml +++ b/src/main/resources/logback-dev.xml @@ -1,9 +1,10 @@ - - - + + + + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index d8e7a3e..6bb28a9 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -1,9 +1,9 @@ - - - + + + Date: Wed, 10 Sep 2025 17:13:22 +0900 Subject: [PATCH 03/17] =?UTF-8?q?jndi=20=EB=AA=85=EC=B9=AD=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applicationContext-datasource-DEV.xml | 4 ++-- .../applicationContext-datasource-PROD.xml | 16 ++++++++-------- .../applicationContext-datasource-STG.xml | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/WebContent/WEB-INF/applicationContext-datasource-DEV.xml b/WebContent/WEB-INF/applicationContext-datasource-DEV.xml index 5f0bf5c..2c45aca 100644 --- a/WebContent/WEB-INF/applicationContext-datasource-DEV.xml +++ b/WebContent/WEB-INF/applicationContext-datasource-DEV.xml @@ -27,7 +27,7 @@ p:schema="AGWADM" p:dynamic="true" p:online="true" - p:jndiName="jdbc/dsDOBP_AGW" + p:jndiName="jdbc/dsOBP_AGW" p:render="ONL,COM" /> @@ -52,7 +52,7 @@ p:schema="EMSADM" p:dynamic="false" p:online="false" - p:jndiName="jdbc/dsDOBP_EMS" + p:jndiName="jdbc/dsOBP_EMS" /> diff --git a/WebContent/WEB-INF/applicationContext-datasource-PROD.xml b/WebContent/WEB-INF/applicationContext-datasource-PROD.xml index 09da4be..ffbf4f8 100644 --- a/WebContent/WEB-INF/applicationContext-datasource-PROD.xml +++ b/WebContent/WEB-INF/applicationContext-datasource-PROD.xml @@ -27,12 +27,12 @@ p:schema="apigw" p:dynamic="true" p:online="true" - p:jndiName="APIGW_APP_NXA" + p:jndiName="jdbc/dsOBP_AGW" p:render="ONL,COM" /> - + /> --> - + /> --> - + /> --> diff --git a/WebContent/WEB-INF/applicationContext-datasource-STG.xml b/WebContent/WEB-INF/applicationContext-datasource-STG.xml index 2aa52aa..6d39331 100644 --- a/WebContent/WEB-INF/applicationContext-datasource-STG.xml +++ b/WebContent/WEB-INF/applicationContext-datasource-STG.xml @@ -27,12 +27,12 @@ p:schema="dapigw" p:dynamic="true" p:online="true" - p:jndiName="DAPIGW_APP_NXA" + p:jndiName="jdbc/dsOBP_AGW" p:render="ONL,COM" /> - + /> --> - + /> --> - + /> --> From a437b14f6185b19d6ff064ebb8a9304fe0d20c07 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Wed, 10 Sep 2025 22:10:12 +0900 Subject: [PATCH 04/17] =?UTF-8?q?=EB=B9=8C=EB=93=9C=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 2405bbe..598699a 100644 --- a/build.gradle +++ b/build.gradle @@ -49,6 +49,7 @@ compileJava { war { rootSpec.exclude '**/persistence.xml' exclude '**/context.xml' + archiveFileName = "eapim-admin.war" } tasks.withType(JavaCompile) { From a3dae6e8c76da63c149338e76435cfb73f5f1ac2 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Thu, 11 Sep 2025 09:55:55 +0900 Subject: [PATCH 05/17] =?UTF-8?q?schema=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/applicationContext-datasource-STG.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WebContent/WEB-INF/applicationContext-datasource-STG.xml b/WebContent/WEB-INF/applicationContext-datasource-STG.xml index 6d39331..76116e5 100644 --- a/WebContent/WEB-INF/applicationContext-datasource-STG.xml +++ b/WebContent/WEB-INF/applicationContext-datasource-STG.xml @@ -24,7 +24,7 @@ class="com.eactive.eai.rms.common.datasource.DataSourceType" p:name="APIGW" p:text="APIGW" - p:schema="dapigw" + p:schema="AGWADM" p:dynamic="true" p:online="true" p:jndiName="jdbc/dsOBP_AGW" @@ -50,7 +50,7 @@ class="com.eactive.eai.rms.common.datasource.DataSourceType" p:name="MONITORING" p:text="MONITORING" - p:schema="dapims" + p:schema="EMSADM" p:dynamic="false" p:online="false" p:jndiName="jdbc/dsOBP_EMS" From eaefdc2fa1a8f68216b4fbb7b4be1e8e9c0aa96b Mon Sep 17 00:00:00 2001 From: Rinjae Date: Thu, 11 Sep 2025 10:13:47 +0900 Subject: [PATCH 06/17] =?UTF-8?q?weblogic=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/META-INF/persistence.xml | 30 ++++ .../WEB-INF/properties/env.D.properties | 2 +- .../WEB-INF/properties/env.P.properties | 4 +- .../WEB-INF/properties/env.T.properties | 6 +- WebContent/WEB-INF/web.xml | 2 +- WebContent/WEB-INF/weblogic-web.xml | 146 ++++++++++++++++++ build.gradle | 10 ++ 7 files changed, 193 insertions(+), 7 deletions(-) create mode 100644 WebContent/META-INF/persistence.xml create mode 100644 WebContent/WEB-INF/weblogic-web.xml diff --git a/WebContent/META-INF/persistence.xml b/WebContent/META-INF/persistence.xml new file mode 100644 index 0000000..2668051 --- /dev/null +++ b/WebContent/META-INF/persistence.xml @@ -0,0 +1,30 @@ + + org.hibernate.jpa.HibernatePersistenceProvider + jdbc/dsOBP_EMS + + + + + + com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusiness + + com.eactive.eai.data.entity.onl.unifbwk.UnifBwkTp + false + + + org.hibernate.jpa.HibernatePersistenceProvider + jdbc/dsOBP_EMS + + + + + + com.eactive.eai.rms.data.entity.onl.bzwkdstcd.UserBusiness + + com.eactive.eai.data.entity.onl.unifbwk.UnifBwkTp + false + \ No newline at end of file diff --git a/WebContent/WEB-INF/properties/env.D.properties b/WebContent/WEB-INF/properties/env.D.properties index 2e38be4..0445e14 100644 --- a/WebContent/WEB-INF/properties/env.D.properties +++ b/WebContent/WEB-INF/properties/env.D.properties @@ -10,7 +10,7 @@ hibernate.dialect=org.hibernate.dialect.MySQL5Dialect # Priority of the was -D option inst.Name=apimsSvr11 -eai.tableowner=apims +eai.tableowner=EMSADM # P/T/D/S eai.systemmode=D eai.drmode=N diff --git a/WebContent/WEB-INF/properties/env.P.properties b/WebContent/WEB-INF/properties/env.P.properties index 18a7407..6702788 100644 --- a/WebContent/WEB-INF/properties/env.P.properties +++ b/WebContent/WEB-INF/properties/env.P.properties @@ -9,8 +9,8 @@ db.vendor=mariadb hibernate.dialect=org.hibernate.dialect.MySQL5Dialect # Priority of the was -D option -inst.Name=apimsSvr11 -eai.tableowner=apims +inst.Name=admSvr11 +eai.tableowner=EMSADM # P/T/D/S eai.systemmode=D eai.drmode=N diff --git a/WebContent/WEB-INF/properties/env.T.properties b/WebContent/WEB-INF/properties/env.T.properties index 78c3625..4eef0bc 100644 --- a/WebContent/WEB-INF/properties/env.T.properties +++ b/WebContent/WEB-INF/properties/env.T.properties @@ -9,10 +9,10 @@ db.vendor=mariadb hibernate.dialect=org.hibernate.dialect.MySQL5Dialect # Priority of the was -D option -inst.Name=apimsSvr11 -eai.tableowner=apims +inst.Name=admSvr11 +eai.tableowner=EMSADM # P/T/D/S -eai.systemmode=D +eai.systemmode=T eai.drmode=N # black / blue / green / orange / yellow theme.color=green diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 5e2ea54..2342bdd 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -63,7 +63,7 @@ --> - + org.springframework.web.context.ContextLoaderListener diff --git a/WebContent/WEB-INF/weblogic-web.xml b/WebContent/WEB-INF/weblogic-web.xml new file mode 100644 index 0000000..18e2775 --- /dev/null +++ b/WebContent/WEB-INF/weblogic-web.xml @@ -0,0 +1,146 @@ + + + monitoring + + contextConfigLocation + /WEB-INF/applicationContext.xml + + + + CrossScriptingFilter + com.eactive.eai.rms.common.filter.CrossScriptingFilter + + + CrossScriptingFilter + /* + + + + encodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + encodingFilterEUCKR + org.springframework.web.filter.CharacterEncodingFilter + + encoding + utf-8 + + + forceEncoding + true + + + + encodingFilterEUCKR + *.excel + + + encodingFilter + *.file + + + + + + default + weblogic.servlet.FileServlet + + + default + /static/* + + + + + org.springframework.web.context.ContextLoaderListener + + + + + springapp + + org.springframework.web.servlet.DispatcherServlet + + 1 + + 10485760 + 15728640 + 1048576 + + + + + springapp + *.do + + + springapp + *.json + + + springapp + *.view + + + springapp + *.excel + + + springapp + *.file + + + + /emergency.jsp + + + + + + + 404 + /common/errors/error404.jsp + + + + 500 + /common/errors/error500.jsp + + + + + http://java.sun.com/jsp/jstl/core + /WEB-INF/tld/c.tld + + + http://java.sun.com/jsp/jstl/functions + /WEB-INF/tld/fn.tld + + + + + 120 + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 598699a..092d219 100644 --- a/build.gradle +++ b/build.gradle @@ -47,6 +47,16 @@ compileJava { } war { + def profile = project.findProperty("profile") ?: "weblogic" + if (profile == "weblogic") { + // weblogic-web.xml 파일을 web.xml 이름으로 넣기 + from("WEB-INF/weblogic-web.xml") { + into "WEB-INF" + rename { "web.xml" } + } + } + + rootSpec.exclude '**/persistence.xml' exclude '**/context.xml' archiveFileName = "eapim-admin.war" From df2939636b844de50cd44fe57feb3b5a788fa782 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Thu, 11 Sep 2025 10:17:30 +0900 Subject: [PATCH 07/17] =?UTF-8?q?weblogic=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 092d219..c84a968 100644 --- a/build.gradle +++ b/build.gradle @@ -48,12 +48,11 @@ compileJava { war { def profile = project.findProperty("profile") ?: "weblogic" + if (profile == "weblogic") { - // weblogic-web.xml 파일을 web.xml 이름으로 넣기 - from("WEB-INF/weblogic-web.xml") { - into "WEB-INF" - rename { "web.xml" } - } + webXml = file("WEB-INF/weblogic-web.xml") + } else { + webXml = file("WEB-INF/web.xml") } From 89a9a036415a2dd2dfd3d36f23ead7102f6f4228 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Thu, 11 Sep 2025 10:18:41 +0900 Subject: [PATCH 08/17] =?UTF-8?q?weblogic=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index c84a968..953055d 100644 --- a/build.gradle +++ b/build.gradle @@ -50,9 +50,9 @@ war { def profile = project.findProperty("profile") ?: "weblogic" if (profile == "weblogic") { - webXml = file("WEB-INF/weblogic-web.xml") + webXml = file("WebContent/WEB-INF/weblogic-web.xml") } else { - webXml = file("WEB-INF/web.xml") + webXml = file("WebContent/WEB-INF/web.xml") } From e26a9714c3154141a6f41afdd67460507f9f0e46 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Thu, 11 Sep 2025 10:20:19 +0900 Subject: [PATCH 09/17] =?UTF-8?q?weblogic=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/{web.xml => web-default.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename WebContent/WEB-INF/{web.xml => web-default.xml} (100%) diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web-default.xml similarity index 100% rename from WebContent/WEB-INF/web.xml rename to WebContent/WEB-INF/web-default.xml From 80d2436cd38dbcd2fe0676f215f674e358a8df6a Mon Sep 17 00:00:00 2001 From: Rinjae Date: Thu, 11 Sep 2025 10:21:30 +0900 Subject: [PATCH 10/17] =?UTF-8?q?weblogic=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 953055d..b8e9034 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,7 @@ war { } - rootSpec.exclude '**/persistence.xml' + // rootSpec.exclude '**/persistence.xml' exclude '**/context.xml' archiveFileName = "eapim-admin.war" } From 3588405721809607170c39147423a0b4e247db18 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Thu, 11 Sep 2025 10:23:54 +0900 Subject: [PATCH 11/17] =?UTF-8?q?weblogic=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/weblogic.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/WebContent/WEB-INF/weblogic.xml b/WebContent/WEB-INF/weblogic.xml index c5310e1..3e2e27d 100644 --- a/WebContent/WEB-INF/weblogic.xml +++ b/WebContent/WEB-INF/weblogic.xml @@ -10,4 +10,14 @@ JSESSIONID_EMS replicated_if_clustered + + + +org.slf4j.* +ch.qos.logback.* + + +org/slf4j/impl/StaticLoggerBinder.class + + \ No newline at end of file From 45280a967a8774cab710e445401ef2f2493b9c50 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Thu, 11 Sep 2025 18:04:41 +0900 Subject: [PATCH 12/17] =?UTF-8?q?adm/app=20=EA=B3=84=EC=A0=95=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=ED=95=98=EC=9D=B4=EB=B2=84=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/config/ConfigurableMultiTenantConnectionProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/eactive/eai/rms/data/config/ConfigurableMultiTenantConnectionProvider.java b/src/main/java/com/eactive/eai/rms/data/config/ConfigurableMultiTenantConnectionProvider.java index 030bf6d..4a3893b 100644 --- a/src/main/java/com/eactive/eai/rms/data/config/ConfigurableMultiTenantConnectionProvider.java +++ b/src/main/java/com/eactive/eai/rms/data/config/ConfigurableMultiTenantConnectionProvider.java @@ -58,7 +58,7 @@ public class ConfigurableMultiTenantConnectionProvider implements MultiTenantCon // 한다. // 일단 schema 설정을 하지 않고 사용 String schema = DataSourceTypeManager.getDataSourceType(tenantIdentifier).getSchema(); - // connection.setSchema(schema); + connection.setSchema(schema); log.debug("change schema : {} connection : {}", schema, connection); return connection; } From ff99e7caada28a1b5840e1405c94fc0e28a814cd Mon Sep 17 00:00:00 2001 From: Rinjae Date: Thu, 11 Sep 2025 18:46:21 +0900 Subject: [PATCH 13/17] =?UTF-8?q?adm/app=20=EA=B3=84=EC=A0=95=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=ED=95=98=EC=9D=B4=EB=B2=84=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/applicationContext-jpa.xml | 8 ++++++++ .../config/ConfigurableMultiTenantConnectionProvider.java | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/WebContent/WEB-INF/applicationContext-jpa.xml b/WebContent/WEB-INF/applicationContext-jpa.xml index 287b55e..a56d6c8 100644 --- a/WebContent/WEB-INF/applicationContext-jpa.xml +++ b/WebContent/WEB-INF/applicationContext-jpa.xml @@ -113,5 +113,13 @@ false false + + SCHEMA + + com.eactive.eai.rms.data.config.ConfigurableMultiTenantConnectionProvider + + + com.eactive.eai.rms.data.config.TenantIdentifierResolver + \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/data/config/ConfigurableMultiTenantConnectionProvider.java b/src/main/java/com/eactive/eai/rms/data/config/ConfigurableMultiTenantConnectionProvider.java index 4a3893b..4743b02 100644 --- a/src/main/java/com/eactive/eai/rms/data/config/ConfigurableMultiTenantConnectionProvider.java +++ b/src/main/java/com/eactive/eai/rms/data/config/ConfigurableMultiTenantConnectionProvider.java @@ -53,10 +53,6 @@ public class ConfigurableMultiTenantConnectionProvider implements MultiTenantCon } public Connection changeSchema(Connection connection, String tenantIdentifier) throws SQLException { - // connection.setSchema() 를 이용하여 schema를 설정 하려 했으나 postgresql 에서는 대문자로 넣으면 에러가 - // 발생 한다. 에러가 발생 하지 않게 하려면 applicationContext-datasource.xml 에서 스키마명을 소문자로 변경 - // 한다. - // 일단 schema 설정을 하지 않고 사용 String schema = DataSourceTypeManager.getDataSourceType(tenantIdentifier).getSchema(); connection.setSchema(schema); log.debug("change schema : {} connection : {}", schema, connection); From 7d41f18429a4039abebf75fbaa276bfdb9064a24 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 12 Sep 2025 14:46:15 +0900 Subject: [PATCH 14/17] =?UTF-8?q?=EB=A9=80=ED=8B=B0=ED=83=9C=EB=84=8C?= =?UTF-8?q?=EC=8A=A4=20=EB=8F=99=EC=9E=91=20=ED=99=95=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/applicationContext-jpa.xml | 8 -------- .../WEB-INF/{web-default.xml => web.xml} | 0 build.gradle | 19 +++++++++--------- readme.md | 8 ++++++++ .../data/config/EMSTenantConfiguration.java | 20 +++++++++++++++++-- 5 files changed, 35 insertions(+), 20 deletions(-) rename WebContent/WEB-INF/{web-default.xml => web.xml} (100%) diff --git a/WebContent/WEB-INF/applicationContext-jpa.xml b/WebContent/WEB-INF/applicationContext-jpa.xml index a56d6c8..287b55e 100644 --- a/WebContent/WEB-INF/applicationContext-jpa.xml +++ b/WebContent/WEB-INF/applicationContext-jpa.xml @@ -113,13 +113,5 @@ false false - - SCHEMA - - com.eactive.eai.rms.data.config.ConfigurableMultiTenantConnectionProvider - - - com.eactive.eai.rms.data.config.TenantIdentifierResolver - \ No newline at end of file diff --git a/WebContent/WEB-INF/web-default.xml b/WebContent/WEB-INF/web.xml similarity index 100% rename from WebContent/WEB-INF/web-default.xml rename to WebContent/WEB-INF/web.xml diff --git a/build.gradle b/build.gradle index b8e9034..133fa55 100644 --- a/build.gradle +++ b/build.gradle @@ -47,20 +47,19 @@ compileJava { } war { - def profile = project.findProperty("profile") ?: "weblogic" - - if (profile == "weblogic") { - webXml = file("WebContent/WEB-INF/weblogic-web.xml") - } else { - webXml = file("WebContent/WEB-INF/web.xml") - } - - + def profile = project.findProperty("profile") ?: "tomcat" + + if (profile == "weblogic") { + webXml = file("WebContent/WEB-INF/weblogic-web.xml") + } + + // rootSpec.exclude '**/persistence.xml' exclude '**/context.xml' - archiveFileName = "eapim-admin.war" + archiveFileName = "eapim-admin.war" } + tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } diff --git a/readme.md b/readme.md index bdfffa8..2ab5794 100644 --- a/readme.md +++ b/readme.md @@ -46,3 +46,11 @@ eLink 모듈을 참조하여 구성되어있으며, 추후 필요 모듈외에 -Dfile.encoding=utf-8 -DLOGBACK_LOG_LEVEL=info ``` + +### Gradle 빌드 옵션 +```bash +# Weblogic 배포용 (테스트 제외) +gradle build -x test -Pprofile=weblogic +``` + +- -Pprofile=weblogic 사용시 weblogic-web.xml 을 web.xml 로 사용 (DefaultServlet 이슈) \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/data/config/EMSTenantConfiguration.java b/src/main/java/com/eactive/eai/rms/data/config/EMSTenantConfiguration.java index 06bbb2f..b25ec18 100644 --- a/src/main/java/com/eactive/eai/rms/data/config/EMSTenantConfiguration.java +++ b/src/main/java/com/eactive/eai/rms/data/config/EMSTenantConfiguration.java @@ -1,10 +1,13 @@ package com.eactive.eai.rms.data.config; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; import javax.persistence.EntityManagerFactory; import javax.sql.DataSource; +import org.hibernate.cfg.AvailableSettings; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan.Filter; @@ -13,10 +16,12 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.support.SharedEntityManagerBean; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.transaction.TransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; +import com.eactive.eai.common.dao.Keys; import com.eactive.eai.data.jpa.BaseRepositoryImpl; import com.eactive.eai.rms.common.datasource.DataSourceTypeManager; import com.eactive.eai.rms.data.EMSDataSource; @@ -31,13 +36,17 @@ public class EMSTenantConfiguration { public LocalContainerEntityManagerFactoryBean entityManagerFactoryForEMS( @Qualifier(DataSourceTypeManager.MONITORING) DataSource dataSource, @Qualifier("hibernateProperties") Properties hibernateProperties) { - + LocalContainerEntityManagerFactoryBean bean = new LocalContainerEntityManagerFactoryBean(); bean.setDataSource(dataSource); bean.setPackagesToScan("com.eactive.eai.data", "com.eactive.eai.rms.data", "com.eactive.apim.portal"); bean.setJpaVendorAdapter(new HibernateJpaVendorAdapter()); - bean.setJpaProperties(hibernateProperties); + + Map settings = new HashMap<>(); + settings.put(AvailableSettings.DEFAULT_SCHEMA, System.getProperty(Keys.TABLE_OWNER_KEY)); + bean.setJpaPropertyMap(settings); + return bean; } @@ -49,5 +58,12 @@ public class EMSTenantConfiguration { jpaTransactionManager.setEntityManagerFactory(entityManagerFactory); return jpaTransactionManager; } + + @Bean("entityManagerForEMS") + public SharedEntityManagerBean entityManager(@Qualifier("entityManagerFactoryForEMS") EntityManagerFactory entityManagerFactory) { + SharedEntityManagerBean sharedEntityManagerBean = new SharedEntityManagerBean(); + sharedEntityManagerBean.setEntityManagerFactory(entityManagerFactory); + return sharedEntityManagerBean; + } } From 9bb8f78ddea7a53fb8d5ea431bc3d7a5d25d8a74 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 12 Sep 2025 15:02:34 +0900 Subject: [PATCH 15/17] =?UTF-8?q?weblogic=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 133fa55..8f1fafa 100644 --- a/build.gradle +++ b/build.gradle @@ -57,6 +57,7 @@ war { // rootSpec.exclude '**/persistence.xml' exclude '**/context.xml' archiveFileName = "eapim-admin.war" + duplicatesStrategy = DuplicatesStrategy.WARN } From ca75f8d31b51e032a62a4c736a9ceb6b723b67bd Mon Sep 17 00:00:00 2001 From: Rinjae Date: Fri, 12 Sep 2025 15:59:21 +0900 Subject: [PATCH 16/17] =?UTF-8?q?hbernate=20=EB=A1=9C=EA=B7=B8=20=EB=A0=88?= =?UTF-8?q?=EB=B2=A8=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback-dev.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml index bb3a702..61f9097 100644 --- a/src/main/resources/logback-dev.xml +++ b/src/main/resources/logback-dev.xml @@ -72,15 +72,24 @@ 10 + + ${LOG_HOME}/${PREFIX}_hibernate.log + + ${LOG_HOME}/${PREFIX}_hibernate.log-%d{yyyy-MM-dd} + 10 + + - - - + + + + + From 626e5e0986e3d0ca23a6bda10fb8b0175b29c832 Mon Sep 17 00:00:00 2001 From: Rinjae Date: Tue, 16 Sep 2025 10:42:17 +0900 Subject: [PATCH 17/17] =?UTF-8?q?logback=20=EC=84=A4=EC=A0=95=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/properties/env.D.properties | 2 +- .../WEB-INF/properties/env.P.properties | 4 ++-- .../WEB-INF/properties/env.T.properties | 2 +- src/main/resources/logback-dev.xml | 23 +++++++++++++++++++ src/main/resources/logback.xml | 22 +++++++++++++++++- 5 files changed, 48 insertions(+), 5 deletions(-) diff --git a/WebContent/WEB-INF/properties/env.D.properties b/WebContent/WEB-INF/properties/env.D.properties index 0445e14..b83da1a 100644 --- a/WebContent/WEB-INF/properties/env.D.properties +++ b/WebContent/WEB-INF/properties/env.D.properties @@ -6,7 +6,7 @@ db.vendor=mariadb # - oracle10g : org.hibernate.dialect.Oracle10gDialect # - MySQL8 : org.hibernate.dialect.MySQL8Dialect # - MariaDB 10.3 : org.hibernate.dialect.MariaDB103Dialect -hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +hibernate.dialect=org.hibernate.dialect.Oracle12cDialect # Priority of the was -D option inst.Name=apimsSvr11 diff --git a/WebContent/WEB-INF/properties/env.P.properties b/WebContent/WEB-INF/properties/env.P.properties index 6702788..908dbda 100644 --- a/WebContent/WEB-INF/properties/env.P.properties +++ b/WebContent/WEB-INF/properties/env.P.properties @@ -6,7 +6,7 @@ db.vendor=mariadb # - oracle10g : org.hibernate.dialect.Oracle10gDialect # - MySQL8 : org.hibernate.dialect.MySQL8Dialect # - MariaDB 10.3 : org.hibernate.dialect.MariaDB103Dialect -hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +hibernate.dialect=org.hibernate.dialect.Oracle12cDialect # Priority of the was -D option inst.Name=admSvr11 @@ -15,4 +15,4 @@ eai.tableowner=EMSADM eai.systemmode=D eai.drmode=N # black / blue / green / orange / yellow -theme.color=orange +theme.color=orange \ No newline at end of file diff --git a/WebContent/WEB-INF/properties/env.T.properties b/WebContent/WEB-INF/properties/env.T.properties index 4eef0bc..806baae 100644 --- a/WebContent/WEB-INF/properties/env.T.properties +++ b/WebContent/WEB-INF/properties/env.T.properties @@ -6,7 +6,7 @@ db.vendor=mariadb # - oracle10g : org.hibernate.dialect.Oracle10gDialect # - MySQL8 : org.hibernate.dialect.MySQL8Dialect # - MariaDB 10.3 : org.hibernate.dialect.MariaDB103Dialect -hibernate.dialect=org.hibernate.dialect.MySQL5Dialect +hibernate.dialect=org.hibernate.dialect.Oracle12cDialect # Priority of the was -D option inst.Name=admSvr11 diff --git a/src/main/resources/logback-dev.xml b/src/main/resources/logback-dev.xml index 61f9097..ca1d61f 100644 --- a/src/main/resources/logback-dev.xml +++ b/src/main/resources/logback-dev.xml @@ -27,6 +27,9 @@ 10 + + ${LOG_PATTERN} + + + utf-8 + ${LOG_PATTERN} + @@ -49,6 +56,10 @@ 10 + + utf-8 + ${LOG_PATTERN} + @@ -60,6 +71,10 @@ 10 + + utf-8 + ${LOG_PATTERN} + @@ -71,6 +86,10 @@ 10 + + utf-8 + ${LOG_PATTERN} + ${LOG_HOME}/${PREFIX}_hibernate.log @@ -78,6 +97,10 @@ ${LOG_HOME}/${PREFIX}_hibernate.log-%d{yyyy-MM-dd} 10 + + utf-8 + ${LOG_PATTERN} + diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 9ee91f6..b16a368 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - + @@ -16,6 +16,10 @@ 10 + + utf-8 + ${LOG_PATTERN} + + + utf-8 + ${LOG_PATTERN} + @@ -38,6 +46,10 @@ 10 + + utf-8 + ${LOG_PATTERN} + @@ -49,6 +61,10 @@ 10 + + utf-8 + ${LOG_PATTERN} + @@ -60,6 +76,10 @@ 10 + + utf-8 + ${LOG_PATTERN} +