Skip to content

Commit 40d69e2

Browse files
author
litongjava
committed
update docker file and plugin
1 parent f1102c1 commit 40d69e2

File tree

6 files changed

+22
-13
lines changed

6 files changed

+22
-13
lines changed

frameworks/Java/tio-http-server/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,20 @@
2121
<version>3.7.3.v20240701-RELEASE</version>
2222
</dependency>
2323

24+
<dependency>
25+
<groupId>com.litongjava</groupId>
26+
<artifactId>jfinal-plugins</artifactId>
27+
<version>${jfinal-plugins.version}</version>
28+
</dependency>
29+
2430
<!-- https://mvnrepository.com/artifact/com.jfinal/activerecord -->
31+
<!--
2532
<dependency>
2633
<groupId>com.jfinal</groupId>
2734
<artifactId>activerecord</artifactId>
2835
<version>5.1.6</version>
2936
</dependency>
37+
-->
3038

3139

3240
<dependency>

frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/config/EhCachePluginConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.litongjava.tio.http.server.config;
22

3-
import com.jfinal.plugin.ehcache.EhCachePlugin;
3+
import com.litongjava.jfinal.plugin.ehcache.EhCachePlugin;
44

55
public class EhCachePluginConfig {
66

frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/config/MysqlDbConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.litongjava.tio.http.server.config;
22

3-
import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
4-
import com.jfinal.plugin.activerecord.OrderedFieldContainerFactory;
5-
import com.jfinal.plugin.hikaricp.HikariCpPlugin;
3+
import com.litongjava.jfinal.plugin.activerecord.ActiveRecordPlugin;
4+
import com.litongjava.jfinal.plugin.activerecord.OrderedFieldContainerFactory;
5+
import com.litongjava.jfinal.plugin.hikaricp.HikariCpPlugin;
66
import com.litongjava.tio.utils.environment.EnvUtils;
77

88
public class MysqlDbConfig {

frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/controller/CacheController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import java.util.stream.Collectors;
77

88
import com.alibaba.fastjson2.JSON;
9-
import com.jfinal.plugin.activerecord.Db;
10-
import com.jfinal.plugin.activerecord.Record;
9+
import com.litongjava.jfinal.plugin.activerecord.Db;
10+
import com.litongjava.jfinal.plugin.activerecord.Record;
1111
import com.litongjava.tio.http.common.HeaderName;
1212
import com.litongjava.tio.http.common.HeaderValue;
1313
import com.litongjava.tio.http.common.HttpRequest;

frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/controller/DbController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
import java.util.stream.Collectors;
1010

1111
import com.alibaba.fastjson2.JSON;
12-
import com.jfinal.plugin.activerecord.Db;
13-
import com.jfinal.plugin.activerecord.Record;
14-
import com.jfinal.plugin.ehcache.CacheKit;
1512
import com.jfinal.template.Engine;
1613
import com.jfinal.template.Template;
14+
import com.litongjava.jfinal.plugin.activerecord.Db;
15+
import com.litongjava.jfinal.plugin.activerecord.Record;
16+
import com.litongjava.jfinal.plugin.ehcache.CacheKit;
1717
import com.litongjava.tio.http.common.HeaderName;
1818
import com.litongjava.tio.http.common.HeaderValue;
1919
import com.litongjava.tio.http.common.HttpRequest;

frameworks/Java/tio-http-server/tio-server.dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM maven:3.6.1-jdk-8-slim as maven
1+
FROM litongjava/maven:3.8.8-jdk8u391 AS builder
22
WORKDIR /app
33

44
COPY pom.xml pom.xml
@@ -7,10 +7,11 @@ RUN mvn dependency:go-offline
77
COPY src src
88
RUN mvn package -Passembly -q
99

10-
#TODO use separate JDK/JRE for the RUN (as the other builds)
10+
FROM litongjava/jre:8u391-stable-slim
1111

12-
#WORKDIR /app
13-
#COPY target/tio-http-server-benchmark-1.0.jar tio-http-server-benchmark-1.0.jar
12+
WORKDIR /app
13+
14+
COPY --from=builder /src/target/tio-http-server-benchmark-1.0.jar /app/target
1415

1516
EXPOSE 8080
1617

0 commit comments

Comments
 (0)