1.获取用户信息放到redis

amos-boot-biz-common/pom.xml

@@ -136,7 +136,11 @@
 			<artifactId>pagehelper</artifactId>
 			<version>5.1.10</version>
 		</dependency>
-
+		<dependency>
+			<groupId>org.redisson</groupId>
+			<artifactId>redisson</artifactId>
+			<version>2.7.0</version>
+		</dependency>
 	</dependencies>
 
 </project>

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/permission/PermissionOfUser.java → amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/permission/PermissionOfUser.java

-package com.yeejoin.amos.boot.module.ymt.biz.permission;
+package com.yeejoin.amos.boot.biz.common.permission;
 
 import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.module.ymt.biz.utils.RedisUtil;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -15,7 +15,6 @@ import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 
-import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -28,7 +27,7 @@ public class PermissionOfUser {
     RedissonClient redissonClient;
 
     @Autowired
-    RedisUtil redisUtil;
+    RedisUtils redisUtil;
 
     private static final String LOCK_KEY = "PERMISSION_SET_KEY";
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/config/RedissonManager.java → amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/config/RedissonManager.java

-package com.yeejoin.amos.boot.module.ymt.biz.config;
+package com.yeejoin.amos.boot.biz.config;
+
 
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.Redisson;
@@ -14,29 +15,34 @@ import org.springframework.context.annotation.Configuration;
 @Slf4j
 public class RedissonManager {
 
-    //集群环境使用
+    /**
+     * 集群环境使用
+     */
     @Value("${spring.redis.cluster.nodes:default}")
     private String clusterNodes;
 
-    //通用
+    /**
+     * 通用
+     */
     @Value("${spring.redis.password}")
     private String password;
 
-    //单机环境使用
+    /**
+     * 单机环境使用
+     */
     @Value("${spring.redis.host:default}")
     private String host;
 
-    //单机环境使用
+    /**
+     * 单机环境使用
+     */
     @Value("${spring.redis.port:default}")
     private String port;
 
     @Bean
     @ConditionalOnProperty(name = "spring.redis.mode", havingValue = "cluster")
-    public RedissonClient redissonClient() {
+    public RedissonClient redissonClusterClient() {
         //集群环境使用
-        log.info("clusterNodes{}",clusterNodes);
-        log.info("password{}",password);
-
         Config config = new Config();
         config.useClusterServers()
                 .addNodeAddress(clusterNodes.split(","))
@@ -45,7 +51,7 @@ public class RedissonManager {
     }
 
     @Bean
-    @ConditionalOnProperty(name = "spring.redis.mode", havingValue = "singleton")
+    @ConditionalOnProperty(name = "spring.redis.mode", havingValue = "singleton", matchIfMissing = true)
     public RedissonClient redissonSingletonClient() {
         // 单机打包使用
         Config config = new Config();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.permission.PermissionOfUser;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.ymt.api.dto.*;
@@ -22,7 +23,6 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.service.IEquipmentCategoryService;
 import com.yeejoin.amos.boot.module.ymt.api.vo.EquipExportVo;
 import com.yeejoin.amos.boot.module.ymt.biz.dao.ESEquipmentCategory;
-import com.yeejoin.amos.boot.module.ymt.biz.permission.PermissionOfUser;
 import com.yeejoin.amos.boot.module.ymt.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.ymt.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.ymt.flc.api.feign.PrivilegeFeginService;

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/utils/RedisUtil.java

@@ -565,12 +565,4 @@ public class RedisUtil {
             return 0;
         }
     }
-
-    public Long getAndDeletePatternKeys(String pattern) {
-        Set<String> keys = redisTemplate.keys(pattern);
-        if (!CollectionUtils.isEmpty(keys)) {
-            return redisTemplate.delete(keys);
-        }
-        return null;
-    }
 }

amos-boot-system-tzs/pom.xml

@@ -62,11 +62,6 @@
             <artifactId>amos-component-security</artifactId>
             <version>${amos.version.tzs}</version>
         </dependency>
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson</artifactId>
-            <version>2.7.0</version>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>