Commit f1c1237c authored by 胡占生's avatar 胡占生 🇨🇳

fix: 登录接口修改,请求封装修改,时间日期封装修复

parent 1dd6ed4b
...@@ -3,7 +3,7 @@ import request from '@/utils/axios' ...@@ -3,7 +3,7 @@ import request from '@/utils/axios'
/*get请求*/ /*get请求*/
export function getFun(url,params) { export function getFun(url,params) {
return request({ return request({
url: +url, url: url,
method: 'get', method: 'get',
params params
}) })
......
/**
* 严肃声明:
* 开源版本请务必保留此注释头信息,若删除我方将保留所有法律责任追究!
* 本系统已申请软件著作权,受国家版权局知识产权以及国家计算机软件著作权保护!
* 可正常分享和学习源码,不得用于违法犯罪活动,违者必究!
* Copyright (c) 2020 陈尼克 all rights reserved.
* 版权所有,侵权必究!
*/
import { getFun, postFun } from "@/service/table.js";
import axios from '../utils/axios'
export function getUserInfo() {
return getFun('/getInfo')
}
export function EditUserInfo(params) {
return axios.put('/hse/app-api/user/info', params);
}
export function login(params) {
return postFun('/user/login', params);
}
export function logout() {
return postFun('/user/logout')
}
export function register(params) {
return postFun('/user/register', params);
}
...@@ -6,7 +6,7 @@ import { Dialog } from 'vant'; ...@@ -6,7 +6,7 @@ import { Dialog } from 'vant';
import { getToken ,removeToken} from '@/utils/auth' // get token from cookie import { getToken ,removeToken} from '@/utils/auth' // get token from cookie
const service = axios.create({ const service = axios.create({
// baseURL: '/aqpt/app-api', //前缀路径 // baseURL: '/aqpt/app-api', //前缀路径
baseURL: '/dev-api', //前缀路径 baseURL: '/app-api', //前缀路径
headers: {//请求头部 headers: {//请求头部
// "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", // "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
"content-type": "application/json", "content-type": "application/json",
...@@ -16,7 +16,7 @@ const service = axios.create({ ...@@ -16,7 +16,7 @@ const service = axios.create({
//拦截接口请求 //拦截接口请求
service.interceptors.request.use(config => { service.interceptors.request.use(config => {
if (getToken()) { if (getToken()) {
config.headers['token'] = getToken() config.headers['Authorization'] = getToken()
} }
return config return config
},error => { },error => {
...@@ -45,7 +45,16 @@ service.interceptors.response.use(response => { ...@@ -45,7 +45,16 @@ service.interceptors.response.use(response => {
}).then(() => { }).then(() => {
router.go(-1); router.go(-1);
}); });
} else{ }else if(res.code === 401){
Dialog.alert({
title: '提示',
message: '登录过期,请重新登录!',
theme: 'round-button',
}).then(() => {
removeToken()
location.href="/login"
});
} else{
Toast.fail({ Toast.fail({
title: '提示', title: '提示',
forbidClick: true, forbidClick: true,
......
export function timestampToTime (time,type,zero,num) { export function timestampToTime (time,type,zero,num) {
if(!time){return ''} if(!time){return ''}
try{ try{
var date = new Date(time) var date = new Date(time.toString().replace(/-/g, "/"))
if(num&&typeof parseInt(num)=="number"){ if(num&&typeof parseInt(num)=="number"){
date = new Date(new Date(time).getTime()+num*60*60*24*1000)//时间戳以毫秒为单位,也可用其他日期格式 date = new Date(new Date(time.toString().replace(/-/g, "/")).getTime()+num*60*60*24*1000)//时间戳以毫秒为单位,也可用其他日期格式
} }
let yy = date.getFullYear();//年 let yy = date.getFullYear();//年
let mm = date.getMonth()+1;//月 let mm = date.getMonth()+1;//月
...@@ -30,26 +31,8 @@ export function timestampToTime (time,type,zero,num) { ...@@ -30,26 +31,8 @@ export function timestampToTime (time,type,zero,num) {
return yy+''+mm+''+dd+''+hh+''+mf+''+ss+'';//yyyy年mm月dd日 hh时mf分ss秒 return yy+''+mm+''+dd+''+hh+''+mf+''+ss+'';//yyyy年mm月dd日 hh时mf分ss秒
}else if(type=="DT7"){ }else if(type=="DT7"){
return yy+''+mm+''+dd+'';//yyyy年mm月dd日 return yy+''+mm+''+dd+'';//yyyy年mm月dd日
}else if(type=="DT8"){
return yy+'-'+mm+'-'+dd+' '+hh+':'+mf;//yyyy-mm-dd hh:mf
} }
}catch(e){ }catch(e){
console.log("timestampToTime Error");return "" console.log("timestampToTime Error");return ""
} }
} }
\ No newline at end of file
export function generateId (prefix) {
var year = new Date().getFullYear();
var month = new Date().getMonth()+1;
var date = new Date().getDate();
var hours = new Date().getHours();
var minutes = new Date().getMinutes();
var seconds = new Date().getSeconds();
if (month < 10) month = "0" + month;
if (date < 10) date = "0" + date;
if (hours < 10) hours = "0" + hours;
if (minutes < 10) minutes = "0" + minutes;
if (seconds < 10) seconds = "0" + seconds;
let uuid = year + "-" + month + "-" + date + "-" +hours+minutes+seconds;
return prefix + "-" + uuid
}
...@@ -85,21 +85,25 @@ export default { ...@@ -85,21 +85,25 @@ export default {
postFun('/login',values).then((Response)=>{ postFun('/login',values).then((Response)=>{
if(Response.code==200){ if(Response.code==200){
this.$toast.clear() this.$toast.clear()
this.$toast.success({ // setLocalUserInfo(user)
message:'登录成功', setToken(Response.token)
duration: 2000 getFun('/getInfo').then((Response2)=>{
console.log('%c [ Response2 ]-89', 'font-size:13px; background:pink; color:#bf2c9f;', Response2)
var userInfo={
...Response2.user
}
/* 存储用户信息 */
setUserInfo(userInfo)
// if(!Response2.data.initializePassword){
// this.$router.push('/save-workbench')
// }else{
// this.$router.push('/reset-pas-two')
// }
this.$router.push('/save-workbench')
}) })
var userInfo={
token:Response.token,
}
var user={
username:values.username
}
/* 存储用户信息 */ /* 存储用户信息 */
setUserInfo(userInfo)
setLocalUserInfo(user)
setToken(Response.token)
this.$router.push('/save-workbench')
}else{ }else{
this.$toast.clear() this.$toast.clear()
this.$toast.fail({ this.$toast.fail({
......
...@@ -7,14 +7,15 @@ module.exports = { ...@@ -7,14 +7,15 @@ module.exports = {
https: false, https: false,
//以上的ip和端口是我们本机的;下面为需要跨域的 //以上的ip和端口是我们本机的;下面为需要跨域的
proxy: { //配置跨域 proxy: { //配置跨域
'/dev-api': { '/app-api': {
target: 'http://192.168.4.232:8080/', //这里是后台的地址 target: 'http://192.168.4.232:8080/', //这里是后台的地址
// target: 'http://192.168.10.137:8080/', //这里是后台的地址
ws: true, ws: true,
changOrigin: true, //允许跨域 changOrigin: true, //允许跨域
// logLevel: 'debug', // 显示代理调试信息 // logLevel: 'debug', // 显示代理调试信息
pathRewrite: { // pathRewrite: {
'^/dev-api': '' //请求的时候使用这个api就可以 // '^/app-api': '' //请求的时候使用这个api就可以
} // }
}, },
// '/ps_ceninss': { // '/ps_ceninss': {
// target: 'http://192.168.3.80:8080', //这里是后台的地址 // target: 'http://192.168.3.80:8080', //这里是后台的地址
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment