diff --git a/parent/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java b/parent/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java index 039de90..5116bb3 100644 --- a/parent/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java +++ b/parent/center.manager/src/main/java/com/lyms/cm/job/SyncFixJob.java @@ -89,7 +89,13 @@ public class SyncFixJob { //LOG.info("返回结果: " + result); if (StringUtils.isBlank(result)) return; - ChannelData data = JsonUtils.jsonToBean(result, ChannelData.class); + ChannelData data = null; + try{ + data = JsonUtils.jsonToBean(result, ChannelData.class); + }catch(Exception e){ + LOG.error("同步数据转换异常,请求结果:{} ",result); + return; + } // 处理回执消息 if (data != null && data.getAck() && StrUtils.isNotEmpty(data.getRemoteClazz()) && StrUtils.isNotEmpty(data.getRemoteMethod())) { // 拉取到数据执行本地方法 diff --git a/parent/hospital.web/src/main/resources/dev/redis.properties b/parent/hospital.web/src/main/resources/dev/redis.properties index ee93728..f3d0531 100644 --- a/parent/hospital.web/src/main/resources/dev/redis.properties +++ b/parent/hospital.web/src/main/resources/dev/redis.properties @@ -3,6 +3,9 @@ redis.port1=6379 redis.password1=Lyms123456 #redis.host1=127.0.0.1 #redis.port1=6379 +#redis.password1= +#redis.host1=127.0.0.1 +#redis.port1=6379 #redis.password1=Lyms123456 @@ -29,5 +32,5 @@ redis.maxIdle=300 redis.maxActive=600 redis.maxWait=1000 redis.testOnBorrow=true -redis.HttpSession.redisNamespace=hospital -spring.redis.cluster.max-redirects= 3 +redis.HttpSession.redisNamespace=center +spring.redis.cluster.max-redirects= 3 \ No newline at end of file diff --git a/parent/hospital.web/src/main/resources/xml/app-timer.xml b/parent/hospital.web/src/main/resources/xml/app-timer.xml index e9d2ddb..8939fe0 100644 --- a/parent/hospital.web/src/main/resources/xml/app-timer.xml +++ b/parent/hospital.web/src/main/resources/xml/app-timer.xml @@ -18,5 +18,4 @@ - \ No newline at end of file