Browse Source

后台监视修正

shilin 3 years ago
parent
commit
d5b31d6e8d

+ 8 - 6
web/consumer-hb/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 # 项目相关配置
 gyee:
   #API访问ip
-  #swaggerip: 49.4.50.80:8082
-  swaggerip: 192.168.56.1:8170
+  #swaggerip: 192.168.56.1:8170
+  swaggerip: 192.168.2.216:8170
 server:
   port: 8170
 
@@ -13,6 +13,7 @@ spring:
       nacos:
         discovery:
           server-addr: 192.168.56.1:8848
+          #server-addr: 192.168.2.216:8848
           #指定yaml格式的配置
           file-extension: yaml
           cluster-name: master
@@ -20,10 +21,10 @@ spring:
         password: nacos
   #redis集群
   redis:
-#    host: 10.83.68.94
-    host: 123.60.213.70
+    #host: 10.83.68.94
+    host: 192.168.2.202
     #   host: 10.155.32.4
-    password: gdnxfd123
+    password:
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释,单机不需要打开
@@ -40,7 +41,7 @@ spring:
         min-idle: 0
         max-idle: 8
         max-wait: -1
-    database: 1
+    database: 19
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
   datasource:
@@ -104,6 +105,7 @@ feign:
         connect-timeout: 60000
 provider:
   url: http://192.168.56.1:8171/
+  #url: http://192.168.2.216:8171/
 management:
   endpoints:
     jmx:

+ 3 - 3
web/monitor-web-hb/src/main/java/com/gyee/frame/util/MongoEdosUtil.java

@@ -686,7 +686,7 @@ public class MongoEdosUtil implements IRealTimeDataBaseUtil {
         }
     }
 
-    @Override
+
     public void sendSinglePoint(PointData point) throws Exception {
         String url = baseURL + "/latest";
 
@@ -702,7 +702,7 @@ public class MongoEdosUtil implements IRealTimeDataBaseUtil {
         }
     }
 
-    @Override
+
     public void sendMultiPoint(List<PointData> pointls) throws Exception {
 
         String url = baseURL + "/latest/batch";
@@ -722,7 +722,7 @@ public class MongoEdosUtil implements IRealTimeDataBaseUtil {
         }
     }
 
-    @Override
+
     public void sendMultiPoint(String[] realvalue, DNAVal[] pointls) throws Exception {
         String url = baseURL + "/latest/batch";
 

+ 6 - 6
web/monitor-web-hb/src/main/resources/application-dev.yml

@@ -11,8 +11,8 @@ spring:
         #        username: root
         #        password: 123456
 
-        url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
-        #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+        #url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+        url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
         username: gdprod
         password: gd123
         driver-class-name: oracle.jdbc.driver.OracleDriver
@@ -24,11 +24,11 @@ spring:
         password: root
         #两票数据源
       ticket:
-        url: jdbc:sqlserver://192.168.2.200:1433;DatabaseName=fdeam
-        #url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeamnew
+        #url: jdbc:sqlserver://192.168.2.200:1433;DatabaseName=fdeam
+        url: jdbc:sqlserver://10.155.32.2:1433;DatabaseName=fdeamnew
         username: sa
-        password: ibs
-        #password: Gyee@321#!
+        #password: ibs
+        password: Gyee@321#!
         driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
         #配置初始化连接数大小
       initial-size: 10

+ 4 - 4
web/monitor-web-hb/src/main/resources/application.yml

@@ -33,7 +33,7 @@ gyee:
   swaggerip: 10.155.32.4:8082
   #默认小数位数
   digit: 2
-  realtimedataBase: mongodb #数据查询模式 golden、hwy
+  realtimedataBase: golden #数据查询模式 golden、hwy
   weatherurl: http://123.60.213.70:7011
   weatherqygs: nx_qygs
 #tomcat config
@@ -92,9 +92,9 @@ spring :
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    database: 19
-    host: 192.168.2.202
-    #host: 10.155.32.4
+    database: 1
+    #host: 192.168.2.202
+    host: 10.0.118.73
     password:
     pool:
       maxTotal: 20