Merge branch 'dev_test_wx_token' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

 Conflicts:

	epmet-gateway/src/main/resources/bootstrap.yml

epmet-gateway/src/main/resources/bootstrap.yml

@@ -471,6 +471,7 @@ epmet:
   # 内部认证url白名单(在白名单中的，就不会再校验登录了)
   internalAuthUrlsWhiteList:
     - /epmetuser/customerstaff/customerlist
+    - /auth/wechat/**
     - /**/druid/**
     - /gov/project/project/platformcallback
     - /oper/customize/customerstartpage/homestartpage