Skip to content

Y
yysh5
Commit 2a9d64aa authored by 何娜's avatar 何娜
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 0185df87 9292c5cf
Pipeline #28075 failed with stage
    in 24 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 4 additions and 4 deletions
    app/controller/task.js
    View file @ 2a9d64aa
    ...@@ -93,12 +93,12 @@ class TaskController extends Controller { ...@@ -93,12 +93,12 @@ class TaskController extends Controller {
    const status = order.status; const status = order.status;
    ctx.app.wsMap.set(String(taskId) + orderId, { ws, addTime: new Date().getTime() }); ctx.app.wsMap.set(String(taskId) + orderId, { ws, addTime: new Date().getTime() });
    ctx.app.orderIdMap.set(String(taskId) + orderId, { ctx.app.orderIdMap.set(String(taskId) + orderId, {
    appkey,
    netMark,
    orderSn: orderId, orderSn: orderId,
    addTime: new Date().getTime(), addTime: new Date().getTime(),
    type: 'ws', type: 'ws',
    state: 'open', state: 'open',
    appkey,
    netMark,
    }); });
    try { try {
    ws.send('ok'); ws.send('ok');
    ...@@ -136,12 +136,12 @@ class TaskController extends Controller { ...@@ -136,12 +136,12 @@ class TaskController extends Controller {
    } else { } else {
    ctx.app.wsMap.set(String(taskId) + orderId, { ws, addTime: new Date().getTime() }); ctx.app.wsMap.set(String(taskId) + orderId, { ws, addTime: new Date().getTime() });
    ctx.app.orderIdMap.set(String(taskId) + orderId, { ctx.app.orderIdMap.set(String(taskId) + orderId, {
    appkey,
    netMark,
    orderSn: orderId, orderSn: orderId,
    addTime: new Date().getTime(), addTime: new Date().getTime(),
    type: 'ws', type: 'ws',
    state: 'open', state: 'open',
    appkey,
    netMark,
    }); });
    try { try {
    ws.send('ok'); ws.send('ok');
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment