File tree Expand file tree Collapse file tree 4 files changed +27
-13
lines changed
main/java/info/xiaomo/server
test/java/info/xiaomo/server/test Expand file tree Collapse file tree 4 files changed +27
-13
lines changed Original file line number Diff line number Diff line change 11package info .xiaomo .server .config ;
22
3+ import info .xiaomo .gameCore .config .FileConfigDataManager ;
4+ import info .xiaomo .gameCore .config .FileDataManagerConfig ;
35import info .xiaomo .gameCore .config .IConfigDataManager ;
46import info .xiaomo .gameCore .config .excel .ExcelConfigDataManager ;
57
1921 * desc :
2022 * Copyright(©) 2017 by xiaomo.
2123 */
22- public class ConfigDataManager implements IConfigDataManager {
23- private ExcelConfigDataManager manager = new ExcelConfigDataManager ();
2424
25+ public class ConfigDataManager extends FileDataManagerConfig implements IConfigDataManager {
26+ private FileConfigDataManager manager = new ExcelConfigDataManager (new DataManagerConfig ());
2527 private static ConfigDataManager ourInstance = new ConfigDataManager ();
2628
2729 public static ConfigDataManager getInstance () {
@@ -51,14 +53,8 @@ public void init() throws Exception {
5153 manager .init ();
5254 }
5355
54- public void init (String configPath ) throws Exception {
55- manager .setExcelFileDir (configPath );
56- manager .setConfigPackageName ("info.xiaomo.server.config.beans" );
57- init ();
58- }
59-
6056 public void setSubfix (String subfix ) {
61- manager .setExcelFileSuffix (subfix );
57+ manager .setConfigFileSuffix (subfix );
6258 }
6359
6460
Original file line number Diff line number Diff line change 1+ /**
2+ * 创建日期: 2017年08月24日 17:54
3+ 4+ */
5+ package info .xiaomo .server .config ;
6+
7+ import info .xiaomo .gameCore .config .FileDataManagerConfig ;
8+ import info .xiaomo .gameCore .config .annotation .ConfigFileScan ;
9+ import info .xiaomo .gameCore .config .annotation .PackageScan ;
10+
11+ /**
12+ * @author YangQiang
13+ */
14+ @ ConfigFileScan (value = "G:\\ ChessGame\\ ConfigData" , suffix = ".xlsx" )
15+ @ PackageScan ("info.xiaomo.server.config.beans" )
16+ public class DataManagerConfig extends FileDataManagerConfig {
17+ }
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ public GameServer(ServerOption option) throws Exception {
6464 DataCenter .init (option );
6565
6666 //初始化配置文件
67- ConfigDataManager .getInstance ().init (option . getConfigDataPath () );
67+ ConfigDataManager .getInstance ().init ();
6868
6969 // 注册事件
7070 EventRegister .registerPreparedListeners ();
Original file line number Diff line number Diff line change 11package info .xiaomo .server .test ;
22
3- import info .xiaomo .server .config .beans . ItemConfig ;
3+ import info .xiaomo .gameCore .config .FileDataManagerConfig ;
44import info .xiaomo .server .config .ConfigDataManager ;
5+ import info .xiaomo .server .config .beans .ItemConfig ;
56
67/**
78 * 把今天最好的表现当作明天最新的起点..~
1718 * desc :
1819 * Copyright(©) 2017 by xiaomo.
1920 */
20- public class TestExcelConfig {
21+ public class TestExcelConfig extends FileDataManagerConfig {
2122
2223 public static void main (String [] args ) throws Exception {
23- ConfigDataManager .getInstance ().init (TestExcelConfig . class . getClassLoader (). getResource ( "" ). getPath () );
24+ ConfigDataManager .getInstance ().init ();
2425 ConfigDataManager .getInstance ().getConfigs (ItemConfig .class ).forEach (System .out ::println );
2526 }
2627
You can’t perform that action at this time.
0 commit comments