Merge branch 'dev' of liubing/wlyy2.0 into dev

svr/svr-cloud-job/src/main/resources/application.yml

@@ -123,6 +123,8 @@ cloudServer:
  server_url: http://172.26.0.107:10301/
pay:
  flag: true
cloudCare:
  url: http://172.26.0.107:10301/
##是否发送短信消息 无测试公众号测试线也不发送模板消息
sendTXMessage:
@@ -177,6 +179,8 @@ pay:
##是否发送短信消息
sendTXMessage:
  flag: true
cloudCare:
  url: 1
---
spring:
  profiles: hzprod
@@ -230,4 +234,6 @@ pay:
  flag: true
##是否发送短信消息
sendTXMessage:
  flag: true
  flag: true
cloudCare:
  url: http://127.0.0.1:10301/