Skip to content

Commit 6f4404a

Browse files
TalexDreamSoulTalexDreamSoul
committed
@initial 7.0.0-preview.607 Completely change request analyser logic
1 parent c5bad2d commit 6f4404a

79 files changed

Lines changed: 2136 additions & 1186 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎mvnw‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<dependency>
108108
<groupId>mysql</groupId>
109109
<artifactId>mysql-connector-java</artifactId>
110-
<version>8.0.28</version>
110+
<version>8.0.29</version>
111111
<scope>runtime</scope>
112112
</dependency>
113113
<dependency>
@@ -184,7 +184,7 @@
184184
<dependency>
185185
<groupId>cn.hutool</groupId>
186186
<artifactId>hutool-all</artifactId>
187-
<version>5.8.0</version>
187+
<version>5.8.1</version>
188188
</dependency>
189189
<!-- <dependency>-->
190190
<!-- <groupId>org.springframework.boot</groupId>-->

‎src/main/java/com/talexframe/frame/config/RedisConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class RedisConfig {
1818
//
1919
// redisTemplate.setConnectionFactory(connectionFactory);
2020
//
21-
// Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
21+
// Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.app);
2222
//
2323
// ObjectMapper objectMapper = new ObjectMapper();
2424
// objectMapper.setVisibility(PropertyAccessor.ALL, com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility.ANY);

‎src/main/java/com/talexframe/frame/core/function/command/CommandManager.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.talexframe.frame.core.function.command;
22

33
import cn.hutool.core.util.StrUtil;
4-
import com.talexframe.frame.core.pojo.annotations.TalexCommand;
4+
import com.talexframe.frame.core.pojo.annotations.TCmd;
55
import com.talexframe.frame.core.pojo.wrapper.WrappedSender;
66
import com.talexframe.frame.core.talex.TFrame;
77
import lombok.Getter;
@@ -99,7 +99,7 @@ private void processCmdClass(ISender sender, BaseCommand cmd, String wholeCmd, S
9999

100100
for ( Method method : cmd.getClass().getMethods() ) {
101101

102-
TalexCommand tc = method.getAnnotation(TalexCommand.class);
102+
TCmd tc = method.getAnnotation(TCmd.class);
103103

104104
if ( tc == null ) {
105105
continue;

‎src/main/java/com/talexframe/frame/core/function/command/frame/InfoCmd.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import cn.hutool.system.*;
44
import com.talexframe.frame.core.function.command.BaseCommand;
5-
import com.talexframe.frame.core.pojo.annotations.TalexCommand;
5+
import com.talexframe.frame.core.pojo.annotations.TCmd;
66
import com.talexframe.frame.core.pojo.wrapper.WrappedSender;
77
import com.talexframe.frame.core.talex.TFrame;
88

@@ -19,7 +19,7 @@ public InfoCmd() {
1919
super(TFrame.tframe.getFrameSender(), "info", new String[] { "information", "i" }, "信息命令");
2020
}
2121

22-
@TalexCommand
22+
@TCmd
2323
public void onDefault(WrappedSender sender) {
2424

2525
sender.sendMessage(DIVIDER);
@@ -31,7 +31,7 @@ public void onDefault(WrappedSender sender) {
3131

3232
}
3333

34-
@TalexCommand( "details" )
34+
@TCmd( "details" )
3535
public void onDetails(WrappedSender sender) {
3636

3737
sender.sendMessage( DIVIDER );
@@ -72,7 +72,7 @@ public void onDetails(WrappedSender sender) {
7272

7373
}
7474

75-
@TalexCommand( "platform" )
75+
@TCmd( "platform" )
7676
public void onPlatform(WrappedSender sender) {
7777

7878
sender.sendMessage( DIVIDER );
@@ -96,8 +96,8 @@ public void onPlatform(WrappedSender sender) {
9696
sender.sendMessage(" --> version: " + runtimeInfo.getVersion());
9797
sender.sendMessage(" --> home: " + runtimeInfo.getHomeDir());
9898
sender.sendMessage(" --> endorsed-dirs: " + runtimeInfo.getEndorsedDirs());
99-
sender.sendMessage(" --> class-path: " + runtimeInfo.getClassPath());
100-
sender.sendMessage(" --> class-version: " + runtimeInfo.getClassVersion());
99+
sender.sendMessage(" --> app-path: " + runtimeInfo.getClassPath());
100+
sender.sendMessage(" --> app-version: " + runtimeInfo.getClassVersion());
101101
sender.sendMessage(" --> library-path: " + runtimeInfo.getLibraryPath());
102102
sender.sendMessage(" --> protocol-packages: " + runtimeInfo.getProtocolPackages());
103103

@@ -115,7 +115,7 @@ public void onPlatform(WrappedSender sender) {
115115

116116
}
117117

118-
@TalexCommand( "version" )
118+
@TCmd( "version" )
119119
public void onVersion(WrappedSender sender) {
120120

121121
sender.sendMessage( DIVIDER );

‎src/main/java/com/talexframe/frame/core/function/command/frame/PluginCmd.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.talexframe.frame.core.function.command.ISender;
55
import com.talexframe.frame.core.modules.plugins.core.PluginInfo;
66
import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
7-
import com.talexframe.frame.core.pojo.annotations.TalexCommand;
7+
import com.talexframe.frame.core.pojo.annotations.TCmd;
88
import com.talexframe.frame.core.pojo.mapper.frame.FrameSender;
99
import com.talexframe.frame.core.pojo.wrapper.WrappedSender;
1010
import com.talexframe.frame.core.talex.TFrame;
@@ -22,7 +22,7 @@ public PluginCmd() {
2222
super(TFrame.tframe.getFrameSender(), "plugin", new String[] { "plugins", "plugman" }, "插件命令");
2323
}
2424

25-
@TalexCommand
25+
@TCmd
2626
public void onDefault(WrappedSender sender) {
2727

2828
sender.sendMessage(DIVIDER);
@@ -35,7 +35,7 @@ public void onDefault(WrappedSender sender) {
3535

3636
}
3737

38-
@TalexCommand( "list" )
38+
@TCmd( "list" )
3939
public void onListPlugin(WrappedSender sender) {
4040

4141
sender.sendMessage("%divider%");
@@ -58,14 +58,14 @@ public void onListPlugin(WrappedSender sender) {
5858

5959
}
6060

61-
@TalexCommand( "load" )
61+
@TCmd( "load" )
6262
public void onLoadPlugin(ISender sender, String loadPlugin) {
6363

6464
tframe.getPluginManager().loadPlugin(loadPlugin);
6565

6666
}
6767

68-
@TalexCommand( "unload" )
68+
@TCmd( "unload" )
6969
public void onUnloadPlugin(ISender sender, String loadPlugin) {
7070

7171
sender.sendMessage("[插件] 正在卸载插件 " + loadPlugin);
@@ -88,7 +88,7 @@ public void onUnloadPlugin(ISender sender, String loadPlugin) {
8888

8989
}
9090

91-
@TalexCommand( "reload" )
91+
@TCmd( "reload" )
9292
public void onReloadPlugin(ISender sender, String loadPlugin) {
9393

9494
sender.sendMessage("[插件] 正在重载插件 " + loadPlugin);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.talexframe.frame.core.function.listener;
22

33
import com.talexframe.frame.core.modules.event.FrameListener;
4-
import com.talexframe.frame.core.modules.event.TalexSubscribe;
4+
import com.talexframe.frame.core.modules.event.THandler;
55
import com.talexframe.frame.core.modules.event.events.dao.DAOProcessorPreShutdownEvent;
66
import com.talexframe.frame.core.modules.repository.TRepo;
77
import com.talexframe.frame.core.modules.repository.TRepoPlus;
@@ -24,7 +24,7 @@ public FrameSelfListener() {
2424

2525
}
2626

27-
// @TalexSubscribe
27+
// @THandler
2828
// public void onMysqlConnected(DAOProcessorConnectedEvent<Mysql> event) {
2929
//
3030
// for ( TRepo repository : tframe.getRepoManager().getRepositories().values() ) {
@@ -39,7 +39,7 @@ public FrameSelfListener() {
3939
//
4040
// }
4141

42-
@TalexSubscribe
42+
@THandler
4343
public void onMysqlPreShutdown(DAOProcessorPreShutdownEvent<Mysql> event) {
4444

4545
for ( TRepo repository : tframe.getRepoManager().getRepositories().values() ) {

‎src/main/java/com/talexframe/frame/core/modules/application/TApp.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,23 @@ public TApp(String provider) {
2828

2929
this.repo = this.getRepo();
3030

31-
// 不强制要求 Repository
31+
}
3232

33-
// if ( this.repo == null ) {
33+
public abstract TRepo getRepo();
3434

35-
// throw new RuntimeException("无法找到 Repo");
35+
/**
36+
*
37+
* 获取这个类所有请求接口的起始路径
38+
* For example, if you set 'api/v1/' as the base path, then in order to enter, the url path must initiative added on each request path;
39+
*
40+
* @return basic path
41+
*/
42+
public String getDefaultPath() {
3643

37-
// }
44+
return "";
3845

3946
}
4047

41-
public abstract TRepo getRepo();
42-
4348
public String getTableName() {
4449

4550
return this.repo.getProvider();

‎src/main/java/com/talexframe/frame/core/modules/application/TAppManager.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package com.talexframe.frame.core.modules.application;
22

3+
import com.talexframe.frame.core.modules.event.events.app.AppPostRegisterEvent;
4+
import com.talexframe.frame.core.modules.event.events.app.AppPreRegisterEvent;
5+
import com.talexframe.frame.core.modules.event.events.app.AppUnRegisteredEvent;
36
import com.talexframe.frame.core.modules.network.connection.RequestAnalyser;
47
import com.talexframe.frame.core.modules.network.interfaces.IUnRegisterHandler;
58
import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
@@ -59,6 +62,12 @@ public boolean registerController(WebPlugin plugin, TApp controller) {
5962

6063
}
6164

65+
AppPreRegisterEvent event = new AppPreRegisterEvent(plugin, controller);
66+
67+
TFrame.tframe.callEvent(new AppPostRegisterEvent(plugin, controller));
68+
69+
if( event.isCancelled() ) return false;
70+
6271
this.controllers.put(controller.getClass(), controller);
6372
this.controllerPluginMap.put(controller, plugin.getName());
6473

@@ -93,12 +102,7 @@ public boolean registerController(WebPlugin plugin, TApp controller) {
93102

94103
}
95104

96-
/**
97-
*
98-
* 让 NetworkMananager 扫一下这个类
99-
*
100-
*/
101-
RequestAnalyser.scanRequests(controller);
105+
TFrame.tframe.callEvent(new AppPostRegisterEvent(plugin, controller));
102106

103107
return true;
104108

@@ -131,6 +135,8 @@ public boolean unRegisterController(WebPlugin plugin, TApp controller) {
131135
this.controllers.remove(controller.getClass(), controller);
132136
this.controllerPluginMap.remove(controller, plugin.getName());
133137

138+
TFrame.tframe.callEvent(new AppUnRegisteredEvent(plugin, controller));
139+
134140
return true;
135141

136142
}

‎src/main/java/com/talexframe/frame/core/modules/event/MethodManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public class MethodManager {
2020
private Method method;
2121
@Setter
2222
@Getter
23-
private TalexSubscribe talexSubscribe;
23+
private THandler tHandler;
2424

25-
public MethodManager(FrameListener listener, Class<?> paramType, Method method, TalexSubscribe talexSubscribe) {
25+
public MethodManager(FrameListener listener, Class<?> paramType, Method method, THandler tHandler) {
2626

2727
this.owner = listener;
2828
this.paramType = paramType;
2929
this.method = method;
30-
this.talexSubscribe = talexSubscribe;
30+
this.tHandler = tHandler;
3131

3232
}
3333

0 commit comments

Comments
 (0)