From 79c943d31b8eeadcdfac2f5f8e665d17e38b7ade Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 13 Oct 2020 14:39:22 +0800 Subject: [PATCH] Change Memo Url --- src/AppConfig.js | 2 +- src/forums/Component/Announcement.jsx | 2 +- src/forums/Component/ItemDropDown.jsx | 12 ++++++------ src/forums/Component/Prise.jsx | 2 +- src/forums/Component/Top.jsx | 2 +- src/forums/Forums.js | 4 ++-- src/forums/ForumsDetail.jsx | 4 ++-- src/forums/New.jsx | 8 ++++---- src/forums/Theme.js | 4 ++-- src/forums/ThemeRight.jsx | 2 +- src/forums/new_comments/comment_list.js | 8 ++++---- src/forums/new_comments/comments.js | 2 +- src/forums/new_comments/new_comment.js | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/AppConfig.js b/src/AppConfig.js index cd01c04b..8e921d9f 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -59,7 +59,7 @@ export function initAxiosInterceptors(props) { // TODO 避免重复的请求 https://github.com/axios/axios#cancellation var proxy = "http://localhost:3000" - proxy = "https://testforgeplus.trustie.net" + // proxy = "https://testforgeplus.trustie.net" const requestMap = {}; window.setfalseInRequestMap = function (keyName) { diff --git a/src/forums/Component/Announcement.jsx b/src/forums/Component/Announcement.jsx index 6ecce112..fa5a7e7e 100644 --- a/src/forums/Component/Announcement.jsx +++ b/src/forums/Component/Announcement.jsx @@ -30,7 +30,7 @@ export default (({ content , operation ,plateId }) => { setVisible(false); // 调用保存接口 if(editWord){ - const url = `/v1/forum_sections/${plateId}/edit_notice.json`; + const url = `/forum_sections/${plateId}/edit_notice.json`; axios.post(url,{ content:editWord }).then(result=>{ diff --git a/src/forums/Component/ItemDropDown.jsx b/src/forums/Component/ItemDropDown.jsx index 8d5406ea..6c38df28 100644 --- a/src/forums/Component/ItemDropDown.jsx +++ b/src/forums/Component/ItemDropDown.jsx @@ -16,7 +16,7 @@ export default ({ id , permission , calbackFunc , confirm }) => { // 置顶、取消置顶 function changeSticky(s){ let sticky = s ? 0 : 1;//1为置顶，0为取消置顶 - const url = `/v1/memos/${id}/set-top-or-down.json`; + const url = `/memos/${id}/set-top-or-down.json`; axios.get(url,{ params:{ sticky @@ -31,7 +31,7 @@ export default ({ id , permission , calbackFunc , confirm }) => { // 推荐、取消推荐 function changeFine(f){ let is_fine = f ? 0 : 1;//1表示加精，0表示取消加精 - const url = `/v1/memos/${id}/is_fine.json`; + const url = `/memos/${id}/is_fine.json`; axios.post(url,{ is_fine }).then(result=>{ @@ -45,7 +45,7 @@ export default ({ id , permission , calbackFunc , confirm }) => { // 关注、取消关注 function changeMemoWatched(m){ let is_watch = m ? 0 : 1;//1为添加关注，0为取消关注 - const url = `/v1/memos/${id}/watch_memo.json`; + const url = `/memos/${id}/watch_memo.json`; axios.post(url,{ is_watch }).then(result=>{ @@ -60,8 +60,8 @@ export default ({ id , permission , calbackFunc , confirm }) => { confirm && confirm({ content: '确认删除帖子?', onOk:()=>{ - const url = `/v1/memos/${id}/destroy.json`; - axios.post(url).then(result=>{ + const url = `/memos/${id}.json`; + axios.delete(url).then(result=>{ if(result){ notification.open({message:"提示",description:result.data.message}); calbackFunc && calbackFunc(); @@ -78,7 +78,7 @@ export default ({ id , permission , calbackFunc , confirm }) => { confirm && confirm({ content: '确认申请删帖?', onOk:()=>{ - const url = `/v1/memos/${id}/confirm_delete.json`; + const url = `/memos/${id}/confirm_delete.json`; axios.post(url,{ is_apply }).then(result=>{ diff --git a/src/forums/Component/Prise.jsx b/src/forums/Component/Prise.jsx index 394f01b4..d005228e 100644 --- a/src/forums/Component/Prise.jsx +++ b/src/forums/Component/Prise.jsx @@ -13,7 +13,7 @@ export default ({ isPrised, num, memo_id, container_type, current_login }) => { function priseForums() { if (current_login) { axios - .post(`/v1/discusses/${memo_id}/plus.json`, { + .post(`/memos/${memo_id}/plus.json`, { container_type: container_type, id: memo_id, type: flag ? 0 : 1, diff --git a/src/forums/Component/Top.jsx b/src/forums/Component/Top.jsx index 203aa822..a9627895 100644 --- a/src/forums/Component/Top.jsx +++ b/src/forums/Component/Top.jsx @@ -65,7 +65,7 @@ export default ({ headData, title , operation , history }) => { // 收藏、取消收藏 function saveForum(id){ if(id){ - const url = `/v1/memos/forum_memos/${id}/is_watch.json`; + const url = `/memos/forum_memos/${id}/is_watch.json`; axios.post(url,{ is_watch:watched?0:1 }).then(result=>{ diff --git a/src/forums/Forums.js b/src/forums/Forums.js index fb86d5cb..080e879e 100644 --- a/src/forums/Forums.js +++ b/src/forums/Forums.js @@ -44,7 +44,7 @@ function aa(props) { async function init() { setListSpin(true); - let url = `/v1/memos.json`; + let url = `/memos.json`; axios .get(url, { params: { page, search, sort , limit:PAGESIZE }, @@ -66,7 +66,7 @@ function aa(props) { useEffect(() => { async function init() { - let url = `/v1/forum_sections.json`; + let url = `/forum_sections.json`; axios .get(url, { params: { is_detail: true }, diff --git a/src/forums/ForumsDetail.jsx b/src/forums/ForumsDetail.jsx index a8ee79da..f29f3d14 100644 --- a/src/forums/ForumsDetail.jsx +++ b/src/forums/ForumsDetail.jsx @@ -47,7 +47,7 @@ function memo_show(props) { async function init() { setSpinType(true); - let url = `/v1/memos/${memo_id}.json`; + let url = `/memos/${memo_id}.json`; axios .get(url) .then((result) => { @@ -79,7 +79,7 @@ function memo_show(props) { } function related_memos() { - let url = `/v1/memos/${memo_id}/related_memos.json`; + let url = `/memos/${memo_id}/related_memos.json`; axios .get(url) .then((result) => { diff --git a/src/forums/New.jsx b/src/forums/New.jsx index 74345629..f958d98e 100644 --- a/src/forums/New.jsx +++ b/src/forums/New.jsx @@ -50,7 +50,7 @@ function New(props, ref) { function getDetail(plate){ if(forumId){ - const url = `/v1/memos/${forumId}/edit.json`; + const url = `/memos/${forumId}/edit.json`; axios.get(url).then(result=>{ if(result){ setContent(result.data.content); @@ -90,7 +90,7 @@ function New(props, ref) { function getPlate() { setSpining(true); - const url = `/v1/forum_sections.json`; + const url = `/forum_sections.json`; axios.get(url) .then((result) => { if (result && result.data) { @@ -183,7 +183,7 @@ function New(props, ref) { } if(forumId){ // 编辑保存 - const url = `/v1/memos/${forumId}/update.json`; + const url = `/memos/${forumId}/update.json`; axios.post(url, params).then((result) => { if (result && result.data) { notification.open({ @@ -202,7 +202,7 @@ function New(props, ref) { }); }else{ // 新建提交 - const url = `/v1/memos/create.json`; + const url = `/memos.json`; axios.post(url, params).then((result) => { if (result && result.data) { notification.open({ diff --git a/src/forums/Theme.js b/src/forums/Theme.js index aa47a549..3006cfb1 100644 --- a/src/forums/Theme.js +++ b/src/forums/Theme.js @@ -37,7 +37,7 @@ function theme(props) { async function InitList() { setListSpin(true); - const url = `/v1/memos/forum_memos/${plateMainId}.json`; + const url = `/memos/forum_memos/${plateMainId}.json`; axios.get(url, { params: { page, search, sort, select_type: menuKey @@ -56,7 +56,7 @@ function theme(props) { useEffect(()=>{ async function getTopInfo(){ - const url = `/v1/memos/forum_memos_head/${plateMainId}.json`; + const url = `/memos/forum_memos_head/${plateMainId}.json`; axios.get(url).then(result=>{ if(result && result.data){ setBreadCrumb(result.data.bread_crumb.forum_tag); diff --git a/src/forums/ThemeRight.jsx b/src/forums/ThemeRight.jsx index 4028baf7..8bc716be 100644 --- a/src/forums/ThemeRight.jsx +++ b/src/forums/ThemeRight.jsx @@ -11,7 +11,7 @@ export default (({ plateId , operation })=> { useEffect(()=>{ async function Init(){ - const url = `/v1/memos/forum_memos_right/${plateId}.json`; + const url = `/memos/forum_memos_right/${plateId}.json`; axios.get(url).then(result=>{ if(result){ setContent({notice:result.data.notice,login:result.data.user_login,name:result.data.username}); diff --git a/src/forums/new_comments/comment_list.js b/src/forums/new_comments/comment_list.js index b0354306..7eace911 100644 --- a/src/forums/new_comments/comment_list.js +++ b/src/forums/new_comments/comment_list.js @@ -45,7 +45,7 @@ function comment_list({ const praise_reply = (id) => { if (current_login) { axios - .post(`/v1/discusses/${id}/plus.json`, { + .post(`/memos/${id}/plus.json`, { container_type: "Memo", id: id, type: is_praise ? 0 : 1, @@ -65,9 +65,9 @@ function comment_list({ function deleteorder(id) { setDeleteSpin(true); - let url = `/v1/memos/${id}/destroy.json`; + let url = `/memos/${id}.json`; axios - .post(url) + .delete(url) .then((result) => { if (result) { if (result.data.status === 0) { @@ -109,7 +109,7 @@ function comment_list({ setChangePage(new_page); } setIsSpin(true); - let url = `/v1/${target_type}/${id}/more_reply.json`; + let url = `/${target_type}/${id}/more_reply.json`; axios .get(url, { params: { page: new_page, limit }, diff --git a/src/forums/new_comments/comments.js b/src/forums/new_comments/comments.js index d4cf6caa..d47ef551 100644 --- a/src/forums/new_comments/comments.js +++ b/src/forums/new_comments/comments.js @@ -27,7 +27,7 @@ function comments({ useEffect(() => { async function init() { setIsSpin(true); - let url = `/v1/${target_type}/${target_id}/more_reply.json`; + let url = `/${target_type}/${target_id}/more_reply.json`; axios .get(url, { params: { page, limit }, diff --git a/src/forums/new_comments/new_comment.js b/src/forums/new_comments/new_comment.js index 2021791b..ad2035e8 100644 --- a/src/forums/new_comments/new_comment.js +++ b/src/forums/new_comments/new_comment.js @@ -13,7 +13,7 @@ function new_comment({ memo_id, user_image, click_button, new_reply }) { function add_reply() { setJournalSpin(true); - let url = `/v1/memos/${memo_id}/reply.json`; + let url = `/memos/${memo_id}/reply.json`; axios .post(url, {parent_id: memo_id, content: content}) .then((result) => {