部分redis的使用更换为本项目自带的redis

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/LoginToWebsiteController.java

@@ -13,7 +13,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.tourism.common.additional.constant.CacheConstants;
 import com.tourism.common.additional.constant.Constants;
 import com.tourism.common.additional.model.AjaxResult;
-import com.tourism.common.additional.redis.RedisCache;
 import com.tourism.common.additional.sign.Base64;
 import com.tourism.common.additional.uuid.IdUtils;
 import com.tourism.common.core.constant.ApplicationConstant;
@@ -44,6 +43,7 @@ import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -75,8 +75,6 @@ import org.springframework.web.multipart.MultipartFile;
 @RequestMapping("/website/web")
 public class LoginToWebsiteController {
     @Autowired
-    private RedisCache redisCache;
-    @Autowired
     private TourUserService tourUserService;
     @Autowired
     private LoginToWebsiteService loginToWebsiteService;
@@ -133,7 +131,13 @@ public class LoginToWebsiteController {
         code = capText.substring(capText.lastIndexOf("@") + 1);
         image = captchaProducerMath.createImage(capStr);
 
-        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+        // 获取 RBucket 对象
+        RBucket<String> bucket = redissonClient.getBucket(verifyKey);
+
+        // 设置缓存对象并设置过期时间
+        bucket.set(code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+
+//        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
         // 转换流信息写出
         FastByteArrayOutputStream os = new FastByteArrayOutputStream();
         try

application-webadmin/src/main/java/com/tourism/webadmin/app/website/service/impl/LoginToWebsiteServiceImpl.java

@@ -2,7 +2,6 @@ package com.tourism.webadmin.app.website.service.impl;
 
 import cn.hutool.core.util.ReflectUtil;
 import com.tourism.common.additional.constant.CacheConstants;
-import com.tourism.common.additional.redis.RedisCache;
 import com.tourism.common.additional.utils.StringUtils;
 import com.tourism.common.core.constant.GlobalDeletedFlag;
 import com.tourism.common.core.util.*;
@@ -19,14 +18,17 @@ import com.tourism.webadmin.back.service.TourUserService;
 import io.jsonwebtoken.lang.Collections;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -39,8 +41,6 @@ import java.util.concurrent.TimeUnit;
 public class LoginToWebsiteServiceImpl implements LoginToWebsiteService
 {
     @Autowired
-    private RedisCache redisCache;
-    @Autowired
     private TourBookInfoService tourBookInfoService;
     @Autowired
     private TourUserService tourUserService;
@@ -80,8 +80,15 @@ public class LoginToWebsiteServiceImpl implements LoginToWebsiteService
     public boolean validateCaptcha(String uuid, String code)
     {
         String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
-        String captcha = redisCache.getCacheObject(verifyKey);
-        redisCache.deleteObject(verifyKey);
+//        String captcha = redisCache.getCacheObject(verifyKey);
+        // 获取 RBucket 对象
+        RBucket<String> bucket = redissonClient.getBucket(verifyKey);
+
+        // 从缓存中获取对象
+        String captcha = bucket.get();
+
+//        redisCache.deleteObject(verifyKey);
+        bucket.delete();
         if (captcha == null || !(captcha.equals(code.toLowerCase())))
         {
             return false;
@@ -97,8 +104,15 @@ public class LoginToWebsiteServiceImpl implements LoginToWebsiteService
      */
     @Override
     public boolean validateSmsCode(String mobile,String smsCode){
-        String cacheObject = redisCache.getCacheObject(mobile);
-        redisCache.deleteObject(mobile);
+//        String cacheObject = redisCache.getCacheObject(mobile);
+
+        // 获取 RBucket 对象
+        RBucket<String> bucket = redissonClient.getBucket(mobile);
+
+        // 从缓存中获取对象
+        String cacheObject = bucket.get();
+//        redisCache.deleteObject(mobile);
+        bucket.delete();
         if(cacheObject == null || !(smsCode.equals(cacheObject.toLowerCase())) ){
             return false;
         }
@@ -117,11 +131,24 @@ public class LoginToWebsiteServiceImpl implements LoginToWebsiteService
         String remoteIpAddress = IpUtil.getRemoteIpAddress(request);
         String startKey = CacheConstants.TOUR_BOOK_IP.concat(remoteIpAddress);
         String convertStartKey = StringUtils.replacePattern(startKey, ":", "_");
-        Collection<String> keys = redisCache.keys(convertStartKey.concat("*"));
-        if(Collections.isEmpty(keys) || keys.size() < 6) {
+        Iterable<String> keysByPattern = redissonClient.getKeys().getKeysByPattern(convertStartKey.concat("*"));
+
+        // 将 Iterable 转换为 List
+        List<String> keyList = new ArrayList<>();
+        for (String key : keysByPattern) {
+            keyList.add(key);
+        }
+
+        if(Collections.isEmpty(keyList) || keyList.size() < 6) {
             String key = convertStartKey.concat(String.valueOf(System.currentTimeMillis()));
 //            String key = CacheConstants.TOUR_REGISTER_IP.concat(remoteIpAddress);
-            redisCache.setCacheObject(key, bookMobile, 1, TimeUnit.MINUTES);
+//            redisCache.setCacheObject(key, bookMobile, 1, TimeUnit.MINUTES);
+            // 获取 RBucket 对象
+            RBucket<String> bucket = redissonClient.getBucket(key);
+            // 设置缓存对象
+            bucket.set(bookMobile);
+            // 设置过期时间
+            bucket.expire(1, TimeUnit.MINUTES);
             TourBookInfo tourBookInfo = new TourBookInfo();
             tourBookInfo.setBookMobile(bookMobile);
             tourBookInfo.setBookTime(new Date());

common/common-additional/src/main/java/com/tourism/common/additional/redis/RedisCache.java

@@ -1,277 +0,0 @@
-package com.tourism.common.additional.redis;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.redis.core.*;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.stereotype.Component;
-
-/**
- * spring redis 工具类
- *
- * @author tourism
- **/
-@SuppressWarnings(value = { "unchecked", "rawtypes" })
-@Component
-public class RedisCache
-{
-    @Autowired
-    public RedisTemplate redisTemplate;
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
-
-
-    @Bean
-    public RedisTemplate redisTemplateInit() {
-        //设置序列化Key的实例化对象
-        redisTemplate.setKeySerializer(new StringRedisSerializer());
-        //设置序列化Value的实例化对象
-        redisTemplate.setValueSerializer(new GenericJackson2JsonRedisSerializer());
-        return redisTemplate;
-    }
-
-    /**
-     * 缓存基本的对象，Integer、String、实体类等
-     *
-     * @param key 缓存的键值
-     * @param value 缓存的值
-     */
-    public <T> void setCacheObject(final String key, final T value)
-    {
-        redisTemplate.opsForValue().set(key, value);
-    }
-
-    /**
-     * 缓存基本的对象，Integer、String、实体类等
-     *
-     * @param key 缓存的键值
-     * @param value 缓存的值
-     * @param timeout 时间
-     * @param timeUnit 时间颗粒度
-     */
-    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
-    {
-        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
-    }
-
-    /**
-     * 设置有效时间
-     *
-     * @param key Redis键
-     * @param timeout 超时时间
-     * @return true=设置成功；false=设置失败
-     */
-    public boolean expire(final String key, final long timeout)
-    {
-        return expire(key, timeout, TimeUnit.SECONDS);
-    }
-
-    /**
-     * 设置有效时间
-     *
-     * @param key Redis键
-     * @param timeout 超时时间
-     * @param unit 时间单位
-     * @return true=设置成功；false=设置失败
-     */
-    public boolean expire(final String key, final long timeout, final TimeUnit unit)
-    {
-        return redisTemplate.expire(key, timeout, unit);
-    }
-
-    /**
-     * 获取有效时间
-     *
-     * @param key Redis键
-     * @return 有效时间
-     */
-    public long getExpire(final String key)
-    {
-        return redisTemplate.getExpire(key);
-    }
-
-    /**
-     * 判断 key是否存在
-     *
-     * @param key 键
-     * @return true 存在 false不存在
-     */
-    public Boolean hasKey(String key)
-    {
-        return redisTemplate.hasKey(key);
-    }
-
-    /**
-     * 获得缓存的基本对象。
-     *
-     * @param key 缓存键值
-     * @return 缓存键值对应的数据
-     */
-    public <T> T getCacheObject(final String key)
-    {
-        ValueOperations<String, T> operation = redisTemplate.opsForValue();
-        return operation.get(key);
-    }
-
-    /**
-     * 删除单个对象
-     *
-     * @param key
-     */
-    public boolean deleteObject(final String key)
-    {
-        return redisTemplate.delete(key);
-    }
-
-    /**
-     * 删除集合对象
-     *
-     * @param collection 多个对象
-     * @return
-     */
-    public boolean deleteObject(final Collection collection)
-    {
-        return redisTemplate.delete(collection) > 0;
-    }
-
-    /**
-     * 缓存List数据
-     *
-     * @param key 缓存的键值
-     * @param dataList 待缓存的List数据
-     * @return 缓存的对象
-     */
-    public <T> long setCacheList(final String key, final List<T> dataList)
-    {
-        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
-        return count == null ? 0 : count;
-    }
-
-    /**
-     * 获得缓存的list对象
-     *
-     * @param key 缓存的键值
-     * @return 缓存键值对应的数据
-     */
-    public <T> List<T> getCacheList(final String key)
-    {
-        return redisTemplate.opsForList().range(key, 0, -1);
-    }
-
-    /**
-     * 缓存Set
-     *
-     * @param key 缓存键值
-     * @param dataSet 缓存的数据
-     * @return 缓存数据的对象
-     */
-    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
-    {
-        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
-        Iterator<T> it = dataSet.iterator();
-        while (it.hasNext())
-        {
-            setOperation.add(it.next());
-        }
-        return setOperation;
-    }
-
-    /**
-     * 获得缓存的set
-     *
-     * @param key
-     * @return
-     */
-    public <T> Set<T> getCacheSet(final String key)
-    {
-        return redisTemplate.opsForSet().members(key);
-    }
-
-    /**
-     * 缓存Map
-     *
-     * @param key
-     * @param dataMap
-     */
-    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
-    {
-        if (dataMap != null) {
-            redisTemplate.opsForHash().putAll(key, dataMap);
-        }
-    }
-
-    /**
-     * 获得缓存的Map
-     *
-     * @param key
-     * @return
-     */
-    public <T> Map<String, T> getCacheMap(final String key)
-    {
-        return redisTemplate.opsForHash().entries(key);
-    }
-
-    /**
-     * 往Hash中存入数据
-     *
-     * @param key Redis键
-     * @param hKey Hash键
-     * @param value 值
-     */
-    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
-    {
-        redisTemplate.opsForHash().put(key, hKey, value);
-    }
-
-    /**
-     * 获取Hash中的数据
-     *
-     * @param key Redis键
-     * @param hKey Hash键
-     * @return Hash中的对象
-     */
-    public <T> T getCacheMapValue(final String key, final String hKey)
-    {
-        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
-        return opsForHash.get(key, hKey);
-    }
-
-    /**
-     * 获取多个Hash中的数据
-     *
-     * @param key Redis键
-     * @param hKeys Hash键集合
-     * @return Hash对象集合
-     */
-    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
-    {
-        return redisTemplate.opsForHash().multiGet(key, hKeys);
-    }
-
-    /**
-     * 删除Hash中的某条数据
-     *
-     * @param key Redis键
-     * @param hKey Hash键
-     * @return 是否成功
-     */
-    public boolean deleteCacheMapValue(final String key, final String hKey)
-    {
-        return redisTemplate.opsForHash().delete(key, hKey) > 0;
-    }
-
-    /**
-     * 获得缓存的基本对象列表
-     *
-     * @param pattern 字符串前缀
-     * @return 对象列表
-     */
-    public Collection<String> keys(final String pattern)
-    {
-        return redisTemplate.keys(pattern);
-    }
-
-}