@initial 7.0.0-preview.608 Canary

TalexDreamSoul · TalexDreamSoul · commit 82fc8dbe42e8 · 2022-06-08T21:46:56.000+08:00
diff --git a/src/main/java/com/talexframe/frame/core/function/command/frame/StopCmd.java b/src/main/java/com/talexframe/frame/core/function/command/frame/StopCmd.java
@@ -1,5 +1,6 @@
 package com.talexframe.frame.core.function.command.frame;
 
+import com.talexframe.frame.TalexFrameApplication;
 import com.talexframe.frame.core.function.command.BaseCommand;
 import com.talexframe.frame.core.function.command.ISender;
 import com.talexframe.frame.core.talex.TFrame;
@@ -20,7 +21,11 @@ public StopCmd() {
     @Override
     public boolean executeCommand(ISender sender, String wholeCommand, String matchedLabel, String[] args) {
 
-        tframe.shutdown();
+        if ( TalexFrameApplication.context != null ) {
+
+            TalexFrameApplication.context.stop();
+
+        }
 
         return false;
 
diff --git a/src/main/java/com/talexframe/frame/core/function/listener/FrameMajorListener.java b/src/main/java/com/talexframe/frame/core/function/listener/FrameMajorListener.java
@@ -84,6 +84,8 @@ public void onStopped(ContextStoppedEvent event) {
     @EventListener
     public void onStopped(ContextClosedEvent event) {
 
+        TFrame.tframe.shutdown();
+
         log.warn("框架已停止.");
 
         TFrame.tframe.callEvent(new FramePostUnInstallEvent(System.nanoTime() - TalexFrameApplication.startedTimeStamp));
diff --git a/src/main/java/com/talexframe/frame/core/modules/application/TAppManager.java b/src/main/java/com/talexframe/frame/core/modules/application/TAppManager.java
@@ -3,7 +3,6 @@
 import com.talexframe.frame.core.modules.event.events.app.AppPostRegisterEvent;
 import com.talexframe.frame.core.modules.event.events.app.AppPreRegisterEvent;
 import com.talexframe.frame.core.modules.event.events.app.AppUnRegisteredEvent;
-import com.talexframe.frame.core.modules.network.connection.RequestAnalyser;
 import com.talexframe.frame.core.modules.network.interfaces.IUnRegisterHandler;
 import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
 import com.talexframe.frame.core.modules.repository.TRepo;
@@ -64,7 +63,7 @@ public boolean registerController(WebPlugin plugin, TApp controller) {
 
         AppPreRegisterEvent event = new AppPreRegisterEvent(plugin, controller);
 
-        TFrame.tframe.callEvent(new AppPostRegisterEvent(plugin, controller));
+        TFrame.tframe.callEvent(event);
 
         if( event.isCancelled() ) return false;
 
diff --git a/src/main/java/com/talexframe/frame/core/modules/event/TalexEventBus.java b/src/main/java/com/talexframe/frame/core/modules/event/TalexEventBus.java
@@ -1,6 +1,7 @@
 package com.talexframe.frame.core.modules.event;
 
 import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.json.JSONUtil;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import com.talexframe.frame.core.modules.event.service.IContinue;
@@ -106,6 +107,8 @@ private void _callEvent(TalexEvent event, MethodManager methodManager) {
         // 判断 event 参数是否和 continue event 相同
         if( !methodManager.getMethod().getParameterTypes()[0].isAssignableFrom(event.getClass()) ) return;
 
+        log.debug("[Event] For _event: {} | {}", event, JSONUtil.toJsonStr(methodManager));
+
         // execute
         if ( methodManager.getTHandler().threadMode() == ThreadMode.ASYNC ) {
 
@@ -128,6 +131,8 @@ public TalexEventBus callEvent(TalexEvent event) {
             String matchKey = ( (IContinue) event ).getMatchKey();
             continueEvents.put(matchKey, event);
 
+            log.debug("[Event] For continuously event: {} | {}", event, JSONUtil.toJsonStr(continueEvents));
+
         }
 
         // 筛选出匹配的 methodManager
@@ -143,6 +148,8 @@ public TalexEventBus callEvent(TalexEvent event) {
 
         });
 
+        log.debug("[Event] For event preList: {}", preList);
+
         List<MethodManager> pl = new ArrayList<>(preList.values());
 
         pl.sort((o1, o2) -> {
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
@@ -73,12 +73,20 @@ private void process() {
 
         log.debug("[解析层] Format url: " + parsedUrl);
 
+        AtomicBoolean matched = new AtomicBoolean(false);
+
         networkManager.matchUrlReceivers(parsedUrl).forEach((reqReceiver) -> {
 
+            if( matched.get() ) return;
+
             String subUrl = parsedUrl.replaceFirst(reqReceiver.getTApp().getDefaultPath(), "");
 
             reqReceiver.matchUrlSubReceivers(subUrl).forEach((subReqReceiver) -> {
 
+                if( matched.get() ) return;
+
+                matched.set(true);
+
                 if( wr.getResponse().isCommitted() ) return;
 
                 log.debug("[解析层] 匹配到的路径: " + subUrl);
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
@@ -44,13 +44,23 @@ public boolean onPreInvokeMethod(MethodAppReceiver methodAppReceiver, WrappedRes
 
         if( tRedisCache == null ) return true;
 
+        Class<?> returnType = methodAppReceiver.getMethod().getReturnType();
+
+        if( returnType.isAssignableFrom(Void.TYPE) ) {
+
+            log.warn("[RedisCache] 方法返回类型为Void, 不支持缓存! ");
+
+            return true;
+
+        }
+
         RedisTemplate<String, Object> template = redis.getConfig().getRedisTemplate();
 
         ValueOperations<String, Object> vo = template.opsForValue();
 
         if ( !tRedisCache.delete() ) {
 
-            String key = getRedisCacheKey( tRedisCache, wr.getRequest().getRequestURI(), methodAppReceiver.getParams() );
+            String key = getRedisCacheKey( tRedisCache, wr.getRequest().getRequestURI(), wr.getParams() );
 
             Object obj = vo.get(key);
 
@@ -85,7 +95,17 @@ public void onPostInvokeMethod(MethodAppReceiver methodAppReceiver, WrappedRespo
 
         }
 
-        String key = getRedisCacheKey( tRedisCache, wr.getRequest().getRequestURI(), methodAppReceiver.getParams() );
+        Class<?> returnType = methodAppReceiver.getMethod().getReturnType();
+
+        if( returnType.isAssignableFrom(Void.TYPE) ) {
+
+            log.warn("[RedisCache] 方法返回类型为Void, 不支持缓存! ");
+
+            return;
+
+        }
+
+        String key = getRedisCacheKey( tRedisCache, wr.getRequest().getRequestURI(), wr.getParams() );
 
         if ( tRedisCache.delete() ) {
 
diff --git a/src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/param/ReceiverParamAddon.java b/src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/param/ReceiverParamAddon.java
@@ -14,6 +14,7 @@
 
 import java.lang.reflect.Parameter;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -35,6 +36,8 @@ public boolean onPreInvokeMethod(MethodAppReceiver methodAppReceiver, WrappedRes
 
         boolean parseData = methodAppReceiver.isParseData();
 
+        List<Object> params = wr.getParams();
+
         String str = parseData ? wr.getRequest().getBody() : null;
         JSONObject json = null;
 
@@ -52,7 +55,7 @@ public boolean onPreInvokeMethod(MethodAppReceiver methodAppReceiver, WrappedRes
 
             json = JSONUtil.parseObj(str);
 
-            log.debug("[解析层] RequestData: " + json.toString());
+            log.debug("[解析层] RequestData: " + json);
 
         }
 
@@ -62,7 +65,7 @@ public boolean onPreInvokeMethod(MethodAppReceiver methodAppReceiver, WrappedRes
 
             if( parameter.getType() == WrappedResponse.class ) {
 
-                methodAppReceiver.getParams().add(wr);
+                params.add(wr);
 
                 log.debug("[解析层]     #    -> WrappedResponse");
 
@@ -84,7 +87,7 @@ public boolean onPreInvokeMethod(MethodAppReceiver methodAppReceiver, WrappedRes
 
             if( tParam == null ) {
 
-                methodAppReceiver.getParams().add(null);
+                params.add(null);
 
                 log.warn("[解析层] AccessWarned # MissingParamAnnotation -> In null");
 
@@ -102,7 +105,7 @@ public boolean onPreInvokeMethod(MethodAppReceiver methodAppReceiver, WrappedRes
 
                 if ( !json.containsKey(fieldName) ) {
 
-                    if ( extracted(wr, methodAppReceiver, parameter, tParam) ) {
+                    if ( extracted(wr, parameter, tParam) ) {
 
                         log.debug("[解析层]  -- # -> Extracted");
 
@@ -126,11 +129,11 @@ public boolean onPreInvokeMethod(MethodAppReceiver methodAppReceiver, WrappedRes
 
                         could.set(addon.onPreAddParam(methodAppReceiver, parameter, wr, obj));
 
-                        log.info("[解析层]     Accessing <- Value: {}", could.get());
+                        log.debug("[解析层]     Accessing <- Value: {}", could.get());
 
                     });
 
-                    methodAppReceiver.getParams().add(obj);
+                    params.add(obj);
 
                     paramReceiverAddons.forEach((addon) -> {
 
@@ -146,7 +149,7 @@ public boolean onPreInvokeMethod(MethodAppReceiver methodAppReceiver, WrappedRes
 
             } catch ( ConvertException e ) {
 
-                if ( extracted(wr, methodAppReceiver, parameter, tParam) ) {
+                if ( extracted(wr, parameter, tParam) ) {
 
                     e.printStackTrace();
 
@@ -208,6 +211,8 @@ public boolean processUrlParam(MethodAppReceiver methodReceiver, Parameter param
 
         if ( tUrlParam == null ) return true;
 
+        List<Object> params = wr.getParams();
+
         String url = UrlUtil.formatUrl("/" + wr.getRequest().getRequestURI());
         String[] requestUrls = url.split("/");
         String requestUrl = UrlUtil.formatUrl("/" + methodReceiver.getTRequest().value());
@@ -238,7 +243,7 @@ public boolean processUrlParam(MethodAppReceiver methodReceiver, Parameter param
 
                 String obj = (i + 1 >= urls.length) ? urls[i] : urls[i + 1];
 
-                int ind = methodReceiver.getParams().size();
+                int ind = params.size();
 
                 AtomicBoolean could = new AtomicBoolean(true);
                 LinkedList<ReceiverAddon> urlParamReceiverAddons = ReceiverAddonAdapter.getReceiverAddons(ReceiverAddonType.URL_PARAM_APP);
@@ -250,13 +255,9 @@ public boolean processUrlParam(MethodAppReceiver methodReceiver, Parameter param
 
                 });
 
-                methodReceiver.getParams().add(obj);
-
-                urlParamReceiverAddons.forEach((addon) -> {
-
-                    addon.onPostAddUrlParam(methodReceiver, methodReceiver.getMethod().getParameters()[ind], wr, requestUrl, url, fieldName, obj);
+                params.add(obj);
 
-                });
+                urlParamReceiverAddons.forEach((addon) -> addon.onPostAddUrlParam(methodReceiver, methodReceiver.getMethod().getParameters()[ind], wr, requestUrl, url, fieldName, obj));
 
                 log.debug("[解析层]     add param: " + obj);
 
@@ -270,7 +271,7 @@ public boolean processUrlParam(MethodAppReceiver methodReceiver, Parameter param
 
     }
 
-    private boolean extracted(WrappedResponse wr, MethodAppReceiver methodAppReceiver, Parameter parameter, TParam param) {
+    private boolean extracted(WrappedResponse wr, Parameter parameter, TParam param) {
 
         if ( !param.nullable() ) {
 
@@ -282,7 +283,21 @@ private boolean extracted(WrappedResponse wr, MethodAppReceiver methodAppReceive
 
         } else {
 
-            methodAppReceiver.getParams().add(null);
+            if( !StrUtil.isBlankIfStr(param.defaultValue()) ) {
+
+                wr.getParams().add(
+                        new JSONObject().putOpt("value", param.defaultValue()).get("value", parameter.getType(), true)
+                );
+
+            } else if ( Number.class.isAssignableFrom( parameter.getType() ) ) { // 如果类型是数字类型就塞 0
+
+                wr.getParams().add(0);
+
+            } else if ( Boolean.class.isAssignableFrom( parameter.getType() ) ) {
+
+                wr.getParams().add(false);
+
+            } else wr.getParams().add(null);
 
         }
 
diff --git a/src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/param/TParam.java b/src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/param/TParam.java
@@ -1,5 +1,7 @@
 package com.talexframe.frame.core.modules.network.connection.app.addon.param;
 
+import com.google.common.annotations.Beta;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -20,6 +22,13 @@
      */
     boolean nullable() default false;
 
+    /**
+     * 当字段不存在时 将自动根据参数类型将输入内容转换输入
+     * 如果输入类型不匹配将会传入 null
+     */
+    @Beta
+    String defaultValue() default "";
+
     /**
      * 默认解析json字段为当前参数名，设置后将按照field解析
      */
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
@@ -12,8 +12,6 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * {@link com.talexframe.frame.core.modules.network.connection.app Package }
@@ -41,12 +39,8 @@ public MethodAppReceiver(TApp ownApp, Method method) {
 
         this.tRequest = method.getAnnotation(TRequest.class);
 
-        this.params = new ArrayList<>(method.getParameterCount());
-
     }
 
-    private final List<Object> params;
-
     @Setter
     private boolean parseData = false;
 
@@ -55,7 +49,7 @@ public Object onRequest(ClassAppReceiver clzAppReceiver, MethodAppReceiver metho
         log.info("[应用层] 交付执行 @" + clzAppReceiver.getOwnClass().getName() + "." + methodAppReceiver.getMethod().getName());
 
         log.info("[应用层]  #  参数一览 #");
-        log.info("[应用层]  #    (provide)-> {}", params);
+        log.info("[应用层]  #    (provide)-> {}", wr.getParams());
         log.info("[应用层]  #    (receive)-> {}", (Object) methodAppReceiver.getMethod().getParameters());
         log.info("[应用层]  #  开始执行并计时 #");
         log.info("[应用层]  ------------------------");
@@ -66,7 +60,7 @@ public Object onRequest(ClassAppReceiver clzAppReceiver, MethodAppReceiver metho
 
             timer.start(requestID);
 
-            Object obj = method.invoke(ownApp, params.toArray());
+            Object obj = method.invoke(ownApp, wr.getParams().toArray());
 
             long ms = timer.intervalMs(wr.getRequest().getSession().getId());
 
diff --git a/src/main/java/com/talexframe/frame/core/modules/plugins/core/PluginManager.java b/src/main/java/com/talexframe/frame/core/modules/plugins/core/PluginManager.java
@@ -370,6 +370,8 @@ public boolean unloadPlugin(String pluginName) {
 
         }
 
+        log.info("[插件] Plugin onDisable: {}", plugin);
+
         plugin.onDisable();
 
         PluginScanner scanner = this.pluginScannerMap.get(pluginName);
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
@@ -5,13 +5,14 @@
 import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
 import com.talexframe.frame.core.talex.FrameCreator;
 import lombok.SneakyThrows;
-import org.springframework.stereotype.Component;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * {@link com.talexframe.frame.core.modules.application Package }
  *
  * @author TalexDreamSoul 22/04/02 下午 08:44 Project: TalexFrame
  */
+@Slf4j
 public class TRepoCompAdapter extends PluginCompAdapter<TRepo> {
 
     private final TRepoManager repoManager = tframe.getRepoManager();
@@ -20,13 +21,17 @@ public class TRepoCompAdapter extends PluginCompAdapter<TRepo> {
     @Override
     public boolean injectWithInstance(PluginScanner scanner, WebPlugin webPlugin, TRepo instance) {
 
+        log.info("[TRepoCompAdapter] injectWithInstance: {}", instance.getClass().getName());
+
         return repoManager.registerRepo( webPlugin, instance );
 
     }
 
     @Override
     public boolean logoutInstance(PluginScanner scanner, WebPlugin webPlugin, Class<? extends FrameCreator> clazz) {
 
+        log.info("[Repository] Unregister owned by {} | {}", webPlugin.getName(), clazz.getName());
+
         return repoManager.unRegisterRepo( webPlugin, repoManager.getRepoByClass(clazz));
 
     }
diff --git a/src/main/java/com/talexframe/frame/core/modules/schedule/FrameRunnable.java b/src/main/java/com/talexframe/frame/core/modules/schedule/FrameRunnable.java
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
diff --git a/src/main/java/com/talexframe/frame/core/pojo/wrapper/WrappedResponse.java b/src/main/java/com/talexframe/frame/core/pojo/wrapper/WrappedResponse.java
diff --git a/src/main/java/com/talexframe/frame/core/talex/TFrame.java b/src/main/java/com/talexframe/frame/core/talex/TFrame.java
diff --git a/src/test/java/com/talex/talexframe/TalexFrameApplicationTests.java b/src/test/java/com/talex/talexframe/TalexFrameApplicationTests.java

Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,8 @@ public boolean unloadPlugin(String pluginName) {`
`370`	`370`
`371`	`371`	`}`
`372`	`372`
	`373`	`+ log.info("[插件] Plugin onDisable: {}", plugin);`
	`374`	`+`
`373`	`375`	`plugin.onDisable();`
`374`	`376`
`375`	`377`	`PluginScanner scanner = this.pluginScannerMap.get(pluginName);`