prod

src/main/resources/application-dev.yml

@@ -1,37 +1,22 @@
 #测试环境配置文件
 spring:
   datasource:
-    url: jdbc:oracle:thin:@172.16.90.197:1521/ATTMS
-    password: SSO
-    username: SSO
+    url: jdbc:oracle:thin:@172.16.90.214:1521/gxmes
+    password: gxmestest
+    username: gxmestest
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: antai-api
   mvc:
     async:
       request-timeout: 15000
-#  redis:
-#    # Redis本地服务器地址，注意要开启redis服务，即那个redis-server.exe
-#    host: 127.0.0.1
-#    # Redis服务器端口,默认为6379.若有改动按改动后的来
-#    port: 6379
-#    #Redis服务器连接密码，默认为空，若有设置按设置的来
-#    password:
-#    jedis:
-#      pool:
-#        # 连接池最大连接数，若为负数则表示没有任何限制
-#        max-active: 8
-#        # 连接池最大阻塞等待时间，若为负数则表示没有任何限制
-#        max-wait: -1
-#        # 连接池中的最大空闲连接
-#        max-idle: 8
-
 
 server:
   port: 8080
   tomcat:
     max-threads: 1000
     accept-count: 800
+    basedir: /tomcat/baseDir
 eureka:
   client:
     registerWithEureka: false
@@ -39,31 +24,31 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.90.202:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.202:8079}
+    url: ${AMSFEIGN_URL:172.16.90.214:8079}
   BmsFeign:
-    url: ${BMSFEIGN_URL:172.16.90.202:8078}
+    url: ${BMSFEIGN_URL:172.16.90.214:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8086}
+    url: ${TMSFEIGN_URL:172.16.90.214:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.202:8093}
+    url: ${WMSFEIGN_URL:172.16.90.214:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.90.202:8095}
+    url: ${OMSFEIGN_URL:172.16.90.214:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.202:8060}
+    url: ${RMSFEIGN_URL:172.16.90.214:8060}
   IntegrationFeign:
-    url: ${INTEGRATIONFEIGN_URL:172.16.90.202:8066}
+    url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
   OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.90.202:8038}
+    url: ${OTMSFEIGN_URL:172.16.90.214:8038}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.202:8096}
-  WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
+    url: ${TMSFEIGN_URL:172.16.90.214:8096}
   SSOFeign:
-    url: ${SSOFEIGN_URL:172.16.90.202:9001}
+    url: ${SSOFEIGN_URL:172.16.90.214:9001}
+  WebSocketFeign:
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.202:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.214:8055}
 
 
 #远程调用
@@ -74,7 +59,7 @@ feign:
     config:
       default:  #默认配置,连接时间要短，读取时间要长
         connectTimeout: 1000 #单位毫秒
-        readTimeout: 150000 #单位毫秒
+        readTimeout: 30000 #单位毫秒
 #熔断器
 hystrix:
   command:

src/main/resources/application-prod.yml

@@ -1,9 +1,9 @@
 #正式环境配置文件
 spring:
   datasource:
-    url: jdbc:oracle:thin:@172.16.90.214:1521/gxmes
-    password: gxmestest
-    username: gxmestest
+    url: jdbc:oracle:thin:@172.16.90.197:1521/ATTMS
+    password: SSO
+    username: SSO
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: antai-api
@@ -24,31 +24,31 @@ eureka:
 
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.90.214:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.90.202:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.90.214:8079}
+    url: ${AMSFEIGN_URL:172.16.90.202:8079}
   BmsFeign:
-    url: ${BMSFEIGN_URL:172.16.90.214:8078}
+    url: ${BMSFEIGN_URL:172.16.90.202:8078}
   TmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8086}
+    url: ${TMSFEIGN_URL:172.16.90.202:8086}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.90.214:8093}
+    url: ${WMSFEIGN_URL:172.16.90.202:8093}
   OMSFeign:
-    url: ${OMSFEIGN_URL:172.16.90.214:8095}
+    url: ${OMSFEIGN_URL:172.16.90.202:8095}
   RmsFeign:
-    url: ${RMSFEIGN_URL:172.16.90.214:8060}
+    url: ${RMSFEIGN_URL:172.16.90.202:8060}
   IntegrationFeign:
-    url: ${INTEGRATIONFEIGN_URL:172.16.90.214:8066}
+    url: ${INTEGRATIONFEIGN_URL:172.16.90.202:8066}
   OTMSFeign:
-    url: ${OTMSFEIGN_URL:172.16.90.214:8038}
+    url: ${OTMSFEIGN_URL:172.16.90.202:8038}
   EmsFeign:
-    url: ${TMSFEIGN_URL:172.16.90.214:8096}
+    url: ${TMSFEIGN_URL:172.16.90.202:8096}
   SSOFeign:
-    url: ${SSOFEIGN_URL:172.16.90.214:9001}
+    url: ${SSOFEIGN_URL:172.16.90.202:9001}
   WebSocketFeign:
-    url: ${WEBSOCKETFEIGN_URL:172.16.90.214:8000}
+    url: ${WEBSOCKETFEIGN_URL:172.16.90.202:8000}
   REPORTFeign:
-    url: ${REPORTFEIGN_URL:172.16.90.214:8055}
+    url: ${REPORTFEIGN_URL:172.16.90.202:8055}
 
 
 #远程调用