Merge branch 'master' into test

src/main/resources/applition-hmhjtest.yml

+# 192.168.0.70测试环境 配置文件
+server:
+  exception:
+    to: 1327531085@qq.com;18463106881@163.com
+    form: ptlims@163.com
+    subject: 测试 soil服务异常
+swagger:
+  enable: true
+service:
+  api-url: http://api.hmhjtest.patzn.com
+  url: http://api.hmhjtest.patzn.com
+  #原来食品的配置   开发自己调用  已经修改为hmhjtest  IP也改了
+  food-url: http://food.hmhjtest.patzn.com
+  province-item-url: http://192.168.0.70:7000/
+  soffice: /opt/libreoffice6.2/program/soffice
+spring:
+  datasource:
+    #设置数据库线程池连接   不设置会每次新增一个链接浪费资源
+    type: com.zaxxer.hikari.HikariDataSource
+    url: jdbc:postgresql://192.168.0.70:5432/test_lims_hmhj
+    username: zkdatabase
+    password: 123456
+    dynamic:
+      enabled: false
+  # 注册中心配置
+  cloud:
+    consul:
+      host: 192.168.0.70
+  redis:
+    host: 192.168.0.70
+    password: 123456
+  mail:
+    host: smtp.163.com
+    username: ptlims@163.com
+    password: HFQYDSHMSKTVYRQW
+    port: 25
+    protocol: smtp
+    default-encoding: UTF-8
+  rabbitmq:
+    host: 192.168.0.70
+    port: 5672
+    username: rabbitmqadmin
+    password: 123456aA@
+    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
+      report-make-msg: test.topic.report.make.msg
+      soil-work-msg: test.topic.soil.work.msg
+      hmhj-work-msg: test.topic.hmhj.work.msg
+  data:
+    mongodb:
+      uri: mongodb://limsAdmin:devpt12$mg@192.168.0.70:27017/lims
+      grid-fs-database: lims
+
+# Mongodb GridFS 存储
+oss:
+  grid-fs: true
+  bucket-name: base
+
+
+
+#libreOffice 安装信息
+libreOffice:
+  url: /opt/libreOffice6.2
+### jobs
+jobs:
+  admin-address: http://api.pertest.patzn.com/print
+# 日志打印在这个文件中   （启动时服务器生成log文件夹）
+logging:
+  config: classpath:log4j2.xml
+