diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-open-bridge/config.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-open-bridge/config.json new file mode 100644 index 0000000000000000000000000000000000000000..b17a375b5b75b79b3d6f8f5ee28f11db904c4028 --- /dev/null +++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-open-bridge/config.json @@ -0,0 +1,12 @@ +{ + "schedule": { + "__UNI__xxxxxx": { + "enable": true, + "h5-weixin": { + "enable": false, + "tasks": ["ticket"] + } + } + }, + "ipWhitelist": ["0.0.0.0"] +} \ No newline at end of file diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js index b8fe878feae912c83169be2c4b4f6b0b8bd00d42..f187b10e6abd3bb284753c99c25434c1e8d5f93e 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js @@ -488,6 +488,8 @@ module.exports = { /** * 获取微信公众号config参数 * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-h5-weixin-config + * @param {object} params + * @param {string} params.url 当前页面url不带hash部分 * @returns */ getH5WeixinConfig diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/get-h5-weixin-config.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/get-h5-weixin-config.js index 91121436bbda5506dc4f988c32a41362d4253acc..77ab369cc2b55764ae42fcfb4386f235ff86d11a 100644 --- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/get-h5-weixin-config.js +++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/utils/get-h5-weixin-config.js @@ -11,6 +11,8 @@ const { /** * 获取微信公众号config参数 * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-h5-weixin-config + * @param {object} params + * @param {string} params.url 当前页面url不带hash部分 * @returns */ module.exports = async function (params) { @@ -28,8 +30,8 @@ module.exports = async function (params) { appId } = this.getClientInfo() const weixinPlatform = getWeixinPlatform.call(this) - const getTicketRes = await this.getTicket.getTicket({ - appId, + const getTicketRes = await this.uniOpenBridge.getTicket({ + dcloudAppid: appId, platform: weixinPlatform + '-weixin' }) if (!getTicketRes) { diff --git a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/common/uni-open-bridge-common/config.js b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/common/uni-open-bridge-common/config.js index f8366f3e5476a85c42886a31f1f45d50e536d155..0e931139ffe416b341faaa22df6fe24636f23e17 100644 --- a/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/common/uni-open-bridge-common/config.js +++ b/uni_modules/uni-open-bridge/uniCloud/cloudfunctions/common/uni-open-bridge-common/config.js @@ -3,8 +3,8 @@ const configCenter = require('uni-config-center') const OauthConfig = { - 'mp-weixin': ['oauth', 'weixin'], - 'h5-weixin': ['oauth', 'weixin'] + 'mp-weixin': ['mp-weixin', 'oauth', 'weixin'], + 'h5-weixin': ['web', 'oauth', 'h5-weixin'] } class ConfigBase { @@ -28,12 +28,7 @@ class ConfigBase { return (item.dcloudAppid === appid) }) } - - if (this._uniId.dcloudAppid === appid) { - return this._uniId - } - - return null + return this._uniId } get ready() { @@ -73,13 +68,8 @@ class AppConfig extends ConfigBase { } getOauthConfig(appConfig, platformName) { - const platformConfig = appConfig[platformName] - if (!platformConfig) { - return null - } - let tree = OauthConfig[platformName] - let node = platformConfig + let node = appConfig for (let i = 0; i < tree.length; i++) { let nodeName = tree[i] if (node[nodeName]) {