diff --git a/server/src/main/java/info/xiaomo/server/GameServerBootstrap.java b/server/src/main/java/info/xiaomo/server/GameServerBootstrap.java index c6c5046..b36db8b 100644 --- a/server/src/main/java/info/xiaomo/server/GameServerBootstrap.java +++ b/server/src/main/java/info/xiaomo/server/GameServerBootstrap.java @@ -1,5 +1,7 @@ package info.xiaomo.server; +import info.xiaomo.gameCore.config.annotation.ConfigFileScan; +import info.xiaomo.gameCore.config.annotation.PackageScan; import info.xiaomo.server.back.BackServer; import info.xiaomo.server.server.GameContext; import info.xiaomo.server.server.GameServer; @@ -21,6 +23,8 @@ * Copyright(©) 2015 by xiaomo. **/ +@ConfigFileScan(value = "G:\\ChessGame\\ConfigData", suffix = ".xlsx") +@PackageScan("info.xiaomo.server.config.beans") public class GameServerBootstrap { public static final Logger LOGGER = LoggerFactory.getLogger(GameServerBootstrap.class); diff --git a/server/src/main/java/info/xiaomo/server/config/ConfigDataManager.java b/server/src/main/java/info/xiaomo/server/config/ConfigDataManager.java index e2132a8..c7a72df 100644 --- a/server/src/main/java/info/xiaomo/server/config/ConfigDataManager.java +++ b/server/src/main/java/info/xiaomo/server/config/ConfigDataManager.java @@ -1,10 +1,9 @@ package info.xiaomo.server.config; -import info.xiaomo.gameCore.config.FileConfigDataManager; -import info.xiaomo.gameCore.config.IConfigDataManager; +import info.xiaomo.gameCore.config.annotation.ConfigFileScan; +import info.xiaomo.gameCore.config.annotation.PackageScan; import info.xiaomo.gameCore.config.excel.ExcelConfigDataManager; - -import java.util.List; +import info.xiaomo.server.GameServerBootstrap; /** * 把今天最好的表现当作明天最新的起点..~ @@ -21,40 +20,14 @@ * Copyright(©) 2017 by xiaomo. */ -public class ConfigDataManager implements IConfigDataManager { - private FileConfigDataManager manager = new ExcelConfigDataManager(new DataManagerConfig()); - private static ConfigDataManager ourInstance = new ConfigDataManager(); - - public static ConfigDataManager getInstance() { - return ourInstance; - } +public class ConfigDataManager extends ExcelConfigDataManager { + private static final ConfigDataManager INSTANCE = new ConfigDataManager(); private ConfigDataManager() { + super(GameServerBootstrap.class); } - @Override - public T getConfig(Class clz, Object... primaryKey) { - return manager.getConfig(clz, primaryKey); - } - - @Override - public List getConfigs(Class clz) { - return manager.getConfigs(clz); - } - - @Override - public T getConfigCache(Class clz) { - return manager.getConfigCache(clz); - } - - @Override - public void init() throws Exception { - manager.init(); - } - - public void setSubfix(String subfix) { - manager.setConfigFileSuffix(subfix); + public static ConfigDataManager getInstance() { + return INSTANCE; } - - } diff --git a/server/src/main/java/info/xiaomo/server/config/DataManagerConfig.java b/server/src/main/java/info/xiaomo/server/config/DataManagerConfig.java deleted file mode 100644 index 10c2e18..0000000 --- a/server/src/main/java/info/xiaomo/server/config/DataManagerConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - * 创建日期: 2017年08月24日 17:54 - * 创建作者: 杨 强 <281455776@qq.com> - */ -package info.xiaomo.server.config; - -import info.xiaomo.gameCore.config.FileConfigDataManagerConfig; -import info.xiaomo.gameCore.config.annotation.ConfigFileScan; -import info.xiaomo.gameCore.config.annotation.PackageScan; - -/** - * @author YangQiang - */ -@ConfigFileScan(value = "G:\\ChessGame\\ConfigData", suffix = ".xlsx") -@PackageScan("info.xiaomo.server.config.beans") -public class DataManagerConfig extends FileConfigDataManagerConfig { -}