@initial 7.0.0-preview.614 Fix many bugs for canary

TalexDreamSoul · TalexDreamSoul · commit 73833b9bc42c · 2022-06-14T14:19:46.000+08:00
diff --git a/src/main/java/com/talexframe/frame/core/modules/network/connection/RequestAnalyser.java b/src/main/java/com/talexframe/frame/core/modules/network/connection/RequestAnalyser.java
@@ -97,11 +97,11 @@ private void process() {
 
                     if( !could.get() ) return;
 
-                    log.debug("[解析层] # -- CLASS -- 开始执行接收器: " + addon.getClass().getName());
+                    // log.debug("[解析层] # -- CLASS -- 开始执行接收器: " + addon.getClass().getName());
 
                     could.set(addon.onPreCheckAppReceiver(reqReceiver, wr));
 
-                    log.debug("[解析层] # -- CLASS -- 接收器执行结果: " + could.get());
+                    // log.debug("[解析层] # -- CLASS -- 接收器执行结果: " + could.get());
 
                 });
 
@@ -133,7 +133,8 @@ private void process() {
 
                     log.debug("[解析层]   #   -- onRequest -- 执行结果: " + JSONUtil.toJsonStr(obj));
 
-                    receiverAddons.forEach((addon) -> addon.onPostInvokeMethod(subReqReceiver, wr, obj));
+                    final Object finalObj = obj;
+                    receiverAddons.forEach((addon) -> addon.onPostInvokeMethod(subReqReceiver, wr, finalObj));
 
                     log.debug("[解析层]   # -- METHOD -- 执行结果完毕!");
 
@@ -149,7 +150,7 @@ private void process() {
 
                 clsReceiverAddons.forEach((addon) -> addon.onPostCheckAppReceiver(reqReceiver, wr));
 
-                log.debug("[解析层] # -- CLASS -- 接收器执行结果完毕!");
+                // log.debug("[解析层] # -- CLASS -- 接收器执行结果完毕!");
 
                 log.debug("-------------------------------------------");
 
diff --git a/src/main/java/com/talexframe/frame/core/modules/network/connection/RequestConnector.java b/src/main/java/com/talexframe/frame/core/modules/network/connection/RequestConnector.java
@@ -5,6 +5,7 @@
 import com.talexframe.frame.core.modules.application.TAppManager;
 import com.talexframe.frame.core.modules.event.events.request.RequestCannotGetTokenEvent;
 import com.talexframe.frame.core.modules.event.events.request.RequestCorsTryEvent;
+import com.talexframe.frame.core.pojo.enums.FrameStatus;
 import com.talexframe.frame.core.pojo.wrapper.ResultData;
 import com.talexframe.frame.core.pojo.wrapper.WrappedResponse;
 import com.talexframe.frame.core.talex.TFrame;
@@ -39,6 +40,8 @@ public RequestConnector(WrappedResponse wr) {
 
         this.processLimiter();
 
+        this.processFrameStatus();
+
     }
 
     /**
@@ -74,7 +77,21 @@ private void processLimiter() {
 
         globalLimiter.acquire();
 
-        this.headerProcessor();
+    }
+
+    private void processFrameStatus() {
+
+        if( tframe.getFrameStatus() != FrameStatus.RUNNING ) {
+
+            wr.returnDataByFailed(ResultData.ResultEnum.SERVER_ERROR, "服务器维护");
+
+            log.warn("[连接层] 请求已被拦截 - 服务器状态异常 | {}", tframe.getFrameStatus().getMsg());
+
+        } else {
+
+            this.headerProcessor();
+
+        }
 
     }
 
diff --git a/src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/cache/redis/ReceiverCacheRedisAddon.java b/src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/cache/redis/ReceiverCacheRedisAddon.java
@@ -194,9 +194,7 @@ private String getRedisCacheKey( TRedisCache tRedisCache, String url, List<Objec
 
                 key = url;
 
-            }
-
-            if ( key.startsWith("#url") ) {
+            } else if ( key.startsWith("#url") ) {
 
                 int index = Integer.parseInt(key.substring(5, 6));
 
diff --git a/src/main/java/com/talexframe/frame/core/modules/network/connection/app/subapp/MethodAppReceiver.java b/src/main/java/com/talexframe/frame/core/modules/network/connection/app/subapp/MethodAppReceiver.java
@@ -5,6 +5,7 @@
 import com.talexframe.frame.core.modules.network.connection.IRequestReceiver;
 import com.talexframe.frame.core.modules.network.connection.TRequest;
 import com.talexframe.frame.core.modules.network.connection.app.ClassAppReceiver;
+import com.talexframe.frame.core.pojo.wrapper.ResultData;
 import com.talexframe.frame.core.pojo.wrapper.WrappedResponse;
 import com.talexframe.frame.core.talex.FrameCreator;
 import lombok.Getter;
@@ -79,6 +80,12 @@ public Object onRequest(ClassAppReceiver clzAppReceiver, MethodAppReceiver metho
             log.info("[应用层]  应用执行完毕!");
             log.info("[应用层] ------------------------");
 
+            if ( !(obj instanceof ResultData ) ) {
+
+                obj = ResultData.SUCCESS(obj);
+
+            }
+
             return obj;
 
         } catch (Exception e) {
diff --git a/src/main/java/com/talexframe/frame/core/modules/repository/TRepoCompAdapter.java b/src/main/java/com/talexframe/frame/core/modules/repository/TRepoCompAdapter.java
@@ -21,7 +21,7 @@ public class TRepoCompAdapter extends PluginCompAdapter<TRepo> {
     @Override
     public boolean injectWithInstance(PluginScanner scanner, WebPlugin webPlugin, TRepo instance) {
 
-        log.info("[TRepoCompAdapter] injectWithInstance: {}", instance.getClass().getName());
+        log.debug("[TRepoCompAdapter] injectWithInstance: {}", instance.getClass().getName());
 
         return repoManager.registerRepo( webPlugin, instance );
 
diff --git a/src/main/java/com/talexframe/frame/core/modules/repository/TRepoManager.java b/src/main/java/com/talexframe/frame/core/modules/repository/TRepoManager.java
@@ -133,11 +133,15 @@ public boolean registerRepo(WebPlugin plugin, TRepo Repo) {
 
                 if ( Repo instanceof TRepoPlus ) {
 
+                    log.debug("Init table Repo - " + Repo.getClass().getName());
+
                     TRepoPlus<?> plusRepo = ( (TRepoPlus<?>) Repo );
                     plusRepo.initTable();
 
                     scanner.pushService(() -> {
 
+                        log.debug("Init Repo - " + Repo.getClass().getName());
+
                         plusRepo.onInstall();
 
                         scanner.pushService(plusRepo::onAllRepoDone);
diff --git a/src/main/java/com/talexframe/frame/core/modules/repository/TRepoPlus.java b/src/main/java/com/talexframe/frame/core/modules/repository/TRepoPlus.java
@@ -4,7 +4,6 @@
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Entity;
 import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
 import com.talexframe.frame.core.pojo.dao.vo.auto.AutoSaveData;
 import com.talexframe.frame.core.pojo.dao.vo.auto.TAutoColumn;
@@ -95,10 +94,15 @@ public void onSingleDataRemoved(WrappedData<?> data) {
 
     }
 
+    /**
+     * @param data 数据实例 默认 不cache 所以每次数据一更新就自动塞到数据库
+     */
     public void addData(T data) {
 
         if( !doCached() ) {
 
+            saveDataToMysql(data);
+
             return;
 
         }
@@ -110,24 +114,14 @@ public void addData(T data) {
     }
 
     /**
-     * @param data 数据实例 默认 不cache 所以每次数据一更新就自动塞到数据库
-     *
      * @return 返回真不放入数据map
      */
     @SneakyThrows
     public boolean onSingleDataLoaded(WrappedData<T> data) {
 
-        if ( !doCached() ) {
-
-            saveDataToMysql( data.getValue() );
-
-        } else {
-
-            saveAllDataToMysql();
+        // 每次放入map也刷新数据库中数据
 
-            dataMap.clear();
-
-        }
+        saveDataToMysql( data.getValue() );
 
         return false;
     }
@@ -142,31 +136,39 @@ public void onAllRepoDone() {}
     public void onInstall() {
 
         if ( !doCached() ) {
+
             return;
+
         }
 
         this.dataMap = new ConcurrentHashMap<>();
 
-        List<Entity> entityList = this.forAllData();
+        List<Entity> entities = this.forDb().findAll(forEntity());
+
+        for ( Entity entity : entities ) {
 
-        for ( Entity entity : entityList ) {
+            // log.debug("[AutoSaveData] Load all data for first column {}", rs);
 
-            @SuppressWarnings( "unchecked" ) WrappedData<T> data = (WrappedData<T>) AutoSaveData.deserialize(templateData, JSONUtil.parseObj(Base64.decodeStr(entity.getStr("as_info"))));
+            @SuppressWarnings( "unchecked" ) WrappedData<T> data = (WrappedData<T>) AutoSaveData.deserializeByBase64Str(templateData, entity.getStr("as_info"));
 
             if ( data.getValue() == null || data.getValue().getMainKey() == null ) {
+
                 log.error("[AutoSaveData] FatalError!! # " + templateData.getName());
+
             }
 
             if ( onSingleDataLoaded(data) ) {
+
                 continue;
+
             }
 
             dataMap.put(( data.getValue() ).getMainKey(), data.getValue());
 
-            onDataLoaded();
-
         }
 
+        onDataLoaded();
+
     }
 
     public void onUninstall() {
diff --git a/src/main/java/com/talexframe/frame/core/pojo/dao/factory/mysql/Mysql.java b/src/main/java/com/talexframe/frame/core/pojo/dao/factory/mysql/Mysql.java
@@ -182,10 +182,10 @@ public boolean connect() {
             dataSource.setUsername(config.getUsername());
             dataSource.setPassword(config.getPassword());
 
-            dataSource.setTimeBetweenEvictionRunsMillis(15000);
-            dataSource.setValidationQuery("SELECT 1");
+            // dataSource.setTimeBetweenEvictionRunsMillis(15000);
+            // dataSource.setValidationQuery("SELECT 1");
 
-            dataSource.setTestWhileIdle(true);
+            // dataSource.setTestWhileIdle(true);
 
             session = Session.create(dataSource);
 
@@ -197,7 +197,13 @@ public boolean connect() {
 
             status = DataProcessorStatus.CONNECTED;
 
-            task = CronUtil.schedule("0/10 * * * * ? ", (Runnable) () -> {
+            task = CronUtil.schedule("0/10 * * * * ?", (Runnable) () -> {
+
+                if( status != DataProcessorStatus.CONNECTED ) {
+
+                     return;
+
+                }
 
                 if( !checker() ) return;
 
@@ -274,6 +280,8 @@ private boolean checker() {
     @Override
     public boolean disconnect() {
 
+        log.debug("[数据库] [断开] 断开数据库连接 ...");
+
         status = DataProcessorStatus.DISCONNECTED;
 
         if ( this.session != null ) {
diff --git a/src/main/java/com/talexframe/frame/core/talex/TFrame.java b/src/main/java/com/talexframe/frame/core/talex/TFrame.java
@@ -1,5 +1,6 @@
 package com.talexframe.frame.core.talex;
 
+import cn.hutool.core.thread.ThreadUtil;
 import com.google.common.collect.Multimap;
 import com.talexframe.frame.TalexFrameApplication;
 import com.talexframe.frame.core.function.command.CommandManager;
@@ -104,13 +105,14 @@ public void started() {
         this.repoManager = TRepoManager.init();
         this.appManager = TAppManager.init();
 
+        log.info("Loading dao-manager ...");
+        this.daoManager = new DAOManager();
+
+
         getEventBus().registerListener(new FrameSelfListener());
 
         callEvent(new FrameStartedEvent(System.nanoTime() - TalexFrameApplication.startedTimeStamp));
 
-        log.info("Loading dao-manager ...");
-        this.daoManager = new DAOManager();
-
         if ( frameStatus == FrameStatus.RUNNING ) {
 
             log.info("Loading command-manager ...");
@@ -140,11 +142,16 @@ public void started() {
 
             new YamlConfigAdapter();
             new JSONConfigAdapter();
-            this.pluginManager = new PluginManager(new File(mainFile.getAbsolutePath() + "/plugins"));
-
-            this.pluginManager.loadAllPluginsInFolder();
             // ThreadUtil.execAsync(() -> this.pluginManager.loadAllPluginsInFolder());
 
+            ThreadUtil.execute(() -> {
+
+                this.pluginManager = new PluginManager(new File(mainFile.getAbsolutePath() + "/plugins"));
+
+                this.pluginManager.loadAllPluginsInFolder();
+
+            });
+
             log.info("框架启动成功! (" + (System.nanoTime() - TalexFrameApplication.startedTimeStamp) + " ns)");
             log.debug("** DEBUG 模式已启动!");
 
