From ad90fe207be03050e1afca24c231e50ee836d8a4 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Thu, 12 Oct 2023 02:58:30 +0800 Subject: [PATCH] chore: login Extension Parameters --- src/api/platform/core/controller/user.ts | 11 ++++------- src/api/platform/system/controller/dictdata.ts | 2 +- src/assets/loginmini/icon/icon-role.png | Bin 0 -> 4492 bytes src/assets/loginmini/icon/icon-tenant.png | Bin 0 -> 2451 bytes src/assets/loginmini/style/home.less | 8 ++++++++ 5 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 src/assets/loginmini/icon/icon-role.png create mode 100644 src/assets/loginmini/icon/icon-tenant.png diff --git a/src/api/platform/core/controller/user.ts b/src/api/platform/core/controller/user.ts index 4e78da6..470bf47 100644 --- a/src/api/platform/core/controller/user.ts +++ b/src/api/platform/core/controller/user.ts @@ -27,22 +27,19 @@ export const login = (params: LoginParams) => { param: ['password'] }); - const username = user.username.trim(); - const password = user.password; - const code = user.code; - const realKey = user.realKey; + const { username, password, options, ...exOauthParams} = user; const grant_type = 'password'; const scope = 'server'; - const data = qs.stringify({'username': username, 'password': password}); + const data = qs.stringify({ 'username': username.trim(), 'password': password }); return defHttp.post({ url: Api.login, headers: { 'Content-Type': 'application/x-www-form-urlencoded; charset=utf-8' }, - params: { code, realKey, grant_type, scope }, + params: { ...exOauthParams, grant_type, scope }, data: data - }, params?.options); + }, options); }; /** 获取当前用户信息 */ diff --git a/src/api/platform/system/controller/dictdata.ts b/src/api/platform/system/controller/dictdata.ts index e4ebb88..fc4c8ac 100644 --- a/src/api/platform/system/controller/dictdata.ts +++ b/src/api/platform/system/controller/dictdata.ts @@ -31,4 +31,4 @@ export const getDictData = (id: string) => defHttp.get({ url: `${Api.g export const delDictData = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); /** 根据字典类型查询字典数据 */ -export const getDataByDictType = (dictType: string) => defHttp.get({ url: `${Api.getByDictType}/${dictType}` }); +export const getDataByDictType = (params: DictData) => defHttp.get({ url: Api.getByDictType, params }); diff --git a/src/assets/loginmini/icon/icon-role.png b/src/assets/loginmini/icon/icon-role.png new file mode 100644 index 0000000000000000000000000000000000000000..eb510139bb887be5bce40f8759b14c004c944667 GIT binary patch literal 4492 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 G_&)&={VKiy literal 0 HcmV?d00001 diff --git a/src/assets/loginmini/style/home.less b/src/assets/loginmini/style/home.less index bc31b3e..0002309 100644 --- a/src/assets/loginmini/style/home.less +++ b/src/assets/loginmini/style/home.less @@ -350,6 +350,14 @@ background-image: url(../icon/icon-code.png); } +.icon-tenant { + background-image: url(../icon/icon-tenant.png); +} + +.icon-role { + background-image: url(../icon/icon-role.png); +} + .aui-inputClear:focus { border-bottom: 1px solid #1b90ff; }