浏览代码

修改http-client接口默认地址为环境变量VITE_API_URL配置
新增线上环境路径配置

zhontai 2 年之前
父节点
当前提交
0fcba35254

+ 1 - 1
.env.development

@@ -2,4 +2,4 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://localhost:8000/'
+VITE_API_URL = 'http://localhost:8000'

+ 4 - 1
.env.production

@@ -1,5 +1,8 @@
 # 线上环境
 ENV = 'production'
 
+# public path 配置线上环境路径(打包)
+VITE_PUBLIC_PATH = '/'
+
 # 线上环境接口地址
-VITE_API_URL = 'http://localhost:8000/'
+VITE_API_URL = 'https://admin.zhontai.net'

+ 1 - 1
gen/gen-admin-api.js

@@ -5,7 +5,7 @@ const path = require('path')
 const apis = [
   {
     output: path.resolve(__dirname, '../src/api/admin'),
-    url: 'http://localhost:8000/swagger/admin/swagger.json',
+    url: import.meta.env.VITE_API_URL + '/swagger/admin/swagger.json',
   },
 ]
 

+ 1 - 1
gen/templates/http-client.ejs

@@ -88,7 +88,7 @@ export class HttpClient<SecurityDataType = unknown> {
     private format?: ResponseType;
 
     constructor({ securityWorker, secure, format, ...axiosConfig }: ApiConfig<SecurityDataType> = {}) {
-        this.instance = axios.create({ ...axiosConfig, timeout: 60000, baseURL: axiosConfig.baseURL || "<%~ apiConfig.baseUrl %>" })
+        this.instance = axios.create({ ...axiosConfig, timeout: 60000, baseURL: axiosConfig.baseURL || import.meta.env.VITE_API_URL })
         this.secure = secure;
         this.format = format;
         this.securityWorker = securityWorker;

+ 1 - 1
src/api/admin/http-client.ts

@@ -95,7 +95,7 @@ export class HttpClient<SecurityDataType = unknown> {
   private format?: ResponseType
 
   constructor({ securityWorker, secure, format, ...axiosConfig }: ApiConfig<SecurityDataType> = {}) {
-    this.instance = axios.create({ ...axiosConfig, timeout: 60000, baseURL: axiosConfig.baseURL || 'http://localhost:8000' })
+    this.instance = axios.create({ ...axiosConfig, timeout: 60000, baseURL: axiosConfig.baseURL || import.meta.env.VITE_API_URL })
     this.secure = secure
     this.format = format
     this.securityWorker = securityWorker

+ 1 - 1
src/layout/navBars/breadcrumb/user.vue

@@ -108,7 +108,7 @@ const state = reactive({
 // 头像地址
 const avatar = computed(() => {
   return (
-    (userInfos.value.photo && `${import.meta.env.VITE_API_URL}upload/admin/avatar/${userInfos.value.photo}`) ||
+    (userInfos.value.photo && `${import.meta.env.VITE_API_URL}/upload/admin/avatar/${userInfos.value.photo}`) ||
     'https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500'
   )
 })

+ 2 - 2
src/views/admin/personal/index.vue

@@ -190,14 +190,14 @@ const avatarHeaders = computed(() => {
 // 头像地址
 const avatar = computed(() => {
   return (
-    (userInfos.value.photo && `${import.meta.env.VITE_API_URL}upload/admin/avatar/${userInfos.value.photo}`) ||
+    (userInfos.value.photo && `${import.meta.env.VITE_API_URL}/upload/admin/avatar/${userInfos.value.photo}`) ||
     'https://img2.baidu.com/it/u=1978192862,2048448374&fm=253&fmt=auto&app=138&f=JPEG?w=504&h=500'
   )
 })
 
 // 上传头像请求url
 const avatarAction = computed(() => {
-  return import.meta.env.VITE_API_URL + 'api/admin/user/avatar-upload'
+  return import.meta.env.VITE_API_URL + '/api/admin/user/avatar-upload'
 })
 
 onMounted(() => {