diff --git a/laf-cloud/functions/passCheck.ts b/laf-cloud/functions/passCheck.ts index 5b49bc3..38ee5dc 100644 --- a/laf-cloud/functions/passCheck.ts +++ b/laf-cloud/functions/passCheck.ts @@ -12,10 +12,10 @@ export default async function (ctx: FunctionContext) { return { code: 0, data: null, msg: "未获取到uid" }; } let dbname = "users"; - const gameName = ctx.body.gameName; - if (gameName == "iaa") { - dbname = "usersAd"; - } + // const gameName = ctx.body.gameName; + // if (gameName == "iaa") { + // dbname = "usersAd"; + // } let res = await db.collection(dbname).where({ _id: uid }).getOne(); const token1 = ctx.body.token; if (res.data && res.data.token) { @@ -34,13 +34,13 @@ export default async function (ctx: FunctionContext) { return { code: 1, data: { passCheck: passCheck }, msg: "用户数据更新成功" } case 'read': let passCheck1 = legacyPassView(res.data?.passCheck || null, res.data?.passCheckUpgrade); - let time = await db.collection("idcount").where({ _id: "69fac1528463a95668c5e5db" }).getOne(); + let time = await db.collection("idcount").where({ _id: process.env.PASSCHECKTIME_ID }).getOne(); let t = time.data.passcheckTime; if (Date.now() > t + 30 * 24 * 3600000) { const endOfDay: any = new Date(); endOfDay.setHours(16, 0, 0, 0); // 设置为明天的0点,等同于今天的24点 t = endOfDay.getTime(); - await db.collection("idcount").where({ _id: "69fac1528463a95668c5e5db" }).update({ passcheckTime: t }); + await db.collection("idcount").where({ _id: process.env.PASSCHECKTIME_ID }).update({ passcheckTime: t }); } return { code: 1, data: { passCheck: passCheck1, time: t }, msg: "成功" } default: diff --git a/laf-cloud/functions/wx/iosgetPayInfo.ts b/laf-cloud/functions/wx/iosgetPayInfo.ts index 45065d4..5cfab3c 100644 --- a/laf-cloud/functions/wx/iosgetPayInfo.ts +++ b/laf-cloud/functions/wx/iosgetPayInfo.ts @@ -5,8 +5,8 @@ import { isUpgradeOrder } from '@/passCheckUpgrade'; import crypto from 'crypto'; import * as JungleConfigModule from "@/jungleConfig"; const JungleConfig: any = JungleConfigModule as any; -const mchid = "1719895437";//商户id -const serialNo = "2A97ED6ED441E55600EBC8830B9EC889ED41496E";//证书序列号 +const mchid = process.env.WX_MCH_ID;//商户id +const serialNo = process.env.WX_MCH_CERT_SERIAL_NO;//证书序列号 const db = cloud.database(); const ThinkingData = require('thinkingdata-node'); export default async function (ctx: FunctionContext) { @@ -119,7 +119,7 @@ const getClientIp = (req) => { }; /**获取订单*/ async function getOrder(outTradeNo) { - const url = `https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/${outTradeNo}?mchid=1719895437`; + const url = `https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/${outTradeNo}?mchid=${mchid}`; const nonceStr = crypto.randomBytes(16).toString('hex'); const timestamp = Math.floor(Date.now() / 1000).toString(); let au = await sign(outTradeNo, nonceStr, timestamp); @@ -139,13 +139,13 @@ async function getOrder(outTradeNo) { } } async function sign(outTradeNo, nonceStr, timestamp) { - const data = `GET\n/v3/pay/transactions/out-trade-no/${outTradeNo}?mchid=1719895437\n${timestamp}\n${nonceStr}\n\n` + const data = `GET\n/v3/pay/transactions/out-trade-no/${outTradeNo}?mchid=${mchid}\n${timestamp}\n${nonceStr}\n\n` // 创建签名对象 const sign = crypto.createSign('RSA-SHA256'); // 更新签名内容 sign.update(data); // 获取存储桶 - const bucket = cloud.storage.bucket('j3k323ol-colorblock-oss'); + const bucket = cloud.storage.bucket(process.env.WX_PAY_PRIVATE_KEY_BUCKET); // 获取文件列表 const res = await bucket.readFile('apiclient_key.pem'); const privateKeyPem = await res.Body.transformToString();