commit

DataFusion/res/config.properties

@@ -3,7 +3,6 @@ jdbcUrl_zskk  = jdbc:mysql://47.104.6.21:3306/pacsonline?characterEncoding=utf8&
 user_zskk 	  = pacs
 password_zskk = ZSKK@2017~!@#
 
-
 jdbcUrl_connected  = jdbc:mysql://10.1.8.121:3306/gecris
 user_connected 	   = cloud
 password_connected = cloud

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

@@ -44,7 +44,6 @@ public class ZskkConfig extends JFinalConfig {
 	@Override
 	public void configEngine(Engine me) {
 		// TODO Auto-generated method stub
-
 	}
 
 	public static DruidPlugin createZskkDruidPlugin() {
@@ -76,9 +75,9 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(druidPluginConnected);
 
 		// 配置ActiveRecord插件
-		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-		arpConnected.setDialect(new MysqlDialect());
-		me.add(arpConnected);
+//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+//		arpConnected.setDialect(new MysqlDialect());
+//		me.add(arpConnected);
 
 //		Cron4jPlugin cpData = new Cron4jPlugin();
 //		cpData.addTask("*/5 * * * *", new DataTask());

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

@@ -77,7 +77,7 @@ public class ViewController extends Controller {
             druidPluginConnected.start();
 			// 配置ActiveRecord插件
 			ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-			arpConnected.setDialect(new OracleDialect());
+			arpConnected.setDialect(new MysqlDialect());
 			arpConnected.start();
 
 		} catch (Exception e) {