diff --git a/.env.development b/.env.development index fd0fc2b4..a8966f21 100644 --- a/.env.development +++ b/.env.development @@ -7,7 +7,7 @@ VITE_PUBLIC_PATH = / # 本地开发代理,可以解决跨域及多地址代理 # 如果接口地址匹配到,则会转发到http://localhost:3000,防止本地出现跨域问题 # 可以有多个,注意多个不能换行,否则代理将会失效 -VITE_PROXY = [["/api","http://192.168.1.100:10408"]] +VITE_PROXY = [["/api","http://223.99.228.207:10406"]] # 是否删除Console.log VITE_DROP_CONSOLE = false diff --git a/src/api/base/user/index.ts b/src/api/base/user/index.ts index 55fbded4..78f22b35 100644 --- a/src/api/base/user/index.ts +++ b/src/api/base/user/index.ts @@ -4,18 +4,16 @@ import { defHttp } from '@/utils/http/axios' export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal') { return defHttp.post({ - url: '/baymax-auth/oauth/token', + url: '/iot-auth/oauth/token', params: { username: params.username, password: params.password, - grant_type: 'captcha', + grant_type: 'password', scope: 'all', type: 'account', }, headers: { 'Tenant-Id': params.tenantId, - 'Captcha-Key': params.captchaKey, - 'Captcha-Code': params.captchaCode, }, }, { errorMessageMode: mode, @@ -26,7 +24,7 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal') export function getUserInfo() { return defHttp.get({ - url: '/baymax-system/user/info', + url: '/iot-system/user/info', }) } @@ -48,19 +46,19 @@ export interface __MenuItem { export function getUserRouters() { return defHttp.get<__MenuItem[]>({ - url: '/baymax-system/menu/routes', + url: '/iot-system/sysApp/routes?appCode=mes', }) } export function getUserButtons() { return defHttp.get({ - url: '/baymax-system/menu/buttons', + url: '/iot-system/sys-app-menu/buttons?appCode=mes', }) } export function doLogout() { - return defHttp.post({ - url: '/baymax-auth/oauth/logout', + return defHttp.get({ + url: '/iot-auth/oauth/logout', }) } @@ -75,14 +73,14 @@ export function getLoginCaptcha() { export function updateUserInfo(data: Partial) { return defHttp.post({ - url: '/baymax-system/user/update-info', + url: '/iot-system/user/update-info', data, }) } export function updatePassword(params: { oldPassword: string, newPassword: string, newPassword1: string }) { return defHttp.post({ - url: '/baymax-system/user/update-password', + url: '/iot-system/user/update-password', params, }, { joinParamsToUrl: true }) } diff --git a/src/api/base/user/types.ts b/src/api/base/user/types.ts index bd683a87..cd170b27 100644 --- a/src/api/base/user/types.ts +++ b/src/api/base/user/types.ts @@ -4,8 +4,6 @@ export interface LoginParams { username: string password: string tenantId: string - captchaKey: string - captchaCode: string } export interface LoginResult extends User { diff --git a/src/views/base/login/LoginForm.vue b/src/views/base/login/LoginForm.vue index 3c81fcb4..38deb371 100644 --- a/src/views/base/login/LoginForm.vue +++ b/src/views/base/login/LoginForm.vue @@ -1,12 +1,9 @@