fix -> 修改接口地址

package.json

@@ -2,7 +2,7 @@
   "name": "blog",
   "version": "0.1.0",
   "private": true,
-  "proxy": "https://www.nosum.cn/",
+  "proxy": "http://localhost:8086",
   "dependencies": {
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
@@ -24,7 +24,8 @@
     "redux": "^4.0.4",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.3.0",
-    "styled-components": "^4.4.1"
+    "styled-components": "^4.4.1",
+    "yarn": "^1.22.19"
   },
   "scripts": {
     "start": "react-scripts start",

src/App.js

@@ -9,7 +9,7 @@ import Header from "./components/Header";
 import Footer from "./components/Footer";
 import ToTop from './components/BackTop';
 import Router from './router';
-import APlayer from 'aplayer';
+// import APlayer from 'aplayer';
 import 'aplayer/dist/APlayer.min.css';
 import axios from "axios";
 
@@ -36,23 +36,23 @@ class App extends PureComponent {
     }
 
     getMuisic(){
-        axios.get('/music/music/v1/list').then((res) => {
-            if(res.models.length > 0){
-                const options = {
-                    container: document.getElementById('player'),
-                    fixed: true,
-                    theme: '#fe9600',
-                    listMaxHeight: '300px',
-                    listFolded: false,
-                    lrcType: 3,
-                    audio:res.models
-                };
-                const ap = new APlayer(options);
-                ap.on('ended', function () {
-                    console.log('player ended');
-                });
-            }
-        })
+        // axios.get('/music/music/v1/list').then((res) => {
+        //     if(res.models.length > 0){
+        //         const options = {
+        //             container: document.getElementById('player'),
+        //             fixed: true,
+        //             theme: '#fe9600',
+        //             listMaxHeight: '300px',
+        //             listFolded: false,
+        //             lrcType: 3,
+        //             audio:res.models
+        //         };
+        //         const ap = new APlayer(options);
+        //         ap.on('ended', function () {
+        //             console.log('player ended');
+        //         });
+        //     }
+        // })
     }
 }
 

src/components/Header/index.js

@@ -28,6 +28,7 @@ class Header extends PureComponent {
     }
 
     render() {
+        // this.state.loading = true
         const {isVisible, value, open, isUser, menuList, loading} = this.state;
         const {category} = this.props;
         const {title, domain} = this.props.confing.toJS();
@@ -237,7 +238,7 @@ class Header extends PureComponent {
 
     getMenu() {
         this.setState({loading: false});
-        axios.get('/menu/front/v1/list', {
+        axios.get('api/v1/menu/list', {
             params: {
                 page: 1,
                 size: 10
@@ -362,6 +363,7 @@ const mapStateToProps = (state) => {
         userInfo: state.getIn(['header', 'userInfo']),
     }
 };
+
 const mapDispatchToProps = (dispatch) => {
     return {
         getCategory() {

src/components/Header/store/actionCreators.js

@@ -10,7 +10,7 @@ const changeCategory = (data) => ({
 
 export const getCategory = () => {
     return (dispatch) => {
-        axios.get('/category/category/v1/list').then((res) => {
+        axios.get('api/v1/category/list').then((res) => {
             if (res.success === 1) {
                 dispatch(changeCategory(res.models));
             }
@@ -20,20 +20,20 @@ export const getCategory = () => {
 
 export const getUser = () => {
     return (dispatch) => {
-        axios.get('/auth/master/v1/get').then((res) => {
-            if (res.success === 1) {
-                dispatch({
-                    type: constants.GET_USER,
-                    data: fromJS(res.model)
-                });
-            }
-        })
+        // axios.get('/auth/master/v1/get').then((res) => {
+        //     if (res.success === 1) {
+        //         dispatch({
+        //             type: constants.GET_USER,
+        //             data: fromJS(res.model)
+        //         });
+        //     }
+        // })
     }
 };
 
 export const getConfing = () => {
     return (dispatch) => {
-        axios.get('/config/config-base/v1/list').then((res) => {
+        axios.get('api/v1/config/list').then((res) => {
             if (res.success === 1) {
                 const {models} = res;
                 let data = {};

src/lib/axios.js

@@ -1,7 +1,7 @@
 import axios from 'axios';
 import {getToken} from './auth';
 
-axios.defaults.baseURL = '/api/blog';
+// axios.defaults.baseURL = '/api/blog';
 // 添加请求拦截器
 axios.interceptors.request.use(function (config) {
     if (getToken()) {

src/pages/archives/index.js

@@ -104,7 +104,7 @@ class Archives extends PureComponent {
 
     getArchives() {
         this.setState({loading: true});
-        axios.get('/posts/archive/v1/list').then((res) => {
+        axios.get('api/v1/post/archive/list').then((res) => {
             if (res.success === 1) {
                 this.setState({
                     list: res.models,

src/pages/category/index.js

@@ -49,21 +49,22 @@ class Category extends PureComponent {
         this.getTimg();
     }
 
-    getList(page, id, override) {
+    getList(current, id, override) {
         this.setState({loading: true});
-        axios.get('/posts/posts/v1/list', {
+        axios.get('api/v1/post/list', {
             params: {
-                page: page,
+                current: current,
                 size: 10,
                 categoryId: id
             }
         }).then((res) => {
-            if (res.success === 1) {
-                let current = res.pageInfo.page * res.pageInfo.size;
-                let total = res.pageInfo.total;
-                const data = res.models;
+            if (res.code === 1) {
+                let current = res.data.current * res.data.size;
+                let total = res.data.total;
+                const data = res.data.records;
                 const Img = this.props.ListImg;
                 let arr = [];
+
                 for (let i = 0; i < data.length; i++) {
                     arr.push({
                         id: data[i].id,
@@ -79,10 +80,11 @@ class Category extends PureComponent {
                         categoryName: data[i].categoryName
                     })
                 }
+
                 this.setState((prevState) => {
                     return {
                         CategoryList: override ? arr : [...prevState.CategoryList, ...arr],
-                        page: page + 1,
+                        current: current + 1,
                         loading: false
                     }
                 });

src/pages/home/components/Banner.js

@@ -92,23 +92,23 @@ class Banner extends PureComponent {
     }
 
     componentDidMount() {
-        axios.get('/social/social/v1/info').then((res) => {
-            if (res.success === 1) {
-                const {models} = res;
-                let array = [];
-                for (let i = 0; i < models.length; i++) {
-                    array.push({
-                        show: false,
-                        icon: models[i].icon,
-                        content: models[i].content,
-                        showType: models[i].showType,
-                    })
-                }
-                this.setState({
-                    info: array
-                })
-            }
-        });
+        // axios.get('/social/social/v1/info').then((res) => {
+        //     if (res.success === 1) {
+        //         const {models} = res;
+        //         let array = [];
+        //         for (let i = 0; i < models.length; i++) {
+        //             array.push({
+        //                 show: false,
+        //                 icon: models[i].icon,
+        //                 content: models[i].content,
+        //                 showType: models[i].showType,
+        //             })
+        //         }
+        //         this.setState({
+        //             info: array
+        //         })
+        //     }
+        // });
     }
 }
 

src/pages/home/components/List.js

@@ -134,19 +134,19 @@ const list = (thumbList, data) => {
 
 const mapDispatch = (dispatch) => {
     return {
-        getBlogList(page, override) {
+        getBlogList(current, override) {
             dispatch({type: constants.LOADING_TRUE});
-            axios.get('/posts/posts/v1/list', {
+            axios.get('api/v1/post/list', {
                 params: {
-                    page: page,
+                    current: current,
                     size: 10
                 }
             }).then((res) => {
-                if (res.success === 1) {
-                    let current = res.pageInfo.page * res.pageInfo.size;
-                    let total = res.pageInfo.total;
-                    let data = list(this.ListImg, res.models);
-                    dispatch(setBlogList(data, page + 1, override));
+                if (res.code === 1) {
+                    let current = res.data.current * res.data.size;
+                    let total = res.data.total;
+                    let data = list(this.ListImg, res.data.records);
+                    dispatch(setBlogList(data, current + 1, override));
                     if (current > total) dispatch(setfinished());
                 }
             });

src/pages/home/store/actionCreators.js

@@ -9,15 +9,15 @@ const setFeature = (data) => ({
 
 export const getFeature = () => {
     return (dispatch) => {
-        axios.get('/posts/weight/v1/list', {
-            params: {
-                page: 1,
-                size: 3
-            }
-        }).then(function (res) {
-            if (res.success === 1) {
-                dispatch(setFeature(res.models));
-            }
-        });
+        // axios.get('/posts/weight/v1/list', {
+        //     params: {
+        //         page: 1,
+        //         size: 3
+        //     }
+        // }).then(function (res) {
+        //     if (res.success === 1) {
+        //         dispatch(setFeature(res.models));
+        //     }
+        // });
     }
 };

src/pages/links/index.js

@@ -95,8 +95,8 @@ class Links extends PureComponent {
 
     getLinks() {
         this.setState({loading: true});
-        axios.get('/link/link/v2/list').then((res) => {
-            let {extra} = res;
+        axios.get('api/v1/link/map').then((res) => {
+            let extra = res.data;
             let arrar = [];
             for (let i in extra) {
                 arrar.push({

src/pages/search/index.js

@@ -38,19 +38,19 @@ class Search extends PureComponent {
         this.getList(1, this.state.key, true);
     }
 
-    getList(page, key, override) {
+    getList(current, key, override) {
         this.setState({loading: true});
-        axios.get('/posts/posts/v1/list', {
+        axios.get('api/v1/post/list', {
             params: {
-                page: page,
+                current: current,
                 size: 10,
                 keywords: key
             }
         }).then((res) => {
-            if (res.success === 1) {
-                let current = res.pageInfo.page * res.pageInfo.size;
-                let total = res.pageInfo.total;
-                const data = res.models;
+            if (res.code === 1) {
+                let current = res.data.current * res.data.size;
+                let total = res.data.total;
+                const data = res.data.records;
                 const Img = this.props.ListImg;
                 let arr = [];
                 data.forEach((item) => {
@@ -68,13 +68,15 @@ class Search extends PureComponent {
                         categoryName: item.categoryName
                     })
                 });
+
                 this.setState((prevState) => {
                     return {
                         list: override ? arr : [...prevState.list, ...arr],
-                        page: page + 1,
+                        current: current + 1,
                         loading: false
                     }
                 });
+
                 if (current > total) {
                     this.setState({
                         finished: true

src/pages/tags/list.js

@@ -49,22 +49,23 @@ class TagList extends PureComponent {
         this.getTimg();
     }
 
-    getList(page, id, override) {
+    getList(current, id, override) {
         this.setState({loading: true});
-        axios.get('/posts/posts/v1/list', {
+        axios.get('api/v1/post/list', {
             params: {
-                page: page,
+                current: current,
                 size: 10,
                 postsTagsId: id
             }
         }).then((res) => {
-            if (res.success === 1) {
-                let current = res.pageInfo.page * res.pageInfo.size;
-                let total = res.pageInfo.total;
-                const data = res.models;
+            if (res.code === 1) {
+                let current = res.data.current * res.data.size;
+                let total = res.data.total;
+                const data = res.data.records;
                 const Img = this.props.ListImg;
                 let arr = [];
                 data.forEach((item) => {
+                    console.log(item)
                     arr.push({
                         id: item.id,
                         title: item.title,
@@ -79,13 +80,15 @@ class TagList extends PureComponent {
                         categoryName: item.categoryName
                     })
                 });
+
                 this.setState((prevState) => {
                     return {
                         list: override ? arr : [...prevState.list, ...arr],
-                        page: page + 1,
+                        current: current + 1,
                         loading: false
                     }
                 });
+
                 if (current > total) {
                     this.setState({
                         finished: true