diff --git a/apps/api/src/wechat-auth.ts b/apps/api/src/wechat-auth.ts index f5adb8a..8c59d71 100644 --- a/apps/api/src/wechat-auth.ts +++ b/apps/api/src/wechat-auth.ts @@ -28,13 +28,22 @@ export class WechatAuthService { js_code: code, grant_type: "authorization_code", }); - const response = await fetch( - `https://api.weixin.qq.com/sns/jscode2session?${query.toString()}`, - ); - if (!response.ok) throw new ServiceUnavailableException("微信登录服务暂时不可用"); + let response: Response; + try { + response = await fetch(`https://api.weixin.qq.com/sns/jscode2session?${query.toString()}`); + } catch (error) { + console.error("wechat session request failed", error instanceof Error ? error.message : error); + throw new ServiceUnavailableException("微信登录服务暂时不可用"); + } + if (!response.ok) { + console.error("wechat session http error", response.status); + throw new ServiceUnavailableException("微信登录服务暂时不可用"); + } const result = (await response.json()) as WechatSessionResponse; - if (!result.openid || !result.session_key) + if (!result.openid || !result.session_key) { + console.warn("wechat session rejected", { errcode: result.errcode, errmsg: result.errmsg }); throw new UnauthorizedException(result.errmsg ?? "微信登录失败"); + } return { openid: result.openid, sessionKey: result.session_key, diff --git a/apps/miniapp/pages/booking/index.js b/apps/miniapp/pages/booking/index.js index 94ec4b7..17543ef 100644 --- a/apps/miniapp/pages/booking/index.js +++ b/apps/miniapp/pages/booking/index.js @@ -1,2 +1,2 @@ const API=getApp().globalData.apiBaseUrl; -Page({data:{service:{},form:{},serviceId:'',quantity:1,submitting:false},onLoad(q){wx.request({url:API+'/public/services',success:r=>{const service=r.data.find(x=>x.id===q.serviceId)||r.data.find(x=>x.priceAmount!==null)||{};this.setData({service,serviceId:service.id||''})}})},input(e){this.setData({['form.'+e.currentTarget.dataset.key]:e.detail.value})},increase(){if(this.data.quantity<50)this.setData({quantity:this.data.quantity+1})},decrease(){if(this.data.quantity>1)this.setData({quantity:this.data.quantity-1})},submit(){const f=this.data.form;if(!this.data.serviceId){wx.showToast({title:'请先选择服务',icon:'none'});return}if(!f.customerName||!f.wechatId){wx.showToast({title:'请填写称呼和联系方式',icon:'none'});return}this.setData({submitting:true});const send=token=>wx.request({url:API+'/customer/bookings',method:'POST',header:{Authorization:'Bearer '+token},data:{requestType:'package',customerName:f.customerName,wechatId:f.wechatId,contactPreference:'wechat',requestedTime:f.requestedTime,note:f.note,items:[{serviceId:this.data.serviceId,quantity:this.data.quantity}]},success:r=>{this.setData({submitting:false});if(r.statusCode<300){wx.showToast({title:'预约已提交'});setTimeout(()=>wx.navigateTo({url:'/pages/bookings/index'}),500)}else wx.showToast({title:'提交失败',icon:'none'})},fail:()=>this.setData({submitting:false})});const existing=wx.getStorageSync('customerToken');if(existing){send(existing);return}wx.login({success:l=>wx.request({url:API+'/customer/session/wechat',method:'POST',data:{code:l.code},success:r=>{wx.setStorageSync('customerToken',r.data.token);send(r.data.token)},fail:()=>{this.setData({submitting:false});wx.showToast({title:'登录失败',icon:'none'})}})})}}); +Page({data:{service:{},form:{},serviceId:'',quantity:1,submitting:false},onLoad(q){wx.request({url:API+'/public/services',success:r=>{const service=r.data.find(x=>x.id===q.serviceId)||r.data.find(x=>x.priceAmount!==null)||{};this.setData({service,serviceId:service.id||''})}})},input(e){this.setData({['form.'+e.currentTarget.dataset.key]:e.detail.value})},increase(){if(this.data.quantity<50)this.setData({quantity:this.data.quantity+1})},decrease(){if(this.data.quantity>1)this.setData({quantity:this.data.quantity-1})},submit(){const f=this.data.form;if(!this.data.serviceId){wx.showToast({title:'请先选择服务',icon:'none'});return}if(!f.customerName||!f.wechatId){wx.showToast({title:'请填写称呼和联系方式',icon:'none'});return}this.setData({submitting:true});const send=token=>wx.request({url:API+'/customer/bookings',method:'POST',header:{Authorization:'Bearer '+token},data:{requestType:'package',customerName:f.customerName,wechatId:f.wechatId,contactPreference:'wechat',requestedTime:f.requestedTime,note:f.note,items:[{serviceId:this.data.serviceId,quantity:this.data.quantity}]},success:r=>{this.setData({submitting:false});if(r.statusCode<300){wx.showToast({title:'预约已提交'});setTimeout(()=>wx.navigateTo({url:'/pages/bookings/index'}),500)}else wx.showToast({title:(r.data&&r.data.error&&r.data.error.message)||'提交失败',icon:'none'})},fail:e=>{this.setData({submitting:false});wx.showToast({title:e.errMsg||'网络请求失败',icon:'none'})}});const existing=wx.getStorageSync('customerToken');if(existing){send(existing);return}wx.login({success:l=>wx.request({url:API+'/customer/session/wechat',method:'POST',data:{code:l.code},success:r=>{if(r.statusCode<300){wx.setStorageSync('customerToken',r.data.token);send(r.data.token)}else{this.setData({submitting:false});wx.showToast({title:(r.data&&r.data.error&&r.data.error.message)||'微信登录失败',icon:'none'})}},fail:e=>{this.setData({submitting:false});wx.showToast({title:e.errMsg||'微信登录请求失败',icon:'none'})}}),fail:e=>{this.setData({submitting:false});wx.showToast({title:e.errMsg||'微信登录失败',icon:'none'})}})}});