mirrors/pig-ui
1
0
Fork 0
mirror of https://gitee.com/log4j/pig-ui.git synced 2024-12-22 12:58:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 全局后端请求增加 /api 方便vite 代理配置

Browse Source
This commit is contained in:
lbw 2023-04-06 14:38:45 +08:00
parent c38b355b18
commit 69403bfc0c
12 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.env
View File

@ -1,6 +1,18 @@
# 是否是微服务架构（重要）
VITE_IS_MICRO= false
# 前端访问前缀
VITE_PUBLIC_PATH = /
# 后端请求前缀
VITE_API_URL = /api
# ADMIN 服务地址
VITE_ADMIN_PROXY_PATH = http://localhost:9999
# 代码生成服务地址 (单体架构有效)
VITE_GEN_PROXY_PATH = http://localhost:5003
# 前端加密密钥
VITE_PWD_ENC_KEY='pigxpigxpigxpigx'
@ -13,11 +25,6 @@ VITE_OAUTH2_MOBILE_CLIENT='app:app'
# OAUTH2 社交登录客户端信息
VITE_OAUTH2_SOCIAL_CLIENT='social:social'
# ADMIN 服务地址
VITE_ADMIN_PROXY_PATH = http://localhost:9999
# 代码生成服务地址
VITE_GEN_PROXY_PATH = http://localhost:5003
# 是否开启websocket 消息接受,
VITE_WEBSOCKET_ENABLE = false
@ -28,6 +35,3 @@ VITE_REGISTER_ENABLE = true
# 是否开启租户自动选择 （根据租户域名）
VITE_AUTO_TENANT = false
# 代码代码前缀
VITE_PUBLIC_PATH = /

13
src/api/login/index.ts
View File

@ -10,14 +10,17 @@ import { useUserInfo } from '/@/stores/userInfo';
export const login = (data: any) => {
const basicAuth = 'Basic ' + window.btoa(import.meta.env.VITE_OAUTH2_PASSWORD_CLIENT);
Session.set('basicAuth', basicAuth);
const { username, password, randomStr, code, grant_type, scope } = data;
return request({
url: '/auth/oauth2/token',
method: 'post',
params: data,
params: { username, randomStr, code, grant_type, scope },
data: { password: password },
headers: {
skipToken: true,
'TENANT-ID': '1',
Authorization: basicAuth,
'Content-Type': 'application/x-www-form-urlencoded',
},
});
};
@ -34,6 +37,7 @@ export const loginByMobile = (mobile: any, code: any) => {
skipToken: true,
'TENANT-ID': '1',
Authorization: basicAuth,
'Content-Type': 'application/x-www-form-urlencoded',
},
method: 'post',
params: { mobile: 'SMS@' + mobile, code: code, grant_type, scope },
@ -52,6 +56,7 @@ export const loginBySocial = (state: string, code: string) => {
skipToken: true,
'TENANT-ID': '1',
Authorization: basicAuth,
'Content-Type': 'application/x-www-form-urlencoded',
},
method: 'post',
params: { mobile: state + '@' + code, code: code, grant_type, scope },
@ -60,7 +65,7 @@ export const loginBySocial = (state: string, code: string) => {
export const sendMobileCode = (mobile: any) => {
return request({
url: '/auth/mobile/' + mobile,
url: '/admin/mobile/' + mobile,
method: 'get',
});
};
@ -77,6 +82,7 @@ export const refreshTokenApi = (refresh_token: string) => {
skipToken: true,
'TENANT-ID': '1',
Authorization: basicAuth,
'Content-Type': 'application/x-www-form-urlencoded',
},
method: 'post',
params: { refresh_token, grant_type, scope },
@ -94,6 +100,7 @@ export const checkToken = (refreshTime: number, refreshLock: boolean) => {
headers: {
skipToken: true,
Authorization: basicAuth,
'Content-Type': 'application/x-www-form-urlencoded',
},
method: 'get',
params: { token: Session.getToken() },
@ -131,7 +138,7 @@ export const checkToken = (refreshTime: number, refreshLock: boolean) => {
*/
export const getUserInfo = () => {
return request({
url: '/auth/user/info',
url: '/admin/user/info',
method: 'get',
});
};

2
src/components/Upload/Excel.vue
View File

@ -6,7 +6,7 @@
:limit="1"
accept=".xlsx, .xls"
:headers="headers"
:action="other.adaptationUrl(url)"
:action="baseURL + other.adaptationUrl(url)"
:disabled="state.upload.isUploading"
:on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess"

2
src/components/Upload/Image.vue
View File

@ -15,7 +15,7 @@
:accept="fileType.join(',')"
>
<template v-if="imageUrl">
<img :src="imageUrl" class="upload-image" />
<img :src="baseURL + imageUrl" class="upload-image" />
<div class="upload-handle" @click.stop>
<div class="handle-icon" @click="editImg" v-if="!self_disabled">
<el-icon><Edit /></el-icon>

2
src/components/Upload/index.vue
View File

@ -4,7 +4,7 @@
<el-upload
ref="fileUpload"
v-if="props.type === 'default'"
:action="other.adaptationUrl(props.uploadFileUrl)"
:action="baseURL + other.adaptationUrl(props.uploadFileUrl)"
:before-upload="handleBeforeUpload"
:file-list="fileList"
:headers="headers"

4
src/components/verifition/api/index.ts
View File

@ -7,7 +7,7 @@ import request from '/@/utils/request';
//获取验证图片 以及token
export function reqGet(data: Object) {
return request({
url: '/admin/code/create',
url: '/code/create',
method: 'get',
data,
});
@ -16,7 +16,7 @@ export function reqGet(data: Object) {
//滑动或者点选验证
export function reqCheck(data: Object) {
return request({
url: '/admin/code/check',
url: '/code/check',
method: 'post',
params: data,
});

2
src/layout/navBars/breadcrumb/user.vue
View File

@ -47,7 +47,7 @@
</div>
<el-dropdown :show-timeout="70" :hide-timeout="50" @command="onHandleCommandClick">
<span class="layout-navbars-breadcrumb-user-link">
<img :src="userInfos.user.avatar" class="layout-navbars-breadcrumb-user-link-photo mr5" />
<img :src="baseURL + userInfos.user.avatar" class="layout-navbars-breadcrumb-user-link-photo mr5" />
{{ userInfos.user.username }}
<el-icon class="el-icon--right">
<ele-ArrowDown />

1
src/main.ts
View File

@ -46,6 +46,7 @@ app.config.globalProperties.parseDate = parseDate;
app.config.globalProperties.dateTimeStr = dateTimeStr;
app.config.globalProperties.dateStr = dateStr;
app.config.globalProperties.timeStr = timeStr;
app.config.globalProperties.baseURL = import.meta.env.VITE_API_URL;
directive(app);
other.elSvg(app);

6
src/stores/userInfo.ts
View File

@ -47,7 +47,7 @@ export const useUserInfo = defineStore('userInfo', {
resolve(res);
})
.catch((err) => {
useMessage().error('服务器异常，请联系管理员');
useMessage().error(err?.msg || '系统异常请联系管理员');
reject(err);
});
});
@ -70,7 +70,7 @@ export const useUserInfo = defineStore('userInfo', {
resolve(res);
})
.catch((err) => {
useMessage().error(err.msg);
useMessage().error(err?.msg || '系统异常请联系管理员');
reject(err);
});
});
@ -94,7 +94,7 @@ export const useUserInfo = defineStore('userInfo', {
resolve(res);
})
.catch((err) => {
useMessage().error('登录失败，账号未绑定');
useMessage().error(err?.msg || '系统异常请联系管理员');
reject(err);
});
});

7
src/utils/other.ts
View File

@ -458,10 +458,15 @@ export function toUnderline(str: string) {
const adaptationUrl = (originUrl?: string) => {
// 微服务架构 不做路径转换,为空不做路径转换
const isMicro = import.meta.env.VITE_IS_MICRO;
if (validateNull(isMicro) || isMicro === true) {
if (validateNull(isMicro) || isMicro === 'true') {
return originUrl;
}
// 验证码服务
if (originUrl?.startsWith('/code/')) {
return `/admin/${originUrl}`;
}
// 如果是代码生成服务，不做路径转换
if (originUrl?.startsWith('/gen')) {
return originUrl;

1
src/utils/request.ts
View File

@ -10,7 +10,6 @@ import other from './other';
const service: AxiosInstance = axios.create({
baseURL: import.meta.env.VITE_API_URL,
timeout: 50000, // 全局超时时间
headers: { 'Content-Type': 'application/json' },
});
/**

10
vite.config.ts
View File

@ -53,15 +53,17 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
hmr: true, // 启用热更新
proxy: {
// 代理设置，用于解决跨域问题
'/admin': {
'/api': {
target: env.VITE_ADMIN_PROXY_PATH, // 目标服务器地址
ws: true, // 是否启用 WebSocket
changeOrigin: true, // 是否修改请求头中的 Origin 字段
rewrite: (path) => path.replace(/^\/api/, ''),
},
'/gen': {
target: env.VITE_GEN_PROXY_PATH,
ws: true,
'/api/gen': {
//单体架构下特殊处理代码生成模块代理
target: env.VITE_IS_MICRO === 'true' ? env.VITE_ADMIN_PROXY_PATH : env.VITE_GEN_PROXY_PATH,
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''),
},
},
},