commit

DataFusion/res/config.properties

@@ -1,13 +1,13 @@
 #DB-connected partners
-jdbcUrl_connected  = jdbc:sqlserver://192.160.253.176:1433;DatabaseName=QiHIS
+jdbcUrl_connected  = jdbc:sqlserver://192.168.0.5:1433;DatabaseName=hcpacsris3
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
-user_connected 	   = his
-password_connected = his
+user_connected 	   = yunpacs
+password_connected = MY2024@!
 
 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
+password_local = Zskk_2024
 
 #jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
 jdbcUrl_crb  = jdbc:oracle:thin:@11.129.12.58:1521:orcl

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

@@ -68,11 +68,6 @@ public class ZskkConfig extends JFinalConfig {
 
 		return new DruidPlugin(PropKit.get("jdbcUrl_local"), PropKit.get("user_local"),PropKit.get("password_local").trim());
 	}
-	
-	public static DruidPlugin createCrbDruidPlugin() {
-
-		return new DruidPlugin(PropKit.get("jdbcUrl_crb"), PropKit.get("user_crb"),PropKit.get("password_crb").trim());
-	}
 
 	@Override
 	public void configPlugin(Plugins me) {
@@ -82,9 +77,6 @@ public class ZskkConfig extends JFinalConfig {
 		
 		DruidPlugin druidPluginLocal = createLocalDruidPlugin();
 		me.add(druidPluginLocal);
-
-		DruidPlugin druidPluginCrb = createCrbDruidPlugin();
-		me.add(druidPluginCrb);
 		
 		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
@@ -94,10 +86,6 @@ public class ZskkConfig extends JFinalConfig {
 		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
 		arpLocal.setDialect(new MysqlDialect());
 		me.add(arpLocal);
-		
-		ActiveRecordPlugin arpCrb = new ActiveRecordPlugin("crb", druidPluginCrb);
-		arpCrb.setDialect(new OracleDialect());
-		me.add(arpCrb);
 
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/2 * * * *", new UpdateTask());