Browse Source

Upgrade hserver Framework version and optimize configuration (#7241)

* hserver framework submit

* hserver framework submit

* lowercase fix

* Required response header missing: Date fix

* Date format fix

* update hserver version

* update hserver threadPool

* update hserver

* update hserver

* update hserver query

* update hserver query

* Update README.md

* update hserver query

* update hserver query

* update hserver query

* update hserver query

* update hserver query

* update hserver query

* Optimal configuration of hserver framework

* Optimal configuration of hserver framework

* Optimal configuration of hserver framework

* Upgrade hserver Framework version and optimize configuration

* Upgrade hserver Framework version and optimize configuration

* Upgrade hserver Framework version and optimize configuration

* Upgrade hserver Framework version and optimize configuration

* Upgrade hserver Framework version and optimize configuration

Co-authored-by: 黑小马 <[email protected]>
黑小马 3 years ago
parent
commit
6dc7038a30

+ 2 - 2
frameworks/Java/hserver/hserver.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3.6.3-openjdk-8-slim as maven
 WORKDIR /hserver
 WORKDIR /hserver
 COPY pom.xml pom.xml
 COPY pom.xml pom.xml
 COPY src src
 COPY src src
 RUN mvn package
 RUN mvn package
 
 
-FROM openjdk:11.0.3-jdk-slim
+FROM openjdk:8u275-jdk-slim
 WORKDIR /hserver
 WORKDIR /hserver
 COPY --from=maven /hserver/target/hserver-1.0.jar app.jar
 COPY --from=maven /hserver/target/hserver-1.0.jar app.jar
 
 

+ 1 - 1
frameworks/Java/hserver/pom.xml

@@ -11,7 +11,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.hikaricp>3.3.1</version.hikaricp>
         <version.hikaricp>3.3.1</version.hikaricp>
         <version.postgres>42.3.3</version.postgres>
         <version.postgres>42.3.3</version.postgres>
-        <version.hserver>2.9.81</version.hserver>
+        <version.hserver>2.9.83</version.hserver>
     </properties>
     </properties>
 
 
     <dependencies>
     <dependencies>

+ 7 - 0
frameworks/Java/hserver/src/main/java/com/test/hserver/controller/TestController.java

@@ -25,6 +25,7 @@ import static com.test.hserver.util.Util.randomWorld;
 @Controller
 @Controller
 public class TestController {
 public class TestController {
     private static final String HELLO = "Hello, World!";
     private static final String HELLO = "Hello, World!";
+    private static final String HServer = "HServer";
     private static final String SELECT_WORLD = "select * from world where id=?";
     private static final String SELECT_WORLD = "select * from world where id=?";
 
 
     @Autowired
     @Autowired
@@ -33,12 +34,14 @@ public class TestController {
     @GET("/json")
     @GET("/json")
     public Message json(HttpResponse response) {
     public Message json(HttpResponse response) {
         response.setHeader("Date", DateUtil.getTime());
         response.setHeader("Date", DateUtil.getTime());
+        response.setHeader("Server",HServer);
         return new Message();
         return new Message();
     }
     }
 
 
     @GET("/plaintext")
     @GET("/plaintext")
     public String plaintext(HttpResponse response) {
     public String plaintext(HttpResponse response) {
         response.setHeader("Date", DateUtil.getTime());
         response.setHeader("Date", DateUtil.getTime());
+        response.setHeader("Server",HServer);
         return HELLO;
         return HELLO;
     }
     }
 
 
@@ -55,6 +58,7 @@ public class TestController {
             }
             }
         }
         }
         response.setHeader("Date", DateUtil.getTime());
         response.setHeader("Date", DateUtil.getTime());
+        response.setHeader("Server",HServer);
         response.sendJson(result);
         response.sendJson(result);
     }
     }
 
 
@@ -73,6 +77,7 @@ public class TestController {
             }
             }
         }
         }
         response.setHeader("Date", DateUtil.getTime());
         response.setHeader("Date", DateUtil.getTime());
+        response.setHeader("Server",HServer);
         response.sendJson(result);
         response.sendJson(result);
     }
     }
 
 
@@ -108,6 +113,7 @@ public class TestController {
             }
             }
         }
         }
         response.setHeader("Date", DateUtil.getTime());
         response.setHeader("Date", DateUtil.getTime());
+        response.setHeader("Server",HServer);
         response.sendJson(result);
         response.sendJson(result);
     }
     }
 
 
@@ -126,6 +132,7 @@ public class TestController {
         fortunes.add(new Fortune(0, "Additional fortune added at request time."));
         fortunes.add(new Fortune(0, "Additional fortune added at request time."));
         Collections.sort(fortunes);
         Collections.sort(fortunes);
         response.setHeader("Date", DateUtil.getTime());
         response.setHeader("Date", DateUtil.getTime());
+        response.setHeader("Server",HServer);
         Map<String,Object> data=new HashMap<>();
         Map<String,Object> data=new HashMap<>();
         data.put("data",fortunes);
         data.put("data",fortunes);
         response.sendTemplate("fortunes.ftl",data);
         response.sendTemplate("fortunes.ftl",data);