Skip to content

Commit 5cf6959

Browse files
author
litongjava
committed
update version
1 parent 8e5983e commit 5cf6959

File tree

7 files changed

+30
-128
lines changed

7 files changed

+30
-128
lines changed

frameworks/Java/tio-http-server/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ tio-server-benchmark
100100

101101
-windows
102102
```
103-
D:\java\jdk1.8.0_121\bin\java -jar target\tio-server-benchmark-1.0.jar --JDBC_URL=jdbc:mysql://192.168.3.9/hello_world --JDBC_USER=root --JDBC_PSWD=robot_123456#
103+
D:\java\jdk1.8.0_121\bin\java -jar target\tio-server-benchmark-1.0.jar --JDBC_URL=jdbc:mysql://192.168.3.9/hello_world?useSSL=false --JDBC_USER=root --JDBC_PSWD=robot_123456#
104104
```
105105
or
106106
```

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
32
<modelVersion>4.0.0</modelVersion>
43
<groupId>com.litongjava</groupId>
54
<artifactId>tio-http-server-benchmark</artifactId>
@@ -18,7 +17,7 @@
1817
<dependency>
1918
<groupId>com.litongjava</groupId>
2019
<artifactId>tio-http-server</artifactId>
21-
<version>3.7.3.v20231224-RELEASE</version>
20+
<version>3.7.3.v20240701-RELEASE</version>
2221
</dependency>
2322

2423
<!-- https://mvnrepository.com/artifact/com.jfinal/activerecord -->
@@ -28,6 +27,12 @@
2827
<version>5.1.2</version>
2928
</dependency>
3029

30+
<dependency>
31+
<groupId>com.alibaba.fastjson2</groupId>
32+
<artifactId>fastjson2</artifactId>
33+
<version>2.0.52</version>
34+
</dependency>
35+
3136
<dependency>
3237
<groupId>net.sf.ehcache</groupId>
3338
<artifactId>ehcache-core</artifactId>

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

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

3+
import org.slf4j.Logger;
4+
import org.slf4j.LoggerFactory;
5+
36
import com.litongjava.tio.http.common.HttpConfig;
47
import com.litongjava.tio.http.common.handler.HttpRequestHandler;
58
import com.litongjava.tio.http.server.config.EhCachePluginConfig;
@@ -8,23 +11,22 @@
811
import com.litongjava.tio.http.server.controller.CacheController;
912
import com.litongjava.tio.http.server.controller.DbController;
1013
import com.litongjava.tio.http.server.controller.IndexController;
11-
import com.litongjava.tio.http.server.handler.HttpRoutes;
1214
import com.litongjava.tio.http.server.handler.SimpleHttpDispatcherHandler;
13-
import com.litongjava.tio.http.server.handler.SimpleHttpRoutes;
15+
import com.litongjava.tio.http.server.router.DefaultHttpReqeustSimpleHandlerRoute;
16+
import com.litongjava.tio.http.server.router.HttpReqeustSimpleHandlerRoute;
1417
import com.litongjava.tio.server.ServerTioConfig;
15-
import com.litongjava.tio.utils.environment.EnvironmentUtils;
16-
import org.slf4j.Logger;
17-
import org.slf4j.LoggerFactory;
18+
import com.litongjava.tio.utils.environment.EnvUtils;
1819

1920
public class MainApp {
2021

2122
public static void main(String[] args) {
2223
Logger log = LoggerFactory.getLogger(MainApp.class);
2324
long start = System.currentTimeMillis();
24-
EnvironmentUtils.buildCmdArgsMap(args);
25+
EnvUtils.buildCmdArgsMap(args);
2526
// add route
2627
IndexController controller = new IndexController();
27-
HttpRoutes simpleHttpRoutes = new SimpleHttpRoutes();
28+
29+
HttpReqeustSimpleHandlerRoute simpleHttpRoutes = new DefaultHttpReqeustSimpleHandlerRoute();
2830
simpleHttpRoutes.add("/", controller::index);
2931
simpleHttpRoutes.add("/plaintext", controller::plaintext);
3032
simpleHttpRoutes.add("/json", controller::json);
@@ -54,7 +56,7 @@ public static void main(String[] args) {
5456
// start server
5557
try {
5658
httpServerStarter.start();
57-
if (!EnvironmentUtils.getBoolean("native")) {
59+
if (!EnvUtils.getBoolean("native")) {
5860
new MysqlDbConfig().init();
5961
new EnjoyEngineConfig().engine();
6062
new EhCachePluginConfig().ehCachePlugin();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
44
import com.jfinal.plugin.activerecord.OrderedFieldContainerFactory;
55
import com.jfinal.plugin.hikaricp.HikariCpPlugin;
6-
import com.litongjava.tio.utils.environment.EnvironmentUtils;
6+
import com.litongjava.tio.utils.environment.EnvUtils;
77

88
public class MysqlDbConfig {
99

1010
public void init() {
1111
// start active recored
1212

13-
String jdbcUrl = EnvironmentUtils.get("JDBC_URL");
13+
String jdbcUrl = EnvUtils.get("JDBC_URL");
1414
// String jdbcUrl = "jdbc:mysql://192.168.3.9/hello_world";
1515

16-
String jdbcUser = EnvironmentUtils.get("JDBC_USER");
16+
String jdbcUser = EnvUtils.get("JDBC_USER");
1717
// String jdbcUser = "root";
1818

19-
String jdbcPswd = EnvironmentUtils.get("JDBC_PSWD");
19+
String jdbcPswd = EnvUtils.get("JDBC_PSWD");
2020
// String jdbcPswd = "robot_123456#";
2121
HikariCpPlugin hikariCpPlugin = new HikariCpPlugin(jdbcUrl, jdbcUser, jdbcPswd);
2222

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.litongjava.tio.http.server.controller;
22

3-
import java.util.Collection;
43
import java.util.List;
54
import java.util.Map;
65
import java.util.Objects;
@@ -14,27 +13,23 @@
1413
import com.litongjava.tio.http.common.HttpRequest;
1514
import com.litongjava.tio.http.common.HttpResponse;
1615
import com.litongjava.tio.http.server.utils.RandomUtils;
17-
import com.litongjava.tio.utils.cache.CacheUtils;
18-
import com.litongjava.tio.utils.cache.FirsthandCreater;
19-
import com.litongjava.tio.utils.cache.ICache;
20-
import com.litongjava.tio.utils.cache.caffeine.CaffeineCache;
2116

2217
public class CacheController {
2318
// private Logger log = LoggerFactory.getLogger(this.getClass());
2419

2520
public HttpResponse cacheQuery(HttpRequest request) {
2621
String queries = request.getParam("queries");
2722
List<Map<String, Object>> recordMaps = RandomUtils.randomWorldNumbers()
28-
// limit
29-
.limit(RandomUtils.parseQueryCount(queries)) // 限制查询数量
30-
.mapToObj(id -> findByIdWithCache("world", id)) // 使用 mapToObj 将 int 映射为对象
31-
.filter(Objects::nonNull) // 过滤掉 null 值
32-
.map(Record::toMap) // 将每个 Record 对象转换为 Map
33-
.collect(Collectors.toList()); // 收集到 List
23+
// limit
24+
.limit(RandomUtils.parseQueryCount(queries)) // 限制查询数量
25+
.mapToObj(id -> findByIdWithCache("world", id)) // 使用 mapToObj 将 int 映射为对象
26+
.filter(Objects::nonNull) // 过滤掉 null 值
27+
.map(Record::toMap) // 将每个 Record 对象转换为 Map
28+
.collect(Collectors.toList()); // 收集到 List
3429

3530
HttpResponse httpResponse = new HttpResponse(request);
3631
httpResponse.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_JSON);
37-
httpResponse.setBody(JSON.toJSONString(recordMaps).getBytes());
32+
httpResponse.setBody(JSON.toJSONBytes(recordMaps));
3833
return httpResponse;
3934

4035
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import com.litongjava.tio.http.server.util.Resps;
2323
import com.litongjava.tio.http.server.utils.BeanConverterUtils;
2424
import com.litongjava.tio.http.server.utils.RandomUtils;
25-
import com.litongjava.tio.utils.cache.ICache;
26-
import com.litongjava.tio.utils.cache.caffeine.CaffeineCache;
2725

2826
public class DbController {
2927

frameworks/Java/tio-http-server/src/main/java/com/litongjava/tio/http/server/utils/EnviormentUtils.java

Lines changed: 0 additions & 98 deletions
This file was deleted.

0 commit comments

Comments
 (0)