Merge remote-tracking branch 'origin/master'

src/main/resources/application-ys.yml

+# 测试环境
+server:
+  exception:
+    to: 1327531085@qq.com;18463106881@163.com
+    form: ptlims_test@163.com
+    subject: 测试 hmhj服务异常
+swagger:
+  enable: true
+service:
+  api-url: http://api.ys.patzn.com
+  url: http://api.ys.patzn.com
+  food-url: http://food.ys.patzn.com
+  province-item-url: http://60.216.97.250:8087/
+  soffice: /opt/libreoffice6.2/program/soffice
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    url: jdbc:postgresql://39.103.208.182:5432/pc_lims_hmhj
+    username: dbhmhj
+    password: svfYEhgW586e!$6
+    dynamic:
+      enabled: false
+  # 注册中心配置
+  cloud:
+    consul:
+      host: 121.89.205.20
+  redis:
+    host: 121.89.205.20
+    password: ysadmin63Tba
+  mail:
+    host: smtp.163.com
+    username: ptlims_test@163.com
+    password: QTXWOTEUSHARYDWT
+    port: 25
+    protocol: smtp
+    default-encoding: UTF-8
+  rabbitmq:
+    host: 121.89.205.20
+    port: 5672
+    username: ysadmin
+    password: ysadmin63$%64
+    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: test.topic.soil.work.msg
+      hmhj-work-msg: pro.topic.hmhj.work.msg
+
+# 对象存储配置
+oss:
+  aliyun:
+    folder: hmhj
+
+#libreOffice 安装信息
+libreOffice:
+  url: /opt/libreOffice6.2
+### jobs
+jobs:
+  admin-address: http://api.ys.patzn.com/print
\ No newline at end of file