From aad95000a8d83ba4ea67ddb439514b7b1b404a3d Mon Sep 17 00:00:00 2001 From: Dawn1Ocean <1785590531@qq.com> Date: Fri, 29 Mar 2024 21:33:30 +0800 Subject: [PATCH] add ping service --- mock/api.ts | 6 ++++++ src/app.ts | 23 +++++++++++------------ src/service/addToOreo.ts | 2 +- src/service/changeDutyCount.ts | 2 +- src/service/changeStatus.ts | 2 +- src/service/currentTicket.ts | 2 +- src/service/memberLogin.ts | 6 +++--- src/service/pickTicket.ts | 2 +- src/service/pingAte.ts | 18 ++++++++++++++++++ src/service/report.ts | 2 +- src/service/retrieve.ts | 2 +- src/service/submitComment.ts | 2 +- src/service/submitTicket.ts | 2 +- src/service/userData.ts | 2 +- 14 files changed, 48 insertions(+), 25 deletions(-) create mode 100644 src/service/pingAte.ts diff --git a/mock/api.ts b/mock/api.ts index 1c6a26e..012cbd0 100644 --- a/mock/api.ts +++ b/mock/api.ts @@ -5,6 +5,12 @@ import ticketsList from './ticketsList.json'; import ticketsSearch from './ticketSearch.json'; export default { + 'GET /ping': { + success: true, + data: { + msg: 'pong', + }, + }, 'GET /duty/info': { success: true, data: { diff --git a/src/app.ts b/src/app.ts index 008065c..b63d2ed 100644 --- a/src/app.ts +++ b/src/app.ts @@ -6,22 +6,21 @@ import { checkLogin, checkToken } from './service/checkLogin'; import wechatUser from './wechat'; import { loginAte } from './service/login'; import { getInfo } from './service/getInfo'; +import { pingAte } from './service/pingAte'; function App({ children }: PropsWithChildren) { useLaunch(() => { console.log('App launched.'); - // if (checkLogin()) { - // wechatUser.setToken(checkToken()); - // if(getMemberInfo()); - // } else { - // loginAte(); - // } - checkLogin((success) => { - if (success) { - wechatUser.setToken(checkToken()); - getInfo(); - } else { - loginAte(); + pingAte((res) => { + if (res) { + checkLogin((success) => { + if (success) { + wechatUser.setToken(checkToken()); + getInfo(); + } else { + loginAte(); + } + }); } }); }); diff --git a/src/service/addToOreo.ts b/src/service/addToOreo.ts index a94ad53..fc26962 100644 --- a/src/service/addToOreo.ts +++ b/src/service/addToOreo.ts @@ -32,7 +32,7 @@ export function addToOreo(that: TicketDetail) { isOreoLoading: false, }); Taro.atMessage({ - message: pt.get().button.submitText.error + err.errMsg.toString(), + message: pt.get().button.submitText.error + err.errMsg, type: 'error', }); }); diff --git a/src/service/changeDutyCount.ts b/src/service/changeDutyCount.ts index 542492e..276d069 100644 --- a/src/service/changeDutyCount.ts +++ b/src/service/changeDutyCount.ts @@ -39,7 +39,7 @@ export function changeDutyCnt(that: MainPage) { isLoading: false, }); Taro.atMessage({ - message: pt.get().button.submitText.error + err.errMsg.toString(), + message: pt.get().button.submitText.error + err.errMsg, type: 'error', }); }); diff --git a/src/service/changeStatus.ts b/src/service/changeStatus.ts index e7df0b3..a1096d4 100644 --- a/src/service/changeStatus.ts +++ b/src/service/changeStatus.ts @@ -40,7 +40,7 @@ export function changeStatus(that: TicketDetail, status: number) { isStatusLoading: false, }); Taro.atMessage({ - message: pt.get().button.submitText.error + err.errMsg.toString(), + message: pt.get().button.submitText.error + err.errMsg, type: 'error', }); }); diff --git a/src/service/currentTicket.ts b/src/service/currentTicket.ts index cf5b124..49fb630 100644 --- a/src/service/currentTicket.ts +++ b/src/service/currentTicket.ts @@ -36,7 +36,7 @@ export function getCurrentTicket(that: RepairPage) { .catch((err) => { console.log(err); Taro.atMessage({ - message: pt.get().button.submitText.error + err.errMsg.toString(), + message: pt.get().button.submitText.error + err.errMsg, type: 'error', }); }); diff --git a/src/service/memberLogin.ts b/src/service/memberLogin.ts index 0b8cb6a..6b0e4e4 100644 --- a/src/service/memberLogin.ts +++ b/src/service/memberLogin.ts @@ -47,7 +47,7 @@ export function memberLogin(that: UserMemberPage) { isLoading: false, }); Taro.atMessage({ - message: pt.get().button.loginText.error + err.errMsg.toString(), + message: pt.get().button.loginText.error + err.errMsg, type: 'error', }); }); @@ -57,7 +57,7 @@ export function memberLogin(that: UserMemberPage) { isLoading: false, }); Taro.atMessage({ - message: pt.get().button.loginText.error + err.errMsg.toString(), + message: pt.get().button.loginText.error + err.errMsg, type: 'error', }); }, @@ -95,7 +95,7 @@ export function memberLogout(that: UserMemberPage) { isLoading: false, }); Taro.atMessage({ - message: pt.get().button.logoutText.error + err.errMsg.toString(), + message: pt.get().button.logoutText.error + err.errMsg, type: 'error', }); }); diff --git a/src/service/pickTicket.ts b/src/service/pickTicket.ts index 4b12455..5b70219 100644 --- a/src/service/pickTicket.ts +++ b/src/service/pickTicket.ts @@ -39,7 +39,7 @@ export function pickTicket(that: TicketDetail) { isPickLoading: false, }); Taro.atMessage({ - message: pt.get().button.submitText.error + err.errMsg.toString(), + message: pt.get().button.submitText.error + err.errMsg, type: 'error', }); }); diff --git a/src/service/pingAte.ts b/src/service/pingAte.ts new file mode 100644 index 0000000..7b8f429 --- /dev/null +++ b/src/service/pingAte.ts @@ -0,0 +1,18 @@ +import Taro from '@tarojs/taro'; +import { getUrl } from '.'; + +export function pingAte(callback: (success: boolean) => void) { + Taro.request({ + url: getUrl('/ping'), + method: 'GET', + data: {}, + }) + .then((res) => { + console.log(res.data); + callback(true); + }) + .catch((err) => { + console.log(err.errMsg); + callback(false); + }); +} diff --git a/src/service/report.ts b/src/service/report.ts index 5ba6b82..7668997 100644 --- a/src/service/report.ts +++ b/src/service/report.ts @@ -32,7 +32,7 @@ export function reportMessage(that: ReportPage) { isLoading: false, }); Taro.atMessage({ - message: pt.get().button.submitText.error + err.errMsg.toString(), + message: pt.get().button.submitText.error + err.errMsg, type: 'error', }); }); diff --git a/src/service/retrieve.ts b/src/service/retrieve.ts index da1cdb8..9edd6eb 100644 --- a/src/service/retrieve.ts +++ b/src/service/retrieve.ts @@ -39,7 +39,7 @@ export function retrieve(that: TicketDetail) { isRetrieveLoading: false, }); Taro.atMessage({ - message: pt.get().button.submitText.error + err.errMsg.toString(), + message: pt.get().button.submitText.error + err.errMsg, type: 'error', }); }); diff --git a/src/service/submitComment.ts b/src/service/submitComment.ts index 814e6cf..cc5f9d7 100644 --- a/src/service/submitComment.ts +++ b/src/service/submitComment.ts @@ -39,7 +39,7 @@ export function submitComment(that: TicketDetail) { isCommentLoading: false, }); Taro.atMessage({ - message: pt.get().button.submitText.error + err.errMsg.toString(), + message: pt.get().button.submitText.error + err.errMsg, type: 'error', }); }); diff --git a/src/service/submitTicket.ts b/src/service/submitTicket.ts index 934120e..7cbbbb8 100644 --- a/src/service/submitTicket.ts +++ b/src/service/submitTicket.ts @@ -87,7 +87,7 @@ export function submitTicket(that: RepairPage) { isLoading: false, }); Taro.atMessage({ - message: pt.get().button.submitText.error + err.errMsg.toString(), + message: pt.get().button.submitText.error + err.errMsg, type: 'error', }); }); diff --git a/src/service/userData.ts b/src/service/userData.ts index f814879..4c52b68 100644 --- a/src/service/userData.ts +++ b/src/service/userData.ts @@ -33,7 +33,7 @@ export function updateUserInfo(that: InformPage) { isLoading: false, }); Taro.atMessage({ - message: pt.get().button.submitText.error + err.errMsg.toString(), + message: pt.get().button.submitText.error + err.errMsg, type: 'error', }); });