kyoyue 8 months ago
parent
commit
892d6955f7

+ 3 - 3
.env.analyze

@@ -1,5 +1,5 @@
 # Whether to open mock
-VITE_USE_MOCK = true
+VITE_USE_MOCK = false
 
 # public path
 VITE_PUBLIC_PATH = /
@@ -11,11 +11,11 @@ VITE_BUILD_COMPRESS = 'none'
 
 
 # Basic interface address SPA
-VITE_GLOB_API_URL=/basic-api
+VITE_GLOB_API_URL=https://wxadminapi.gkscrm.com
 
 # File upload address, optional
 # It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=/upload
+VITE_GLOB_UPLOAD_URL=https://wxadminapi.gkscrm.com
 
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=

+ 4 - 5
.env.development

@@ -10,17 +10,16 @@ VITE_BUILD_COMPRESS = 'none'
 VITE_DROP_CONSOLE = false
 
 # vite 本地跨域代理
-# VITE_PROXY=[["/sys-api","http://localhost:19101"]]
-# VITE_BUILD_COMPRESS = 'none'
+# VITE_PROXY=[["/fms-api","https://wxadminapi.gkscrm.com"]]
 # Basic interface address SPA
 VITE_GLOB_API_URL=https://wxadminapi.gkscrm.com
+# File upload address, optional
+VITE_GLOB_UPLOAD_URL=https://wxadminapi.gkscrm.com
 # VITE_GLOB_API_URL=
-# VITE_GLOB_API_URL=http://192.168.66.16:19101
 # VITE_GLOB_API_URL=/sys-api
 
 
-# File upload address, optional
-VITE_GLOB_UPLOAD_URL=/fms-api/upload
+
 
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=

+ 1 - 1
.env.production

@@ -15,7 +15,7 @@ VITE_DROP_CONSOLE = true
 VITE_GLOB_API_URL=https://wxadminapi.gkscrm.com
 
 # File upload address, optional
-VITE_GLOB_UPLOAD_URL=/fms-api/upload
+VITE_GLOB_UPLOAD_URL=https://wxadminapi.gkscrm.com
 
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=

+ 3 - 3
.env.test

@@ -1,6 +1,6 @@
 NODE_ENV=production
 # Whether to open mock
-VITE_USE_MOCK = true
+VITE_USE_MOCK = false
 
 # public path
 VITE_PUBLIC_PATH = /
@@ -11,11 +11,11 @@ VITE_PUBLIC_PATH = /
 VITE_BUILD_COMPRESS = 'none'
 
 # Basic interface address SPA
-VITE_GLOB_API_URL=/sys-api
+VITE_GLOB_API_URL=https://wxadminapi.gkscrm.com
 
 # File upload address, optional
 # It can be forwarded by nginx or write the actual address directly
-VITE_GLOB_UPLOAD_URL=/fms-api/upload
+VITE_GLOB_UPLOAD_URL=https://wxadminapi.gkscrm.com
 
 # Interface prefix
 VITE_GLOB_API_URL_PREFIX=

+ 3 - 3
src/api/fms/file.ts

@@ -4,7 +4,7 @@ import { ErrorMessageMode, UploadFileParams } from '/#/axios';
 import { BaseDataResp, BaseListReq, BaseResp, BaseUUIDsReq } from '../model/baseModel';
 import { FileListResp, updateFileInfoReq } from './model/fileModel';
 import { AxiosProgressEvent } from 'axios';
-
+import { useGlobSetting } from '@/hooks/setting';
 enum Api {
   uploadFile = '/fms-api/upload',
   GetFileList = '/fms-api/file/list',
@@ -13,7 +13,7 @@ enum Api {
   DownloadFile = '/fms-api/file/download',
   DeleteFile = '/fms-api/file/delete',
 }
-
+const { uploadUrl = '' } = useGlobSetting();
 /**
  * @description: Upload interface
  */
@@ -23,7 +23,7 @@ export function uploadApi(
 ) {
   return defHttp.uploadFile<BaseDataResp<UploadApiResp>>(
     {
-      url: Api.uploadFile,
+      url: uploadUrl+ '/fms-api/upload',
       onUploadProgress,
     },
     params,

+ 1 - 1
src/api/sys/upload.ts

@@ -15,7 +15,7 @@ export function uploadApi(
 ) {
   return defHttp.uploadFile<UploadApiResp>(
     {
-      url: uploadUrl,
+      url: uploadUrl + '/fms-api/upload',
       onUploadProgress,
     },
     params,

+ 1 - 0
src/hooks/setting/index.ts

@@ -7,6 +7,7 @@ export const useGlobSetting = (): Readonly<GlobConfig> => {
     getAppEnvConfig();
 
   // Take global configuration
+  console.log(VITE_GLOB_UPLOAD_URL,'VITE_GLOB_UPLOAD_URL')
   const glob: Readonly<GlobConfig> = {
     title: VITE_GLOB_APP_TITLE,
     apiUrl: VITE_GLOB_API_URL,

+ 2 - 2
src/views/wechat/sop_task/add_sop/components/msgContant.vue

@@ -103,8 +103,8 @@
   import CustomIcons from './customIcons.vue';
   import ProductNote from './productNote.vue';
   import { BasicUpload } from '@/components/Upload';
-  import { deleteFile, downloadFile, getFileList, uploadApi } from '@/api/fms/file';
-  //  import { uploadApi } from '@/api/sys/upload';
+  // import { deleteFile, downloadFile, getFileList, uploadApi } from '@/api/fms/file';
+   import { uploadApi } from '@/api/sys/upload';
   import { uploadPics } from '@/api/wechat/tes';
   import ProductContant from './productContant.vue';
   export default defineComponent({