Commit 96866393 authored by lvweichao's avatar lvweichao

update: fix koa use order

parent 8ae37e3a
const Koa = require('koa'); const Koa = require('koa');
const views = require('koa-views'); // const views = require('koa-views');
const serve = require('koa-static'); const serve = require('koa-static');
const koaBody = require('koa-body'); const koaBody = require('koa-body');
const bodyParser = require('koa-bodyparser'); const bodyParser = require('koa-bodyparser');
...@@ -11,11 +11,15 @@ const env = process.env.NODE_ENV; ...@@ -11,11 +11,15 @@ const env = process.env.NODE_ENV;
const app = new Koa(); const app = new Koa();
app.use(koaBody({ multipart: true }));
app.use(bodyParser());
app.use(router.routes(), router.allowedMethods()); app.use(router.routes(), router.allowedMethods());
app.use(serve(path.join(__dirname, './public'))); app.use(serve(path.join(__dirname, './public')));
app.use(koaBody({ multipart: true }));
app.use(bodyParser());
app.listen(config.port, () => { app.listen(config.port, () => {
console.info( console.info(
......
const LOGIN_URI = require('../config.js').LOGIN_URI const LOGIN_URI = require('../config.js').LOGIN_URI
const API_INTERNAL_URI = require('../config.js').API_INTERNAL_URI const API_INTERNAL_URI = require('../config.js').API_INTERNAL_URI
const req = require('../utils/request').httpReq const req = require('../utils/request').httpReq
const controller_utils = require('./utils')
exports.getAll_role_list = async (ctx, next) => { exports.getAll_role_list = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/get_role_list`; ctx.body = await controller_utils.getUserPermission(ctx);
var opts = {
url: url,
method: 'POST',
json: true,
timeout: 8000,
body: ctx.request.body
}
ctx.body = await req(ctx, opts)
} }
exports.getRole_list = async (ctx, next) => { exports.getRole_list = async (ctx, next) => {
var url = `${API_INTERNAL_URI}/merchant/authority/role_list`; var url = `${API_INTERNAL_URI}/merchant/authority/role_list`;
......
...@@ -36,7 +36,14 @@ const getDefaultParams = () => { ...@@ -36,7 +36,14 @@ const getDefaultParams = () => {
} }
}; };
const getDefaultHeaders = () => {}; const getDefaultHeaders = (config) => {
const { method } = config;
if (method.toLowerCase() === 'post') {
return {
"Content-Type": "application/json"
}
}
};
/** /**
* axios instance * axios instance
...@@ -57,7 +64,7 @@ instance.interceptors.request.use( ...@@ -57,7 +64,7 @@ instance.interceptors.request.use(
/** /**
* merge headers * merge headers
*/ */
config.headers = { ...getDefaultHeaders(), ...config.headers } config.headers = { ...getDefaultHeaders(config), ...config.headers }
/** /**
* merge params * merge params
......
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