Merge remote-tracking branch 'origin/master'

power-admin/src/main/resources/config/config.properties

@@ -9,8 +9,8 @@ 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_IP = 10.6.1.127
+SERVER_PORT = 8080
 
 #power\u6743\u9650\u7CFB\u7EDFip
 POWER_IP = ${SERVER_IP}
@@ -20,12 +20,12 @@ 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}

power-admin/src/main/resources/config/jdbc.properties

@@ -1,5 +1,5 @@
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc\:mysql\://localhost\:3306/zjpower?useUnicode\=true&characterEncoding\=utf-8
+jdbc.url=jdbc\:mysql\://localhost\:3306/power?useUnicode\=true&characterEncoding\=utf-8
 jdbc.username=root
 jdbc.password=docus702