Skip to content

Commit b1383f0

Browse files
heixiaoma黑小马
heixiaoma
and
黑小马
authored
Update hserver and hserver-business version (TechEmpower#10060)
* Update hserver version 3.7.0 pom.xml * Update hserver version 3.7.0 pom.xml * 4.0.0 * 4.0.0 * 4.0.0 * 4.0.0 --------- Co-authored-by: 黑小马 <[email protected]>
1 parent fb5b6af commit b1383f0

File tree

14 files changed

+92
-100
lines changed

14 files changed

+92
-100
lines changed

‎frameworks/Java/hserver-business/pom.xml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<artifactId>hserver-parent</artifactId>
1313
<groupId>cn.hserver</groupId>
14-
<version>3.7.0</version>
14+
<version>4.0.0-beta.3</version>
1515
</parent>
1616
<properties>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -20,15 +20,14 @@
2020
</properties>
2121

2222
<dependencies>
23-
<!-- 核心依赖-->
2423
<dependency>
25-
<artifactId>hserver</artifactId>
24+
<artifactId>hserver-web-starter</artifactId>
2625
<groupId>cn.hserver</groupId>
2726
</dependency>
28-
<!-- web框架 -->
2927
<dependency>
30-
<artifactId>hserver-plugin-web</artifactId>
31-
<groupId>cn.hserver</groupId>
28+
<groupId>org.slf4j</groupId>
29+
<artifactId>slf4j-api</artifactId>
30+
<version>2.0.17</version>
3231
</dependency>
3332
<dependency>
3433
<groupId>com.zaxxer</groupId>
@@ -44,7 +43,7 @@
4443
<build>
4544
<plugins>
4645
<plugin>
47-
<artifactId>hserver-plugin-maven</artifactId>
46+
<artifactId>hserver-maven</artifactId>
4847
<groupId>cn.hserver</groupId>
4948
</plugin>
5049
</plugins>

‎frameworks/Java/hserver-business/src/main/java/com/test/hserver/StartApp.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.test.hserver;
22

33

4-
import cn.hserver.HServerApplication;
5-
import cn.hserver.core.ioc.annotation.HServerBoot;
6-
import cn.hserver.core.server.context.ConstConfig;
7-
4+
import cn.hserver.core.boot.HServerApplication;
5+
import cn.hserver.core.boot.annotation.HServerBoot;
86

97
/**
108
* @author hxm
@@ -13,6 +11,6 @@
1311
public class StartApp {
1412

1513
public static void main(String[] args) {
16-
HServerApplication.run(StartApp.class, 8888, args);
14+
HServerApplication.run(StartApp.class, args);
1715
}
1816
}

‎frameworks/Java/hserver-business/src/main/java/com/test/hserver/controller/TestController.java‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
package com.test.hserver.controller;
22

33
import cn.hserver.core.ioc.annotation.Autowired;
4-
import cn.hserver.plugin.web.annotation.Controller;
5-
import cn.hserver.plugin.web.annotation.GET;
6-
import cn.hserver.plugin.web.interfaces.HttpRequest;
7-
import cn.hserver.plugin.web.interfaces.HttpResponse;
4+
import cn.hserver.mvc.annotation.Controller;
5+
import cn.hserver.mvc.annotation.router.GET;
6+
import cn.hserver.mvc.request.Request;
7+
import cn.hserver.mvc.response.Response;
88
import com.test.hserver.bean.Fortune;
99
import com.test.hserver.bean.Message;
1010
import com.test.hserver.bean.World;
1111
import com.test.hserver.util.DateUtil;
12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
1412

1513
import javax.sql.DataSource;
1614
import java.sql.Connection;
@@ -34,19 +32,19 @@ public class TestController {
3432
private DataSource dataSource;
3533

3634
@GET("/json")
37-
public Message json(HttpResponse response) {
38-
response.setHeader("Date", DateUtil.getTime());
35+
public Message json(Response response) {
36+
response.addHeader("Date", DateUtil.getTime());
3937
return new Message();
4038
}
4139

4240
@GET("/plaintext")
43-
public String plaintext(HttpResponse response) {
44-
response.setHeader("Date", DateUtil.getTime());
41+
public String plaintext(Response response) {
42+
response.addHeader("Date", DateUtil.getTime());
4543
return HELLO;
4644
}
4745

4846
@GET("/db")
49-
public void db(HttpResponse response) throws SQLException {
47+
public void db(Response response) throws SQLException {
5048
World result;
5149
try (Connection conn = dataSource.getConnection()) {
5250
try (final PreparedStatement statement = conn.prepareStatement(SELECT_WORLD)) {
@@ -57,12 +55,12 @@ public void db(HttpResponse response) throws SQLException {
5755
}
5856
}
5957
}
60-
response.setHeader("Date", DateUtil.getTime());
58+
response.addHeader("Date", DateUtil.getTime());
6159
response.sendJson(result);
6260
}
6361

6462
@GET("/queries")
65-
public void queries(HttpRequest request,HttpResponse response) throws Exception {
63+
public void queries(Request request, Response response) throws Exception {
6664
World[] result = new World[getQueries(request.query("queries"))];
6765
try (Connection conn = dataSource.getConnection()) {
6866
for (int i = 0; i < result.length; i++) {
@@ -75,13 +73,13 @@ public void queries(HttpRequest request,HttpResponse response) throws Exception
7573
}
7674
}
7775
}
78-
response.setHeader("Date", DateUtil.getTime());
76+
response.addHeader("Date", DateUtil.getTime());
7977
response.sendJson(result);
8078
}
8179

8280

8381
@GET("/updates")
84-
public void updates(HttpRequest request,HttpResponse response) throws Exception {
82+
public void updates(Request request,Response response) throws Exception {
8583
World[] result = new World[getQueries(request.query("queries"))];
8684
StringJoiner updateSql = new StringJoiner(
8785
", ",
@@ -110,12 +108,12 @@ public void updates(HttpRequest request,HttpResponse response) throws Exception
110108
statement.executeUpdate();
111109
}
112110
}
113-
response.setHeader("Date", DateUtil.getTime());
111+
response.addHeader("Date", DateUtil.getTime());
114112
response.sendJson(result);
115113
}
116114

117115
@GET("/fortunes")
118-
public void fortunes(HttpResponse response) throws Exception {
116+
public void fortunes(Response response) throws Exception {
119117
List<Fortune> fortunes = new ArrayList<>();
120118
try (Connection connection = dataSource.getConnection()) {
121119
try (PreparedStatement stt = connection.prepareStatement("select * from fortune")) {
@@ -128,7 +126,7 @@ public void fortunes(HttpResponse response) throws Exception {
128126
}
129127
fortunes.add(new Fortune(0, "Additional fortune added at request time."));
130128
Collections.sort(fortunes);
131-
response.setHeader("Date", DateUtil.getTime());
129+
response.addHeader("Date", DateUtil.getTime());
132130
Map<String,Object> data=new HashMap<>();
133131
data.put("data",fortunes);
134132
response.sendTemplate("fortunes.ftl",data);

‎frameworks/Java/hserver-business/src/main/java/com/test/hserver/db/DataSourceConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.test.hserver.db;
22

3+
import cn.hserver.core.config.annotation.Configuration;
34
import cn.hserver.core.ioc.annotation.Autowired;
45
import cn.hserver.core.ioc.annotation.Bean;
5-
import cn.hserver.core.ioc.annotation.Configuration;
66
import com.zaxxer.hikari.HikariDataSource;
77

88
import javax.sql.DataSource;

‎frameworks/Java/hserver-business/src/main/java/com/test/hserver/db/PostgresConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.test.hserver.db;
22

33

4-
import cn.hserver.core.ioc.annotation.ConfigurationProperties;
4+
import cn.hserver.core.config.annotation.ConfigurationProperties;
55

66
@ConfigurationProperties
77
public class PostgresConfig {

‎frameworks/Java/hserver-business/src/main/java/com/test/hserver/task/TimeAdd.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.test.hserver.task;
22

3-
import cn.hserver.core.ioc.annotation.Bean;
4-
import cn.hserver.core.ioc.annotation.Task;
3+
import cn.hserver.core.ioc.annotation.Component;
4+
import cn.hserver.core.scheduling.annotation.Task;
55
import com.test.hserver.util.DateUtil;
66

7-
@Bean
7+
@Component
88
public class TimeAdd {
99

1010
@Task(name = "时间计算", time = "1000")

‎frameworks/Java/hserver-business/src/main/resources/app.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ password= benchmarkdbpass
44
maximumPoolSize= 256
55

66
log=info
7+
netty.pool= 64

‎frameworks/Java/hserver/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@
1111
<parent>
1212
<artifactId>hserver-parent</artifactId>
1313
<groupId>cn.hserver</groupId>
14-
<version>3.7.0</version>
14+
<version>4.0.0-beta.3</version>
1515
</parent>
16+
1617
<properties>
1718
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1819
<version.hikaricp>3.3.1</version.hikaricp>
1920
<version.postgres>42.7.2</version.postgres>
2021
</properties>
2122

2223
<dependencies>
23-
<!-- 核心依赖-->
2424
<dependency>
25-
<artifactId>hserver</artifactId>
25+
<artifactId>hserver-web-starter</artifactId>
2626
<groupId>cn.hserver</groupId>
2727
</dependency>
28-
<!-- web框架 -->
2928
<dependency>
30-
<artifactId>hserver-plugin-web</artifactId>
31-
<groupId>cn.hserver</groupId>
29+
<groupId>org.slf4j</groupId>
30+
<artifactId>slf4j-api</artifactId>
31+
<version>2.0.17</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>com.zaxxer</groupId>
@@ -44,7 +44,7 @@
4444
<build>
4545
<plugins>
4646
<plugin>
47-
<artifactId>hserver-plugin-maven</artifactId>
47+
<artifactId>hserver-maven</artifactId>
4848
<groupId>cn.hserver</groupId>
4949
</plugin>
5050
</plugins>

‎frameworks/Java/hserver/src/main/java/com/test/hserver/StartApp.java‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.test.hserver;
22

33

4-
import cn.hserver.HServerApplication;
5-
import cn.hserver.core.ioc.annotation.HServerBoot;
6-
import cn.hserver.core.server.context.ConstConfig;
7-
4+
import cn.hserver.core.boot.HServerApplication;
5+
import cn.hserver.core.boot.annotation.HServerBoot;
6+
import cn.hserver.mvc.server.WebServer;
7+
import com.test.hserver.controller.TestController;
88

99
/**
1010
* @author hxm
@@ -13,6 +13,14 @@
1313
public class StartApp {
1414

1515
public static void main(String[] args) {
16-
HServerApplication.run(StartApp.class, 8888, args);
16+
WebServer.router
17+
.get("/json", TestController::json)
18+
.get("/plaintext", TestController::plaintext)
19+
.get("/db", TestController::db)
20+
.get("/queries", TestController::queries)
21+
.get("/updates", TestController::updates)
22+
.get("/fortunes", TestController::fortunes)
23+
;
24+
HServerApplication.run(StartApp.class, args);
1725
}
1826
}

0 commit comments

Comments
 (0)