提交 df33abad authored 作者: 钟是志's avatar 钟是志

34246 在学工、素质测评、宿管、离校的所有接口中增加请求头

上级 28cbe86e
...@@ -28,7 +28,10 @@ import baseConfig from '@/config/config'; ...@@ -28,7 +28,10 @@ import baseConfig from '@/config/config';
import 'react-quill/dist/quill.snow.css'; import 'react-quill/dist/quill.snow.css';
import ButtonUpload from './ButtonUpload'; import ButtonUpload from './ButtonUpload';
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const RadioGroup = Radio.Group; const RadioGroup = Radio.Group;
const Option = Select.Option; const Option = Select.Option;
...@@ -488,10 +491,7 @@ export default class FormArray extends Component { ...@@ -488,10 +491,7 @@ export default class FormArray extends Component {
accept={info.accept} accept={info.accept}
multiple={info.multiple} multiple={info.multiple}
{...defaultProps} {...defaultProps}
headers={{ headers={getSassApiHeader()}
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
}}
data={{ data={{
token: getToken(), token: getToken(),
}} }}
......
...@@ -7,7 +7,10 @@ import config from '@/config/config'; ...@@ -7,7 +7,10 @@ import config from '@/config/config';
import { connect } from 'dva'; import { connect } from 'dva';
// import { exportExcel } from 'xlsx-oc'; // import { exportExcel } from 'xlsx-oc';
import { getToken } from '@/utils/authority'; import { getToken } from '@/utils/authority';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const Step = Steps.Step; const Step = Steps.Step;
const TabPane = Tabs.TabPane; const TabPane = Tabs.TabPane;
...@@ -203,10 +206,7 @@ export default class ImportUtil extends React.PureComponent { ...@@ -203,10 +206,7 @@ export default class ImportUtil extends React.PureComponent {
name: 'file', name: 'file',
action: config.sqlFormsServer + '/upload', action: config.sqlFormsServer + '/upload',
headers: { headers: getSassApiHeader(),
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
},
data: { data: {
token: getToken(), token: getToken(),
}, },
......
import { getToken } from '@/webPublic/one_stop_public/utils/getToken';
import { getUserInfo } from '@/webPublic/one_stop_public/utils/token';
export function isJSON(str) { export function isJSON(str) {
if (typeof str == 'string') { if (typeof str == 'string') {
try { try {
...@@ -35,3 +38,12 @@ export const getYunShangGuiZhouSyStemConfig = () => { ...@@ -35,3 +38,12 @@ export const getYunShangGuiZhouSyStemConfig = () => {
}; };
} }
}; };
export const getSassApiHeader = () => {
// 解决禅道 34246 在学工、素质测评、宿管、离校的所有接口中增加请求头
return {
authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
tenant: getUserInfo().tenantId || null,
};
};
...@@ -29,7 +29,10 @@ import { ...@@ -29,7 +29,10 @@ import {
} from 'draft-js'; } from 'draft-js';
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const FormItem = Form.Item; const FormItem = Form.Item;
function getBlockStyle(block) { function getBlockStyle(block) {
...@@ -500,10 +503,7 @@ class AttrForm extends React.Component { ...@@ -500,10 +503,7 @@ class AttrForm extends React.Component {
showUploadList={false} showUploadList={false}
name="file" name="file"
action={config.uploadUrl} action={config.uploadUrl}
headers={{ headers={getSassApiHeader()}
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
}}
data={{ data={{
token: getToken(), token: getToken(),
}} }}
...@@ -594,10 +594,7 @@ class VideoForm extends React.Component { ...@@ -594,10 +594,7 @@ class VideoForm extends React.Component {
showUploadList={false} showUploadList={false}
name="file" name="file"
action={config.uploadUrl} action={config.uploadUrl}
headers={{ headers={getSassApiHeader()}
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
}}
data={{ data={{
token: getToken(), token: getToken(),
}} }}
...@@ -687,10 +684,7 @@ class PicForm extends React.Component { ...@@ -687,10 +684,7 @@ class PicForm extends React.Component {
name="file" name="file"
action={config.uploadUrl} action={config.uploadUrl}
onChange={this.onChange} onChange={this.onChange}
headers={{ headers={getSassApiHeader()}
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
}}
data={{ data={{
token: getToken(), token: getToken(),
}} }}
......
...@@ -28,7 +28,10 @@ import { ...@@ -28,7 +28,10 @@ import {
RichUtils, RichUtils,
} from 'draft-js'; } from 'draft-js';
import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const FormItem = Form.Item; const FormItem = Form.Item;
function getBlockStyle(block) { function getBlockStyle(block) {
...@@ -503,10 +506,7 @@ class AttrForm extends React.Component { ...@@ -503,10 +506,7 @@ class AttrForm extends React.Component {
showUploadList={false} showUploadList={false}
name="file" name="file"
action={config.uploadUrl} action={config.uploadUrl}
headers={{ headers={getSassApiHeader()}
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
}}
data={{ data={{
token: getToken(), token: getToken(),
}} }}
...@@ -598,10 +598,7 @@ class VideoForm extends React.Component { ...@@ -598,10 +598,7 @@ class VideoForm extends React.Component {
name="file" name="file"
action={config.uploadUrl} action={config.uploadUrl}
onChangemultiple={false} onChangemultiple={false}
headers={{ headers={getSassApiHeader()}
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
}}
data={{ data={{
token: getToken(), token: getToken(),
}} }}
...@@ -690,10 +687,7 @@ class PicForm extends React.Component { ...@@ -690,10 +687,7 @@ class PicForm extends React.Component {
name="file" name="file"
action={config.uploadUrl} action={config.uploadUrl}
onChange={this.onChange} onChange={this.onChange}
headers={{ headers={getSassApiHeader()}
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
}}
data={{ data={{
token: getToken(), token: getToken(),
}} }}
......
...@@ -10,7 +10,10 @@ import { getMessage, getModal } from '@/webPublic/one_stop_public/utils/utils'; ...@@ -10,7 +10,10 @@ import { getMessage, getModal } from '@/webPublic/one_stop_public/utils/utils';
import { giveFilePostDataInfoForTrue } from '@/webPublic/one_stop_public/Base16'; import { giveFilePostDataInfoForTrue } from '@/webPublic/one_stop_public/Base16';
import { getTransformApi } from '@/webPublic/one_stop_public/2022beidianke/localstorageTransform'; import { getTransformApi } from '@/webPublic/one_stop_public/2022beidianke/localstorageTransform';
import ProgressDiy from './ProgressDiy'; import ProgressDiy from './ProgressDiy';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const Modal = getModal(); const Modal = getModal();
const message = getMessage(); const message = getMessage();
...@@ -296,10 +299,7 @@ export default class ImportUtil extends React.PureComponent { ...@@ -296,10 +299,7 @@ export default class ImportUtil extends React.PureComponent {
const props = { const props = {
name: 'file', name: 'file',
action: config.uploadUrl, action: config.uploadUrl,
headers: { headers: getSassApiHeader(),
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
},
data: { data: {
token: getToken(), token: getToken(),
}, },
......
...@@ -6,7 +6,10 @@ import { getToken } from '@/webPublic/one_stop_public/utils/token'; ...@@ -6,7 +6,10 @@ import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { deepCopy } from '@/webPublic/zyd_public/utils/utils'; import { deepCopy } from '@/webPublic/zyd_public/utils/utils';
import { getTransformApi } from '@/webPublic/one_stop_public/2022beidianke/localstorageTransform'; import { getTransformApi } from '@/webPublic/one_stop_public/2022beidianke/localstorageTransform';
import moment from 'moment'; import moment from 'moment';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const apiUrl = queryOauthActionPath(); const apiUrl = queryOauthActionPath();
const exportStyles = { const exportStyles = {
...@@ -1203,10 +1206,7 @@ function FormdataWrapper(obj, fd, pre) { ...@@ -1203,10 +1206,7 @@ function FormdataWrapper(obj, fd, pre) {
export async function downloadFile(url, params, fileName = '导出文件', ext = 'xlsx') { export async function downloadFile(url, params, fileName = '导出文件', ext = 'xlsx') {
const { transformApi, headersApi } = await getTransformApi(url); const { transformApi, headersApi } = await getTransformApi(url);
let headers = { let headers = getSassApiHeader();
Authorization: `bearer ${localStorage.getItem('antd-pro-token-onestop')}`,
sysCode: getSysCode(),
};
// if(headersApi){ // if(headersApi){
// headers.apis = headersApi; // headers.apis = headersApi;
// } // }
...@@ -1247,10 +1247,7 @@ export async function downloadFile(url, params, fileName = '导出文件', ext = ...@@ -1247,10 +1247,7 @@ export async function downloadFile(url, params, fileName = '导出文件', ext =
export async function downloadFileAndShowModal(url, params, fileName = '导出文件', ext = 'xlsx') { export async function downloadFileAndShowModal(url, params, fileName = '导出文件', ext = 'xlsx') {
const { transformApi, headersApi } = await getTransformApi(url); const { transformApi, headersApi } = await getTransformApi(url);
let headers = { let headers = getSassApiHeader();
Authorization: `bearer ${localStorage.getItem('antd-pro-token-onestop')}`,
sysCode: getSysCode(),
};
// if(headersApi){ // if(headersApi){
// headers.apis = headersApi; // headers.apis = headersApi;
// } // }
......
...@@ -4,7 +4,10 @@ import config from '@/webPublic/one_stop_public/config'; ...@@ -4,7 +4,10 @@ import config from '@/webPublic/one_stop_public/config';
import { zipImage } from '@/webPublic/zyd_public/utils/handlePhoto'; import { zipImage } from '@/webPublic/zyd_public/utils/handlePhoto';
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig'; import { queryFileUrl } from '@/webPublic/one_stop_public/utils/queryConfig';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
export default class ImgUploadCom extends React.Component { export default class ImgUploadCom extends React.Component {
constructor(props) { constructor(props) {
...@@ -91,10 +94,7 @@ export default class ImgUploadCom extends React.Component { ...@@ -91,10 +94,7 @@ export default class ImgUploadCom extends React.Component {
disabled={disabled} disabled={disabled}
accept={otherProps.accept || 'image/*'} accept={otherProps.accept || 'image/*'}
url={url} url={url}
headers={{ headers={getSassApiHeader()}
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
}}
data={{ data={{
token: getToken(), token: getToken(),
}} }}
......
...@@ -3,7 +3,10 @@ import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/ut ...@@ -3,7 +3,10 @@ import { queryApiActionPath, queryFileUrl } from '@/webPublic/one_stop_public/ut
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { isFromIframe } from '@/webPublic/one_stop_public/utils/utils'; import { isFromIframe } from '@/webPublic/one_stop_public/utils/utils';
import getOneStopUploadUrl from '@/webPublic/one_stop_public/Base16/getOneStopUploadUrl'; import getOneStopUploadUrl from '@/webPublic/one_stop_public/Base16/getOneStopUploadUrl';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const oneSetItemP = { const oneSetItemP = {
...@@ -142,8 +145,7 @@ export const uploadFile = (file) => { ...@@ -142,8 +145,7 @@ export const uploadFile = (file) => {
method: 'POST', method: 'POST',
headers: { headers: {
Accept: '*/*', Accept: '*/*',
Authorization: `bearer ${getToken()}`, ...getSassApiHeader(),
sysCode: getSysCode(),
}, },
body: formData, body: formData,
}) })
......
...@@ -7,7 +7,10 @@ import styles from './style.less'; ...@@ -7,7 +7,10 @@ import styles from './style.less';
import UploadComDiyForQnZy from '@/webPublic/one_stop_public/libs/UploadComDiyForQnZy'; import UploadComDiyForQnZy from '@/webPublic/one_stop_public/libs/UploadComDiyForQnZy';
import Viewer from 'react-viewer'; import Viewer from 'react-viewer';
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
message.config({ message.config({
top: 300, top: 300,
...@@ -174,10 +177,7 @@ class UploadCom extends React.Component { ...@@ -174,10 +177,7 @@ class UploadCom extends React.Component {
name: 'file', name: 'file',
multiple: isMultiple, multiple: isMultiple,
accept: accept, accept: accept,
headers: { headers: getSassApiHeader(),
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
},
data: { data: {
token: getToken(), token: getToken(),
}, },
......
...@@ -7,7 +7,10 @@ import { checkIsImage } from "./UploadCom"; ...@@ -7,7 +7,10 @@ import { checkIsImage } from "./UploadCom";
import Viewer from "react-viewer"; import Viewer from "react-viewer";
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { getHeaders } from '@/webPublic/zyd_public/utils/utils'; import { getHeaders } from '@/webPublic/zyd_public/utils/utils';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
// 为黔南职院单独写的 上传组件 用于 bug 20576 个人就业信息/求职创业补贴申报,201801010006 119242 上传图片加限制,跟签约派遣上传图片加限制一样 // 为黔南职院单独写的 上传组件 用于 bug 20576 个人就业信息/求职创业补贴申报,201801010006 119242 上传图片加限制,跟签约派遣上传图片加限制一样
...@@ -108,10 +111,7 @@ export default class UploadComDiyForQnZy extends React.Component { ...@@ -108,10 +111,7 @@ export default class UploadComDiyForQnZy extends React.Component {
showUploadList: false, showUploadList: false,
onChange: this.changeUrl, onChange: this.changeUrl,
beforeUpload: this.beforeUpload, beforeUpload: this.beforeUpload,
headers: { headers: getSassApiHeader(),
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
},
data: { data: {
token: getToken(), token: getToken(),
}, },
......
...@@ -4,7 +4,10 @@ import queryConfig from './queryConfig'; ...@@ -4,7 +4,10 @@ import queryConfig from './queryConfig';
import { Upload, message } from 'antd'; import { Upload, message } from 'antd';
import { isJSON } from '@/webPublic/one_stop_public/copy'; import { isJSON } from '@/webPublic/one_stop_public/copy';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const getToken = () => { const getToken = () => {
const x = localStorage.getItem('uploadVideoServiceToken'); const x = localStorage.getItem('uploadVideoServiceToken');
...@@ -109,10 +112,9 @@ export default class VideoUploadCom extends React.Component { ...@@ -109,10 +112,9 @@ export default class VideoUploadCom extends React.Component {
name="file" name="file"
action={configService + '/uploadFileApi/upload'} action={configService + '/uploadFileApi/upload'}
onChange={this.changeUrl} onChange={this.changeUrl}
headers={{ headers={
Authorization: `bearer ${getToken()}`, getSassApiHeader()
sysCode: getSysCode(), }
}}
multiple={false} multiple={false}
data={{ data={{
isConvert: true, isConvert: true,
......
...@@ -15,7 +15,10 @@ import styles from './Ability.css'; ...@@ -15,7 +15,10 @@ import styles from './Ability.css';
import FormdataWrapper from '@/utils/object-to-formdata-custom'; import FormdataWrapper from '@/utils/object-to-formdata-custom';
import moment from 'moment'; import moment from 'moment';
import { controlNotification } from '@/baseComponent/utils'; import { controlNotification } from '@/baseComponent/utils';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const Option = Select.Option; const Option = Select.Option;
const nameSpan = { const nameSpan = {
...@@ -423,10 +426,7 @@ export default class StatisticsInfo extends React.Component { ...@@ -423,10 +426,7 @@ export default class StatisticsInfo extends React.Component {
fetch(url, { fetch(url, {
method: 'POST', method: 'POST',
body: FormdataWrapper(params), body: FormdataWrapper(params),
headers: { headers: getSassApiHeader(),
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
},
}) })
.then((res) => { .then((res) => {
if (res.status != '200') { if (res.status != '200') {
......
import request from '@/utils/request'; import request from '@/utils/request';
import config, { getUploadUrl } from '@/config/config'; import config, { getUploadUrl } from '@/config/config';
import { getToken } from '@/utils/authority'; import { getToken } from '@/utils/authority';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const uploadUrl = getUploadUrl(); const uploadUrl = getUploadUrl();
export default function uploadFile(params) { export default function uploadFile(params) {
return request(uploadUrl, { return request(uploadUrl, {
method: 'POST', method: 'POST',
headers: { headers: getSassApiHeader(),
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
},
body: params, body: params,
}); });
} }
...@@ -7,7 +7,10 @@ import ButtonDiy from '@/baseComponent/ButtonDiy'; ...@@ -7,7 +7,10 @@ import ButtonDiy from '@/baseComponent/ButtonDiy';
import { getUploadUrl } from '@/config/config'; import { getUploadUrl } from '@/config/config';
import { Row, Col } from 'antd'; import { Row, Col } from 'antd';
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken } from '@/webPublic/one_stop_public/utils/token';
import { getSysCode } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; import {
getSassApiHeader,
getSysCode
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
const Step = Steps.Step; const Step = Steps.Step;
...@@ -377,10 +380,7 @@ export default class ImportUtil extends React.PureComponent { ...@@ -377,10 +380,7 @@ export default class ImportUtil extends React.PureComponent {
const props = { const props = {
name: 'file', name: 'file',
action: getUploadUrl(), action: getUploadUrl(),
headers: { headers: getSassApiHeader(),
Authorization: `bearer ${getToken()}`,
sysCode: getSysCode(),
},
data: { data: {
token: getToken(), token: getToken(),
}, },
......
import { getToken } from '@/webPublic/one_stop_public/utils/token'; import { getToken, getUserInfo } from '@/webPublic/one_stop_public/utils/token';
import { import {
getSassApiHeader,
getSysCode, getSysCode,
} from '@/webPublic/one_stop_public/2023yunshangguizhou/utils'; } from '@/webPublic/one_stop_public/2023yunshangguizhou/utils';
import { getIsBei_Dian } from '@/webPublic/zyd_public/utils/utils'; import { getIsBei_Dian } from '@/webPublic/zyd_public/utils/utils';
...@@ -19,9 +20,7 @@ export function getVisitorToken() { ...@@ -19,9 +20,7 @@ export function getVisitorToken() {
export function getHeaders(url = '', headersApi = undefined) { export function getHeaders(url = '', headersApi = undefined) {
let token = getVisitorToken(); let token = getVisitorToken();
const res = { const res = {
headers: { headers: getSassApiHeader(),
sysCode: getSysCode(),
},
}; };
if (process.env.NODE_ENV === 'development' && getIsBei_Dian()) { if (process.env.NODE_ENV === 'development' && getIsBei_Dian()) {
res.headers.env = 'test'; res.headers.env = 'test';
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论