Skip to content

Commit e9599d8

Browse files
author
黑小马
committed
Upgrade hserver Framework version and optimize configuration
1 parent 2f0a0b2 commit e9599d8

File tree

3 files changed

+9
-16
lines changed

3 files changed

+9
-16
lines changed

frameworks/Java/hserver/hserver.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM maven:3.6.3-openjdk-8-slim as maven
1+
FROM maven:3.8.4-openjdk-17-slim as maven
22
WORKDIR /hserver
33
COPY pom.xml pom.xml
44
COPY src src
55
RUN mvn package
66

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

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

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import cn.hserver.core.ioc.annotation.Autowired;
44
import cn.hserver.plugin.web.annotation.Controller;
55
import cn.hserver.plugin.web.annotation.GET;
6-
import cn.hserver.plugin.web.context.WebConstConfig;
6+
import cn.hserver.plugin.web.interfaces.HttpRequest;
77
import cn.hserver.plugin.web.interfaces.HttpResponse;
88
import com.test.hserver.bean.Fortune;
99
import com.test.hserver.bean.Message;
@@ -29,7 +29,6 @@
2929
public class TestController {
3030
private static final String HELLO = "Hello, World!";
3131
private static final String SELECT_WORLD = "select * from world where id=?";
32-
private static final Logger log = LoggerFactory.getLogger(TestController.class);
3332

3433
@Autowired
3534
private DataSource dataSource;
@@ -63,33 +62,27 @@ public void db(HttpResponse response) throws SQLException {
6362
}
6463

6564
@GET("/queries")
66-
public void queries(String queries,HttpResponse response) throws Exception {
67-
int queries1 = getQueries(queries);
68-
World[] result = new World[queries1];
65+
public void queries(HttpRequest request,HttpResponse response) throws Exception {
66+
World[] result = new World[getQueries(request.query("queries"))];
6967
try (Connection conn = dataSource.getConnection()) {
7068
for (int i = 0; i < result.length; i++) {
7169
try (final PreparedStatement statement = conn.prepareStatement(SELECT_WORLD)) {
7270
statement.setInt(1, randomWorld());
7371
try (ResultSet rs = statement.executeQuery()) {
7472
rs.next();
7573
result[i] = new World(rs.getInt("id"), rs.getInt("randomNumber"));
76-
}catch (Exception e){
77-
log.error(e.getMessage());
7874
}
79-
}catch (Exception e){
80-
log.error(e.getMessage());
8175
}
8276
}
8377
}
8478
response.setHeader("Date", DateUtil.getTime());
85-
log.debug("\n请求:{}\n响应:{}\n",queries1, WebConstConfig.JSON.writeValueAsString(result));
8679
response.sendJson(result);
8780
}
8881

8982

9083
@GET("/updates")
91-
public void updates(String queries,HttpResponse response) throws Exception {
92-
World[] result = new World[getQueries(queries)];
84+
public void updates(HttpRequest request,HttpResponse response) throws Exception {
85+
World[] result = new World[getQueries(request.query("queries"))];
9386
StringJoiner updateSql = new StringJoiner(
9487
", ",
9588
"UPDATE world SET randomNumber = temp.randomNumber FROM (VALUES ",

frameworks/Java/hserver/src/main/resources/app.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ username= benchmarkdbuser
33
password= benchmarkdbpass
44
maximumPoolSize= 256
55

6-
log=debug
7-
#web.businessPool=-1
6+
log=info
7+
web.businessPool=-1

0 commit comments

Comments
 (0)