refactor : 更新路徑

api/convertApi.js

@@ -3,7 +3,7 @@ import service from '@utils/GraphApiService'
 export function fetchCnToCpc(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/CN2CPC',
+    url: 'api/v1.0/Word/CN2CPC',
     method: 'POST',
     data
   })
@@ -12,7 +12,7 @@ export function fetchCnToCpc(baseURL, data) {
 export function fetchCntToPct(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/CN2PCT',
+    url: 'api/v1.0/Word/CN2PCT',
     method: 'post',
     data
   })
@@ -21,7 +21,7 @@ export function fetchCntToPct(baseURL, data) {
 export function fetchPctToCn(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/PCT2CN',
+    url: 'api/v1.0/Word/PCT2CN',
     method: 'POST',
     data
   })
@@ -30,7 +30,7 @@ export function fetchPctToCn(baseURL, data) {
 export function fetchConvertEquations(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/ConvertEquations',
+    url: 'api/v1.0/Word/ConvertEquations',
     method: 'POST',
     data
   })
@@ -39,7 +39,7 @@ export function fetchConvertEquations(baseURL, data) {
 export function fetchDownloadFile(baseURL, params) {
   return service({
     baseURL: baseURL,
-    url: 'RequestPayment/DownloadFile',
+    url: 'api/v1.0/RequestPayment/DownloadFile',
     method: 'get',
     responseType: 'blob',
     params

api/fileApi.js

@@ -3,7 +3,7 @@ import service from '@utils/requestService'
 export function SplitRevisionDoc(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/SplitRevisionDoc',
+    url: 'api/v1.0/Word/SplitRevisionDoc',
     method: 'post',
     data
   })

api/graphApi.js

@@ -3,7 +3,7 @@ import service from '@utils/GraphApiService'
 export function splitDocxByBookMark(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByBookMark',
+    url: 'api/v1.0/Word/SplitDocxByBookMark',
     method: 'post',
     data
   })
@@ -12,7 +12,7 @@ export function splitDocxByBookMark(baseURL, data) {
 export function splitDocxByRange(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByRange',
+    url: 'api/v1.0/Word/SplitDocxByRange',
     method: 'post',
     data
   })
@@ -21,7 +21,7 @@ export function splitDocxByRange(baseURL, data) {
 export function splitDocx(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/SplitDocx',
+    url: 'api/v1.0/Word/SplitDocx',
     method: 'post',
     data
   })
@@ -31,7 +31,7 @@ export function splitDocx(baseURL, data) {
 export function splitDocxByPageBreak(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByPageBreak',
+    url: 'api/v1.0/Word/SplitDocxByPageBreak',
     method: 'post',
     data
   })
@@ -40,7 +40,7 @@ export function splitDocxByPageBreak(baseURL, data) {
 export function downloadFile(baseURL, data){
   return service({
     baseURL: baseURL,
-    url:'Word/DownloadFile',
+    url:'api/v1.0/Word/DownloadFile',
     method: 'post',
     data,
     responseType: 'blob' 

api/uploadApi.js

@@ -3,7 +3,7 @@ import service from '@utils/requestService'
 export function createHxRequestPaymentVerticalTotal(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'RequestPayment/ChangeHXRequestPaymentVerticalTotal',
+    url: 'api/v1.0/RequestPayment/ChangeHXRequestPaymentVerticalTotal',
     method: 'POST',
     data
   })
@@ -11,7 +11,7 @@ export function createHxRequestPaymentVerticalTotal(baseURL, data) {
 export function createHxRequestPaymentVerticalTotal2(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'RequestPayment/ChangeHXRequestPaymentVerticalTotal2',
+    url: 'api/v1.0/RequestPayment/ChangeHXRequestPaymentVerticalTotal2',
     method: 'POST',
     data
   })
@@ -19,7 +19,7 @@ export function createHxRequestPaymentVerticalTotal2(baseURL, data) {
 export function downloadFile(baseURL,params) {
   return service({
     baseURL:baseURL,
-    url: 'RequestPayment/DownloadFile',
+    url: 'api/v1.0/RequestPayment/DownloadFile',
     method: 'GET',
     params,
     responseType: 'blob'

api/uploadExcelApi.js

@@ -3,7 +3,7 @@ import service from '@utils/GraphApiService'
 export function fetchEhrEmployeeByName(baseURL, params) {
   return service({ 
     baseURL: baseURL,
-    url: 'Wade/GetEhrEmployeeByName',
+    url: 'api/v1.0/Wade/GetEhrEmployeeByName',
     method: 'get',
     params
   })
@@ -11,7 +11,7 @@ export function fetchEhrEmployeeByName(baseURL, params) {
 export function fetchCaseLevelList(baseURL, data) {
   return service({
     baseURL: baseURL,
-    url: 'Wade/CreateCaseLevelList',
+    url: 'api/v1.0/Wade/CreateCaseLevelList',
     method: 'post',
     data
   })

lib/index.common.js

@@ -90199,7 +90199,7 @@ GraphApiService.interceptors.response.use(
 function splitDocxByBookMark(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByBookMark',
+    url: 'api/v1.0/Word/SplitDocxByBookMark',
     method: 'post',
     data
   })
@@ -90208,7 +90208,7 @@ function splitDocxByBookMark(baseURL, data) {
 function splitDocxByRange(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByRange',
+    url: 'api/v1.0/Word/SplitDocxByRange',
     method: 'post',
     data
   })
@@ -90217,7 +90217,7 @@ function splitDocxByRange(baseURL, data) {
 function splitDocx(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/SplitDocx',
+    url: 'api/v1.0/Word/SplitDocx',
     method: 'post',
     data
   })
@@ -90227,7 +90227,7 @@ function splitDocx(baseURL, data) {
 function splitDocxByPageBreak(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByPageBreak',
+    url: 'api/v1.0/Word/SplitDocxByPageBreak',
     method: 'post',
     data
   })
@@ -90236,7 +90236,7 @@ function splitDocxByPageBreak(baseURL, data) {
 function downloadFile(baseURL, data){
   return utils_GraphApiService({
     baseURL: baseURL,
-    url:'Word/DownloadFile',
+    url:'api/v1.0/Word/DownloadFile',
     method: 'post',
     data,
     responseType: 'blob' 
@@ -91154,7 +91154,7 @@ var Cn2CpcFormvue_type_template_id_3f429a72_staticRenderFns = []
 function fetchCnToCpc(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/CN2CPC',
+    url: 'api/v1.0/Word/CN2CPC',
     method: 'POST',
     data
   })
@@ -91163,7 +91163,7 @@ function fetchCnToCpc(baseURL, data) {
 function fetchCntToPct(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/CN2PCT',
+    url: 'api/v1.0/Word/CN2PCT',
     method: 'post',
     data
   })
@@ -91172,7 +91172,7 @@ function fetchCntToPct(baseURL, data) {
 function fetchPctToCn(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/PCT2CN',
+    url: 'api/v1.0/Word/PCT2CN',
     method: 'POST',
     data
   })
@@ -91181,7 +91181,7 @@ function fetchPctToCn(baseURL, data) {
 function fetchConvertEquations(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/ConvertEquations',
+    url: 'api/v1.0/Word/ConvertEquations',
     method: 'POST',
     data
   })
@@ -91190,7 +91190,7 @@ function fetchConvertEquations(baseURL, data) {
 function fetchDownloadFile(baseURL, params) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'RequestPayment/DownloadFile',
+    url: 'api/v1.0/RequestPayment/DownloadFile',
     method: 'get',
     responseType: 'blob',
     params
@@ -92229,7 +92229,7 @@ service.interceptors.response.use(
 function SplitRevisionDoc(baseURL, data) {
   return requestService({
     baseURL: baseURL,
-    url: 'Word/SplitRevisionDoc',
+    url: 'api/v1.0/Word/SplitRevisionDoc',
     method: 'post',
     data
   })
@@ -92614,7 +92614,7 @@ var srcvue_type_template_id_684e8cf8_staticRenderFns = []
 function createHxRequestPaymentVerticalTotal(baseURL, data) {
   return requestService({
     baseURL: baseURL,
-    url: 'RequestPayment/ChangeHXRequestPaymentVerticalTotal',
+    url: 'api/v1.0/RequestPayment/ChangeHXRequestPaymentVerticalTotal',
     method: 'POST',
     data
   })
@@ -92622,7 +92622,7 @@ function createHxRequestPaymentVerticalTotal(baseURL, data) {
 function createHxRequestPaymentVerticalTotal2(baseURL, data) {
   return requestService({
     baseURL: baseURL,
-    url: 'RequestPayment/ChangeHXRequestPaymentVerticalTotal2',
+    url: 'api/v1.0/RequestPayment/ChangeHXRequestPaymentVerticalTotal2',
     method: 'POST',
     data
   })
@@ -92630,7 +92630,7 @@ function createHxRequestPaymentVerticalTotal2(baseURL, data) {
 function uploadApi_downloadFile(baseURL,params) {
   return requestService({
     baseURL:baseURL,
-    url: 'RequestPayment/DownloadFile',
+    url: 'api/v1.0/RequestPayment/DownloadFile',
     method: 'GET',
     params,
     responseType: 'blob'
@@ -93241,7 +93241,7 @@ var UploadExcel_component = normalizeComponent(
 function fetchEhrEmployeeByName(baseURL, params) {
   return utils_GraphApiService({ 
     baseURL: baseURL,
-    url: 'Wade/GetEhrEmployeeByName',
+    url: 'api/v1.0/Wade/GetEhrEmployeeByName',
     method: 'get',
     params
   })
@@ -93249,7 +93249,7 @@ function fetchEhrEmployeeByName(baseURL, params) {
 function fetchCaseLevelList(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Wade/CreateCaseLevelList',
+    url: 'api/v1.0/Wade/CreateCaseLevelList',
     method: 'post',
     data
   })

lib/index.umd.js

@@ -90208,7 +90208,7 @@ GraphApiService.interceptors.response.use(
 function splitDocxByBookMark(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByBookMark',
+    url: 'api/v1.0/Word/SplitDocxByBookMark',
     method: 'post',
     data
   })
@@ -90217,7 +90217,7 @@ function splitDocxByBookMark(baseURL, data) {
 function splitDocxByRange(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByRange',
+    url: 'api/v1.0/Word/SplitDocxByRange',
     method: 'post',
     data
   })
@@ -90226,7 +90226,7 @@ function splitDocxByRange(baseURL, data) {
 function splitDocx(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/SplitDocx',
+    url: 'api/v1.0/Word/SplitDocx',
     method: 'post',
     data
   })
@@ -90236,7 +90236,7 @@ function splitDocx(baseURL, data) {
 function splitDocxByPageBreak(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/SplitDocxByPageBreak',
+    url: 'api/v1.0/Word/SplitDocxByPageBreak',
     method: 'post',
     data
   })
@@ -90245,7 +90245,7 @@ function splitDocxByPageBreak(baseURL, data) {
 function downloadFile(baseURL, data){
   return utils_GraphApiService({
     baseURL: baseURL,
-    url:'Word/DownloadFile',
+    url:'api/v1.0/Word/DownloadFile',
     method: 'post',
     data,
     responseType: 'blob' 
@@ -91163,7 +91163,7 @@ var Cn2CpcFormvue_type_template_id_3f429a72_staticRenderFns = []
 function fetchCnToCpc(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/CN2CPC',
+    url: 'api/v1.0/Word/CN2CPC',
     method: 'POST',
     data
   })
@@ -91172,7 +91172,7 @@ function fetchCnToCpc(baseURL, data) {
 function fetchCntToPct(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/CN2PCT',
+    url: 'api/v1.0/Word/CN2PCT',
     method: 'post',
     data
   })
@@ -91181,7 +91181,7 @@ function fetchCntToPct(baseURL, data) {
 function fetchPctToCn(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/PCT2CN',
+    url: 'api/v1.0/Word/PCT2CN',
     method: 'POST',
     data
   })
@@ -91190,7 +91190,7 @@ function fetchPctToCn(baseURL, data) {
 function fetchConvertEquations(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Word/ConvertEquations',
+    url: 'api/v1.0/Word/ConvertEquations',
     method: 'POST',
     data
   })
@@ -91199,7 +91199,7 @@ function fetchConvertEquations(baseURL, data) {
 function fetchDownloadFile(baseURL, params) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'RequestPayment/DownloadFile',
+    url: 'api/v1.0/RequestPayment/DownloadFile',
     method: 'get',
     responseType: 'blob',
     params
@@ -92238,7 +92238,7 @@ service.interceptors.response.use(
 function SplitRevisionDoc(baseURL, data) {
   return requestService({
     baseURL: baseURL,
-    url: 'Word/SplitRevisionDoc',
+    url: 'api/v1.0/Word/SplitRevisionDoc',
     method: 'post',
     data
   })
@@ -92623,7 +92623,7 @@ var srcvue_type_template_id_684e8cf8_staticRenderFns = []
 function createHxRequestPaymentVerticalTotal(baseURL, data) {
   return requestService({
     baseURL: baseURL,
-    url: 'RequestPayment/ChangeHXRequestPaymentVerticalTotal',
+    url: 'api/v1.0/RequestPayment/ChangeHXRequestPaymentVerticalTotal',
     method: 'POST',
     data
   })
@@ -92631,7 +92631,7 @@ function createHxRequestPaymentVerticalTotal(baseURL, data) {
 function createHxRequestPaymentVerticalTotal2(baseURL, data) {
   return requestService({
     baseURL: baseURL,
-    url: 'RequestPayment/ChangeHXRequestPaymentVerticalTotal2',
+    url: 'api/v1.0/RequestPayment/ChangeHXRequestPaymentVerticalTotal2',
     method: 'POST',
     data
   })
@@ -92639,7 +92639,7 @@ function createHxRequestPaymentVerticalTotal2(baseURL, data) {
 function uploadApi_downloadFile(baseURL,params) {
   return requestService({
     baseURL:baseURL,
-    url: 'RequestPayment/DownloadFile',
+    url: 'api/v1.0/RequestPayment/DownloadFile',
     method: 'GET',
     params,
     responseType: 'blob'
@@ -93250,7 +93250,7 @@ var UploadExcel_component = normalizeComponent(
 function fetchEhrEmployeeByName(baseURL, params) {
   return utils_GraphApiService({ 
     baseURL: baseURL,
-    url: 'Wade/GetEhrEmployeeByName',
+    url: 'api/v1.0/Wade/GetEhrEmployeeByName',
     method: 'get',
     params
   })
@@ -93258,7 +93258,7 @@ function fetchEhrEmployeeByName(baseURL, params) {
 function fetchCaseLevelList(baseURL, data) {
   return utils_GraphApiService({
     baseURL: baseURL,
-    url: 'Wade/CreateCaseLevelList',
+    url: 'api/v1.0/Wade/CreateCaseLevelList',
     method: 'post',
     data
   })

package.json

 {
   "name": "@purplevin/component",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "private": false,
   "main": "lib/index.umd.min.js",
   "scripts": {

utils/agsRequest.js

+import axios from 'axios'
+import { Loading, Message } from 'element-ui'
+import store from '@/store'
+import { getToken, getExpiresDate } from '@/utils/auth'
+import { saveAs } from 'file-saver'
+import { blobValidate } from '@/utils'
+import i18n from '@/locale'
+import router from '@/router'
+import moment from 'moment'
+import browserIO from '@/utils/browserIO'
+const envs = [
+  { 'env': 'development_local', 'url': '/ags-api-dev/' },
+  { 'env': 'dev_local', 'url': '/ags-api-dev/' }
+]
+const env = envs.find(x => x.env === process.env.NODE_ENV)
+const whiteList = ['/web/auth/captcha', '/dev-api/api/refresh/']
+// create an axios instance
+const service = axios.create({
+  // ags-api 會透過代理去調用接口
+  baseURL: env === undefined ? process.env.VUE_APP_BASE_API : env.url,
+  withCredentials: true, // send cookies when cross-domain requests
+  timeout: 30000 // request timeout
+})
+let downloadLoadingInstance
+
+// request interceptor
+service.interceptors.request.use(
+  async config => {
+    // 是否已過期, 過期重新獲取Token
+    const isExpiresDate = moment().isAfter(moment(getExpiresDate()))
+    if (isExpiresDate && config.url !== '/web/auth/refresh_token') {
+      await store.dispatch('account/refreshToken')
+    }
+    if (getToken()) {
+      config.headers['Authorization'] = 'Bearer ' + getToken()
+    }
+    return config
+  },
+  error => {
+    console.log('service.interceptors.request:', error) // for debug
+    return Promise.reject(error)
+  }
+)
+
+// response interceptor
+service.interceptors.response.use(
+  async response => {
+    const res = response.data
+    // 判斷是否為檔案類型
+    if (response.config.responseType === 'blob') return res
+
+    // 白名單直接回傳資料
+    if (whiteList.includes(response.config.url)) return res
+
+    switch (res.code) {
+      case '1': // code = 1 為運營看板暫時使用
+        return res
+      case 40301:
+      case 40309: // Token失效
+        if (router.currentRoute.name !== 'login') {
+          Message({
+            message: res.message || res.msg || 'Error',
+            type: 'error',
+            duration: 5 * 1000
+          })
+          await store.dispatch('account/logout')
+          router.push({ path: '/login' })
+        }
+        return Promise.reject(res)
+      case 40307: // Token已過期, 開始重新獲取Token流程
+        return refreshToken(response)
+      case 20000: // 正常狀態
+        return res
+    }
+
+    // obtain專用
+    const { status, data } = response
+    if (status === 200 && !data.code) {
+      return data
+    }
+
+    Message({
+      message: res.message || res.msg || 'Error',
+      type: 'error',
+      duration: 5 * 1000
+    })
+    // return Promise.reject(res)
+    return res
+  },
+  error => {
+    if (error.response) {
+      switch (error.response.status) {
+        case 400: {
+          Message({
+            message: `${error.response.status}:${error.message}`,
+            type: 'error',
+            duration: 5 * 1000
+          })
+          break
+        }
+        case 401: {
+          Message({
+            message: `${error.response.status}:${i18n.t('request.relogin')}`,
+            type: 'error',
+            duration: 5 * 1000
+          })
+          break
+        }
+        case 404:
+          Message({
+            message: `${error.response.status}: ${i18n.t('request.notfound')}`,
+            type: 'error',
+            duration: 5 * 1000
+          })
+          break
+        case 403:
+          Message({
+            message: `${error.response.data.code}: ${error.response.data.message}`,
+            type: 'error',
+            duration: 5 * 1000
+          })
+          break
+        case 500:
+          Message({
+            message: `${error.response.status}: ${i18n.t('request.systemError')}`,
+            type: 'error',
+            duration: 5 * 1000
+          })
+          break
+
+        default:
+          Message({
+            message: `${error.response.status}: ${i18n.t('request.systemMaintenance')}。`,
+            type: 'error',
+            duration: 5 * 1000
+          })
+      }
+      console.log('agsRequest Error: ' + error) // for debug
+      return Promise.reject(error)
+    } else {
+      console.log('agsRequest other Error : ' + error) // for debug
+      if (error.message) {
+        Message({
+          message: error.message,
+          type: 'error',
+          duration: 5 * 1000
+        })
+      }
+      return Promise.reject(error)
+    }
+  }
+)
+
+const refreshToken = (response) => {
+  // 從登入來的就顯示帳號密碼錯誤
+  if (response.config.url === '/ags/web/auth/login') {
+    const accountAndPasswordError = { message: i18n.t('login.accountAndPasswordError') }
+    Message({
+      message: accountAndPasswordError.message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(accountAndPasswordError.message)
+  }
+
+  // 如果是從refreshToke就離開, 表示refreshToken也失效
+  if (response.config.url.indexOf('/web/auth/refresh_token') > 0) {
+    return Promise.reject(response)
+  }
+
+  // 原始 request 資訊
+  const originalRequest = response.config
+  // 依據 refresh_token 刷新 access_token 並重發 request
+  return store.dispatch('account/refreshToken').then(response => {
+    // 刷新Token並重新登入應用
+    browserIO.login()
+    return service(originalRequest)
+  }).catch(async error => {
+    Message({
+      message: `${i18n.t('request.relogin')}`,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    await store.dispatch('account/logout')
+    router.push({ path: '/login' })
+    return Promise.reject(error)
+  })
+}
+
+// 通用下載方法
+export function download(url, params, filename, type = 'POST') {
+  downloadLoadingInstance = Loading.service({ text: '正在下载数据，请稍候', spinner: 'el-icon-loading' })
+  return service.get(url, params, {
+    responseType: 'blob'
+  }).then(async(data) => {
+    const isValidate = await blobValidate(data)
+    if (isValidate) {
+      const blob = new Blob([data])
+      saveAs(blob, filename)
+    } else {
+      Message.error('下载的档案内容不正确')
+    }
+    downloadLoadingInstance.close()
+  }).catch((r) => {
+    console.error(r)
+    Message.error('下载文件出现错误，请联系管理员！')
+    downloadLoadingInstance.close()
+  })
+}
+
+export default service