城市

app/controller/task.js

@@ -143,13 +143,11 @@ class TaskController extends Controller {
   //任务回调接口
   async handleCallback() {
     const { ctx, service } = this;
-    ctx.logger.info('---------handleCallback_into------------', ctx.request.body);
     const { taskId } = ctx.request.body;
     const result = await service.task.fetchTask({ taskId });
-    ctx.logger.info('---------handleCallback_result----------', result);
+    ctx.logger.info('【handleCallback_result】', result.code);
     ctx.success();
     const order = await service.order.getOneByTaskId(taskId);
-    // ctx.logger.info('---------handleCallback_order----------', order);
     if (!order) {
       ctx.logger.error('handleCallback', taskId, '未查询到此任务');
       return
@@ -197,7 +195,6 @@ class TaskController extends Controller {
           note: { code: 0, msg: '任务成功', data: { data: null, loginParam: null, cityId, orderSn: orderId } },
         };
         try {
-          // const insertData = await service.washData.wash(result);
           result.cityId = Number(result.data.cityId);
           result.cityName = await service.scripts.fetchScriptName(result.data.cityId);
           result.data = JSON.parse(result.data.data);

app/service/scripts.js

@@ -63,7 +63,7 @@ class ScriptsService extends Service {
     if (result.data && (String(result.data.id) === scriptId)) {
       await this.app.redis.set(redisScriptListKey + scriptId, JSON.stringify(result.data), 'EX', 60);
     }
-    return result.data;
+    return result.data['hub_name'];
   }
 
   async fetchParams(refresh = false) {

config/config.prod.js

@@ -4,10 +4,10 @@ module.exports = () => {
   const config = exports = {};
   config.debug = true;
   config.logger = {
-    dir: '/jianbing/logs/tax_api',
+    dir: '/jianbing/logs/taxh5',
   };
 
-  config.projectRootPath = '/tax_api';
+  config.projectRootPath = '/taxh5';
 
   config.redis = {
     client: {
@@ -19,7 +19,6 @@ module.exports = () => {
   };
   config.taskAPI = {
     host: process.env.TASKAPI_HOST,
-    newhost: 'http://tt.51gjj.com:7001',
     fetchHubsUrl: '',
     createTaskUrl: '/IncomeTax/createItTask',
     fetchCodeUrl: '/IncomeTax/getItCode',
@@ -33,26 +32,26 @@ module.exports = () => {
     fetchTheme: '/chaos/theme',
     fetchScripts: '/chaos/partners/scripts',
     fetchAgreements: '/chaos/agreements',
-    redisThemePrefix: 'URANUS.HF.PARNTERS.THEME',
-    redisScriptsPrefix: 'URANUS.HF.PARNTERS.SCRIPTS',
-    redisAgreementsPrefix: 'URANUS.HF.PARNTERS.Agreements',
     fetchInfo: '/chaos/partner',
-    redisInfoPrefix:'URANUS.HF.PARNTERS.Info',
+    redisThemePrefix: 'URANUS.IT.PARNTERS.THEME',
+    redisScriptsPrefix: 'URANUS.IT.PARNTERS.SCRIPTS',
+    redisAgreementsPrefix: 'URANUS.IT.PARNTERS.Agreements',
+    redisInfoPrefix: 'URANUS.IT.PARNTERS.Info',
   };
 
   config.scriptsAPI = {
-    host: 'https://dev-nginx.jianbing.com/zeus-api/v1',
-    fetchScriptsUrl: '/chaos/hf/two_dimension_array/queries',
-    fetchOneScriptUrl: '/chaos/hf/two_dimension_array/info',
-    fetchParamsInfoUrl: '/chaos/hf/login_param_map',
-    fetchQueryButtonUrl: '/chaos/hf/query_button',
-    fetchHelpUrl: '/chaos/hf/help',
-    fetchNoticeUrl: '/chaos/hf/notice',
-    fetchHubSeriptsUrl: '/chaos/hf/hubs',
-    fetchScriptByCityNameUrl: '/chaos/hf/city_scripts',
-    redisScriptsKey: 'DATA_SERVER_SHEBAO.SCRIPTS',
-    redisParamsKey: 'DATA_SERVER_SHEBAO.PARAMS',
-    redisScriptListKey: 'DATA_SERVER_SHEBAO.SCRIPTLIST',
+    host: process.env.SCRIPTSAPI_HOST,
+    fetchScriptsUrl: '/chaos/it/two_dimension_array/queries',
+    fetchOneScriptUrl: '/chaos/it/two_dimension_array/info',
+    fetchParamsInfoUrl: '/chaos/it/login_param_map',
+    fetchQueryButtonUrl: '/chaos/it/query_button',
+    fetchHelpUrl: '/chaos/it/help',
+    fetchNoticeUrl: '/chaos/it/notice',
+    fetchHubSeriptsUrl: '/chaos/it/hubs',
+    fetchScriptByCityNameUrl: '/chaos/it/city_scripts',
+    redisScriptsKey: 'URANUS.IT.SCRIPTS',
+    redisParamsKey: 'URANUS.IT.PARAMS',
+    redisScriptListKey: 'URANUS.IT.SCRIPTLIST',
   };
 
   config.storageAPI = {
@@ -79,11 +78,11 @@ module.exports = () => {
   };
 
   config.lockKeys = {
-    fecthHub: 'NEWSB.HF.HUBS.LOCK',
-    fecteToken: 'NEWSB.HF.TOKEN.LOCK',
-    token: 'NEWSB.HF.TOKEN',
-    fecthParnters: 'NEWSB.PARNTERS.LOCK',
-    taskPrefix: 'NEWSB.TASK',
+    fecthHub: 'URANUS.IT.HUBS.LOCK',
+    fecteToken: 'URANUS.IT.TOKEN.LOCK',
+    token: 'URANUS.IT.TOKEN',
+    fecthParnters: 'URANUS.PARNTERS.LOCK',
+    taskPrefix: 'URANUS.TASK',
   };
 
   config.sequelize = {