Skip to content

Commit 3634f57

Browse files
TalexDreamSoulTalexDreamSoul
authored
Merge pull request #2 from Talexs/develop
@initial 7.0.0-preview.318.1
2 parents 90ecabd + 5d390e9 commit 3634f57

26 files changed

Lines changed: 424 additions & 320 deletions

‎latest.log‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
88
<version>2.6.2</version>
9-
<relativePath/> <!-- lookup parent from repository -->
9+
<relativePath/> <!-- lookup parent from repo -->
1010
</parent>
1111
<groupId>com.talex.frame</groupId>
1212
<artifactId>TalexFrame</artifactId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void processCommand(ISender sender, String wholeCmd) {
6060

6161
boolean match = false;
6262

63-
for ( Map.Entry<String, BaseCommand> entry : this.commands.entrySet() ) {
63+
for ( Map.Entry<String, BaseCommand> entry : new HashSet<>(this.commands.entrySet()) ) {
6464

6565
String cmdLabel = entry.getKey();
6666
BaseCommand cmd = entry.getValue();

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import com.talexframe.frame.core.modules.event.TalexSubscribe;
55
import com.talexframe.frame.core.modules.event.events.dao.DAOProcessorConnectedEvent;
66
import com.talexframe.frame.core.modules.event.events.dao.DAOProcessorPreShutdownEvent;
7-
import com.talexframe.frame.core.modules.repository.TAutoRepository;
8-
import com.talexframe.frame.core.modules.repository.TRepository;
7+
import com.talexframe.frame.core.modules.repository.TRepoPlus;
8+
import com.talexframe.frame.core.modules.repository.TRepo;
99
import com.talexframe.frame.core.pojo.dao.factory.mysql.Mysql;
1010
import com.talexframe.frame.core.talex.TFrame;
1111

@@ -28,11 +28,11 @@ public FrameSelfListener() {
2828
@TalexSubscribe
2929
public void onMysqlConnected(DAOProcessorConnectedEvent<Mysql> event) {
3030

31-
for ( TRepository repository : tframe.getRepositoryManager().getRepositories().values() ) {
31+
for ( TRepo repository : tframe.getRepoManager().getRepositories().values() ) {
3232

33-
if ( repository instanceof TAutoRepository ) {
33+
if ( repository instanceof TRepoPlus ) {
3434

35-
( (TAutoRepository<?>) repository ).onInstall();
35+
( (TRepoPlus<?>) repository ).onInstall();
3636

3737
}
3838

@@ -43,11 +43,11 @@ public void onMysqlConnected(DAOProcessorConnectedEvent<Mysql> event) {
4343
@TalexSubscribe
4444
public void onMysqlPreShutdown(DAOProcessorPreShutdownEvent<Mysql> event) {
4545

46-
for ( TRepository repository : tframe.getRepositoryManager().getRepositories().values() ) {
46+
for ( TRepo repository : tframe.getRepoManager().getRepositories().values() ) {
4747

48-
if ( repository instanceof TAutoRepository ) {
48+
if ( repository instanceof TRepoPlus ) {
4949

50-
( (TAutoRepository<?>) repository ).onUninstall();
50+
( (TRepoPlus<?>) repository ).onUninstall();
5151

5252
}
5353

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package com.talexframe.frame.core.modules.application;
2+
3+
import com.talexframe.frame.core.modules.repository.TRepo;
4+
import com.talexframe.frame.core.modules.repository.TRepoManager;
5+
import com.talexframe.frame.core.pojo.mapper.frame.FrameSender;
6+
import com.talexframe.frame.core.talex.FrameCreator;
7+
import com.talexframe.frame.core.talex.TFrame;
8+
import lombok.Getter;
9+
10+
/**
11+
* <br /> {@link com.talexframe.frame.core.modules.application Package }
12+
*
13+
* @author TalexDreamSoul
14+
* 2022/1/20 16:54 <br /> Project: TalexFrame <br />
15+
*/
16+
@Getter
17+
public abstract class TApp extends FrameCreator {
18+
19+
protected final TFrame tframe = TFrame.tframe;
20+
protected FrameSender frameSender = tframe.getFrameSender();
21+
protected TAppManager controllerManager = tframe.getAppManager();
22+
protected TRepoManager repositoryManager = tframe.getRepoManager();
23+
protected TRepo repo;
24+
25+
public TApp(String provider) {
26+
27+
super("TAPP", provider);
28+
29+
this.repo = this.getRepo();
30+
31+
if ( this.repo == null ) {
32+
33+
throw new RuntimeException("无法找到 Repo");
34+
35+
}
36+
37+
}
38+
39+
public abstract TRepo getRepo();
40+
41+
public String getTableName() {
42+
43+
return this.repo.getProvider();
44+
45+
}
46+
47+
}

src/main/java/com/talexframe/frame/core/modules/controller/TControllerManager.java renamed to src/main/java/com/talexframe/frame/core/modules/application/TAppManager.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.talexframe.frame.core.modules.controller;
1+
package com.talexframe.frame.core.modules.application;
22

33
import com.talexframe.frame.core.modules.network.connection.RequestAnalyser;
44
import com.talexframe.frame.core.modules.network.interfaces.IUnRegisterHandler;
55
import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
6-
import com.talexframe.frame.core.modules.repository.TRepository;
7-
import com.talexframe.frame.core.modules.repository.TRepositoryManager;
6+
import com.talexframe.frame.core.modules.repository.TRepo;
7+
import com.talexframe.frame.core.modules.repository.TRepoManager;
88
import com.talexframe.frame.core.pojo.annotations.TRepoInject;
99
import com.talexframe.frame.core.talex.TFrame;
1010
import lombok.Getter;
@@ -15,27 +15,27 @@
1515
import java.util.concurrent.ConcurrentMap;
1616

1717
/**
18-
* <br /> {@link com.talexframe.frame.core.modules.controller Package }
18+
* <br /> {@link com.talexframe.frame.core.modules.application Package }
1919
*
2020
* @author TalexDreamSoul
2121
* @date 2022/1/20 18:49 <br /> Project: TalexFrame <br />
2222
*/
2323
@Getter
24-
public class TControllerManager {
24+
public class TAppManager {
2525

26-
private static TControllerManager manager;
27-
private final ConcurrentMap<Class<?>, TController> controllers = new ConcurrentHashMap<>(32);
28-
private final ConcurrentMap<TController, String> controllerPluginMap = new ConcurrentHashMap<>(32);
26+
private static TAppManager manager;
27+
private final ConcurrentMap<Class<?>, TApp> controllers = new ConcurrentHashMap<>(32);
28+
private final ConcurrentMap<TApp, String> controllerPluginMap = new ConcurrentHashMap<>(32);
2929

30-
private TControllerManager() {
30+
private TAppManager() {
3131

3232

3333
}
3434

35-
public static TControllerManager init() {
35+
public static TAppManager init() {
3636

3737
if ( manager == null ) {
38-
manager = new TControllerManager();
38+
manager = new TAppManager();
3939
}
4040

4141
return manager;
@@ -51,7 +51,7 @@ public static TControllerManager init() {
5151
* @return 注册是否成功
5252
*/
5353
@SneakyThrows
54-
public boolean registerController(WebPlugin plugin, TController controller) {
54+
public boolean registerController(WebPlugin plugin, TApp controller) {
5555

5656
if ( this.controllers.containsKey(controller.getClass()) ) {
5757

@@ -62,11 +62,11 @@ public boolean registerController(WebPlugin plugin, TController controller) {
6262
this.controllers.put(controller.getClass(), controller);
6363
this.controllerPluginMap.put(controller, plugin.getName());
6464

65-
TRepositoryManager repoManager = TFrame.tframe.getRepositoryManager();
65+
TRepoManager repoManager = TFrame.tframe.getRepoManager();
6666

6767
/*
6868
69-
扫描类中所有字段 带有 TRepInject 的字段，自动从 TRepositoryManager 中根据字段类型注入
69+
扫描类中所有字段 带有 TRepInject 的字段，自动从 TRepoManager 中根据字段类型注入
7070
7171
*/
7272
for ( Field field : controller.getClass().getDeclaredFields() ) {
@@ -79,11 +79,11 @@ public boolean registerController(WebPlugin plugin, TController controller) {
7979

8080
field.setAccessible(true);
8181

82-
TRepository tRep = repoManager.getASRepositoryByClass(repClz);
82+
TRepo tRep = repoManager.getASRepoByClass(repClz);
8383

8484
if ( tRep == null ) {
8585

86-
throw new NullPointerException("Inject repository with null - " + repClz.getName());
86+
throw new NullPointerException("Inject repo with null - " + repClz.getName());
8787

8888
}
8989

@@ -112,7 +112,7 @@ public boolean registerController(WebPlugin plugin, TController controller) {
112112
*
113113
* @return 注销是否成功
114114
*/
115-
public boolean unRegisterController(WebPlugin plugin, TController controller) {
115+
public boolean unRegisterController(WebPlugin plugin, TApp controller) {
116116

117117
if ( !this.controllers.containsKey(controller.getClass()) ) {
118118

src/main/java/com/talexframe/frame/core/modules/controller/TAutoController.java renamed to src/main/java/com/talexframe/frame/core/modules/application/TAppPlus.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
package com.talexframe.frame.core.modules.controller;
1+
package com.talexframe.frame.core.modules.application;
22

33
import com.talexframe.frame.core.modules.plugins.core.WebPlugin;
4-
import com.talexframe.frame.core.modules.repository.TAutoRepository;
5-
import com.talexframe.frame.core.modules.repository.TRepository;
4+
import com.talexframe.frame.core.modules.repository.TRepoPlus;
5+
import com.talexframe.frame.core.modules.repository.TRepo;
66
import com.talexframe.frame.core.talex.TFrame;
77
import lombok.Getter;
88

99
import java.lang.reflect.ParameterizedType;
1010

1111
/**
12-
* <br /> {@link com.talexframe.frame.function.controller Package }
12+
* <br /> {@link com.talexframe.frame.core.modules.application Package }
1313
*
1414
* @author TalexDreamSoul
15-
* @date 2022/1/20 18:51 <br /> Project: TalexFrame <br />
15+
* 2022/1/20 18:51 <br /> Project: TalexFrame <br />
1616
*/
1717
@Getter
18-
public class TAutoController<T extends TAutoRepository<?>> extends TController {
18+
public class TAppPlus<T extends TRepoPlus<?>> extends TApp {
1919

2020
private final WebPlugin ownPlugin;
2121
/**
22-
* 如果使用的是 TAutoController 那么应该调用这个 repository
22+
* 如果使用的是 TAppPlus 那么应该调用这个 repo
2323
*/
2424
protected T asRepository;
2525
private Class<T> templateData;
@@ -29,7 +29,7 @@ public class TAutoController<T extends TAutoRepository<?>> extends TController {
2929
*
3030
* @param webPlugin 所属插件
3131
*/
32-
public TAutoController(String provider, WebPlugin webPlugin) {
32+
public TAppPlus(String provider, WebPlugin webPlugin) {
3333

3434
super(provider);
3535

@@ -39,11 +39,11 @@ public TAutoController(String provider, WebPlugin webPlugin) {
3939

4040
@SuppressWarnings( "unchecked" )
4141
@Override
42-
public TRepository getRepository() {
42+
public TRepo getRepo() {
4343

4444
this.templateData = (Class<T>) ( (ParameterizedType) this.getClass().getGenericSuperclass() ).getActualTypeArguments()[0];
4545

46-
super.repository = asRepository = (T) TFrame.tframe.getRepositoryManager().getRepositories().get(templateData);
46+
super.repo = asRepository = (T) TFrame.tframe.getRepoManager().getRepositories().get(templateData);
4747

4848
return asRepository;
4949
}

‎src/main/java/com/talexframe/frame/core/modules/application/package-info.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/**
2+
* TalexFrame # 应用件 (控制器) <br /> {@link com.talexframe.frame.function.application Package }
3+
*
4+
* @author TalexDreamSoul
5+
* @date 2022/1/20 17:01 <br /> Project: TalexFrame <br />
6+
*/
7+
package com.talexframe.frame.core.modules.application;

‎src/main/java/com/talexframe/frame/core/modules/controller/TController.java‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎src/main/java/com/talexframe/frame/core/modules/controller/package-info.java‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)