Browse Source

创建焦作三院分支

刘韬 4 years ago
parent
commit
dfafe84cae

+ 0 - 1
DataFusion/WebRoot/WEB-INF/classes/.gitignore

@@ -1 +0,0 @@
-/com/

+ 0 - 8
DataFusion/WebRoot/WEB-INF/classes/config.properties

@@ -1,8 +0,0 @@
-#DB-ZhongShiKangKai and connected partners
-jdbcUrl_zskk  = jdbc:mysql://47.104.6.21:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-user_zskk 	  = pacs
-password_zskk = ZSKK@2017~!@#
-
-jdbcUrl_connected  = jdbc:oracle:thin:@11.0.0.1:1521:orcl
-user_connected 	   = VUSER_PACS
-password_connected = VUSER_PACS

+ 0 - 10
DataFusion/WebRoot/WEB-INF/classes/log4j.properties

@@ -1,10 +0,0 @@
-log4j.rootLogger=WARN, stdout, file
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%n%-d{yyyy-MM-dd HH:mm:ss}%n[%p]-[Thread: %t]-[%C.%M()]: %m%n
-
-# Output to the File
-log4j.appender.file=org.apache.log4j.FileAppender
-log4j.appender.file.File=./jfinal_demo.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

+ 3 - 3
DataFusion/res/config.properties

@@ -3,6 +3,6 @@ jdbcUrl_zskk  = jdbc:mysql://47.104.6.21:3306/pacsonline?characterEncoding=utf8&
 user_zskk 	  = pacs
 password_zskk = ZSKK@2017~!@#
 
-jdbcUrl_connected  = jdbc:oracle:thin:@//11.0.0.1:1521/orcl
-user_connected 	   = VUSER_PACS
-password_connected = VUSER_PACS
+jdbcUrl_connected  = jdbc:sqlserver://129.1.0.155:1433;DatabaseName=Visionris
+user_connected 	   = pacs
+password_connected = pacs

+ 3 - 3
DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -80,9 +80,9 @@ public class ZskkConfig extends JFinalConfig {
 		arpConnected.setDialect(new OracleDialect());
 		me.add(arpConnected);
 
-		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/5 * * * *", new DataTask());
-		me.add(cpData);
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/5 * * * *", new DataTask());
+//		me.add(cpData);
 
 //		Cron4jPlugin cp2 = new Cron4jPlugin();
 //		cp2.addTask("*/15 * * * *", new UpdateTask());