gjj

app/controller/order.js

@@ -127,16 +127,7 @@ class OrderController extends Controller {
       };
     } catch (err) {
       ctx.logger.error('partnerShow', JSON.stringify(err));
-      ctx.status = 200;
-      if (err.code === 'invalid_param') {
-        ctx.body = { code: -1, msg: '请求参数有误' };
-        return;
-      }
-      if (/[a-zA-Z]+/.test(err.message)) {
-        ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
-        return;
-      }
-      ctx.body = { code: err.code || -1, msg: err.message || '' };
+      ctx.error(err);
     }
   }
 
@@ -182,16 +173,7 @@ class OrderController extends Controller {
       };
     } catch (err) {
       ctx.logger.error('fetchOrderId', JSON.stringify(err));
-      ctx.status = 200;
-      if (err.code === 'invalid_param') {
-        ctx.body = { code: -1, msg: '请求参数有误' };
-        return;
-      }
-      if (/[a-zA-Z]+/.test(err.message)) {
-        ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
-        return;
-      }
-      ctx.body = { code: err.code || -1, msg: err.message || '' };
+      ctx.error(err);
     }
   }
 }

app/controller/script.js

@@ -16,7 +16,7 @@ class ScriptController extends Controller {
     let data = await service.scripts.fetchScripts();
     if (limitScriptsList) {
       data = data.filter(item => {
-        return !(limitScriptsList.includes(item.id))
+        return !(limitScriptsList.includes(item.id));
       });
     }
     ctx.success(data);

app/controller/task.js

@@ -174,16 +174,8 @@ class TaskController extends Controller {
       ctx.body = result;
       return;
     } catch (err) {
-      ctx.status = 200;
-      if (err.code === 'invalid_param') {
-        ctx.body = { code: -1, msg: '请求参数有误' };
-        return;
-      }
-      if (/[a-zA-Z]+/.test(err.message)) {
-        ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
-        return;
-      }
-      ctx.body = { code: err.code || -1, msg: err.message || '' };
+      ctx.logger.error('fetchCityConfig ERROR', JSON.stringify(err));
+      ctx.error(err);
     }
   }
 }

app/controller/token.js

@@ -35,16 +35,7 @@ class TokenController extends Controller {
       };
     } catch (err) {
       ctx.logger.error('partnerCreate', JSON.stringify(err));
-      ctx.status = 200;
-      if (err.code === 'invalid_param') {
-        ctx.body = { code: -1, msg: '请求参数有误' };
-        return;
-      }
-      if (/[a-zA-Z]+/.test(err.message)) {
-        ctx.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
-        return;
-      }
-      ctx.body = { code: err.code || -1, msg: err.message || '' };
+      ctx.error(err);
     }
   }
 }

app/extend/context.js

@@ -26,4 +26,17 @@ module.exports = {
     };
   },
 
+  error(err = '') {
+    this.status = 200;
+    if (err.code === 'invalid_param') {
+      this.body = { code: -1, msg: '请求参数有误' };
+      return;
+    }
+    if (/[a-zA-Z]+/.test(err.message)) {
+      this.body = { code: err.code || -1, msg: '系统错误, 请稍后再试' };
+      return;
+    }
+    this.body = { code: err.code || -1, msg: err.message || '' };
+  },
+
 };

app/service/partner.js

@@ -68,33 +68,6 @@ class PartnerService extends Service {
     return ret.data[0];
   }
 
-  async fetchScripts(appKey) {
-    const { ctx, partnerAPI: { fetchScripts, host, redisScriptsPrefix } } = this;
-
-    if (appKey) {
-      const data = await this.app.redis.get(redisScriptsPrefix + appKey);
-      if (data) {
-        try {
-          return JSON.parse(data);
-        } catch (err) {
-          ctx.logger.error('【Partner】 fetchScripts', redisScriptsPrefix + appKey, 'result:', JSON.stringify(data), err);
-          await this.app.redis.del(redisScriptsPrefix + appKey);
-        }
-      }
-    }
-    const url = `${host + fetchScripts}/${appKey}`;
-    const ret = await ctx.curl(url, {
-      charset: 'utf-8',
-      timeout: [30000, 30000],
-      dataType: 'json',
-      method: 'GET',
-    });
-    ctx.logger.info(`【Partner】 fetchTheme ${url}`, JSON.stringify(ret.data));
-    if (ret.status === 200 && ret.data && ret.data.id === appKey) {
-      await this.app.redis.set(redisScriptsPrefix + appKey, JSON.stringify(ret.data), 'EX', 300);
-    }
-    return ret.data;
-  }
   async fetchAgreements(id) {
     const { ctx, partnerAPI: { fetchAgreements, host, redisAgreementsPrefix } } = this;
     const data = await this.app.redis.get(redisAgreementsPrefix + id);
@@ -115,7 +88,7 @@ class PartnerService extends Service {
     });
     ctx.logger.info(`【Partner】 fetchAgreements ${url}`, JSON.stringify(ret.data));
     if (ret.status === 200 && ret.data && ret.data.id === id) {
-      await this.app.redis.set(redisAgreementsPrefix + appKey, JSON.stringify(ret.data), 'EX', 300);
+      await this.app.redis.set(redisAgreementsPrefix + id, JSON.stringify(ret.data), 'EX', 300);
     }
     return ret.data;
   }

app/service/scripts.js

@@ -38,7 +38,7 @@ class ScriptsService extends Service {
     });
     ctx.logger.info(`【Scripts】fetchScripts,${baseURL + fetchScriptsUrl}`, 'result:', result.data);
     if (result.data && result.data.length > 0) {
-      await this.app.redis.set(redisScriptsKey, JSON.stringify(result.data), 'EX', 300);
+      await this.app.redis.set(redisScriptsKey, JSON.stringify(result.data), 'EX', 120);
     }
 
     return result.data;
@@ -182,7 +182,6 @@ class ScriptsService extends Service {
     }
   }
 
-  // eslint-disable-next-line no-empty-function
   async getCityList(params) {
     try {
       const { cityListUrl, ctx } = this;

config/config.local.js

@@ -16,7 +16,6 @@ module.exports = () => {
   };
   config.taskAPI = {
     host: 'http://tm.51gjj.com:4821',
-    fetchHubsUrl: '',
     createTaskUrl: '/gjjServices/createGjjTask',
     fetchCodeUrl: '/gjjServices/queryGjjCode',
     submitTaskUrl: '/gjjServices/queryGjj',
@@ -69,7 +68,6 @@ module.exports = () => {
     fetchTokenUrl: '/Access/GetToken',
     fetchOrderIdUrl: '/Order/GetOrderSn',
     signatureUrl: '/Access/SignValidityCheck',
-    fetchParnterUrl: '',
     signatureType: 'gjj',
     customerUrl: '/customer/query',
   };

config/config.prod.js

@@ -19,7 +19,6 @@ module.exports = () => {
   };
   config.taskAPI = {
     host: process.env.TASKAPI_HOST || 'http://tm.51gjj.com:4821',
-    fetchHubsUrl: '',
     createTaskUrl: '/gjjServices/createGjjTask',
     fetchCodeUrl: '/gjjServices/queryGjjCode',
     submitTaskUrl: '/gjjServices/queryGjj',
@@ -60,7 +59,6 @@ module.exports = () => {
     fetchTokenUrl: '/Access/GetToken',
     fetchOrderIdUrl: '/Order/GetOrderSn',
     signatureUrl: '/Access/SignValidityCheck',
-    fetchParnterUrl: '',
     signatureType: 'gjj',
     customerUrl: '/customer/query',
   };
@@ -82,7 +80,7 @@ module.exports = () => {
     fecteToken: 'URANUS.HF.TOKEN.LOCK',
     token: 'URANUS.HF.TOKEN',
     fecthParnters: 'URANUS.PARNTERS.LOCK',
-    taskPrefix: 'URANUS.HFH5.TASK',
+    taskPrefix: 'URANUS.HF.TASK',
   };
 
   config.sequelize = {