commit

DataFusion/WebRoot/WEB-INF/classes/.gitignore

@@ -1,3 +0,0 @@
-/com/
-/config.properties
-/log4j.properties

DataFusion/WebRoot/WEB-INF/classes/log4j.properties

@@ -5,6 +5,6 @@ log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-
 
 # Output to the File
 log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=./jfinal_demo.log
+log4j.appender.file.File=./zskk_df.log
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n

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

@@ -1,15 +1,15 @@
 package com.zskk.config;
 
-import com.jfinal.config.Constants;
-import com.jfinal.config.Handlers;
-import com.jfinal.config.Interceptors;
-import com.jfinal.config.JFinalConfig;
-import com.jfinal.config.Plugins;
-import com.jfinal.config.Routes;
+import com.jfinal.config.*;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
+import com.jfinal.plugin.activerecord.dialect.OracleDialect;
+import com.jfinal.plugin.cron4j.Cron4jPlugin;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.template.Engine;
+import com.zskk.control.ViewController;
+import com.zskk.task.DataTask;
 
 public class ZskkConfig extends JFinalConfig {
 
@@ -23,7 +23,8 @@ public class ZskkConfig extends JFinalConfig {
 	@Override
 	public void configRoute(Routes me) {
 		// TODO Auto-generated method stub
-
+		me.add("/view", ViewController.class);
+		me.add("/", ViewController.class,"");
 	}
 
 	@Override
@@ -32,14 +33,26 @@ public class ZskkConfig extends JFinalConfig {
 
 	}
 
-	public static DruidPlugin createDruidPlugin() {
-		
-		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 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);
 	}
 
 	@Override