|
@@ -153,7 +153,8 @@ function getWechatPay(): any | null {
|
|
|
return null;
|
|
return null;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- const appId = process.env.WECHAT_APP_ID;
|
|
|
|
|
|
|
+ // JSAPI支付必须使用公众号appId,不能用小程序appId
|
|
|
|
|
+ const appId = process.env.WECHAT_PUBLIC_APP_ID || process.env.WECHAT_APP_ID;
|
|
|
const mchId = process.env.WECHAT_MCH_ID;
|
|
const mchId = process.env.WECHAT_MCH_ID;
|
|
|
const serialNo = process.env.WECHAT_SERIAL_NO;
|
|
const serialNo = process.env.WECHAT_SERIAL_NO;
|
|
|
const apiv3Key = process.env.WECHAT_APIV3_KEY;
|
|
const apiv3Key = process.env.WECHAT_APIV3_KEY;
|
|
@@ -807,7 +808,8 @@ function httpsGet(url: string): Promise<any> {
|
|
|
// 获取微信公众号 access_token(带缓存)
|
|
// 获取微信公众号 access_token(带缓存)
|
|
|
// 通过 OAuth code 获取用户 openid
|
|
// 通过 OAuth code 获取用户 openid
|
|
|
export async function getWechatOpenid(code: string): Promise<string | null> {
|
|
export async function getWechatOpenid(code: string): Promise<string | null> {
|
|
|
- const appId = process.env.WECHAT_APP_ID;
|
|
|
|
|
|
|
+ // OAuth获取openid必须使用公众号appId
|
|
|
|
|
+ const appId = process.env.WECHAT_PUBLIC_APP_ID || process.env.WECHAT_APP_ID;
|
|
|
const appSecret = process.env.WECHAT_APP_SECRET;
|
|
const appSecret = process.env.WECHAT_APP_SECRET;
|
|
|
|
|
|
|
|
if (!appId || !appSecret) {
|
|
if (!appId || !appSecret) {
|