Merge remote-tracking branch 'origin/master'

src/main/resources/application-devout.yml

-# 开发环境
-server:
-  exception:
-    enable: false
-swagger:
-  enable: true
-service:
-  api-url: http://api.dev.patzn.com:7000
-  url: http://api.dev.patzn.com:7000
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-#    url: jdbc:postgresql://localhost:5432/dev_lims_meter
-    username: dbmeter
-    password: sfdWrE39&d!Pt
-    url: jdbc:postgresql://139.9.144.39:5432/pertest_lims_soil
-    driver-class-name: org.postgresql.Driver
-    dynamic:
-      enabled: false
-  # 注册中心配置
-  cloud:
-    consul:
-      host: localhost
-      discovery:
-        health-check-interval: 5s
-  #      host: localhost
-  rabbitmq:
-    host: 121.36.130.208
-    port: 5672
-    username: mqbase
-    password: mqb123#@$5
-    virtual-host: /
-    topic:
-      push-msg: dev.topic.push.msg
-      sys-log: dev.topic.sys.log
-      chemical-classify-warning: dev.topic.chemical.classify.warning
-      equip-check-msg: dev.topic.equip.check.msg
-      env-work-msg: dev.topic.env.work.msg
-      food-work-msg: dev.topic.food.work.msg
-      food-statistics-customer-contract: dev.topic.food.statistics.customer.contract
-      food-statistics-contract-progress: dev.topic.food.statistics.contract.progress
-      food-statistics-sample-progress: dev.topic.food.statistics.sample.progress
-      report-make-msg: dev.topic.report.make.msg
-
-### jobs
-jobs:
-  admin-address: http://api.dev.patzn.com:7000/print
-
-
-# 对象存储配置
-oss:
-  bucket-name: pt-web-sys
-  aliyun:
-    endpoint: http://oss.test.patzn.com
-    folder: dev/soil
-
-# ribbon 路由配置
-food.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
-print.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
-res.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
-convert.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule

src/main/resources/application-out.yml

-# 开发环境
-server:
-  exception:
-    enable: false
-swagger:
-  enable: true
-service:
-  api-url: http://api.dev.patzn.com:7000
-  url: http://api.dev.patzn.com:7000
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-#    url: jdbc:postgresql://localhost:5432/dev_lims_meter
-    url: jdbc:postgresql://139.9.144.39:5432/test_lims_soil
-    username: dbsoil
-    password: sfdWrE39&d!Pt
-    driver-class-name: org.postgresql.Driver
-    dynamic:
-      enabled: false
-  # 注册中心配置
-  cloud:
-    consul:
-      host: localhost
-      discovery:
-        health-check-interval: 5s
-  #      host: localhost
-  rabbitmq:
-    host: 121.36.130.208
-    port: 5672
-    username: mqbase
-    password: mqb123#@$5
-    virtual-host: /
-    topic:
-      push-msg: dev.topic.push.msg
-      sys-log: dev.topic.sys.log
-      chemical-classify-warning: dev.topic.chemical.classify.warning
-      equip-check-msg: dev.topic.equip.check.msg
-      report-make-msg: dev.topic.report.make.msg
-      soil-work-msg: dev.topic.soil.work.msg
-
-### jobs
-jobs:
-  admin-address: http://api.dev.patzn.com:7000/print
-
-
-# 对象存储配置
-oss:
-  bucket-name: pt-web-sys
-  aliyun:
-    endpoint: http://oss.test.patzn.com
-    folder: dev/soil
-#libreOffice 安装信息
-libreOffice:
-  url: C:/Program Files/LibreOffice
-# ribbon 路由配置
-food.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
-print.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
-res.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule
-convert.ribbon.NFLoadBalancerRuleClassName: com.patzn.cloud.zuul.LocalRule

src/main/resources/application-pro.yml

-# 生产环境
-service:
-  api-url: http://api.patzn.com
-  url: http://api.patzn.com
-  food-url: http://food.patzn.com
-  province-item-url: http://60.216.97.250:8087
-  soffice: /opt/libreoffice6.1/program/soffice
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:postgresql://121.36.94.193:5432/pc_lims_soil
-    username: dbsoil
-    password: ptd435%a!381
-    dynamic:
-      enabled: false
-  # 注册中心配置
-  cloud:
-    consul:
-      host: 124.70.154.133
-  rabbitmq:
-    host: 124.70.154.133
-    port: 5672
-    username: mqbase
-    password: mqb123#@$5
-    virtual-host: /
-    topic:
-      push-msg: pro.topic.push.msg
-      sys-log: pro.topic.sys.log
-      chemical-classify-warning: pro.topic.chemical.classify.warning
-      equip-check-msg: pro.topic.equip.check.msg
-      report-make-msg: pro.topic.report.make.msg
-      soil-work-msg: pro.topic.soil.work.msg
-  redis:
-    database: 0
-    host: 124.70.154.133
-    port: 6379
-    password: patzn123TQa
-  #服务监控
-  boot:
-    admin:
-      client:
-        instance:
-          service-url: http://${network-ip}:${server.port}
-          name: food
-        username: "patznAdmin"
-        password: "asd9*765"
-        url:
-          - http://springadmin.patzn.com
-# 对象存储配置
-oss:
-  aliyun:
-    folder: soil
-
-### jobs
-jobs:
-  admin-address: http://api.patzn.com/print
-
-# 日志
-logging:
-  config: classpath:log4j2-pro.xml
-
-#libreOffice 安装信息
-libreOffice:
-  url: /opt/libreoffice6.2

src/main/resources/application-test.yml

-# 测试环境
-server:
-  exception:
-    to: 1327531085@qq.com;18463106881@163.com
-    subject: 测试 food 服务异常
-swagger:
-  enable: true
-service:
-  api-url: http://api.test.patzn.com
-  url: http://api.test.patzn.com
-  food-url: http://food.test.patzn.com
-  province-item-url: http://60.216.97.250:8087/
-  soffice: /opt/libreoffice6.1/program/soffice
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    url: jdbc:postgresql://121.36.94.193:5432/test_lims_soil
-    username: dbsoil
-    password: ptd434%b!361
-    dynamic:
-      enabled: false
-  # 注册中心配置
-  cloud:
-    consul:
-      host: 121.36.130.208
-
-  rabbitmq:
-    host: 121.36.130.208
-    port: 5672
-    username: mqbase
-    password: mqb123#@$5
-    virtual-host: /
-    topic:
-      push-msg: test.topic.push.msg
-      sys-log: test.topic.sys.log
-      chemical-classify-warning: test.topic.chemical.classify.warning
-      equip-check-msg: test.topic.equip.check.msg
-      env-work-msg: test.topic.env.work.msg
-      food-work-msg: test.topic.food.work.msg
-      food-statistics-customer-contract: test.topic.food.statistics.customer.contract
-      food-statistics-contract-progress: test.topic.food.statistics.contract.progress
-      food-statistics-sample-progress: test.topic.food.statistics.sample.progress
-      report-make-msg: test.topic.report.make.msg
-
-# 对象存储配置
-oss:
-  bucket-name: pt-web-sys
-  aliyun:
-    endpoint: http://oss.test.patzn.com
-    folder: test/food
-#libreOffice 安装信息
-libreOffice:
-  url: C:/Program Files/LibreOffice
-### jobs
-jobs:
-  admin-address: http://api.test.patzn.com/print
\ No newline at end of file

src/main/resources/application-zhyf.yml

-server:
-  exception:
-    to: 929339256@qq.com;1516330897@qq.com;18463106881@163.com
-    subject: 中海油服 soil 服务异常
-service:
-  api-url: http://api.lims.com
-  url: http://api.lims.com
-  food-url: http://food.lims.com
-  province-item-url: http://60.216.97.250:8087
-  soffice: /opt/libreoffice6.1/program/soffice
-spring:
-  datasource:
-    username: dbsoiladmin
-    password: ptoil!%&wzhj768
-    url: jdbc:postgresql://127.0.0.1:5432/pc_lims_soil
-    driver-class-name: org.postgresql.Driver
-    dynamic:
-      enabled: false
-  # 注册中心配置
-  cloud:
-    consul:
-      host: 127.0.0.1
-  rabbitmq:
-    host: 127.0.0.1
-    port: 5672
-    username: patznsomq
-    password: mqsoil456#@$5
-    virtual-host: /
-    topic:
-      push-msg: pro.topic.push.msg
-      sys-log: pro.topic.sys.log
-      chemical-classify-warning: pro.topic.chemical.classify.warning
-      equip-check-msg: pro.topic.equip.check.msg
-      report-make-msg: pro.topic.report.make.msg
-      soil-work-msg: pro.topic.soil.work.msg
-  redis:
-    host: 127.0.0.1
-    password: ptsoil476TMa
-  # Mongodb GridFS
-  data:
-    mongodb:
-      uri: mongodb://mgluser:soild574ld@127.0.0.1:27017/lims
-      grid-fs-database: lims
-
-# Mongodb GridFS 存储
-oss:
-  grid-fs: true
-  bucket-name: base
-
-### jobs
-jobs:
-  admin-address: http://api.lims.com/print
-
-# 日志
-logging:
-  config: classpath:log4j2-pro.xml
-