commit

DataFusion/res/config.properties

@@ -4,7 +4,7 @@ jdbcUrl_connected  = jdbc:sqlserver://192.160.253.176:1433;DatabaseName=QiHIS
 user_connected 	   = his
 password_connected = his
 
-jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline
+jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
 user_local 	   = zskk
 password_local = Zskk_2022

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

@@ -74,17 +74,17 @@ public class ZskkConfig extends JFinalConfig {
 		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
 		me.add(druidPluginConnected);
 		
-		DruidPlugin druidPluginLocal = createLocalDruidPlugin();
-		me.add(druidPluginConnected);
+//		DruidPlugin druidPluginLocal = createLocalDruidPlugin();
+//		me.add(druidPluginConnected);
 
 		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
 		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);
 		
-		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
-		arpLocal.setDialect(new MysqlDialect());
-		me.add(arpLocal);
+//		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
+//		arpLocal.setDialect(new MysqlDialect());
+//		me.add(arpLocal);
 
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/2 * * * *", new UpdateTask());

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

@@ -13,6 +13,7 @@ import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
 import okhttp3.FormBody;
@@ -88,8 +89,8 @@ public class ViewController extends Controller {
 			DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
             druidPluginConnected.start();
 			// 配置ActiveRecord插件
-			ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-			arpConnected.setDialect(new SqlServerDialect());
+			ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("local", druidPluginConnected);
+			arpConnected.setDialect(new MysqlDialect());
 			arpConnected.start();
 
 		} catch (Exception e) {
@@ -100,7 +101,7 @@ public class ViewController extends Controller {
 	
 	public static DruidPlugin createConnectedDruidPlugin() {
 
-		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
+		return new DruidPlugin(PropKit.get("jdbcUrl_local"), PropKit.get("user_local"),PropKit.get("password_local").trim());
 	}
 	
 	/**