冠新初始

config-server/src/main/resources/logback-spring.xml

@@ -213,37 +213,37 @@
     -->
     <logger name="com.diagbot.mapper" level="DEBUG"/>
 
-    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.236:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"config-server"}</customFields>
-        </encoder>
-    </appender>
+<!--    <appender name="LOGSTASHDEV" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
+<!--        <destination>192.168.2.236:5044</destination>-->
+<!--        &lt;!&ndash; encoder必须配置,有多种可选 &ndash;&gt;-->
+<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">-->
+<!--            <customFields>{"appname":"config-server"}</customFields>-->
+<!--        </encoder>-->
+<!--    </appender>-->
 
-    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.241:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"config-server"}</customFields>
-        </encoder>
-    </appender>
+<!--    <appender name="LOGSTASHTEST" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
+<!--        <destination>192.168.2.241:5044</destination>-->
+<!--        &lt;!&ndash; encoder必须配置,有多种可选 &ndash;&gt;-->
+<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">-->
+<!--            <customFields>{"appname":"config-server"}</customFields>-->
+<!--        </encoder>-->
+<!--    </appender>-->
 
-    <appender name="LOGSTASHPRE" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.121:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"config-server"}</customFields>
-        </encoder>
-    </appender>
+<!--    <appender name="LOGSTASHPRE" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
+<!--        <destination>192.168.2.121:5044</destination>-->
+<!--        &lt;!&ndash; encoder必须配置,有多种可选 &ndash;&gt;-->
+<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">-->
+<!--            <customFields>{"appname":"config-server"}</customFields>-->
+<!--        </encoder>-->
+<!--    </appender>-->
 
-    <appender name="LOGSTASHPRO" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>192.168.2.122:5044</destination>
-        <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
-            <customFields>{"appname":"config-server"}</customFields>
-        </encoder>
-    </appender>
+<!--    <appender name="LOGSTASHPRO" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
+<!--        <destination>192.168.2.122:5044</destination>-->
+<!--        &lt;!&ndash; encoder必须配置,有多种可选 &ndash;&gt;-->
+<!--        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">-->
+<!--            <customFields>{"appname":"config-server"}</customFields>-->
+<!--        </encoder>-->
+<!--    </appender>-->
 
     <!-- 本地环境下的日志配置 -->
     <springProfile name="native">
@@ -262,58 +262,58 @@
             <appender-ref ref="WARN"/>
             <appender-ref ref="INFO"/>
             <appender-ref ref="DEBUG"/>
-            <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT"/>
+<!--            &lt;!&ndash; 生产环境将请stdout去掉 &ndash;&gt;-->
+<!--            <appender-ref ref="STDOUT"/>-->
         </root>
     </springProfile>
 
-    <!-- 开发环境下的日志配置 -->
-    <springProfile name="dev">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHDEV"/>
-        </root>
-    </springProfile>
+<!--    &lt;!&ndash; 开发环境下的日志配置 &ndash;&gt;-->
+<!--    <springProfile name="dev">-->
+<!--        <root level="INFO">-->
+<!--            <appender-ref ref="ERROR"/>-->
+<!--            <appender-ref ref="WARN"/>-->
+<!--            <appender-ref ref="INFO"/>-->
+<!--            <appender-ref ref="DEBUG"/>-->
+<!--            &lt;!&ndash; 生产环境将请stdout去掉 &ndash;&gt;-->
+<!--            <appender-ref ref="STDOUT"/>-->
+<!--            <appender-ref ref="LOGSTASHDEV"/>-->
+<!--        </root>-->
+<!--    </springProfile>-->
 
-    <!-- 测试环境下的日志配置 -->
-    <springProfile name="test">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHTEST"/>
-        </root>
-    </springProfile>
+<!--    &lt;!&ndash; 测试环境下的日志配置 &ndash;&gt;-->
+<!--    <springProfile name="test">-->
+<!--        <root level="INFO">-->
+<!--            <appender-ref ref="ERROR"/>-->
+<!--            <appender-ref ref="WARN"/>-->
+<!--            <appender-ref ref="INFO"/>-->
+<!--            <appender-ref ref="DEBUG"/>-->
+<!--            &lt;!&ndash; 生产环境将请stdout去掉 &ndash;&gt;-->
+<!--            <appender-ref ref="STDOUT"/>-->
+<!--            <appender-ref ref="LOGSTASHTEST"/>-->
+<!--        </root>-->
+<!--    </springProfile>-->
 
-    <!-- 预发布环境下的日志配置 -->
-    <springProfile name="pre">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHPRE"/>
-        </root>
-    </springProfile>
+<!--    &lt;!&ndash; 预发布环境下的日志配置 &ndash;&gt;-->
+<!--    <springProfile name="pre">-->
+<!--        <root level="INFO">-->
+<!--            <appender-ref ref="ERROR"/>-->
+<!--            <appender-ref ref="WARN"/>-->
+<!--            <appender-ref ref="INFO"/>-->
+<!--            <appender-ref ref="DEBUG"/>-->
+<!--            <appender-ref ref="STDOUT"/>-->
+<!--            <appender-ref ref="LOGSTASHPRE"/>-->
+<!--        </root>-->
+<!--    </springProfile>-->
 
-    <!-- 生产环境下的日志配置 -->
-    <springProfile name="pro">
-        <root level="INFO">
-            <appender-ref ref="ERROR"/>
-            <appender-ref ref="WARN"/>
-            <appender-ref ref="INFO"/>
-            <appender-ref ref="DEBUG"/>
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="LOGSTASHPRO"/>
-        </root>
-    </springProfile>
+<!--    &lt;!&ndash; 生产环境下的日志配置 &ndash;&gt;-->
+<!--    <springProfile name="pro">-->
+<!--        <root level="INFO">-->
+<!--            <appender-ref ref="ERROR"/>-->
+<!--            <appender-ref ref="WARN"/>-->
+<!--            <appender-ref ref="INFO"/>-->
+<!--            <appender-ref ref="DEBUG"/>-->
+<!--            <appender-ref ref="STDOUT"/>-->
+<!--            <appender-ref ref="LOGSTASHPRO"/>-->
+<!--        </root>-->
+<!--    </springProfile>-->
 </configuration>

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://10.5.55.29:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.201.115:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lt@great
+      password: lantone
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -61,8 +61,8 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: guest
-    password: guest
+    username: lantone
+    password: lantone
     publisher-confirms: true
     virtual-host: /
 
@@ -99,12 +99,12 @@ io.github.lvyahui8.spring.base-packages: com.diagbot.aggregate
 
 ai:
   server:
-    address: http://10.5.55.40:5008
+    address: http://192.168.201.115:5008
 
 nlp:
   server:
-    address: http://10.5.55.40:5002
+    address: http://192.168.201.115:5002
 
 aineo:
   server:
-    address: http://10.5.55.40:8888
+    address: http://192.168.201.115:8888

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

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

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

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

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://10.5.55.29:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.201.115:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lt@great
+      password: lantone
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -69,8 +69,8 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: guest
-    password: guest
+    username: lantone
+    password: lantone
     publisher-confirms: true
     virtual-host: /
 

config-server/src/main/resources/shared/prec-service-local.yml

@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://10.5.55.29:3306/sys-prec?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.201.115:3306/sys-prec?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lt@great
+      password: lantone
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -70,8 +70,8 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: guest
-    password: guest
+    username: lantone
+    password: lantone
     publisher-confirms: true
     virtual-host: /
 
@@ -105,7 +105,7 @@ mybatis-plus:
     cache-enabled: false
 
 imageUrl:
-  prefix: http://10.5.55.40:82
+  prefix: http://192.168.201.115:82
 
 io.github.lvyahui8.spring:
   base-packages: com.diagbot.aggregate

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://10.5.55.29:3306/sys-tran?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.201.115:3306/sys-tran?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lt@great
+      password: lantone
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -61,8 +61,8 @@ spring:
   rabbitmq:
     host: localhost
     port: 5672
-    username: guest
-    password: guest
+    username: lantone
+    password: lantone
     publisher-confirms: true
     virtual-host: /
 
@@ -70,7 +70,7 @@ spring:
   redis:
     database:
       mr: 7 # Redis病历索引
-    host: 10.5.55.40  #Redis服务器地址
+    host: 192.168.201.115  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:

config-server/src/main/resources/shared/triage-service-local.yml

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

tran-service/src/main/java/com/diagbot/facade/PatientInfoDjFacade.java

@@ -406,54 +406,6 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
      */
     private List<RegisterInfoDTO> getRegisterInfo(SignInVO signInVO) {
         List<RegisterInfoDTO> registerInfoDTOS = new ArrayList<>();
-        //调用第三方的url
-        String url = "http://172.17.220.121:27772/cdyzone/rest/CDYZone.APPCON.BS.RestService";
-        //调用第三方的入参并得到返回的出参
-        String json = doPostJson(url, JSONObject.toJSONString(signInVO));
-        System.out.println("返回的JSON-------------" + json);
-        //把返回的参数转换成需要的格式
-        RespDTO respDTO = JSONObject.parseObject(json, RespDTO.class);
-        if (respDTO.code.equals("0")) {
-            List<SignlnsDTO> signInDTOS = JSONObject.parseArray(JSONObject.toJSONString(respDTO.data), SignlnsDTO.class);
-            signInDTOS.forEach(signInDTO -> {
-                //病人信息
-                PatientInfo patientInfo = new PatientInfo();
-                patientInfo.setCode(StringUtils.isNotEmpty(signInDTO.getPatientCode()) ? signInDTO.getPatientCode() : "");
-                patientInfo.setHospitalCode(StringUtils.isNotEmpty(signInDTO.getHospitalCode()) ? signInDTO.getHospitalCode() : "");
-                patientInfo.setSex(Integer.valueOf(StringUtils.isNotEmpty(signInDTO.getSex()) ? signInDTO.getSex() : ""));
-                patientInfo.setName(StringUtils.isNotEmpty(signInDTO.getPatientName()) ? signInDTO.getPatientName() : "");
-                patientInfo.setBirthday(DateUtil.parseDate(StringUtils.isNotEmpty(signInDTO.getBirthday()) ? signInDTO.getBirthday() : ""));
-                patientInfo.setIdentityNum(StringUtils.isNotEmpty(signInDTO.getIdentityNum())? signInDTO.getIdentityNum() : "");
-                patientInfo.setIdNo(StringUtils.isNotEmpty(signInDTO.getPatientCode()) ? signInDTO.getPatientCode() : "");
-                //医生信息
-                DoctorInfo doctorInfo = new DoctorInfo();
-                doctorInfo.setHospitalCode(StringUtils.isNotEmpty(signInDTO.getHospitalCode()) ? signInDTO.getHospitalCode() : "");
-                doctorInfo.setHospitalDeptCode(StringUtils.isNotEmpty(signInDTO.getHospitalDeptCode()) ? signInDTO.getHospitalDeptCode() : "");
-                doctorInfo.setSex(Integer.valueOf(StringUtils.isNotEmpty(signInDTO.getSex()) ? signInDTO.getSex() : ""));
-                doctorInfo.setName(StringUtils.isNotEmpty(signInDTO.getDoctorName()) ? signInDTO.getDoctorName() : "");
-                doctorInfo.setCode(StringUtils.isNotEmpty(signInDTO.getDoctorCode()) ? signInDTO.getDoctorCode() : "");
-                //病人详情
-                List<RegisterInfoDetailDTO> detail = new ArrayList<>();
-                RegisterInfoDetailDTO registerInfoDetailDTO = new RegisterInfoDetailDTO();
-                registerInfoDetailDTO.setDoctorInfo(doctorInfo);
-                registerInfoDetailDTO.setRecordTime(StringUtils.isNotEmpty(signInDTO.getRecordTime())?signInDTO.getRecordTime():"");
-                registerInfoDetailDTO.setRegisterNum(StringUtils.isNotEmpty(signInDTO.getRegisterNum()) ? signInDTO.getRegisterNum() : "");
-                registerInfoDetailDTO.setHospitalDeptName(StringUtils.isNotEmpty(signInDTO.getHospitalDeptName()) ? signInDTO.getHospitalDeptName() : "");
-                registerInfoDetailDTO.setRecordId(StringUtils.isNotEmpty(signInDTO.getRecordId()) ? signInDTO.getRecordId() : "");
-                registerInfoDetailDTO.setRegisterNum(StringUtils.isNotEmpty(signInDTO.getRegisterNum()) ? signInDTO.getRegisterNum() : "");
-                registerInfoDetailDTO.setHospitalDeptCode(StringUtils.isNotEmpty(signInDTO.getHospitalDeptCode()) ? signInDTO.getHospitalDeptCode() : "");
-                detail.add(registerInfoDetailDTO);
-                //医院挂号信息
-                RegisterInfoDTO registerInfoDTO = new RegisterInfoDTO();
-                registerInfoDTO.setHospitalCode(StringUtils.isNotEmpty(signInDTO.getHospitalCode()) ? signInDTO.getHospitalCode() : "");
-                registerInfoDTO.setHospitalName(StringUtils.isNotEmpty(signInDTO.getHospitalName()) ? signInDTO.getHospitalName() : "");
-                registerInfoDTO.setSonHospitalCode(StringUtils.isNotEmpty(signInDTO.getHospitalCode()) ? signInDTO.getHospitalCode() : "");
-                registerInfoDTO.setSonHospitalName(StringUtils.isNotEmpty(signInDTO.getHospitalName()) ? signInDTO.getHospitalName() : "");
-                registerInfoDTO.setPatientInfo(patientInfo);
-                registerInfoDTO.setDetail(detail);
-                registerInfoDTOS.add(registerInfoDTO);
-            });
-        }
         return registerInfoDTOS;
     }