Inicio Explorar Axuda
Rexistro Iniciar sesión
liubing
/
wlyy2.0
Fork de Amoy2/wlyy2.0
Seguir 1
Destacar 0
Fork 0
Ficheiros
Explorar o código

Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/sql记录
yeshijie %!s(int64=4) %!d(string=hai) anos
pai
bb2bbdd329
achega
ebe34b85ad
Modificáronse 2 ficheiros con 6 adicións e 6 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 3 3
      svr/svr-cloud-care/src/main/resources/application.yml
  2. 3 3
      svr/svr-cloud-device/src/main/resources/application.yml

+ 3 - 3
svr/svr-cloud-care/src/main/resources/application.yml
Ver ficheiro 

@ -135,7 +135,7 @@ wechat:
 
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
 
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
 
  accId: gh_ffd64560fb21
 
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
 
  id: ijk  # base库中,wx_wechat 的id字段
 
  flag: false #演示环境  true走Mysql数据库  false走Oracle
 
im:
 
@ -231,7 +231,7 @@ wechat:
 
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
 
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
 
  accId: gh_ffd64560fb21
 
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
 
  id: ijk  # base库中,wx_wechat 的id字段
 
  flag: false #演示环境  true走Mysql数据库  false走Oracle
 
im:
 
@ -335,7 +335,7 @@ wechat:
 
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
 
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
 
  accId: gh_ffd64560fb21
 
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
 
  id: ijk  # base库中,wx_wechat 的id字段
 
  flag: false #演示环境  true走Mysql数据库  false走Oracle
 
im:

+ 3 - 3
svr/svr-cloud-device/src/main/resources/application.yml
Ver ficheiro 

@ -128,7 +128,7 @@ wechat:
 
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
 
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
 
  accId: gh_ffd64560fb21
 
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
 
  id: ijk  # base库中,wx_wechat 的id字段
 
  flag: false #演示环境  true走Mysql数据库  false走Oracle
 
im:
 
@ -221,7 +221,7 @@ wechat:
 
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
 
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
 
  accId: gh_ffd64560fb21
 
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
 
  id: ijk  # base库中,wx_wechat 的id字段
 
  flag: false #演示环境  true走Mysql数据库  false走Oracle
 
im:
 
@ -321,7 +321,7 @@ wechat:
 
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
 
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
 
  accId: gh_ffd64560fb21
 
  id: sd_tnzyy_wx  # base库中,wx_wechat 的id字段
 
  id: ijk  # base库中,wx_wechat 的id字段
 
  flag: false #演示环境  true走Mysql数据库  false走Oracle
 
im: