diff --git a/ZR.Admin.WebApi/NLog.config b/ZR.Admin.WebApi/NLog.config index a6d075c..4982ce8 100644 --- a/ZR.Admin.WebApi/NLog.config +++ b/ZR.Admin.WebApi/NLog.config @@ -30,6 +30,15 @@ keepFileOpen="false" layout="${longdate} | ${event-properties:item=EventId_Id} | ${uppercase:${level}} | ${logger} | ${aspnet-request-iP} | ${event-properties:item=user} | ${aspnet-request-url} | ${message} | ${event-properties:item=requestParam} | ${event-properties:item=jsonResult} | ${onexception:${exception:format=tostring}"/> + + + @@ -46,6 +55,7 @@ + diff --git a/ZR.Vue/src/store/getters.js b/ZR.Vue/src/store/getters.js index adcf1d8..ec52d5f 100644 --- a/ZR.Vue/src/store/getters.js +++ b/ZR.Vue/src/store/getters.js @@ -7,6 +7,7 @@ const getters = { token: state => state.user.token, avatar: state => state.user.avatar, name: state => state.user.name, + userId: state => state.user.userInfo.userId, introduction: state => state.user.introduction, roles: state => state.user.roles, permissions: state => state.user.permissions, diff --git a/ZR.Vue/src/utils/request.js b/ZR.Vue/src/utils/request.js index 9cf7d49..4336d66 100644 --- a/ZR.Vue/src/utils/request.js +++ b/ZR.Vue/src/utils/request.js @@ -26,6 +26,7 @@ service.interceptors.request.use(config => { if (getToken()) { //将token放到请求头发送给服务器,将tokenkey放在请求头中 config.headers['Authorization'] = 'Bearer ' + getToken(); + config.headers['userid'] = store.getters.userId; } else { // console.log(config) } @@ -42,7 +43,7 @@ service.interceptors.response.use(res => { return; } // 未设置状态码则默认成功状态 - const { code , msg } = res.data; + const { code, msg } = res.data; if (code == 401) { MessageBox.confirm('登录状态已过期,请重新登录', '系统提示', { @@ -137,4 +138,4 @@ export function postForm(url, data, config) { }) }) } -export default service +export default service \ No newline at end of file