diff --git a/pom.xml b/pom.xml index e3ad201..826888b 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,8 @@ war + UTF-8 + UTF-8 1.8 5.3.6 4.0.0 @@ -30,18 +32,6 @@ true - - egovframe - https://maven.egovframe.go.kr/maven/ - - true - - - - - false - - @@ -50,7 +40,6 @@ spring-context 5.3.6 - commons-logging commons-logging @@ -58,11 +47,6 @@ - - com.googlecode.json-simple - json-simple - 1.1 - org.springframework @@ -70,7 +54,7 @@ 5.3.6 - + org.springframework.security spring-security-web @@ -122,40 +106,16 @@ - - log4j - log4j - 1.2.17 - - - org.slf4j - slf4j-api - 1.6.6 - - - org.slf4j - jcl-over-slf4j - 1.6.6 - runtime - - - org.slf4j - slf4j-log4j12 - 1.6.6 - runtime - - - org.apache.logging.log4j - log4j-core - 2.17.1 - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.17.1 - + + ch.qos.logback + logback-classic + 1.3.0 + compile + + + @@ -164,19 +124,7 @@ 4.12 - - - org.mybatis - mybatis - 3.4.6 - - - - org.mybatis - mybatis-spring - 1.3.2 - @@ -198,69 +146,15 @@ 1.2 - - org.apache.tiles - tiles-servlet - 3.0.5 - - - - org.apache.tiles - tiles-api - 3.0.5 - - - - org.apache.tiles - tiles-jsp - 3.0.5 - - - - org.apache.tiles - tiles-core - 3.0.5 - - - - org.apache.tiles - tiles-template - 3.0.5 - - - org.apache.poi - poi-ooxml - 4.0.0 - - - org.apache.commons - commons-dbcp2 - 2.4.0 - - - - - com.github.pagehelper - pagehelper - 5.2.0 - - - - - mysql - mysql-connector-java - 8.0.28 - - - egovframework.rte - egovframework.rte.psl.dataaccess - 2.7.0 - + org.apache.ibatis + ibatis-sqlmap + 2.3.4.726 + @@ -277,13 +171,7 @@ 2.13.2 - - - - org.bgee.log4jdbc-log4j2 - log4jdbc-log4j2-jdbc4.1 - 1.16 - + @@ -293,23 +181,9 @@ 1.1.1 - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - com.tmax.tibero - tibero-jdbc - 6.0 - system - ${basedir}/src/main/webapp/WEB-INF/lib/tibero6-jdbc.jar - @@ -318,9 +192,7 @@ org.apache.maven.plugins maven-war-plugin - diff --git a/src/main/java/kr/api/service/ApiMainServiceImpl.java b/src/main/java/kr/api/service/ApiMainServiceImpl.java index b7be020..ec7cfac 100644 --- a/src/main/java/kr/api/service/ApiMainServiceImpl.java +++ b/src/main/java/kr/api/service/ApiMainServiceImpl.java @@ -213,7 +213,6 @@ public class ApiMainServiceImpl implements ApiMainService { con.setRequestProperty("Content-type", "application/json; charset=UTF-8"); con.setDoOutput(true); - // DATA JSONObject param = new JSONObject(); diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml deleted file mode 100644 index 49bedbb..0000000 --- a/src/main/resources/log4j2.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/log4jdbc.log4j2.properties b/src/main/resources/log4jdbc.log4j2.properties deleted file mode 100644 index 6d789c0..0000000 --- a/src/main/resources/log4jdbc.log4j2.properties +++ /dev/null @@ -1,2 +0,0 @@ -log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator - diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..2988f14 --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + ${LOG_PATTERN} + + + + + ${LOG_PATH}/${LOG_FILE_NAME}.log + + ${LOG_PATTERN} + + + + + ${LOG_PATH}/${LOG_FILE_NAME}.%d{yyyy-MM-dd}_%i.log + + 10MB + + + 30 + + + + + + + error + ACCEPT + DENY + + + ${LOG_PATH}/${ERR_LOG_FILE_NAME}.log + + ${LOG_PATTERN} + + + + + ${LOG_PATH}/${ERR_LOG_FILE_NAME}.%d{yyyy-MM-dd}_%i.log + + + 10MB + + + 60 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mybatis-config-dev.xml b/src/main/resources/mybatis/mybatis-config-dev.xml deleted file mode 100644 index c0798a1..0000000 --- a/src/main/resources/mybatis/mybatis-config-dev.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/mybatis/mybatis-config-prod.xml b/src/main/resources/mybatis/mybatis-config-prod.xml deleted file mode 100644 index 4e16cc0..0000000 --- a/src/main/resources/mybatis/mybatis-config-prod.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/properties/config-dev.properties b/src/main/resources/properties/config-dev.properties deleted file mode 100644 index c9a222c..0000000 --- a/src/main/resources/properties/config-dev.properties +++ /dev/null @@ -1,73 +0,0 @@ -#tibero -#jdbc.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -#jdbc.url=jdbc:log4jdbc:tibero:thin:@175.198.238.72:18629:tpssdev -#jdbc.username=tpss -#jdbc.password=V6$Q2iYw - -##tibero7(Dev) -#jdbc.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -#jdbc.url=jdbc:log4jdbc:tibero:thin:@220.126.183.238:48629:tpssdev -#jdbc.username=tpss -#jdbc.password=V6$Q2iYw - -#tibero7(Test) -jdbc.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -jdbc.url=jdbc:log4jdbc:tibero:thin:@192.168.1.122:48629:tpssdev -jdbc.username=tpss -jdbc.password=V6$Q2iYw - -#tibero7(Test) -jdbc.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -jdbc.url=jdbc:log4jdbc:tibero:thin:@192.168.1.122:48629:tpssdev -jdbc.username=tpss -jdbc.password=V6$Q2iYw - - - -# map -map.url=https://icloud.incheon.go.kr/Basemap/Normal_kor/{z}/{x}/{y}.png - -# api key -api.key.safemap=AYCAA6GR-AYCA-AYCA-AYCA-AYCAA6GRSX -api.key.taas.jaywalking=HKJy2dFc4yN5x5UDL8SR0u0Frs5CnzvwXo8yvWCAfOOH%2Fwhirlvr8v%2F4m5ZNUq3b -api.key.taas.oldman=qvAwshGrHUmHIXVs8v1lUYnmt15EZevFx8VpAbiJ%2FmQR3dQMK2FKCglHT5rkc3Yf -api.key.taas.child=v8%2FRSQh094uyoTJMSxb6u%2FM4UHyz20iNuw2idqegU3DH4lH8fGc%2FOSKJViW3D0oL -api.key.taas.schoolzone.child=qZFs05HLyZ8fEzSWglUXTZ8pfgc4MZ%2Fi6MfjX7i1gK92AlE9hwVkjNt4nir5UTWt -api.key.taas.bicycle=RDg2SyI9ji2ED11Dl9yjzrXFad8%2Fm3vW8Cwbh1LzRhMa3RmyPn7l36dMxGfft7pt - -# TAAS Open APi -taas.sido.code=28 -taas.gugun.code=710,245,170,200,140,177,237,260,185,720,110 - -# GEOSERVER(Dev) -geoserver.url=http://220.126.183.238:18443 - - -#LOGIN_Chk -login.chk=dev - -#tibero -#jdbc.default.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -#jdbc.default.url=jdbc:log4jdbc:tibero:thin:@192.168.6.12:8629:ictrat -#jdbc.default.username=tpss -#jdbc.default.password=itstpss - -#tibero -#jdbc.default.driverClassName=com.tmax.tibero.jdbc.TbDriver -#jdbc.default.url=jdbc:tibero:thin:@175.198.238.72:18629:tpssdev -#jdbc.default.username=tpss -#jdbc.default.password=V6$Q2iYw - -#mysql -#jdbc.default.driverClassName=com.mysql.jdbc.Driver -#jdbc.default.url=jdbc:mysql://106.240.250.138:3306/locgov?characterEncoding=UTF-8 -#jdbc.default.username=uinet -#jdbc.default.password=uinetworks201% - - -#tibero -local -#jdbc.default.driverClassName=com.tmax.tibero.jdbc.TbDriver -#jdbc.default.url=jdbc:tibero:thin:@127.0.0.1:8629:tibero -#jdbc.default.username=sys -#jdbc.default.password=admin1234 - diff --git a/src/main/resources/properties/config-prod.properties b/src/main/resources/properties/config-prod.properties deleted file mode 100644 index 2da3dce..0000000 --- a/src/main/resources/properties/config-prod.properties +++ /dev/null @@ -1,47 +0,0 @@ -#tibero -#jdbc.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -#jdbc.url=jdbc:log4jdbc:tibero:thin:@175.198.238.72:18629:tpssdev -#jdbc.username=tpss -#jdbc.password=V6$Q2iYw - -#tibero7(Dev) -#jdbc.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -#jdbc.url=jdbc:log4jdbc:tibero:thin:@175.198.238.72:38629:tpssdev -#jdbc.username=tpss -#jdbc.password=V6$Q2iYw - -#tibero7(Prod) -jdbc.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -jdbc.url=jdbc:log4jdbc:tibero:thin:@192.168.6.54:8629:biganlydb -jdbc.username=TPSS -jdbc.password=V6$Q2iYw - -# map -map.url=https://icloud.incheon.go.kr/Basemap/Normal_kor/{z}/{x}/{y}.png -#map.url=https://tile.openstreetmap.org/{z}/{x}/{y}.png -#map.url=https://imap.incheon.go.kr/Basemap/Normal_kor/map_tiles/v_fix/{z}/{x}/{y}.png - -# map(Prod) -#map.url=http://101.0.1.99:8093/Basemap/Normal_kor/map_tiles/v_fix/{level}/{col}/{row}.png - -# api key -api.key.safemap=AYCAA6GR-AYCA-AYCA-AYCA-AYCAA6GRSX -api.key.taas.jaywalking=HKJy2dFc4yN5x5UDL8SR0u0Frs5CnzvwXo8yvWCAfOOH%2Fwhirlvr8v%2F4m5ZNUq3b -api.key.taas.oldman=qvAwshGrHUmHIXVs8v1lUYnmt15EZevFx8VpAbiJ%2FmQR3dQMK2FKCglHT5rkc3Yf -api.key.taas.child=v8%2FRSQh094uyoTJMSxb6u%2FM4UHyz20iNuw2idqegU3DH4lH8fGc%2FOSKJViW3D0oL -api.key.taas.schoolzone.child=qZFs05HLyZ8fEzSWglUXTZ8pfgc4MZ%2Fi6MfjX7i1gK92AlE9hwVkjNt4nir5UTWt -api.key.taas.bicycle=RDg2SyI9ji2ED11Dl9yjzrXFad8%2Fm3vW8Cwbh1LzRhMa3RmyPn7l36dMxGfft7pt - -# TAAS Open APi -taas.sido.code=28 -taas.gugun.code=710,245,170,200,140,177,237,260,185,720,110 - -# GEOSERVER(Prod) -#geoserver.url=http://192.168.6.104:81 -#geoserver.url=http://192.168.21.66:8443 -geoserver.url=http://192.168.6.51:8443 -geoserver.in.url=http://10.161.129.35:8443 - -#LOGIN_Chk -login.chk=prod - diff --git a/src/main/resources/spring/context-dev.xml b/src/main/resources/spring/context-dev.xml deleted file mode 100644 index a45ccff..0000000 --- a/src/main/resources/spring/context-dev.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/spring/context-prod.xml b/src/main/resources/spring/context-prod.xml deleted file mode 100644 index c805bee..0000000 --- a/src/main/resources/spring/context-prod.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/WEB-INF/lib/dsagent-v36.jar b/src/main/webapp/WEB-INF/lib/dsagent-v36.jar deleted file mode 100644 index 1b9a98d..0000000 Binary files a/src/main/webapp/WEB-INF/lib/dsagent-v36.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/lib/jcaos-1.4.7.5.jar b/src/main/webapp/WEB-INF/lib/jcaos-1.4.7.5.jar deleted file mode 100644 index 8c0e229..0000000 Binary files a/src/main/webapp/WEB-INF/lib/jcaos-1.4.7.5.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/lib/tibero6-jdbc.jar b/src/main/webapp/WEB-INF/lib/tibero6-jdbc.jar deleted file mode 100644 index 73f9f5d..0000000 Binary files a/src/main/webapp/WEB-INF/lib/tibero6-jdbc.jar and /dev/null differ diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 8693682..1847884 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -4,14 +4,18 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd" version="4.0"> - - contextConfigLocation - - classpath:spring/context-*.xml - - - - + + + + contextConfigLocation + + classpath:spring/context-*.xml + + + + + + org.springframework.web.context.ContextLoaderListener