From 815c6be8d063ca1ec89079722d265585f7d3602c Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 13 十月 2023 11:05:08 +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 | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 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 0636f1f..f5af68d 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
@@ -1,5 +1,9 @@
package com.vci.ubcs.system.cache;
+import com.alibaba.nacos.api.config.ConfigFactory;
+import com.alibaba.nacos.api.config.ConfigService;
+import com.alibaba.nacos.api.exception.NacosException;
+import com.vci.ubcs.common.constant.LauncherConstant;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.BladeUser;
@@ -8,8 +12,12 @@
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
+import org.yaml.snakeyaml.Yaml;
+
+import java.util.Map;
/**
* redis涓瓨鍌ㄧ殑nacos涓婇厤缃殑瓒呯閰嶇疆淇℃伅
@@ -23,24 +31,50 @@
private static final String ADMIN_INFO_CODE = "admin:info:";
- @Autowired
- private Environment environment;
+ private static ConfigService configService;
+
+ private static final String GROUP_ID = "DEFAULT_GROUP";
+ private static final String DATA_ID = "ubcs.yaml";
+
+ static {
+ try {
+ configService = ConfigFactory.createConfigService(LauncherConstant.NACOS_DEV_ADDR);
+ } catch (NacosException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 闈欐�佹柟娉曚腑鑾峰彇閰嶇疆
+ * @return
+ */
+ public static Map<String, Map<String,String>> getConfig() {
+ try {
+ String config = configService.getConfig(DATA_ID, GROUP_ID, 5000);
+ Yaml yaml = new Yaml();
+ return yaml.load(config);
+ } catch (NacosException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
/**
* 鑾峰彇瀛樺叆redis涓�
* nacos涓婇厤缃殑瓒呯淇℃伅
* @return
*/
- public BladeUser getAdminUserInfo() {
+ public static BladeUser getAdminUserInfo() {
try {
BladeUser user = CacheUtil.getCache(NACOS_CONFIG_CACHE).get(ADMIN_INFO_CODE,BladeUser.class);
- String tenantId = environment.getProperty("user-info.tenant-id", "000000");
+ Map<String, Map<String,String>> configMap = getConfig();
+ String tenantId = configMap.get("user-info").get("tenant-id");
//浠庣紦瀛樹腑鏈幏鍙栧埌瓒呯骇绠＄悊鍛橀厤缃俊鎭垨鑰呭拰nacos涓婇厤缃殑绉熸埛涓嶄竴鑷达紝浠巒acos涓婇噸鏂拌幏鍙栧苟瀛樺叆缂撳瓨銆�
if(Func.isEmpty(user) || !user.getTenantId().equals(tenantId)){
BladeUser adminUser = new BladeUser();
adminUser.setTenantId(tenantId);
- adminUser.setUserName(environment.getProperty("user-info.user-name","admin"));
- adminUser.setUserId(Func.toLong(environment.getProperty("user-info.id","0")));
+ adminUser.setUserName(configMap.get("user-info").get("user-name"));
+ adminUser.setUserId(Func.toLong(configMap.get("user-info").get("id")));
CacheUtil.getCache(NACOS_CONFIG_CACHE).put(ADMIN_INFO_CODE,adminUser);
return adminUser;
}
--
Gitblit v1.9.3