fix all query

Author: litongjava

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

@@ -9,6 +9,7 @@
     <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
+    <jfinal-plugins.version>1.1.2</jfinal-plugins.version>
 
     <graalvm.version>23.1.1</graalvm.version>
     <main.class>com.litongjava.tio.http.server.MainApp</main.class>
@@ -24,9 +25,10 @@
     <dependency>
       <groupId>com.jfinal</groupId>
       <artifactId>activerecord</artifactId>
-      <version>5.1.2</version>
+      <version>5.1.6</version>
     </dependency>
 
+
     <dependency>
       <groupId>com.alibaba.fastjson2</groupId>
       <artifactId>fastjson2</artifactId>

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

@@ -22,10 +22,10 @@ public class MainApp {
   public static void main(String[] args) {
     Logger log = LoggerFactory.getLogger(MainApp.class);
     long start = System.currentTimeMillis();
-    EnvUtils.buildCmdArgsMap(args);
+    EnvUtils.load();
     // add route
     IndexController controller = new IndexController();
-    
+
     HttpReqeustSimpleHandlerRoute simpleHttpRoutes = new DefaultHttpReqeustSimpleHandlerRoute();
     simpleHttpRoutes.add("/", controller::index);
     simpleHttpRoutes.add("/plaintext", controller::plaintext);
@@ -38,7 +38,7 @@ public static void main(String[] args) {
     simpleHttpRoutes.add("/fortunes", dbQueryController::fortunes);
 
     CacheController cacheController = new CacheController();
-    simpleHttpRoutes.add("/cacheQuery", cacheController::cacheQuery);
+    simpleHttpRoutes.add("/cachedQuery", cacheController::cachedQuery);
 
     // config server
     HttpConfig httpConfig = new HttpConfig(8080, null, null, null);

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

@@ -1,5 +1,4 @@
-package com.litongjava.tio.http.server.config;
-
+  package com.litongjava.tio.http.server.config;
 
 import com.jfinal.plugin.ehcache.EhCachePlugin;
 

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

@@ -9,27 +9,23 @@ public class MysqlDbConfig {
 
   public void init() {
     // start active recored
-
     String jdbcUrl = EnvUtils.get("JDBC_URL");
     // String jdbcUrl = "jdbc:mysql://192.168.3.9/hello_world";
 
     String jdbcUser = EnvUtils.get("JDBC_USER");
-//    String jdbcUser = "root";
+    // String jdbcUser = "root";
 
     String jdbcPswd = EnvUtils.get("JDBC_PSWD");
-//    String jdbcPswd = "robot_123456#";
+    // String jdbcPswd = "robot_123456#";
     HikariCpPlugin hikariCpPlugin = new HikariCpPlugin(jdbcUrl, jdbcUser, jdbcPswd);
 
     ActiveRecordPlugin arp = new ActiveRecordPlugin(hikariCpPlugin);
     arp.setContainerFactory(new OrderedFieldContainerFactory());
 
-//    Engine engine = arp.getEngine();
-//    engine.setSourceFactory(new ClassPathSourceFactory());
-//    engine.setCompressorOn(' ');
-//    engine.setCompressorOn('\n');
-    // arp.addSqlTemplate("/sql/all_sqls.sql");
-//    arp.start();
+    // arp.setShowSql(true);
+
     hikariCpPlugin.start();
-    arp.start();
+    boolean start = arp.start();
+    System.out.println("db started:" + start);
   }
 }

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

@@ -17,7 +17,7 @@
 public class CacheController {
   // private Logger log = LoggerFactory.getLogger(this.getClass());
 
-  public HttpResponse cacheQuery(HttpRequest request) {
+  public HttpResponse cachedQuery(HttpRequest request) {
     String queries = request.getParam("queries");
     List<Map<String, Object>> recordMaps = RandomUtils.randomWorldNumbers()
         // limit

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

@@ -25,21 +25,21 @@
 
 public class DbController {
 
-  // @GetMapping("/db")
   public HttpResponse db(HttpRequest request) {
     Integer id = request.getInt("id");
     if (id == null) {
       id = RandomUtils.randomWorldNumber();
     }
 
+    System.out.println("id:" + id);
     HttpResponse httpResponse = new HttpResponse(request);
 
     // int id = 11;
     // String sql="SELECT id, randomNumber FROM world WHERE id = ?";
 
     Record recored = Db.findById("world", id);
     if (recored != null) {
-      httpResponse.setBody(JSON.toJSONString(recored.toMap()).getBytes());
+      httpResponse.setBody(JSON.toJSONBytes(recored.toMap()));
     } else {
       httpResponse.setBody("{}".getBytes());
     }
@@ -62,7 +62,7 @@ public HttpResponse queries(HttpRequest request) {
 
     HttpResponse httpResponse = new HttpResponse(request);
     httpResponse.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_JSON);
-    httpResponse.setBody(JSON.toJSONString(recordMaps).getBytes());
+    httpResponse.setBody(JSON.toJSONBytes(recordMaps));
     return httpResponse;
   }
 
@@ -71,7 +71,7 @@ public HttpResponse updates(HttpRequest request) {
     String queries = request.getParam("queries");
 
     CacheKit.removeAll("world");
-    
+
     List<Map<String, Object>> updatedRecords = RandomUtils.randomWorldNumbers()// random numbers
         // limit
         .limit(RandomUtils.parseQueryCount(queries))
@@ -96,17 +96,15 @@ public HttpResponse updates(HttpRequest request) {
 
     HttpResponse httpResponse = new HttpResponse(request);
     httpResponse.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_JSON);
-    httpResponse.setBody(JSON.toJSONString(updatedRecords).getBytes());
+    httpResponse.setBody(JSON.toJSONBytes(updatedRecords));
     return httpResponse;
   }
 
-//@GetMapping("/fortunes")
   public HttpResponse fortunes(HttpRequest request) throws IllegalAccessException, InstantiationException {
-    List<Record> records = Db.find("SELECT * FROM fortune"); // 假设表名为 "fortune"
+    List<Record> records = Db.find("SELECT * FROM fortune"); 
 
     List<Fortune> fortunes = new ArrayList<>(records.size());
     for (Record record : records) {
-
       fortunes.add(BeanConverterUtils.toBean(record.toMap(), Fortune.class));
     }
     // 添加额外的 Fortune

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

@@ -7,6 +7,7 @@ public class RandomUtils {
 
   private static final int MIN_WORLD_NUMBER = 1;
   private static final int MAX_WORLD_NUMBER_PLUS_ONE = 10_001;
+//  private static final int MAX_WORLD_NUMBER_PLUS_ONE = 30;
 
   public static int randomWorldNumber() {
     return ThreadLocalRandom.current().nextInt(MIN_WORLD_NUMBER, MAX_WORLD_NUMBER_PLUS_ONE);

frameworks/Java/tio-http-server/src/main/resources/app.properties

@@ -0,0 +1,9 @@
+http.response.addServerHead=true
+
+#JDBC_URL=jdbc:mysql://192.168.1.2/hello_world?useSSL=false&allowPublicKeyRetrieval=true
+#JDBC_USER=root
+#JDBC_PSWD=robot_123456#
+
+JDBC_URL=jdbc:mysql://tfb-database/hello_world
+JDBC_USER=benchmarkdbuser
+JDBC_PSWD=benchmarkdbpass

frameworks/Java/tio-http-server/tio-server.dockerfile

@@ -1,12 +1,13 @@
 FROM maven:3.6.1-jdk-8-slim as maven
-WORKDIR /t-io
-COPY pom.xml pom.xml
-COPY src src
-RUN mvn package -Passembly -q
+#WORKDIR /t-io
+#COPY pom.xml pom.xml
+#RUN mvn dependency:go-offline
+#COPY src src
+#RUN mvn package -Passembly -q
 
 #TODO use separate JDK/JRE for the RUN (as the other builds)
-WORKDIR /t-io/target/tio-server-benchmark
-
+WORKDIR /app
+COPY target/tio-http-server-benchmark-1.0.jar tio-http-server-benchmark-1.0.jar
 EXPOSE 8080
 
-CMD ["java", "-server", "-Xms1G", "-Xmx1G", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-Dpacket.handler.mode=queue1", "-jar", "/t-io/target/tio-http-server-benchmark-1.0.jar","--JDBC_URL=jdbc:mysql://tfb-database/hello_world","--JDBC_USER=benchmarkdbuser" ,"--JDBC_PSWD=benchmarkdbpass"]
+CMD ["java", "-server", "-Xms1G", "-Xmx1G", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-Dpacket.handler.mode=queue1", "-jar", "/app/tio-http-server-benchmark-1.0.jar"]