Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
op-web-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
op-web-service
Commits
1f759b0e
Commit
1f759b0e
authored
Aug 30, 2021
by
gengshaojing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:上传图片、导出订单改为调用node接口
parent
fd55430f
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
136 additions
and
19 deletions
+136
-19
relay.js
server/controllers/relay.js
+94
-0
router.js
server/router.js
+6
-0
request.js
server/utils/request.js
+14
-0
addProduc.vue
src/pages/Activity/releaseProduc/components/addProduc.vue
+1
-1
infoEditing.vue
src/pages/Activity/releaseProduc/components/infoEditing.vue
+1
-1
index.vue
src/pages/Goods/Detail/index.vue
+1
-1
groupmeal.js
src/service/Groupmeal/groupmeal.js
+19
-16
No files found.
server/controllers/relay.js
0 → 100644
View file @
1f759b0e
const
fs
=
require
(
"fs"
);
const
API_INTERNAL_URI
=
require
(
"../config.js"
).
API_INTERNAL_URI
;
const
req
=
require
(
"../utils/request"
).
httpReq
;
const
FormData
=
require
(
"form-data"
);
const
http
=
require
(
"http"
);
const
GROUPMEAL_URI
=
require
(
"../config.js"
).
GROUPMEAL_URI
;
exports
.
uploadPic
=
async
(
ctx
,
next
)
=>
{
const
url
=
`
${
API_INTERNAL_URI
}
/ksy/ks3apiunencrypt/ks3api_upload`
;
const
{
body
:
{
type
},
files
,
}
=
ctx
.
request
;
console
.
log
(
"type"
,
type
);
const
filePath
=
files
.
file
.
path
;
const
file
=
fs
.
createReadStream
(
filePath
);
const
form
=
new
FormData
();
form
.
append
(
"file"
,
file
);
form
.
append
(
"type"
,
type
);
const
opts
=
{
method
:
"post"
,
url
:
url
,
body
:
form
,
headers
:
form
.
getHeaders
(),
};
ctx
.
body
=
await
req
(
opts
);
};
exports
.
oldOrderExport
=
async
(
ctx
)
=>
{
const
{
marketing_id
,
type
}
=
ctx
.
query
;
// `${ENV}order/oldbackground/order_export?marketing_id=${eventId}&type=${type}`;
const
url
=
`
${
GROUPMEAL_URI
}
/order/oldbackground/order_export?marketing_id=
${
marketing_id
}
&type=
${
type
}
`
;
console
.
log
(
'url'
,
url
);
const
options
=
new
URL
(
url
);
let
{
buffer
,
res
}
=
await
requestPromise
(
options
);
const
fileName
=
res
.
headers
[
"content-disposition"
].
split
(
"="
)[
1
];
ctx
.
set
(
"Content-Type"
,
"application/octet-stream"
);
ctx
.
set
(
"Content-Disposition"
,
`attachment; filename=
${
fileName
}
`
);
ctx
.
body
=
buffer
;
}
exports
.
orderExport
=
async
(
ctx
)
=>
{
const
{
marketing_id
,
type
}
=
ctx
.
query
;
const
url
=
`
${
GROUPMEAL_URI
}
/order/background/order_export?marketing_id=
${
marketing_id
}
&type=
${
type
}
`
;
console
.
log
(
'url'
,
url
);
const
options
=
new
URL
(
url
);
let
{
buffer
,
res
}
=
await
requestPromise
(
options
);
const
fileName
=
res
.
headers
[
"content-disposition"
].
split
(
"="
)[
1
];
ctx
.
set
(
"Content-Type"
,
"application/octet-stream"
);
ctx
.
set
(
"Content-Disposition"
,
`attachment; filename=
${
fileName
}
`
);
ctx
.
body
=
buffer
;
};
function
requestPromise
(
options
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
const
req
=
http
.
request
(
options
,
function
(
res
)
{
let
{
statusCode
}
=
res
;
//返回不是200
if
(
statusCode
!==
200
)
{
return
reject
(
new
Error
(
"error"
));
}
let
arr
=
[];
let
len
=
0
;
res
.
on
(
"data"
,
(
chunk
)
=>
{
len
+=
chunk
.
length
;
arr
.
push
(
Buffer
.
from
(
chunk
));
});
res
.
on
(
"end"
,
()
=>
{
//正确 success
return
resolve
({
buffer
:
Buffer
.
concat
(
arr
,
len
),
res
,
});
});
});
//请求出错
req
.
on
(
"error"
,
(
err
)
=>
{
return
reject
(
err
);
});
req
.
end
();
});
}
server/router.js
View file @
1f759b0e
...
...
@@ -10,6 +10,7 @@ const activity = require('./controllers/activity');
const
withdrawal
=
require
(
'./controllers/withdrawal'
);
const
groupmeal
=
require
(
'./controllers/groupmeal'
);
const
qr_code
=
require
(
'./controllers/qr-code'
);
const
relay
=
require
(
'./controllers/relay'
);
const
router
=
Router
();
const
API_VERSION
=
"/api/v1"
;
...
...
@@ -131,4 +132,9 @@ router.post(`${API_VERSION}/get_reblack_list`, withdrawal.getReblackList)
router
.
get
(
`
${
API_VERSION
}
/get_wallet_account_status`
,
withdrawal
.
getWalletAccountStatus
)
router
.
post
(
`
${
API_VERSION
}
/reset_wallet_account_status`
,
withdrawal
.
resetAccountStatus
)
// 图片上传
router
.
post
(
`
${
API_VERSION
}
/relay/ks3api_upload`
,
relay
.
uploadPic
)
router
.
get
(
`
${
API_VERSION
}
/relay/order_export`
,
relay
.
orderExport
)
router
.
get
(
`
${
API_VERSION
}
/relay/old_order_export`
,
relay
.
oldOrderExport
)
module
.
exports
=
router
;
\ No newline at end of file
server/utils/request.js
View file @
1f759b0e
...
...
@@ -32,3 +32,17 @@ exports.httpReq = (ctx, opts) => {
});
});
};
exports
.
httpReqOther
=
(
opts
)
=>
{
opts
.
timeout
=
opts
.
timeout
||
10000
;
return
new
Promise
((
resolve
,
reject
)
=>
{
request
(
opts
,
(
err
,
res
,
body
)
=>
{
if
(
!
err
)
{
resolve
(
body
);
}
else
{
reject
(
err
);
console
.
error
(
opts
.
url
,
err
);
}
});
});
};
src/pages/Activity/releaseProduc/components/addProduc.vue
View file @
1f759b0e
...
...
@@ -368,7 +368,7 @@ var addProduct = {
picUrlList
:
[],
picUploadList
:
[],
// 上传详情图片列表
isShowPopver
:
false
,
// 是否展示图片框
uploadUrl
:
`
${
GOODS_URI
}
/ksy/ks3apiunencrypt
/ks3api_upload`
,
// 金山云上传地址
uploadUrl
:
`
/api/v1/relay
/ks3api_upload`
,
// 金山云上传地址
hideUpload
:
false
,
limitCount
:
1
,
...
...
src/pages/Activity/releaseProduc/components/infoEditing.vue
View file @
1f759b0e
...
...
@@ -71,7 +71,7 @@ export default {
picSubmitList
:
[],
// 发布功能需要的图片列表
propData
:
{},
isShowPopver
:
false
,
// 是否展示图片框
uploadUrl
:
`
${
GOODS_URI
}
/ksy/ks3apiunencrypt
/ks3api_upload`
,
// 金山云上传地址
uploadUrl
:
`
/api/v1/relay
/ks3api_upload`
,
// 金山云上传地址
hideUpload
:
false
,
limitCount
:
9
};
...
...
src/pages/Goods/Detail/index.vue
View file @
1f759b0e
...
...
@@ -793,7 +793,7 @@ export default {
activeStartTime
:
""
,
// 活动开始时间
activeEndTime
:
""
,
// 活动结束时间
uploadUrl
:
`
${
GOODS_URI
}
/ksy/ks3apiunencrypt
/ks3api_upload`
,
// 金山云上传地址
uploadUrl
:
`
/api/v1/relay
/ks3api_upload`
,
// 金山云上传地址
addShopShow
:
false
,
// 添加门店弹框显示
...
...
src/service/Groupmeal/groupmeal.js
View file @
1f759b0e
...
...
@@ -124,15 +124,21 @@ export async function orderRefundReject(params) {
// 导出订单
export
function
getOrderExportURL
(
eventId
,
type
)
{
var
ENV
;
if
(
process
.
env
.
NODE_ENV
==
"development"
){
ENV
=
"http://bp-dev.ini.yidian-inc.com/"
}
else
if
(
process
.
env
.
NODE_ENV
==
"test"
){
ENV
=
"http://bp-test.ini.yidian-inc.com/"
}
else
{
ENV
=
"http://bp.int.yidian-inc.com/"
// var ENV;
// if(process.env.NODE_ENV == "development"){
// ENV = "http://bp-dev.ini.yidian-inc.com/"
// }else if(process.env.NODE_ENV == "test"){
// ENV = "http://bp-test.ini.yidian-inc.com/"
// }else{
// ENV = "http://bp.int.yidian-inc.com/"
// }
// return `${ENV}order/oldbackground/order_export?marketing_id=${eventId}&type=${type}`;
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
return
`http://127.0.0.1:8055/api/v1/relay/old_order_export?marketing_id=
${
eventId
}
&type=
${
type
}
`
;
}
else
{
return
`/api/v1/relay/old_order_export?marketing_id=
${
eventId
}
&type=
${
type
}
`
;
}
return
`
${
ENV
}
order/oldbackground/order_export?marketing_id=
${
eventId
}
&type=
${
type
}
`
;
}
// 新订单管理
...
...
@@ -210,13 +216,10 @@ export async function newOrderRefundReject(params) {
// 导出订单
export
function
newGetOrderExportURL
(
eventId
,
type
)
{
var
ENV
;
if
(
process
.
env
.
NODE_ENV
==
"development"
){
ENV
=
"http://bp-dev.ini.yidian-inc.com/"
}
else
if
(
process
.
env
.
NODE_ENV
==
"test"
){
ENV
=
"http://bp-test.ini.yidian-inc.com/"
}
else
{
ENV
=
"http://bp.int.yidian-inc.com/"
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
return
`http://127.0.0.1:8055/api/v1/relay/order_export?marketing_id=
${
eventId
}
&type=
${
type
}
`
;
}
else
{
return
`/api/v1/relay/order_export?marketing_id=
${
eventId
}
&type=
${
type
}
`
;
}
return
`
${
ENV
}
order/background
/order_export?marketing_id=
${
eventId
}
&type=
${
type
}
`
;
// return `/api/v1/relay
/order_export?marketing_id=${eventId}&type=${type}`;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment