From 12a7d931f12a42bac597b9014696340b6c05fe4c Mon Sep 17 00:00:00 2001 From: jsy_zjg <31502350@qq.com> Date: Wed, 20 Nov 2024 16:23:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E7=BB=9C=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=EF=BC=8C=E7=99=BB=E5=BD=95=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E7=94=A8=E6=88=B7=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +++--- api/login.js | 10 +++++----- config.js | 2 +- package.json | 3 ++- pages/login.vue | 7 +++---- pages/mine/index.vue | 2 +- store/modules/user.js | 5 +++-- utils/request.js | 11 +++++------ vite.config.js | 32 ++++++++++++++++++++++---------- 9 files changed, 45 insertions(+), 33 deletions(-) diff --git a/.env.development b/.env.development index d4bfd55..1d83a62 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ VITE_ENV = 'development' -VITE_BASE_API = 'http://39.105.121.219' -#VITE_BASE_API = 'http://127.0.0.1' +#VITE_BASE_API = 'http://39.105.121.219' +VITE_BASE_API = 'http://127.0.0.1' #VITE_BASE_API = 'http://api.jsyzhineng.com' - +VITE_APP_BASE_API = '/dev-api' VITE_BASE_MQTT = '39.105.121.219:8083/mqtt' #VITE_BASE_MQTT = '8.130.77.146:8083/mqtt' \ No newline at end of file diff --git a/api/login.js b/api/login.js index 593e840..a2c61cf 100644 --- a/api/login.js +++ b/api/login.js @@ -1,15 +1,15 @@ import request from '@/utils/request' // 登录方法 -export function login(loginName, password, code, uuid) { +export function login(username, password, code, uuid) { return request({ - url: '/login/user/app', + url: '/auth/loginApp', headers: { isToken: false }, method: 'post', data: { - loginName, + username, password, code, uuid @@ -37,7 +37,7 @@ export function phoneLogin(data) { //查询用户的菜单权限 export function userRoles() { return request({ - url: '/app/getRouters', + url: '/system/role/getRoleMenu', method: 'get', }) } @@ -57,7 +57,7 @@ export function register(data) { // 获取用户详细信息 export function getInfo() { return request({ - url: '/getInfo', + url: '/system/user/getInfo', method: 'get' }) } diff --git a/config.js b/config.js index b57c4a2..c41ad1c 100644 --- a/config.js +++ b/config.js @@ -1,6 +1,6 @@ // 应用全局配置 const config = { - port: 9000, + port: 3006, baseUrl: '', // 应用信息 appInfo: { diff --git a/package.json b/package.json index 9adc941..aa3019f 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ }, "dependencies": { "jsencrypt": "^3.3.2", - "mqtt": "^3.0.0" + "mqtt": "^3.0.0", + "axios": "0.28.1" } } diff --git a/pages/login.vue b/pages/login.vue index f0096cf..012402a 100644 --- a/pages/login.vue +++ b/pages/login.vue @@ -105,7 +105,7 @@ if (uni.getStorageSync("jsy_remember") === true) { rememberPassword.value = true loginForm.value.loginName = uni.getStorageSync("jsy_username") - loginForm.value.password = rsaDecrypt(uni.getStorageSync("jsy_password")) + loginForm.value.password = uni.getStorageSync("jsy_password") } // //页面加载完后，重置这个参数 // getApp().globalData.updateApp = false; @@ -210,7 +210,6 @@ setCodeTimer(); }, 3000) - return; store .dispatch("onGetCodePhone", loginForm.value.phone) .then(res => { @@ -291,7 +290,7 @@ url: "Login", data: { loginName: loginObj.loginName, - password: rsaEncrypt(loginObj.password) + password: loginObj.password } } } else { @@ -326,7 +325,7 @@ if (rememberPassword.value) { uni.setStorageSync("jsy_remember", true) uni.setStorageSync("jsy_username", loginForm.value.loginName) - uni.setStorageSync("jsy_password", rsaEncrypt(loginForm.value.password)) + uni.setStorageSync("jsy_password", loginForm.value.password) } else { uni.removeStorageSync("jsy_remember") uni.removeStorageSync("jsy_username") diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 882af9f..d6b32eb 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -108,7 +108,7 @@ --> - + 设置 diff --git a/store/modules/user.js b/store/modules/user.js index e0bb48d..cd47df8 100644 --- a/store/modules/user.js +++ b/store/modules/user.js @@ -70,8 +70,9 @@ const user = { return new Promise((resolve, reject) => { login(loginName, password, code, uuid) .then(res => { - setToken(res.token) - commit("SET_TOKEN", res.token) + console.log(res) + setToken(res.data.access_token) + commit("SET_TOKEN", res.data.access_token) resolve(res) }) .catch(error => { diff --git a/utils/request.js b/utils/request.js index 7f8c20b..2fcc8ca 100644 --- a/utils/request.js +++ b/utils/request.js @@ -1,3 +1,4 @@ + import store from "@/store" import { getToken @@ -11,15 +12,12 @@ import { let timeout = 10000 const request = config => { - let baseUrl - if (config.port && config.port == 9001) { - baseUrl = import.meta.env.VITE_BASE_API + ":9001" - } else { - baseUrl = import.meta.env.VITE_BASE_API + ":9000" - } + // 创建axios实例 + let baseUrl = import.meta.env.VITE_BASE_API+":3006"+import.meta.env.VITE_APP_BASE_API; // 是否需要设置 token const isToken = (config.headers || {}).isToken === false config.header = config.header || {} + console.log(getToken()) if (getToken() && !isToken) { config.header["Authorization"] = "Bearer " + getToken() } @@ -39,6 +37,7 @@ const request = config => { dataType: "json" }) .then(response => { + console.log(response) const res = response const code = res.data.code || 200 const msg = errorCode[code] || res.data.msg || errorCode["default"] diff --git a/vite.config.js b/vite.config.js index fe75c9b..dc3edcd 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,13 +1,25 @@ -import {defineConfig} from 'vite' +import { + defineConfig +} from 'vite' import uni from '@dcloudio/vite-plugin-uni' export default defineConfig(() => { - return { - server: { - port: '3002' - }, - plugins: [ - uni() - ], - } -}) + return { + server: { + port: '3006', + host: '0.0.0.0', + open: true, + proxy: { + // https://cn.vitejs.dev/config/#server-proxy + '/dev-api': { + target: 'http://localhost:8088', + changeOrigin: true, + rewrite: (p) => p.replace(/^\/dev-api/, '') + } + } + }, + plugins: [ + uni() + ], + } +}) \ No newline at end of file