Skip to content

Commit 2c3e13c

Browse files
Develop (#16)
* Add<TParamSqlValid>: Add annotation for application to check whether params are legal * Upd<TParamSqlValid>: Update annotation for custom validate field * Fix<ConfigAdapter>: logout instance return error * Fix<Mysql>: Fix disconnect logic (Set status in advance cause data couldn't save) Fix<MaxLengthCheckError>: case error Change<UrlUtil>: Improve logic Fix<MethodAppReceiver>: Fix intervalMS logic * Change<Frame>: For couldn't stop frame properly, add some debug log * Change<RouterMatch>: Quote tire, waiting for next canary version, for completely hot-adapt path mechanism * Change<Frame>: Trim plug-in system, transposing partial implementation, add application command * Upd<README>: Update README, english version waiting * @initial 7.0.0-official * Change<Project>: param validate addon field (msg) & with events & with objParam(anno) * Change<Project>: param validate addon field (msg) & with events & with objParam(anno)
1 parent 56f8376 commit 2c3e13c

35 files changed

Lines changed: 374 additions & 77 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ public void doLogout(String loginType, Object loginId, String tokenValue) {
3333
@Override
3434
public void doKickout(String loginType, Object loginId, String tokenValue) {
3535

36-
TFrame.tframe.callEvent(new SaPostLogoutEvent(loginType, loginId, tokenValue));
36+
TFrame.tframe.callEvent(new SaKickLogoutEvent(loginType, loginId, tokenValue));
3737

3838
}
3939

4040
/** 每次被顶下线时触发 */
4141
@Override
4242
public void doReplaced(String loginType, Object loginId, String tokenValue) {
4343

44-
TFrame.tframe.callEvent(new SaPostLogoutEvent(loginType, loginId, tokenValue));
44+
TFrame.tframe.callEvent(new SaPostReplacedOutEvent(loginType, loginId, tokenValue));
4545

4646
}
4747

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

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

33
import com.talexframe.frame.core.modules.repository.TRepo;
44
import com.talexframe.frame.core.modules.repository.TRepoManager;
5-
import com.talexframe.frame.core.pojo.mapper.frame.FrameSender;
65
import com.talexframe.frame.core.talex.FrameCreator;
76
import com.talexframe.frame.core.talex.TFrame;
87
import lombok.Getter;
@@ -17,7 +16,7 @@
1716
public abstract class TApp extends FrameCreator {
1817

1918
protected final TFrame tframe = TFrame.tframe;
20-
protected FrameSender frameSender = tframe.getFrameSender();
19+
2120
protected TAppManager controllerManager = tframe.getAppManager();
2221
protected TRepoManager repositoryManager = tframe.getRepoManager();
2322
protected TRepo repo;
@@ -45,6 +44,10 @@ public String getDefaultPath() {
4544

4645
}
4746

47+
/**
48+
* Use getRepo().getProvider() instead, because of single responsibility
49+
*/
50+
@Deprecated
4851
public String getTableName() {
4952

5053
return this.repo.getProvider();

src/main/java/com/talexframe/frame/core/modules/application/TAppPlus.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
44
import com.talexframe.frame.core.modules.repository.TRepoPlus;
55
import com.talexframe.frame.core.modules.repository.TRepo;
6+
import com.talexframe.frame.core.pojo.mapper.frame.FramePluginSender;
67
import com.talexframe.frame.core.talex.TFrame;
78
import lombok.Getter;
89

@@ -22,6 +23,8 @@ public class TAppPlus<T extends TRepoPlus<?>> extends TApp {
2223
* 如果使用的是 TAppPlus 那么应该调用这个 repo
2324
*/
2425
protected T asRepository;
26+
protected FramePluginSender logger;
27+
2528
private Class<T> templateData;
2629

2730
/**
@@ -34,6 +37,7 @@ public TAppPlus(String provider, WebPlugin webPlugin) {
3437
super(provider);
3538

3639
this.ownPlugin = webPlugin;
40+
this.logger = webPlugin.getConsoleSender();
3741

3842
}
3943

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.talexframe.frame.core.modules.event.events.plugin;
2+
3+
import com.talexframe.frame.core.modules.event.service.TalexEvent;
4+
import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
5+
import lombok.Getter;
6+
7+
/**
8+
* {@link com.talexframe.frame.core.modules.event.events.plugin Package }
9+
*
10+
* @author TalexDreamSoul 22/08/01 下午 03:13 Project: TalexFrame
11+
*/
12+
public class WebPluginDisabledEvent extends TalexEvent {
13+
14+
@Getter
15+
private final WebPlugin plugin;
16+
17+
public WebPluginDisabledEvent(WebPlugin plugin) {
18+
19+
this.plugin = plugin;
20+
21+
}
22+
23+
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.talexframe.frame.core.modules.event.events.plugin;
2+
3+
import com.talexframe.frame.core.modules.event.service.TalexEvent;
4+
import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
5+
import lombok.Getter;
6+
7+
/**
8+
* {@link com.talexframe.frame.core.modules.event.events.plugin Package }
9+
*
10+
* @author TalexDreamSoul 22/08/01 下午 03:18 Project: TalexFrame
11+
*/
12+
public class WebPluginPreDisableEvent extends TalexEvent {
13+
14+
@Getter
15+
private final WebPlugin plugin;
16+
17+
public WebPluginPreDisableEvent(WebPlugin plugin) {
18+
19+
this.plugin = plugin;
20+
}
21+
22+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.talexframe.frame.core.modules.event.events.plugin;
2+
3+
import com.talexframe.frame.core.modules.event.service.TalexEvent;
4+
import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
5+
import lombok.Getter;
6+
7+
/**
8+
* {@link com.talexframe.frame.core.modules.event.events.plugin Package }
9+
*
10+
* @author TalexDreamSoul 22/08/01 下午 02:58 Project: TalexFrame
11+
*/
12+
public class WebPluginPreScanEvent extends TalexEvent {
13+
14+
@Getter
15+
private final WebPlugin plugin;
16+
17+
public WebPluginPreScanEvent(WebPlugin plugin) {
18+
19+
this.plugin = plugin;
20+
21+
}
22+
23+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.talexframe.frame.core.modules.event.events.plugin;
2+
3+
import com.talexframe.frame.core.modules.event.service.TalexEvent;
4+
import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
5+
import lombok.Getter;
6+
7+
/**
8+
* {@link com.talexframe.frame.core.modules.event.events.plugin Package }
9+
*
10+
* @author TalexDreamSoul 22/08/01 下午 03:13 Project: TalexFrame
11+
*/
12+
public class WebPluginScannedEvent extends TalexEvent {
13+
14+
@Getter
15+
private final WebPlugin plugin;
16+
17+
public WebPluginScannedEvent(WebPlugin plugin) {
18+
19+
this.plugin = plugin;
20+
21+
}
22+
23+
}

src/main/java/com/talexframe/frame/core/modules/event/events/request/PostHandleRequest.java renamed to src/main/java/com/talexframe/frame/core/modules/event/events/request/PostHandleRequestEvent.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
import javax.servlet.http.HttpServletResponse;
99

1010
/**
11-
* 在建立请求之后 (interceptor post handle request) 如果取消则不会进入插件处理阶段 <br /> {@link com.talexframe.frame.function.event.events.request
11+
* 在建立请求之后 (interceptor post handle request) 如果取消则不会进入插件处理阶段 <br /> {@link com.talexframe.frame.core.modules.event.events.request
1212
* Package }
1313
*
1414
* @author TalexDreamSoul
15-
* @date 2022/1/20 19:23 <br /> Project: TalexFrame <br />
15+
* 2022/08/01 02:55:40 <br /> Project: TalexFrame <br />
1616
*/
17-
public class PostHandleRequest extends TalexEvent {
17+
public class PostHandleRequestEvent extends TalexEvent {
1818

1919
@Getter
2020
private final BodyCopyHttpServletRequestWrapper request;
@@ -28,7 +28,7 @@ public class PostHandleRequest extends TalexEvent {
2828
@Getter
2929
private final ModelAndView modelAndView;
3030

31-
public PostHandleRequest(BodyCopyHttpServletRequestWrapper request, HttpServletResponse response, Object handler, ModelAndView modelAndView) {
31+
public PostHandleRequestEvent(BodyCopyHttpServletRequestWrapper request, HttpServletResponse response, Object handler, ModelAndView modelAndView) {
3232

3333
this.request = request;
3434
this.response = response;

src/main/java/com/talexframe/frame/core/modules/network/connection/app/ClassReceiverManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ClassReceiverManager {
2222
@Getter
2323
private final TrieRouter tireRouter = new TrieRouter();
2424

25-
private AntPathMatcher antPathMatcher = new AntPathMatcher();
25+
private final AntPathMatcher antPathMatcher = new AntPathMatcher();
2626

2727
private ClassReceiverManager() {
2828

src/main/java/com/talexframe/frame/core/modules/network/connection/app/addon/ReceiverAddonAdapter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.max.value.ReceiverMaxValueValidateAddon;
1313
import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.min.length.ReceiverMinLengthValidateAddon;
1414
import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.min.value.ReceiverMinValueValidateAddon;
15-
import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.nonull.ReceiverNoNullValidateAddon;
1615
import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.pattern.ReceiverPatternValidateAddon;
1716
import com.talexframe.frame.core.modules.network.connection.app.addon.param.valid.sql.ReceiverParamSqlValidateAddon;
1817
import com.talexframe.frame.core.modules.network.connection.app.addon.permission.ReceiverPermissionAddon;
@@ -57,7 +56,6 @@ public ReceiverAddonAdapter() {
5756
register(new ReceiverCacheRedisAddon());
5857

5958
register(new ReceiverPatternValidateAddon());
60-
register(new ReceiverNoNullValidateAddon());
6159
register(new ReceiverAssertValidateAddon());
6260
register(new ReceiverMaxLengthValidateAddon());
6361
register(new ReceiverMaxValueValidateAddon());

0 commit comments

Comments
 (0)