gjjapi

app/controller/order.js

@@ -36,27 +36,27 @@ class OrderController extends Controller {
               token: 'string',
             },
           },
-        }
+        },
       },
-      cityId: 'string'
+      cityId: 'string',
     };
   }
 
-  //拉取数据接口
+  // 拉取数据接口
   async partnerShow() {
     const { ctx, service } = this;
     try {
       ctx.validate(this.showRule);
       const { appKey, orderSn } = ctx.request.body.params;
-      // await service.signature.signatureCheck(ctx.request.body);
-      let data = await service.cache.get({ key: orderSn });
+      await service.signature.signatureCheck(ctx.request.body);
+      const data = await service.cache.get({ key: orderSn });
       let result = { code: 2, msg: '任务还在执行或未输入', data: {} };
       if (data) {
         if (data.status === 'success') {
           const result = await service.storage.read(orderSn, appKey);
           ctx.body = {
             code: 0,
-            data: result
+            data: result,
           };
           return;
         } else if (data.note) {
@@ -68,14 +68,19 @@ class OrderController extends Controller {
     } catch (err) {
       ctx.logger.error('partnerShow', err);
       ctx.status = 200;
-      if (err.code == 'invalid_param') {
-        return ctx.body = { code: -1, msg: err.message || '' };
+      if (err.code === 'invalid_param') {
+        ctx.body = { code: -1, msg: '请求参数有误' };
+        return;
       }
-      return ctx.body = { code: err.code || -1, msg: err.message || '' };
+      if (/[a-zA-Z]+/.test(err.message)) {
+        ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
+        return;
+      }
+      ctx.body = { code: err.code || -1, msg: err.message || '' };
     }
   }
 
-  //创建订单号接口
+  // 创建订单号接口
   async fetchOrderId() {
     const { ctx, service } = this;
     try {
@@ -88,28 +93,30 @@ class OrderController extends Controller {
       await service.order.create({
         orderId,
         taskId,
-        cityId: cityId,
+        cityId,
         notifyUrl: ctx.app.notifyMap.get(appKey) && ctx.app.notifyMap.get(appKey).notifyUrl || '',
-        appKey: appKey,
+        appKey,
         status: 'init',
       });
       ctx.body = {
         code: 0,
         data: {
-          orderSn: orderId
+          orderSn: orderId,
         },
-        msg: ''
-      }
+        msg: '',
+      };
     } catch (err) {
       ctx.logger.error('fetchOrderId', err);
       ctx.status = 200;
-      if (err.code == 'invalid_param') {
-        return ctx.body = { code: -1, msg: err.message || '' };
+      if (err.code === 'invalid_param') {
+        ctx.body = { code: -1, msg: '请求参数有误' };
+        return;
       }
       if (/[a-zA-Z]+/.test(err.message)) {
-        return ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
+        ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
+        return;
       }
-      return ctx.body = { code: err.code || -1, msg: err.message || '' };
+      ctx.body = { code: err.code || -1, msg: err.message || '' };
     }
   }
 }

app/controller/script.js

@@ -4,7 +4,7 @@ const Controller = require('egg').Controller;
 
 class ScriptController extends Controller {
 
-  //获取城市配置
+  // 获取城市配置
   async fetchCityConfig() {
     const { ctx, service } = this;
     try {
@@ -15,7 +15,7 @@ class ScriptController extends Controller {
       ctx.logger.error('fetchOrderId', err);
       ctx.status = 200;
       if (err.code === 'invalid_param') {
-        ctx.body = { code: -1, msg: err.message || '' };
+        ctx.body = { code: -1, msg: '请求参数有误' };
         return;
       }
       if (/[a-zA-Z]+/.test(err.message)) {

app/controller/task.js

@@ -22,7 +22,7 @@ class TaskController extends Controller {
           phone: { type: 'string', format: /^1\d{10}$/, required: false, message: '手机号格式错误' },
           ID: { type: 'string', format: /^\d{14}(\d{3})?[\dXx]$/, required: false, message: '身份证格式错误' },
         },
-      }
+      },
     };
 
     this.fetchCaptureRule = {
@@ -51,7 +51,7 @@ class TaskController extends Controller {
     };
   }
 
-  //创建任务接口
+  // 创建任务接口
   async create() {
     const { ctx, service } = this;
     ctx.validate(this.createRule);
@@ -60,24 +60,25 @@ class TaskController extends Controller {
     ctx.success({ taskId });
   }
 
-  //提交任务接口
+  // 提交任务接口
   async submit() {
     const { ctx, service, config } = this;
     try {
       ctx.validate(this.submitRule);
       const { orderSn } = ctx.request.body;
-      let order = await service.cache.get({ key: orderSn });
-      if (order.status == 'success' || order.status == 'failure') {
-        return ctx.body = {
+      const order = await service.cache.get({ key: orderSn });
+      if (order.status === 'success' || order.status === 'failure') {
+        ctx.body = {
           code: -1,
-          msg: '此任务已结束'
-        }
+          msg: '此任务已结束',
+        };
+        return;
       }
       await service.cache.set({
         key: orderSn, value: {
           status: 'submit',
           note: { code: 3, msg: '任务已提交', data: { data: null, loginParam: null, cityId: order.cityId, orderSn } },
-        }
+        },
       });
       await service.task.submit({
         taskId: order.taskId,
@@ -89,34 +90,37 @@ class TaskController extends Controller {
         code: 0,
         data: {
           cityId: order.cityId,
-          orderSn
-        }
+          orderSn,
+        },
       };
     } catch (err) {
       ctx.logger.error('submit', err);
       ctx.status = 200;
-      if (err.code == 'invalid_param') {
-        return ctx.body = { code: -1, msg: err.message || '' };
+      if (err.code === 'invalid_param') {
+        ctx.body = { code: -1, msg: '请求参数有误' };
+        return;
       }
       if (/[a-zA-Z]+/.test(err.message)) {
-        return ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
+        ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
+        return;
       }
-      return ctx.body = { code: err.code || -1, msg: err.message || '' };
+      ctx.body = { code: err.code || -1, msg: err.message || '' };
     }
   }
 
-  //获取验证码接口
+  // 获取验证码接口
   async fetchCapture() {
     const { ctx, service } = this;
     try {
       ctx.validate(this.fetchCaptureRule);
       const { type, orderSn } = ctx.request.body;
       const order = await service.cache.get({ key: orderSn });
-      if (order.status == 'success' || order.status == 'failure') {
-        return ctx.body = {
+      if (order.status === 'success' || order.status === 'failure') {
+        ctx.body = {
           code: -1,
-          msg: '此任务已结束'
-        }
+          msg: '此任务已结束',
+        };
+        return;
       }
       const result = await service.task.fetchCapture({
         taskId: order.taskId,
@@ -125,22 +129,24 @@ class TaskController extends Controller {
       delete result.taskId;
       ctx.body = {
         code: 0,
-        data: { ...result, orderSn }
+        data: { ...result, orderSn },
       };
     } catch (err) {
       ctx.logger.error('submit', err);
       ctx.status = 200;
-      if (err.code == 'invalid_param') {
-        return ctx.body = { code: -1, msg: err.message || '' };
+      if (err.code === 'invalid_param') {
+        ctx.body = { code: -1, msg: '请求参数有误' };
+        return;
       }
       if (/[a-zA-Z]+/.test(err.message)) {
-        return ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
+        ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
+        return;
       }
-      return ctx.body = { code: err.code || -1, msg: err.message || '' };
+      ctx.body = { code: err.code || -1, msg: err.message || '' };
     }
   }
 
-  //任务回调接口
+  // 任务回调接口
   async handleCallback() {
     const { ctx, service } = this;
     const { taskId } = ctx.request.body;
@@ -149,7 +155,7 @@ class TaskController extends Controller {
     const order = await service.order.getOneByTaskId(taskId);
     if (!order) {
       ctx.logger.error('handleCallback', taskId, '未查询到此任务');
-      return
+      return;
     }
     const { orderId, appKey, cityId } = order;
     let taskNote = {
@@ -157,66 +163,66 @@ class TaskController extends Controller {
       note: { code: 2, msg: '任务正在执行', data: { data: null, loginParam: null, cityId, orderSn: orderId } },
     };
     switch (result.code) {
-      case -1:
-      case 106:
-      case 102:
-      case 204:
-        taskNote = {
-          status: 'failure',
-          note: { code: -1, msg: result.msg, data: { data: null, loginParam: null, cityId, orderSn: orderId } },
-        };
-        await service.cache.set({
-          key: orderId,
-          value: taskNote,
-        });
-        await service.partner.notice(order);
-        break;
-      case 1:
-        taskNote = {
-          status: 'next',
-          note: { code: 1, msg: null, data: { data: null, loginParam: result.loginParam, cityId, orderSn: orderId } },
-        };
+    case -1:
+    case 106:
+    case 102:
+    case 204:
+      taskNote = {
+        status: 'failure',
+        note: { code: -1, msg: result.msg, data: { data: null, loginParam: null, cityId, orderSn: orderId } },
+      };
+      await service.cache.set({
+        key: orderId,
+        value: taskNote,
+      });
+      await service.partner.notice(order);
+      break;
+    case 1:
+      taskNote = {
+        status: 'next',
+        note: { code: 1, msg: null, data: { data: null, loginParam: result.loginParam, cityId, orderSn: orderId } },
+      };
+      await service.cache.set({
+        key: orderId,
+        value: taskNote,
+      });
+      await service.partner.notice(order);
+      break;
+    case 110:
+      taskNote = {
+        status: 'query',
+        note: { code: 110, msg: '任务提交成功', data: { data: null, loginParam: null, cityId, orderSn: orderId } },
+      };
+      break;
+    case 0:
+      taskNote = {
+        status: 'success',
+        note: { code: 0, msg: '任务成功', data: { data: null, loginParam: null, cityId, orderSn: orderId } },
+      };
+      try {
+        const insertData = await service.washData.wash(result);
+        insertData.orderId = orderId;
+        insertData.cityName = await service.scripts.fetchScriptName(insertData.cid);
+        insertData.taskId = Number(taskId);
+        insertData.appKey = appKey;
+        delete insertData.code;
+        await service.storage.write(insertData);
         await service.cache.set({
           key: orderId,
           value: taskNote,
         });
         await service.partner.notice(order);
-        break;
-      case 110:
+      } catch (err) {
+        ctx.logger.error('handleCallback', err, JSON.stringify(result));
         taskNote = {
-          status: 'query',
-          note: { code: 110, msg: '任务提交成功', data: { data: null, loginParam: null, cityId, orderSn: orderId } },
-        };
-        break;
-      case 0:
-        taskNote = {
-          status: 'success',
-          note: { code: 0, msg: '任务成功', data: { data: null, loginParam: null, cityId, orderSn: orderId } },
+          status: 'failure',
+          note: { code: -1, msg: '系统错误', data: { data: null, loginParam: null, cityId: order.cityId, orderSn: order.orderId } },
         };
-        try {
-          const insertData = await service.washData.wash(result);
-          insertData.orderId = orderId;
-          insertData.cityName = await service.scripts.fetchScriptName(insertData.cid);
-          insertData.taskId = Number(taskId);
-          insertData.appKey = appKey;
-          delete insertData.code;
-          await service.storage.write(insertData);
-          await service.cache.set({
-            key: orderId,
-            value: taskNote,
-          });
-          await service.partner.notice(order);
-        } catch (err) {
-          ctx.logger.error('handleCallback', err, JSON.stringify(result));
-          taskNote = {
-            status: 'failure',
-            note: { code: -1, msg: '系统错误', data: { data: null, loginParam: null, cityId: order.cityId, orderSn: order.orderId } },
-          };
-        }
-        break;
-      default:
-        ctx.logger.warn('handleCallback', JSON.stringify(result));
-        break;
+      }
+      break;
+    default:
+      ctx.logger.warn('handleCallback', JSON.stringify(result));
+      break;
     }
   }
 

app/controller/token.js

@@ -17,24 +17,25 @@ class TokenController extends Controller {
     };
   }
 
-  //获取token
+  // 获取token
   async partnerCreate() {
     const { ctx, service } = this;
     try {
       ctx.validate(this.createRule);
       const token = await service.signature.createToken(ctx.request.body);
-      return ctx.body = {
+      ctx.body = {
         code: 0,
         data: { token },
-        msg: ''
-      }
+        msg: '',
+      };
     } catch (err) {
       ctx.logger.error('partnerCreate', err);
       ctx.status = 200;
-      if (err.code == 'invalid_param') {
-        return ctx.body = { code: -1, msg: err.message || '' };
+      if (err.code === 'invalid_param') {
+        ctx.body = { code: -1, msg: '请求参数有误' };
+        return;
       }
-      return ctx.body = { code: err.code || -1, msg: err.message || '' };
+      ctx.body = { code: err.code || -1, msg: err.message || '' };
     }
   }
 }

app/extend/application.js

@@ -42,8 +42,8 @@ class Cache {
     this.app.logger.info(`[cache] set (ms)${this.name}.${key}: ${value}`);
     return await this._set(key, value, ttl);
   }
-  async del(key){
-    return await this._del(key)
+  async del(key) {
+    return await this._del(key);
   }
 }
 
@@ -66,7 +66,7 @@ class NodeCacheWrap extends Cache {
       cache.set(key, value);
     }
   }
-  async _del(key){
+  async _del(key) {
     const { cache } = this;
     cache.del(key);
   }

app/middleware/errorHandler.js

@@ -3,7 +3,7 @@
 module.exports = (options, app) => {
   return async function errorHandler(ctx, next) {
     try {
-      if(ctx.request.method == 'POST'){
+      if (ctx.request.method === 'POST') {
         app.logger.info(JSON.stringify(ctx.request.body));
       }
       await next();

app/model/cusdata.js

 'use strict';
 
 module.exports = app => {
-    const { DataTypes } = app.Sequelize;
+  const { DataTypes } = app.Sequelize;
 
-    const cusDatas = app.model.define('cusDatas', {
-        id: {
-            type: DataTypes.INTEGER,
-            allowNull: false,
-            autoIncrement: true,
-            primaryKey: true,
-            field: 'id',
-        },
-        orderId: {
-            type: DataTypes.STRING(255),
-            allowNull: false,
-            defaultValue: '',
-            primaryKey: true,
-            field: 'orderId',
-        },
-        appKey: {
-            type: DataTypes.STRING(255),
-            allowNull: false,
-            field: 'appKey',
-        },
-        type: {
-            type: DataTypes.STRING(255),
-            allowNull: true,
-            defaultValue: '',
-            field: 'type',
-        },
-        date: {
-            type: DataTypes.DATE,
-            allowNull: true,
-            defaultValue: app.Sequelize.literal('CURRENT_TIMESTAMP'),
-            field: 'date',
-        },
-        text1: {
-            type: DataTypes.STRING(255),
-            allowNull: true,
-            defaultValue: '',
-            field: 'text1',
-        },
-        text2: {
-            type: DataTypes.STRING(255),
-            allowNull: true,
-            defaultValue: '',
-            field: 'text2',
-        },
-        text3: {
-            type: DataTypes.STRING(255),
-            allowNull: true,
-            defaultValue: '',
-            field: 'text3',
-        },
-        text4: {
-            type: DataTypes.STRING(255),
-            allowNull: true,
-            defaultValue: '',
-            field: 'text4',
-        },
-        date1: {
-            type: DataTypes.DATE,
-            allowNull: true,
-            field: 'date1',
-        },
-        date2: {
-            type: DataTypes.DATE,
-            allowNull: true,
-            field: 'date2',
-        },
+  const cusDatas = app.model.define('cusDatas', {
+    id: {
+      type: DataTypes.INTEGER,
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      field: 'id',
     },
-        {
-            tableName: 'cus_data',
-            timestamps: false,
-        });
+    orderId: {
+      type: DataTypes.STRING(255),
+      allowNull: false,
+      defaultValue: '',
+      primaryKey: true,
+      field: 'orderId',
+    },
+    appKey: {
+      type: DataTypes.STRING(255),
+      allowNull: false,
+      field: 'appKey',
+    },
+    type: {
+      type: DataTypes.STRING(255),
+      allowNull: true,
+      defaultValue: '',
+      field: 'type',
+    },
+    date: {
+      type: DataTypes.DATE,
+      allowNull: true,
+      defaultValue: app.Sequelize.literal('CURRENT_TIMESTAMP'),
+      field: 'date',
+    },
+    text1: {
+      type: DataTypes.STRING(255),
+      allowNull: true,
+      defaultValue: '',
+      field: 'text1',
+    },
+    text2: {
+      type: DataTypes.STRING(255),
+      allowNull: true,
+      defaultValue: '',
+      field: 'text2',
+    },
+    text3: {
+      type: DataTypes.STRING(255),
+      allowNull: true,
+      defaultValue: '',
+      field: 'text3',
+    },
+    text4: {
+      type: DataTypes.STRING(255),
+      allowNull: true,
+      defaultValue: '',
+      field: 'text4',
+    },
+    date1: {
+      type: DataTypes.DATE,
+      allowNull: true,
+      field: 'date1',
+    },
+    date2: {
+      type: DataTypes.DATE,
+      allowNull: true,
+      field: 'date2',
+    },
+  },
+  {
+    tableName: 'cus_data',
+    timestamps: false,
+  });
 
-    return cusDatas;
-}
+  return cusDatas;
+};
\ No newline at end of file

app/model/taskStatus.js

@@ -109,10 +109,10 @@ module.exports = app => {
       field: 'notice',
     },
   },
-    {
-      tableName: 'gjj_status',
-      timestamps: false,
-    });
+  {
+    tableName: 'gjj_status',
+    timestamps: false,
+  });
 
   return taskStatsu;
 };

app/schedule/notifyUrl.js

 'use strict';
 
 module.exports = {
-    schedule: {
-        interval: '5m', // 5分钟间隔
-        type: 'all', // 所有woker
-        immediate: true,
-    },
+  schedule: {
+    interval: '5m', // 5分钟间隔
+    type: 'all', // 所有woker
+    immediate: true,
+  },
 
-    async task(ctx) {
-        try {
-            const { host, customerUrl } = ctx.app.config.signatureAPI;
-            const notifyMap = new Map();
-            const ret = await ctx.curl(host + customerUrl, {
-                charset: 'utf-8',
-                timeout: ['30s', '30s'],
-                dataType: 'json',
-                contentType: 'json',
-            });
-            // ctx.logger.info(JSON.stringify(ret.data));
-            if (ret.data.code == '0') {
-                ret.data.data.customerList.map(customer => {
-                    if ('callBackUrl' in customer) {
-                        notifyMap.set(customer.appKey, { notifyUrl: customer.callBackUrl });
-                    }
-                });
-                ctx.app.notifyMap = notifyMap;
-            }
-        } catch (e) {
-            ctx.logger.error('【schedule/notifyUrlTask】catch error:', JSON.stringify(e));
-        }
+  async task(ctx) {
+    try {
+      const { host, customerUrl } = ctx.app.config.signatureAPI;
+      const notifyMap = new Map();
+      const ret = await ctx.curl(host + customerUrl, {
+        charset: 'utf-8',
+        timeout: ['30s', '30s'],
+        dataType: 'json',
+        contentType: 'json',
+      });
+      // ctx.logger.info(JSON.stringify(ret.data));
+      if (ret.data.code == '0') {
+        ret.data.data.customerList.map(customer => {
+          if ('callBackUrl' in customer) {
+            notifyMap.set(customer.appKey, { notifyUrl: customer.callBackUrl });
+          }
+        });
+        ctx.app.notifyMap = notifyMap;
+      }
+    } catch (e) {
+      ctx.logger.error('【schedule/notifyUrlTask】catch error:', JSON.stringify(e));
     }
-}
+  },
\ No newline at end of file
+};

app/service/partner.js

@@ -19,12 +19,12 @@ class PartnerService extends Service {
         contentType: 'json',
         method: 'POST',
         data: {
-          orderSn: orderId
+          orderSn: orderId,
         },
       }
-      )
+      );
       ctx.logger.info(`【Partner】 notice ${notifyUrl}`, 'orderId:', orderId, 'result:', ret.status, JSON.stringify(ret.data));
-      if (ret.status == 200) {
+      if (ret.status === 200) {
         await order.update({ notice: '1' });
       }
     }

app/service/storage.js

@@ -57,8 +57,8 @@ class StorageService extends Service {
     await ctx.model.Cusdata.create({
       appKey,
       orderId,
-      type: 'gjj'
-    })
+      type: 'gjj',
+    });
     return result.data.data[readDataKey];
   }
 }

app/service/washData.js

@@ -51,16 +51,16 @@ class WashDataService extends Service {
   dealData(data, passID = false) {
     const { clearGjj, clearLoan } = this;
     delete data.data.general_analyzed_data;
-    for (let gjjItem of data.data.gjj_data) {
-      for (let text of clearGjj) {
-        if (!(passID && text == 'ID')) {
+    for (const gjjItem of data.data.gjj_data) {
+      for (const text of clearGjj) {
+        if (!(passID && text === 'ID')) {
           delete gjjItem.gjj_brief[text];
         }
       }
       delete gjjItem.gjj_account_analyzed_data;
     }
-    for (let loanItem of data.data.loan_data) {
-      for (let text of clearLoan) {
+    for (const loanItem of data.data.loan_data) {
+      for (const text of clearLoan) {
         delete loanItem.loan_brief[text];
       }
     }