From c65ff06918b613b121ee2daae56b67e5df9f1fcf Mon Sep 17 00:00:00 2001 From: ktianc Date: Sun, 14 May 2023 23:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7=EF=BC=9A?= =?UTF-8?q?=201.=20=E4=BF=AE=E5=A4=8D=EF=BC=88kinit-api=EF=BC=89=EF=BC=9Au?= =?UTF-8?q?tils/cache.py=20=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=202.=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=88kinit-api=EF=BC=89=EF=BC=9Atoken=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=A4=B1=E8=B4=A5=E4=BC=9A=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=203.=20=E4=BC=98=E5=8C=96=EF=BC=88k?= =?UTF-8?q?init-api=EF=BC=89=EF=BC=9A=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=A4=B1=E8=B4=A5=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E4=BC=98=E5=8C=96=204.=20=E4=BC=98=E5=8C=96=EF=BC=88kinit-api?= =?UTF-8?q?=EF=BC=89=EF=BC=9A=E8=8E=B7=E5=8F=96redis=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BAredis=5Fgetter(request)=205?= =?UTF-8?q?.=20=E4=BC=98=E5=8C=96=EF=BC=88kini-api=EF=BC=89=EF=BC=9A?= =?UTF-8?q?=E6=96=87=E4=BB=B6IO=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=E6=93=8D=E4=BD=9C=206.=20=E4=BC=98=E5=8C=96=EF=BC=88k?= =?UTF-8?q?init-api=EF=BC=89=EF=BC=9A=E5=85=B3=E8=81=94=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=BA=E6=97=B6=E5=B0=86user=5Fid=E6=94=B9=E4=B8=BAcreate=5F?= =?UTF-8?q?user=5Fid=207.=20=E6=96=87=E6=A1=A3=EF=BC=88kinit-api=EF=BC=89?= =?UTF-8?q?=EF=BC=9Akinit-api/README.md=20=E5=8A=A0=E5=85=A5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=96=87=E6=A1=A3=208.=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=EF=BC=88kinit-admin=EF=BC=89=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=97=A0=E6=B3=95=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=209.=20=E4=BC=98=E5=8C=96=EF=BC=88kinit-admi?= =?UTF-8?q?n=EF=BC=89=EF=BC=9A=E8=A7=92=E8=89=B2=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=8E=E7=BC=96=E8=BE=91=E6=A1=86=E4=BD=BF=E7=94=A8=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=88=B6=E5=AD=90=E8=81=94=E5=8A=A8=2010.=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=EF=BC=88kinit-admin=EF=BC=89=EF=BC=9AusePermissionSto?= =?UTF-8?q?re=20=E6=94=B9=E4=B8=BA=20useRouterStoreWithOut=EF=BC=8C?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E6=AD=A4=E6=96=87=E4=BB=B6=E4=B8=BB=E8=A6=81?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=B7=AF=E7=94=B1=2011.=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=EF=BC=88kinit-admin=EF=BC=89=EF=BC=9A=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8C=81=E4=B9=85?= =?UTF-8?q?=E5=8C=96=E5=AD=98=E5=82=A8=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=BB=85?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=9C=A8pinia=20store=E5=85=B1=E4=BA=AB?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=B9=B6=E6=B7=BB=E5=8A=A0roles=EF=BC=8Cperm?= =?UTF-8?q?issions=E4=BF=A1=E6=81=AF=2012.=20=E4=BF=AE=E5=A4=8D=EF=BC=88ki?= =?UTF-8?q?nit-admin=EF=BC=89=EF=BC=9A=E8=8F=9C=E5=8D=95=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=8E=E7=BC=96=E8=BE=91=E6=A1=86=EF=BC=8C=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E4=B8=8E=E8=8F=9C=E5=8D=95=E5=88=87=E6=8D=A2=E6=97=B6=E4=BC=9A?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=8A=96=E5=8A=A8=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=2013.=20=E4=BC=98=E5=8C=96=EF=BC=88kinit-admin?= =?UTF-8?q?=EF=BC=89=EF=BC=9Asrc\hooks\web\useTable.ts=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E6=96=B9=E6=B3=95?= =?UTF-8?q?=2014.=20=E4=BC=98=E5=8C=96=EF=BC=88kinit-admin=EF=BC=89?= =?UTF-8?q?=EF=BC=9Aconfig/services.ts=20=E6=96=B0=E5=A2=9E=E8=BF=94?= =?UTF-8?q?=E5=9B=9E403=E7=8A=B6=E6=80=81=E7=A0=81=E6=97=B6=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E9=80=80=E5=87=BA=E7=B3=BB=E7=BB=9F=2015.=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=88kinit-admin=EF=BC=89=EF=BC=9A=E5=B0=86store?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=9C=AC=E6=96=87=E4=BB=B6=E4=BD=BF=E7=94=A8?= =?UTF-8?q?store=E8=B0=83=E7=94=A8=E7=9A=84=EF=BC=8C=E6=94=B9=E4=B8=BAthis?= =?UTF-8?q?=2016.=20=E6=9B=B4=E6=96=B0=EF=BC=88kinit-admin=EF=BC=89?= =?UTF-8?q?=EF=BC=9A=E8=B7=AF=E7=94=B1=E6=8B=A6=E6=88=AA=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=2017.=20=E6=9B=B4=E6=96=B0=EF=BC=88kinit-api=EF=BC=8Ckinit-adm?= =?UTF-8?q?in=EF=BC=8Ckinit-uni=EF=BC=89=EF=BC=9A=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=E6=9C=80=E5=90=8E=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=20/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/dashboard/analysis/index.ts | 8 +- kinit-admin/src/api/dashboard/map/index.ts | 2 +- .../src/api/dashboard/workplace/index.ts | 12 +- kinit-admin/src/api/login/index.ts | 6 +- kinit-admin/src/api/vadmin/auth/menu.ts | 12 +- kinit-admin/src/api/vadmin/auth/role.ts | 12 +- kinit-admin/src/api/vadmin/auth/user.ts | 26 +-- kinit-admin/src/api/vadmin/help/issue.ts | 22 +-- kinit-admin/src/api/vadmin/system/dict.ts | 24 +-- kinit-admin/src/api/vadmin/system/files.ts | 2 +- .../src/api/vadmin/system/record/login.ts | 2 +- .../src/api/vadmin/system/record/operation.ts | 2 +- kinit-admin/src/api/vadmin/system/settings.ts | 12 +- .../components/Breadcrumb/src/Breadcrumb.vue | 6 +- kinit-admin/src/components/Menu/src/Menu.vue | 6 +- .../src/components/TabMenu/src/TabMenu.vue | 12 +- .../src/components/TagsView/src/TagsView.vue | 12 +- kinit-admin/src/config/axios/service.ts | 6 +- .../src/directives/permission/hasPermi.ts | 8 +- kinit-admin/src/hooks/web/useTable.ts | 45 +++-- kinit-admin/src/permission.ts | 16 +- kinit-admin/src/store/modules/app.ts | 5 - kinit-admin/src/store/modules/auth.ts | 44 +++-- .../modules/{permission.ts => router.ts} | 10 +- kinit-admin/src/views/Dashboard/Workplace.vue | 11 +- .../src/views/Login/components/LoginForm.vue | 12 +- .../Login/components/TelephoneCodeForm.vue | 12 +- kinit-admin/src/views/Reset/Reset.vue | 12 +- .../vadmin/auth/menu/components/Write.vue | 2 +- .../src/views/vadmin/auth/menu/index.vue | 7 +- .../vadmin/auth/role/components/Write.vue | 2 +- .../src/views/vadmin/auth/role/index.vue | 6 +- .../vadmin/auth/user/components/Password.vue | 98 ---------- .../src/views/vadmin/auth/user/index.vue | 23 ++- .../src/views/vadmin/help/issue/index.vue | 7 +- .../views/vadmin/help/issueCategory/index.vue | 6 +- .../src/views/vadmin/system/dict/detail.vue | 6 +- .../src/views/vadmin/system/dict/index.vue | 6 +- kinit-api/README.md | 174 +++++++++++++++++- kinit-api/application/settings.py | 12 +- kinit-api/apps/vadmin/analysis/views.py | 8 +- kinit-api/apps/vadmin/auth/models/user.py | 2 +- kinit-api/apps/vadmin/auth/utils/login.py | 8 +- .../apps/vadmin/auth/utils/login_manage.py | 3 +- .../apps/vadmin/auth/utils/validation/auth.py | 32 +++- .../vadmin/auth/utils/validation/login.py | 3 +- kinit-api/apps/vadmin/auth/views.py | 58 +++--- kinit-api/apps/vadmin/help/crud.py | 35 +++- kinit-api/apps/vadmin/help/models/issue.py | 8 +- kinit-api/apps/vadmin/help/schemas/issue.py | 4 +- .../vadmin/help/schemas/issue_category.py | 4 +- .../apps/vadmin/help/schemas/issue_m2m.py | 2 +- kinit-api/apps/vadmin/help/views.py | 42 +++-- kinit-api/apps/vadmin/record/views.py | 8 +- kinit-api/apps/vadmin/system/crud.py | 2 +- kinit-api/apps/vadmin/system/views.py | 42 ++--- kinit-api/apps/vadmin/workplace/views.py | 10 +- kinit-api/core/database.py | 1 - kinit-api/core/exception.py | 2 +- kinit-api/requirements.txt | 2 +- kinit-api/utils/cache.py | 4 +- kinit-api/utils/file/file_manage.py | 52 ++++-- kinit-uni/common/request/api/login.js | 8 +- .../common/request/api/vadmin/auth/user.js | 6 +- .../common/request/api/vadmin/help/issue.js | 6 +- .../common/request/api/vadmin/system/dict.js | 2 +- .../request/api/vadmin/system/settings.js | 2 +- 67 files changed, 605 insertions(+), 459 deletions(-) rename kinit-admin/src/store/modules/{permission.ts => router.ts} (88%) delete mode 100644 kinit-admin/src/views/vadmin/auth/user/components/Password.vue diff --git a/kinit-admin/src/api/dashboard/analysis/index.ts b/kinit-admin/src/api/dashboard/analysis/index.ts index 5240286..91374b3 100644 --- a/kinit-admin/src/api/dashboard/analysis/index.ts +++ b/kinit-admin/src/api/dashboard/analysis/index.ts @@ -7,17 +7,17 @@ import type { } from './types' export const getBannersApi = (): Promise> => { - return request.get({ url: '/vadmin/analysis/banners/' }) + return request.get({ url: '/vadmin/analysis/banners' }) } export const getUserAccessSourceApi = (): Promise> => { - return request.get({ url: '/vadmin/analysis/user/access/source/' }) + return request.get({ url: '/vadmin/analysis/user/access/source' }) } export const getWeeklyUserActivityApi = (): Promise> => { - return request.get({ url: '/vadmin/analysis/weekly/user/activity/' }) + return request.get({ url: '/vadmin/analysis/weekly/user/activity' }) } export const getMonthlySalesApi = (): Promise> => { - return request.get({ url: '/vadmin/analysis/monthly/sales/' }) + return request.get({ url: '/vadmin/analysis/monthly/sales' }) } diff --git a/kinit-admin/src/api/dashboard/map/index.ts b/kinit-admin/src/api/dashboard/map/index.ts index 9661d6c..5544d0d 100644 --- a/kinit-admin/src/api/dashboard/map/index.ts +++ b/kinit-admin/src/api/dashboard/map/index.ts @@ -1,5 +1,5 @@ import request from '@/config/axios' export const getUserLoginDistributeApi = (): Promise => { - return request.get({ url: '/vadmin/record/analysis/user/login/distribute/' }) + return request.get({ url: '/vadmin/record/analysis/user/login/distribute' }) } diff --git a/kinit-admin/src/api/dashboard/workplace/index.ts b/kinit-admin/src/api/dashboard/workplace/index.ts index a25c948..785479f 100644 --- a/kinit-admin/src/api/dashboard/workplace/index.ts +++ b/kinit-admin/src/api/dashboard/workplace/index.ts @@ -2,25 +2,25 @@ import request from '@/config/axios' import type { WorkplaceTotal, Project, Dynamic, Team, RadarData, Shortcuts } from './types' export const getCountApi = (): Promise> => { - return request.get({ url: '/vadmin/workplace/total/' }) + return request.get({ url: '/vadmin/workplace/total' }) } export const getProjectApi = (): Promise> => { - return request.get({ url: '/vadmin/workplace/project/' }) + return request.get({ url: '/vadmin/workplace/project' }) } export const getDynamicApi = (): Promise> => { - return request.get({ url: '/vadmin/workplace/dynamic/' }) + return request.get({ url: '/vadmin/workplace/dynamic' }) } export const getTeamApi = (): Promise> => { - return request.get({ url: '/vadmin/workplace/team/' }) + return request.get({ url: '/vadmin/workplace/team' }) } export const getRadarApi = (): Promise> => { - return request.get({ url: '/vadmin/workplace/radar/' }) + return request.get({ url: '/vadmin/workplace/radar' }) } export const getShortcutsApi = (): Promise> => { - return request.get({ url: '/vadmin/workplace/shortcuts/' }) + return request.get({ url: '/vadmin/workplace/shortcuts' }) } diff --git a/kinit-admin/src/api/login/index.ts b/kinit-admin/src/api/login/index.ts index b51a94a..abfb0eb 100644 --- a/kinit-admin/src/api/login/index.ts +++ b/kinit-admin/src/api/login/index.ts @@ -2,13 +2,13 @@ import request from '@/config/axios' import type { UserLoginType } from './types' export const loginApi = (data: UserLoginType): Promise => { - return request.post({ url: '/auth/login/', data }) + return request.post({ url: '/auth/login', data }) } export const getRoleMenusApi = (): Promise> => { - return request.get({ url: '/auth/getMenuList/' }) + return request.get({ url: '/auth/getMenuList' }) } export const postSMSCodeApi = (params: any): Promise => { - return request.post({ url: '/vadmin/system/sms/send/', params }) + return request.post({ url: '/vadmin/system/sms/send', params }) } diff --git a/kinit-admin/src/api/vadmin/auth/menu.ts b/kinit-admin/src/api/vadmin/auth/menu.ts index 2c7da4a..2db0e7e 100644 --- a/kinit-admin/src/api/vadmin/auth/menu.ts +++ b/kinit-admin/src/api/vadmin/auth/menu.ts @@ -2,25 +2,25 @@ import request from '@/config/axios' import { List } from 'echarts' export const getMenuListApi = (params: any): Promise => { - return request.get({ url: '/vadmin/auth/menus/', params }) + return request.get({ url: '/vadmin/auth/menus', params }) } export const delMenuListApi = (data: List): Promise => { - return request.delete({ url: '/vadmin/auth/menus/', data }) + return request.delete({ url: '/vadmin/auth/menus', data }) } export const addMenuListApi = (data: any): Promise => { - return request.post({ url: '/vadmin/auth/menus/', data }) + return request.post({ url: '/vadmin/auth/menus', data }) } export const putMenuListApi = (data: any): Promise => { - return request.put({ url: `/vadmin/auth/menus/${data.id}/`, data }) + return request.put({ url: `/vadmin/auth/menus/${data.id}`, data }) } export const getMenuTreeOptionsApi = (): Promise => { - return request.get({ url: '/vadmin/auth/menus/tree/options/' }) + return request.get({ url: '/vadmin/auth/menus/tree/options' }) } export const getMenuRoleTreeOptionsApi = (): Promise => { - return request.get({ url: '/vadmin/auth/menus/role/tree/options/' }) + return request.get({ url: '/vadmin/auth/menus/role/tree/options' }) } diff --git a/kinit-admin/src/api/vadmin/auth/role.ts b/kinit-admin/src/api/vadmin/auth/role.ts index 0ff7874..31747b9 100644 --- a/kinit-admin/src/api/vadmin/auth/role.ts +++ b/kinit-admin/src/api/vadmin/auth/role.ts @@ -1,25 +1,25 @@ import request from '@/config/axios' export const getRoleListApi = (params: any): Promise => { - return request.get({ url: '/vadmin/auth/roles/', params }) + return request.get({ url: '/vadmin/auth/roles', params }) } export const addRoleListApi = (data: any): Promise => { - return request.post({ url: '/vadmin/auth/roles/', data }) + return request.post({ url: '/vadmin/auth/roles', data }) } export const delRoleListApi = (data: any): Promise => { - return request.delete({ url: '/vadmin/auth/roles/', data }) + return request.delete({ url: '/vadmin/auth/roles', data }) } export const putRoleListApi = (data: any): Promise => { - return request.put({ url: `/vadmin/auth/roles/${data.id}/`, data }) + return request.put({ url: `/vadmin/auth/roles/${data.id}`, data }) } export const getRoleApi = (dataId: number): Promise => { - return request.get({ url: `/vadmin/auth/roles/${dataId}/` }) + return request.get({ url: `/vadmin/auth/roles/${dataId}` }) } export const getRoleOptionsApi = (): Promise => { - return request.get({ url: `/vadmin/auth/roles/options/` }) + return request.get({ url: `/vadmin/auth/roles/options` }) } diff --git a/kinit-admin/src/api/vadmin/auth/user.ts b/kinit-admin/src/api/vadmin/auth/user.ts index 3972a2d..329d072 100644 --- a/kinit-admin/src/api/vadmin/auth/user.ts +++ b/kinit-admin/src/api/vadmin/auth/user.ts @@ -1,57 +1,57 @@ import request from '@/config/axios' export const getUserListApi = (params: any): Promise => { - return request.get({ url: '/vadmin/auth/users/', params }) + return request.get({ url: '/vadmin/auth/users', params }) } export const addUserListApi = (data: any): Promise => { - return request.post({ url: '/vadmin/auth/users/', data }) + return request.post({ url: '/vadmin/auth/users', data }) } export const delUserListApi = (data: any): Promise => { - return request.delete({ url: '/vadmin/auth/users/', data }) + return request.delete({ url: '/vadmin/auth/users', data }) } export const putUserListApi = (data: any): Promise => { - return request.put({ url: `/vadmin/auth/users/${data.id}/`, data }) + return request.put({ url: `/vadmin/auth/users/${data.id}`, data }) } export const getUserApi = (dataId: number): Promise => { - return request.get({ url: `/vadmin/auth/users/${dataId}/` }) + return request.get({ url: `/vadmin/auth/users/${dataId}` }) } export const postCurrentUserResetPassword = (data: any): Promise => { - return request.post({ url: `/vadmin/auth/user/current/reset/password/`, data }) + return request.post({ url: `/vadmin/auth/user/current/reset/password`, data }) } export const postCurrentUserUpdateInfo = (data: any): Promise => { - return request.post({ url: `/vadmin/auth/user/current/update/info/`, data }) + return request.post({ url: `/vadmin/auth/user/current/update/info`, data }) } export const getCurrentAdminUserInfo = (): Promise => { - return request.get({ url: `/vadmin/auth/user/admin/current/info/` }) + return request.get({ url: `/vadmin/auth/user/admin/current/info` }) } export const postExportUserQueryListApi = (params: any, data: any): Promise => { - return request.post({ url: `/vadmin/auth/user/export/query/list/to/excel/`, params, data }) + return request.post({ url: `/vadmin/auth/user/export/query/list/to/excel`, params, data }) } export const getImportTemplateApi = (): Promise => { - return request.get({ url: `/vadmin/auth/user/download/import/template/` }) + return request.get({ url: `/vadmin/auth/user/download/import/template` }) } export const postImportUserApi = (data: any): Promise => { return request.post({ - url: `/vadmin/auth/import/users/`, + url: `/vadmin/auth/import/users`, headersType: 'multipart/form-data', data }) } export const postUsersInitPasswordSendSMSApi = (data: any): Promise => { - return request.post({ url: `/vadmin/auth/users/init/password/send/sms/`, data }) + return request.post({ url: `/vadmin/auth/users/init/password/send/sms`, data }) } export const postUsersInitPasswordSendEmailApi = (data: any): Promise => { - return request.post({ url: `/vadmin/auth/users/init/password/send/email/`, data }) + return request.post({ url: `/vadmin/auth/users/init/password/send/email`, data }) } diff --git a/kinit-admin/src/api/vadmin/help/issue.ts b/kinit-admin/src/api/vadmin/help/issue.ts index d3e4d65..d1257a1 100644 --- a/kinit-admin/src/api/vadmin/help/issue.ts +++ b/kinit-admin/src/api/vadmin/help/issue.ts @@ -2,46 +2,46 @@ import request from '@/config/axios' // 常见问题类别 export const getIssueCategoryListApi = (params: any): Promise => { - return request.get({ url: '/vadmin/help/issue/categorys/', params }) + return request.get({ url: '/vadmin/help/issue/categorys', params }) } export const addIssueCategoryApi = (data: any): Promise => { - return request.post({ url: '/vadmin/help/issue/categorys/', data }) + return request.post({ url: '/vadmin/help/issue/categorys', data }) } export const delIssueCategoryListApi = (data: any): Promise => { - return request.delete({ url: '/vadmin/help/issue/categorys/', data }) + return request.delete({ url: '/vadmin/help/issue/categorys', data }) } export const putIssueCategoryApi = (data: any): Promise => { - return request.put({ url: `/vadmin/help/issue/categorys/${data.id}/`, data }) + return request.put({ url: `/vadmin/help/issue/categorys/${data.id}`, data }) } export const getIssueCategoryApi = (dataId: number): Promise => { - return request.get({ url: `/vadmin/help/issue/categorys/${dataId}/` }) + return request.get({ url: `/vadmin/help/issue/categorys/${dataId}` }) } export const getIssueCategoryOptionsApi = (): Promise => { - return request.get({ url: `/vadmin/help/issue/categorys/options/` }) + return request.get({ url: `/vadmin/help/issue/categorys/options` }) } // 常见问题 export const getIssueListApi = (params: any): Promise => { - return request.get({ url: '/vadmin/help/issues/', params }) + return request.get({ url: '/vadmin/help/issues', params }) } export const addIssueApi = (data: any): Promise => { - return request.post({ url: '/vadmin/help/issues/', data }) + return request.post({ url: '/vadmin/help/issues', data }) } export const delIssueListApi = (data: any): Promise => { - return request.delete({ url: '/vadmin/help/issues/', data }) + return request.delete({ url: '/vadmin/help/issues', data }) } export const putIssueApi = (data: any): Promise => { - return request.put({ url: `/vadmin/help/issues/${data.id}/`, data }) + return request.put({ url: `/vadmin/help/issues/${data.id}`, data }) } export const getIssueApi = (dataId: number): Promise => { - return request.get({ url: `/vadmin/help/issues/${dataId}/` }) + return request.get({ url: `/vadmin/help/issues/${dataId}` }) } diff --git a/kinit-admin/src/api/vadmin/system/dict.ts b/kinit-admin/src/api/vadmin/system/dict.ts index f543555..27b001a 100644 --- a/kinit-admin/src/api/vadmin/system/dict.ts +++ b/kinit-admin/src/api/vadmin/system/dict.ts @@ -1,49 +1,49 @@ import request from '@/config/axios' export const getDictTypeListApi = (params: any): Promise => { - return request.get({ url: '/vadmin/system/dict/types/', params }) + return request.get({ url: '/vadmin/system/dict/types', params }) } export const addDictTypeListApi = (data: any): Promise => { - return request.post({ url: '/vadmin/system/dict/types/', data }) + return request.post({ url: '/vadmin/system/dict/types', data }) } export const delDictTypeListApi = (data: any): Promise => { - return request.delete({ url: '/vadmin/system/dict/types/', data }) + return request.delete({ url: '/vadmin/system/dict/types', data }) } export const putDictTypeListApi = (data: any): Promise => { - return request.put({ url: `/vadmin/system/dict/types/${data.id}/`, data }) + return request.put({ url: `/vadmin/system/dict/types/${data.id}`, data }) } export const getDictTypeApi = (dataId: number): Promise => { - return request.get({ url: `/vadmin/system/dict/types/${dataId}/` }) + return request.get({ url: `/vadmin/system/dict/types/${dataId}` }) } export const getDictTypeOptionsApi = (): Promise => { - return request.get({ url: `/vadmin/system/dict/types/options/` }) + return request.get({ url: `/vadmin/system/dict/types/options` }) } export const getDictTypeDetailsApi = (data: any): Promise => { - return request.post({ url: `/vadmin/system/dict/types/details/`, data }) + return request.post({ url: `/vadmin/system/dict/types/details`, data }) } export const getDictDetailsListApi = (params: any): Promise => { - return request.get({ url: '/vadmin/system/dict/details/', params }) + return request.get({ url: '/vadmin/system/dict/details', params }) } export const addDictDetailsListApi = (data: any): Promise => { - return request.post({ url: '/vadmin/system/dict/details/', data }) + return request.post({ url: '/vadmin/system/dict/details', data }) } export const delDictDetailsListApi = (data: any): Promise => { - return request.delete({ url: '/vadmin/system/dict/details/', data }) + return request.delete({ url: '/vadmin/system/dict/details', data }) } export const putDictDetailsListApi = (data: any): Promise => { - return request.put({ url: `/vadmin/system/dict/details/${data.id}/`, data }) + return request.put({ url: `/vadmin/system/dict/details/${data.id}`, data }) } export const getDictDetailsApi = (dataId: number): Promise => { - return request.get({ url: `/vadmin/system/dict/details/${dataId}/` }) + return request.get({ url: `/vadmin/system/dict/details/${dataId}` }) } diff --git a/kinit-admin/src/api/vadmin/system/files.ts b/kinit-admin/src/api/vadmin/system/files.ts index 3c5e99c..5ca7367 100644 --- a/kinit-admin/src/api/vadmin/system/files.ts +++ b/kinit-admin/src/api/vadmin/system/files.ts @@ -2,7 +2,7 @@ import request from '@/config/axios' export const addFilesListApi = (data: any): Promise => { return request.post({ - url: `/vadmin/system/files/`, + url: `/vadmin/system/files`, headersType: 'multipart/form-data', data }) diff --git a/kinit-admin/src/api/vadmin/system/record/login.ts b/kinit-admin/src/api/vadmin/system/record/login.ts index 924a5b8..24c9a1a 100644 --- a/kinit-admin/src/api/vadmin/system/record/login.ts +++ b/kinit-admin/src/api/vadmin/system/record/login.ts @@ -1,5 +1,5 @@ import request from '@/config/axios' export const getRecordLoginListApi = (params: any): Promise => { - return request.get({ url: '/vadmin/record/logins/', params }) + return request.get({ url: '/vadmin/record/logins', params }) } diff --git a/kinit-admin/src/api/vadmin/system/record/operation.ts b/kinit-admin/src/api/vadmin/system/record/operation.ts index 0d4dfaa..0003b7c 100644 --- a/kinit-admin/src/api/vadmin/system/record/operation.ts +++ b/kinit-admin/src/api/vadmin/system/record/operation.ts @@ -1,5 +1,5 @@ import request from '@/config/axios' export const getRecordOperationListApi = (params: any): Promise => { - return request.get({ url: '/vadmin/record/operations/', params }) + return request.get({ url: '/vadmin/record/operations', params }) } diff --git a/kinit-admin/src/api/vadmin/system/settings.ts b/kinit-admin/src/api/vadmin/system/settings.ts index bd2c8c1..24883e2 100644 --- a/kinit-admin/src/api/vadmin/system/settings.ts +++ b/kinit-admin/src/api/vadmin/system/settings.ts @@ -1,28 +1,28 @@ import request from '@/config/axios' export const getSystemSettingsTabsApi = (params: any): Promise => { - return request.get({ url: '/vadmin/system/settings/tabs/', params }) + return request.get({ url: '/vadmin/system/settings/tabs', params }) } export const getSystemSettingsApi = (params: any): Promise => { - return request.get({ url: '/vadmin/system/settings/tabs/values/', params }) + return request.get({ url: '/vadmin/system/settings/tabs/values', params }) } export const putSystemSettingsApi = (data: any): Promise => { - return request.put({ url: '/vadmin/system/settings/tabs/values/', data }) + return request.put({ url: '/vadmin/system/settings/tabs/values', data }) } // 获取系统基础配置,每次进入系统时使用 export const getSystemBaseConfigApi = (): Promise => { - return request.get({ url: '/vadmin/system/settings/base/config/' }) + return request.get({ url: '/vadmin/system/settings/base/config' }) } // 获取系统隐私协议 export const getSystemPrivacyApi = (): Promise => { - return request.get({ url: '/vadmin/system/settings/privacy/' }) + return request.get({ url: '/vadmin/system/settings/privacy' }) } // 获取系统用户协议 export const getSystemAgreementApi = (): Promise => { - return request.get({ url: '/vadmin/system/settings/agreement/' }) + return request.get({ url: '/vadmin/system/settings/agreement' }) } diff --git a/kinit-admin/src/components/Breadcrumb/src/Breadcrumb.vue b/kinit-admin/src/components/Breadcrumb/src/Breadcrumb.vue index 831fc6e..1163dd5 100644 --- a/kinit-admin/src/components/Breadcrumb/src/Breadcrumb.vue +++ b/kinit-admin/src/components/Breadcrumb/src/Breadcrumb.vue @@ -2,7 +2,7 @@ import { ElBreadcrumb, ElBreadcrumbItem } from 'element-plus' import { ref, watch, computed, unref, defineComponent, TransitionGroup } from 'vue' import { useRouter } from 'vue-router' -import { usePermissionStore } from '@/store/modules/permission' +import { useRouterStore } from '@/store/modules/router' import { filterBreadcrumb } from './helper' import { filter, treeToList } from '@/utils/tree' import type { RouteLocationNormalizedLoaded, RouteMeta } from 'vue-router' @@ -29,10 +29,10 @@ export default defineComponent({ const levelList = ref([]) - const permissionStore = usePermissionStore() + const routerStore = useRouterStore() const menuRouters = computed(() => { - const routers = permissionStore.getRouters + const routers = routerStore.getRouters return filterBreadcrumb(routers) }) diff --git a/kinit-admin/src/components/Menu/src/Menu.vue b/kinit-admin/src/components/Menu/src/Menu.vue index cd50db2..3aa89fe 100644 --- a/kinit-admin/src/components/Menu/src/Menu.vue +++ b/kinit-admin/src/components/Menu/src/Menu.vue @@ -2,7 +2,7 @@ import { computed, defineComponent, unref, PropType } from 'vue' import { ElMenu, ElScrollbar } from 'element-plus' import { useAppStore } from '@/store/modules/app' -import { usePermissionStore } from '@/store/modules/permission' +import { useRouterStore } from '@/store/modules/router' import { useRenderMenuItem } from './components/useRenderMenuItem' import { useRouter } from 'vue-router' import { isUrl } from '@/utils/is' @@ -28,7 +28,7 @@ export default defineComponent({ const { push, currentRoute } = useRouter() - const permissionStore = usePermissionStore() + const routerStore = useRouterStore() const menuMode = computed((): 'vertical' | 'horizontal' => { // 竖 @@ -42,7 +42,7 @@ export default defineComponent({ }) const routers = computed(() => - unref(layout) === 'cutMenu' ? permissionStore.getMenuTabRouters : permissionStore.getRouters + unref(layout) === 'cutMenu' ? routerStore.getMenuTabRouters : routerStore.getRouters ) const collapse = computed(() => appStore.getCollapse) diff --git a/kinit-admin/src/components/TabMenu/src/TabMenu.vue b/kinit-admin/src/components/TabMenu/src/TabMenu.vue index 1ec61ca..24dfd0f 100644 --- a/kinit-admin/src/components/TabMenu/src/TabMenu.vue +++ b/kinit-admin/src/components/TabMenu/src/TabMenu.vue @@ -1,5 +1,5 @@