0xb00b5/0xb00b5-packmate
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Переезд на java 13

Browse Source
This commit is contained in:
serega6531
2020-03-11 18:56:46 +03:00
parent 1f76d2c9dd
commit 59665145b3
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile_app
View File

@@ -1,4 +1,4 @@
FROM openjdk:8-jdk-alpine FROM openjdk:13-jdk-alpine
RUN apk add libpcap npm RUN apk add libpcap npm

12
build.gradle
View File

@@ -1,13 +1,15 @@
plugins { plugins {
id 'org.springframework.boot' version '2.1.4.RELEASE' id 'org.springframework.boot' version '2.2.5.RELEASE'
id 'java' id 'java'
} }
apply plugin: 'io.spring.dependency-management' apply plugin: 'io.spring.dependency-management'
group = 'ru.serega6531' group = 'ru.serega6531'
version = '0.0.1-SNAPSHOT' version = '1.0-SNAPSHOT'
sourceCompatibility = '1.8'
sourceCompatibility = JavaVersion.VERSION_13
targetCompatibility = JavaVersion.VERSION_13
configurations { configurations {
compileOnly { compileOnly {
@@ -25,7 +27,7 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-security" implementation "org.springframework.boot:spring-boot-starter-security"
implementation "org.springframework.boot:spring-boot-starter-websocket" implementation "org.springframework.boot:spring-boot-starter-websocket"
implementation 'org.springframework.session:spring-session-core' implementation 'org.springframework.session:spring-session-core'
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7' compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
compile group: 'commons-io', name: 'commons-io', version: '2.6' compile group: 'commons-io', name: 'commons-io', version: '2.6'
compile 'org.pcap4j:pcap4j-core:1.8.2' compile 'org.pcap4j:pcap4j-core:1.8.2'
compile 'org.pcap4j:pcap4j-packetfactory-static:1.8.2' compile 'org.pcap4j:pcap4j-packetfactory-static:1.8.2'
@@ -34,5 +36,5 @@ dependencies {
runtimeOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'org.springframework.boot:spring-boot-devtools'
runtimeOnly 'org.postgresql:postgresql' runtimeOnly 'org.postgresql:postgresql'
annotationProcessor 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok'
testCompile 'org.junit.jupiter:junit-jupiter:5.4.2' testCompile 'org.junit.jupiter:junit-jupiter:5.6.0'
} }

2
docker-compose.yml
View File

@@ -18,7 +18,7 @@ services:
network_mode: "host" network_mode: "host"
image: packmate-app:v1 image: packmate-app:v1
command: [ command: [
"/usr/bin/java", "-Djava.net.preferIPv4Stack=true", "-Djava.net.preferIPv4Addresses=true", "java", "-Djava.net.preferIPv4Stack=true", "-Djava.net.preferIPv4Addresses=true",
"-jar", "/app/app.jar", "--spring.datasource.url=jdbc:postgresql://127.0.0.1:65001/$${DB_NAME}", "-jar", "/app/app.jar", "--spring.datasource.url=jdbc:postgresql://127.0.0.1:65001/$${DB_NAME}",
"--spring.datasource.username=$${DB_USER}", "--spring.datasource.password=$${DB_PASSWORD}", "--spring.datasource.username=$${DB_USER}", "--spring.datasource.password=$${DB_PASSWORD}",
"--interface-name=$${INTERFACE}", "--local-ip=$${LOCAL_IP}", "--account-login=$${WEB_LOGIN}", "--interface-name=$${INTERFACE}", "--local-ip=$${LOCAL_IP}", "--account-login=$${WEB_LOGIN}",

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

3
src/main/java/ru/serega6531/packmate/service/StreamSubscriptionService.java
View File

@@ -12,13 +12,14 @@ import ru.serega6531.packmate.model.pojo.SubscriptionMessage;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
@Service @Service
@Slf4j @Slf4j
public class StreamSubscriptionService { public class StreamSubscriptionService {
private List<WebSocketSession> subscribers = new ArrayList<>(); private List<WebSocketSession> subscribers = Collections.synchronizedList(new ArrayList<>());
private final ObjectMapper mapper; private final ObjectMapper mapper;

1
src/main/resources/application.yml
View File

@@ -11,6 +11,7 @@ spring:
hibernate: hibernate:
temp: temp:
use_jdbc_metadata_defaults: false use_jdbc_metadata_defaults: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
enable-capture: true enable-capture: true