Browse Source

迁移至浪潮云

刘韬 5 years ago
parent
commit
85ad0309bd

+ 7 - 7
PacsOnline_Wechat_Patient/pom.xml

@@ -11,14 +11,14 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jdk.version>1.8</jdk.version>
+		<jdk.version>11</jdk.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.4.1</version>
+			<version>5.6.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -29,12 +29,12 @@
 		<dependency>
 			<groupId>com.jfinal</groupId>
 			<artifactId>jfinal</artifactId>
-			<version>4.3</version>
+			<version>4.8</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>
@@ -44,17 +44,17 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>1.2.58</version>
+			<version>1.2.62</version>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>4.0.1</version>
+			<version>4.3.1</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.16</version>
+			<version>8.0.19</version>
 		</dependency>
 		<dependency>
 			<groupId>redis.clients</groupId>

+ 1 - 1
PacsOnline_Wechat_Patient/src/main/java/com/zskk/common/ZskkConfig.java

@@ -85,7 +85,7 @@ public class ZskkConfig extends JFinalConfig {
 		_MappingKit.mapping(arp);
 
 		// 使用redis分布accessToken
-		RedisPlugin redisPlugin = new RedisPlugin("weixin_patient", "127.0.0.1", 6379);
+		RedisPlugin redisPlugin = new RedisPlugin("weixin_patient", "10.46.159.65", 6379);
 		redisPlugin.setSerializer(JdkSerializer.me); // 需要使用fst高性能序列化的用户请删除这一行(Fst jar依赖请查看WIKI)
 		me.add(redisPlugin);
 	}

+ 3 - 0
PacsOnline_Wechat_Patient/src/main/java/com/zskk/controller/WeixinApiController.java

@@ -184,6 +184,9 @@ public class WeixinApiController extends ApiController {
     {
         String reportId = getPara("reportId");
 		Report reports = Report.dao.findById(reportId);
+		if (reports == null) {
+			
+		}
 		Exams exams = Exams.dao.findById(reports.getExamId());
 		Institution institution = Institution.dao.findById(exams.getInstitutionId());
 		String appId;

+ 3 - 3
PacsOnline_Wechat_Patient/src/main/resources/config.properties

@@ -1,7 +1,7 @@
 #Database
-jdbcUrl  = jdbc:mysql://www.pacsonline.cn:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
-user     = pacs
-password = ZSKK@2017~!@#
+jdbcUrl  = jdbc:mysql://10.46.2.149:3306/pacsonline_pro?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
+user     = pacs_pro
+password = Zskk@2019~!@#
 devMode  = true