From 1e4baae8f8dbd31d2901a5c8c3ccfc1ce6873003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Tue, 19 Sep 2023 13:07:31 +0900 Subject: [PATCH] =?UTF-8?q?common=20=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC?= =?UTF-8?q?=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pav-common/build.gradle | 38 +++++++++++++++++++ pav-common/settings.gradle | 1 + .../com/palnet/common/CommonApplication.java | 13 +++++++ .../com/palnet/common/model/SampleDTO.java | 10 +++++ .../src/main/resources/application.properties | 1 + .../palnet/common/CommonApplicationTests.java | 13 +++++++ pav-server/build.gradle | 31 +++++++++++---- pav-socket/build.gradle | 2 + pav-websocket/build.gradle | 2 + settings.gradle | 3 +- 10 files changed, 106 insertions(+), 8 deletions(-) create mode 100644 pav-common/build.gradle create mode 100644 pav-common/settings.gradle create mode 100644 pav-common/src/main/java/com/palnet/common/CommonApplication.java create mode 100644 pav-common/src/main/java/com/palnet/common/model/SampleDTO.java create mode 100644 pav-common/src/main/resources/application.properties create mode 100644 pav-common/src/test/java/com/palnet/common/CommonApplicationTests.java diff --git a/pav-common/build.gradle b/pav-common/build.gradle new file mode 100644 index 00000000..e42972e9 --- /dev/null +++ b/pav-common/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.5.1' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +group = 'com.palnet' +version = '0.0.1' + +java { + sourceCompatibility = '11' +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter' + + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} +tasks.withType(JavaCompile){ + options.encoding = "UTF-8" +} \ No newline at end of file diff --git a/pav-common/settings.gradle b/pav-common/settings.gradle new file mode 100644 index 00000000..b44df8bf --- /dev/null +++ b/pav-common/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'pav-common' diff --git a/pav-common/src/main/java/com/palnet/common/CommonApplication.java b/pav-common/src/main/java/com/palnet/common/CommonApplication.java new file mode 100644 index 00000000..1a127d94 --- /dev/null +++ b/pav-common/src/main/java/com/palnet/common/CommonApplication.java @@ -0,0 +1,13 @@ +package com.palnet.common; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class CommonApplication { + + public static void main(String[] args) { + SpringApplication.run(CommonApplication.class, args); + } + +} diff --git a/pav-common/src/main/java/com/palnet/common/model/SampleDTO.java b/pav-common/src/main/java/com/palnet/common/model/SampleDTO.java new file mode 100644 index 00000000..75e45035 --- /dev/null +++ b/pav-common/src/main/java/com/palnet/common/model/SampleDTO.java @@ -0,0 +1,10 @@ +package com.palnet.common.model; + +import lombok.Data; + +@Data +public class SampleDTO { + + private String sample; + +} diff --git a/pav-common/src/main/resources/application.properties b/pav-common/src/main/resources/application.properties new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/pav-common/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/pav-common/src/test/java/com/palnet/common/CommonApplicationTests.java b/pav-common/src/test/java/com/palnet/common/CommonApplicationTests.java new file mode 100644 index 00000000..a5f851fd --- /dev/null +++ b/pav-common/src/test/java/com/palnet/common/CommonApplicationTests.java @@ -0,0 +1,13 @@ +package com.palnet.common; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class CommonApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/pav-server/build.gradle b/pav-server/build.gradle index 6898bc74..e58a5576 100644 --- a/pav-server/build.gradle +++ b/pav-server/build.gradle @@ -14,14 +14,20 @@ java { compileJava { options.compilerArgs += [ - '-Amapstruct.unmappedTargetPolicy=IGNORE', - '-Amapstruct.unmappedSourcePolicy=IGNORE' + '-Amapstruct.unmappedTargetPolicy=IGNORE', + '-Amapstruct.unmappedSourcePolicy=IGNORE' ] } repositories { - mavenCentral() + mavenCentral { + content { + excludeModule("javax.media", "jai_core") + } + } + maven { url "https://repo.osgeo.org/repository/release" } + } jar { @@ -29,6 +35,7 @@ jar { } dependencies { + implementation project(':pav-common') // spring implementation 'org.springframework.boot:spring-boot-starter' implementation 'org.springframework.boot:spring-boot-starter-web' @@ -70,11 +77,21 @@ dependencies { implementation 'commons-httpclient:commons-httpclient:3.1' implementation 'com.googlecode.json-simple:json-simple:1.1.1' implementation 'io.springfox:springfox-boot-starter:3.0.0' - implementation 'com.esri.geometry:esri-geometry-api:2.2.4' - implementation 'org.locationtech.proj4j:proj4j:1.1.5' - implementation 'org.locationtech.jts:jts-core:1.18.0' implementation 'org.json:json:20220320' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2' + implementation 'com.bedatadriven:jackson-datatype-jts:2.4' + implementation 'de.grundid.opendatalab:geojson-jackson:1.14' + + + + + // geometry + implementation 'com.esri.geometry:esri-geometry-api:2.2.4' + implementation 'org.locationtech.proj4j:proj4j:1.3.0' + implementation 'org.locationtech.jts:jts-core:1.19.0' + implementation 'org.geotools:gt-geojson:29.2' + testImplementation 'org.springframework.boot:spring-boot-starter-test' testAnnotationProcessor "org.mapstruct:mapstruct-processor:1.5.5.Final" @@ -83,7 +100,7 @@ dependencies { tasks.named('test') { useJUnitPlatform() } -tasks.withType(JavaCompile){ +tasks.withType(JavaCompile) { options.encoding = "UTF-8" } diff --git a/pav-socket/build.gradle b/pav-socket/build.gradle index 675fb290..3b08317d 100644 --- a/pav-socket/build.gradle +++ b/pav-socket/build.gradle @@ -20,6 +20,8 @@ jar { } dependencies { + implementation project(':pav-common') + implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-webflux' diff --git a/pav-websocket/build.gradle b/pav-websocket/build.gradle index 53c4e5a6..5cd9e046 100644 --- a/pav-websocket/build.gradle +++ b/pav-websocket/build.gradle @@ -20,6 +20,8 @@ jar { } dependencies { + implementation project(':pav-common') + implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'io.netty:netty-all:4.1.63.Final' diff --git a/settings.gradle b/settings.gradle index 02e11aa7..d85a34dc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,6 @@ rootProject.name = 'pav-be-kac' +include 'pav-common' include 'pav-socket' include 'pav-websocket' -include 'pav-server' \ No newline at end of file +include 'pav-server'