Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mpwechatApp/src/main/resources/application-pgprod.properties

UI/src/utils/config.js

@@ -4,12 +4,12 @@ const APIV3 = 'http://192.168.50.32:8004'
 const APIV4 = 'http://192.168.50.32:8005'
 
 const APIV3Auth = 'http://192.168.50.32:13001/oauth2'
-// const WXAPIV5= 'http://192.168.50.32:13001/qiyewechat'
+const WXAPIV5= 'http://192.168.50.32:13001/qiyewechat'
 const WXMpAPI= 'http://192.168.50.32:13001/mpwechat'
 const staticMpAPI = 'http://192.168.50.32:13001/mpwechat'
 
 // const APIV3Auth = 'http://192.168.50.32:8031'
-const WXAPIV5= 'http://localhost:7000'
+// const WXAPIV5= 'http://localhost:7000'
 // const WXMpAPI= 'http://localhost:8081'
 module.exports =  {
   name: '亮健营销平台',

mpwechatApp/src/main/resources/application-pgprod.properties

@@ -69,7 +69,7 @@ spring.ue.datasource.driver-class-name= org.postgresql.Driver
 spring.ue.datasource.url= jdbc:postgresql://localhost:5433/qiyewechat
 spring.ue.datasource.username= dbuser
 spring.ue.datasource.password= postgres#lj360.com@2019@#
-    
+
 # quartz
 spring.quartz.properties.org.quartz.scheduler.instanceName = clusteredScheduler
 spring.quartz.properties.org.quartz.scheduler.instanceId = AUTO