Merge branch 'master' into deploy

elunez · elunez · commit 8411f6ab3fea · 2021-02-01T20:52:15.000+08:00
# Conflicts:
#	eladmin-system/src/main/resources/config/application-dev.yml
#	eladmin-system/src/main/resources/config/application-prod.yml
diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java
@@ -95,7 +95,7 @@ public static File toFile(MultipartFile multipartFile) {
         File file = null;
         try {
             // 用uuid作为文件名，防止生成的临时文件重复
-            file = File.createTempFile(IdUtil.simpleUUID(), prefix);
+            file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix);
             // MultipartFile to File
             multipartFile.transferTo(file);
         } catch (IOException e) {
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/repository/UserRepository.java
@@ -81,12 +81,12 @@ public interface UserRepository extends JpaRepository<User, Long>, JpaSpecificat
 
     /**
      * 根据角色中的部门查询
-     * @param id /
+     * @param deptId /
      * @return /
      */
     @Query(value = "SELECT u.* FROM sys_user u, sys_users_roles r, sys_roles_depts d WHERE " +
-            "u.user_id = r.user_id AND r.role_id = d.role_id AND r.role_id = ?1 group by u.user_id", nativeQuery = true)
-    List<User> findByDeptRoleId(Long id);
+            "u.user_id = r.user_id AND r.role_id = d.role_id AND d.dept_id = ?1 group by u.user_id", nativeQuery = true)
+    List<User> findByRoleDeptId(Long deptId);
 
     /**
      * 根据菜单查询
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java
@@ -273,7 +273,7 @@ private List<DeptDto> deduplication(List<DeptDto> list) {
      * @param id /
      */
     public void delCaches(Long id){
-        List<User> users = userRepository.findByDeptRoleId(id);
+        List<User> users = userRepository.findByRoleDeptId(id);
         // 删除数据权限
         redisUtils.delByKeys(CacheKey.DATA_USER, users.stream().map(User::getId).collect(Collectors.toSet()));
         redisUtils.del(CacheKey.DEPT_ID + id);
diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml
@@ -10,17 +10,26 @@ spring:
       # 初始连接数
       initial-size: 5
       # 最小连接数
-      min-idle: 10
+      min-idle: 15
       # 最大连接数
-      max-active: 20
+      max-active: 30
+      # 是否自动回收超时连接
+      remove-abandoned: true
+      # 超时时间(以秒数为单位)
+      remove-abandoned-timeout: 180
       # 获取连接超时时间
-      max-wait: 5000
+      max-wait: 3000
       # 连接有效性检测时间
-      time-between-eviction-runs-millis: 1800000
+      time-between-eviction-runs-millis: 60000
       # 连接在池中最小生存的时间
-      min-evictable-idle-time-millis: 1800000
+      min-evictable-idle-time-millis: 300000
+      # 连接在池中最大生存的时间
+      max-evictable-idle-time-millis: 900000
+      # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
       test-while-idle: true
-      test-on-borrow: false
+      # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
+      test-on-borrow: true
+      # 是否在归还到池中前进行检验
       test-on-return: false
       # 检测连接是否有效
       validation-query: select 1
diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml
@@ -10,17 +10,22 @@ spring:
       # 初始连接数
       initial-size: 5
       # 最小连接数
-      min-idle: 10
+      min-idle: 15
       # 最大连接数
-      max-active: 20
+      max-active: 30
       # 获取连接超时时间
-      max-wait: 60000
+      max-wait: 5000
       # 连接有效性检测时间
       time-between-eviction-runs-millis: 60000
       # 连接在池中最小生存的时间
-      min-evictable-idle-time-millis: 900000
+      min-evictable-idle-time-millis: 300000
+      # 连接在池中最大生存的时间
+      max-evictable-idle-time-millis: 900000
+      # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除
       test-while-idle: true
-      test-on-borrow: false
+      # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个
+      test-on-borrow: true
+      # 是否在归还到池中前进行检验
       test-on-return: false
       # 检测连接是否有效
       validation-query: select 1
@@ -29,6 +34,7 @@ spring:
         enabled: true
       stat-view-servlet:
         enabled: true
+        # 控制台管理用户名和密码
         url-pattern: /druid/*
         reset-enable: false
         login-username: admin
