diff --git a/.gitmodules b/.gitmodules index 765ac2a..4cbf63b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "elink-online-core"] path = elink-online-core - url = ssh://git@192.168.240.178:18081/eapim/elink-online-core.git + url = https://git.eactive.synology.me:8090/kjb-eapim/elink-online-core.git [submodule "elink-online-transformer"] path = elink-online-transformer - url = ssh://git@192.168.240.178:18081/eapim/elink-online-transformer.git + url = https://git.eactive.synology.me:8090/kjb-eapim/elink-online-transformer.git [submodule "elink-online-common"] path = elink-online-common - url = ssh://git@192.168.240.178:18081/eapim/elink-online-common.git + url = https://git.eactive.synology.me:8090/kjb-eapim/elink-online-common.git [submodule "elink-online-emsclient"] path = elink-online-emsclient - url = ssh://git@192.168.240.178:18081/eapim/elink-online-emsclient.git + url = https://git.eactive.synology.me:8090/kjb-eapim/elink-online-emsclient.git [submodule "elink-online-core-jpa"] path = elink-online-core-jpa - url = ssh://git@192.168.240.178:18081/eapim/elink-online-core-jpa.git \ No newline at end of file + url = https://git.eactive.synology.me:8090/kjb-eapim/elink-online-core-jpa.git \ No newline at end of file diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml new file mode 100644 index 0000000..ae81110 --- /dev/null +++ b/WebContent/META-INF/context.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/build.gradle b/build.gradle index fd261ca..0f815bb 100644 --- a/build.gradle +++ b/build.gradle @@ -20,14 +20,16 @@ def queryDslVersion = "5.0.0" def hibernateVersion = "5.6.15.Final" def generatedJavaDir = "$buildDir/generated/java" -//def nexusUrl = "https://nexus.eactive.synology.me:8090" -// -//repositories { -// maven { -// url "${nexusUrl}/repository/maven-public/" -// allowInsecureProtocol = true -// } -//} +def nexusUrl = "https://nexus.eactive.synology.me:8090" + +allprojects { + repositories { + maven { + url "${nexusUrl}/repository/maven-public/" + allowInsecureProtocol = true + } + } +} java { toolchain { diff --git a/elink-online-common b/elink-online-common index 8b72299..1bbfe85 160000 --- a/elink-online-common +++ b/elink-online-common @@ -1 +1 @@ -Subproject commit 8b722996895ead9ec42b445f1652fb08c98fe132 +Subproject commit 1bbfe85d4f246c2c80d1c9d7f3457449c11fe5c7 diff --git a/elink-online-core b/elink-online-core index 8c886f9..c22786b 160000 --- a/elink-online-core +++ b/elink-online-core @@ -1 +1 @@ -Subproject commit 8c886f92fb48f9a5a0aa4cc80636016156b28295 +Subproject commit c22786b72926f2a6180a8d5085f37a5f6c86068d diff --git a/elink-online-transformer b/elink-online-transformer index 947d1f2..35b90c3 160000 --- a/elink-online-transformer +++ b/elink-online-transformer @@ -1 +1 @@ -Subproject commit 947d1f223ca9ca265d14a8e7195958873e867faf +Subproject commit 35b90c391ccaff66b503052ad52b9ad0d994ca1a diff --git a/src/main/resources/certificate/elink-oauth-dev.jks b/src/main/resources/certificate/elink-oauth-dev.jks new file mode 100644 index 0000000..68a25f7 Binary files /dev/null and b/src/main/resources/certificate/elink-oauth-dev.jks differ diff --git a/src/main/resources/certificate/elink-oauth-dev.pub b/src/main/resources/certificate/elink-oauth-dev.pub new file mode 100644 index 0000000..d1dae40 --- /dev/null +++ b/src/main/resources/certificate/elink-oauth-dev.pub @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjT8R5ujHcHCsW7/pnw4h +JxuQlvg0rH6EFzrPoJe65FrVXuZSyWJUrzK+hCwx27ci1Q1cnArgCFZuia+SO754 +dl+vmAQQvLFpcUxp1DSSh2T8nr0bcBftZfmdFZuAWJ4rAG2ZuMg344DTmEa+vrZL +86yFnJvy7GnS3jDucz0LzRjAIm7JcVaPf9TbeDnRyiiejSlQgTuMvszsw4w4/Pxs +DhYPoGIMv6Vu9yJzEozhbz0pgehaa32dqVSDAzZTzGrpiKVJTF2wYxJZdL9V7vXw +AOCq92vywvO6SW96hSIaClo3L8AouLYm4Gp1ZqD+k8LW3r0Re8gk3Na1Jp6/NvbB +CQIDAQAB +-----END PUBLIC KEY----- diff --git a/src/main/resources/certificate/keystore.p12 b/src/main/resources/certificate/keystore.p12 new file mode 100644 index 0000000..8b520d2 Binary files /dev/null and b/src/main/resources/certificate/keystore.p12 differ