perf($auth-center): configure ignored service

[skip ci]
johnnymillergh · Feb 8, 2021 · 78c069b · 78c069b
1 parent ac7aabc
commit 78c069b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/.../java/com/jmsoftware/maf/authcenter/permission/configuration/PermissionConfiguration.java b/.../java/com/jmsoftware/maf/authcenter/permission/configuration/PermissionConfiguration.java
@@ -0,0 +1,26 @@
+package com.jmsoftware.maf.authcenter.permission.configuration;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.validation.annotation.Validated;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.Set;
+
+/**
+ * Description: PermissionConfiguration, change description here.
+ *
+ * @author 钟俊（zhongjun）, email: zhongjun@toguide.cn, date: 2/8/2021 5:18 PM
+ **/
+@Data
+@Validated
+@RefreshScope
+@Configuration
+@ConfigurationProperties(prefix = "permission")
+public class PermissionConfiguration {
+    @NotEmpty
+    private Set<@NotBlank String> ignoredServiceIds;
+}
diff --git a/...ain/java/com/jmsoftware/maf/authcenter/permission/service/impl/PermissionServiceImpl.java b/...ain/java/com/jmsoftware/maf/authcenter/permission/service/impl/PermissionServiceImpl.java
@@ -4,7 +4,7 @@
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
+import com.jmsoftware.maf.authcenter.permission.configuration.PermissionConfiguration;
 import com.jmsoftware.maf.authcenter.permission.entity.GetServicesInfoResponse;
 import com.jmsoftware.maf.authcenter.permission.entity.PermissionPersistence;
 import com.jmsoftware.maf.authcenter.permission.mapper.PermissionMapper;
@@ -16,7 +16,6 @@
 import com.jmsoftware.maf.common.domain.authcenter.permission.PermissionType;
 import com.jmsoftware.maf.common.domain.springbootstarter.HttpApiResourcesResponse;
 import com.jmsoftware.maf.common.exception.BusinessException;
-import com.jmsoftware.maf.springcloudstarter.configuration.MafProjectProperty;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -43,8 +42,8 @@
 public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, PermissionPersistence> implements PermissionService {
     private final RoleService roleService;
     private final DiscoveryClient discoveryClient;
-    private final MafProjectProperty mafProjectProperty;
     private final RestTemplate restTemplate;
+    private final PermissionConfiguration permissionConfiguration;
 
     @Override
     public GetPermissionListByRoleIdListResponse getPermissionListByRoleIdList(@Valid GetPermissionListByRoleIdListPayload payload) {
@@ -82,11 +81,9 @@ public GetServicesInfoResponse getServicesInfo() throws BusinessException {
         log.info("Getting service info from Service ID list: {}", serviceIdList);
         val response = new GetServicesInfoResponse();
         val mapper = new ObjectMapper();
-        val ignoredServiceIdList = Lists.newArrayList(mafProjectProperty.getProjectArtifactId(),
-                                                      "api-gateway", "spring-boot-admin", "consul");
-        log.info("Ignored service ID list: {}", ignoredServiceIdList);
+        log.info("Ignored service ID: {}", permissionConfiguration.getIgnoredServiceIds());
         for (String serviceId : serviceIdList) {
-            if (ignoredServiceIdList.contains(serviceId)) {
+            if (CollUtil.contains(permissionConfiguration.getIgnoredServiceIds(), serviceId)) {
                 log.warn("Ignored service ID: {}", serviceId);
                 continue;
             }