升级依赖jar包

ZSKK_DicomServer/pom.xml

@@ -10,24 +10,24 @@
 	<url>http://maven.apache.org</url>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jdk.version>12</jdk.version>
+		<jdk.version>11</jdk.version>
 	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.5.1</version>
+			<version>5.5.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.jfinal</groupId>
 			<artifactId>jfinal</artifactId>
-			<version>4.3</version>
+			<version>4.7</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
-			<version>1.1.19</version>
+			<version>1.1.21</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.17</version>
+			<version>8.0.18</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -55,22 +55,22 @@
 		<dependency>
 			<groupId>org.dcm4che</groupId>
 			<artifactId>dcm4che-core</artifactId>
-			<version>5.18.0</version>
+			<version>5.19.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.dcm4che</groupId>
 			<artifactId>dcm4che-net</artifactId>
-			<version>5.18.0</version>
+			<version>5.19.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.dcm4che.tool</groupId>
 			<artifactId>dcm4che-tool-common</artifactId>
-			<version>5.18.0</version>
+			<version>5.19.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>4.1.1</version>
+			<version>4.2.2</version>
 		</dependency>
 	</dependencies>
 	<build>

ZSKK_DicomServer/src/main/java/com/zskk/common/ZskkConfig.java

@@ -58,14 +58,14 @@ public class ZskkConfig extends JFinalConfig {
 
 	public void configPlugin(Plugins me) {
 		// 配置数据库连接池插件
-		DruidPlugin druidPluginZskk = createZskkDruidPlugin();
-		me.add(druidPluginZskk);
+//		DruidPlugin druidPluginZskk = createZskkDruidPlugin();
+//		me.add(druidPluginZskk);
 		// 配置ActiveRecord插件
-		ActiveRecordPlugin arpZskk = new ActiveRecordPlugin(druidPluginZskk);
-		arpZskk.setDialect(new MysqlDialect());
+//		ActiveRecordPlugin arpZskk = new ActiveRecordPlugin(druidPluginZskk);
+//		arpZskk.setDialect(new MysqlDialect());
     	//所有映射在 MappingKit 中自动化搞定
-		_MappingKit.mapping(arpZskk);
-		me.add(arpZskk);
+//		_MappingKit.mapping(arpZskk);
+//		me.add(arpZskk);
 	}
 
 	public void configInterceptor(Interceptors me) {

ZSKK_DicomServer/src/main/java/com/zskk/controller/DicomController.java

@@ -46,6 +46,10 @@ public class DicomController extends Controller {
 	
 	public void getOrderInfo() {
         String applyNo = getPara("applyNo");
+        if (applyNo == null || applyNo.isEmpty()) {
+			renderJson(ErrorConstant.ERROR_APPLYNO);
+			return;
+		}
 		InfoService iService = ServiceFactory.getService(InfoService.class);
 		String resultString =  iService.getOrderInfo(applyNo);
 		if (resultString == null) {

ZSKK_DicomServer/src/main/java/com/zskk/util/ErrorConstant.java

@@ -4,5 +4,6 @@ import com.zskk.controller.bean.ResultBean;
 
 public class ErrorConstant {
 	public static final ResultBean ERROR_NOT_FOUND = new ResultBean(100, "未获取到影像");
+	public static final ResultBean ERROR_APPLYNO = new ResultBean(101, "申请单号错误");
 	
 }

ZSKK_DicomServer/src/main/resources/config.properties

@@ -1,5 +1,10 @@
 #Database
-jdbcUrl_zskk  = jdbc:mysql://192.10.10.165:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
-user_zskk     = root
-password_zskk = Zskk@2019
+jdbcUrl_zskk  = jdbc:mysql://www.pacsonline.cn:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
+user_zskk 	  = pacs
+password_zskk = ZSKK@2017~!@#
+
+jdbcUrl_connected  = jdbc:sqlserver://172.172.1.130:1433;DatabaseName=RIS
+user_connected 	   = ris
+password_connected = 4s3c2a1p
+
 devMode  = true