Browse Source

调整数据库配置

liuqq 5 years ago
parent
commit
18c68ffaf8

+ 7 - 7
config-server/src/main/resources/shared/aipt-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.132:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://10.48.45.180:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: zjltzk@2020
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5
@@ -61,8 +61,8 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: lantone
-    password: lantone
+    username: guest
+    password: guest
     publisher-confirms: true
     virtual-host: /
 
@@ -99,12 +99,12 @@ io.github.lvyahui8.spring.base-packages: com.diagbot.aggregate
 
 ai:
   server:
-    address: http://192.168.2.132:5008
+    address: http://10.48.45.180:5008
 
 nlp:
   server:
-    address: http://192.168.2.132:5002
+    address: http://10.48.45.180:5002
 
 aineo:
   server:
-    address: http://192.168.2.132:8888
+    address: http://10.48.45.180:8888

+ 1 - 1
config-server/src/main/resources/shared/application-local.yml

@@ -103,4 +103,4 @@ crypt:
 
 mrqc:
   server:
-    address: http://192.168.2.132:8090
+    address: http://10.48.45.180:8090

+ 3 - 3
config-server/src/main/resources/shared/bi-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://10.48.45.180:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lantone
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5
@@ -99,4 +99,4 @@ io.github.lvyahui8.spring.base-packages: com.diagbot.aggregate
 
 neo:
   server:
-    address: http://192.168.2.234:5004
+    address: http://10.48.45.180:5004

+ 2 - 2
config-server/src/main/resources/shared/data-service-local.yml

@@ -16,7 +16,7 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: lantone
-    password: lantone
+    username: guest
+    password: guest
     publisher-confirms: true
     virtual-host: /

+ 2 - 2
config-server/src/main/resources/shared/diagbotman-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-diagbotman?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://10.48.45.180:3306/sys-diagbotman?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lantone
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5

+ 2 - 2
config-server/src/main/resources/shared/feedback-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://10.48.45.180:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lantone
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5

+ 3 - 3
config-server/src/main/resources/shared/gateway-service-local.yml

@@ -18,7 +18,7 @@ spring:
   redis:
     database:
       cache: 0 # Redis限流缓存索引
-    host: 192.168.2.132  #Redis服务器地址
+    host: 10.48.45.180  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
     password: lantone # Redis服务器连接密码(默认为空)
     lettuce:
@@ -32,8 +32,8 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: lantone
-    password: lantone
+    username: guest
+    password: guest
     publisher-confirms: true
     virtual-host: /
   cloud:

+ 4 - 4
config-server/src/main/resources/shared/icss-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-icss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://10.48.45.180:3306/sys-icss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lantone
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5
@@ -78,8 +78,8 @@ spring:
   redis:
     database:
       cache: 5 # Redis缓存索引
-    host: 192.168.2.236  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
+    host: 10.48.45.180  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
     password: lantone # Redis服务器连接密码(默认为空)
     lettuce:
       pool:

+ 5 - 5
config-server/src/main/resources/shared/icssman-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-icss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://10.48.45.180:3306/sys-icss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lantone
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5
@@ -76,8 +76,8 @@ spring:
   redis:
     database:
       cache: 5 # Redis缓存索引
-    host: 192.168.2.236  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
+    host: 10.48.45.180  #Redis服务器地址
+    port: 637 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
     password: lantone # Redis服务器连接密码(默认为空)
     lettuce:
       pool:
@@ -122,6 +122,6 @@ fastdfs:
   charset: UTF-8
   http_tracker_http_port: 8080
   http_anti_steal_token: no
-  tracker_servers: 192.168.2.236:22122
+  tracker_servers: 10.48.45.180:22122
 
 

+ 8 - 8
config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://10.48.45.180:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
-      password: lantone
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5
@@ -82,8 +82,8 @@ spring:
   redis:
     database:
       cache: 6 # Redis缓存索引
-    host: 192.168.2.236  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
+    host: 10.48.45.180  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
     password: lantone # Redis服务器连接密码(默认为空)
     lettuce:
       pool:
@@ -125,16 +125,16 @@ mybatis-plus:
 hystrix.command.AIServiceClient#createFile().execution.isolation.thread.timeoutInMilliseconds: 180000
 
 imageUrl:
-  prefix: http://192.168.2.236:82
+  prefix: http://10.48.45.180:82
 
 neo:
   server:
-    address: http://192.168.2.234:5004
+    address: http://10.48.45.180:5004
 
 ai:
   server:
-    address: http://192.168.2.234:5008
+    address: http://10.48.45.180:5008
 
 nlp:
   server:
-    address: http://192.168.2.234:5002
+    address: http://10.48.45.180:5002

+ 4 - 4
config-server/src/main/resources/shared/logger-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.132:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://10.48.45.180:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: zjltzk@2020
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5
@@ -69,8 +69,8 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: lantone
-    password: lantone
+    username: guest
+    password: guest
     publisher-confirms: true
     virtual-host: /
 

+ 2 - 2
config-server/src/main/resources/shared/ltapi-service-local.yml

@@ -16,7 +16,7 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: lantone
-    password: lantone
+    username: guest
+    password: guest
     publisher-confirms: true
     virtual-host: /

+ 7 - 7
config-server/src/main/resources/shared/ltkg-service-local.yml

@@ -12,9 +12,9 @@ spring:
       datasource:
         neo4j:
           driver-class-name: org.neo4j.jdbc.Driver
-          url: jdbc:neo4j:http://192.168.3.150:7474
+          url: jdbc:neo4j:http://10.48.45.180:7474
           username: neo4j
-          password: 12345678
+          password: lt@great
           #定义初始连接数
           initialSize: 0
           #定义最大连接数
@@ -28,9 +28,9 @@ spring:
         mysql:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql
-          url: jdbc:mysql://192.168.2.236:3306/sys-ltkg?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+          url: jdbc:mysql://10.48.45.180:3306/sys-ltkg?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
           username: root
-          password: lantone
+          password: lt@great
 
 
   cloud:
@@ -91,11 +91,11 @@ mybatis-plus:
 
 nlprel:
   server:
-    address: http://192.168.3.150:3456
+    address: http://10.48.45.180:3456
 
 qa:
   server:
-    address: http://192.168.3.150:9998
+    address: http://10.48.45.180:9998
 term:
   server:
-    address: http://192.168.3.150:23232
+    address: http://10.48.45.180:23232

+ 5 - 5
config-server/src/main/resources/shared/tran-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.132:3306/sys-tran?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://10.48.45.180:3306/sys-tran?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: zjltzk@2020
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5
@@ -61,8 +61,8 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: lantone
-    password: lantone
+    username: guest
+    password: guest
     publisher-confirms: true
     virtual-host: /
 
@@ -70,7 +70,7 @@ spring:
   redis:
     database:
       mr: 7 # Redis病历索引
-    host: 192.168.2.132  #Redis服务器地址
+    host: 10.48.45.180  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378,其他环境端口是6379)
     password: lantone # Redis服务器连接密码(默认为空)
     lettuce:

+ 10 - 20
tran-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -1,31 +1,22 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
+import com.alibaba.fastjson.JSONObject;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
+import com.diagbot.dto.SysSetInfoDTO;
+import com.diagbot.entity.InputInfo;
+import com.diagbot.enums.SysTypeEnum;
+import com.diagbot.util.*;
+import com.diagbot.vo.*;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.alibaba.fastjson.JSONObject;
-import com.diagbot.dto.SysSetInfoDTO;
-import com.diagbot.entity.InputInfo;
-import com.diagbot.enums.SysTypeEnum;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.ReadProperties;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.vo.ConceptIntroduceVO;
-import com.diagbot.vo.HosCodeVO;
-import com.diagbot.vo.HospitalSetVO;
-import com.diagbot.vo.PushJoinVO;
-import com.diagbot.vo.PushVO;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * HIS接口对接业务
@@ -205,7 +196,6 @@ public class PushFacade {
 		inputInfo.setInquiryCode(pushVO.getInquiryCode());
 		inputInfo.setAge(pushVO.getAge());
 		inputInfo.setSexType(pushVO.getSex().toString());
-		//inputInfo.setDiseaseName(pushVO.getDiseaseName());
 		inputInfo.setParamIn(JSONObject.toJSONString(pushVO));
 		inputInfo.setParamOut(url);
 		inputInfo.setTransTime(DateUtil.format(new Date(), DateUtil.DATE_TIME_FORMAT));

+ 2 - 2
tran-service/src/main/resources/jdbc.properties

@@ -5,8 +5,8 @@ jdbc.username=root
 jdbc.password=root
 
 #\u6570\u636e\u670d\u52a1\u6a21\u5f0f
-remote.address.ver=http://223.93.170.82:13247/index.html
-remote.address.hor=http://223.93.170.82:13247/indexHorizontal.html
+remote.address.ver=http://10.48.45.180:5545/index.html
+remote.address.hor=http://10.48.45.180:5545/indexHorizontal.html
 
 #his\u65b9\u60a3\u8005\u63a5\u53e3\u5730\u5740
 his.patient.url=