From 3c7ad0d41a0dec19371ec91f6798dbcbe661b61b Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Fri, 10 Jul 2020 13:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E6=88=B7=E9=A1=B5=E9=9D=A2=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E7=97=85=E6=A1=88=E5=A4=8D=E5=8D=B0=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=9B=BE=E6=A0=87=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 power-admin/src/main/resources/config/config.properties   | 8 ++++----
 .../main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/power-admin/src/main/resources/config/config.properties b/power-admin/src/main/resources/config/config.properties
index a066239..e10c6dc 100644
--- a/power-admin/src/main/resources/config/config.properties
+++ b/power-admin/src/main/resources/config/config.properties
@@ -10,7 +10,7 @@ TOKEN_EXPIRE_TIME = 1200000
 ##################################################\u670D\u52A1\u5668ip##########################################################
 #\u901A\u7528\u670D\u52A1\u5668IP\u4E0E\u901A\u7528\u670D\u52A1\u5668\u7AEF\u53E3
 SERVER_IP = localhost
-SERVER_PORT = 8081
+SERVER_PORT = 8080
 
 #power\u6743\u9650\u7CFB\u7EDFip
 POWER_IP = ${SERVER_IP}
@@ -20,17 +20,17 @@ POWER_PORT = ${SERVER_PORT}
 #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDFip
 EMRMEDICALRECORD_IP = ${SERVER_IP}
 #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDF\u7AEF\u53E3
-EMRMEDICALRECORD_PORT = 8082
+EMRMEDICALRECORD_PORT = ${SERVER_PORT}
 
 #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDFip
 EMRRECORD_IP = ${SERVER_IP}
 #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDF\u7AEF\u53E3
-EMRRECORD_PORT = 8081
+EMRRECORD_PORT = ${SERVER_PORT}
 
 #\u75C5\u6848\u590D\u5370\u9884\u7EA6ip
 EMRAPPLYCOPY_IP = ${SERVER_IP}
 #\u75C5\u6848\u590D\u5370\u9884\u7EA6\u7AEF\u53E3
-EMRAPPLYCOPY_PORT = ${SERVER_PORT}
+EMRAPPLYCOPY_PORT = 80
 
 #\u75C5\u6848\u7B7E\u6536ip
 EMRFILES_IP = ${SERVER_IP}
diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
index d332406..d05c410 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
@@ -439,7 +439,7 @@
                         </a>
                     </div>
                 </c:if>
-                <%--<c:if test="${emr_apply_copy == 1}">
+                <c:if test="${emr_apply_copy == 1}">
                     <div class="iconContext left">
                         <a href="${EMRAPPLYCOPY_URLHEAD}/auth/login?token=${token}&userName=${CURRENT_USER.userName}">
                             <!-- Unnamed (矩形) -->
@@ -469,7 +469,7 @@
                         </a>
                     </div>
                 </c:if>
-                <c:if test="${emr_files == 1}">
+                <%--<c:if test="${emr_files == 1}">
                     <div class="iconContext left">
                         <a href="${EMRFILES_URLHEAD}/login?token=${token}&userName=${CURRENT_USER.userName}">
                             <!-- Unnamed (矩形) -->