Merge branch 'dev' into release
This commit is contained in:
commit
eb1e346988
@ -20,7 +20,7 @@ export class CrossEmailPull extends Scheduler {
|
|||||||
async start() {
|
async start() {
|
||||||
/**同步跨服邮件*/
|
/**同步跨服邮件*/
|
||||||
G.clientCross.callApi("email/GetCrossEmail", {server_id: G.config.serverId + ""}).then((res) => {
|
G.clientCross.callApi("email/GetCrossEmail", {server_id: G.config.serverId + ""}).then((res) => {
|
||||||
if(!res.isSucc)return;
|
if (!res.isSucc) return;
|
||||||
res.res.emails.forEach(async (email) => {
|
res.res.emails.forEach(async (email) => {
|
||||||
if (email.uid != "system") {
|
if (email.uid != "system") {
|
||||||
await EmailFun.addEmail(email)
|
await EmailFun.addEmail(email)
|
||||||
@ -29,6 +29,9 @@ export class CrossEmailPull extends Scheduler {
|
|||||||
}
|
}
|
||||||
await EmailFun.addEmail(email)
|
await EmailFun.addEmail(email)
|
||||||
})
|
})
|
||||||
|
if (res.res.emails.length > 0) {
|
||||||
|
G.clientCross.callApi("email/DelCrossEmail", {eids: res.res.emails.map(e => e._id)})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
await this.ctorStartTime()
|
await this.ctorStartTime()
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user