Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/application-dockertest.yml

@@ -3,9 +3,9 @@ server:
     to: 929339256@qq.com;1516330897@qq.com;18463106881@163.com
     subject: docker测试 soil 服务异常
 service:
-  api-url: http://api.docker.com
-  url: http://api.docker.com
-  food-url: http://food.docker.com
+  api-url: http://api.docker.com:9000
+  url: http://api.docker.com:9000
+  food-url: http://food.docker.com:9000
   province-item-url: http://60.216.97.250:8087
   soffice: /opt/libreoffice6.1/program/soffice
 spring: