diff --git a/src/services/project.js b/src/services/project.js index 253f484a..3aa44e4d 100644 --- a/src/services/project.js +++ b/src/services/project.js @@ -6,8 +6,8 @@ let baseZoneUrl = `${zoneUrl}/api` if (__CLIENT__) { let settings = localStorage.chromesetting && localStorage.chromesetting !== 'undefined' &&JSON.parse(localStorage.chromesetting); - baseUrl = settings && settings.common.main_site_url + '/api'; - baseZoneUrl = settings && settings.common.zone + '/api'; + baseUrl = `${settings && settings.common.main_site_url}/api`; + baseZoneUrl = `${settings && settings.common.zone}/api`; } const axiosInstance = axios.create({ @@ -24,6 +24,11 @@ axiosInstance.interceptors.response.use( ) const setHead = () => { + if (__CLIENT__ && baseUrl === 'undefined/api') { + let settings = localStorage.chromesetting && localStorage.chromesetting !== 'undefined' &&JSON.parse(localStorage.chromesetting); + baseUrl = `${settings && settings.common.main_site_url}/api`; + baseZoneUrl = `${settings && settings.common.zone}/api`; + } if (__SERVER__) { axiosInstance.defaults.headers.cookie = domObj.window.document.cookie axiosInstance.defaults.headers.common['isServer'] = true @@ -31,53 +36,52 @@ const setHead = () => { } -// export async function getProjectFunc (owner, projectsId) { - const url = `${baseUrl}/${owner}/${projectsId}/simple.json`; setHead() + const url = `${baseUrl}/${owner}/${projectsId}/simple.json`; return axiosInstance.get(url); } export async function getProjectDetailFunc (owner, projectsId) { - const url = `${baseUrl}/${owner}/${projectsId}/detail.json`; setHead() + const url = `${baseUrl}/${owner}/${projectsId}/detail.json`; return axiosInstance.get(url); } export async function getProjectEntriesFunc (owner, projectsId, branch) { - const url = `${baseUrl}/${owner}/${projectsId}/entries.json`; setHead() + const url = `${baseUrl}/${owner}/${projectsId}/entries.json`; return axiosInstance.get(url, {params: { ref: branch }}); } export async function getBannerFunc (owner, projectsId) { - const url = `${baseUrl}/${owner}/${projectsId}/menu_list.json`; setHead() + const url = `${baseUrl}/${owner}/${projectsId}/menu_list.json`; return axiosInstance.get(url); } export async function getProjectReadMe (owner, projectsId, branch) { - const url = `${baseUrl}/${owner}/${projectsId}/readme.json`; setHead() + const url = `${baseUrl}/${owner}/${projectsId}/readme.json`; return axiosInstance.get(url, {params: { ref: branch }}); } export async function getOwnerInfo (owner) { - const url = `${baseUrl}/owners/${owner}.json`; setHead() + const url = `${baseUrl}/owners/${owner}.json`; return axiosInstance.get(url); } export async function getMainInfos (deptId) { - const url = `${baseZoneUrl}/zone/open/zoneKey/${deptId}`; setHead() + const url = `${baseZoneUrl}/zone/open/zoneKey/${deptId}`; return axiosInstance.get(url); } export async function getNewsDetail (id) { - const url = `${baseZoneUrl}/cms/doc/open/${id}`; setHead() + const url = `${baseZoneUrl}/cms/doc/open/${id}`; return axiosInstance.get(url); }