Java：MultiDataSource 升级 APIJSON 5.3.0, apijson-framework 5.3.0, apijson-column1.2.7, apijson-router 1.0.6

Author: TommyLemon

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/APIJSON-5.2.0.jar

@@ -67,35 +67,35 @@
  <dependency>
  <groupId>com.github.APIJSON</groupId>
  <artifactId>apijson-framework</artifactId>
- <version>5.2.0</version>
- <exclusions>
- <exclusion>
- <groupId>com.github.Tencent</groupId>
- <artifactId>APIJSON</artifactId>
- </exclusion>
- </exclusions>
+ <version>5.3.0</version>
+<!-- <exclusions>-->
+<!-- <exclusion>-->
+<!-- <groupId>com.github.Tencent</groupId>-->
+<!-- <artifactId>APIJSON</artifactId>-->
+<!-- </exclusion>-->
+<!-- </exclusions>-->
  </dependency>
  <dependency>
  <groupId>com.github.APIJSON</groupId>
  <artifactId>apijson-column</artifactId>
- <version>1.2.5</version>
- <exclusions>
- <exclusion>
- <groupId>com.github.Tencent</groupId>
- <artifactId>APIJSON</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.2.7</version>
+<!-- <exclusions>-->
+<!-- <exclusion>-->
+<!-- <groupId>com.github.Tencent</groupId>-->
+<!-- <artifactId>APIJSON</artifactId>-->
+<!-- </exclusion>-->
+<!-- </exclusions>-->
  </dependency>
  <dependency>
  <groupId>com.github.APIJSON</groupId>
  <artifactId>apijson-router</artifactId>
- <version>1.0.6</version>
- <exclusions>
- <exclusion>
- <groupId>com.github.Tencent</groupId>
- <artifactId>APIJSON</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.0.8</version>
+<!-- <exclusions>-->
+<!-- <exclusion>-->
+<!-- <groupId>com.github.Tencent</groupId>-->
+<!-- <artifactId>APIJSON</artifactId>-->
+<!-- </exclusion>-->
+<!-- </exclusions>-->
  </dependency>
  <!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 >>>>>>>>>> -->
 

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/APIJSON-5.3.0.jar

@@ -2030,21 +2030,50 @@ public void invokeMethod(@RequestBody String request, HttpServletRequest servlet
  super.invokeMethod(request, servletRequest);
  }
 
+ // 为 UnitAuto 提供的单元测试接口 https://github.com/TommyLemon/UnitAuto >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+
+
+ // 为 APIAuto, UnitAuto, SQLAuto 提供的后台 Headless 无 UI 测试转发接口 <<<<<<<<<<<<<<<<<<<<<<<<<<<
 
  @GetMapping("/api/test/start")
- public String startApiTest(HttpServletResponse response, HttpSession session) throws Exception {
+ public String startApiTest(HttpSession session) {
  //response.sendRedirect("http://localhost:3000/test/start");
  long id = 100000 + Math.round(899999*Math.random());
- DemoParser.KEY_MAP.put(id, session); // 调这个接口一般是前端/CI/CD，调查询接口的是 Node，Session 不同 session.setAttribute("key", id);
+ DemoParser.KEY_MAP.put(String.valueOf(id), session); // 调这个接口一般是前端/CI/CD，调查询接口的是 Node，Session 不同 session.setAttribute("key", id);
  return delegate("http://localhost:3000/test/start?key=" + id, null, null, null, null, HttpMethod.GET, session);
  }
  @GetMapping("/api/test/status")
- public String getApiTestStatus(HttpServletResponse response, HttpSession session) throws Exception {
+ public String getApiTestStatus(@RequestParam(value = "key", required = false) String key, HttpSession session) {
  //response.sendRedirect("http://localhost:3000/test/status");
+ DemoParser.KEY_MAP.remove(key);
  return delegate("http://localhost:3000/test/status", null, null, null, null, HttpMethod.GET, session);
  }
 
- // 为 UnitAuto 提供的单元测试接口 https://github.com/TommyLemon/UnitAuto >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+ @GetMapping("/unit/test/start")
+ public String startUnitTest(HttpSession session) {
+ long id = 100000 + Math.round(899999*Math.random());
+ DemoParser.KEY_MAP.put(String.valueOf(id), session); // 调这个接口一般是前端/CI/CD，调查询接口的是 Node，Session 不同 session.setAttribute("key", id);
+ return delegate("http://localhost:3001/test/start?key=" + id, null, null, null, null, HttpMethod.GET, session);
+ }
+ @GetMapping("/unit/test/status")
+ public String getUnitTestStatus(@RequestParam(value = "key", required = false) String key, HttpSession session) {
+ DemoParser.KEY_MAP.remove(key);
+ return delegate("http://localhost:3001/test/status", null, null, null, null, HttpMethod.GET, session);
+ }
+
+ @GetMapping("/sql/test/start")
+ public String startSQLTest(HttpSession session) {
+ long id = 100000 + Math.round(899999*Math.random());
+ DemoParser.KEY_MAP.put(String.valueOf(id), session); // 调这个接口一般是前端/CI/CD，调查询接口的是 Node，Session 不同 session.setAttribute("key", id);
+ return delegate("http://localhost:3002/test/start?key=" + id, null, null, null, null, HttpMethod.GET, session);
+ }
+ @GetMapping("/sql/test/status")
+ public String getSQLTestStatus(@RequestParam("key") String key, HttpSession session) {
+ DemoParser.KEY_MAP.remove(key);
+ return delegate("http://localhost:3002/test/status", null, null, null, null, HttpMethod.GET, session);
+ }
+
+ // 为 APIAuto, UnitAuto, SQLAuto 提供的后台 Headless 无 UI 测试转发接口 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 
 }

APIJSON-Java-Server/APIJSONBoot/libs/apijson-column-1.2.5.jar renamed to APIJSON-Java-Server/APIJSONBoot-MultiDataSource/libs/apijson-column-1.2.7.jar

@@ -38,7 +38,7 @@
  */
 public class DemoParser extends APIJSONParser<Long> {
 
- public static final Map<Long, HttpSession> KEY_MAP;
+ public static final Map<String, HttpSession> KEY_MAP;
  static {
  KEY_MAP = new HashMap<>();
  }
@@ -63,7 +63,7 @@ public int getMaxQueryCount() {
  @Override
  public JSONObject parseResponse(JSONObject request) {
  try { // 内部使用，可通过这种方式来突破限制，获得更大的自由度
- HttpSession session = KEY_MAP.get(request.getLong("key"));
+ HttpSession session = KEY_MAP.get(request.getString("key"));
  //DemoVerifier.verifyLogin(session);
  if (session != null) {
  request.remove("key");