diff --git a/admin/.env.development b/admin/.env.development index 59a598c5..02ecd7fd 100644 --- a/admin/.env.development +++ b/admin/.env.development @@ -1,4 +1,4 @@ NODE_ENV = 'development' # Base API -VITE_APP_BASE_URL='https://likeadmin.yixiangonline.com' \ No newline at end of file +VITE_APP_BASE_URL='http://likeadmin-java-api.yixiangonline.com' \ No newline at end of file diff --git a/admin/src/App.vue b/admin/src/App.vue index 99b6caeb..d0e31a74 100644 --- a/admin/src/App.vue +++ b/admin/src/App.vue @@ -24,15 +24,19 @@ export default defineComponent({ // 获取配置 const data = await store.dispatch('app/getConfig') + console.log(data, 'data.webFavicon') + + // console.log(favicon, 'favicon') + // 设置网站logo let favicon: HTMLLinkElement = document.querySelector('link[rel="icon"]')! if (favicon) { - favicon.href = data.web_favicon + favicon.href = data.webFavicon return } favicon = document.createElement('link') favicon.rel = 'icon' - favicon.href = data.web_favicon + favicon.href = data.webFavicon document.head.appendChild(favicon) }) return { diff --git a/admin/src/api/app.ts b/admin/src/api/app.ts index bae86493..2d691d53 100644 --- a/admin/src/api/app.ts +++ b/admin/src/api/app.ts @@ -40,5 +40,5 @@ export function apiFileRename(params: { id: number; name: string }) { // 配置 export function apiConfig() { - return request.get('/config/getConfig') + return request.get('/index/config') } diff --git a/admin/src/api/auth.ts b/admin/src/api/auth.ts index 5852385a..1c2bbebe 100644 --- a/admin/src/api/auth.ts +++ b/admin/src/api/auth.ts @@ -2,27 +2,28 @@ import request from '@/utils/request' import { terminal } from '@/config/app' export function adminLists(params: any) { - return request.get('/auth.admin/lists', { params }) + return request.get('/admin/lists', { params }) } // 管理员添加 export function apiAdminAdd(params: any) { - return request.post('/auth.admin/add', params) + return request.post('/admin/add', params) } export function apiAdminEdit(params: any) { - return request.post('/auth.admin/edit', params) + return request.post('/admin/edit', params) } // 管理员删除 export function apiAdminDelete(params: { id: number }) { - return request.post('/auth.admin/delete', params) + return request.post('/admin/del', params) } // 管理员详情 export function apiAdminDetail(params: any) { - return request.get('/auth.admin/detail', { params }) + return request.get('/admin/detail', { params }) } + // 角色列表 export function apiRoleLists(params: any) { return request.get('/auth.role/lists', { params }) @@ -50,6 +51,6 @@ export function apiConfigGetMenu() { } // 角色权限 -export function apiConfigGetAuth() { - return request.get('/config/getAuth') -} +// export function apiConfigGetAuth() { +// return request.get('/config/getAuth') +// } diff --git a/admin/src/api/user.ts b/admin/src/api/user.ts index 1313a0e0..498428f0 100644 --- a/admin/src/api/user.ts +++ b/admin/src/api/user.ts @@ -3,15 +3,15 @@ import { terminal } from '@/config/app' // 登录 export function apiLogin(params: { account: string; password: string }) { - return request.post('/login/account', { ...params, terminal }) + return request.post('/system/login', { ...params, terminal }) } // 退出登录 export function apiLogout() { - return request.post('/login/logout') + return request.post('/system/logout') } // 用户信息 export function apiUserInfo() { - return request.get('/auth.admin/mySelf') + return request.get('/system/admin/self') } diff --git a/admin/src/store/modules/app.ts b/admin/src/store/modules/app.ts index e8b27d2e..7a3a0020 100644 --- a/admin/src/store/modules/app.ts +++ b/admin/src/store/modules/app.ts @@ -19,6 +19,8 @@ const app: Module = { return new Promise((resolve, reject) => { apiConfig().then(data => { commit('setConfig', data) + console.log(data, '==============================') + resolve(data) }) }) diff --git a/admin/src/store/modules/permission.ts b/admin/src/store/modules/permission.ts index a6be6bf0..b1ca3b2a 100644 --- a/admin/src/store/modules/permission.ts +++ b/admin/src/store/modules/permission.ts @@ -30,14 +30,14 @@ const permission: Module = { actions: { getPermission({ commit }) { return new Promise((resolve, reject) => { - apiConfigGetAuth() - .then(data => { - commit('setPermission', data) - resolve(data) - }) - .catch(err => { - reject(err) - }) + // apiConfigGetAuth() + // .then(data => { + // commit('setPermission', data) + // resolve(data) + // }) + // .catch(err => { + // reject(err) + // }) }) } } diff --git a/admin/src/utils/request.ts b/admin/src/utils/request.ts index a89f18df..891e7281 100644 --- a/admin/src/utils/request.ts +++ b/admin/src/utils/request.ts @@ -40,7 +40,7 @@ const eventResponse = { } const request = axios.create({ - baseURL: `${import.meta.env.VITE_APP_BASE_URL}/adminapi`, + baseURL: `${import.meta.env.VITE_APP_BASE_URL}/api`, timeout: 60 * 1000, headers: { 'Content-Type': 'application/json', diff --git a/admin/src/views/account/login.vue b/admin/src/views/account/login.vue index 2eb63235..f8cd47dc 100644 --- a/admin/src/views/account/login.vue +++ b/admin/src/views/account/login.vue @@ -5,12 +5,12 @@