【优化】config 支持 directory

uni_modules/uni-pay/uniCloud/cloudfunctions/uni-pay-co/index.obj.js

@@ -94,6 +94,7 @@ module.exports = {
 			other, // 其他请求参数（会发送给第三方支付服务器）
 			clientInfo, // 兼容云对象调用云对象模式
 			cloudInfo, // 兼容云对象调用云对象模式
+			config_directory,
 		} = data;
 
 		if (!clientInfo) clientInfo = this.getClientInfo();
@@ -116,6 +117,7 @@ module.exports = {
 			other,
 			clientInfo,
 			cloudInfo,
+			config_directory,
 		});
 
 		return res;
@@ -212,6 +214,7 @@ module.exports = {
 			provider,
 			code,
 			clientInfo, // 兼容云对象调用云对象模式
+			config_directory,
 		} = data;
 
 		if (!clientInfo) clientInfo = this.getClientInfo();
@@ -219,7 +222,8 @@ module.exports = {
 		res = await service.pay.getOpenid({
 			provider,
 			code,
-			clientInfo
+			clientInfo,
+			config_directory,
 		});
 
 		return res;
@@ -238,10 +242,11 @@ module.exports = {
 	async getProviderAppId(data) {
 		let {
 			provider,
-			provider_pay_type
+			provider_pay_type,
+			config_directory,
 		} = data;
 		// 注意，前往不要直接把 conifg 内的所有内容返回给前端
-		let conifg = service.pay.getConfig();
+		let conifg = service.pay.getConfig(data);
 		try {
 			return {
 				errorCode: 0,

uni_modules/uni-pay/uniCloud/cloudfunctions/uni-pay-co/libs/common.js

@@ -289,5 +289,29 @@ common.camel2snakeJson = function(obj) {
 	return parseObjectKeys(obj, 'camel2snake');
 };
 
+// 2个对象合并
+function mergeObjects(obj1, obj2) {
+	// 创建一个新的对象来存储合并后的结果
+	const result = {};
+	// 复制obj1的所有属性到result
+	for (let key in obj1) {
+		if (typeof obj1[key] === 'object' && obj1[key] !== null) {
+			result[key] = mergeObjects({}, obj1[key]); // 递归合并
+		} else {
+			result[key] = obj1[key];
+		}
+	}
+	// 合并obj2的属性到result
+	for (let key in obj2) {
+		if (typeof obj2[key] === 'object' && obj2[key] !== null) {
+			result[key] = mergeObjects(result[key] || {}, obj2[key]); // 递归合并
+		} else {
+			result[key] = obj2[key];
+		}
+	}
+	return result;
+}
 
+common.mergeObjects = mergeObjects;
+	
 module.exports = common;

uni_modules/uni-pay/uniCloud/cloudfunctions/uni-pay-co/service/pay.js

@@ -29,8 +29,19 @@ class service {
 	/**
 	 * 获取支付插件的完整配置
 	 */
-	getConfig() {
-		return config;
+	getConfig(data = {}) {
+		let {
+			config_directory
+		} = data;
+		let realityConfig = {};
+		if (config_directory && config_directory !== "default") {
+			const directoryConfig = configCenter({ pluginId: 'uni-pay' }).requireFile(`${config_directory}/config.js`);
+			// 深度合并配置，参数名相同时，以directoryConfig为主
+			realityConfig = libs.common.mergeObjects(config, directoryConfig);
+		} else {
+			realityConfig = config;
+		}
+		return realityConfig;
 	}
 	/**
 	 * 支付成功 - 异步通知
@@ -43,12 +54,17 @@ class service {
 		} = data;
 		console.log('httpInfo: ', httpInfo);
 		let path = httpInfo.path;
-		let pay_type = path.substring(notifyPath.length);
+		let notifyPathSplit = path.substring(notifyPath.length).split("/");
+		
+		let pay_type = notifyPathSplit[0]; // 获取支付方式
 		let provider = pay_type.split("-")[0]; // 获取支付供应商
-		let provider_pay_type = pay_type.split("-")[1]; // 获取支付方式
+		let provider_pay_type = pay_type.split("-")[1]; // 获取支付供应商对应的支付类型
+		
+		let config_directory = notifyPathSplit[1]; // 获取使用的配置目录
+		
 		let original_data = libs.common.getNotifyData({ httpInfo, provider }); // 获取原始回调数据
 		// 初始化uniPayInstance
-		let uniPayInstance = await this.initUniPayInstance({ provider, provider_pay_type });
+		let uniPayInstance = await this.initUniPayInstance({ provider, provider_pay_type, config_directory });
 		let notifyType = await uniPayInstance.checkNotifyType(httpInfo);
 		if (notifyType !== "payment") {
 			// 由于支付宝部分退款会触发支付成功的回调，但同时签名验证是算未通过的，为了避免支付宝重复推送，这里可以直接返回成功告知支付宝服务器，不用再推送过来了。
@@ -156,6 +172,7 @@ class service {
 			qr_code, // 是否强制使用扫码支付
 			clientInfo, // 客户端信息
 			cloudInfo, // 云端信息
+			config_directory = "default", // 支付配置所在目录
 
 			custom, // 自定义参数（不会发送给第三方支付服务器）
 			other, // 其他请求参数（会发送给第三方支付服务器）
@@ -229,14 +246,14 @@ class service {
 		});
 		res.provider_pay_type = provider_pay_type;
 		// 拼接实际异步回调地址
-		let finalNotifyUrl = `${currentNotifyUrl}${notifyPath}${provider}-${provider_pay_type}`;
+		let finalNotifyUrl = `${currentNotifyUrl}${notifyPath}${provider}-${provider_pay_type}/${config_directory}`;
 
 		// 获取uniPay交易类型
 		let tradeType = libs.common.getTradeType({ provider, provider_pay_type });
 
-		let uniPayConifg = await this.getUniPayConfig({ provider, provider_pay_type });
+		let uniPayConifg = await this.getUniPayConfig({ provider, provider_pay_type, config_directory });
 		// 初始化uniPayInstance
-		let uniPayInstance = await this.initUniPayInstance({ provider, provider_pay_type });
+		let uniPayInstance = await this.initUniPayInstance({ provider, provider_pay_type, config_directory });
 
 		// 获取支付信息
 		let getOrderInfoParam = {
@@ -331,6 +348,7 @@ class service {
 			await dao.uniPayOrders.add({
 				provider,
 				provider_pay_type,
+				config_directory,
 				uni_platform: platform,
 				status: 0,
 				type,
@@ -365,6 +383,7 @@ class service {
 			await dao.uniPayOrders.updateById(payOrderInfo._id, {
 				provider,
 				provider_pay_type,
+				config_directory,
 			});
 		}
 		// 自动删除3天前的订单（未付款订单）
@@ -691,6 +710,7 @@ class service {
 			provider, // 支付供应商
 			code, // 用户登录获取的code
 			clientInfo, // 客户端环境
+			config_directory,
 		} = data;
 		if (!code) {
 			throw { errCode: ERROR[51002] };
@@ -702,7 +722,7 @@ class service {
 			platform,
 			ua
 		});
-		let uniPayConifg = await this.getUniPayConfig({ provider, provider_pay_type });
+		let uniPayConifg = await this.getUniPayConfig({ provider, provider_pay_type, config_directory });
 		if (provider === "wxpay") {
 			return await libs.wxpay.getOpenid({
 				config: uniPayConifg,
@@ -859,13 +879,15 @@ class service {
 
 	/**
 	 * 获取对应支付配置
-	 * let uniPayConifg = await this.getUniPayConfig({ provider, provider_pay_type });
+	 * let uniPayConifg = await this.getUniPayConfig({ provider, provider_pay_type, config_directory });
 	 */
 	async getUniPayConfig(data = {}) {
 		let {
 			provider,
 			provider_pay_type,
+			config_directory
 		} = data;
+		let config = this.getConfig(data);
 		if (config && config[provider] && config[provider][provider_pay_type]) {
 			let uniPayConfig = config[provider][provider_pay_type];
 			if (!uniPayConfig.appId && provider !== "appleiap") {
@@ -879,7 +901,7 @@ class service {
 
 	/**
 	 * 初始化uniPayInstance
-	 * let uniPayInstance = await service.pay.initUniPayInstance({ provider, provider_pay_type });
+	 * let uniPayInstance = await service.pay.initUniPayInstance({ provider, provider_pay_type, config_directory });
 	 */
 	async initUniPayInstance(data = {}) {
 		let {