Java：MultiDataSource 优化 Redis 缓存

Author: TommyLemon

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>apijson.boot</groupId>
     <artifactId>apijson-boot-multi-datasource</artifactId>
-    <version>5.4.0</version>
+    <version>6.0.0</version>
     <packaging>jar</packaging>
 
     <name>APIJSONBoot-MultiDataSource</name>
@@ -19,13 +19,6 @@
     </properties>
 
     <dependencies>
-        <!-- JDK 11+ 需要，否则启动报错 NoClassDefFoundError: javax/activation/UnsupportedDataTypeException -->
-        <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
         <!-- APIJSON 需要用的依赖库，1.2.0 以上 -->
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -60,26 +53,26 @@
 
 
         <!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 <<<<<<<<<< -->
-        <dependency>
-            <groupId>com.github.Tencent</groupId>
-            <artifactId>APIJSON</artifactId>
-            <version>5.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.APIJSON</groupId>
-            <artifactId>apijson-framework</artifactId>
-            <version>5.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.APIJSON</groupId>
-            <artifactId>apijson-column</artifactId>
-            <version>1.2.9</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.APIJSON</groupId>
-            <artifactId>apijson-router</artifactId>
-            <version>1.1.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.github.Tencent</groupId>-->
+<!--            <artifactId>APIJSON</artifactId>-->
+<!--            <version>6.0.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.github.APIJSON</groupId>-->
+<!--            <artifactId>apijson-framework</artifactId>-->
+<!--            <version>6.0.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.github.APIJSON</groupId>-->
+<!--            <artifactId>apijson-column</artifactId>-->
+<!--            <version>1.3.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.github.APIJSON</groupId>-->
+<!--            <artifactId>apijson-router</artifactId>-->
+<!--            <version>1.2.0</version>-->
+<!--        </dependency>-->
         <!-- 可使用 libs 目录的 apijson-orm.jar, apijson-framework.jar, apijson-column.jar 来替代，两种方式二选一 >>>>>>>>>> -->
 
         <!-- 需要用的数据库 JDBC 驱动 -->

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoApplication.java

@@ -82,6 +82,12 @@ public static ApplicationContext getApplicationContext() {
     public static void main(String[] args) throws Exception {
         APPLICATION_CONTEXT = SpringApplication.run(DemoApplication.class, args);
 
+        try {
+            DemoSQLExecutor.REDIS_TEMPLATE.discard();
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+
         // FIXME 不要开放给项目组后端之外的任何人使用 UnitAuto（强制登录鉴权）！！！如果不需要单元测试则移除相关代码或 unitauto.Log.DEBUG = false;
         // 上线生产环境前改为 false，可不输出 APIJSONORM 的日志 以及 SQLException 的原始(敏感)信息
         unitauto.Log.DEBUG = Log.DEBUG = true;

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/demo/DemoSQLExecutor.java

@@ -18,7 +18,6 @@
 import apijson.RequestMethod;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.support.spring.FastJsonRedisSerializer;
 import com.vesoft.nebula.jdbc.impl.NebulaDriver;
 import com.zaxxer.hikari.HikariDataSource;
 
@@ -100,28 +99,9 @@ public synchronized void removeCache(String sql, SQLConfig config) {
         }
     }
 
-    @Override
-    public JSONObject execute(SQLConfig config, boolean unknownType) throws Exception {
-        JSONObject result = super.execute(config, unknownType);
-        RequestMethod method = config.getMethod();
-        if (method == RequestMethod.POST) { // 没必要，直接查就行了
-//      Object id = result.get(config.getIdKey());
-//      Object idIn = result.get(config.getIdKey() + "[]");
-//      SQLConfig cacheConfig = APIJSONRouterApplication.DEFAULT_APIJSON_CREATOR.createSQLConfig();
-//      cacheConfig.setMethod(RequestMethod.GET);
-//
-        } else if (method == RequestMethod.PUT || method == RequestMethod.DELETE) { // RequestMethod.isQueryMethod(method) == false) {
-            config.setMethod(RequestMethod.GET);
-            boolean isPrepared = config.isPrepared();
-            removeCache(config.getSQL(false), config);
-            config.setPrepared(isPrepared);
-            config.setMethod(method);
-        }
-        return result;
-    }
-
     // Redis 缓存 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
+
     // 适配连接池，如果这里能拿到连接池的有效 Connection，则 SQLConfig 不需要配置 dbVersion, dbUri, dbAccount, dbPassword
     @Override
     public Connection getConnection(SQLConfig config) throws Exception {