npm/wo-user-toolkit-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

send _passtoken in post body instead of in header, because cloudflare doesn't pass header to my server

Browse Source
This commit is contained in:
陆柯 2023-03-12 16:54:15 +08:00
parent 81e7e50b65
commit da8bb9a4a5
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unitool.js
View File

@ -195,8 +195,7 @@ export default {
let [error, { statusCode, header, errMsg, data: resultServer = {} } = {}] = await uni.request({ let [error, { statusCode, header, errMsg, data: resultServer = {} } = {}] = await uni.request({
method: httpMethod, method: httpMethod,
url: url, url: url,
header: { _passtoken: uni.getStorageSync('_passtoken') }, data: { ...apiWhat, _passtoken: uni.getStorageSync('_passtoken') },
data: apiWhat,
}) })
if (error) { if (error) {
if (error.errMsg === 'request:fail') { if (error.errMsg === 'request:fail') {
@ -249,11 +248,6 @@ export default {
name = 'file', name = 'file',
} = {}) { } = {}) {
// 有的管理后台不需要登录就允许上传，例如 cmctoy。因此不要在这里依赖登录状态。 // 有的管理后台不需要登录就允许上传，例如 cmctoy。因此不要在这里依赖登录状态。
// if (uni.getStorageSync('_passtoken')) {
// header._passtoken = uni.getStorageSync('_passtoken')
// } else {
// return [{ _ERROR: 'USER_OFFLINE', errMsg: 'offline user cannot upload files' }, null]
// }
let filePath let filePath
if (mediaType === 'image') { if (mediaType === 'image') {
@ -271,7 +265,7 @@ export default {
// multer 不会自动处理 JSON 数据,必须前后端配合处理 // multer 不会自动处理 JSON 数据,必须前后端配合处理
formData[key] = JSON.stringify(formData[key]) formData[key] = JSON.stringify(formData[key])
} }
header._passtoken = uni.getStorageSync('_passtoken') // 在 Fileloader/fileloader.js 里，已经不再依赖 _passtoken，而且 header 在 cloudflare 代理之后也被过滤掉了，因此不再使用这一句： header._passtoken = uni.getStorageSync('_passtoken')
uni.showLoading() uni.showLoading()
let [errorUpload, { data, statusCode } = {}] = await uni.uploadFile({ url: this.makeServerUrl(url), filePath, name, header, formData }) let [errorUpload, { data, statusCode } = {}] = await uni.uploadFile({ url: this.makeServerUrl(url), filePath, name, header, formData })