设置token

2024-06-15 11:22:30 +08:00 · 2024-06-15 11:22:30 +08:00 · 7ebef9625f
commit 7ebef9625f
parent ce49dfe013
5 changed files with 85 additions and 62 deletions
--- a/src/api/index.js
+++ b/src/api/index.js
@ -1,9 +1,9 @@
 import { request } from '@umijs/max';
-import loginStore from '../store/login.store';
+// import loginStore from '../store/login.store';

 // 获取登陆人
 export function getCurrentUser() {
-  let token = loginStore.token
+  // let token = loginStore.token
  return request('/api/user/getCurrentUser', {
    method: 'get'
  });
@ -49,7 +49,7 @@ export function queryUserMenu() {

 // 基本图层
 // 获取图层明细点位数据/热力图数据
-export function getLayerPoints( params ) {
+export function getLayerPointsApi( params ) {
  return request('/api/basicMap/getLayerPoints', {
    method: 'GET',
    params: params
@ -112,8 +112,8 @@ export function createPoint( data ) {
 }

 // 获取基础图层菜单栏
-export function getBasicLayerMenu( params ) {
-  return request('/api/basicMap/createPoint', {
+export function getBasicLayerMenuApi( params ) {
+  return request('/api/basicMap/getBasicLayerMenu', {
    method: 'get',
    params: params
  });
@ -126,6 +126,48 @@ export function queryUserLayers() {
  });
 }

+// 获取省
+export function getAllProvinceApi() {
+  return request('/api/mapCommon/getAllProvince', {
+    method: 'get',
+  });
+}
+
+// 获取市
+export function getCityByProvinceApi( params ) {
+  return request('/api/mapCommon/getCityByProvince', {
+    method: 'get',
+    params: params
+  });
+}
+
+// 获取区
+export function getDistrictByCityApi( params ) {
+  return request('/api/mapCommon/getDistrictByCity', {
+    method: 'get',
+    params: params
+  });
+}
+
+// 获取围栏图层数据
+export function getLayerShapesApi( params ) {
+  return request('/api/basicMap/getLayerShapes', {
+    method: 'get',
+    params: params
+  });
+}
+
+// 获取围栏图层数据
+export function getPointByAddressApi( params ) {
+  return request('/api/mapCommon/getPointByAddress', {
+    method: 'get',
+    params: params
+  });
+}
+
+
+
+



--- a/src/pages/BaseMap/LayerData/index.js
+++ b/src/pages/BaseMap/LayerData/index.js
@ -1,13 +1,12 @@
 import React from 'react';
 import { Tree, Button, Modal, Form, Input, Radio, message } from 'antd';
-import axios from 'axios';
 import {
  DownOutlined,
  EyeOutlined,
  EyeInvisibleOutlined,
 } from '@ant-design/icons';
 import SetLogoImagePath from './SetLogoImagePath'
-import { createLayer } from '../../../api';
+import { createLayer, getBasicLayerMenuApi } from '../../../api';
 import '../../../index.less';

 class LayerData extends React.Component {
@ -30,12 +29,8 @@ class LayerData extends React.Component {

    // 获取基础图层菜单栏
    getBasicLayerMenu = (adcode) => {
-        return axios.get('/api/basicMap/getBasicLayerMenu', {
-            params: {
-                adcode: adcode
-            }
-        }).then((e) => {
-            let basicLayeData = e.data.data;
+        return getBasicLayerMenuApi({adcode: adcode}).then((e) => {
+            let basicLayeData = e.data;
            let basicLayeList = [];
            for (var i in basicLayeData) {
                basicLayeList.push({
--- a/src/pages/BaseMap/index.js
+++ b/src/pages/BaseMap/index.js
@ -1,10 +1,9 @@
 import React from 'react';
 import { Select, Input, Card, Col, Row, Button, message, Modal, Spin, Form } from 'antd';
-import axios from 'axios';
 import LayerData from './LayerData';
 import { AimOutlined } from '@ant-design/icons';
 import Header from '../../components/Header/index.js';
-import { createPoint, queryUserLayers } from '../../api';
+import { createPoint, queryUserLayers, getLayerPointsApi, getAllProvinceApi, getCityByProvinceApi, getDistrictByCityApi, getLayerShapesApi, getPointByAddressApi } from '../../api';

 import { GaodeMap ,Scene, Heatmap, PolygonLayer, Marker, MarkerLayer, Popup } from '@antv/l7';
 import { DrawPoint, DrawEvent } from '@antv/l7-draw';
@ -110,13 +109,11 @@ class BaseMap extends React.Component{
    getLayerPoints = (layerId, selected, nodeType) => {
        if (selected) {
            this.startLoading();
-            return axios.get('/api/basicMap/getLayerPoints', {
-                params: {
+            getLayerPointsApi({
                adcode: this.state.districtAdcode || this.state.cityAdcode || this.state.provinceAdcode,
                layerId: layerId
-                }
            }).then((e) => {
-                let layerPointsData = e.data.data || [];
+                let layerPointsData = e.data || [];
                layerPointsData = layerPointsData.map((item) => {
                    item.lng = item.location.split(',')[0];
                    item.lat = item.location.split(',')[1];
@ -259,13 +256,11 @@ class BaseMap extends React.Component{
    // 获取围栏图层数据
    getLayerShapes = (layerId, selected, adcode) => {
        if (selected) {
-            return axios.get('/api/basicMap/getLayerShapes', {
-                params: {
+            return getLayerShapesApi({
                adcode: adcode || this.state.districtAdcode || this.state.cityAdcode || this.state.provinceAdcode,
                layerId: layerId
-                }
            }).then((e) => {
-                let positionBorderData = e.data.data;
+                let positionBorderData = e.data;
                this.setPolygon(positionBorderData, layerId);
            });
        } else {
@ -334,8 +329,8 @@ class BaseMap extends React.Component{

    // 获取省
    getAllProvince = () => {
-        return axios.get('/api/mapCommon/getAllProvince').then((e) => {
-            let provinceData = e.data.data;
+        return getAllProvinceApi().then((e) => {
+            let provinceData = e.data;
            let provinceList = [];
            for (var i in provinceData) {
                provinceList.push({
@ -373,12 +368,8 @@ class BaseMap extends React.Component{
    }
     // 获取市
     getCityByProvince = (provinceAdcode) => {
-        return axios.get('/api/mapCommon/getCityByProvince', {
-            params: {
-                provinceAdcode: provinceAdcode
-            }
-        }).then((e) => {
-            let cityData = e.data.data;
+        return getCityByProvinceApi({provinceAdcode: provinceAdcode}).then((e) => {
+            let cityData = e.data;
            let cityList = [];
            for (var i in cityData) {
                cityList.push({
@ -419,12 +410,8 @@ class BaseMap extends React.Component{
    }
     // 获取区
     getDistrictByCity = (cityAdcode) => {
-        return axios.get('/api/mapCommon/getDistrictByCity', {
-            params: {
-                cityAdcode: cityAdcode
-            }
-        }).then((e) => {
-            let districtData = e.data.data;
+        return getDistrictByCityApi({cityAdcode: cityAdcode}).then((e) => {
+            let districtData = e.data;
            let districtList = [];
            for (var i in districtData) {
                districtList.push({
@ -495,12 +482,8 @@ class BaseMap extends React.Component{
                return false;
            }else{
                address = this.state.provinceLabel +  this.state.cityLabel + address;
-                return axios.get('/api/mapCommon/getPointByAddress', {
-                    params: {
-                        address: address
-                    }
-                }).then((e) => {
-                    let coordinate = e.data.data;
+                return getPointByAddressApi({address: address}).then((e) => {
+                    let coordinate = e.data;
                    if(coordinate === ""||coordinate === null){
                        errorSearchAddress();
                    }else{
--- a/src/pages/Login/passwordLogin.js
+++ b/src/pages/Login/passwordLogin.js
@ -3,6 +3,7 @@ import { useNavigate } from 'react-router-dom';
 import { passwordLogin } from '../../api';
 import '../../index.less';
 import loginStore from '../../store/login.store';
+import { setToken } from '../../utils/token'

 function Login (e) {
  let navigate = useNavigate();
@ -11,10 +12,12 @@ function Login (e) {
    passwordLogin({phone: values.phone, password: values.password}).then((e) => {
        if (!e.success) {
            message.error(e.message);
-          } else {
-            let setToken = loginStore;
-            setToken.setAuthName(e.data.username);
-            setToken.setToken(e.data.token)
+          } else {debugger
+            // let setToken = loginStore;
+            // setToken.setAuthName(e.data.username);
+            // setToken.setToken(e.data.token)
+            setToken(e.data.token)
+            loginStore.setAuthName(e.data.username)
            navigate('/home');
          }
    })
--- a/src/store/login.store.js
+++ b/src/store/login.store.js
@ -8,17 +8,17 @@ class LoginStore {
        makeAutoObservable(this)
    }
    // token
-    get isLoggedIn() {
-        return !!this.token;
-      }
-    setToken = (data) => {
-       this.token = data;
-       localStorage.setItem('authToken', data);
-    }
-    clearToken() {
-        this.token = null;
-        localStorage.removeItem('authToken');
-    }
+    // get isLoggedIn() {
+    //     return !!this.token;
+    //   }
+    // setToken = (data) => {
+    //    this.token = data;
+    //    localStorage.setItem('authToken', data);
+    // }
+    // clearToken() {
+    //     this.token = null;
+    //     localStorage.removeItem('authToken');
+    // }
    // 登录名
    get authName() {
        return !!this.authName;