From 385f565007bf778c37a2f8c66ee72231a85cd2af Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 10 十月 2023 19:58:22 +0800
Subject: [PATCH] 前端打包文件上传
---
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
index 64f3bdd..0636f1f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
@@ -34,10 +34,11 @@
public BladeUser getAdminUserInfo() {
try {
BladeUser user = CacheUtil.getCache(NACOS_CONFIG_CACHE).get(ADMIN_INFO_CODE,BladeUser.class);
- //浠庣紦瀛樹腑鏈幏鍙栧埌瓒呯骇绠＄悊鍛橀厤缃俊鎭紝浠巒acos涓婇噸鏂拌幏鍙栧苟瀛樺叆缂撳瓨銆�
- if(Func.isEmpty(user)){
+ String tenantId = environment.getProperty("user-info.tenant-id", "000000");
+ //浠庣紦瀛樹腑鏈幏鍙栧埌瓒呯骇绠＄悊鍛橀厤缃俊鎭垨鑰呭拰nacos涓婇厤缃殑绉熸埛涓嶄竴鑷达紝浠巒acos涓婇噸鏂拌幏鍙栧苟瀛樺叆缂撳瓨銆�
+ if(Func.isEmpty(user) || !user.getTenantId().equals(tenantId)){
BladeUser adminUser = new BladeUser();
- adminUser.setTenantId(environment.getProperty("user-info.tenant-id", "000000"));
+ adminUser.setTenantId(tenantId);
adminUser.setUserName(environment.getProperty("user-info.user-name","admin"));
adminUser.setUserId(Func.toLong(environment.getProperty("user-info.id","0")));
CacheUtil.getCache(NACOS_CONFIG_CACHE).put(ADMIN_INFO_CODE,adminUser);
--
Gitblit v1.9.3