【第一版开发】

1.移除无效代码
2.修改清除缓存位置，防止并发导致的异常

data-easy/src/main/java/com/dataeasy/server/service/manager/impl/SubscriptionManagerImpl.java

@@ -154,12 +154,11 @@ public class SubscriptionManagerImpl implements ISubscriptionManager {
 
     @Override
     public void modifyPushOption(PushOptionRequest request) {
-        // 清除缓存
-        cacheManager.getCache(CacheNameConstant.SUBSCRIPTION_USER_CONFIG_LIST).evict(UserUtils.getCurrentUserId());
-
         SubscriptionUserConfig subscriptionUserConfig = new SubscriptionUserConfig();
         subscriptionUserConfig.setId(request.getId());
         subscriptionUserConfig.setPushOption(request.getPushOption());
         subscriptionUserConfigService.updateById(subscriptionUserConfig);
+        // 清除缓存
+        cacheManager.getCache(CacheNameConstant.SUBSCRIPTION_USER_CONFIG_LIST).evict(UserUtils.getCurrentUserId());
     }
 }

data-easy/src/main/java/com/dataeasy/server/service/manager/impl/UserManagerImpl.java

@@ -93,14 +93,14 @@ public class UserManagerImpl implements IUserManager {
     public void modifyNickname(NicknameRequest request) {
         // 获取当前用户id
         Long currentUserId = UserUtils.getCurrentUserId();
-        // 清除缓存
-        cacheManager.getCache(CacheNameConstant.USER).evict(currentUserId);
-        cacheManager.getCache(CacheNameConstant.USER_VO).evict(currentUserId);
         // 更新数据库
         User user = new User();
         user.setId(currentUserId);
         user.setNickname(request.getNickname());
         userService.updateById(user);
+        // 清除缓存
+        cacheManager.getCache(CacheNameConstant.USER).evict(currentUserId);
+        cacheManager.getCache(CacheNameConstant.USER_VO).evict(currentUserId);
     }
 
     @Override

data-easy/src/main/java/com/dataeasy/server/service/manager/impl/WxManagerImpl.java

@@ -140,9 +140,6 @@ public class WxManagerImpl implements IWxManager {
             updateSubscriptionOrder.setPaymentStatus(PaymentStatusEnum.SUCCESS);
             subscriptionOrderService.updateById(updateSubscriptionOrder);
 
-            // 清除缓存
-            cacheManager.getCache(CacheNameConstant.SUBSCRIPTION_USER_CONFIG_LIST).evict(subscriptionOrder.getUserId());
-
             // 支付成功创建用户配置
             SubscriptionUserConfig addSubscriptionUserConfig = new SubscriptionUserConfig();
             addSubscriptionUserConfig.setPushOption(PushOptionEnum.ENABLED);
@@ -152,6 +149,9 @@ public class WxManagerImpl implements IWxManager {
             addSubscriptionUserConfig.setEndTime(DateUtils.getTimestampSpecial(subscriptionOrder.getSubscriptionDuration()));
             subscriptionUserConfigService.insert(addSubscriptionUserConfig);
 
+            // 清除缓存
+            cacheManager.getCache(CacheNameConstant.SUBSCRIPTION_USER_CONFIG_LIST).evict(subscriptionOrder.getUserId());
+
             // TODO 这里要回写订单信息
             return WxPayNotifyV3Response.success("处理成功!");
         } catch (Exception e) {

data-easy/src/main/java/com/dataeasy/server/utiis/CacheUtils.java

@@ -1,63 +0,0 @@
-package com.dataeasy.server.utiis;
-
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-
-/**
- * 缓存工具类
- */
-public class CacheUtils {
-
-    private static CacheManager cacheManager;
-
-    static {
-        cacheManager = SpringUtils.getBean(CacheManager.class);
-    }
-
-    /**
-     * 添加缓存
-     *
-     * @param cacheName 缓存名称
-     * @param key 缓存key
-     * @param value 缓存值
-     */
-    public static void put(String cacheName, String key, Object value) {
-        Cache cache = cacheManager.getCache(cacheName);
-        cache.put(key, value);
-    }
-
-    /**
-     * 获取缓存（泛型）
-     *
-     * @param cacheName 缓存名称
-     * @param key 缓存key
-     * @param clazz 缓存类
-     * @param <T> 返回值泛型
-     * @return
-     */
-    public static <T> T get(String cacheName, String key, Class<T> clazz) {
-        Cache cache = cacheManager.getCache(cacheName);
-        if (cache == null) {
-            return null;
-        }
-        Cache.ValueWrapper wrapper = cache.get(key);
-        if (wrapper == null) {
-            return null;
-        }
-        return (T)wrapper.get();
-    }
-
-    /**
-     * 失效缓存
-     *
-     * @param cacheName 缓存名称
-     * @param key 缓存key
-     */
-    public static void evict(String cacheName, String key) {
-        Cache cache = cacheManager.getCache(cacheName);
-        if (cache != null) {
-            cache.evict(key);
-        }
-    }
-
-}