diff --git a/docker/Dockerfile-App b/docker/Dockerfile-App index f619b3d..9f489d4 100644 --- a/docker/Dockerfile-App +++ b/docker/Dockerfile-App @@ -29,11 +29,13 @@ RUN mkdir -p /var/log/sanbing && \ mkdir -p /var/log/sanbing/accesslog && \ mkdir -p /var/log/sanbing/gc && \ mkdir -p /var/log/sanbing/heapdump && \ + chown -R sanbing:sanbing /tmp \ chmod 700 -R /var/log/* RUN chmod a+x *.sh && mv start.sh /usr/bin EXPOSE 8080 8080 +USER sanbing ENV APP_LOG_LEVEL=INFO ENV PROTOCOLS_LOG_LEVEL=INFO diff --git a/docker/Dockerfile-Protocol b/docker/Dockerfile-Protocol index 82aae02..2631607 100644 --- a/docker/Dockerfile-Protocol +++ b/docker/Dockerfile-Protocol @@ -29,11 +29,13 @@ RUN mkdir -p /var/log/sanbing && \ mkdir -p /var/log/sanbing/accesslog && \ mkdir -p /var/log/sanbing/gc && \ mkdir -p /var/log/sanbing/heapdump && \ + chown -R sanbing:sanbing /tmp \ chmod 700 -R /var/log/* RUN chmod a+x *.sh && mv start.sh /usr/bin EXPOSE 8081 8081 +USER sanbing ENV PROTOCOLS_LOG_LEVEL=INFO diff --git a/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/VersionedCaffeineCache.java b/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/VersionedCaffeineCache.java index 84d25ba..15bf58e 100644 --- a/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/VersionedCaffeineCache.java +++ b/jcpp-infrastructure-cache/src/main/java/sanbing/jcpp/infrastructure/cache/VersionedCaffeineCache.java @@ -47,10 +47,11 @@ public abstract class VersionedCaffeineCache doGet(K key) { Cache.ValueWrapper source = cache.get(key); - if (source != null && source.get() instanceof JCPPPair pair) { - return pair; + if (source != null && source.get() instanceof JCPPPair pair) { + return (JCPPPair) pair; } return null; } diff --git a/pom.xml b/pom.xml index 3fcf2fd..0caac5f 100644 --- a/pom.xml +++ b/pom.xml @@ -482,6 +482,15 @@ itCoverageAgent + + report + + report + + + ${project.build.directory} + +