diff --git a/lib/mysapi/tool.js b/lib/mysapi/tool.js index 5333fbe..fdf5cef 100644 --- a/lib/mysapi/tool.js +++ b/lib/mysapi/tool.js @@ -76,18 +76,15 @@ export default class ZZZApiTool { } getUrlMap = (data = {}) => { - const deiveCfg = settings.getConfig('device') || {}; + const deviceCfg = settings.getConfig('device'); + const defDeviceCfg = settings.getdefSet('device'); const { - productName = _.get(deiveCfg, 'productName', 'J9110'), - deviceType = _.get(deiveCfg, 'productType', 'J9110'), - modelName = _.get(deiveCfg, 'modelName', 'J9110'), - oaid = _.get(deiveCfg, 'oaid', '17a40451-9947-4430-a4fe-29f15e8497c1'), - deviceInfo = _.get( - deiveCfg, - 'deviceInfo', - 'Sony/J9110/J9110:11/55.2.A.4.332/055002A004033203408384484:user/release-keys' - ), - board = _.get(deiveCfg, 'board', 'msmnile'), + productName = _.get(deviceCfg, defDeviceCfg, 'productName'), + deviceType = _.get(deviceCfg, defDeviceCfg, 'productType'), + modelName = _.get(deviceCfg, defDeviceCfg, 'modelName'), + oaid = _.get(deviceCfg, defDeviceCfg, 'oaid'), + deviceInfo = _.get(deviceCfg, defDeviceCfg, 'deviceInfo'), + board = _.get(deviceCfg, defDeviceCfg, 'board'), } = data; const deviceBrand = deviceInfo.split('/')[0]; let urlMap = {