From 5c207dd8d404265e6f2e31a628d51f7eccd8bb47 Mon Sep 17 00:00:00 2001 From: cyf009 <591388323@qq.com> Date: Sat, 3 Aug 2024 20:13:47 +0800 Subject: [PATCH] 1 --- .../reader/LoginQueryServiceImpl.java | 28 ++++++++++++++++++- WebSite/src/core/base/Realm.js | 16 ++++++----- WebSite/src/settings/index.js | 6 ++-- 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/LoginQueryServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/LoginQueryServiceImpl.java index 6b2bed0b..38e6cea7 100644 --- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/LoginQueryServiceImpl.java +++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/reader/LoginQueryServiceImpl.java @@ -167,6 +167,32 @@ public class LoginQueryServiceImpl implements LoginQueryService { .responseCode(ResponseCode.DATA_ACCESS_EXCEPTION) .build() ); - return null; + List<MenuOut> records=new ArrayList<>(); + for (int i=0;i<stationArray.size();i++) { + JSONObject object=stationArray.getJSONObject(i); + MenuOut menuOut=new MenuOut(); + menuOut.setMenuNo(object.getString("menuNo")); + menuOut.setName(object.getString("name")); + menuOut.setRoutingUrl(object.getString("routingUrl")); + menuOut.setId(object.getString("id")); + menuOut.setApplicationId(object.getString("applicationId")); + menuOut.setRoutingUrl(object.getString("routingUrl")); + JSONArray childrenArray = object.getJSONArray("children"); + List<MenuOut> childernRecords=new ArrayList<>(); + for (int j=0; j<childrenArray.size();j++){ + JSONObject childernObject=childrenArray.getJSONObject(j); + MenuOut childern=new MenuOut(); + childern.setMenuNo(childernObject.getString("menuNo")); + childern.setName(childernObject.getString("name")); + childern.setRoutingUrl(childernObject.getString("routingUrl")); + childern.setId(childernObject.getString("id")); + childern.setApplicationId(childernObject.getString("applicationId")); + childern.setRoutingUrl(childernObject.getString("routingUrl")); + childernRecords.add(childern); + } + menuOut.setChildren(childernRecords); + records.add(menuOut); + } + return records; } } diff --git a/WebSite/src/core/base/Realm.js b/WebSite/src/core/base/Realm.js index e5620607..7188d78c 100644 --- a/WebSite/src/core/base/Realm.js +++ b/WebSite/src/core/base/Realm.js @@ -28,9 +28,9 @@ class Realm { if (principals && credentials) { // do somethings here const res = await Account.login({ principals, credentials }); - if (!res.isSuccess) { + if (res.code!="00000") { ElNotification({ - message: res.errorMessage, + message: res.description, type: 'error', duration: 5 * 1000 }); @@ -57,15 +57,15 @@ class Realm { debugger; const personId=authorizationToken.personId; const res = await Account.GetUserMenuList({personId}); - if (!res.isSuccess) { + if (res.code!="00000") { ElNotification({ - message: res.errorMessage, + message: res.description, type: 'error', duration: 5 * 1000 }); return null; } - +debugger; let menuList = res.data; let token = authorizationToken.token; return new AuthorizationInfo({ menuList }, token); @@ -96,14 +96,16 @@ class Realm { debugger; const personId=res.data[0].personId; const resMenu = await Account.GetUserMenuList({personId}); - if (!resMenu.isSuccess) { + debugger; + if (resMenu.code!="00000") { ElNotification({ - message: res.errorMessage, + message: resMenu.description, type: 'error', duration: 5 * 1000 }); return null; } + debugger; user.menuList = resMenu.data; return new AuthorizationInfo(user, token); } diff --git a/WebSite/src/settings/index.js b/WebSite/src/settings/index.js index e1705ae2..1b8e3d16 100644 --- a/WebSite/src/settings/index.js +++ b/WebSite/src/settings/index.js @@ -11,7 +11,7 @@ module.exports = { /** * 搴旂敤鍚嶇О */ - applicationName: '宸梾涓氬姟绠$悊' || npmConfig.name, + applicationName: '閾惰鏀舵鍥炲崟鍏ヨ处' || npmConfig.name, /** * 搴旂敤璇嗗埆id */ @@ -71,13 +71,13 @@ module.exports = { * 椤舵爮閰嶇疆 */ navbar: { - enabled: false + enabled: true }, /** * 渚ф爮閰嶇疆 */ sidebar: { - enabled: false, + enabled: true, showLogo: false }, /** -- GitLab