Skip to content

Commit ce89a8f

Browse files
committed
简化配置表读取管理器
1 parent 8d1476a commit ce89a8f

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

log/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>GameServer</artifactId>
77
<groupId>info.xiaomo</groupId>
8-
<version>1.0</version>
8+
<version>2017.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

server/src/main/java/info/xiaomo/server/dataConfig/ConfigDataManager.java renamed to server/src/main/java/info/xiaomo/server/config/ConfigDataManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.xiaomo.server.dataConfig;
1+
package info.xiaomo.server.config;
22

33
import info.xiaomo.gameCore.config.IConfigDataManager;
44
import info.xiaomo.gameCore.config.excel.ExcelConfigDataManager;

server/src/main/java/info/xiaomo/server/db/MysqlDataProviderProxy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void insertData(CacheAble cache, boolean immediately) {
9696

9797
@Override
9898
public void addData(CacheAble cache) {
99-
// provider.put((Persistable) cache);
99+
provider.put((Persistable) cache);
100100
}
101101

102102
@Override

server/src/main/java/info/xiaomo/server/http/HttpServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import info.xiaomo.server.util.Utils;
66
import org.springframework.boot.SpringApplication;
77
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
8+
import org.springframework.context.ApplicationContext;
89
import org.springframework.security.access.prepost.PreAuthorize;
910
import org.springframework.web.bind.annotation.*;
1011

@@ -27,7 +28,7 @@ public class HttpServer {
2728

2829
public static final String API_KEY = "0I3EaVD2WfElnw3O";
2930

30-
private static org.springframework.context.ApplicationContext applicationContext;
31+
private static ApplicationContext applicationContext;
3132

3233
@PreAuthorize("permitAll")
3334
@RequestMapping("/")

server/src/main/java/info/xiaomo/server/server/GameServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import info.xiaomo.gameCore.protocol.NetworkService;
44
import info.xiaomo.gameCore.protocol.NetworkServiceBuilder;
55
import info.xiaomo.server.constant.GameConst;
6-
import info.xiaomo.server.dataConfig.ConfigDataManager;
6+
import info.xiaomo.server.config.ConfigDataManager;
77
import info.xiaomo.server.db.DataCenter;
88
import info.xiaomo.server.event.EventRegister;
99
import info.xiaomo.server.processor.LogicProcessor;

server/src/test/java/info/xiaomo/server/test/TestExcelConfig.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package info.xiaomo.server.test;
22

33
import info.xiaomo.server.config.beans.ItemConfig;
4-
import info.xiaomo.server.dataConfig.ConfigDataManager;
5-
6-
import java.util.List;
4+
import info.xiaomo.server.config.ConfigDataManager;
75

86
/**
97
* 把今天最好的表现当作明天最新的起点..~

0 commit comments

Comments
 (0)