Commit 765ab271 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5

parents 3ea49c55 4d0d77cd
...@@ -39,6 +39,6 @@ spring: ...@@ -39,6 +39,6 @@ spring:
template-loader-path: classpath:/templates/ template-loader-path: classpath:/templates/
wx: wx:
corpid: wwbcb090af0dfe50e5 corpid: wwbcb090af0dfe50e5
corpsecret: kFG3_g_Ce0bpZt6mByx524 corpsecret: R0nKkvsY-oF41fuQvUXZ-kFG3_g_Ce0bpZt6mByx524
agentid: 1000009 agentid: 1000009
authUrl: https://wx.worfu.com/auth/oauth/wxLogin authUrl: https://wx.worfu.com/yifu-auth/method/oauth/wxLogin
\ No newline at end of file \ No newline at end of file
...@@ -29,4 +29,4 @@ spring: ...@@ -29,4 +29,4 @@ spring:
hcm: hcm:
appId: b2475bbd0a7ef3f3 appId: b2475bbd0a7ef3f3
appSecret: C800A676B2475BBD0A7EF3F3C4265582 appSecret: C800A676B2475BBD0A7EF3F3C4265582
appUrl: http://119.96.166.49:28950/api/v1/instance/business/list?startTime={startTime}&endTime={endTime} appUrl: https://hcm.yfzxtech.com/api/v1/instance/business/list?startTime={startTime}&endTime={endTime}
\ No newline at end of file \ No newline at end of file
...@@ -27,6 +27,10 @@ spring: ...@@ -27,6 +27,10 @@ spring:
auto-commit: true #此属性控制从池返回的连接的默认自动提交行为,默认值:true auto-commit: true #此属性控制从池返回的连接的默认自动提交行为,默认值:true
max-lifetime: 0 #此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认1800000即30分钟 max-lifetime: 0 #此属性控制池中连接的最长生命周期,值0表示无限生命周期,默认1800000即30分钟
wx:
corpid: wwbcb090af0dfe50e5
corpsecret: R0nKkvsY-oF41fuQvUXZ-kFG3_g_Ce0bpZt6mByx524
agentid: 1000009
authUrl: https://wx.worfu.com/yifu-auth/method/oauth/wxLogin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment