zhuwei il y a 8 mois
Parent
commit
af2d9203de

+ 1 - 1
blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -118,7 +118,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
         } else if (userType.equals(UserEnum.MANAGER.getName())) {
             result = userClient.userInfo(tenantId, username, UserEnum.MANAGER.getName());  //后管
         } else if (userType.equals(UserEnum.HAC.getName())) {
-            result = userClient.userInfo(tenantId, username, UserEnum.HAC.getName());  //后管
+            result = userClient.userInfo(tenantId, username, UserEnum.HAC.getName());  //内控
         }
 
 

+ 3 - 3
blade-common/src/main/java/org/springblade/common/utils/AsyncConfigurer.java

@@ -15,7 +15,7 @@ public class AsyncConfigurer {
     /**
      * cpu 核心数量
      */
-    public static final int cpuNum = 10 ;//Runtime.getRuntime().availableProcessors();
+    public static final int cpuNum = 3 ;//Runtime.getRuntime().availableProcessors();
 
     /**
      * 线程池配置
@@ -24,8 +24,8 @@ public class AsyncConfigurer {
     @Bean("taskExecutor1")
     public ThreadPoolExecutor getAsyncExecutor() {
         return new ThreadPoolMonitor(cpuNum
-                , 15
-                , 30
+                , 6
+                , 180
                 , TimeUnit.SECONDS
                 , new LinkedBlockingQueue<>(2000)
                 , new ThreadPoolExecutor.DiscardOldestPolicy(), "manager-thread-pool");

+ 10 - 8
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java

@@ -486,15 +486,17 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
                 HashSet<String> hashSet = new HashSet<>(userList);
                 List<String> users = new ArrayList<>();
                 hashSet.forEach(user -> {
-                    String[] array = user.split("-");
-                    if (!users.contains(array[0])) {
-                        User bUser = this.userClient.userInfoById(Long.parseLong(array[0])).getData();
-                        if (bUser != null) {
-                            result.add(new FileUserVO(array[0], bUser.getRealName()));
-                        } else {
-                            result.add(new FileUserVO(array[0], array[1]));
+                    if(Func.isNotEmpty(user) && user.contains("-") && user.length() > 1) {
+                        String[] array = user.split("-");
+                        if (!users.contains(array[0]) ) {
+                            User bUser = this.userClient.userInfoById(Long.parseLong(array[0])).getData();
+                            if (bUser != null) {
+                                result.add(new FileUserVO(array[0], bUser.getRealName()));
+                            } else {
+                                result.add(new FileUserVO(array[0], array[1]));
+                            }
+                            users.add(array[0]);
                         }
-                        users.add(array[0]);
                     }
                 });
             }