Commit a70507b4 by zhaochengxiang

bug fix

parent 69caf6f6
......@@ -8,6 +8,7 @@ import { appId } from '../App';
const CancelToken = axios.CancelToken;
const baseURL = '/api/';
const debugEnv = 475629450;
const instance = axios.create({
baseURL,
......@@ -122,9 +123,10 @@ export function getTemplateType() {
export function Get(url, params) {
const cancelToken = __source ? __source.token : null;
const templateType = getTemplateType();
const env = LocalStorage.get('assetsEnv')??debugEnv;
return textplain.get(url, {
params: {templateType, ...params}, cancelToken
params: {templateType, env, ...params}, cancelToken
}).then(
callback
)
......@@ -133,9 +135,10 @@ export function Get(url, params) {
export function GetJSON(url, params) {
const cancelToken = __source ? __source.token : null;
const templateType = getTemplateType();
const env = LocalStorage.get('assetsEnv')??debugEnv;
return instance.get(url, {
params: {templateType, ...params}, cancelToken,
params: {templateType, env, ...params}, cancelToken,
validateStatus: false
}).then(
callback
......@@ -145,9 +148,10 @@ export function GetJSON(url, params) {
export const GetJSONRaw = (url, params) => {
const cancelToken = __source ? __source.token : null;
const templateType = getTemplateType();
const env = LocalStorage.get('assetsEnv')??debugEnv;
return instanceRow.get(url, {
params: {templateType, ...params}, cancelToken,
params: {templateType, env, ...params}, cancelToken,
validateStatus: false
}).then(
callback
......@@ -157,9 +161,10 @@ export const GetJSONRaw = (url, params) => {
export function Delete(url, params) {
const cancelToken = __source ? __source.token : null;
const templateType = getTemplateType();
const env = LocalStorage.get('assetsEnv')??debugEnv;
return instance.delete(url, {
params: {templateType, ...params}, cancelToken,
params: {templateType, env, ...params}, cancelToken,
}).then(
callback
)
......@@ -169,13 +174,14 @@ export function PostJSON(url, payload) {
const { params = null, data = null } = payload||{};
const cancelToken = __source ? __source.token : null;
const templateType = getTemplateType();
const env = LocalStorage.get('assetsEnv')??debugEnv;
return IsArr(data) ? instance.post(url, data, {
params: {templateType, ...params}, cancelToken
params: {templateType, env, ...params}, cancelToken
}).then(
callback
) : instance.post(url, null, {
params: {templateType, ...params}, data, cancelToken
params: {templateType, env, ...params}, data, cancelToken
}).then(
callback
)
......@@ -185,9 +191,10 @@ export function Post(url, payload) {
const { params = null, data = null } = payload||{};
const cancelToken = __source ? __source.token : null;
const templateType = getTemplateType();
const env = LocalStorage.get('assetsEnv')??debugEnv;
return textplain.post(url, null, {
params: {templateType, ...params}, data, cancelToken
params: {templateType, env, ...params}, data, cancelToken
}).then(
callback
)
......@@ -196,13 +203,14 @@ export function Post(url, payload) {
export function PostFile(url, payload) {
const { fileList = null, params = null } = payload||{};
const templateType = getTemplateType();
const env = LocalStorage.get('assetsEnv')??debugEnv;
let formData = new FormData();
(fileList||[]).forEach(file=> {
formData.append('file', file);
});
return fileplain.post(url, formData, { params: {templateType, ...params} } ).then(
return fileplain.post(url, formData, { params: {templateType, env, ...params} } ).then(
callback
)
}
......@@ -217,13 +225,15 @@ export const callFetchRaw = (method, url, options) => {
}
const templateType = getTemplateType();
const env = LocalStorage.get('assetsEnv')??debugEnv;
var bodyFormData = new FormData();
Object.keys(params||[]).forEach(key => {
bodyFormData.append(key, params[key]);
});
bodyFormData.append(templateType, templateType);
bodyFormData.append('templateType', templateType);
bodyFormData.append('env', env);
return axios.request({
......
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