From 7575eaa766eb186a0eb3717ddfd10d8831847207 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 12 十月 2023 09:48:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
similarity index 65%
rename from Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java
rename to Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
index b7ffd86..0636f1f 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
@@ -1,9 +1,12 @@
-package com.vci.ubcs.common.cache;
+package com.vci.ubcs.system.cache;
-/*import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.BladeUser;
-import org.springblade.core.tool.utils.Func;*/
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
@@ -28,13 +31,14 @@
* nacos涓婇厤缃殑瓒呯淇℃伅
* @return
*/
- /*public BladeUser getAdminUserInfo() {
+ 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);
@@ -44,6 +48,6 @@
}catch (Exception e){
throw new ServiceException("浠巒acos涓婅幏鍙栬秴绾х鐞嗗憳閰嶇疆澶辫触锛�");
}
- }*/
+ }
}
--
Gitblit v1.9.3