Skip to content

Commit 04c9461

Browse files
smthingsmthing
authored
update dockerfile (#8573)
* update smart-servlet to 0.1.3-SNAPSHOT * update aio-enhance to 1.0.3-SNAPSHOT * smart-servlet bugfix * bugfix * update smart-socket to 1.5.6-SNAPSHOT * remove file * update aio-enhance to 1.0.4-SNAPSHOT * 优化代码 * 优化代码 * update smart-socket to 1.5.6 * config threadNum * update smart-socket to 1.5.7-SNAPSHOT * 优化代码 * update smart-socket to 1.5.10-SNAPSHOT * 优化代码 * 优化代码 * 优化代码 * 异常aio-enhance * 优化代码 * 优化代码 * 优化代码 * remove aio-pro * remove headerLimiter * update hikaricp version * replace json util * 更新线程模型 * upgrade smart-servlet to 0.1.9-SNAPSHOT * config thread num * config thread num * revert code * revert code * upgrade smart-servlet to 0.2.1-SNAPSHOT * upgrade smart-servlet to 0.6-SNAPSHOT * upgrade smart-servlet to 0.6-SNAPSHOT * upgrade smart-servlet to 0.6-SNAPSHOT * upgrade smart-servlet to 0.6-SNAPSHOT * upgrade smart-servlet to 0.6-SNAPSHOT * upgrade smart-servlet to 0.6-SNAPSHOT * upgrade smart-servlet to 0.6-SNAPSHOT
1 parent 1883313 commit 04c9461

File tree

7 files changed

+66
-69
lines changed

7 files changed

+66
-69
lines changed

‎frameworks/Java/smart-socket/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<packaging>jar</packaging>
99
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11-
<maven.compiler.source>11</maven.compiler.source>
12-
<maven.compiler.target>11</maven.compiler.target>
11+
<maven.compiler.source>17</maven.compiler.source>
12+
<maven.compiler.target>17</maven.compiler.target>
1313
<log4j.version>2.17.1</log4j.version>
14-
<smartservlet.version>0.2.1-SNAPSHOT</smartservlet.version>
14+
<smartservlet.version>0.6-SNAPSHOT</smartservlet.version>
1515
<hikaricp.version>5.0.0</hikaricp.version>
1616
<jsoniter.version>0.9.23</jsoniter.version>
1717
</properties>

‎frameworks/Java/smart-socket/smart-socket-smart-servlet.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3.8.6-openjdk-18-slim as maven
22
WORKDIR /smart-socket
33
COPY pom.xml pom.xml
44
COPY src src
55
RUN mvn compile assembly:single -q
66

7-
FROM openjdk:11.0.3-jdk-slim
7+
FROM openjdk:21-jdk-slim
88
WORKDIR /smart-socket
99
COPY --from=maven /smart-socket/target/smart-socket-benchmark-1.0-jar-with-dependencies.jar app.jar
1010

1111
EXPOSE 8080
1212

13-
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-cp", "app.jar", "org.smartboot.servlet.Bootstrap"]
13+
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-cp", "app.jar", "org.smartboot.servlet.Bootstrap"]

‎frameworks/Java/smart-socket/smart-socket.dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM maven:3.6.1-jdk-11-slim as maven
1+
FROM maven:3.8.6-openjdk-18-slim as maven
22
WORKDIR /smart-socket
33
COPY pom.xml pom.xml
44
COPY src src
55
RUN mvn compile assembly:single -q
66

7-
FROM openjdk:11.0.3-jdk-slim
7+
FROM openjdk:21-jdk-slim
88
WORKDIR /smart-socket
99
COPY --from=maven /smart-socket/target/smart-socket-benchmark-1.0-jar-with-dependencies.jar app.jar
1010

1111
EXPOSE 8080
1212

13-
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-cp", "app.jar", "org.smartboot.http.Bootstrap"]
13+
CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-cp", "app.jar", "org.smartboot.http.Bootstrap"]

‎frameworks/Java/smart-socket/src/main/java/org/smartboot/http/JsonUtil.java

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,69 @@
11
package org.smartboot.http;
22

3+
import com.jsoniter.output.JsonStream;
4+
import com.jsoniter.output.JsonStreamPool;
35
import com.jsoniter.spi.JsonException;
4-
import io.edap.x.json.Eson;
5-
import io.edap.x.json.JsonWriter;
6+
import com.jsoniter.spi.Slice;
7+
import jakarta.servlet.http.HttpServletResponse;
68
import org.smartboot.http.server.HttpResponse;
79

8-
import javax.servlet.http.HttpServletResponse;
910
import java.io.IOException;
1011

1112
/**
1213
* @author 三刀
1314
* @version V1.0 , 2020/6/16
1415
*/
1516
public class JsonUtil {
17+
// public static void writeJsonBytes(HttpResponse httpResponse, Object obj) {
18+
// JsonWriter writer = Eson.THREAD_WRITER.get();
19+
// try {
20+
// writer.reset();
21+
// Eson.serialize(obj, writer);
22+
// httpResponse.setContentLength(writer.size());
23+
// writer.toStream(httpResponse.getOutputStream());
24+
// } catch (IOException e) {
25+
// throw new JsonException(e);
26+
// }
27+
// }
1628
public static void writeJsonBytes(HttpResponse httpResponse, Object obj) {
17-
JsonWriter writer = Eson.THREAD_WRITER.get();
29+
JsonStream stream = JsonStreamPool.borrowJsonStream();
1830
try {
19-
writer.reset();
20-
Eson.serialize(obj, writer);
21-
httpResponse.setContentLength(writer.size());
22-
writer.toStream(httpResponse.getOutputStream());
31+
stream.reset(null);
32+
stream.writeVal(obj.getClass(), obj);
33+
Slice slice = stream.buffer();
34+
httpResponse.setContentLength(slice.tail());
35+
httpResponse.getOutputStream().write(slice.data(), 0, slice.tail());
2336
} catch (IOException e) {
2437
throw new JsonException(e);
38+
} finally {
39+
JsonStreamPool.returnJsonStream(stream);
2540
}
2641
}
2742

28-
// public static void writeJsonBytes(HttpResponse httpResponse, Object obj) {
29-
// JsonStream stream = JsonStreamPool.borrowJsonStream();
30-
// try {
31-
// stream.reset(null);
32-
// stream.writeVal(obj.getClass(), obj);
33-
// Slice slice = stream.buffer();
34-
// httpResponse.setContentLength(slice.tail());
35-
// httpResponse.getOutputStream().write(slice.data(), 0, slice.tail());
36-
// } catch (IOException e) {
37-
// throw new JsonException(e);
38-
// } finally {
39-
// JsonStreamPool.returnJsonStream(stream);
40-
// }
41-
// }
43+
public static void writeJsonBytes(HttpServletResponse httpResponse, Object obj) {
44+
JsonStream stream = JsonStreamPool.borrowJsonStream();
45+
try {
46+
stream.reset(null);
47+
stream.writeVal(obj.getClass(), obj);
48+
Slice slice = stream.buffer();
49+
httpResponse.setContentLength(slice.tail());
50+
httpResponse.getOutputStream().write(slice.data(), 0, slice.tail());
51+
} catch (IOException e) {
52+
throw new JsonException(e);
53+
} finally {
54+
JsonStreamPool.returnJsonStream(stream);
55+
}
56+
}
4257

4358
// public static void writeJsonBytes(HttpServletResponse httpResponse, Object obj) {
44-
// JsonStream stream = JsonStreamPool.borrowJsonStream();
59+
// JsonWriter writer = Eson.THREAD_WRITER.get();
4560
// try {
46-
// stream.reset(null);
47-
// stream.writeVal(obj.getClass(), obj);
48-
// Slice slice = stream.buffer();
49-
// httpResponse.setContentLength(slice.tail());
50-
// httpResponse.getOutputStream().write(slice.data(), 0, slice.tail());
61+
// writer.reset();
62+
// Eson.serialize(obj, writer);
63+
// httpResponse.setContentLength(writer.size());
64+
// writer.toStream(httpResponse.getOutputStream());
5165
// } catch (IOException e) {
5266
// throw new JsonException(e);
53-
// } finally {
54-
// JsonStreamPool.returnJsonStream(stream);
5567
// }
5668
// }
57-
58-
public static void writeJsonBytes(HttpServletResponse httpResponse, Object obj) {
59-
JsonWriter writer = Eson.THREAD_WRITER.get();
60-
try {
61-
writer.reset();
62-
Eson.serialize(obj, writer);
63-
httpResponse.setContentLength(writer.size());
64-
writer.toStream(httpResponse.getOutputStream());
65-
} catch (IOException e) {
66-
throw new JsonException(e);
67-
}
68-
}
6969
}

‎frameworks/Java/smart-socket/src/main/java/org/smartboot/servlet/Bootstrap.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,17 @@
44
import org.smartboot.http.server.HttpRequest;
55
import org.smartboot.http.server.HttpResponse;
66
import org.smartboot.http.server.HttpServerHandler;
7-
import org.smartboot.http.server.impl.Request;
87
import org.smartboot.servlet.conf.ServletInfo;
9-
import org.smartboot.socket.StateMachineEnum;
10-
import org.smartboot.socket.extension.processor.AbstractMessageProcessor;
11-
import org.smartboot.socket.transport.AioSession;
128

13-
import java.io.IOException;
9+
import java.util.concurrent.CompletableFuture;
1410

1511
/**
1612
* @author 三刀（[email protected]）
1713
* @version V1.0 , 2020/12/22
1814
*/
1915
public class Bootstrap {
2016

21-
public static void main(String[] args) {
17+
public static void main(String[] args) throws Throwable {
2218
ContainerRuntime containerRuntime = new ContainerRuntime();
2319
// plaintext
2420
ServletContextRuntime applicationRuntime = new ServletContextRuntime("/");
@@ -50,8 +46,8 @@ public static void main(String[] args) {
5046
bootstrap.setPort(8080)
5147
.httpHandler(new HttpServerHandler() {
5248
@Override
53-
public void handle(HttpRequest request, HttpResponse response) throws IOException {
54-
containerRuntime.doHandle(request, response);
49+
public void handle(HttpRequest request, HttpResponse response, CompletableFuture<Object> completableFuture) throws Throwable {
50+
containerRuntime.doHandle(request, response, completableFuture);
5551
}
5652
})
5753
.start();

‎frameworks/Java/smart-socket/src/main/java/org/smartboot/servlet/HelloWorldServlet.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.smartboot.servlet;
22

3-
import javax.servlet.ServletException;
4-
import javax.servlet.http.HttpServlet;
5-
import javax.servlet.http.HttpServletRequest;
6-
import javax.servlet.http.HttpServletResponse;
3+
import jakarta.servlet.ServletException;
4+
import jakarta.servlet.http.HttpServlet;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletResponse;
7+
78
import java.io.IOException;
89

910
/**
@@ -16,7 +17,7 @@ public class HelloWorldServlet extends HttpServlet {
1617
@Override
1718
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
1819
resp.setContentLength(BODY.length);
19-
resp.setContentType("text/plain; charset=UTF-8");
20+
resp.setContentType("text/plain;charset=UTF-8");
2021
resp.setBufferSize(0);
2122
resp.getOutputStream().write(BODY);
2223
}

‎frameworks/Java/smart-socket/src/main/java/org/smartboot/servlet/JsonServlet.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.smartboot.servlet;
22

3+
import jakarta.servlet.ServletException;
4+
import jakarta.servlet.http.HttpServlet;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletResponse;
37
import org.smartboot.Message;
48
import org.smartboot.http.JsonUtil;
59

6-
import javax.servlet.ServletException;
7-
import javax.servlet.http.HttpServlet;
8-
import javax.servlet.http.HttpServletRequest;
9-
import javax.servlet.http.HttpServletResponse;
1010
import java.io.IOException;
1111

1212
/**
@@ -16,7 +16,7 @@
1616
public class JsonServlet extends HttpServlet {
1717
@Override
1818
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
19-
resp.setContentType("application/json");
19+
resp.setContentType("application/json;charset=UTF-8");
2020
resp.setBufferSize(0);
2121
JsonUtil.writeJsonBytes(resp, new Message("Hello, World!"));
2222
}

0 commit comments

Comments
 (0)