yys

app/controller/script.js

@@ -77,11 +77,17 @@ class ScriptController extends Controller {
     ctx.validate(this.hubsRule, ctx.params);
     const { phone } = ctx.params;
     const areaInfo = await service.task.phoneArea(phone);
-    const hubId = await service.scripts.fetchScriptByCityName(areaInfo.province);
-    let data = await service.scripts.fetchHubSeripts(hubId.hubId);
+    const cityMap = await service.scripts.fetchScripts();
+    let hubId = '';
+    cityMap.map(data => {
+      if (data.hub_name === areaInfo.province) {
+        hubId = data.hub_id;
+      }
+    });
+    let data = await service.scripts.fetchHubSeripts(hubId);
     let result = '';
     data = data.filter(item => {
-      if (item.name === areaInfo.operator) {
+      if (item.name === (areaInfo.province + areaInfo.operator)) {
         result = item;
         return false;
       }

app/service/scripts.js

@@ -128,6 +128,9 @@ class ScriptsService extends Service {
 
   async fetchHubSeripts(hubId) {
     const { baseURL, scriptsAPI: { fetchHubSeriptsUrl }, ctx } = this;
+    if (!hubId) {
+      ctx.throw(400, '手机号码区域验证失败');
+    }
     const result = await ctx.curl(baseURL + fetchHubSeriptsUrl + '/' + hubId + '/scripts', {
       charset: 'utf-8',
       timeout: [30000, 30000],

config/config.local.js

@@ -44,14 +44,14 @@ module.exports = () => {
 
   config.scriptsAPI = {
     host: 'https://uat-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',
+    fetchScriptsUrl: '/chaos/yys/two_dimension_array/queries',
+    fetchOneScriptUrl: '/chaos/yys/two_dimension_array/info',
+    fetchParamsInfoUrl: '/chaos/yys/login_param_map',
+    fetchQueryButtonUrl: '/chaos/yys/query_button',
+    fetchHelpUrl: '/chaos/yys/help',
+    fetchNoticeUrl: '/chaos/yys/notice',
+    fetchHubSeriptsUrl: '/chaos/yys/hubs',
+    fetchScriptByCityNameUrl: '/chaos/yys/city_scripts',
     redisScriptsKey: 'URANUS.YYS.SCRIPTS',
     redisParamsKey: 'URANUS.YYS.PARAMS',
     redisScriptListKey: 'URANUS.YYS.SCRIPTLIST',

config/config.prod.js

@@ -34,14 +34,14 @@ module.exports = () => {
 
   config.scriptsAPI = {
     host: process.env.SCRIPTSAPI_HOST || 'https://uat-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',
+    fetchScriptsUrl: '/chaos/yys/two_dimension_array/queries',
+    fetchOneScriptUrl: '/chaos/yys/two_dimension_array/info',
+    fetchParamsInfoUrl: '/chaos/yys/login_param_map',
+    fetchQueryButtonUrl: '/chaos/yys/query_button',
+    fetchHelpUrl: '/chaos/yys/help',
+    fetchNoticeUrl: '/chaos/yys/notice',
+    fetchHubSeriptsUrl: '/chaos/yys/hubs',
+    fetchScriptByCityNameUrl: '/chaos/yys/city_scripts',
     redisScriptsKey: 'URANUS.YYS.SCRIPTS',
     redisParamsKey: 'URANUS.YYS.PARAMS',
     redisScriptListKey: 'URANUS.YYS.SCRIPTLIST',