Commit c5cee695 authored by 高东东's avatar 高东东

*)修改请求头获取为方法

parent ae50f225
......@@ -72,9 +72,11 @@ function _defineProperty(e, t, r) {
}) : e[t] = r, e
}
var lsTool = _amosTool.Store.lsTool,
defaultHeaders = window.isPluginsToAmos ? window.requestInfo.staticHeader : {
appKey: "AMOS_IOT",
product: "AMOS_IOT_WEB"
defaultHeaders = function() {
return window.isPluginsToAmos ? window.requestInfo.staticHeader : {
appKey: "AMOS_IOT",
product: "AMOS_IOT_WEB"
}
},
_default = _objectSpread(_objectSpread({}, utils), {}, {
AmosEnum: _AmosEnum.default
......@@ -89,7 +91,7 @@ var AmosFetch = {
return function(e, t, r) {
if (!_amosProcessor.AmosFetch[o]) throw new Error("AmosFetch: ´íÎóµÄÇëÇó[".concat(o, "]"));
t = _amosTool.utils.merge({
headers: _objectSpread(_objectSpread({}, defaultHeaders), {}, {
headers: _objectSpread(_objectSpread({}, defaultHeaders()), {}, {
token: getToken()
})
}, t);
......
......@@ -42,12 +42,14 @@ function _defineProperty(e, o, r) {
}) : e[o] = r, e
}
var lsTool = _amosTool.Store.lsTool,
defaultHeaders = window.isPluginsToAmos ? window.requestInfo.staticHeader : {
appKey: "AMOS_IOT",
product: "AMOS_IOT_WEB"
defaultHeaders = function() {
return window.isPluginsToAmos ? window.requestInfo.staticHeader : {
appKey: "AMOS_IOT",
product: "AMOS_IOT_WEB"
}
},
compleHeaders = function() {
return _objectSpread(_objectSpread({}, defaultHeaders), {}, {
return _objectSpread(_objectSpread({}, defaultHeaders()), {}, {
token: getToken()
})
};
......
......@@ -8,10 +8,12 @@ import sysConsts from 'amos-processor/lib/config';
const lsTool = Store.lsTool;
const defaultHeaders = window.isPluginsToAmos ? window.requestInfo.staticHeader : {
appKey: 'AMOS_IOT',
product: 'AMOS_IOT_WEB'
};
const defaultHeaders = () => {
return window.isPluginsToAmos ? window.requestInfo.staticHeader : {
appKey: 'AMOS_IOT',
product: 'AMOS_IOT_WEB'
};
}
export default{
// ..._fetch,
......@@ -33,7 +35,7 @@ export const AmosFetch = {
const newParams = toolUtils.merge(
{
headers: {
...defaultHeaders,
...defaultHeaders(),
token: getToken()
},
// ÆôÓà cookie£¬ `include, same-origin, *omit`
......
......@@ -6,14 +6,16 @@ import payload from './payload';
const lsTool = Store.lsTool;
const defaultHeaders = window.isPluginsToAmos ? window.requestInfo.staticHeader : {
appKey: 'AMOS_IOT',
product: 'AMOS_IOT_WEB'
};
const defaultHeaders = () => {
return window.isPluginsToAmos ? window.requestInfo.staticHeader : {
appKey: 'AMOS_IOT',
product: 'AMOS_IOT_WEB'
};
}
export const compleHeaders = () => {
return {
...defaultHeaders,
...defaultHeaders(),
token: getToken()
};
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment