From 8c4e9a416a480e31147f1a46b2bec9215fcd317d Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 26 Mar 2024 09:37:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- project.private.config.json | 3 +- src/basePage/index/index.tsx | 21 ++- .../customized/tabWrapper/index.tsx | 2 +- src/config/axios/errorCode.ts | 6 - src/config/axios/index.ts | 38 ++++++ src/config/axios/service.ts | 109 ---------------- src/config/index.ts | 2 +- src/pages/login/index.tsx | 121 ++++++++++++++++-- 8 files changed, 173 insertions(+), 129 deletions(-) delete mode 100644 src/config/axios/errorCode.ts delete mode 100644 src/config/axios/service.ts diff --git a/project.private.config.json b/project.private.config.json index 2f04138..dda83fc 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -2,7 +2,8 @@ "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html", "projectname": "taro-demo", "setting": { - "compileHotReLoad": true + "compileHotReLoad": true, + "urlCheck": false }, "condition": {} } \ No newline at end of file diff --git a/src/basePage/index/index.tsx b/src/basePage/index/index.tsx index 742b60a..6ee6151 100644 --- a/src/basePage/index/index.tsx +++ b/src/basePage/index/index.tsx @@ -1,5 +1,5 @@ import { Image, View } from "@tarojs/components"; -import { useState } from "react"; +import { useEffect, useState } from "react"; import Taro from "@tarojs/taro"; import Iot from "../iot"; @@ -17,6 +17,15 @@ import tab3Icon from '../../assets/images/tab/tab3.png' import tab3Icon_selected from '../../assets/images/tab/tab3_selected.png' import { globalData } from "../../config"; +import { request } from "../../config/axios"; + +const getDevice = (data) => { + return request({ + url: '/app/soil-insect/getDevice', + method: 'GET', + data + }) +} const Index = () => { // Taro.navigateTo({ url: '/pages/inspectionLog/index' }) @@ -34,6 +43,14 @@ const Index = () => { } handleAuth() + useEffect(() => { + getDevice({ + belongPark: '1769896538700668928', + belongPlot: '1769908355099721729', + deviceType: '14,16' + }) + }, []) + const bottomMenuList = [ { id: 'iot', @@ -59,7 +76,7 @@ const Index = () => { ] return ( - + { e.stopPropagation() }}> { diff --git a/src/components/customized/tabWrapper/index.tsx b/src/components/customized/tabWrapper/index.tsx index 7a78c6e..ff74a9d 100644 --- a/src/components/customized/tabWrapper/index.tsx +++ b/src/components/customized/tabWrapper/index.tsx @@ -1,5 +1,5 @@ import { View } from "@tarojs/components" -// import './index.css' +import './index.css' /** * options 为菜单列表 selected为选中值 callback为函数回调 diff --git a/src/config/axios/errorCode.ts b/src/config/axios/errorCode.ts deleted file mode 100644 index 94d719f..0000000 --- a/src/config/axios/errorCode.ts +++ /dev/null @@ -1,6 +0,0 @@ -export default { - '401': '认证失败，无法访问系统资源', - '403': '当前操作没有权限', - '404': '访问资源不存在', - default: '系统未知错误，请反馈给管理员' -} diff --git a/src/config/axios/index.ts b/src/config/axios/index.ts index e69de29..b4f0cfc 100644 --- a/src/config/axios/index.ts +++ b/src/config/axios/index.ts @@ -0,0 +1,38 @@ +import Taro from "@tarojs/taro" +import { axiosConfig } from ".." +import { stringify } from "qs" + +export const request = ({ + url = '', + baseUrl = axiosConfig.baseUrl, + data = {}, + method = 'GET', + header = { + 'Authorization': Taro.getStorageSync('token') + } +}): Promise => { + let requestParams = '?' + if (method === 'GET') requestParams += stringify(data, { indices: false }) + console.log('requestParams', requestParams); + + return new Promise((resolve, reject) => { + Taro.showLoading({ title: '加载中...' }) + Taro.request({ + url: baseUrl + url + (requestParams === '?' ? '' : requestParams), + data, + method: method as any, + header, + success: function (res) { + console.log('接口返回', res); + resolve(res.data) + }, + fail: function(err) { + console.error('err', err); + reject(err) + }, + complete: function () { + Taro.hideLoading() + } + }) + }) +} \ No newline at end of file diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts deleted file mode 100644 index 50f3baf..0000000 --- a/src/config/axios/service.ts +++ /dev/null @@ -1,109 +0,0 @@ -import axios, { AxiosError, AxiosInstance, AxiosRequestHeaders, AxiosResponse, InternalAxiosRequestConfig } from "axios"; -import { axiosConfig } from ".."; -import Taro from "@tarojs/taro"; -import qs from 'qs' -import errorCode from './errorCode' - -// 请求白名单，无须token的接口 -const whiteList: string[] = ['/login', '/refresh-token'] - -// 是否正在刷新中 -let isRefreshToken = false -// 请求队列 -let requestList: any[] = [] - -// 创建实例 -const service: AxiosInstance = axios.create({ - baseURL: axiosConfig.baseUrl, - timeout: axiosConfig.timeout, - withCredentials: axiosConfig.withCredentials -}); - -const getAccessToken = () => { - return Taro.getStorageSync('token') -} - -// request拦截器 -service.interceptors.request.use((config: InternalAxiosRequestConfig) => { - // 是否需要设置 token - let isToken = (config!.headers || {}).isToken === false - whiteList.some((v) => { - if (config.url) { - config.url.indexOf(v) > -1 - return (isToken = false) - } - }) - if (getAccessToken() && !isToken) { - ; (config as any).headers.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token - } - const params = config.params || {} - const data = config.data || false - - if ( - config.method?.toUpperCase() === 'POST' && - (config.headers as AxiosRequestHeaders)['Content-Type'] === - 'application/x-www-form-urlencoded' - ) { config.data = qs.stringify(data) } - - // get参数编码 - if (config.method?.toUpperCase() === 'GET' && params) { - config.params = {} - const paramsStr = qs.stringify(params, { allowDots: true }) - if (paramsStr) { - config.url = config.url + '?' + paramsStr - } - } - - return config -}, (error: AxiosError) => { - Promise.reject(error) -}) - -// response 拦截器 -service.interceptors.response.use( - async (response: AxiosResponse) => { - let { data } = response - const config = response.config - if (!data) { throw new Error() } - - const code = data.code || 200 // 默认成功 - // 获取错误信息 - const msg = data.msg || errorCode[code] || errorCode['default'] - - if (code === 401) { - // 如果未认证，并且未进行刷新令牌，说明可能是访问令牌过期了 - // isRefreshToken false 未开始刷新token 进入刷新token程序 - if (!isRefreshToken) { - isRefreshToken = true - try { - // 使用默认的用户名密码进行登录操作 - const token = 'request login' - Taro.setStorageSync('token', token) - config.headers!.Authorization = 'Bearer ' + getAccessToken() - requestList.forEach((cb: any) => { cb() }) - requestList = [] - return service(config) - } catch (e) { - // 刷新失败时 处理错误 - requestList = [] // 清空队列 - return Promise.reject() - } finally { - requestList = [] - isRefreshToken = false - } - } else { - // 正在尝试刷新token，放入等待队列 - return new Promise((resolve) => { - requestList.push(() => { - config.headers!.Authorization = 'Bearer ' + getAccessToken() // 让每个请求携带自定义token 请根据实际情况自行修改 - resolve(service(config)) - }) - }) - } - } else if (code === 500) { - return Promise.reject(new Error(msg)) - } else { - return data - } - } -) \ No newline at end of file diff --git a/src/config/index.ts b/src/config/index.ts index 840007f..47d0c4e 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -1,5 +1,5 @@ export const axiosConfig = { - baseUrl: '', + baseUrl: 'http://117.73.12.97:1606/admin-api/', timeout: 30000, withCredentials: false // 禁用 Cookie 等信息 } diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index 756876d..bc21806 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -3,23 +3,104 @@ import loginBg from '../../assets/images/loginBg.png' import questionIcon from '../../assets/images/icons/question-line.png' import Taro from "@tarojs/taro" import { useState } from "react" +import { request } from "../../config/axios" + +const login = (data, tenantId = '1') => { + return request({ + url: '/system/auth/login', + method: 'POST', + header: { 'Tenant-Id': tenantId }, + data + }) +} + +const getTenantId = (data) => { + return request({ + url: '/system/tenant/get-id-by-name', + method: 'GET', + data + }) +} + +const autoLoginCheck = async () => { + const expireTime = Taro.getStorageSync('expiresTime') + const nowTime = new Date().valueOf() + console.log('expireTime', expireTime); + + if (expireTime) { + if (expireTime - nowTime > 1000 * 60 * 60 * 8) { + // 过期时间大于八小时 + Taro.redirectTo({ url: '/basePage/index/index' }) + } else { + // 过期时间不足 八小时 + const tenantName = Taro.getStorageSync('tenantName') + if (!tenantName) return + const { data: _tenantId } = await getTenantId({ name: tenantName }) + if (!_tenantId) return; + const password = Taro.getStorageSync('password') + const username = Taro.getStorageSync('username') + const { data } = await login({ + password, + rememberMe: true, + tenantName, + username + }, _tenantId.toString()) + + if (data.accessToken) { + Taro.setStorageSync('token', data.accessToken) + Taro.hideLoading() + Taro.redirectTo({ url: '/basePage/index/index' }) + } + } + } +} + const Login = () => { const [username, setUserName] = useState('') const [password, setPassWord] = useState('') - const handleLogin = () => { - if (!username || !password) return + const [tenantName, setTenantName] = useState('') + const handleLogin = async () => { + if (!username || !password) { + Taro.showModal({ + title: '提示', + content: '请输入完整的用户名和密码！', + success: function (res) { + if (res.confirm) { + console.log('用户点击确定') + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + return + } + Taro.setStorageSync('username', username) Taro.setStorageSync('password', password) - // 请求完成后跳转 + Taro.setStorageSync('tenantName', tenantName) + Taro.showLoading({ title: '加载中...'}) - setTimeout(() => { - Taro.setStorageSync('token', 'testToken') + + const { data: _tenantId } = await getTenantId({ name: tenantName }) + if (!_tenantId) return; + const { data } = await login({ + password, + rememberMe: true, + tenantName, + username + }, _tenantId.toString()) + + if (data.accessToken) { + Taro.setStorageSync('token', data.accessToken) Taro.hideLoading() Taro.redirectTo({ url: '/basePage/index/index' }) - }, 2000) + } + if (data.expiresTime) { + Taro.setStorageSync('expiresTime', data.expiresTime) + } } - + autoLoginCheck() return ( @@ -30,7 +111,17 @@ const Login = () => { 欢迎登录 - + + + 租户名 + + setTenantName((_tenantName.target as any).value)} + > + + 用户名 @@ -52,7 +143,19 @@ const Login = () => { - + { + Taro.showModal({ + title: '提示', + content: '请联系管理员重置密码！', + success: function (res) { + if (res.confirm) { + console.log('用户点击确定') + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + }}> 忘记密码?