Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
2201063
hserver framework submit
Jul 11, 2021
2372abf
hserver framework submit
Jul 13, 2021
4645735
lowercase fix
Jul 13, 2021
34abb9c
Required response header missing: Date fix
Jul 13, 2021
48e0299
Date format fix
Jul 13, 2021
1a34539
update hserver version
Jan 8, 2022
f389281
Merge branch 'master' into master
heixiaoma Jan 8, 2022
11ff9ff
update hserver threadPool
Jan 8, 2022
79e72f1
Merge remote-tracking branch 'origin/master'
Jan 8, 2022
4ddc0a7
update hserver
Jan 8, 2022
d6b9465
update hserver
Jan 8, 2022
54ec2ac
update hserver query
Jan 14, 2022
e29bd7b
Merge branch 'master' into master
heixiaoma Jan 14, 2022
7054a68
update hserver query
Jan 14, 2022
c0352e0
Merge remote-tracking branch 'origin/master'
Jan 14, 2022
5cda39e
Update README.md
heixiaoma Jan 14, 2022
e5c6c40
update hserver query
Jan 14, 2022
fb27667
Merge remote-tracking branch 'origin/master'
Jan 14, 2022
331357f
update hserver query
Jan 14, 2022
42551fb
update hserver query
Jan 14, 2022
e290975
update hserver query
Jan 14, 2022
33ee67d
update hserver query
Jan 14, 2022
0da62ec
update hserver query
Jan 14, 2022
8c04a31
Optimal configuration of hserver framework
Feb 22, 2022
8b4202f
Merge branch 'master' into master
heixiaoma Feb 22, 2022
7b05c46
Optimal configuration of hserver framework
Feb 24, 2022
d1adc57
Merge remote-tracking branch 'origin/master'
Feb 24, 2022
901ad63
Merge branch 'master' into master
heixiaoma Feb 24, 2022
00a4601
Optimal configuration of hserver framework
Feb 24, 2022
2779154
Merge remote-tracking branch 'origin/master'
Feb 24, 2022
5eb9a61
Upgrade hserver Framework version and optimize configuration
Feb 28, 2022
6e5b845
Upgrade hserver Framework version and optimize configuration
Mar 10, 2022
21dad96
Upgrade hserver Framework version and optimize configuration
Mar 23, 2022
5de801c
Merge branch 'master' into master
heixiaoma Mar 23, 2022
04b0335
Upgrade hserver Framework version and optimize configuration
Mar 23, 2022
852b985
Merge remote-tracking branch 'origin/master'
Mar 23, 2022
5982b4b
Upgrade hserver Framework version and optimize configuration
Mar 23, 2022
f9c4368
Upgrade hserver Framework version and optimize configuration
Apr 7, 2022
2060dde
Merge branch 'master' into master
heixiaoma Apr 7, 2022
f9c9d4c
Upgrade hserver Framework version and optimize configuration
Apr 10, 2022
eff679f
Merge remote-tracking branch 'origin/master'
Apr 10, 2022
7864f59
Upgrade hserver Framework version and optimize configuration
Apr 18, 2022
f395f08
Upgrade hserver Framework version and optimize configuration
May 9, 2022
8a0d0ed
Merge branch 'master' into master
heixiaoma May 9, 2022
d7ae70a
Upgrade hserver Framework version and optimize configuration
May 19, 2022
fbec0ff
Merge remote-tracking branch 'origin/master'
May 19, 2022
77b5e76
Merge branch 'master' into master
heixiaoma May 19, 2022
0f70c9a
Upgrade hserver Framework version and optimize configuration
Jun 9, 2022
7ab727a
Merge remote-tracking branch 'origin/master'
Jun 9, 2022
4291b92
Upgrade hserver Framework version and optimize configuration
Jun 11, 2022
83ae07f
Merge branch 'master' into master
heixiaoma Jun 11, 2022
c0388ea
Upgrade hserver Framework version and optimize configuration
Jun 11, 2022
a9d7e30
Merge remote-tracking branch 'origin/master'
Jun 11, 2022
2d619df
Upgrade hserver Framework version and optimize configuration
Aug 28, 2022
98a1e8a
Merge branch 'master' into master
heixiaoma Aug 28, 2022
f524967
Upgrade hserver Framework version and optimize configuration
Nov 1, 2022
107032e
Merge branch 'master' into master
heixiaoma Nov 1, 2022
bc47fd2
Merge branch 'TechEmpower:master' into master
heixiaoma Nov 16, 2023
a3a78b3
Update pom.xml
heixiaoma Nov 16, 2023
1afb9c0
Merge branch 'TechEmpower:master' into master
heixiaoma Dec 7, 2023
79c4fc8
Upgrade hserver Framework version and optimize configuration
Dec 7, 2023
44284a1
Upgrade hserver Framework version and optimize configuration and Opti…
Dec 7, 2023
4e1588d
Merge branch 'TechEmpower:master' into master
heixiaoma Jun 15, 2024
a82d883
Update pom.xml
heixiaoma Jun 15, 2024
18ba90b
Update StartApp.java
heixiaoma Jun 15, 2024
9a45a93
Merge branch 'TechEmpower:master' into master
heixiaoma Oct 25, 2024
af5bb2c
1
Oct 25, 2024
0fccf97
1
Oct 25, 2024
a2a348f
1
Oct 25, 2024
39de093
update jdk version
Oct 25, 2024
8e73620
update version
Oct 25, 2024
bdc6e2b
update version
Oct 25, 2024
9075d86
update version
Oct 25, 2024
eb19d4a
Update app.properties
heixiaoma Oct 25, 2024
37af954
Update config.toml
heixiaoma Oct 25, 2024
9ad6d61
Update benchmark_config.json
heixiaoma Oct 25, 2024
1325d51
Update benchmark_config.json
heixiaoma Oct 25, 2024
43710ca
Update config.toml
heixiaoma Oct 25, 2024
feed5e4
Upgrade hserver Framework version and optimize configuration
Oct 25, 2024
2f0a0b2
Upgrade hserver Framework version and optimize configuration
Oct 25, 2024
e9599d8
Upgrade hserver Framework version and optimize configuration
Oct 25, 2024
a2f00a1
update version
Oct 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions frameworks/Java/hserver/benchmark_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
{
"default": {
"db_url": "/db",
"query_url": "/queries?queries=",
"fortune_url": "/fortunes",
"plaintext_url": "/plaintext",
"update_url": "/updates?queries=",
"json_url": "/json",
"query_url": "/queries?queries=",
"update_url": "/updates?queries=",
"port": 8888,
"approach": "Realistic",
"classification": "Fullstack",
Expand All @@ -18,8 +18,8 @@
"language": "Java",
"flavor": "None",
"orm": "Full",
"platform": "None",
"webserver": "None",
"platform": "hserver",
"webserver": "hserver",
"os": "Linux",
"database_os": "Linux",
"display_name": "hserver",
Expand All @@ -28,4 +28,4 @@
}
}
]
}
}
6 changes: 3 additions & 3 deletions frameworks/Java/hserver/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ approach = "Realistic"
classification = "Fullstack"
os = "Linux"
orm = "Full"
platform = "None"
webserver = "None"
versus = "hserver"
platform = "hserver"
webserver = "hserver"
versus = "hserver"
6 changes: 3 additions & 3 deletions frameworks/Java/hserver/hserver.dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM maven:3.6.3-openjdk-8-slim as maven
FROM maven:3.8.4-openjdk-17-slim as maven
WORKDIR /hserver
COPY pom.xml pom.xml
COPY src src
RUN mvn package

FROM openjdk:8u275-jdk-slim
FROM openjdk:17.0.2
WORKDIR /hserver
COPY --from=maven /hserver/target/hserver-1.0.jar app.jar

EXPOSE 8888

CMD ["java", "-jar", "app.jar"]
CMD ["java", "-jar", "app.jar"]
2 changes: 1 addition & 1 deletion frameworks/Java/hserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<artifactId>hserver-parent</artifactId>
<groupId>cn.hserver</groupId>
<version>3.5.M2</version>
<version>3.6.0</version>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
import cn.hserver.core.ioc.annotation.Autowired;
import cn.hserver.plugin.web.annotation.Controller;
import cn.hserver.plugin.web.annotation.GET;
import cn.hserver.plugin.web.interfaces.HttpRequest;
import cn.hserver.plugin.web.interfaces.HttpResponse;
import com.test.hserver.bean.Fortune;
import com.test.hserver.bean.Message;
import com.test.hserver.bean.World;
import com.test.hserver.util.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.sql.DataSource;
import java.sql.Connection;
Expand Down Expand Up @@ -59,8 +62,8 @@ public void db(HttpResponse response) throws SQLException {
}

@GET("/queries")
public void queries(String queries,HttpResponse response) throws Exception {
World[] result = new World[getQueries(queries)];
public void queries(HttpRequest request,HttpResponse response) throws Exception {
World[] result = new World[getQueries(request.query("queries"))];
try (Connection conn = dataSource.getConnection()) {
for (int i = 0; i < result.length; i++) {
try (final PreparedStatement statement = conn.prepareStatement(SELECT_WORLD)) {
Expand All @@ -78,8 +81,8 @@ public void queries(String queries,HttpResponse response) throws Exception {


@GET("/updates")
public void updates(String queries,HttpResponse response) throws Exception {
World[] result = new World[getQueries(queries)];
public void updates(HttpRequest request,HttpResponse response) throws Exception {
World[] result = new World[getQueries(request.query("queries"))];
StringJoiner updateSql = new StringJoiner(
", ",
"UPDATE world SET randomNumber = temp.randomNumber FROM (VALUES ",
Expand Down
Loading