From a5fd1e5d4efe92258f7de2b3b5e6df6946642ced Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Tue, 16 Apr 2024 18:02:01 +0800 Subject: [PATCH] =?UTF-8?q?404=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=91=8A=E8=AD=A6=E5=BC=B9=E7=AA=97=EF=BC=8C?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=8A=A0=E5=AF=86=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ah-jjzhgd-web/src/api/log/log.js | 11 ++- ah-jjzhgd-web/src/api/user.js | 8 +++ ah-jjzhgd-web/src/permission.js | 46 +++++------- ah-jjzhgd-web/src/store/modules/user.js | 1 + ah-jjzhgd-web/src/utils/request.js | 2 +- ah-jjzhgd-web/src/views/error-page/404.vue | 2 +- ah-jjzhgd-web/src/views/home/index.vue | 70 ++++++++++++++++++- .../src/views/log/abnormalLog/index.vue | 13 ++-- .../src/views/log/logAnalyse/index.vue | 13 +++- ah-jjzhgd-web/src/views/login/index.vue | 1 + .../src/views/system/roles/index.vue | 1 + 11 files changed, 123 insertions(+), 45 deletions(-) diff --git a/ah-jjzhgd-web/src/api/log/log.js b/ah-jjzhgd-web/src/api/log/log.js index 76d9ebb..cb89e91 100644 --- a/ah-jjzhgd-web/src/api/log/log.js +++ b/ah-jjzhgd-web/src/api/log/log.js @@ -83,8 +83,15 @@ export function getLogSize(data) { }) } - - + //添加异常Ip日志 + export function addLogs(data) { + return request({ + url: '/system/sys/sysLog/addLogs', + method: 'post', + data:data + }) + } + diff --git a/ah-jjzhgd-web/src/api/user.js b/ah-jjzhgd-web/src/api/user.js index 507976e..f242758 100644 --- a/ah-jjzhgd-web/src/api/user.js +++ b/ah-jjzhgd-web/src/api/user.js @@ -72,3 +72,11 @@ export function editPwd(params) { data: params }) } + +export function logWarn(params) { + return request({ + url: '/system/sys/sysLog/logWarn', + method: 'post', + data: params + }) +} \ No newline at end of file diff --git a/ah-jjzhgd-web/src/permission.js b/ah-jjzhgd-web/src/permission.js index 5f81305..d8e0870 100644 --- a/ah-jjzhgd-web/src/permission.js +++ b/ah-jjzhgd-web/src/permission.js @@ -5,6 +5,7 @@ import NProgress from 'nprogress' // progress bar import 'nprogress/nprogress.css' // progress bar style import { getToken } from '@/utils/auth' // get token from cookie import getPageTitle from '@/utils/get-page-title' +import {addLogs} from '@/api/log/log' NProgress.configure({ showSpinner: false }) // NProgress Configuration @@ -15,13 +16,9 @@ router.beforeEach(async(to, from, next) => { NProgress.start() // set page title document.title = getPageTitle(to.meta.title) - - // determine whether the user has logged in - const hasToken = getToken() - - // if (to.path === '/sso') { - // next() - // } else { + + // determine whether the user has logged in + const hasToken = getToken() if (hasToken) { if (to.path === '/login') { // if is logged in, redirect to the home page @@ -39,28 +36,6 @@ router.beforeEach(async(to, from, next) => { router.addRoutes(accessRoutes) next({ ...to, replace: true }) } - // try { - // console.log(11111111) - // // get user info - // // note: roles must be a object array! such as: ['admin'] or ,['developer','editor'] - // // const { roles } = await store.dispatch('user/getInfo') - // // generate accessible routes map based on roles - // const accessRoutes = await store.dispatch('permission/generateRoutes', roles) - // // const accessRoutes = [] - // // dynamically add accessible routes - // router.addRoutes(accessRoutes) - - // // hack method to ensure that addRoutes is complete - // // set the replace: true, so the navigation will not leave a history record - // next({ ...to, replace: true }) - // } catch (error) { - // // remove token and go to login page to re-login - // await store.dispatch('user/resetToken') - // Message.error(error || 'Has Error') - // next(`/login?redirect=${to.path}`) - // NProgress.done() - // } - // } } } else { /* has no token*/ @@ -74,7 +49,18 @@ router.beforeEach(async(to, from, next) => { NProgress.done() } } - // } + + if (to.path === '/404') { + console.log(to.redirectedFrom) + let param = { + operUri: to.redirectedFrom + } + addLogs(param).then((response) => { + // if(response) + + }) + next() + } }) router.afterEach(() => { diff --git a/ah-jjzhgd-web/src/store/modules/user.js b/ah-jjzhgd-web/src/store/modules/user.js index d610865..dd6c4f1 100644 --- a/ah-jjzhgd-web/src/store/modules/user.js +++ b/ah-jjzhgd-web/src/store/modules/user.js @@ -40,6 +40,7 @@ const actions = { setUs(data.us)// 存储用户信息到缓存 commit('SET_ROLES', data.us.role) commit('SET_NAME', data.us.userName) + sessionStorage.setItem('nickName',JSON.parse(data.us).nickName) resolve() }).catch(error => { reject(error) diff --git a/ah-jjzhgd-web/src/utils/request.js b/ah-jjzhgd-web/src/utils/request.js index 067b0ed..1172890 100644 --- a/ah-jjzhgd-web/src/utils/request.js +++ b/ah-jjzhgd-web/src/utils/request.js @@ -34,7 +34,7 @@ const service = axios.create({ // request拦截器 service.interceptors.request.use(config => { // 是否需要加密 - let aqEnnable = true; + let aqEnnable = false; // 是否需要设置 token const isToken = (config.headers || {}).isToken === false // 是否需要防止数据重复提交 diff --git a/ah-jjzhgd-web/src/views/error-page/404.vue b/ah-jjzhgd-web/src/views/error-page/404.vue index 7cbdada..2daff98 100644 --- a/ah-jjzhgd-web/src/views/error-page/404.vue +++ b/ah-jjzhgd-web/src/views/error-page/404.vue @@ -28,7 +28,7 @@ export default { message() { return '找不到网页！' } - } + }, } diff --git a/ah-jjzhgd-web/src/views/home/index.vue b/ah-jjzhgd-web/src/views/home/index.vue index 31dff91..743fab2 100644 --- a/ah-jjzhgd-web/src/views/home/index.vue +++ b/ah-jjzhgd-web/src/views/home/index.vue @@ -2,19 +2,85 @@
+ + + + + + + + +
+ + 确定 + +
+ + + + + + + + +
+ + 确定 + +
+ +
diff --git a/ah-jjzhgd-web/src/views/log/abnormalLog/index.vue b/ah-jjzhgd-web/src/views/log/abnormalLog/index.vue index 40e53b6..df969fb 100644 --- a/ah-jjzhgd-web/src/views/log/abnormalLog/index.vue +++ b/ah-jjzhgd-web/src/views/log/abnormalLog/index.vue @@ -27,9 +27,9 @@ - + @@ -75,9 +75,10 @@ - - -