修改配置信息和多适配器切换

web/consumer-hb/src/main/resources/application-hb.yml

@@ -0,0 +1,125 @@
+# 项目相关配置
+gyee:
+  #API访问ip
+  swaggerip: 192.168.2.198:8170
+
+server:
+  port: 8170
+
+spring:
+  application:
+    name: monitor-web-hb-consumer
+    nacos:
+      discovery:
+        server-addr: 192.168.2.198:8848
+        #指定yaml格式的配置
+        file-extension: yaml
+        cluster-name: master
+      username: nacos
+      password: nacos
+  #redis集群
+  redis:
+    host: 192.168.2.202
+    password:
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      集群信息
+    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 19
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: oracle.jdbc.OracleDriver
+    #外网
+    url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
+    username: gdprod
+    password: gd123
+
+
+    oracle-schema=:
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+logging:
+  level:
+    root: info
+    com.example: debug
+
+url:
+  benchmaring: http://192.168.2.198:8081
+  analysis: http://192.168.2.198:8082
+
+feign:
+  sentinel:
+    enabled: true
+  httpclient:
+    enabled: true
+  client:
+    config:
+      default:
+        read-timeout: 60000
+        connect-timeout: 60000
+provider:
+  monitorurl: http://192.168.2.198:8171/
+  healthurl: http://192.168.2.198:8172/
+  analysisurl: http://192.168.2.198:8173/
+  adminurl: http://192.168.2.198:8174/
+  alarmurl: http://192.168.2.198:8176/
+
+management:
+  endpoints:
+    jmx:
+      exposure:
+        include: "*"
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: always
+

web/consumer-hb/src/main/resources/application-hf.yml

@@ -0,0 +1,123 @@
+# 项目相关配置
+gyee:
+  #API访问ip
+  swaggerip: 10.0.118.76:8170
+server:
+  port: 8170
+
+spring:
+  application:
+    name: monitor-web-hb-consumer
+    nacos:
+      discovery:
+        server-addr: 10.0.118.76:8848
+        #指定yaml格式的配置
+        file-extension: yaml
+        cluster-name: master
+      username: nacos
+      password: nacos
+  #redis集群
+  redis:
+    host: 10.0.118.73
+    password:
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      集群信息
+    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 0
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: oracle.jdbc.OracleDriver
+    #外网
+    url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
+    username: gdprod
+    password: gd123
+
+    oracle-schema=:
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+logging:
+  level:
+    root: info
+    com.example: debug
+
+url:
+  benchmaring: http://192.168.2.198:8081
+  analysis: http://192.168.2.198:8082
+
+feign:
+  sentinel:
+    enabled: true
+  httpclient:
+    enabled: true
+  client:
+    config:
+      default:
+        read-timeout: 60000
+        connect-timeout: 60000
+provider:
+  monitorurl: http://10.0.118.76:8171/
+  healthurl: http://10.0.118.76:8172/
+  analysisurl: http://10.0.118.76:8173/
+  adminurl: http://10.0.118.76:8174/
+  alarmurl: http://10.0.118.76:8176/
+
+management:
+  endpoints:
+    jmx:
+      exposure:
+        include: "*"
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: always
+

web/consumer-hb/src/main/resources/application-hwy.yml

@@ -0,0 +1,123 @@
+# 项目相关配置
+gyee:
+  #API访问ip
+  swaggerip: 123.60.213.70:8170
+server:
+  port: 8170
+
+spring:
+  application:
+    name: monitor-web-hb-consumer
+    nacos:
+      discovery:
+        server-addr: 192.168.56.1:8848
+
+        #指定yaml格式的配置
+        file-extension: yaml
+        cluster-name: master
+      username: nacos
+      password: nacos
+  #redis集群
+  redis:
+    host: 123.60.213.70
+    password:
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      集群信息
+    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 0
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
+    username: nxfdprod
+    password: gdnxfd123
+    driver-class-name: oracle.jdbc.driver.OracleDriver
+
+    oracle-schema=:
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+logging:
+  level:
+    root: info
+    com.example: debug
+
+url:
+  benchmaring: http://192.168.2.198:8081
+  analysis: http://192.168.2.198:8082
+
+feign:
+  sentinel:
+    enabled: true
+  httpclient:
+    enabled: true
+  client:
+    config:
+      default:
+        read-timeout: 60000
+        connect-timeout: 60000
+provider:
+
+  monitorurl: http://192.168.56.1:8171/
+  healthurl: http://192.168.56.1:8171/
+  analysisurl: http://192.168.56.1:8171/
+  adminurl: http://192.168.56.1:8171/
+  alarmurl: http://192.168.56.1:8171/
+management:
+  endpoints:
+    jmx:
+      exposure:
+        include: "*"
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: always
+

web/consumer-hb/src/main/resources/application-jn.yml

@@ -0,0 +1,121 @@
+# 项目相关配置
+gyee:
+  #API访问ip
+  swaggerip: 10.81.3.155:8170
+server:
+  port: 8170
+
+spring:
+  application:
+    name: monitor-web-hb-consumer
+    nacos:
+      discovery:
+        server-addr: 10.81.3.155:8848
+        #指定yaml格式的配置
+        file-extension: yaml
+        cluster-name: master
+      username: nacos
+      password: nacos
+  #redis集群
+  redis:
+    host: 10.81.3.155
+    password:
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      集群信息
+    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 0
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:postgresql://10.81.3.151:5432/wisdom
+    username: gdprod
+    password: gd123
+    driver-class-name: org.postgresql.Driver
+
+    oracle-schema=:
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+logging:
+  level:
+    root: info
+    com.example: debug
+
+url:
+  benchmaring: http://192.168.2.198:8081
+  analysis: http://192.168.2.198:8082
+
+feign:
+  sentinel:
+    enabled: true
+  httpclient:
+    enabled: true
+  client:
+    config:
+      default:
+        read-timeout: 60000
+        connect-timeout: 60000
+provider:
+  monitorurl: http://10.81.3.155:8171/
+  healthurl: http://10.81.3.155:8171/
+  analysisurl: http://10.81.3.155:8171/
+  adminurl: http://10.81.3.155:8171/
+  alarmurl: http://10.81.3.155:8171/
+management:
+  endpoints:
+    jmx:
+      exposure:
+        include: "*"
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    health:
+      show-details: always
+

web/consumer-hb/src/main/resources/application.yml

@@ -1,152 +1,4 @@
-# 项目相关配置
-gyee:
-  #API访问ip
-  #swaggerip: 10.83.68.97:8170
-  #swaggerip: 192.168.56.1:8170
-  #swaggerip: 192.168.2.198:8170
-  swaggerip: 10.81.3.155:8170
-server:
-  port: 8170
-
 spring:
-  application:
-    name: monitor-web-hb-consumer
-    nacos:
-      discovery:
-        server-addr: 10.81.3.155:8848
-        #server-addr: 192.168.56.1:8848
-        #server-addr: 10.83.68.97:8848
-        #server-addr: 192.168.2.198:8848
-        #指定yaml格式的配置
-        file-extension: yaml
-        cluster-name: master
-      username: nacos
-      password: nacos
-  #redis集群
-  redis:
-    #host: 10.0.118.73
-    host: 10.81.3.155
-    #host: 123.60.213.70
-    #host: 192.168.2.202
-    #host: 10.83.68.94
-    password:
-    port: 6379
-    timeout: 100000
-    #    集群环境打开下面注释，单机不需要打开
-    #    cluster:
-    #      集群信息
-    #      nodes: xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx,xxx.xxx.xxx.xxx:xxxx
-    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
-    #      maxRedirects: 3
-    application:
-      name: test
-    jedis:
-      pool:
-        max-active: 8
-        min-idle: 0
-        max-idle: 8
-        max-wait: -1
-    database: 0
-  autoconfigure:
-    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-#    driver-class-name: oracle.jdbc.OracleDriver
-    #外网
-    #url: jdbc:oracle:thin:@10.0.118.71:1521:gdsj
-#    url: jdbc:oracle:thin:@123.60.213.70:1521:gdnxfd
-    #url: jdbc:oracle:thin:@10.83.68.165:1521:gdsj
-    #url: jdbc:oracle:thin:@192.168.2.215:1521:gdsj
-#    username: gdprod
-#    password: gd123
-#    username: nxfdprod
-#    password: gdnxfd123
-
-    url: jdbc:postgresql://10.81.3.151:5432/wisdom
-    username: gdprod
-    password: gd123
-    driver-class-name: org.postgresql.Driver
-
-    oracle-schema=:
-    druid:
-      max-active: 20
-      initial-size: 1
-      min-idle: 3
-      max-wait: 60000
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-  servlet:
-    multipart:
-      # 开启 multipart 上传功能
-      enabled: true
-      # 文件写入磁盘的阈值
-      file-size-threshold: 2KB
-      # 最大文件大小
-      max-file-size: 200MB
-      # 最大请求大小
-      max-request-size: 215MB
-
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
-    auto-mapping-behavior: full
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-  mapper-locations: classpath*:mapper/**/*Mapper.xml
-  global-config:
-    # 逻辑删除配置
-    db-config:
-      id-type: auto
-      # 删除前
-      logic-not-delete-value: 1
-      # 删除后
-      logic-delete-value: 0
-logging:
-  level:
-    root: info
-    com.example: debug
-
-url:
-  benchmaring: http://192.168.2.198:8081
-  analysis: http://192.168.2.198:8082
-
-feign:
-  sentinel:
-    enabled: true
-  httpclient:
-    enabled: true
-  client:
-    config:
-      default:
-        read-timeout: 60000
-        connect-timeout: 60000
-provider:
-#  monitorurl: http://192.168.56.1:8171/
-#  healthurl: http://192.168.56.1:8172/
-#  analysisurl: http://192.168.56.1:8173/
-#  adminurl: http://192.168.56.1:8174/
-#  alarmurl: http://192.168.56.1:8176/
-#  monitorurl: http://192.168.2.198:8171/
-#  healthurl: http://192.168.2.198:8172/
-#  analysisurl: http://192.168.2.198:8173/
-#  adminurl: http://192.168.2.198:8174/
-#  alarmurl: http://192.168.2.198:8176/
-  monitorurl: http://10.81.3.155:8171/
-  healthurl: http://10.81.3.155:8172/
-  analysisurl: http://10.81.3.155:8173/
-  adminurl: http://10.81.3.155:8174/
-  alarmurl: http://10.81.3.155:8176/
-management:
-  endpoints:
-    jmx:
-      exposure:
-        include: "*"
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    health:
-      show-details: always
-
+  profiles:
+    active: hb
+#    active: jn