From e47b06abf8cf7dc69b9d7728fa41185c0ba7a95d Mon Sep 17 00:00:00 2001 From: zxx <47968546@163.com> Date: Thu, 20 Oct 2022 22:43:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86api=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=86=99=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 1 - .env.development | 2 +- src/components/setting/Setting.vue | 6 +++--- src/services/Middle/Admin/api.js | 4 +++- src/services/base/api.js | 16 +++++++++------- src/services/base/user.js | 18 +++++++++--------- 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.env b/.env index bc71f9a..08a6749 100644 --- a/.env +++ b/.env @@ -15,7 +15,6 @@ VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles VUE_APP_LAYOUT_KEY=admin.layout VUE_APP_THEME_MODE_KEY=admin.theme.mode VUE_APP_THEME_COLOR_KEY=admin.theme.color -# VUE_APP_API_BASE_URL=http://192.168.31.91:19000 VUE_APP_API_BASE_URL=http://192.168.52.166:30000 VUE_APP_USER_MODEL=AdminUser diff --git a/.env.development b/.env.development index 664fb64..16b6c22 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,2 @@ -VUE_APP_API_BASE_URL=http://192.168.52.166:30000 +VUE_APP_API_BASE_URL=http://192.168.52.166:30000 \ No newline at end of file diff --git a/src/components/setting/Setting.vue b/src/components/setting/Setting.vue index 3f0fa33..38b2ee2 100644 --- a/src/components/setting/Setting.vue +++ b/src/components/setting/Setting.vue @@ -106,14 +106,14 @@ - - - {{$t('copy')}} + --> + diff --git a/src/services/Middle/Admin/api.js b/src/services/Middle/Admin/api.js index 828b2fd..b876397 100644 --- a/src/services/Middle/Admin/api.js +++ b/src/services/Middle/Admin/api.js @@ -1,4 +1,6 @@ +const request = require('@/utils/request') // 导入请求方法 +const METHOD = request.METHOD import BASE_URL from '@/services/base/api.js'; module.exports = { - LOGIN: `${BASE_URL}/AdminUser/v1/login`, + LOGIN: {url:`${BASE_URL.BASE_URL}/v1/login`, method:METHOD.POST}, // 登录 } diff --git a/src/services/base/api.js b/src/services/base/api.js index 2619541..8c681e7 100644 --- a/src/services/base/api.js +++ b/src/services/base/api.js @@ -1,3 +1,5 @@ +const request = require('@/utils/request') // 导入请求方法 +const METHOD = request.METHOD //跨域代理前缀 // const API_PROXY_PREFIX='/api' // const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX @@ -5,11 +7,11 @@ const BASE_URL = process.env.VUE_APP_API_BASE_URL // 获取环境变量VUE_APP_A const USER_MODEL = process.env.VUE_APP_USER_MODEL module.exports = { BASE_URL, - PROJECT: `${BASE_URL}/${USER_MODEL}/v1/project`, - COMPANY: `${BASE_URL}/${USER_MODEL}/v1/company`, - LOGIN: `${BASE_URL}/${USER_MODEL}/v1/login`, - ROUTES: `${BASE_URL}/${USER_MODEL}/v1/routers`, - USERINFO: `${BASE_URL}/${USER_MODEL}/v1/userinfo`, - PERMISSION: `${BASE_URL}/${USER_MODEL}/v1/permission`, - SETTINGS: `${BASE_URL}/${USER_MODEL}/v1/settings`, + PROJECT: {url:`${BASE_URL}/${USER_MODEL}/v1/project`, method:METHOD.POST}, // 获取项目信息 + LOGIN: {url:`${BASE_URL}/${USER_MODEL}/v1/login`, method:METHOD.POST}, // 登录 + ROUTERS: {url:`${BASE_URL}/${USER_MODEL}/v1/routers`, method:METHOD.POST}, // 获取路由配置 + USERINFO: {url:`${BASE_URL}/${USER_MODEL}/v1/userinfo`, method:METHOD.POST}, // 获取用户信息 + COMPANY: {url:`${BASE_URL}/${USER_MODEL}/v1/company`, method:METHOD.POST}, // 获取公司信息 + PERMISSION: {url:`${BASE_URL}/${USER_MODEL}/v1/permission`, method:METHOD.POST}, // 获取权限配置 + SETTINGS: {url:`${BASE_URL}/${USER_MODEL}/v1/settings`, method:METHOD.POST}, // 获取用户设置 } diff --git a/src/services/base/user.js b/src/services/base/user.js index c45086b..15b6b22 100644 --- a/src/services/base/user.js +++ b/src/services/base/user.js @@ -1,5 +1,5 @@ -import {LOGIN, ROUTES, USERINFO,PERMISSION,SETTINGS,PROJECT,COMPANY} from '@/services/base/api' -import {request, METHOD, removeAuthorization} from '@/utils/request' +import {LOGIN, ROUTERS, USERINFO,PERMISSION,SETTINGS,PROJECT,COMPANY} from '@/services/base/api' +import {request, removeAuthorization} from '@/utils/request' /** * 登录服务 * @param name 账户名 @@ -7,7 +7,7 @@ import {request, METHOD, removeAuthorization} from '@/utils/request' * @returns {Promise>} */ export async function login(name, password) { - return request(LOGIN, METHOD.POST, { + return request(LOGIN.url, LOGIN.method, { mobile: name, password: password }) @@ -20,7 +20,7 @@ export async function login(name, password) { */ export async function getUserInfo() { // 获取用户信息 const userId = parseInt(localStorage.getItem(process.env.VUE_APP_UID_KEY)) // 获取用户id并转换为整数 - return request(USERINFO, METHOD.POST, { + return request(USERINFO.url, USERINFO.method, { uid: userId }) } @@ -31,7 +31,7 @@ export async function getUserInfo() { // 获取用户信息 */ export async function getRoutesConfig() { // 获取路由配置 const userId = parseInt(localStorage.getItem(process.env.VUE_APP_UID_KEY)) // 获取用户id并转换为整数 - return request(ROUTES, METHOD.POST, { + return request(ROUTERS.url, ROUTERS.method, { uid:userId }) } @@ -43,7 +43,7 @@ export async function getRoutesConfig() { // 获取路由配置 */ export async function getPermission() { // 获取权限配置 const userId = parseInt(localStorage.getItem(process.env.VUE_APP_UID_KEY)) // 获取用户id并转换为整数 - return request(PERMISSION, METHOD.POST, { + return request(PERMISSION.url, PERMISSION.method, { uid:userId }) } @@ -55,7 +55,7 @@ export async function getPermission() { // 获取权限配置 */ export async function getSettings() { // 获取用户设置 const userId = parseInt(localStorage.getItem(process.env.VUE_APP_UID_KEY)) // 获取用户id并转换为整数 - return request(SETTINGS, METHOD.POST, { + return request(SETTINGS.url, SETTINGS.method, { uid:userId }) } @@ -66,7 +66,7 @@ export async function getSettings() { // 获取用户设置 * @returns {Promise>} */ export async function getProject() { // 获取项目信息 - return request(PROJECT, METHOD.POST, { + return request(PROJECT.url, PROJECT.method, { beid:parseInt(process.env.VUE_APP_BEID) }) } @@ -78,7 +78,7 @@ export async function getProject() { // 获取项目信息 */ export async function getCompany() { // 获取公司信息 const userId = parseInt(localStorage.getItem(process.env.VUE_APP_UID_KEY)) // 获取用户id并转换为整数 - return request(COMPANY, METHOD.POST, { + return request(COMPANY.url, COMPANY.method, { uid: userId }) }