update

controllers/cache.js

+const jwt = require('jsonwebtoken');
+const config = require('config');
+const hash = require('utils/hash');
+
+const OpenAccount = require('db/mongo/open/account');
+const _ = require('lodash');
+const NodeCache = require('node-cache');
+const mongoose = require('mongoose');
+const {
+    ObjectId
+} =  require('mongoose').Types;
+
+const rmkCache = new NodeCache();
+
+exports.openAccountCache = async(openAccount) => {
+  let temp = openAccount + '';
+  if(rmkCache.get(temp)) return rmkCache.get(temp);
+  else {
+      let obj = await OpenAccount.findById(temp);
+      let info = (obj ? obj.toJSON() : null);
+      rmkCache.set(temp, obj);
+      return obj;
+  }
+}
\ No newline at end of file

controllers/calltask.js

@@ -9,6 +9,7 @@ const clueContrl = require('./clue');
 const groupContrl = require('./group');
 const Clue = require('db/mongo/open/clue');
 const CallTask = require('db/mongo/open/calltask');
+const cache = require('./cache');
 //const callTaskContrl = require('./callTask');
 const HOST = config.HOST;
 const STAMP = 1000 * 60;
@@ -34,17 +35,34 @@ async function unbindWhenCall( phone ) {
             },
             json: true
         });
-        console.dir(rep);
-        console.log('****************************')
+
         console.log(rep)
-        await CallTask.updateOne({ _id }, { $set: {
+        if((rep && rep.status === 'ok') || rep.msg === 'already unbinded') {
+            let callTaskObj = await CallTask.findOneAndUpdate({ _id }, { $set: {
                 updateTime: Date.now(),
                 duration: 0,
                 url: null,
                 result: 'OTHER',
                 minutes: 0,
-            whencall: true
-        }})
+                trigger: 'beforecall',
+                status: 2
+            }}, { new: true }) 
+
+            console.dir(`准备回调`);
+            let account = await cache.openAccountCache(callTaskObj.account);
+            console.dir(account);
+            console.dir(`获取host`)
+            let host = account && account.calltaskNotityUrl ? account.calltaskNotityUrl : null;
+            console.dir(`host:${host}`);
+            if(host) {
+                await api({
+                    method: 'POST',
+                    url: host,
+                    body: callTaskObj,
+                    json: true
+                });
+            }
+        }
     }
     console.log('拨打前解绑结束：*******' )
     return;
@@ -69,15 +87,33 @@ async function unbind() {
         });
         console.log('auto unbinding job result')
         console.log(rep)
-        if((rep && rep.status === 'ok') || rep.msg === 'already unbinded')
-            await CallTask.updateOne({ _id }, { $set: {
+        if((rep && rep.status === 'ok') || rep.msg === 'already unbinded') {
+            let callTaskObj = await CallTask.findOneAndUpdate({ _id }, { $set: {
                 updateTime: Date.now(),
                 duration: 0,
                 url: null,
                 result: 'OTHER',
                 minutes: 0,
-                cron: true
-            }})
+                trigger: 'cron',
+                status: 2
+            }}, { new: true }) 
+
+            console.dir(`准备回调`);
+            let account = await cache.openAccountCache(callTaskObj.account);
+            console.dir(account);
+            console.dir(`获取host`)
+            let host = account && account.calltaskNotityUrl ? account.calltaskNotityUrl : null;
+            console.dir(`host:${host}`);
+            if(host) {
+                await api({
+                    method: 'POST',
+                    url: host,
+                    body: callTaskObj,
+                    json: true
+                });
+            }
+        }
+
     }
 }
 

controllers/clue.js

@@ -119,7 +119,7 @@ exports.list = async (ctx, next) => {
     ctx.body = {
         status: 'ok',
         result: {
-            clues:  (clues || []).map(clue => _.pick(clue, ['account', 'user', 'unikey', 'code', 'type', 'from', 'group', 'sex', 'age', 'city', 'province', 'virtualHost', 'lastCall', 'order', 'subOrder', 'lastCall', 'calledHistory', '_id'])),
+            clues:  (clues || []).map(clue => _.pick(clue, ['account', 'user',  'code', 'type', 'from', 'group', 'sex', 'age', 'city', 'province', 'virtualHost', 'lastCall', 'order', 'subOrder', 'lastCall', 'calledHistory', '_id'])),
             total,
             skip
         }

controllers/order.js

@@ -77,6 +77,31 @@ exports.list = async (ctx, next) => {
     }
 }
 
+
+exports.check = async(ctx, next) => {
+    let {
+        order                                                                                                                                                             
+    } = ctx.request.body;
+    ctx.assert(tools.valid(order), 500, '参数错误，user', {
+        code: 1
+    });
+    let orderObj = await Order.findById(order);
+    ctx.assert(orderObj , 500, '参数错误，order', {
+        code: 1
+    });
+    if(orderObj.status == '审核中') {
+        orderObj.status = '执行中';
+        orderObj.history = orderObj.history.concat([{
+                status: '执行中',
+                date: new Date()
+            }])
+        await orderObj.save();
+    }
+    ctx.body = {
+        status: 'ok'
+    }
+}
+
 exports.all = async (ctx, next) => {
     let {
         id=0,
@@ -132,6 +157,32 @@ exports.all = async (ctx, next) => {
     }
 }
 
+
+exports.check = async(ctx, next) => {
+    let {
+        order                                                                                                                                                             
+    } = ctx.request.body;
+   ctx.assert(tools.valid(order), 500, '参数错误，user', {
+        code: 1
+    });
+    let orderObj = await Order.findById(order);
+    ctx.assert(orderObj , 500, '参数错误，order', {
+        code: 1
+    });
+    if(orderObj.status == '审核中') {
+        orderObj.status = '执行中';
+        orderObj.history = orderObj.history.concat([{
+                status: '执行中',
+                date: new Date()
+            }])
+        await orderObj.save();
+    }
+    ctx.body = {
+        status: 'ok'
+    }
+}
+
+
 //创建订单
 exports.create = async (ctx, next) => {
     let {

db/mongo/open/calltask.js

@@ -75,6 +75,8 @@ const schema = mongoose.Schema({
         type: Number,
         required: false,
     },
+    trigger: String,
+    status: Number,                 // 回调标识 1 联通回调 2 脚本回调
     archive: {                      // 归档标识
         type: Boolean
     },

middleware/jwt.js

@@ -12,7 +12,9 @@ module.exports = (opt = {}) => {
             '/api/token/account',
             '/api/token',
             '/api/clue/input',
-            '/api/order/all'
+            '/api/order/check',
+            '/api/order/all',
+            '/api/order/check'
         ]
     });
 };
\ No newline at end of file

routes/api/order.js

@@ -5,5 +5,5 @@ const Auth = require('controllers/auth');
 router.post('/list', Auth.auth, $.list);
 router.post('/create', Auth.auth, $.create);
 router.post('/all',  $.all);
-
+router.post('/check', $.check);
 module.exports = router;
\ No newline at end of file

yarn.lock

@@ -7641,6 +7641,7 @@ no-case@^2.2.0:
 node-cache@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-4.2.0.tgz#48ac796a874e762582692004a376d26dfa875811"
+  integrity sha512-obRu6/f7S024ysheAjoYFEEBqqDWv4LOMNJEuO8vMeEw2AT4z+NCzO4hlc2lhI4vATzbCQv6kke9FVdx0RbCOw==
   dependencies:
     clone "2.x"
     lodash "4.x"