部署配置兼容

h5app/public/appconfig.json

@@ -1,4 +1,5 @@
 {
   "isDev": true,
-  "webSiteUrl": "http://www.bowintek.com/hzyz/mobile"
+  "webSiteUrl": "http://www.bowintek.com:8022/mobile/index.html/#",
+  "webApiServiceUrl": "/api/"
 }

h5app/src/utils/config.ts

@@ -5,13 +5,14 @@ const service = axios.create({
 
 export interface ConfigParams  {
     isDev: boolean;
-    webSiteUrl: string
+    webSiteUrl: string;
+    webApiServiceUrl: string
 }
 
 export const getConfig = async <ConfigParams>(
 ): Promise<ConfigParams> => {
     try {
-        const res = await service.request({url: 'mobile/appconfig.json'});
+        const res = await service.request({url: '../mobile/appconfig.json'});
 
         return res.data as ConfigParams;
     } catch (error: any) {

h5app/src/utils/request.ts

@@ -5,108 +5,118 @@ import {ACCESS_TOKEN_KEY} from '@/enums/cacheEnum';
 import {Storage} from '@/utils/Storage';
 import {useUserStore} from '@/store/modules/user';
 import {alertController} from "@ionic/vue";
+import {getConfig} from "./config";
 
 // import {ExclamationCircleOutlined} from '@ant-design/icons'
 
 export interface RequestOptions {
-  /** 当前接口权限, 不需要鉴权的接口请忽略， 格式：sys:user:add */
-  permCode?: string;
-  /** 是否直接获取data，而忽略message等 */
-  isGetDataDirectly?: boolean;
-  /** 请求成功是提示信息 */
-  successMsg?: string;
-  /** 请求失败是提示信息 */
-  errorMsg?: string;
-  /** 是否mock数据请求 */
-  isMock?: boolean;
-  /** 是否开发后台数据 */
-  isNew?: boolean;
-  isShowSuccessMsg?:boolean;
-  isShowErrorMsg?:boolean;
+    /** 当前接口权限, 不需要鉴权的接口请忽略， 格式：sys:user:add */
+    permCode?: string;
+    /** 是否直接获取data，而忽略message等 */
+    isGetDataDirectly?: boolean;
+    /** 请求成功是提示信息 */
+    successMsg?: string;
+    /** 请求失败是提示信息 */
+    errorMsg?: string;
+    /** 是否mock数据请求 */
+    isMock?: boolean;
+    /** 是否开发后台数据 */
+    isNew?: boolean;
+    isShowSuccessMsg?: boolean;
+    isShowErrorMsg?: boolean;
 }
 
 export interface RequsetData {
-  item: any;
-  extdata?: any;
-  success?: boolean;
-  msg?: string;
+    item: any;
+    extdata?: any;
+    success?: boolean;
+    msg?: string;
 }
 
 const UNKNOWN_ERROR = '未知错误，请重试';
 // 是否生产环境
 // const IS_PROD = ['production', 'prod'].includes(process.env.NODE_ENV);
 /** 真实请求的路径前缀 */
-const baseApiUrl = '/api/';
+let baseApiUrl = '/api/';
+try {
+    getConfig().then((data: any) => {
+        baseApiUrl = data.webApiServiceUrl || '/api/';
+    }, () => {
+        baseApiUrl = '/api/';
+    })
+} catch (e: any) {
+    baseApiUrl = '/api/';
+}
 /** mock请求路径前缀 */
 const baseMockUrl = '/';
 
 const service = axios.create({
-  // baseURL: baseApiUrl,
-  timeout: 120000,
+    // baseURL: baseApiUrl,
+    timeout: 120000,
 });
 
 service.interceptors.request.use(
-  (config) => {
-    const token = Storage.get(ACCESS_TOKEN_KEY);
-    if (token && config.headers) {
-      // 请求头token信息，请根据实际情况进行修改
-      config.headers['Authorization'] = token;
-    }
-    return config;
-  },
-  (error) => {
-    Promise.reject(error);
-  },
+    (config) => {
+        const token = Storage.get(ACCESS_TOKEN_KEY);
+        if (token && config.headers) {
+            // 请求头token信息，请根据实际情况进行修改
+            config.headers['Authorization'] = token;
+        }
+        return config;
+    },
+    (error) => {
+        Promise.reject(error);
+    },
 );
 
 service.interceptors.response.use(
-  (response) => {
-    const res = response.data;
-
-    // if the custom code is not 200, it is judged as an error.
-
-    if (res.code !== "200") {
-      //$message.error(res.message || UNKNOWN_ERROR);
-
-      // Illegal token
-      if (res.code === 11001 || res.code === 11002) {
-        window.localStorage.clear();
-        window.location.reload();
-        // to re-login
-        // Modal.confirm({
-        //   title: '警告',
-        //   content: res.message || '账号异常，您可以取消停留在该页上，或重新登录',
-        //   okText: '重新登录',
-        //   cancelText: '取消',
-        //   onOk: () => {
-        //     localStorage.clear();
-        //     window.location.reload();
-        //   }
-        // });
-      }
-
-      // throw other
-        const error = new Error(res.message || res.msg || UNKNOWN_ERROR) as Error & { code: any,data:any };
-        error.code = res.code;
-        error.data=res.data;
+    (response) => {
+        const res = response.data;
+
+        // if the custom code is not 200, it is judged as an error.
+
+        if (res.code !== "200") {
+            //$message.error(res.message || UNKNOWN_ERROR);
+
+            // Illegal token
+            if (res.code === 11001 || res.code === 11002) {
+                window.localStorage.clear();
+                window.location.reload();
+                // to re-login
+                // Modal.confirm({
+                //   title: '警告',
+                //   content: res.message || '账号异常，您可以取消停留在该页上，或重新登录',
+                //   okText: '重新登录',
+                //   cancelText: '取消',
+                //   onOk: () => {
+                //     localStorage.clear();
+                //     window.location.reload();
+                //   }
+                // });
+            }
+
+            // throw other
+            const error = new Error(res.message || res.msg || UNKNOWN_ERROR) as Error & { code: any, data: any };
+            error.code = res.code;
+            error.data = res.data;
+            return Promise.reject(error);
+        } else {
+            return res;
+        }
+    },
+    (error) => {
+        // 处理 422 或者 500 的错误异常提示
+        const errMsg = error?.response?.data?.message ?? UNKNOWN_ERROR;
+        //$message.error(errMsg);
+        error.message = errMsg;
         return Promise.reject(error);
-    } else {
-      return res;
-    }
-  },
-  (error) => {
-    // 处理 422 或者 500 的错误异常提示
-    const errMsg = error?.response?.data?.message ?? UNKNOWN_ERROR;
-    //$message.error(errMsg);
-    error.message = errMsg;
-    return Promise.reject(error);
-  },
+    },
 );
 
 export type Response<T = any> = {
-  code: number;
-  message: string;
-  data: T;
+    code: number;
+    message: string;
+    data: T;
 };
 
 export type BaseResponse<T = any> = Promise<Response<T>>;
@@ -118,52 +128,52 @@ export type BaseResponse<T = any> = Promise<Response<T>>;
  * @param data - request data or params
  */
 export const request = async <T = any>(
-  config: AxiosRequestConfig,
-  options: RequestOptions = {},
+    config: AxiosRequestConfig,
+    options: RequestOptions = {},
 ): Promise<T> => {
-  try {
-    const {successMsg, errorMsg, permCode, isMock, isGetDataDirectly = true,isShowSuccessMsg = true} = options;
-    // 如果当前是需要鉴权的接口 并且没有权限的话 则终止请求发起 , isNew
-    if (permCode && !useUserStore().perms.includes(permCode)) {
-      //return $message.error('你没有访问该接口的权限，请联系管理员！');
-      return Promise.reject('你没有访问该接口的权限，请联系管理员！');
+    try {
+        const {successMsg, errorMsg, permCode, isMock, isGetDataDirectly = true, isShowSuccessMsg = true} = options;
+        // 如果当前是需要鉴权的接口 并且没有权限的话 则终止请求发起 , isNew
+        if (permCode && !useUserStore().perms.includes(permCode)) {
+            //return $message.error('你没有访问该接口的权限，请联系管理员！');
+            return Promise.reject('你没有访问该接口的权限，请联系管理员！');
+        }
+        let fullUrl = '';
+
+        fullUrl = `${(isMock ? baseMockUrl : baseApiUrl) + config.url}`;
+        /*
+            if (isNew) {
+              fullUrl = `/n-api/${config.url}`;
+            } else {
+              fullUrl = `${(isMock ? baseMockUrl : baseApiUrl) + config.url}`;
+            }*/
+
+        config.url = uniqueSlash(fullUrl);
+        // if (IS_PROD) {
+        //   // 保持api请求的协议与当前访问的站点协议一致
+        //   config.url.replace(/^https?:/g, location.protocol);
+        // }
+        const res = await service.request(config);
+        successMsg && isShowSuccessMsg && presentAlert("成功", successMsg);
+        //successMsg && $message.success(successMsg);
+        //errorMsg && $message.error(errorMsg);
+
+        return isGetDataDirectly ? res.data : res;
+    } catch (error: any) {
+        const {errorMsg, isShowErrorMsg = true} = options;
+        isShowErrorMsg && presentAlert("错误", (errorMsg || "") + error.message);
+        return Promise.reject(error);
     }
-    let fullUrl = '';
-
-    fullUrl = `${(isMock ? baseMockUrl : baseApiUrl) + config.url}`;
-/*
-    if (isNew) {
-      fullUrl = `/n-api/${config.url}`;
-    } else {
-      fullUrl = `${(isMock ? baseMockUrl : baseApiUrl) + config.url}`;
-    }*/
-
-    config.url = uniqueSlash(fullUrl);
-    // if (IS_PROD) {
-    //   // 保持api请求的协议与当前访问的站点协议一致
-    //   config.url.replace(/^https?:/g, location.protocol);
-    // }
-    const res = await service.request(config);
-    successMsg && isShowSuccessMsg && presentAlert("成功",successMsg);
-    //successMsg && $message.success(successMsg);
-    //errorMsg && $message.error(errorMsg);
-
-    return isGetDataDirectly ? res.data : res;
-  } catch (error: any) {
-    const {errorMsg,isShowErrorMsg=true} = options;
-    isShowErrorMsg && presentAlert("错误",(errorMsg|| "")+error.message);
-    return Promise.reject(error);
-  }
 };
 
-const presentAlert = async (title:string,message: string) => {
-  const alert = await alertController.create({
-    header: title,
-    message: message,
-    buttons: [
-      '确定'
-    ],
-  });
+const presentAlert = async (title: string, message: string) => {
+    const alert = await alertController.create({
+        header: title,
+        message: message,
+        buttons: [
+            '确定'
+        ],
+    });
 
-  await alert.present();
+    await alert.present();
 }

h5app/src/views/pages/userQrCode/index.vue

@@ -93,7 +93,7 @@ export default defineComponent({
     const user = ref(userStore.getUserInfo);
     getConfig().then((data) => {
       const qrCodeUrl = data.webSiteUrl + "/jobUserInfo/index?userId=" + user.value.userID;
-      infoQrcodeUrl.value = "/api/common/getQRCode?code=" + qrCodeUrl;
+      infoQrcodeUrl.value = data.webApiServiceUrl + "/common/getQRCode?code=" + encodeURIComponent(qrCodeUrl);
     }, () => {
       infoQrcodeUrl.value = "";
     })