commit

DataFusion/.classpath

@@ -22,7 +22,6 @@
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jackson-core-2.5.3.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/javassist-3.19.0-GA.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jedis-2.7.2.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jetty-server-8.1.8.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jfinal-3.4-bin-with-src.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j-1.2.16.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mysql-connector-java-5.1.44-bin.jar"/>

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -47,10 +47,46 @@ public class ZskkConfig extends JFinalConfig {
 
 	}
 
+//	public static DruidPlugin createZskkDruidPlugin() {
+//
+//		return new DruidPlugin(PropKit.get("jdbcUrl_zskk"), PropKit.get("user_zskk"),PropKit.get("password_zskk").trim());
+//	}
+//
+//	public static DruidPlugin createConnectedDruidPlugin() {
+//
+//		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
+//	}
 
 	@Override
 	public void configPlugin(Plugins me) {
-	
+		// 配置数据库连接池插件
+//		DruidPlugin druidPluginZskk = createZskkDruidPlugin();
+//		me.add(druidPluginZskk);
+//
+//		// 配置ActiveRecord插件
+//		ActiveRecordPlugin arpZskk = new ActiveRecordPlugin("zskk", druidPluginZskk);
+//		arpZskk.setDialect(new MysqlDialect());
+//
+//		 //所有映射在 MappingKit 中自动化搞定
+//		_MappingKit.mapping(arpZskk);
+//		me.add(arpZskk);
+//
+//		// 配置数据库连接池插件
+//		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
+//		me.add(druidPluginConnected);
+
+		// 配置ActiveRecord插件
+//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+//		arpConnected.setDialect(new OracleDialect());
+//		me.add(arpConnected);
+//
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/5 * * * *", new DataTask());
+//		me.add(cpData);
+
+//		Cron4jPlugin cp2 = new Cron4jPlugin();
+//		cp2.addTask("*/15 * * * *", new UpdateTask());
+//	    me.add(cp2);
 	}
 
 	@Override

DataFusion/src/com/zskk/control/ViewController.java

@@ -35,16 +35,6 @@ import java.util.*;
 
 public class ViewController extends Controller {
 	private static final OkHttpClient OKHTTP_CLIENT = new OkHttpClient();
-
-//	static{
-//		PropKit.use("config.properties");
-//		DruidPlugin plugin = new DruidPlugin(PropKit.get("jdbcUrl_zskk"), PropKit.get("user_zskk"), PropKit.get("password_zskk").trim());
-//		ActiveRecordPlugin arp = new ActiveRecordPlugin(plugin); 		
-//		_MappingKit.mapping(arp);
-//		plugin.start();
-//		arp.start();
-//
-//	}
 	
 	/**
 	 * 在被连接数据库执行sql语句