From 7fb9aaaa4da8641b733d427a12355f8acfd7e34e Mon Sep 17 00:00:00 2001 From: limju Date: Mon, 6 Nov 2023 17:10:52 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20init=20=EB=AA=A8=EB=93=88=20?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=20=20=20=20=20=20=20=20=20=20=20-=20license?= =?UTF-8?q?=20=EB=AA=A8=EB=93=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/config/application-local.yml | 6 ------ .../main/resources/config/application-dev.yml | 6 ------ .../resources/config/application-local.yml | 6 ------ mens-core/pom.xml | 2 ++ .../main/resources/META-INF/spring.factories | 2 +- .../xit/core/init/custom/AppInitHelper.java | 20 +++++++++++-------- 6 files changed, 15 insertions(+), 27 deletions(-) diff --git a/mens-api/src/main/resources/config/application-local.yml b/mens-api/src/main/resources/config/application-local.yml index 13bbb93..245e8b9 100644 --- a/mens-api/src/main/resources/config/application-local.yml +++ b/mens-api/src/main/resources/config/application-local.yml @@ -55,12 +55,6 @@ decorator: app: api-ip: 211.119.124.73 - license: - path: ${app.data.root.path}/mens/.pem/ - key: 'mxLAM1fAEDPWkFz8' - data1: 'jz5LT6TlZtewv1GRVN3cI6CgoPgS89Sfh7qSKkCVjjMPOyBKkT386tlnMnjXluTSr8OIvI1pHd96fHxRZHNUBuLeQOkUeWuzkfxlP8C7nDyIrG36T2aontjroAxoNk3oYdIYRVWNs1Iqw39v9xF8NYFFLGqtfv/wnCGxlwTsDwCf9bjAtyd9cTiS27dVrIbrAVKnchgxIF/DUQQc901l4DZ5gsT6aLx6TmzhvAewPK1HfiG9WrMWxpw0TMxt++0Vedh+oZEs48ACMpuHFFh406LynyxxE7boRVbKmh7Tn87gKa6+zzdzIN1kS8sk58Ms1HPvBfvwwnD8qiJItXO6DQ==' - data2: 'Te3bfmvdiMZdpfRwC3OO9UjwbNkvbf16kqEqn9VqwbVztizA9rvMFshlI0vuqai9Hml31IsNINKg+OYkhmkH6ic1I10r6MNIVl3WL5YxfeK7YBmjvNuGZtKwchlWzhMODsgNAq0aIQVi4kLk5filDaZESY10xlNdbf9c/SKGfJeLZxY7DCchkAgj/ZnmZNqOE2kDAoC+O1ksDNTS0+cr+WsKsoFON0EpNI5B2ElBtnT1LmQQ3R+FNCtp7YJaRZA3RPsata05kKH7sL1J0M6A6HIVxisOU3bjH0hB+60BHJfdlEiXo6RJvsPyXotwe8MYVrHJbIQgsepxSDpMFZe8HA==' - data3: 't9qYJTU49dbaeezJkzpM2uY3iLIcy/V/VnyVsWIcd0f4QMLJ3cmLZ0QcMyKoR7CL2CuHMnPJz8j7KFOTQRPpeN/Dl4bCpOu+BM3foYpn4wb5HcLdHJxp5CuFmhTfqRGuUxurv6jcqkwmRzPW35UjQLjeKSdv6m+2b84PN4sZSNeMjQDH0QC85yKphHKV8m6bzqUbHLiZwDXndgpq2/YGKdWjPinlH7PZ+L2xfrfhdWXoY9QrHYVOSPogd81EizzyQseif8GAkeUG1OKAOomhyEuTOxtdGbUew59YuuBlUpORgj/Koclyd2shHyne9CJdqnQqAA2mh61V1ZzBUvSIWQ==' # swagger url url: 'http://localhost:${server.port}${server.servlet.context-path:}/' data: diff --git a/mens-batch/src/main/resources/config/application-dev.yml b/mens-batch/src/main/resources/config/application-dev.yml index 4aa5aa4..ff3e9e6 100644 --- a/mens-batch/src/main/resources/config/application-dev.yml +++ b/mens-batch/src/main/resources/config/application-dev.yml @@ -63,12 +63,6 @@ decorator: app: api-ip: 211.119.124.9 - license: - path: ${app.data.root.path}/mens/.pem/ - key: 'mxLAM1fAEDPWkFz8' - data1: 'WEcpGVH9g01hS8L0ke6sL9g8Hmsy4yngfEwH5L/ax62IzmdjIU6mE6GoGnC3iuRN1ENCYlVz2b8BYtAKDltMYZWx+qBjY+KscgfFoMDLIVHMGAUSDF+PyE6KV2DsKoAhc2ZdNnqbFJDgDP/qyFSRjwD1dvzeXTuCcz4mnQxOovXqiMkXwnBKhUBzq9dFeLlsk1e/YoR9SZTrpt0x0T8IeyzqI568FFqNAznmbJ+1kpi9yRaJ5c8MXXEIrfPJVONrLfeVezg1Z9jDj56zPL6gqrKhKtHJwkxpESx+5ik8O01GDcmytsLAeoIz0BiZVLJXUc/T6mZBVP6FfZnDC0dWfA==' - data2: 'YBF68uN720dTzblufB/AkZTxZnDIt6G29UkjIkJL9TDH2UkTB9FPNgtk4TqSTCFr1C4SsSU9Z/XQ957+c6K1JZe20JzDlhRWr6Zty0lCORI6erdpRq0zUsKANeJoB2hgqgeLcDxuOUN2S19MacD2VA4H0+7zKATiT8P7OEWXrAU9M2YmbEMMxHQsc6SZIa3EoGrJdNZrgeVXxL2+aJN28gmMm3CgoxLEEtuSZXK3LEZLlLEZvZtDxuxqx7Os4CtNwvHsDyFcIot6Ghbr+G3EsT+jghvvei0Cg4Qgm4n11yj0hsWR8CwmV7FTTqo03s0zBDRhYhgML81KkE/AtZSVvA==' - data3: 'IWPfGH1nDoOsevS4eyw4fItEqNymamycYa+rN+3v/iQxwy5mohdYNgm/+HcOGua2FJ6VxgGC/9i5b0jKB5L2p8bSBrEQBmluh+DsEMzeUxP8mfD2hTIUfeA9osmXW0al6BfcoJKZyiUGzxoSDY1MMdbAB9FQSBWY9yniGBaEXt3CgJmloXsVoRRolalmO6oqRJq4t1kV0fRijGGMQ5/0nu0Z5fuhCukGmEAsIW0abRXARDzoXYfAZKbKW0L70X8htpFAkk9t2IukeZemHGBBinDBWsh0ZlysHJfcXlFnFh83hXrsYcpUAn34PSd3TfLPeymdoduTF8wX7sOVMuPUVg==' # swagger url url: 'http://localhost:${server.port}${server.servlet.context-path:}/' diff --git a/mens-batch/src/main/resources/config/application-local.yml b/mens-batch/src/main/resources/config/application-local.yml index 7229543..1c77d95 100644 --- a/mens-batch/src/main/resources/config/application-local.yml +++ b/mens-batch/src/main/resources/config/application-local.yml @@ -63,12 +63,6 @@ decorator: app: api-ip: 211.119.124.73 - license: - path: ${app.data.root.path}/mens/.pem/ - key: 'mxLAM1fAEDPWkFz8' - data1: 'jz5LT6TlZtewv1GRVN3cI6CgoPgS89Sfh7qSKkCVjjMPOyBKkT386tlnMnjXluTSr8OIvI1pHd96fHxRZHNUBuLeQOkUeWuzkfxlP8C7nDyIrG36T2aontjroAxoNk3oYdIYRVWNs1Iqw39v9xF8NYFFLGqtfv/wnCGxlwTsDwCf9bjAtyd9cTiS27dVrIbrAVKnchgxIF/DUQQc901l4DZ5gsT6aLx6TmzhvAewPK1HfiG9WrMWxpw0TMxt++0Vedh+oZEs48ACMpuHFFh406LynyxxE7boRVbKmh7Tn87gKa6+zzdzIN1kS8sk58Ms1HPvBfvwwnD8qiJItXO6DQ==' - data2: 'Te3bfmvdiMZdpfRwC3OO9UjwbNkvbf16kqEqn9VqwbVztizA9rvMFshlI0vuqai9Hml31IsNINKg+OYkhmkH6ic1I10r6MNIVl3WL5YxfeK7YBmjvNuGZtKwchlWzhMODsgNAq0aIQVi4kLk5filDaZESY10xlNdbf9c/SKGfJeLZxY7DCchkAgj/ZnmZNqOE2kDAoC+O1ksDNTS0+cr+WsKsoFON0EpNI5B2ElBtnT1LmQQ3R+FNCtp7YJaRZA3RPsata05kKH7sL1J0M6A6HIVxisOU3bjH0hB+60BHJfdlEiXo6RJvsPyXotwe8MYVrHJbIQgsepxSDpMFZe8HA==' - data3: 't9qYJTU49dbaeezJkzpM2uY3iLIcy/V/VnyVsWIcd0f4QMLJ3cmLZ0QcMyKoR7CL2CuHMnPJz8j7KFOTQRPpeN/Dl4bCpOu+BM3foYpn4wb5HcLdHJxp5CuFmhTfqRGuUxurv6jcqkwmRzPW35UjQLjeKSdv6m+2b84PN4sZSNeMjQDH0QC85yKphHKV8m6bzqUbHLiZwDXndgpq2/YGKdWjPinlH7PZ+L2xfrfhdWXoY9QrHYVOSPogd81EizzyQseif8GAkeUG1OKAOomhyEuTOxtdGbUew59YuuBlUpORgj/Koclyd2shHyne9CJdqnQqAA2mh61V1ZzBUvSIWQ==' # swagger url url: 'http://localhost:${server.port}${server.servlet.context-path:}/' data: diff --git a/mens-core/pom.xml b/mens-core/pom.xml index c73771c..6b4effa 100644 --- a/mens-core/pom.xml +++ b/mens-core/pom.xml @@ -25,11 +25,13 @@ + diff --git a/mens-core/src/main/resources/META-INF/spring.factories b/mens-core/src/main/resources/META-INF/spring.factories index 221d1bd..3dc086f 100644 --- a/mens-core/src/main/resources/META-INF/spring.factories +++ b/mens-core/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ # META-INF/spring.factories : xit-init -org.springframework.context.ApplicationContextInitializer=xit.core.init.custom.CustomContextInitalizer +#org.springframework.context.ApplicationContextInitializer=xit.core.init.custom.CustomContextInitalizer diff --git a/xit-init/src/main/java/xit/core/init/custom/AppInitHelper.java b/xit-init/src/main/java/xit/core/init/custom/AppInitHelper.java index 484df6e..5e59534 100644 --- a/xit-init/src/main/java/xit/core/init/custom/AppInitHelper.java +++ b/xit-init/src/main/java/xit/core/init/custom/AppInitHelper.java @@ -1,11 +1,5 @@ package xit.core.init.custom; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.env.ConfigurableEnvironment; -import org.springframework.core.env.PropertiesPropertySource; -import xit.core.init.custom.bouncy.BouncyDecUtils; - import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; @@ -15,11 +9,21 @@ import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.Properties; -import java.util.stream.Collectors; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.PropertiesPropertySource; +import xit.core.init.custom.bouncy.BouncyDecUtils; /** * 
- * description :
+ * description : licence module
+ *               app.licence.path, key, data1, data2, data3
+ *               path - private key file path
+ *               key - key
+ *               data1 - license
+ *               data2 - primary DB info
+ *               data3 - secondary DB info
  *
  * packageName : kr.xit.core.spring.config.custom
  * fileName    : AppInitHelper