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

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

parent ae50f225
...@@ -72,9 +72,11 @@ function _defineProperty(e, t, r) { ...@@ -72,9 +72,11 @@ function _defineProperty(e, t, r) {
}) : e[t] = r, e }) : e[t] = r, e
} }
var lsTool = _amosTool.Store.lsTool, var lsTool = _amosTool.Store.lsTool,
defaultHeaders = window.isPluginsToAmos ? window.requestInfo.staticHeader : { defaultHeaders = function() {
appKey: "AMOS_IOT", return window.isPluginsToAmos ? window.requestInfo.staticHeader : {
product: "AMOS_IOT_WEB" appKey: "AMOS_IOT",
product: "AMOS_IOT_WEB"
}
}, },
_default = _objectSpread(_objectSpread({}, utils), {}, { _default = _objectSpread(_objectSpread({}, utils), {}, {
AmosEnum: _AmosEnum.default AmosEnum: _AmosEnum.default
...@@ -89,7 +91,7 @@ var AmosFetch = { ...@@ -89,7 +91,7 @@ var AmosFetch = {
return function(e, t, r) { return function(e, t, r) {
if (!_amosProcessor.AmosFetch[o]) throw new Error("AmosFetch: ´íÎóµÄÇëÇó[".concat(o, "]")); if (!_amosProcessor.AmosFetch[o]) throw new Error("AmosFetch: ´íÎóµÄÇëÇó[".concat(o, "]"));
t = _amosTool.utils.merge({ t = _amosTool.utils.merge({
headers: _objectSpread(_objectSpread({}, defaultHeaders), {}, { headers: _objectSpread(_objectSpread({}, defaultHeaders()), {}, {
token: getToken() token: getToken()
}) })
}, t); }, t);
......
...@@ -42,12 +42,14 @@ function _defineProperty(e, o, r) { ...@@ -42,12 +42,14 @@ function _defineProperty(e, o, r) {
}) : e[o] = r, e }) : e[o] = r, e
} }
var lsTool = _amosTool.Store.lsTool, var lsTool = _amosTool.Store.lsTool,
defaultHeaders = window.isPluginsToAmos ? window.requestInfo.staticHeader : { defaultHeaders = function() {
appKey: "AMOS_IOT", return window.isPluginsToAmos ? window.requestInfo.staticHeader : {
product: "AMOS_IOT_WEB" appKey: "AMOS_IOT",
product: "AMOS_IOT_WEB"
}
}, },
compleHeaders = function() { compleHeaders = function() {
return _objectSpread(_objectSpread({}, defaultHeaders), {}, { return _objectSpread(_objectSpread({}, defaultHeaders()), {}, {
token: getToken() token: getToken()
}) })
}; };
......
...@@ -8,10 +8,12 @@ import sysConsts from 'amos-processor/lib/config'; ...@@ -8,10 +8,12 @@ import sysConsts from 'amos-processor/lib/config';
const lsTool = Store.lsTool; const lsTool = Store.lsTool;
const defaultHeaders = window.isPluginsToAmos ? window.requestInfo.staticHeader : { const defaultHeaders = () => {
appKey: 'AMOS_IOT', return window.isPluginsToAmos ? window.requestInfo.staticHeader : {
product: 'AMOS_IOT_WEB' appKey: 'AMOS_IOT',
}; product: 'AMOS_IOT_WEB'
};
}
export default{ export default{
// ..._fetch, // ..._fetch,
...@@ -33,7 +35,7 @@ export const AmosFetch = { ...@@ -33,7 +35,7 @@ export const AmosFetch = {
const newParams = toolUtils.merge( const newParams = toolUtils.merge(
{ {
headers: { headers: {
...defaultHeaders, ...defaultHeaders(),
token: getToken() token: getToken()
}, },
// ÆôÓà cookie£¬ `include, same-origin, *omit` // ÆôÓà cookie£¬ `include, same-origin, *omit`
......
...@@ -6,14 +6,16 @@ import payload from './payload'; ...@@ -6,14 +6,16 @@ import payload from './payload';
const lsTool = Store.lsTool; const lsTool = Store.lsTool;
const defaultHeaders = window.isPluginsToAmos ? window.requestInfo.staticHeader : { const defaultHeaders = () => {
appKey: 'AMOS_IOT', return window.isPluginsToAmos ? window.requestInfo.staticHeader : {
product: 'AMOS_IOT_WEB' appKey: 'AMOS_IOT',
}; product: 'AMOS_IOT_WEB'
};
}
export const compleHeaders = () => { export const compleHeaders = () => {
return { return {
...defaultHeaders, ...defaultHeaders(),
token: getToken() 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