刘韬 5 years ago
parent
commit
61b30fdc2a
1 changed files with 3 additions and 8 deletions
  1. 3 8
      DataFusion/src/com/zskk/config/ZskkConfig.java

+ 3 - 8
DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -21,12 +21,6 @@ import com.zskk.task.DataTask;
 
 
 public class ZskkConfig extends JFinalConfig {
 public class ZskkConfig extends JFinalConfig {
 	
 	
-	@Override
-	public void afterJFinalStart() {
-		super.afterJFinalStart();
-		ServiceFactory.init();
-	}
-
 	// 本地开发模式
 	// 本地开发模式
 	private boolean isLocalDev = false;
 	private boolean isLocalDev = false;
 	/**
 	/**
@@ -45,7 +39,9 @@ public class ZskkConfig extends JFinalConfig {
 	}
 	}
 
 
 	public void configConstant(Constants me) {
 	public void configConstant(Constants me) {
-		loadProp("config.properties", "a_little_config.txt");
+		PropKit.use("config.properties");
+
+//		loadProp("config.properties", "a_little_config.txt");
 		me.setDevMode(PropKit.getBoolean("devMode", false));
 		me.setDevMode(PropKit.getBoolean("devMode", false));
 	}
 	}
 
 
@@ -71,7 +67,6 @@ public class ZskkConfig extends JFinalConfig {
 		// 配置数据库连接池插件
 		// 配置数据库连接池插件
 		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
 		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
 		me.add(druidPluginConnected);
 		me.add(druidPluginConnected);
-//
 //		// 配置ActiveRecord插件
 //		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
 		arpConnected.setDialect(new SqlServerDialect());
 		arpConnected.setDialect(new SqlServerDialect());