@initial 7.0.0-preview.606 Fixed bugs

Author: TalexDreamSoul

src/main/java/com/talexframe/frame/core/function/command/frame/RestartCmd.java

@@ -0,0 +1,32 @@
+package com.talexframe.frame.core.function.command.frame;
+
+import com.talexframe.frame.core.function.command.BaseCommand;
+import com.talexframe.frame.core.function.command.ISender;
+import com.talexframe.frame.core.talex.TFrame;
+import com.talexframe.launcher.Launcher;
+
+/**
+ * 帮助命令 <br /> {@link com.talexframe.frame.function.command.frame Package }
+ *
+ * @author TalexDreamSoul
+ * @date 2022/1/20 11:40 <br /> Project: TalexFrame <br />
+ */
+public class RestartCmd extends BaseCommand {
+
+    public RestartCmd() {
+
+        super(TFrame.tframe.getFrameSender(), "restart", new String[] {}, "重启系统");
+    }
+
+    @Override
+    public boolean executeCommand(ISender sender, String wholeCommand, String matchedLabel, String[] args) {
+
+        Launcher.restart = true;
+
+        tframe.shutdown();
+
+        return false;
+
+    }
+
+}

src/main/java/com/talexframe/frame/core/function/listener/FrameMajorListener.java

@@ -1,9 +1,11 @@
 package com.talexframe.frame.core.function.listener;
 
+import cn.hutool.core.thread.ThreadUtil;
 import com.talexframe.frame.TalexFrameApplication;
 import com.talexframe.frame.core.modules.event.events.frame.*;
 import com.talexframe.frame.core.pojo.enums.FrameStatus;
 import com.talexframe.frame.core.talex.TFrame;
+import com.talexframe.launcher.Launcher;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.event.ApplicationPreparedEvent;
@@ -95,6 +97,22 @@ public void onStopped(ContextClosedEvent event) {
 
             scanner.close();
 
+        } else if( Launcher.restart ) {
+
+            ThreadUtil.execAsync(() -> {
+
+                log.info("[框架] 将在 3 秒后重启...");
+
+                try {
+                    Thread.sleep(3000);
+                } catch ( InterruptedException e ) {
+                    throw new RuntimeException(e);
+                }
+
+                TalexFrameApplication.start(Launcher.g_args);
+
+            });
+
         }
 
     }

src/main/java/com/talexframe/frame/core/function/listener/FrameSaTokenListener.java

@@ -0,0 +1,80 @@
+package com.talexframe.frame.core.function.listener;
+
+import cn.dev33.satoken.listener.SaTokenListener;
+import cn.dev33.satoken.stp.SaLoginModel;
+import com.talexframe.frame.core.modules.event.events.satoken.*;
+import com.talexframe.frame.core.talex.TFrame;
+import org.springframework.stereotype.Component;
+
+/**
+ * {@link com.talexframe.frame.core.function.listener Package }
+ *
+ * @author TalexDreamSoul 22/06/05 下午 11:52 Project: TalexFrame
+ */
+@Component
+public class FrameSaTokenListener implements SaTokenListener {
+
+    @Override
+    public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel) {
+
+        TFrame.tframe.callEvent(new SaPostLoginEvent(loginType, loginId, tokenValue, loginModel));
+
+    }
+
+    /** 每次注销时触发 */
+    @Override
+    public void doLogout(String loginType, Object loginId, String tokenValue) {
+
+        TFrame.tframe.callEvent(new SaPostLogoutEvent(loginType, loginId, tokenValue));
+
+    }
+
+    /** 每次被踢下线时触发 */
+    @Override
+    public void doKickout(String loginType, Object loginId, String tokenValue) {
+
+        TFrame.tframe.callEvent(new SaPostLogoutEvent(loginType, loginId, tokenValue));
+
+    }
+
+    /** 每次被顶下线时触发 */
+    @Override
+    public void doReplaced(String loginType, Object loginId, String tokenValue) {
+
+        TFrame.tframe.callEvent(new SaPostLogoutEvent(loginType, loginId, tokenValue));
+
+    }
+
+    /** 每次被封禁时触发 */
+    @Override
+    public void doDisable(String loginType, Object loginId, long disableTime) {
+
+        TFrame.tframe.callEvent(new SaUserDisabledEvent(loginType, loginId, disableTime));
+
+    }
+
+    /** 每次被解封时触发 */
+    @Override
+    public void doUntieDisable(String loginType, Object loginId) {
+
+        TFrame.tframe.callEvent(new SaUserEnabledEvent(loginType, loginId));
+
+    }
+
+    /** 每次创建Session时触发 */
+    @Override
+    public void doCreateSession(String id) {
+
+        TFrame.tframe.callEvent(new SaSessionCreateEvent(id));
+
+    }
+
+    /** 每次注销Session时触发 */
+    @Override
+    public void doLogoutSession(String id) {
+
+        TFrame.tframe.callEvent(new SaSessionLogoutEvent(id));
+
+    }
+
+}

src/main/java/com/talexframe/frame/core/function/listener/FrameSelfListener.java

@@ -2,10 +2,9 @@
 
 import com.talexframe.frame.core.modules.event.FrameListener;
 import com.talexframe.frame.core.modules.event.TalexSubscribe;
-import com.talexframe.frame.core.modules.event.events.dao.DAOProcessorConnectedEvent;
 import com.talexframe.frame.core.modules.event.events.dao.DAOProcessorPreShutdownEvent;
-import com.talexframe.frame.core.modules.repository.TRepoPlus;
 import com.talexframe.frame.core.modules.repository.TRepo;
+import com.talexframe.frame.core.modules.repository.TRepoPlus;
 import com.talexframe.frame.core.pojo.dao.factory.mysql.Mysql;
 import com.talexframe.frame.core.talex.TFrame;
 
@@ -25,20 +24,20 @@ public FrameSelfListener() {
 
     }
 
-    @TalexSubscribe
-    public void onMysqlConnected(DAOProcessorConnectedEvent<Mysql> event) {
-
-        for ( TRepo repository : tframe.getRepoManager().getRepositories().values() ) {
-
-            if ( repository instanceof TRepoPlus ) {
-
-                ( (TRepoPlus<?>) repository ).onInstall();
-
-            }
-
-        }
-
-    }
+    // @TalexSubscribe
+    // public void onMysqlConnected(DAOProcessorConnectedEvent<Mysql> event) {
+    //
+    //     for ( TRepo repository : tframe.getRepoManager().getRepositories().values() ) {
+    //
+    //         if ( repository instanceof TRepoPlus ) {
+    //
+    //             ( (TRepoPlus<?>) repository ).onInstall();
+    //
+    //         }
+    //
+    //     }
+    //
+    // }
 
     @TalexSubscribe
     public void onMysqlPreShutdown(DAOProcessorPreShutdownEvent<Mysql> event) {

src/main/java/com/talexframe/frame/core/modules/event/events/satoken/SaKickLogoutEvent.java

@@ -0,0 +1,26 @@
+package com.talexframe.frame.core.modules.event.events.satoken;
+
+import com.talexframe.frame.core.modules.event.TalexEvent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 当用户被踢出时触发
+ */
+@EqualsAndHashCode( callSuper = true )
+@Data
+public class SaKickLogoutEvent extends TalexEvent {
+
+    private final String loginType;
+    private final Object loginId;
+    private final String tokenValue;
+
+    public SaKickLogoutEvent(String loginType, Object loginId, String tokenValue) {
+
+        this.loginType = loginType;
+        this.loginId = loginId;
+        this.tokenValue = tokenValue;
+    }
+
+
+}

src/main/java/com/talexframe/frame/core/modules/event/events/satoken/SaPostLoginEvent.java

@@ -0,0 +1,30 @@
+package com.talexframe.frame.core.modules.event.events.satoken;
+
+import cn.dev33.satoken.stp.SaLoginModel;
+import com.talexframe.frame.core.modules.event.TalexEvent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 当用户登录时触发
+ */
+@EqualsAndHashCode( callSuper = true )
+@Data
+public class SaPostLoginEvent extends TalexEvent {
+
+    private final String loginType;
+    private final Object loginId;
+    private final String tokenValue;
+    private final SaLoginModel loginModel;
+
+    public SaPostLoginEvent(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel) {
+
+        this.loginType = loginType;
+        this.loginId = loginId;
+        this.tokenValue = tokenValue;
+        this.loginModel = loginModel;
+
+    }
+
+
+}

src/main/java/com/talexframe/frame/core/modules/event/events/satoken/SaPostLogoutEvent.java

@@ -0,0 +1,27 @@
+package com.talexframe.frame.core.modules.event.events.satoken;
+
+import com.talexframe.frame.core.modules.event.TalexEvent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 当用户登出时触发
+ */
+@EqualsAndHashCode( callSuper = true )
+@Data
+public class SaPostLogoutEvent extends TalexEvent {
+
+    private final String loginType;
+    private final Object loginId;
+    private final String tokenValue;
+
+    public SaPostLogoutEvent(String loginType, Object loginId, String tokenValue) {
+
+        this.loginType = loginType;
+        this.loginId = loginId;
+        this.tokenValue = tokenValue;
+
+    }
+
+
+}

src/main/java/com/talexframe/frame/core/modules/event/events/satoken/SaPostReplacedOutEvent.java

@@ -0,0 +1,26 @@
+package com.talexframe.frame.core.modules.event.events.satoken;
+
+import com.talexframe.frame.core.modules.event.TalexEvent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 当用户登出时触发
+ */
+@EqualsAndHashCode( callSuper = true )
+@Data
+public class SaPostReplacedOutEvent extends TalexEvent {
+
+    private final String loginType;
+    private final Object loginId;
+    private final String tokenValue;
+
+    public SaPostReplacedOutEvent(String loginType, Object loginId, String tokenValue) {
+
+        this.loginType = loginType;
+        this.loginId = loginId;
+        this.tokenValue = tokenValue;
+    }
+
+
+}

src/main/java/com/talexframe/frame/core/modules/event/events/satoken/SaSessionCreateEvent.java

@@ -0,0 +1,23 @@
+package com.talexframe.frame.core.modules.event.events.satoken;
+
+import com.talexframe.frame.core.modules.event.TalexEvent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 当 Session创建 时触发
+ */
+@EqualsAndHashCode( callSuper = true )
+@Data
+public class SaSessionCreateEvent extends TalexEvent {
+
+    private final String id;
+
+    public SaSessionCreateEvent(String id) {
+
+        this.id = id;
+
+    }
+
+
+}

src/main/java/com/talexframe/frame/core/modules/event/events/satoken/SaSessionLogoutEvent.java

@@ -0,0 +1,23 @@
+package com.talexframe.frame.core.modules.event.events.satoken;
+
+import com.talexframe.frame.core.modules.event.TalexEvent;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 当 Session注销 时触发
+ */
+@EqualsAndHashCode( callSuper = true )
+@Data
+public class SaSessionLogoutEvent extends TalexEvent {
+
+    private final String id;
+
+    public SaSessionLogoutEvent(String id) {
+
+        this.id = id;
+
+    }
+
+
+}