From 0cab15970c0203bbcc1a72e9ec19469d298380ab Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 12 十月 2023 15:59:56 +0800
Subject: [PATCH] 修改bug提交
---
Source/UBCS-WEB/src/views/authority/role.vue | 8 ++--
Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java | 4 -
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java | 44 ++++++++++++++++++++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java | 5 --
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 10 +----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 9 +---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java | 4 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 11 ++---
8 files changed, 57 insertions(+), 38 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/authority/role.vue b/Source/UBCS-WEB/src/views/authority/role.vue
index 75d0045..55bd32a 100644
--- a/Source/UBCS-WEB/src/views/authority/role.vue
+++ b/Source/UBCS-WEB/src/views/authority/role.vue
@@ -27,11 +27,11 @@
plain
@click="handleDelete">鍒� 闄�
</el-button>
+ <!-- v-if="userInfo.role_name.includes('admin')" -->
<el-button size="small"
- icon="el-icon-setting"
- @click="handleRole"
- v-if="userInfo.role_name.includes('admin')"
- plain>鏉冮檺璁剧疆
+ icon="el-icon-setting"
+ @click="handleRole"
+ plain>鏉冮檺璁剧疆
</el-button>
</template>
</avue-crud>
diff --git a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java
index 2b7a3e2..e133c15 100644
--- a/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java
+++ b/Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/utils/TokenUtil.java
@@ -87,8 +87,6 @@
public final static String REFRESH_TOKEN_KEY = "refresh_token";
private static BladeTenantProperties tenantProperties;
- @Autowired
- private static NacosConfigCache nacosConfigCache;
/**
* 鑾峰彇绉熸埛閰嶇疆
@@ -172,7 +170,7 @@
if (tenant == null || tenant.getId() == null) {
throw new UserDeniedAuthorizationException(TokenUtil.USER_HAS_NO_TENANT);
}
- if (StringUtil.equalsIgnoreCase(tenant.getTenantId(), nacosConfigCache.getAdminUserInfo().getTenantId())) {
+ if (StringUtil.equalsIgnoreCase(tenant.getTenantId(), NacosConfigCache.getAdminUserInfo().getTenantId())) {
return false;
}
if (getTenantProperties().getLicense()) {
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..a83c688 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,8 @@
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 org.springblade.core.log.exception.ServiceException;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.BladeUser;
@@ -10,6 +13,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
+import org.yaml.snakeyaml.Yaml;
+
+import java.util.Map;
/**
* redis涓瓨鍌ㄧ殑nacos涓婇厤缃殑瓒呯閰嶇疆淇℃伅
@@ -26,21 +32,51 @@
@Autowired
private Environment environment;
+ private static ConfigService configService;
+
+ private static final String SERVER_ADDR = "localhost:8848";
+ private static final String GROUP_ID = "DEFAULT_GROUP";
+ private static final String DATA_ID = "ubcs.yaml";
+
+ static {
+ try {
+ configService = ConfigFactory.createConfigService(SERVER_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;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 561f424..cde07b5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -85,9 +85,6 @@
@Resource
private IBtmTypeClient btmTypeClient;
- @Resource
- private NacosConfigCache nacosConfigCache;
-
/**
* 鏃ュ織
*/
@@ -129,7 +126,7 @@
public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify,AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
) ? null:AuthUtil.getTenantId()));
@@ -526,14 +523,14 @@
doList = codeClassifyMapper
.selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
) ? null:AuthUtil.getTenantId());
}else{
doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
) ? null:AuthUtil.getTenantId());
@@ -597,7 +594,7 @@
}
List<CodeClassify> doList =codeClassifyMapper.getRMLibByName(libNameList,"Enabled",AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
) ? null:AuthUtil.getTenantId());
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
index a281517..2e90fe6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
@@ -56,9 +56,6 @@
@Resource
private ICodeSrchCondConfigService ICodeSrchCondConfigService;
- @Resource
- private NacosConfigCache nacosConfigCache;
-
/**
* 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
*
@@ -83,7 +80,7 @@
// 鏍规嵁绉熸埛杩涜鍖哄垎瀵瑰簲鐨勫弬鐓ч厤缃�
Map<String, Object> conditionMap = bladeQueryObject.getConditionMap();
// 鏌ヨ鎵�灞炵鎴蜂笅鐨勫拰寮�鍚叏灞�鐨勫弬鐓ч厤缃俊鎭�
- if(!nacosConfigCache.getAdminUserInfo().getTenantId().equals(AuthUtil.getTenantId())){
+ if(!NacosConfigCache.getAdminUserInfo().getTenantId().equals(AuthUtil.getTenantId())){
conditionMap.put("tenantId",AuthUtil.getTenantId());
}
conditionMap.put("isOpenGlobal","true");
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index edba565..3562907 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -114,9 +114,6 @@
private RevisionModelUtil revisionModelUtil;
@Resource
- private NacosConfigCache nacosConfigCache;
-
- @Resource
private ICodeFixedValueService codeFixedValueService;
/**
@@ -128,8 +125,8 @@
@Override
public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) throws VciBaseException {
//濡傛灉绛変簬鑷繁閰嶇疆鐨勭鐞嗙粍绉熸埛id鍜岀鐞嗙粍瓒呯璐﹀彿锛屽氨涓嶉渶瑕佹寜鐓ц鍒欐墍鏈夎�呮潵杩涜鏌ヨ
- if(!(AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())
- && AuthUtil.getUserId().toString().equals(nacosConfigCache.getAdminUserInfo().getUserId().toString()))
+ if(!(AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())
+ && AuthUtil.getUserId().toString().equals(NacosConfigCache.getAdminUserInfo().getUserId().toString()))
){
// 鎸夌収瑙勫垯鎵�鏈夎�呮潵鏌ヨ
conidtionMap.put("owner",AuthUtil.getUserId());
@@ -170,7 +167,7 @@
public boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO)throws VciBaseException {
LambdaQueryWrapper<CodeRule> wrapper = Wrappers.<CodeRule>query()
.lambda().eq(CodeRule::getId, codeRuleDTO.getId());
- if(AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())){
+ if(AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())){
wrapper.eq(CodeRule::getTenantId,AuthUtil.getTenantId());
}
// 鏍规嵁瑙勫垯id鏌ヨ缂栧彿
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
index 7359525..f7ad297 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
@@ -43,12 +43,6 @@
private IUserClient userClient;
/**
- * nacos涓婃媺鍙栫殑閰嶇疆
- */
- @Resource
- private NacosConfigCache nacosConfigCache;
-
- /**
* 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
*
* @param id 涓婚敭
@@ -67,7 +61,7 @@
public Strategy queryByIsDefault() {
return this.strategyMapper.queryByIsDefault(AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
) ? null:AuthUtil.getTenantId()
@@ -88,7 +82,7 @@
strategyPage,
AuthUtil.getTenantId()
.equals(
- nacosConfigCache
+ NacosConfigCache
.getAdminUserInfo()
.getTenantId()
)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java
index bf8fc63..3d041a6 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/TenantServiceImpl.java
@@ -212,9 +212,9 @@
@Override
public List<Map<String,Object>> selectMaps(){
List<Map<String, Object>> mapList = listMaps(new QueryWrapper<Tenant>().select("TENANT_ID", "TENANT_NAME"));
- if(Func.isNotEmpty(nacosConfigCache.getAdminUserInfo().getTenantId()) && !this.containsSameKeys(mapList,nacosConfigCache.getAdminUserInfo().getTenantId())){
+ if(Func.isNotEmpty(NacosConfigCache.getAdminUserInfo().getTenantId()) && !this.containsSameKeys(mapList,nacosConfigCache.getAdminUserInfo().getTenantId())){
Map<String, Object> map = new HashMap<>();
- map.put("TENANT_ID",nacosConfigCache.getAdminUserInfo().getTenantId());
+ map.put("TENANT_ID",NacosConfigCache.getAdminUserInfo().getTenantId());
map.put("TENANT_NAME","绠＄悊缁�");
mapList.add(0,map);
}
--
Gitblit v1.9.3