Skip to content

Commit cb99cc7

Browse files
litongjavalitongjava
litongjava
and
litongjava
authored
update to tio-http-server 3.7.3.v20250301-RELEASE (#9608)
* update tio-http-server version * update dockerfile --------- Co-authored-by: litongjava <[email protected]>
1 parent 697b36c commit cb99cc7

File tree

6 files changed

+91
-201
lines changed

6 files changed

+91
-201
lines changed

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

Lines changed: 64 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
<dependency>
1717
<groupId>com.litongjava</groupId>
1818
<artifactId>tio-http-server</artifactId>
19-
<version>3.7.3.v20240919-RELEASE</version>
19+
<version>3.7.3.v20250301-RELEASE</version>
2020
</dependency>
2121
<dependency>
2222
<groupId>com.litongjava</groupId>
2323
<artifactId>java-db</artifactId>
24-
<version>1.2.6</version>
24+
<version>1.4.9</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>junit</groupId>
@@ -31,16 +31,6 @@
3131
</dependency>
3232

3333

34-
<!-- https://mvnrepository.com/artifact/com.jfinal/activerecord -->
35-
<!--
36-
<dependency>
37-
<groupId>com.jfinal</groupId>
38-
<artifactId>activerecord</artifactId>
39-
<version>5.1.6</version>
40-
</dependency>
41-
-->
42-
43-
4434
<dependency>
4535
<groupId>com.alibaba.fastjson2</groupId>
4636
<artifactId>fastjson2</artifactId>
@@ -66,144 +56,67 @@
6656
</dependency>
6757

6858
</dependencies>
69-
<profiles>
70-
<!-- 开发环境 -->
71-
<profile>
72-
<id>development</id>
73-
<activation>
74-
<activeByDefault>true</activeByDefault>
75-
</activation>
76-
<dependencies>
77-
<dependency>
78-
<groupId>ch.qos.logback</groupId>
79-
<artifactId>logback-classic</artifactId>
80-
<version>1.2.13</version>
81-
</dependency>
82-
</dependencies>
83-
</profile>
59+
<repositories>
60+
<repository>
61+
<id>central</id>
62+
<name>Central Repository</name>
63+
<url>https://repo.maven.apache.org/maven2</url>
64+
</repository>
65+
<repository>
66+
<id>sonatype-nexus-snapshots</id>
67+
<name>Sonatype Nexus Snapshots</name>
68+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
69+
</repository>
70+
</repositories>
71+
<pluginRepositories>
72+
<pluginRepository>
73+
<id>central</id>
74+
<name>Central Repository</name>
75+
<url>https://repo.maven.apache.org/maven2</url>
76+
</pluginRepository>
77+
<pluginRepository>
78+
<id>sonatype-nexus-snapshots</id>
79+
<name>Sonatype Nexus Snapshots</name>
80+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
81+
<releases>
82+
<enabled>false</enabled>
83+
</releases>
84+
<snapshots>
85+
<enabled>true</enabled>
86+
</snapshots>
87+
</pluginRepository>
88+
</pluginRepositories>
89+
<build>
90+
<plugins>
91+
92+
<plugin>
93+
<inherited>true</inherited>
94+
<groupId>org.apache.maven.plugins</groupId>
95+
<artifactId>maven-compiler-plugin</artifactId>
96+
<version>3.8.0</version>
97+
<configuration>
98+
<debug>false</debug>
99+
</configuration>
100+
</plugin>
84101

85-
<!-- 生产环境 -->
86-
<profile>
87-
<id>production</id>
88-
<dependencies>
89-
<dependency>
90-
<groupId>ch.qos.logback</groupId>
91-
<artifactId>logback-classic</artifactId>
92-
<version>1.2.13</version>
93-
</dependency>
94-
</dependencies>
95-
<build>
96-
<plugins>
97-
<plugin>
98-
<groupId>org.springframework.boot</groupId>
99-
<artifactId>spring-boot-maven-plugin</artifactId>
100-
<version>2.7.4</version>
101-
<configuration>
102-
<mainClass>${main.class}</mainClass>
103-
<excludeGroupIds>org.projectlombok</excludeGroupIds>
104-
</configuration>
105-
<!-- 设置执行目标 -->
106-
<executions>
107-
<execution>
108-
<goals>
109-
<goal>repackage</goal>
110-
</goals>
111-
</execution>
112-
</executions>
113-
</plugin>
114-
</plugins>
115-
</build>
116-
</profile>
117-
<!-- assembly -->
118-
<profile>
119-
<id>assembly</id>
120-
<dependencies>
121-
<dependency>
122-
<groupId>ch.qos.logback</groupId>
123-
<artifactId>logback-classic</artifactId>
124-
<version>1.2.13</version>
125-
</dependency>
126-
</dependencies>
127-
<build>
128-
<plugins>
129-
<plugin>
130-
<groupId>org.apache.maven.plugins</groupId>
131-
<artifactId>maven-jar-plugin</artifactId>
132-
<version>3.2.0</version>
133-
</plugin>
134-
<plugin>
135-
<groupId>org.apache.maven.plugins</groupId>
136-
<artifactId>maven-assembly-plugin</artifactId>
137-
<version>3.1.1</version>
138-
<configuration>
139-
<archive>
140-
<manifest>
141-
<mainClass>${main.class}</mainClass>
142-
</manifest>
143-
</archive>
144-
<descriptorRefs>
145-
<descriptorRef>jar-with-dependencies</descriptorRef>
146-
</descriptorRefs>
147-
<appendAssemblyId>false</appendAssemblyId>
148-
</configuration>
149-
<executions>
150-
<execution>
151-
<id>make-assembly</id>
152-
<phase>package</phase>
153-
<goals>
154-
<goal>single</goal>
155-
</goals>
156-
</execution>
157-
</executions>
158-
</plugin>
159-
</plugins>
160-
</build>
161-
</profile>
162-
<profile>
163-
<id>native</id>
164-
<dependencies>
165-
<!-- GraalVM 环境使用 jdk log -->
166-
<dependency>
167-
<groupId>org.slf4j</groupId>
168-
<artifactId>slf4j-jdk14</artifactId>
169-
<version>1.7.31</version>
170-
</dependency>
171-
<!-- GraalVM -->
172-
<dependency>
173-
<groupId>org.graalvm.sdk</groupId>
174-
<artifactId>graal-sdk</artifactId>
175-
<version>${graalvm.version}</version>
176-
<scope>provided</scope>
177-
</dependency>
178-
</dependencies>
179-
<build>
180-
<finalName>${project.artifactId}</finalName>
181-
<plugins>
182-
<plugin>
183-
<groupId>org.graalvm.nativeimage</groupId>
184-
<artifactId>native-image-maven-plugin</artifactId>
185-
<version>21.2.0</version>
186-
<executions>
187-
<execution>
188-
<goals>
189-
<goal>native-image</goal>
190-
</goals>
191-
<phase>package</phase>
192-
</execution>
193-
</executions>
194-
<configuration>
195-
<skip>false</skip>
196-
<imageName>${project.artifactId}</imageName>
197-
<mainClass>${main.class}</mainClass>
198-
<buildArgs>
199-
-H:+RemoveSaturatedTypeFlows
200-
--allow-incomplete-classpath
201-
--no-fallback
202-
</buildArgs>
203-
</configuration>
204-
</plugin>
205-
</plugins>
206-
</build>
207-
</profile>
208-
</profiles>
102+
<plugin>
103+
<artifactId>maven-assembly-plugin</artifactId>
104+
<version>3.1.0</version>
105+
<configuration>
106+
<descriptorRefs>
107+
<descriptorRef>jar-with-dependencies</descriptorRef>
108+
</descriptorRefs>
109+
</configuration>
110+
<executions>
111+
<execution>
112+
<id>make-assembly</id>
113+
<phase>package</phase>
114+
<goals>
115+
<goal>single</goal>
116+
</goals>
117+
</execution>
118+
</executions>
119+
</plugin>
120+
</plugins>
121+
</build>
209122
</project>

‎frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/MainApp.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import com.litongjava.tio.http.server.controller.DbController;
1010
import com.litongjava.tio.http.server.controller.IndexController;
1111
import com.litongjava.tio.http.server.handler.DefaultHttpRequestDispatcher;
12-
import com.litongjava.tio.http.server.router.DefaultHttpReqeustRouter;
12+
import com.litongjava.tio.http.server.router.DefaultHttpRequestRouter;
1313
import com.litongjava.tio.http.server.router.HttpRequestRouter;
1414
import com.litongjava.tio.server.ServerTioConfig;
1515
import com.litongjava.tio.utils.environment.EnvUtils;
@@ -18,11 +18,12 @@ public class MainApp {
1818

1919
public static void main(String[] args) {
2020
long start = System.currentTimeMillis();
21+
EnvUtils.buildCmdArgsMap(args);
2122
EnvUtils.load();
2223
// add route
2324
IndexController controller = new IndexController();
2425

25-
HttpRequestRouter simpleHttpRoutes = new DefaultHttpReqeustRouter();
26+
HttpRequestRouter simpleHttpRoutes = new DefaultHttpRequestRouter();
2627
simpleHttpRoutes.add("/", controller::index);
2728
simpleHttpRoutes.add("/plaintext", controller::plaintext);
2829
simpleHttpRoutes.add("/json", controller::json);
@@ -49,9 +50,16 @@ public static void main(String[] args) {
4950
// close Heartbeat
5051
serverTioConfig.setHeartbeatTimeout(0);
5152
serverTioConfig.statOn = false;
53+
boolean db = EnvUtils.getBoolean("db", true);
54+
if (db) {
55+
try {
56+
new MysqlDbConfig().init();
57+
} catch (Exception e) {
58+
e.printStackTrace();
59+
}
60+
}
5261
// start server
5362
try {
54-
new MysqlDbConfig().init();
5563
new EnjoyEngineConfig().engine();
5664
new EhCachePluginConfig().ehCachePlugin();
5765
httpServerStarter.start();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import com.alibaba.fastjson2.JSON;
99
import com.litongjava.db.activerecord.Db;
10-
import com.litongjava.db.activerecord.Record;
10+
import com.litongjava.db.activerecord.Row;
1111
import com.litongjava.tio.http.common.HeaderName;
1212
import com.litongjava.tio.http.common.HeaderValue;
1313
import com.litongjava.tio.http.common.HttpRequest;
@@ -24,7 +24,7 @@ public HttpResponse cachedQuery(HttpRequest request) {
2424
.limit(RandomUtils.parseQueryCount(queries)) // 限制查询数量
2525
.mapToObj(id -> findByIdWithCache("world", id)) // 使用 mapToObj 将 int 映射为对象
2626
.filter(Objects::nonNull) // 过滤掉 null 值
27-
.map(Record::toMap) // 将每个 Record 对象转换为 Map
27+
.map(Row::toMap) // 将每个 Record 对象转换为 Map
2828
.collect(Collectors.toList()); // 收集到 List
2929

3030
HttpResponse httpResponse = new HttpResponse(request);
@@ -34,7 +34,7 @@ public HttpResponse cachedQuery(HttpRequest request) {
3434

3535
}
3636

37-
private Record findByIdWithCache(String tableName, int id) {
37+
private Row findByIdWithCache(String tableName, int id) {
3838
String sql = "SELECT id, randomNumber FROM world WHERE id = ?";
3939
return Db.findFirstByCache(tableName, id, sql, id);
4040
}

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@
1212
import com.jfinal.template.Engine;
1313
import com.jfinal.template.Template;
1414
import com.litongjava.db.activerecord.Db;
15-
import com.litongjava.db.activerecord.Record;
16-
import com.litongjava.ehcache.EhCache;
15+
import com.litongjava.db.activerecord.Row;
16+
import com.litongjava.ehcache.EhCacheKit;
1717
import com.litongjava.tio.http.common.HeaderName;
1818
import com.litongjava.tio.http.common.HeaderValue;
1919
import com.litongjava.tio.http.common.HttpRequest;
2020
import com.litongjava.tio.http.common.HttpResponse;
2121
import com.litongjava.tio.http.server.model.Fortune;
2222
import com.litongjava.tio.http.server.util.Resps;
23-
import com.litongjava.tio.http.server.utils.BeanConverterUtils;
2423
import com.litongjava.tio.http.server.utils.RandomUtils;
2524

2625
public class DbController {
@@ -37,7 +36,7 @@ public HttpResponse db(HttpRequest request) {
3736
// int id = 11;
3837
// String sql="SELECT id, randomNumber FROM world WHERE id = ?";
3938

40-
Record recored = Db.findById("world", id);
39+
Row recored = Db.findById("world", id);
4140
if (recored != null) {
4241
httpResponse.setBody(JSON.toJSONBytes(recored.toMap()));
4342
} else {
@@ -57,7 +56,7 @@ public HttpResponse queries(HttpRequest request) {
5756
.limit(RandomUtils.parseQueryCount(queries)) // 限制查询数量
5857
.mapToObj(id -> Db.findById("world", id)) // 使用 mapToObj 将 int 映射为对象
5958
.filter(Objects::nonNull) // 过滤掉 null 值
60-
.map(Record::toMap) // 将每个 Record 对象转换为 Map
59+
.map(Row::toMap) // 将每个 Record 对象转换为 Map
6160
.collect(Collectors.toList()); // 收集到 List
6261

6362
HttpResponse httpResponse = new HttpResponse(request);
@@ -66,11 +65,11 @@ public HttpResponse queries(HttpRequest request) {
6665
return httpResponse;
6766
}
6867

69-
//@GetMapping("/updates")
68+
//@GetMapping("/updates")
7069
public HttpResponse updates(HttpRequest request) {
7170
String queries = request.getParam("queries");
7271

73-
EhCache.removeAll("world");
72+
EhCacheKit.removeAll("world");
7473

7574
List<Map<String, Object>> updatedRecords = RandomUtils.randomWorldNumbers()// random numbers
7675
// limit
@@ -90,7 +89,7 @@ public HttpResponse updates(HttpRequest request) {
9089
return record;
9190
})
9291
// tomap
93-
.map(Record::toMap)
92+
.map(Row::toMap)
9493
// to List
9594
.collect(Collectors.toList());
9695

@@ -101,11 +100,11 @@ public HttpResponse updates(HttpRequest request) {
101100
}
102101

103102
public HttpResponse fortunes(HttpRequest request) throws IllegalAccessException, InstantiationException {
104-
List<Record> records = Db.find("SELECT * FROM fortune");
103+
List<Row> records = Db.find("SELECT * FROM fortune");
105104

106105
List<Fortune> fortunes = new ArrayList<>(records.size());
107-
for (Record record : records) {
108-
fortunes.add(BeanConverterUtils.toBean(record.toMap(), Fortune.class));
106+
for (Row record : records) {
107+
fortunes.add(record.toBean(Fortune.class));
109108
}
110109
// 添加额外的 Fortune
111110
fortunes.add(new Fortune(0L, "Additional fortune added at request time."));

0 commit comments

Comments
 (0)