ct 2 giorni fa
parent
commit
c783275b96
100 ha cambiato i file con 351 aggiunte e 320 eliminazioni
  1. 19 19
      fs-admin/src/main/java/com/fs/api/controller/IndexStatisticsController.java
  2. 2 2
      fs-admin/src/main/java/com/fs/qw/FsCourseTask.java
  3. 3 3
      fs-admin/src/main/java/com/fs/third/controller/FeiyuCustomerController.java
  4. 1 1
      fs-admin/src/main/java/com/fs/web/controller/monitor/SysUserOnlineController.java
  5. 1 1
      fs-admin/src/main/java/com/fs/web/controller/system/SysConfigController.java
  6. 4 4
      fs-admin/src/main/java/com/fs/web/controller/system/SysLoginController.java
  7. 1 1
      fs-ai-chat/src/main/java/com/fs/app/controller/CommonController.java
  8. 1 1
      fs-ai-chat/src/main/java/com/fs/app/websocket/service/WebSocketServer.java
  9. 1 1
      fs-company-app/src/main/java/com/fs/app/controller/AppBaseController.java
  10. 1 1
      fs-company-app/src/main/java/com/fs/app/websocket/service/WebSocketServer.java
  11. 1 1
      fs-company-app/src/main/java/com/fs/core/PermissionService.java
  12. 1 1
      fs-company/src/main/java/com/fs/company/controller/company/CompanyLoginController.java
  13. 1 1
      fs-company/src/main/java/com/fs/company/controller/company/TestController.java
  14. 1 1
      fs-company/src/main/java/com/fs/company/controller/course/FsCoursePlaySourceConfigController.java
  15. 2 2
      fs-company/src/main/java/com/fs/company/controller/store/FsUserController.java
  16. 26 6
      fs-company/src/main/java/com/fs/framework/interceptor/impl/SameUrlDataInterceptor.java
  17. 5 5
      fs-company/src/main/java/com/fs/framework/service/CompanyLoginService.java
  18. 4 4
      fs-doctor-app/src/main/java/com/fs/app/controller/DoctorController.java
  19. 1 1
      fs-doctor-app/src/main/java/com/fs/app/interceptor/AuthorizationInterceptor.java
  20. 3 3
      fs-framework/src/main/java/com/fs/framework/web/service/SysLoginService.java
  21. 1 1
      fs-framework/src/main/java/com/fs/framework/web/service/SysRegisterService.java
  22. 1 1
      fs-ipad-task/src/main/java/com/fs/app/service/IpadSendServer.java
  23. 1 1
      fs-ipad-task/src/main/java/com/fs/framework/service/CompanyLoginService.java
  24. 2 2
      fs-live-app/src/main/java/com/fs/live/task/Task.java
  25. 4 4
      fs-live-app/src/main/java/com/fs/live/websocket/service/WebSocketServer.java
  26. 6 5
      fs-qw-api-msg/src/main/java/com/fs/app/controller/QwMsgController.java
  27. 6 3
      fs-qw-api-msg/src/main/java/com/fs/framework/config/ResourcesConfig.java
  28. 17 18
      fs-qw-api-msg/src/main/java/com/fs/framework/config/SecurityConfig.java
  29. 13 6
      fs-qw-api-msg/src/main/java/com/fs/framework/security/filter/JwtAuthenticationTokenFilter.java
  30. 1 1
      fs-qw-api-msg/src/main/java/com/fs/framework/service/CompanyLoginService.java
  31. 2 2
      fs-qw-api/src/main/java/com/fs/app/service/QwDataCallbackService.java
  32. 1 1
      fs-qw-api/src/main/java/com/fs/framework/service/CompanyLoginService.java
  33. 1 1
      fs-qw-task/src/main/java/com/fs/app/controller/CommonController.java
  34. 1 1
      fs-qw-task/src/main/java/com/fs/app/taskService/impl/QwExternalContactRatingServiceImpl.java
  35. 1 1
      fs-qw-task/src/main/java/com/fs/app/taskService/impl/SyncQwExternalContactServiceImpl.java
  36. 1 1
      fs-qw-task/src/main/java/com/fs/framework/service/CompanyLoginService.java
  37. 1 1
      fs-qwhook-msg/src/main/java/com/fs/app/config/SystemStartSopService.java
  38. 1 1
      fs-qwhook/src/main/java/com/fs/app/config/SystemStartSopService.java
  39. 1 1
      fs-qwhook/src/main/java/com/fs/app/controller/QwSopController.java
  40. 1 1
      fs-qwhook/src/main/java/com/fs/app/websocket/service/WebSocketServer2.java
  41. 5 4
      fs-service/src/main/java/com/fs/ad/service/impl/AdHtmlClickLogServiceImpl.java
  42. 1 1
      fs-service/src/main/java/com/fs/common/service/WechatLoginService.java
  43. 1 1
      fs-service/src/main/java/com/fs/company/service/impl/CompanyConfigServiceImpl.java
  44. 1 1
      fs-service/src/main/java/com/fs/company/service/impl/CompanyRechargeServiceImpl.java
  45. 6 6
      fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java
  46. 1 1
      fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java
  47. 2 2
      fs-service/src/main/java/com/fs/course/service/impl/BalanceRollbackErrorServiceImpl.java
  48. 6 6
      fs-service/src/main/java/com/fs/course/service/impl/FsCourseRewardRoundServiceImpl.java
  49. 12 12
      fs-service/src/main/java/com/fs/course/service/impl/FsCourseWatchLogServiceImpl.java
  50. 1 1
      fs-service/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodServiceImpl.java
  51. 17 17
      fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java
  52. 2 2
      fs-service/src/main/java/com/fs/erp/dto/sdk/HzOMS/api/HzOMSClient.java
  53. 10 10
      fs-service/src/main/java/com/fs/fastGpt/service/impl/AiHookServiceImpl.java
  54. 5 5
      fs-service/src/main/java/com/fs/fastGpt/service/impl/AiNewServiceImpl.java
  55. 5 5
      fs-service/src/main/java/com/fs/fastGpt/service/impl/AiServiceImpl.java
  56. 2 2
      fs-service/src/main/java/com/fs/fastGpt/service/impl/FastgptExtUserTagServiceImpl.java
  57. 1 1
      fs-service/src/main/java/com/fs/feishu/service/impl/FsFeishuConfigServiceImpl.java
  58. 1 1
      fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderServiceImpl.java
  59. 9 9
      fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java
  60. 2 2
      fs-service/src/main/java/com/fs/his/service/impl/FsRedPacketServiceImpl.java
  61. 2 2
      fs-service/src/main/java/com/fs/his/utils/IdCardUtil.java
  62. 34 34
      fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java
  63. 6 6
      fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java
  64. 2 2
      fs-service/src/main/java/com/fs/live/service/impl/LiveRedConfServiceImpl.java
  65. 1 1
      fs-service/src/main/java/com/fs/live/service/impl/LiveServiceImpl.java
  66. 1 1
      fs-service/src/main/java/com/fs/live/service/impl/LiveUserFirstEntryServiceImpl.java
  67. 1 1
      fs-service/src/main/java/com/fs/live/service/impl/LiveVideoServiceImpl.java
  68. 1 1
      fs-service/src/main/java/com/fs/live/service/impl/LiveWatchLogServiceImpl.java
  69. 2 2
      fs-service/src/main/java/com/fs/live/service/impl/LiveWatchUserServiceImpl.java
  70. 1 1
      fs-service/src/main/java/com/fs/qw/service/impl/QwCompanyServiceImpl.java
  71. 6 6
      fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java
  72. 1 1
      fs-service/src/main/java/com/fs/qw/service/impl/QwGroupMsgServiceImpl.java
  73. 8 8
      fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java
  74. 8 8
      fs-service/src/main/java/com/fs/qwApi/service/impl/QwApiServiceImpl.java
  75. 3 3
      fs-service/src/main/java/com/fs/sop/service/impl/QwSopLogsServiceImpl.java
  76. 1 1
      fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsServiceImpl.java
  77. 1 1
      fs-service/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java
  78. 2 2
      fs-service/src/main/java/com/fs/system/service/impl/SysConfigServiceImpl.java
  79. 1 1
      fs-service/src/main/java/com/fs/tzBankPay/util/TzBankSendUtil.java
  80. 2 2
      fs-service/src/main/java/com/fs/wxwork/service/WxWorkServiceImpl.java
  81. 2 2
      fs-service/src/main/java/com/fs/wxwork/service/WxWorkServiceNew.java
  82. 1 1
      fs-store/src/main/java/com/fs/framework/service/LoginService.java
  83. 1 1
      fs-store/src/main/java/com/fs/framework/service/LoginServiceScrm.java
  84. 1 1
      fs-store/src/main/java/com/fs/framework/service/TokenServiceScrm.java
  85. 1 1
      fs-user-app-ai-chat/src/main/java/com/fs/app/controller/AppBaseController.java
  86. 1 1
      fs-user-app/src/main/java/com/fs/app/controller/AppBaseController.java
  87. 6 6
      fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java
  88. 1 1
      fs-user-app/src/main/java/com/fs/app/controller/CommonController.java
  89. 1 1
      fs-user-app/src/main/java/com/fs/app/controller/CompanyUserController.java
  90. 1 1
      fs-user-app/src/main/java/com/fs/app/controller/CouponController.java
  91. 1 1
      fs-user-app/src/main/java/com/fs/app/controller/IndexController.java
  92. 3 3
      fs-user-app/src/main/java/com/fs/app/controller/PackageOrderController.java
  93. 1 1
      fs-user-app/src/main/java/com/fs/app/controller/PrescribeController.java
  94. 1 1
      fs-user-app/src/main/java/com/fs/app/controller/VideoTestController.java
  95. 3 3
      fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwController.java
  96. 1 1
      fs-user-app/src/main/java/com/fs/app/controller/live/LiveController.java
  97. 1 1
      fs-user-app/src/main/java/com/fs/app/controller/live/LiveGoodsController.java
  98. 1 1
      fs-user-app/src/main/java/com/fs/app/controller/store/AppLoginScrmController.java
  99. 3 3
      fs-user-app/src/main/java/com/fs/app/controller/store/CompanyOrderScrmController.java
  100. 4 4
      fs-user-app/src/main/java/com/fs/app/controller/store/CompanyUserScrmController.java

+ 19 - 19
fs-admin/src/main/java/com/fs/api/controller/IndexStatisticsController.java

@@ -261,10 +261,10 @@ public class IndexStatisticsController {
         // 参考watchCourseTopTen方法的处理逻辑
         if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             String key = String.format("%s:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType);
-            watchEndPlayTrendDTOS = redisCache.getCacheObject(key);
+            watchEndPlayTrendDTOS = redisCache.getCacheObjectList(key, WatchEndPlayTrendDTO.class);
         }else if(param.getCompanyId() != null){
             String key = String.format("%s:%d:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType,param.getCompanyId());
-            watchEndPlayTrendDTOS = redisCache.getCacheObject(key);
+            watchEndPlayTrendDTOS = redisCache.getCacheObjectList(key, WatchEndPlayTrendDTO.class);
         }else{
             Company company = new Company();
             company.setDeptId(param.getDeptId());
@@ -272,7 +272,7 @@ public class IndexStatisticsController {
             List<WatchEndPlayTrendDTO> tempDTOS = new ArrayList<>();
             for(Long companyId : companyIds){
                 String key = String.format("%s:%d:%d:%d", DATA_OVERVIEW_DEALER_CHARTS, type,userType,companyId);
-                List<WatchEndPlayTrendDTO> companyData = redisCache.getCacheObject(key);
+                List<WatchEndPlayTrendDTO> companyData = redisCache.getCacheObjectList(key, WatchEndPlayTrendDTO.class);
                 if (companyData != null) {
                     tempDTOS.addAll(companyData);
                 }
@@ -345,10 +345,10 @@ public class IndexStatisticsController {
         // 参考deaMemberTopTen方法处理逻辑
         if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             String key = String.format("%s:%d:%d:%d", CHARTS_MEMBER_TOP_TEN_WATCH, type, statisticalType,userType);
-            deaMemberTopTenDTOS =  redisCache.getCacheObject(key);
+            deaMemberTopTenDTOS =  redisCache.getCacheObjectList(key, DeaMemberTopTenDTO.class);
         }else if(param.getCompanyId() != null){
             String key = String.format("%s:%d:%d:%d:%d", CHARTS_MEMBER_TOP_TEN_WATCH, type, statisticalType,userType,param.getCompanyId());
-            deaMemberTopTenDTOS = redisCache.getCacheObject(key);
+            deaMemberTopTenDTOS = redisCache.getCacheObjectList(key, DeaMemberTopTenDTO.class);
         }else{
             Company company = new Company();
             company.setDeptId(param.getDeptId());
@@ -356,7 +356,7 @@ public class IndexStatisticsController {
             List<DeaMemberTopTenDTO> tempDTOS = new ArrayList<>();
             for(Long companyId : companyIds){
                 String key = String.format("%s:%d:%d:%d:%d", CHARTS_MEMBER_TOP_TEN_WATCH, type, statisticalType,userType,companyId);
-                List<DeaMemberTopTenDTO> companyData = redisCache.getCacheObject(key);
+                List<DeaMemberTopTenDTO> companyData = redisCache.getCacheObjectList(key, DeaMemberTopTenDTO.class);
                 if (companyData != null) {
                     tempDTOS.addAll(companyData);
                 }
@@ -402,10 +402,10 @@ public class IndexStatisticsController {
         // 参考rewardMoneyTopTen方法处理逻辑
         if(!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             String key = String.format("%s:%d:%d:%d", CHARTS_REWARD_MONEY_TOP_TEN, type,dataType,userType);
-            rewardMoneyTopTenDTOS = redisCache.getCacheObject(key);
+            rewardMoneyTopTenDTOS = redisCache.getCacheObjectList(key, RewardMoneyTopTenDTO.class);
         }else if(param.getCompanyId() != null){
             String key = String.format("%s:%d:%d:%d:%d", CHARTS_REWARD_MONEY_TOP_TEN, type,dataType,userType,param.getCompanyId());
-            rewardMoneyTopTenDTOS = redisCache.getCacheObject(key);
+            rewardMoneyTopTenDTOS = redisCache.getCacheObjectList(key, RewardMoneyTopTenDTO.class);
         }else{
             Company company = new Company();
             company.setDeptId(param.getDeptId());
@@ -413,7 +413,7 @@ public class IndexStatisticsController {
             List<RewardMoneyTopTenDTO> tempDTOS = new ArrayList<>();
             for(Long companyId : companyIds){
                 String key = String.format("%s:%d:%d:%d:%d", CHARTS_REWARD_MONEY_TOP_TEN, type,dataType,userType,companyId);
-                List<RewardMoneyTopTenDTO> companyData = redisCache.getCacheObject(key);
+                List<RewardMoneyTopTenDTO> companyData = redisCache.getCacheObjectList(key, RewardMoneyTopTenDTO.class);
                 if (companyData != null) {
                     tempDTOS.addAll(companyData);
                 }
@@ -456,10 +456,10 @@ public class IndexStatisticsController {
         // 参考rewardMoneyTrend方法处理逻辑
         if(!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
             String key = String.format("%s:%d:%d", CHARTS_REWARD_MONEY_TREND, type,userType);
-            rewardMoneyTrendDTOS = redisCache.getCacheObject(key);
+            rewardMoneyTrendDTOS = redisCache.getCacheObjectList(key, RewardMoneyTrendDTO.class);
         }else if(param.getCompanyId() != null){
             String key = String.format("%s:%d:%d:%d", CHARTS_REWARD_MONEY_TREND, type,userType,param.getCompanyId());
-            rewardMoneyTrendDTOS = redisCache.getCacheObject(key);
+            rewardMoneyTrendDTOS = redisCache.getCacheObjectList(key, RewardMoneyTrendDTO.class);
         }else{
             Company company = new Company();
             company.setDeptId(param.getDeptId());
@@ -467,7 +467,7 @@ public class IndexStatisticsController {
             List<RewardMoneyTrendDTO> tempDTOS = new ArrayList<>();
             for(Long companyId : companyIds){
                 String key = String.format("%s:%d:%d:%d", CHARTS_REWARD_MONEY_TREND, type,userType,companyId);
-                List<RewardMoneyTrendDTO> companyData = redisCache.getCacheObject(key);
+                List<RewardMoneyTrendDTO> companyData = redisCache.getCacheObjectList(key, RewardMoneyTrendDTO.class);
                 if (companyData != null) {
                     tempDTOS.addAll(companyData);
                 }
@@ -507,16 +507,16 @@ public class IndexStatisticsController {
         Integer userType = param.getUserType();
         List<CourseStatsDTO> courseStatsDTOS;
         if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
-            courseStatsDTOS = redisCache.getCacheObject(String.format("%s:%d:%d:%d:%s", CHARTS_WATCH_TOP_TEN, type,statisticalType,userType,sort));
+            courseStatsDTOS = redisCache.getCacheObjectList(String.format("%s:%d:%d:%d:%s", CHARTS_WATCH_TOP_TEN, type,statisticalType,userType,sort), CourseStatsDTO.class);
         }else if(param.getCompanyId() != null){
-            courseStatsDTOS = redisCache.getCacheObject(String.format("%s:%d:%d:%d:%s:%d", CHARTS_WATCH_TOP_TEN, type,statisticalType,userType,sort,param.getCompanyId()));
+            courseStatsDTOS = redisCache.getCacheObjectList(String.format("%s:%d:%d:%d:%s:%d", CHARTS_WATCH_TOP_TEN, type,statisticalType,userType,sort,param.getCompanyId()), CourseStatsDTO.class);
         }else{
             Company company = new Company();
             company.setDeptId(param.getDeptId());
             Long[] companyIds = companyService.selectCompanyList(company).stream().map(Company::getCompanyId).toArray(Long[]::new);
             List<CourseStatsDTO> tempDTOS = new ArrayList<>();
             for(Long companyId : companyIds){
-                List<CourseStatsDTO> companyDTO = redisCache.getCacheObject(String.format("%s:%d:%d:%d:%s:%d", CHARTS_WATCH_TOP_TEN, type,statisticalType,userType,sort,companyId));
+                List<CourseStatsDTO> companyDTO = redisCache.getCacheObjectList(String.format("%s:%d:%d:%d:%s:%d", CHARTS_WATCH_TOP_TEN, type,statisticalType,userType,sort,companyId), CourseStatsDTO.class);
                 if (companyDTO != null) {
                     tempDTOS.addAll(companyDTO);
                 }
@@ -685,7 +685,7 @@ public class IndexStatisticsController {
     @GetMapping("/smsBalance")
     public R smsBalance(StatisticsDeptCompanyParam param){
         if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
-            return R.ok().put("data", redisCache.getCacheObject(StatisticsRedisConstant.DATA_OVERVIEW_DEALER_SMS_BALANCE));
+            return R.ok().put("data", redisCache.getCacheObject(StatisticsRedisConstant.DATA_OVERVIEW_DEALER_SMS_BALANCE, Long.class));
         }else if(param.getCompanyId() != null){
             return R.ok().put("data", redisCache.getCacheObject(String.format("%s:%d", DATA_OVERVIEW_DEALER_SMS_BALANCE, param.getCompanyId())));
         }else{
@@ -694,7 +694,7 @@ public class IndexStatisticsController {
             long smsBalance = 0L;
             Long[] companyIds = companyService.selectCompanyList(company).stream().map(Company::getCompanyId).toArray(Long[]::new);
             for(Long companyId : companyIds) {
-                Long smsBalanceCompany = redisCache.getCacheObject(String.format("%s:%d", DATA_OVERVIEW_DEALER_SMS_BALANCE, companyId));
+                Long smsBalanceCompany = redisCache.getCacheObject(String.format("%s:%d", DATA_OVERVIEW_DEALER_SMS_BALANCE, companyId), Long.class);
                 if (smsBalanceCompany != null) {
                     smsBalance += smsBalanceCompany;
                 }
@@ -711,7 +711,7 @@ public class IndexStatisticsController {
     public R authorizationInfo(StatisticsDeptCompanyParam  param){
         AuthorizationInfoDTO authorizationInfoDTO = new AuthorizationInfoDTO();
         if (!medicalMallConfig.isStatics() || (param.getCompanyId() == null && param.getDeptId() == null) || (param.getCompanyId() == null && param.getDeptId() == 1)){
-            return R.ok().put("data", redisCache.getCacheObject(StatisticsRedisConstant.DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO));
+            return R.ok().put("data", redisCache.getCacheObject(StatisticsRedisConstant.DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO, AuthorizationInfoDTO.class));
         }else if(param.getCompanyId() != null){
             return R.ok().put("data", redisCache.getCacheObject(String.format("%s:%d", DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO, param.getCompanyId())));
         }else{
@@ -720,7 +720,7 @@ public class IndexStatisticsController {
             AuthorizationInfoDTO authorizationInfoDTO1 = new AuthorizationInfoDTO();
             Long[] companyIds = companyService.selectCompanyList(company).stream().map(Company::getCompanyId).toArray(Long[]::new);
             for(Long companyId : companyIds) {
-                AuthorizationInfoDTO companyDTO = redisCache.getCacheObject(String.format("%s:%d", DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO, companyId));
+                AuthorizationInfoDTO companyDTO = redisCache.getCacheObject(String.format("%s:%d", DATA_OVERVIEW_DEALER_AUTHORIZATION_INFO, companyId), AuthorizationInfoDTO.class);
                 log.info("授权信息:{}", authorizationInfoDTO);
                 if (companyDTO != null) {
                     authorizationInfoDTO1.setTodayWatchUserCount(

+ 2 - 2
fs-admin/src/main/java/com/fs/qw/FsCourseTask.java

@@ -61,7 +61,7 @@ public class FsCourseTask {
                 return;
             }
 
-            BigDecimal redPacketCompanyMoney = redisCache.getCacheObject(REDPACKET_COMPANY_MONEY);
+            BigDecimal redPacketCompanyMoney = redisCache.getCacheObject(REDPACKET_COMPANY_MONEY, BigDecimal.class);
             if(ObjectUtils.isNull(redPacketCompanyMoney)){
                 redPacketCompanyMoney = BigDecimal.ZERO;
             }
@@ -100,7 +100,7 @@ public class FsCourseTask {
 
         BigDecimal oldBigDecimal = new BigDecimal(configValue);
 
-        BigDecimal redPacketCompanyMoney = redisCache.getCacheObject(REDPACKET_COMPANY_MONEY);
+        BigDecimal redPacketCompanyMoney = redisCache.getCacheObject(REDPACKET_COMPANY_MONEY, BigDecimal.class);
 
         log.info("公司账户红包余额变更 {} -> {}",oldBigDecimal,redPacketCompanyMoney);
 

+ 3 - 3
fs-admin/src/main/java/com/fs/third/controller/FeiyuCustomerController.java

@@ -68,7 +68,7 @@ public class FeiyuCustomerController extends BaseController {
         String authCode=param.getString("authCode");
         Long id=param.getLong("thirdId");
         CrmCustomerThird crmCustomerThird=crmCustomerThirdService.selectCrmCustomerThirdById(id);
-        String refresh_token=redisCache.getCacheObject("token-feiyu:refresh"+crmCustomerThird.getId());
+        String refresh_token=redisCache.getCacheObject("token-feiyu:refresh"+crmCustomerThird.getId(), String.class);
         if(StringUtils.isEmpty(refresh_token)) {
             return getAccessTokenAct(crmCustomerThird,authCode);
         }
@@ -79,8 +79,8 @@ public class FeiyuCustomerController extends BaseController {
         if(StringUtils.isEmpty(crmCustomerThird.getRefreshToken())){
             return getAccessTokenAct(crmCustomerThird,authCode);
         }
-        String access_token=redisCache.getCacheObject("token-feiyu:access"+crmCustomerThird.getId());
-        String refresh_token=redisCache.getCacheObject("token-feiyu:refresh"+crmCustomerThird.getId());
+        String access_token=redisCache.getCacheObject("token-feiyu:access"+crmCustomerThird.getId(), String.class);
+        String refresh_token=redisCache.getCacheObject("token-feiyu:refresh"+crmCustomerThird.getId(), String.class);
         if(StringUtils.isEmpty(refresh_token)){  //refreshToken失效
             throw new CustomException("refreshToken已失效,请重新授权",501);
         }else{

+ 1 - 1
fs-admin/src/main/java/com/fs/web/controller/monitor/SysUserOnlineController.java

@@ -46,7 +46,7 @@ public class SysUserOnlineController extends BaseController
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
         for (String key : keys)
         {
-            LoginUser user = redisCache.getCacheObject(key);
+            LoginUser user = redisCache.getCacheObject(key, LoginUser.class);
             if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
             {
                 if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))

+ 1 - 1
fs-admin/src/main/java/com/fs/web/controller/system/SysConfigController.java

@@ -157,7 +157,7 @@ public class SysConfigController extends BaseController {
     @GetMapping("/updateIsTownOn")
     public R queryIsTownOn(String bock, String appId) {
         String key = appId + "start_status_001";
-        String start = redisCache.getCacheObject(key);
+        String start = redisCache.getCacheObject(key, String.class);
         if (ObjectUtil.isNotEmpty(bock)) {
             if (bock.equals("001")) {
                 redisCache.setCacheObject(key, bock);

+ 4 - 4
fs-admin/src/main/java/com/fs/web/controller/system/SysLoginController.java

@@ -174,12 +174,12 @@ public class SysLoginController
         String phone = map.get("phone");
         String code = map.get("code");
         String smsKey = "doctorLogin:sms:" + map.get("phone");
-        String smsCode = redisCache.getCacheObject(smsKey);
+        String smsCode = redisCache.getCacheObject(smsKey, String.class);
 
         if (smsCode == null) {
             throw new ServiceException("验证码已过期,请重新发送");
         } else {
-            String string = redisCache.getCacheObject("doctorLogin:sms:" + phone).toString();
+            String string = redisCache.getCacheObject("doctorLogin:sms:" + phone, String.class);
             if (!string.equals(code)){
                 throw new ServiceException("验证码错误");
             }else{
@@ -208,9 +208,9 @@ public class SysLoginController
     @GetMapping("/checkWechatScan")
     public AjaxResult checkWechatScan(@RequestParam String ticket)
     {
-        String status = redisCache.getCacheObject("wechat:scan:" + ticket);
+        String status = redisCache.getCacheObject("wechat:scan:" + ticket, String.class);
         if ("ok".equals(status)) {
-            String username = redisCache.getCacheObject("login:ticket:" + ticket);
+            String username = redisCache.getCacheObject("login:ticket:" + ticket, String.class);
             redisCache.deleteObject("login:ticket:" + ticket);
             redisCache.deleteObject("wechat:scan:" + ticket);
             SysUser sysUser = userService.selectUserByUserName(username);

+ 1 - 1
fs-ai-chat/src/main/java/com/fs/app/controller/CommonController.java

@@ -151,7 +151,7 @@ public class CommonController {
         logger.info("收到数据:msg:"+ JSONUtil.toJsonStr(dataBean));
         Boolean hasMore=true;
         while (hasMore){
-            String next_cursor=redisCache.getCacheObject(REDIS_CHAT_NEXTCURSOR+dataBean.getOpenKfId());
+            String next_cursor=redisCache.getCacheObject(REDIS_CHAT_NEXTCURSOR+dataBean.getOpenKfId(), String.class);
             WeixinKfMsgDTO dto=new WeixinKfMsgDTO();
             dto.setLimit(1000);
             if(StringUtils.isNotEmpty(next_cursor)){

+ 1 - 1
fs-ai-chat/src/main/java/com/fs/app/websocket/service/WebSocketServer.java

@@ -113,7 +113,7 @@ public class WebSocketServer {
                         session=sessionPools.get(msg.getUserId());
                         ChatRole chatRole=chatRoleService.selectChatRoleByRoleId(Long.parseLong(msg.getRoleId()));
                         WxConfig wxConfig=JSONUtil.toBean(chatRole.getModeConfigJson(), WxConfig.class);
-                        Long sessionId=redisCache.getCacheObject(REDIS_CHAT_SESSION+msg.getUserId()+":"+chatRole.getKfId());
+                        Long sessionId=redisCache.getCacheObject(REDIS_CHAT_SESSION+msg.getUserId()+":"+chatRole.getKfId(), Long.class);
                         if(sessionId==null){
                             ChatSession chatSession=new ChatSession();
                             String sessionCode = IdUtil.getSnowflake(0, 0).nextIdStr();

+ 1 - 1
fs-company-app/src/main/java/com/fs/app/controller/AppBaseController.java

@@ -42,7 +42,7 @@ public class AppBaseController {
 			throw new FSException("未授权,请先登录!");
 		}
 		String userId = claims.getSubject().toString();
-		Long companyId =(Long)redisCache.getCacheObject("companyId:"+userId);
+		Long companyId =redisCache.getCacheObject("companyId:"+userId, Long.class);
 		if (companyId==null){
 			CompanyUser companyUser = companyUserService.selectCompanyUserById(Long.parseLong(userId));
 			companyId = companyUser.getCompanyId();

+ 1 - 1
fs-company-app/src/main/java/com/fs/app/websocket/service/WebSocketServer.java

@@ -114,7 +114,7 @@ public class WebSocketServer {
                         session=sessionPools.get(msg.getUserId());
                         ChatRole chatRole=chatRoleService.selectChatRoleByRoleId(Long.parseLong(msg.getRoleId()));
                         WxConfig wxConfig=JSONUtil.toBean(chatRole.getModeConfigJson(), WxConfig.class);
-                        Long sessionId=redisCache.getCacheObject(REDIS_CHAT_SESSION+msg.getUserId()+":"+chatRole.getKfId());
+                        Long sessionId=redisCache.getCacheObject(REDIS_CHAT_SESSION+msg.getUserId()+":"+chatRole.getKfId(), Long.class);
                         if(sessionId==null){
                             ChatSession chatSession=new ChatSession();
                             String sessionCode = IdUtil.getSnowflake(0, 0).nextIdStr();

+ 1 - 1
fs-company-app/src/main/java/com/fs/core/PermissionService.java

@@ -40,7 +40,7 @@ public class PermissionService
         Claims claims=jwtUtils.getClaimByToken(headValue);
         String userId = claims.getSubject().toString();
         //获取用户所有的权限
-        String permss=redisCache.getCacheObject("perms:"+userId);
+        String permss = redisCache.getCacheObject("perms:"+userId, String.class);
         if(StringUtils.isNotEmpty(permss)){
             List<String> perms= (List<String>) JSONUtils.parse(permss);
             if (StringUtils.isEmpty(permission))

+ 1 - 1
fs-company/src/main/java/com/fs/company/controller/company/CompanyLoginController.java

@@ -135,7 +135,7 @@ public class CompanyLoginController
             Boolean disabled = jsonObject.getBoolean("disabled");
             if(disabled){
                 LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-                Long userId = redisCache.getCacheObject("newCompanyUser:" + loginUser.getUser().getCompanyId() + ":" + loginUser.getUser().getUserName());
+                Long userId = redisCache.getCacheObject("newCompanyUser:" + loginUser.getUser().getCompanyId() + ":" + loginUser.getUser().getUserName(), Long.class);
                 if (loginUser.getUser().getUserId().equals(userId)) {
                     return AjaxResult.success(true);
                 }

+ 1 - 1
fs-company/src/main/java/com/fs/company/controller/company/TestController.java

@@ -98,7 +98,7 @@ public class TestController {
             String key = "qw:logs:pad:send:id:" + qwSopLogs.getId();
             Long time = redisCache.getCacheObject(key);
             // 判断这个消息有没有进入过发送,如果进了就不要再发了,防止重复发送,,,,, TODO 千万不能动!!!!!
-            if (redisCache.getCacheObject(key) != null) {
+            if (time != null) {
                 log.error("{}已有发送:{}, :{}", qwUser.getQwUserName(), qwSopLogs.getId(), time);
                 continue;
             }

+ 1 - 1
fs-company/src/main/java/com/fs/company/controller/course/FsCoursePlaySourceConfigController.java

@@ -153,7 +153,7 @@ public class FsCoursePlaySourceConfigController extends BaseController {
     public R queryIsTownOn(String bock, String appId)
     {
         String key = appId+"start_status_001";
-        String start = redisCache.getCacheObject(key);
+        String start = redisCache.getCacheObject(key, String.class);
         if (ObjectUtil.isNotEmpty(bock)){
             if (bock.equals("001")){
                 redisCache.setCacheObject(key,bock);

+ 2 - 2
fs-company/src/main/java/com/fs/company/controller/store/FsUserController.java

@@ -325,7 +325,7 @@ public class FsUserController extends BaseController
             String smsCooldownKey = "sms:cooldown:company:" + phone;
 
             // 判断是否在 60 秒冷却期
-            if (redisCache.getCacheObject(smsCooldownKey) != null) {
+            if (redisCache.getCacheObject(smsCooldownKey, Object.class) != null) {
                 return R.error("验证码已发送,请稍后再试");
             }
 
@@ -357,7 +357,7 @@ public class FsUserController extends BaseController
             return R.error("y验证码未填写");
         }
         //验证码绑定,需要校验验证码
-        String redisCode = redisCache.getCacheObject("sms:code:company:" + param.getPhone());
+        String redisCode = redisCache.getCacheObject("sms:code:company:" + param.getPhone(), String.class);
         if (org.apache.commons.lang3.StringUtils.isEmpty(redisCode)){
             return R.error("验证码已过期,请重新发送");
         }

+ 26 - 6
fs-company/src/main/java/com/fs/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -84,11 +84,22 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
         Object sessionObj = redisCache.getCacheObject(cacheRepeatKey);
         if (sessionObj != null)
         {
-            Map<String, Object> sessionMap = (Map<String, Object>) sessionObj;
-            if (sessionMap.containsKey(url))
+            Map<String, Object> sessionMap;
+            if (sessionObj instanceof Map)
             {
-                Map<String, Object> preDataMap = (Map<String, Object>) sessionMap.get(url);
-                if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap))
+                sessionMap = (Map<String, Object>) sessionObj;
+            }
+            else
+            {
+                sessionMap = JSONObject.parseObject(JSONObject.toJSONString(sessionObj), Map.class);
+            }
+            if (sessionMap != null && sessionMap.containsKey(url))
+            {
+                Object preObj = sessionMap.get(url);
+                Map<String, Object> preDataMap = preObj instanceof Map
+                        ? (Map<String, Object>) preObj
+                        : JSONObject.parseObject(JSONObject.toJSONString(preObj), Map.class);
+                if (preDataMap != null && compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap))
                 {
                     return true;
                 }
@@ -115,12 +126,21 @@ public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
      */
     private boolean compareTime(Map<String, Object> nowMap, Map<String, Object> preMap)
     {
-        long time1 = (Long) nowMap.get(REPEAT_TIME);
-        long time2 = (Long) preMap.get(REPEAT_TIME);
+        long time1 = toLong(nowMap.get(REPEAT_TIME));
+        long time2 = toLong(preMap.get(REPEAT_TIME));
         if ((time1 - time2) < (this.intervalTime * 1000))
         {
             return true;
         }
         return false;
     }
+
+    private long toLong(Object value)
+    {
+        if (value instanceof Number)
+        {
+            return ((Number) value).longValue();
+        }
+        return value == null ? 0L : Long.parseLong(String.valueOf(value));
+    }
 }

+ 5 - 5
fs-company/src/main/java/com/fs/framework/service/CompanyLoginService.java

@@ -85,7 +85,7 @@ public class CompanyLoginService
     public String login(String username, String password, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {
@@ -138,7 +138,7 @@ public class CompanyLoginService
     public boolean checkIsNeedCheck(String username, String password, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         //redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {
@@ -289,9 +289,9 @@ public class CompanyLoginService
     }
 
     public String checkWechatScan(String ticket) {
-        String status = redisCache.getCacheObject("wechat:scan:" + ticket);
+        String status = redisCache.getCacheObject("wechat:scan:" + ticket, String.class);
         if ("ok".equals(status)) {
-            String username = redisCache.getCacheObject("login:ticket:" + ticket);
+            String username = redisCache.getCacheObject("login:ticket:" + ticket, String.class);
             redisCache.deleteObject("login:ticket:" + ticket);
             redisCache.deleteObject("wechat:scan:" + ticket);
             CompanyUser companyUser = companyUserService.selectUserByUserName(username);
@@ -325,7 +325,7 @@ public class CompanyLoginService
         String unionid = json.getString("unionid");
         if (unionid == null) throw new ServiceException("微信授权失败");
 
-        String username = redisCache.getCacheObject("login:ticket:" + ticket);
+        String username = redisCache.getCacheObject("login:ticket:" + ticket, String.class);
         if (username == null) throw new ServiceException("ticket无效或过期");
         CompanyUser companyUser = companyUserService.selectUserByUserName(username);
         if (companyUser == null) throw new ServiceException("用户不存在");

+ 4 - 4
fs-doctor-app/src/main/java/com/fs/app/controller/DoctorController.java

@@ -227,7 +227,7 @@ public class DoctorController extends  AppBaseController {
 
     public String validateCaptcha(String username, String code, String uuid) {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         redisCache.deleteObject(verifyKey);
 
         if (captcha == null) {
@@ -370,7 +370,7 @@ public class DoctorController extends  AppBaseController {
         if(param.getMoney().compareTo(doctor.getBalance())==1){
             return R.error("提现金额必须小于等于余额");
         }
-        String code=redisCache.getCacheObject(doctor.getMobile());
+        String code=redisCache.getCacheObject(doctor.getMobile(), String.class);
         if(StringUtils.isEmpty(code)){
             return R.error("验证码已过期");
         }
@@ -423,7 +423,7 @@ public class DoctorController extends  AppBaseController {
     @PostMapping("/editExtract")
     public R editExtract(@Validated @RequestBody FsDoctorExtractEditParam param, HttpServletRequest request){
         FsDoctor doctor=doctorService.selectFsDoctorByDoctorId(Long.parseLong(getDoctorId()));
-        String code = redisCache.getCacheObject(doctor.getMobile());
+        String code = redisCache.getCacheObject(doctor.getMobile(), String.class);
         if(StringUtils.isEmpty(code)){
             return R.error("验证码已过期");
         }
@@ -449,7 +449,7 @@ public class DoctorController extends  AppBaseController {
     public R sendSmsCode(){
         FsDoctor doctor=doctorService.selectFsDoctorByDoctorId(Long.parseLong(getDoctorId()));
         //此手机号是否已存在REFIDS 如果存在,不能发送
-        String captcha = redisCache.getCacheObject(doctor.getMobile());
+        String captcha = redisCache.getCacheObject(doctor.getMobile(), String.class);
         if(StringUtils.isNotEmpty(captcha)){
             return R.error("短信已发送,1分钟以内请勿重新发送验证码");
         }

+ 1 - 1
fs-doctor-app/src/main/java/com/fs/app/interceptor/AuthorizationInterceptor.java

@@ -69,7 +69,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
         }
         // doctor Redis token 一致性(若存在则校验)
         try {
-            String redisToken = redisCache.getCacheObject("doctorToken:" + Long.parseLong(claims.getSubject()));
+            String redisToken = redisCache.getCacheObject("doctorToken:" + Long.parseLong(claims.getSubject()), String.class);
             if (redisToken != null && !redisToken.equals(token)) {
                 throw new FSException(jwtUtils.getHeader() + "失效,请重新登录", HttpStatus.UNAUTHORIZED.value());
             }

+ 3 - 3
fs-framework/src/main/java/com/fs/framework/web/service/SysLoginService.java

@@ -124,7 +124,7 @@ public class SysLoginService
     public void validateCaptcha(String username, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {
@@ -153,7 +153,7 @@ public class SysLoginService
     public boolean checkIsNeedCheck(String username, String password, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         //redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {
@@ -307,7 +307,7 @@ public class SysLoginService
         String unionid = json.getString("unionid");
         if (unionid == null) throw new ServiceException("微信授权失败");
 
-        String username = redisCache.getCacheObject("login:ticket:" + ticket);
+        String username = redisCache.getCacheObject("login:ticket:" + ticket, String.class);
         if (username == null) throw new ServiceException("ticket无效或过期");
         SysUser sysUser = userService.selectUserByUserName(username);
         if (sysUser == null) throw new ServiceException("用户不存在");

+ 1 - 1
fs-framework/src/main/java/com/fs/framework/web/service/SysRegisterService.java

@@ -101,7 +101,7 @@ public class SysRegisterService
     public void validateCaptcha(String username, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {

+ 1 - 1
fs-ipad-task/src/main/java/com/fs/app/service/IpadSendServer.java

@@ -1041,7 +1041,7 @@ public class IpadSendServer {
             qwSopLogsService.updateQwSopLogsByWatchLogType(qwSopLogs.getId(), "模板未选消息类型,不发送");
             return false;
         }
-        Integer cacheValue = redisCache.getCacheObject("sopCourse:video:isPause:" + setting.getVideoId());
+        Integer cacheValue = redisCache.getCacheObject("sopCourse:video:isPause:" + setting.getVideoId(), Integer.class);
         int isPause = (cacheValue != null) ? cacheValue : 0;
         log.info("SOP_LOG_ID:{},判断课程({})当前状态:{}", qwSopLogs.getId(), setting.getVideoId(), isPause);
         if (isPause == 1){

+ 1 - 1
fs-ipad-task/src/main/java/com/fs/framework/service/CompanyLoginService.java

@@ -49,7 +49,7 @@ public class CompanyLoginService
     public String login(String username, String password, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {

+ 2 - 2
fs-live-app/src/main/java/com/fs/live/task/Task.java

@@ -582,7 +582,7 @@ public class Task {
             // 使用Set大小来获取最大同时在线人数
             String onlineUsersSetKey = ONLINE_USERS_SET_KEY + liveData.getLiveId();
             Long currentSetSize = redisCache.redisTemplate.opsForSet().size(onlineUsersSetKey);
-            Long maxOnlineFromRedis = Optional.ofNullable(redisCache.getCacheObject(MAX_ONLINE_USERS_KEY + liveData.getLiveId()))
+            Long maxOnlineFromRedis = Optional.ofNullable(redisCache.getCacheObject(MAX_ONLINE_USERS_KEY + liveData.getLiveId(), Long.class))
                     .map(obj -> {
                         if (obj instanceof Number) {
                             return ((Number) obj).longValue();
@@ -705,7 +705,7 @@ public class Task {
                                 // 1. 计算并更新直播用户的在线时长
                                 // 优先从 Redis 获取进入时间
                                 String entryTimeKey = String.format("live:user:entry:time:%s:%s", liveId, userId);
-                                Long entryTime = redisCache.getCacheObject(entryTimeKey);
+                                Long entryTime = redisCache.getCacheObject(entryTimeKey, Long.class);
 
                                 // 如果没有 Redis 记录,使用数据库中的 updateTime
                                 if (entryTime == null) {

+ 4 - 4
fs-live-app/src/main/java/com/fs/live/websocket/service/WebSocketServer.java

@@ -141,7 +141,7 @@ public class WebSocketServer {
             // 存储用户进入直播间的时间到 Redis(用于计算在线时长)
             // 如果已经存在进入时间,说明是重连,不应该覆盖,保持原来的进入时间
             String entryTimeKey = String.format(USER_ENTRY_TIME_KEY, liveId, userId);
-            Long existingEntryTime = redisCache.getCacheObject(entryTimeKey);
+            Long existingEntryTime = redisCache.getCacheObject(entryTimeKey, Long.class);
             if (existingEntryTime == null) {
                 // 首次连接,记录进入时间
                 redisCache.setCacheObject(entryTimeKey, System.currentTimeMillis(), 24, TimeUnit.HOURS);
@@ -162,7 +162,7 @@ public class WebSocketServer {
             // 获取Set的大小作为当前在线人数
             Long currentOnlineCount = redisCache.redisTemplate.opsForSet().size(onlineUsersSetKey);
             //最大同时在线人数 - 使用Set大小来判断
-            Integer maxOnline = redisCache.getCacheObject(MAX_ONLINE_USERS_KEY + liveId);
+            Integer maxOnline = redisCache.getCacheObject(MAX_ONLINE_USERS_KEY + liveId, Integer.class);
             int currentOnline = currentOnlineCount != null ? currentOnlineCount.intValue() : 0;
             if (maxOnline == null || currentOnline > maxOnline) {
                 redisCache.setCacheObject(MAX_ONLINE_USERS_KEY + liveId, currentOnline);
@@ -1126,7 +1126,7 @@ public class WebSocketServer {
         try {
             // 从 Redis 获取用户进入时间
             String entryTimeKey = String.format(USER_ENTRY_TIME_KEY, liveId, userId);
-            Long entryTime = redisCache.getCacheObject(entryTimeKey);
+            Long entryTime = redisCache.getCacheObject(entryTimeKey, Long.class);
 
             if (entryTime == null) {
                 // 如果没有进入时间记录,可能是旧数据,跳过
@@ -1248,7 +1248,7 @@ public class WebSocketServer {
                 String lastUpdateKey = "live:watch:log:last:duration:" + liveId + ":" + userId;
 
                 // 获取上次更新的时长
-                Long lastUpdateDuration = redisCache.getCacheObject(lastUpdateKey);
+                Long lastUpdateDuration = redisCache.getCacheObject(lastUpdateKey, Long.class);
 
                 // 如果达到关键节点,或者距离上次更新已超过60秒,则更新
                 boolean shouldUpdate = false;

+ 6 - 5
fs-qw-api-msg/src/main/java/com/fs/app/controller/QwMsgController.java

@@ -112,7 +112,7 @@ public class QwMsgController {
 
     @GetMapping("/sendExpressInfo/{orderId}")
     public R sendExpressInfo(@PathVariable Long orderId) throws IOException {
-        String isSend = redisCache.getCacheObject("fs:express:info:send:" +orderId);
+        String isSend = redisCache.getCacheObject("fs:express:info:send:" +orderId, String.class);
         if(isSend == null){
             redisCache.setCacheObject("fs:express:info:send:" +orderId, "1",2, TimeUnit.MINUTES);
             FsStoreOrder order = fsStoreOrderService.selectFsStoreOrderByOrderId(orderId);
@@ -256,21 +256,22 @@ public class QwMsgController {
         HashMap<String, String> map = new HashMap<>();
         map.put("errorcode","0");
         map.put("errmsg","ok");
-        Long id = redisCache.getCacheObject("qrCode:uuid:"+wxWorkMsgResp.getUuid());
+        Long id = redisCache.getCacheObject("qrCode:uuid:"+wxWorkMsgResp.getUuid(), Long.class);
         if (id==null){
             return map;
         }
         switch (type){
             case 100001:
                 log.info("id:{}, 扫码返回", id);
+                redisCache.setCacheObject("qrCodeUid:"+wxWorkMsgResp.getUuid(),100001,10, TimeUnit.MINUTES);
                 break;
             case 100002:
                 log.info("id:{}, 取消扫码", id);
-              //  redisCache.setCacheObject("qrCodeUid:"+wxWorkMsgResp.getUuid(),100002,10, TimeUnit.MINUTES);
+                redisCache.setCacheObject("qrCodeUid:"+wxWorkMsgResp.getUuid(),100002,10, TimeUnit.MINUTES);
                 break;
             case 100003:
                 log.info("id:{}, 确认扫码返回", id);
-
+                redisCache.setCacheObject("qrCodeUid:"+wxWorkMsgResp.getUuid(),100003,10, TimeUnit.MINUTES);
                 break;
             case 104001:
                 log.info("id:{}, 登录成功", id);
@@ -669,7 +670,7 @@ public class QwMsgController {
 
 
     void qwUserStatus(String uid, Integer status, String msg){
-        Long id = redisCache.getCacheObject("qrCode:uuid:"+uid);
+        Long id = redisCache.getCacheObject("qrCode:uuid:"+uid, Long.class);
         QwUser qwUser = new QwUser();
         qwUser.setId(id);
         qwUser.setRemark(msg);

+ 6 - 3
fs-qw-api-msg/src/main/java/com/fs/framework/config/ResourcesConfig.java

@@ -50,9 +50,12 @@ public class ResourcesConfig implements WebMvcConfigurer
     public CorsFilter corsFilter()
     {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-                // 显式域名白名单(Boot 2.2 无 originPattern);可用环境变量 CORS_ALLOWED_ORIGINS 覆盖
-        CorsConfiguration config = com.fs.common.config.CorsSupport.buildConfig();
-        // 对接口配置跨域设置
+        // 本模块主要接收企微/云主机服务端回调(非浏览器),保持宽松跨域,避免误拦回调
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true);
+        config.addAllowedOrigin("*");
+        config.addAllowedHeader("*");
+        config.addAllowedMethod("*");
         source.registerCorsConfiguration("/**", config);
         return new CorsFilter(source);
     }

+ 17 - 18
fs-qw-api-msg/src/main/java/com/fs/framework/config/SecurityConfig.java

@@ -110,25 +110,24 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                         "/qwImSocket/**"
                 ).permitAll()
 
-                .antMatchers("/**").anonymous()
-                .antMatchers("**/errorLogUpload").anonymous()
-                .antMatchers("/msg/**").anonymous()
-                .antMatchers("/msg/**/**").anonymous()
-                .antMatchers("/msg").anonymous()
-                .antMatchers("/testSop").anonymous()
-                .antMatchers("/common/getId**").anonymous()
-                .antMatchers("/common/uploadOSS**").anonymous()
-                .antMatchers("/common/uploadWang**").anonymous()
-                .antMatchers("/common/download**").anonymous()
-                .antMatchers("/common/download/resource**").anonymous()
-                .antMatchers("/swagger-ui.html").anonymous()
-                .antMatchers("/swagger-resources/**").anonymous()
-                .antMatchers("/webjars/**").anonymous()
-                .antMatchers("/*/api-docs").anonymous()
+                // 回调/内网接口须 permitAll:anonymous() 在已带 Token 时会 403,第三方回调也可能带无关 Authorization
+                .antMatchers("/msg/**", "/msg/**/**", "/msg").permitAll()
+                .antMatchers("/**").permitAll()
+                .antMatchers("**/errorLogUpload").permitAll()
+                .antMatchers("/testSop").permitAll()
+                .antMatchers("/common/getId**").permitAll()
+                .antMatchers("/common/uploadOSS**").permitAll()
+                .antMatchers("/common/uploadWang**").permitAll()
+                .antMatchers("/common/download**").permitAll()
+                .antMatchers("/common/download/resource**").permitAll()
+                .antMatchers("/swagger-ui.html").permitAll()
+                .antMatchers("/swagger-resources/**").permitAll()
+                .antMatchers("/webjars/**").permitAll()
+                .antMatchers("/*/api-docs").permitAll()
                 // Druid 控制台自带账密;需匿名通过 Spring,否则 iframe 无 JWT 无法打开
-                .antMatchers("/druid/**").anonymous()
-                .antMatchers("/qw/data/**").anonymous()
-                .antMatchers("/qw/test/**").anonymous()
+                .antMatchers("/druid/**").permitAll()
+                .antMatchers("/qw/data/**").permitAll()
+                .antMatchers("/qw/test/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

+ 13 - 6
fs-qw-api-msg/src/main/java/com/fs/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -34,13 +34,20 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws ServletException, IOException
     {
-        LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
+        try
         {
-            tokenService.verifyToken(loginUser);
-            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
-            authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
-            SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+            LoginUser loginUser = tokenService.getLoginUser(request);
+            if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication()))
+            {
+                tokenService.verifyToken(loginUser);
+                UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
+                authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+                SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+            }
+        }
+        catch (Exception e)
+        {
+            // 回调等匿名接口可能带无关 Authorization;解析失败不得阻断后续请求
         }
         chain.doFilter(request, response);
     }

+ 1 - 1
fs-qw-api-msg/src/main/java/com/fs/framework/service/CompanyLoginService.java

@@ -49,7 +49,7 @@ public class CompanyLoginService
     public String login(String username, String password, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {

+ 2 - 2
fs-qw-api/src/main/java/com/fs/app/service/QwDataCallbackService.java

@@ -225,7 +225,7 @@ public class QwDataCallbackService {
                                 isLocked = lock.tryLock(5, 15, TimeUnit.MINUTES);
                                 if (isLocked) {
                                     // 4. 加锁成功后,再次检查缓存(避免多线程竞争时重复执行业务)
-                                    String qwApiExternal = redisCache.getCacheObject(cacheKey);
+                                    String qwApiExternal = redisCache.getCacheObject(cacheKey, String.class);
                                     if (StringUtil.strIsNullOrEmpty(qwApiExternal)) {
                                         try {
                                             String externalUserID = root.getElementsByTagName("ExternalUserID").item(0).getTextContent();
@@ -638,7 +638,7 @@ public class QwDataCallbackService {
         try {
             long seq = 0L;
             if (redisCache.redisTemplate.hasKey("seq:"+corpId+":")) {
-                seq  = redisCache.getCacheObject("seq:"+corpId+":");
+                seq  = redisCache.getCacheObject("seq:"+corpId+":", Long.class);
 //                System.out.println("這是seq的值:" + seq);
             }
             // SDK 初始化参数

+ 1 - 1
fs-qw-api/src/main/java/com/fs/framework/service/CompanyLoginService.java

@@ -49,7 +49,7 @@ public class CompanyLoginService
     public String login(String username, String password, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {

+ 1 - 1
fs-qw-task/src/main/java/com/fs/app/controller/CommonController.java

@@ -269,7 +269,7 @@ public class CommonController {
     public Long getVideoDuration(Long videoId) {
 
             String redisKey = "h5user:video:duration:" + videoId;
-            Long duration = redisCache.getCacheObject(redisKey);
+            Long duration = redisCache.getCacheObject(redisKey, Long.class);
 
             if (duration == null) {
                 FsUserCourseVideoQVO videoInfo = fsUserCourseVideoService.selectFsUserCourseVideoByVideoIdVO(videoId,null);

+ 1 - 1
fs-qw-task/src/main/java/com/fs/app/taskService/impl/QwExternalContactRatingServiceImpl.java

@@ -177,7 +177,7 @@ public class QwExternalContactRatingServiceImpl implements QwExternalContactRati
 
         Integer countDays = item.getCountDays();
         String cacheKey = "sop-tempId:" + item.getSopTempId();
-        Integer sopTemIdNum = redisCache.getCacheObject(cacheKey);
+        Integer sopTemIdNum = redisCache.getCacheObject(cacheKey, Integer.class);
 
         if (sopTemIdNum == null) {
             sopTemIdNum = qwSopTempDayService.getDayNumByIdLimitOne(item.getSopTempId());

+ 1 - 1
fs-qw-task/src/main/java/com/fs/app/taskService/impl/SyncQwExternalContactServiceImpl.java

@@ -34,7 +34,7 @@ public class SyncQwExternalContactServiceImpl implements SyncQwExternalContactSe
             return R.ok("无需同步");
         }
         Long recordId = 0L;
-        String recordIdStr = redisCache.getCacheObject("syncQwExternalContactUnionId");
+        String recordIdStr = redisCache.getCacheObject("syncQwExternalContactUnionId", String.class);
         if (StringUtils.isNotEmpty(recordIdStr)) {
             try {
                 recordId = Long.parseLong(recordIdStr);

+ 1 - 1
fs-qw-task/src/main/java/com/fs/framework/service/CompanyLoginService.java

@@ -49,7 +49,7 @@ public class CompanyLoginService
     public String login(String username, String password, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {

+ 1 - 1
fs-qwhook-msg/src/main/java/com/fs/app/config/SystemStartSopService.java

@@ -24,7 +24,7 @@ package com.fs.app.config;//package com.fs.app.config;
 //    public void run(String... args) throws Exception {
 //
 //
-//        String sopFlag=redisCache.getCacheObject("sopFlag");
+//        String sopFlag = redisCache.getCacheObject("sopFlag", String.class);
 //        if(StringUtils.isNotEmpty(sopFlag)&&sopFlag.equals("start")){
 //            //有了删了
 //            redisCache.deleteObject("sopFlag");

+ 1 - 1
fs-qwhook/src/main/java/com/fs/app/config/SystemStartSopService.java

@@ -24,7 +24,7 @@ package com.fs.app.config;//package com.fs.app.config;
 //    public void run(String... args) throws Exception {
 //
 //
-//        String sopFlag=redisCache.getCacheObject("sopFlag");
+//        String sopFlag = redisCache.getCacheObject("sopFlag", String.class);
 //        if(StringUtils.isNotEmpty(sopFlag)&&sopFlag.equals("start")){
 //            //有了删了
 //            redisCache.deleteObject("sopFlag");

+ 1 - 1
fs-qwhook/src/main/java/com/fs/app/controller/QwSopController.java

@@ -48,7 +48,7 @@ public class QwSopController {
 //
 //        System.out.println("SOP任务 开始执行");
 //        //webSocketServer.SelectQwSopLogsTVOList();
-//        String sopFlag=redisCache.getCacheObject("sopFlag");
+//        String sopFlag = redisCache.getCacheObject("sopFlag", String.class);
 ////        if(StringUtils.isNotEmpty(sopFlag)&&sopFlag.equals("start")){
 ////            return R.ok("已启动");
 ////        }

+ 1 - 1
fs-qwhook/src/main/java/com/fs/app/websocket/service/WebSocketServer2.java

@@ -211,7 +211,7 @@ package com.fs.app.websocket.service;//package com.fs.app.websocket.service;
 //    public void sendSopMsg() throws InterruptedException {
 //        redisCache.setCacheObject("sopFlag","start");
 //        while (true){
-//            String startSop=redisCache.getCacheObject("sopFlag");
+//            String startSop = redisCache.getCacheObject("sopFlag", String.class);
 //            if(StringUtils.isEmpty(startSop)){
 //                return;
 //            }

+ 5 - 4
fs-service/src/main/java/com/fs/ad/service/impl/AdHtmlClickLogServiceImpl.java

@@ -18,6 +18,7 @@ import com.fs.baidu.domain.BdAccount;
 import com.fs.baidu.mapper.BdAccountMapper;
 import com.fs.baidu.param.ConversionType;
 import com.fs.baidu.vo.ad.*;
+import com.fs.common.core.redis.RedisCache;
 import com.fs.common.core.redis.RedisCacheT;
 import com.fs.common.exception.base.BaseException;
 import com.fs.common.utils.DateUtils;
@@ -44,7 +45,7 @@ import java.util.function.Consumer;
 public class AdHtmlClickLogServiceImpl extends ServiceImpl<AdHtmlClickLogMapper, AdHtmlClickLog> implements IAdHtmlClickLogService
 {
     private final AdHtmlClickLogMapper adHtmlClickLogMapper;
-    private final RedisCacheT<AdHtmlClickLog> redisCache;
+    private final RedisCache redisCache;
     private final RedisCacheT<Integer> redisCacheType;
     private final AdYoukuAccountMapper adYoukuAccountMapper;
     private final BdAccountMapper bdAccountMapper;
@@ -140,7 +141,7 @@ public class AdHtmlClickLogServiceImpl extends ServiceImpl<AdHtmlClickLogMapper,
             }
             log.info("广告投流上传信息:vid:{},上传类型:{}", state, clickType);
             String key = genKey(state, type, clickType);
-            AdHtmlClickLog one = redisCache.getCacheObject(key);
+            AdHtmlClickLog one = redisCache.getCacheObject(key, AdHtmlClickLog.class);
             log.info("redis-key:{};;;data:{}", key, one);
             if(one == null){
                 List<AdHtmlClickLog> list = list(new QueryWrapper<AdHtmlClickLog>().eq("vid", state).eq("type", type));
@@ -230,7 +231,7 @@ public class AdHtmlClickLogServiceImpl extends ServiceImpl<AdHtmlClickLogMapper,
             int type = 2;
             String clickType = vo.getClickType();
             String key = genKey(vo.getVid(), type, clickType);
-            AdHtmlClickLog one = redisCache.getCacheObject(key);
+            AdHtmlClickLog one = redisCache.getCacheObject(key, AdHtmlClickLog.class);
             if(one == null){
                 one = getOne(new QueryWrapper<AdHtmlClickLog>().eq("type", type).eq("vid", vo.getVid()).eq("click_type", clickType));
                 if(one != null){
@@ -331,7 +332,7 @@ public class AdHtmlClickLogServiceImpl extends ServiceImpl<AdHtmlClickLogMapper,
 
     private AdHtmlClickLog getLog(String vid, Integer type, String clickType){
         String key = genKey(vid, type, clickType);
-        AdHtmlClickLog one = redisCache.getCacheObject(key);
+        AdHtmlClickLog one = redisCache.getCacheObject(key, AdHtmlClickLog.class);
         if(one == null){
             one = getOne(new QueryWrapper<AdHtmlClickLog>().eq("type", type).eq("vid", vid).eq("click_type", clickType));
             if(one != null){

+ 1 - 1
fs-service/src/main/java/com/fs/common/service/WechatLoginService.java

@@ -21,7 +21,7 @@ public class WechatLoginService {
      * 获取二维码参数
      */
     public Map<String, String> getQrCode(String ticket,String appId,String secret,String redirectUri) throws UnsupportedEncodingException {
-        String username = redisCache.getCacheObject("login:ticket:" + ticket);
+        String username = redisCache.getCacheObject("login:ticket:" + ticket, String.class);
         if (username == null) throw new RuntimeException("ticket无效或过期");
 
         Map<String, String> data = new HashMap<>();

+ 1 - 1
fs-service/src/main/java/com/fs/company/service/impl/CompanyConfigServiceImpl.java

@@ -133,7 +133,7 @@ public class CompanyConfigServiceImpl implements ICompanyConfigService
 
     @Override
     public String selectConfigByKey(String configKey) {
-        String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
+        String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey), String.class));
         if (StringUtils.isNotEmpty(configValue))
         {
             return configValue;

+ 1 - 1
fs-service/src/main/java/com/fs/company/service/impl/CompanyRechargeServiceImpl.java

@@ -129,7 +129,7 @@ public class CompanyRechargeServiceImpl implements ICompanyRechargeService
             if (lockAcquired) {
                 BigDecimal redisMoney;
                 // 获取当前余额
-                String moneyStr = redisCache.getCacheObject(companyMoneyKey);
+                String moneyStr = redisCache.getCacheObject(companyMoneyKey, String.class);
                 if (StringUtils.isNotEmpty(moneyStr)) {
                     redisMoney = new BigDecimal(moneyStr);
                 } else {

+ 6 - 6
fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -221,7 +221,7 @@ public class CompanyServiceImpl implements ICompanyService
             company.setMiniAppMaster(GET_MINI_APP_STR.apply(0, miniApp));
             company.setMiniAppServer(GET_MINI_APP_STR.apply(1, miniApp));
 
-            String redPackageMoney = redisCache.getCacheObject(FsConstants.COMPANY_MONEY_KEY+company.getCompanyId());
+            String redPackageMoney = redisCache.getCacheObject(FsConstants.COMPANY_MONEY_KEY+company.getCompanyId(), String.class);
             if(redPackageMoney!=null){
                 company.setRedPackageMoney(new BigDecimal(redPackageMoney));
             }
@@ -801,7 +801,7 @@ public class CompanyServiceImpl implements ICompanyService
 
         List<CompanyVO> companyVOList=companyMapper.selectCompanyListVO(company);
         companyVOList.forEach(companyVO -> {
-            String redPackageMoney = redisCache.getCacheObject(FsConstants.COMPANY_MONEY_KEY+companyVO.getCompanyId());
+            String redPackageMoney = redisCache.getCacheObject(FsConstants.COMPANY_MONEY_KEY+companyVO.getCompanyId(), String.class);
             if(redPackageMoney!=null){
                 companyVO.setRedPackageMoney(new BigDecimal(redPackageMoney));
 
@@ -1447,7 +1447,7 @@ public class CompanyServiceImpl implements ICompanyService
                 .ifPresent(list -> list.forEach(company -> {
                     try {
                         transactionTemplate.execute(status -> {
-                            String moneyStr = redisCache.getCacheObject(FsConstants.COMPANY_MONEY_KEY + company.getCompanyId());
+                            String moneyStr = redisCache.getCacheObject(FsConstants.COMPANY_MONEY_KEY + company.getCompanyId(), String.class);
                             if (StringUtils.isNotEmpty(moneyStr)) {
                                 BigDecimal redisMoney = new BigDecimal(moneyStr);
                                 BigDecimal dbMoney = company.getRedPackageMoney();
@@ -1503,7 +1503,7 @@ public class CompanyServiceImpl implements ICompanyService
                 lockAcquired = true;
                 BigDecimal originalMoney;
                 // 获取当前余额
-                String moneyStr = redisCache.getCacheObject(companyMoneyKey);
+                String moneyStr = redisCache.getCacheObject(companyMoneyKey, String.class);
                 if (StringUtils.isNotEmpty(moneyStr)) {
                     originalMoney = new BigDecimal(moneyStr);
                 }else {
@@ -1594,7 +1594,7 @@ public class CompanyServiceImpl implements ICompanyService
         Optional.ofNullable(companyList).ifPresent(list -> list.forEach(company -> {
             transactionTemplate.execute(status -> {
                 String time=DateUtils.getTime();
-                String moneyStr = redisCache.getCacheObject(FsConstants.COMPANY_MONEY_KEY + company.getCompanyId());
+                String moneyStr = redisCache.getCacheObject(FsConstants.COMPANY_MONEY_KEY + company.getCompanyId(), String.class);
                 if (StringUtils.isNotEmpty(moneyStr)) {
                     // 存到缓存中,有效期25小时
                     redisCache.setCacheObject(FsConstants.COMPANY_MONEY_DATE_KEY + company.getCompanyId()+":"+DateUtils.getDate(), moneyStr, 25, TimeUnit.HOURS);
@@ -1693,7 +1693,7 @@ public class CompanyServiceImpl implements ICompanyService
                 if (lockAcquired) {
                     BigDecimal redisMoney;
                     // 获取当前余额
-                    String moneyStr = redisCache.getCacheObject(companyMoneyKey);
+                    String moneyStr = redisCache.getCacheObject(companyMoneyKey, String.class);
                     if (StringUtils.isNotEmpty(moneyStr)) {
                         redisMoney = new BigDecimal(moneyStr);
                     }else {

+ 1 - 1
fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -144,7 +144,7 @@ public class CompanyUserServiceImpl implements ICompanyUserService
     @Override
     public CompanyUser selectCompanyUserByIdForRedis(Long userId) {
 
-        String key =(String)redisCache.getCacheObject("companyUserInfo:"+userId);
+        String key = redisCache.getCacheObject("companyUserInfo:"+userId, String.class);
         if (!StringUtil.strIsNullOrEmpty(key)){
             return JSON.parseObject(key, CompanyUser.class);
         }

+ 2 - 2
fs-service/src/main/java/com/fs/course/service/impl/BalanceRollbackErrorServiceImpl.java

@@ -100,7 +100,7 @@ public class BalanceRollbackErrorServiceImpl extends ServiceImpl<BalanceRollback
         for (Company company : companyList) {
             String companyMoneyKey = FsConstants.COMPANY_MONEY_KEY + company.getCompanyId();
             // 判断缓存为空初始化
-            String moneyStr = redisCache.getCacheObject(companyMoneyKey);
+            String moneyStr = redisCache.getCacheObject(companyMoneyKey, String.class);
             if (StringUtils.isEmpty(moneyStr)) {
                 // 初始化余额
                 if(company.getRedPackageMoney() != null){
@@ -128,7 +128,7 @@ public class BalanceRollbackErrorServiceImpl extends ServiceImpl<BalanceRollback
                 lockAcquired=true;
                 BigDecimal originalMoney;
                 // 获取当前余额
-                String moneyStr = redisCache.getCacheObject(companyMoneyKey);
+                String moneyStr = redisCache.getCacheObject(companyMoneyKey, String.class);
                 if (StringUtils.isNotEmpty(moneyStr)) {
                     originalMoney = new BigDecimal(moneyStr);
                 }else {

+ 6 - 6
fs-service/src/main/java/com/fs/course/service/impl/FsCourseRewardRoundServiceImpl.java

@@ -173,8 +173,8 @@ public class FsCourseRewardRoundServiceImpl extends ServiceImpl<FsCourseRewardRo
         }
         String redisKey = "h5user:watch:duration:" + fsCourseWatchLog.getQwUserId()+ ":" + fsCourseWatchLog.getQwExternalContactId() + ":" + fsCourseWatchLog.getVideoId();
         String videoRedisKey = "h5user:video:duration:" + fsCourseWatchLog.getVideoId();
-        String redisSecondStr = redisCache.getCacheObject(redisKey);
-        Long videoRedisKeyStr = redisCache.getCacheObject(videoRedisKey);
+        String redisSecondStr = redisCache.getCacheObject(redisKey, String.class);
+        Long videoRedisKeyStr = redisCache.getCacheObject(videoRedisKey, Long.class);
 //        String redisSecondStr = "304";
 //        String videoRedisKeyStr = "1000";
         if (ObjectUtil.isEmpty(redisSecondStr) || ObjectUtil.isEmpty(videoRedisKeyStr)) {
@@ -487,8 +487,8 @@ public class FsCourseRewardRoundServiceImpl extends ServiceImpl<FsCourseRewardRo
         }
         String redisKey = "h5user:watch:duration:" + fsCourseWatchLog.getQwUserId()+ ":" + fsCourseWatchLog.getQwExternalContactId() + ":" + fsCourseWatchLog.getVideoId();
         String videoRedisKey = "h5user:video:duration:" + fsCourseWatchLog.getVideoId();
-        String redisSecondStr = redisCache.getCacheObject(redisKey);
-        Long videoRedisKeyStr = redisCache.getCacheObject(videoRedisKey);
+        String redisSecondStr = redisCache.getCacheObject(redisKey, String.class);
+        Long videoRedisKeyStr = redisCache.getCacheObject(videoRedisKey, Long.class);
 //        String redisSecondStr = "304";
 //        String videoRedisKeyStr = "1000";
         if (ObjectUtil.isEmpty(redisSecondStr) || ObjectUtil.isEmpty(videoRedisKeyStr)) {
@@ -595,7 +595,7 @@ public class FsCourseRewardRoundServiceImpl extends ServiceImpl<FsCourseRewardRo
         String end = null;
 
         // 获取Redis缓存标识
-        Long kcdate = redisCache.getCacheObject("syncUpdatedCompanyAmount");
+        Long kcdate = redisCache.getCacheObject("syncUpdatedCompanyAmount", Long.class);
 
         // 定义日期格式化器
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -661,7 +661,7 @@ public class FsCourseRewardRoundServiceImpl extends ServiceImpl<FsCourseRewardRo
         String end = null;
 
         // 获取Redis缓存标识
-        Long kcdate = redisCache.getCacheObject("syncUpdatedCompanyAmountForLuckyBag");
+        Long kcdate = redisCache.getCacheObject("syncUpdatedCompanyAmountForLuckyBag", Long.class);
 
         // 定义日期格式化器
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

+ 12 - 12
fs-service/src/main/java/com/fs/course/service/impl/FsCourseWatchLogServiceImpl.java

@@ -391,7 +391,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
             Long userId = Long.parseLong(parts[3]);
             Long videoId = Long.parseLong(parts[4]);
             Long companyUserId = Long.parseLong(parts[5]);
-            String durationStr = redisCache.getCacheObject(key);
+            String durationStr = redisCache.getCacheObject(key, String.class);
             if(durationStr==null){
                 log.error("key中数据为null:{}",key);
                 continue;  // 如果 Redis 中没有记录,跳过
@@ -435,9 +435,9 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
         String videoRedisKey = "h5wxuser:video:duration:" + videoId;
         Long videoDuration=0L;
         try {
-            videoDuration = redisCache.getCacheObject(videoRedisKey);
+            videoDuration = redisCache.getCacheObject(videoRedisKey, Long.class);
         }catch (Exception e){
-            String string = redisCache.getCacheObject(videoRedisKey);
+            String string = redisCache.getCacheObject(videoRedisKey, String.class);
             videoDuration=Long.parseLong(string);
             log.error("key中id为S:{}", videoDuration);
         }
@@ -464,7 +464,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
             Long videoId = Long.parseLong(parts[4]);
             Long companyUserId = Long.parseLong(parts[5]);
             // 获取最后心跳时间
-            String lastHeartbeatStr = redisCache.getCacheObject(key);
+            String lastHeartbeatStr = redisCache.getCacheObject(key, String.class);
             if (lastHeartbeatStr == null) {
                 continue; // 如果 Redis 中没有记录,跳过
             }
@@ -519,7 +519,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
                 log.error("key中id为null:{}", key);
                 continue;
             }
-            String durationStr = redisCache.getCacheObject(key);
+            String durationStr = redisCache.getCacheObject(key, String.class);
             if (com.fs.common.utils.StringUtils.isEmpty(durationStr)) {
                 redisCache.deleteObject(key);
                 log.error("key中数据为null:{}", key);
@@ -835,7 +835,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
                 log.error("key中id为null:{}", key);
                 continue;
             }
-            String durationStr = redisCache.getCacheObject(key);
+            String durationStr = redisCache.getCacheObject(key, String.class);
             if (com.fs.common.utils.StringUtils.isEmpty(durationStr)) {
                 redisCache.deleteObject(key);
                 log.error("key中数据为null:{}", key);
@@ -920,7 +920,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
                 continue;
             }
             // 获取最后心跳时间
-            String lastHeartbeatStr = redisCache.getCacheObject(key);
+            String lastHeartbeatStr = redisCache.getCacheObject(key, String.class);
             if (com.fs.common.utils.StringUtils.isEmpty(lastHeartbeatStr)) {
                 redisCache.deleteObject(key);
                 continue; // 如果 Redis 中没有记录,跳过
@@ -1135,9 +1135,9 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
         String videoRedisKey = "h5user:video:duration:" + videoId;
         Long videoDuration=0L;
         try {
-            videoDuration = redisCache.getCacheObject(videoRedisKey);
+            videoDuration = redisCache.getCacheObject(videoRedisKey, Long.class);
         }catch (Exception e){
-            String string = redisCache.getCacheObject(videoRedisKey);
+            String string = redisCache.getCacheObject(videoRedisKey, String.class);
             videoDuration=Long.parseLong(string);
             log.error("key中id为S:{}", videoDuration);
         }
@@ -1154,7 +1154,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
     public Long getVideoDurationIsOpen(Long videoId){
         //将视频时长也存到redis
         String videoRedisKey = "h5OpenUser:video:duration:" + videoId;
-        Long videoDuration = redisCache.getCacheObject(videoRedisKey);
+        Long videoDuration = redisCache.getCacheObject(videoRedisKey, Long.class);
         if (videoDuration==null){
             FsUserCourseVideo video = courseVideoMapper.selectFsUserCourseVideoByVideoId(videoId);
             videoDuration=video.getDuration();
@@ -1512,7 +1512,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
                 log.error("飞书key中id为null:{}", key);
                 continue;
             }
-            Long duration = redisCache.getCacheObject(key);
+            Long duration = redisCache.getCacheObject(key, Long.class);
             if (duration == null) {
                 log.error("飞书key中数据为null:{}", key);
                 continue;  // 如果 Redis 中没有记录,跳过
@@ -1597,7 +1597,7 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
                 continue;
             }
             // 获取最后心跳时间
-            String lastHeartbeatStr = redisCache.getCacheObject(key);
+            String lastHeartbeatStr = redisCache.getCacheObject(key, String.class);
             if (StringUtils.isEmpty(lastHeartbeatStr)) {
                 redisCache.deleteObject(key);
                 continue; // 如果 Redis 中没有记录,跳过

+ 1 - 1
fs-service/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodServiceImpl.java

@@ -269,7 +269,7 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
         if (ObjectUtil.isNotEmpty(param.getPeriodId())){
             redisKey=redisKey+":"+param.getPeriodId();
         }
-        FsCourseStaticsCountVO durationStr = redisCache.getCacheObject(redisKey);
+        FsCourseStaticsCountVO durationStr = redisCache.getCacheObject(redisKey, FsCourseStaticsCountVO.class);
         if (ObjectUtil.isNotEmpty(durationStr)){
             return durationStr;
         }

+ 17 - 17
fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -503,7 +503,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         String redisKey = "h5user:watch:duration:" + param.getQwUserId() + ":" + param.getQwExternalId() + ":" + param.getVideoId();
 //        log.info("看课redis-key:{}", redisKey);
         try {
-            String durationStr = redisCache.getCacheObject(redisKey);
+            String durationStr = redisCache.getCacheObject(redisKey, String.class);
             Long duration = durationStr != null ? Long.parseLong(durationStr) : 0L;
 
             // 更新Redis中的观看时长
@@ -1598,7 +1598,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
     private boolean isWithin10Minutes(Long userId) {
         String key = "h5user:redPacket:" + userId;
 
-        String storedTimeStr = redisCache.getCacheObject(key);
+        String storedTimeStr = redisCache.getCacheObject(key, String.class);
         if (storedTimeStr == null) {
             return false;
         }
@@ -1878,7 +1878,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                     lockAcquired = true;
                     BigDecimal originalMoney;
                     // 获取当前余额
-                    String moneyStr = redisCache.getCacheObject(companyMoneyKey);
+                    String moneyStr = redisCache.getCacheObject(companyMoneyKey, String.class);
                     if (StringUtils.isNotEmpty(moneyStr)) {
                         originalMoney = new BigDecimal(moneyStr);
                     } else {
@@ -2130,7 +2130,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                         lockAcquired = true;
                         BigDecimal originalMoney;
                         // 获取当前余额
-                        String moneyStr = redisCache.getCacheObject(companyMoneyKey);
+                        String moneyStr = redisCache.getCacheObject(companyMoneyKey, String.class);
                         if (StringUtils.isNotEmpty(moneyStr)) {
                             originalMoney = new BigDecimal(moneyStr);
                         } else {
@@ -2318,7 +2318,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
             if (lock2.tryLock(3, 10, TimeUnit.SECONDS)) {
                 lockAcquired = true;
                 // 获取当前余额
-                String currentMoneyStr = redisCache.getCacheObject(companyMoneyKey);
+                String currentMoneyStr = redisCache.getCacheObject(companyMoneyKey, String.class);
                 if (StringUtils.isEmpty(currentMoneyStr)) {
                     throw new RuntimeException("回滚余额异常");
                 }
@@ -2930,7 +2930,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         }
         // 从Redis中获取用户目前的观看时长
         String redisKey = "h5wxuser:watch:duration:" + param.getFsUserId() + ":" + param.getVideoId() + ":" + param.getCompanyUserId();
-        String durationCurrent = redisCache.getCacheObject(redisKey);
+        String durationCurrent = redisCache.getCacheObject(redisKey, String.class);
 
         //3、获取看课记录
         FsCourseWatchLog watchLog = courseWatchLogMapper.getWatchLogByFsUser(param.getVideoId(), param.getFsUserId(), param.getCompanyUserId());
@@ -2965,9 +2965,9 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
 
         Long videoDuration = 0L;
         try {
-            videoDuration = redisCache.getCacheObject(videoRedisKey);
+            videoDuration = redisCache.getCacheObject(videoRedisKey, Long.class);
         } catch (Exception e) {
-            String string = redisCache.getCacheObject(videoRedisKey);
+            String string = redisCache.getCacheObject(videoRedisKey, String.class);
             videoDuration = Long.parseLong(string);
             log.error("key中id为String:{}", videoDuration);
         }
@@ -3150,7 +3150,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         String redisKey = "h5wxuser:watch:duration:" + param.getUserId() + ":" + param.getVideoId() + ":" + param.getCompanyUserId();
 //        log.info("看课redis缓存key:{}", redisKey);
         try {
-            String durationStr = redisCache.getCacheObject(redisKey);
+            String durationStr = redisCache.getCacheObject(redisKey, String.class);
 //            log.info("看课记录:{}", durationStr);
             long duration = durationStr != null ? Long.parseLong(durationStr) : 0L;
 
@@ -3614,7 +3614,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
      */
     private Long getVideoDuration(Long videoId) {
         String redisKey = "h5user:video:duration:" + videoId;
-        Long duration = redisCache.getCacheObject(redisKey);
+        Long duration = redisCache.getCacheObject(redisKey, Long.class);
 
         if (duration == null) {
             FsUserCourseVideoQVO videoInfo = selectFsUserCourseVideoByVideoIdVO(videoId, null);
@@ -3638,9 +3638,9 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         String videoRedisKey = "h5wxuser:video:duration:" + videoId;
         Long videoDuration = 0L;
         try {
-            videoDuration = redisCache.getCacheObject(videoRedisKey);
+            videoDuration = redisCache.getCacheObject(videoRedisKey, Long.class);
         } catch (Exception e) {
-            String string = redisCache.getCacheObject(videoRedisKey);
+            String string = redisCache.getCacheObject(videoRedisKey, String.class);
             videoDuration = Long.parseLong(string);
             log.error("key中id为S:{}", videoDuration);
         }
@@ -3810,7 +3810,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         String redisKey = "h5OpenUser:watch:duration:" + param.getUserId() + ":" + param.getVideoId();
         //        log.info("看课redis-key:{}", redisKey);
         try {
-            String durationStr = redisCache.getCacheObject(redisKey);
+            String durationStr = redisCache.getCacheObject(redisKey, String.class);
             Long duration = durationStr != null ? Long.parseLong(durationStr) : 0L;
 
             // 更新Redis中的观看时长
@@ -4866,7 +4866,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
             throw new CustomException("请勿重复领取!");
         }
 
-        String prizeStr = redisCache.getCacheObject(FsConstants.REDIS_GRAND_GIFT + userId);
+        String prizeStr = redisCache.getCacheObject(FsConstants.REDIS_GRAND_GIFT + userId, String.class);
         if (StringUtils.isBlank(prizeStr)) {
             throw new CustomException("连接超时,请刷新后重试");
         }
@@ -5370,7 +5370,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
                         lockAcquired = true;
                         BigDecimal originalMoney;
                         // 获取当前余额
-                        String moneyStr = redisCache.getCacheObject(companyMoneyKey);
+                        String moneyStr = redisCache.getCacheObject(companyMoneyKey, String.class);
                         if (StringUtils.isNotEmpty(moneyStr)) {
                             originalMoney = new BigDecimal(moneyStr);
                         } else {
@@ -5785,7 +5785,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
 
         // 从Redis中获取用户目前的观看时长
         String redisKey = CourseConstant.getFeiShuWatchDurationKey(identifier, videoId, companyUserId, periodId);
-        Long durationCurrent = redisCache.getCacheObject(redisKey);
+        Long durationCurrent = redisCache.getCacheObject(redisKey, Long.class);
         if (durationCurrent != null) {
             duration = durationCurrent;
         } else {
@@ -5887,7 +5887,7 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
 
         // 获取用户观看时长
         String redisKey = CourseConstant.getFeiShuWatchDurationKey(identifier, videoId, companyUserId, periodId);
-        Long userLookDuration = redisCache.getCacheObject(redisKey);
+        Long userLookDuration = redisCache.getCacheObject(redisKey, Long.class);
 
         // 更新观看时长
         if (duration > (userLookDuration != null ? userLookDuration : 0) + 90) {

+ 2 - 2
fs-service/src/main/java/com/fs/erp/dto/sdk/HzOMS/api/HzOMSClient.java

@@ -96,13 +96,13 @@ public class HzOMSClient {
      */
     public String getToken() {
         try {
-            String token = redisCache.getCacheObject(HZOMS_TOKEN_KEY);
+            String token = redisCache.getCacheObject(HZOMS_TOKEN_KEY, String.class);
             if (StringUtils.isNotBlank(token)) {
                 return token;
             } else {
                 try {
                     synchronized (HZOMS_TOKEN_KEY) {
-                        String tokenSec = redisCache.getCacheObject(HZOMS_TOKEN_KEY);
+                        String tokenSec = redisCache.getCacheObject(HZOMS_TOKEN_KEY, String.class);
                         if (StringUtils.isNotBlank(tokenSec)) {
                             return tokenSec;
                         }

+ 10 - 10
fs-service/src/main/java/com/fs/fastGpt/service/impl/AiHookServiceImpl.java

@@ -341,7 +341,7 @@ public class AiHookServiceImpl implements AiHookService {
                                     } catch (InterruptedException e) {
 
                                     }
-                                    Integer replyH = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+                                    Integer replyH = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
                                     //用户正在发送消息 后面的消息不发了
                                     if (replyH!=null&&replyH!=0){
                                         return R.ok();
@@ -552,14 +552,14 @@ public class AiHookServiceImpl implements AiHookService {
                 return R.ok();
             }
             //获取是用户是否发送消息
-            Integer reply = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+            Integer reply = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
             Integer replyI=1;
             //用户正在发送消息 不发
             if (reply!=null&&reply!=0){
                 //更新用户发送消息次数
                 redisCache.setCacheObject("reply:" + fastGptChatSession.getSessionId(),reply+1,5, TimeUnit.MINUTES);
                 //获取用户之前发送的消息
-                String msg = redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId());
+                String msg = redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId(), String.class);
                 if (!msg.isEmpty()){
                     //更新用户发送消息内容
                     redisCache.setCacheObject("msg:" + fastGptChatSession.getSessionId(),msg+","+contentEmj,5,TimeUnit.MINUTES);
@@ -658,7 +658,7 @@ public class AiHookServiceImpl implements AiHookService {
                         } catch (InterruptedException e) {
 
                         }
-                        Integer replyH = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+                        Integer replyH = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
                         //用户正在发送消息 后面的消息不发了
                         if (replyH!=null&&replyH!=0){
                             return R.ok();
@@ -687,7 +687,7 @@ public class AiHookServiceImpl implements AiHookService {
      * @return
      */
     private @Nullable R userIsReply(Long sender, String uid, QwUser user) {
-        Long qwExternalContactId = redisCache.getCacheObject(AI_REPLY + sender);
+        Long qwExternalContactId = redisCache.getCacheObject(AI_REPLY + sender, Long.class);
         if(qwExternalContactId == null){
             WxWorkVid2UserIdDTO wxWorkVid2UserIdDTO = new WxWorkVid2UserIdDTO();
             wxWorkVid2UserIdDTO.setUser_id(Arrays.asList(sender));
@@ -705,7 +705,7 @@ public class AiHookServiceImpl implements AiHookService {
                 log.error("没有外部联系人" + "user:" + user);
                 return R.ok();
             }
-            List<String> oldCache = redisCache.getCacheObject(AI_REPLY_TAG + user.getCorpId());
+            List<String> oldCache = redisCache.getCacheObjectList(AI_REPLY_TAG + user.getCorpId(), String.class);
             if(oldCache != null && !oldCache.isEmpty()){
                 QwExternalContact qwExternalContact = new QwExternalContact();
                 if(qwExternalContacts.getTagIds() != null && !qwExternalContacts.getTagIds().isEmpty() && !"[]".equals(qwExternalContacts.getTagIds())){
@@ -737,7 +737,7 @@ public class AiHookServiceImpl implements AiHookService {
      */
     private void cleanNewUserDialogue(QwUser user, QwExternalContact qwExternalContacts) {
         String redisKey = "qwNewChat:" + user.getQwUserId() + ":" + user.getCorpId() + ":" + qwExternalContacts.getExternalUserId();
-        String key  = (String) redisCache.getCacheObject(redisKey);
+        String key  = redisCache.getCacheObject(redisKey, String.class);
         if(!StringUtil.strIsNullOrEmpty(key)){
             try {
                 QwSopLogs qwSopLogs = new QwSopLogs();
@@ -1525,7 +1525,7 @@ public class AiHookServiceImpl implements AiHookService {
             e.printStackTrace();
         }
         //获取现在的次数
-        Integer reply = (Integer)redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+        Integer reply = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
         if (reply!=i){
             //次数变动 重新等待5秒
             R r = sendAiMsg(reply, fastGptChatSession, role, user, qwExternalContactsId, appKey, qwExternalContacts,sender);
@@ -1544,7 +1544,7 @@ public class AiHookServiceImpl implements AiHookService {
             param.setMessages(messageList);
             //添加看客记录
             addCourseWatchLog(qwExternalContactsId);
-            String msgC = (String)redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId());
+            String msgC = redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId(), String.class);
             //添加关键词
             addPromptWord(messageList,msgC,qwExternalContactsId,role.getReminderWords(), role.getContactInfo(),fastGptChatSession.getSessionId());
             R r = chatService.initiatingTakeChat(param, aiHostProper.getAiApi(), appKey);
@@ -1554,7 +1554,7 @@ public class AiHookServiceImpl implements AiHookService {
                 EventLogUtils.createEventTokenLog("发起对话",user,sender,data);
             }
 
-            Integer reply2 = (Integer)redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+            Integer reply2 = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
             //次数变动 重新等待5秒
             if (reply2!=i){
                 System.out.println("等待");

+ 5 - 5
fs-service/src/main/java/com/fs/fastGpt/service/impl/AiNewServiceImpl.java

@@ -249,14 +249,14 @@ public class AiNewServiceImpl implements AiNewService {
                 contentEmj ="用户发送表情:"+qwContent;
             }
             //获取是用户是否发送消息
-            Integer reply = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+            Integer reply = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
             Integer replyI=1;
             //用户正在发送消息 不发
             if (reply!=null&&reply!=0){
                 //更新用户发送消息次数
                 redisCache.setCacheObject("reply:" + fastGptChatSession.getSessionId(),reply+1,5, TimeUnit.MINUTES);
                 //获取用户之前发送的消息
-                String msg = redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId());
+                String msg = redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId(), String.class);
                 if (!msg.isEmpty()){
                     //更新用户发送消息内容
                     redisCache.setCacheObject("msg:" + fastGptChatSession.getSessionId(),msg+","+contentEmj,5,TimeUnit.MINUTES);
@@ -606,7 +606,7 @@ public class AiNewServiceImpl implements AiNewService {
             e.printStackTrace();
         }
         //获取现在的次数
-        Integer reply = (Integer)redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+        Integer reply = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
         if (reply!=i){
             //次数变动 重新等待5秒
             return   sendAiMsg(reply,fastGptChatSession,role,user,qwExternalContactsId,appKey,qwExternalContacts);
@@ -624,11 +624,11 @@ public class AiNewServiceImpl implements AiNewService {
             param.setMessages(messageList);
             //添加看客记录
             addCourseWatchLog(qwExternalContactsId);
-            String msgC = (String)redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId());
+            String msgC = redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId(), String.class);
             //添加关键词
             addPromptWord(messageList,msgC,qwExternalContactsId,role.getReminderWords(), role.getContactInfo(),fastGptChatSession.getSessionId());
             R r = chatService.initiatingTakeChat(param, aiHostProper.getAiApi(),appKey);
-            Integer reply2 = (Integer)redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+            Integer reply2 = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
             //次数变动 重新等待5秒
             if (reply2!=i){
                 System.out.println("等待");

+ 5 - 5
fs-service/src/main/java/com/fs/fastGpt/service/impl/AiServiceImpl.java

@@ -256,14 +256,14 @@ public class AiServiceImpl implements AiService {
                     contentEmj ="用户发送表情:"+msgVo.getContent();
                 }
                 //获取是用户是否发送消息
-                Integer reply = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+                Integer reply = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
                 Integer replyI=1;
                 //用户正在发送消息 不发
                 if (reply!=null&&reply!=0){
                     //更新用户发送消息次数
                     redisCache.setCacheObject("reply:" + fastGptChatSession.getSessionId(),reply+1,5, TimeUnit.MINUTES);
                     //获取用户之前发送的消息
-                    String msg = redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId());
+                    String msg = redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId(), String.class);
                     if (!msg.isEmpty()){
                         //更新用户发送消息内容
                         redisCache.setCacheObject("msg:" + fastGptChatSession.getSessionId(),msg+","+contentEmj,5,TimeUnit.MINUTES);
@@ -584,7 +584,7 @@ public class AiServiceImpl implements AiService {
             e.printStackTrace();
         }
         //获取现在的次数
-        Integer reply = (Integer)redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+        Integer reply = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
         if (reply!=i){
             //次数变动 重新等待5秒
             return   sendAiMsg(reply,fastGptChatSession,role,user,qwExternalContactsId,appKey,qwExternalContacts);
@@ -602,11 +602,11 @@ public class AiServiceImpl implements AiService {
             param.setMessages(messageList);
             //添加看客记录
             addCourseWatchLog(qwExternalContactsId);
-            String msgC = (String)redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId());
+            String msgC = redisCache.getCacheObject("msg:" + fastGptChatSession.getSessionId(), String.class);
             //添加关键词
             addPromptWord(messageList,msgC,qwExternalContactsId,role.getReminderWords(), role.getContactInfo(),fastGptChatSession.getSessionId());
             R r = chatService.initiatingTakeChat(param, aiHostProper.getAiApi(),appKey);
-            Integer reply2 = (Integer)redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId());
+            Integer reply2 = redisCache.getCacheObject("reply:" + fastGptChatSession.getSessionId(), Integer.class);
             //次数变动 重新等待5秒
             if (reply2!=i){
                 System.out.println("等待");

+ 2 - 2
fs-service/src/main/java/com/fs/fastGpt/service/impl/FastgptExtUserTagServiceImpl.java

@@ -94,7 +94,7 @@ public class FastgptExtUserTagServiceImpl extends ServiceImpl<FastgptExtUserTagM
         if(i > 0){
             if(fastgptExtUserTags != null && !fastgptExtUserTags.isEmpty()){
                 String corpId = fastgptExtUserTags.get(0).getCorpId();
-                List<String> oldCache = redisCache.getCacheObject(AI_REPLY_TAG + corpId);
+                List<String> oldCache = redisCache.getCacheObjectList(AI_REPLY_TAG + corpId, String.class);
                 for (FastgptExtUserTag fastgptExtUserTag : fastgptExtUserTags) {
                     if(fastgptExtUserTag != null && fastgptExtUserTag.getTagId() != null){
                         if(oldCache != null && !oldCache.isEmpty()){
@@ -130,7 +130,7 @@ public class FastgptExtUserTagServiceImpl extends ServiceImpl<FastgptExtUserTagM
         }
         if(i > 0){
             if(fastgptExtUserTag != null && fastgptExtUserTag.getTagIds() != null){
-                List<String> oldCache = redisCache.getCacheObject(AI_REPLY_TAG + fastgptExtUserTag.getCorpId());
+                List<String> oldCache = redisCache.getCacheObjectList(AI_REPLY_TAG + fastgptExtUserTag.getCorpId(), String.class);
                 if(oldCache != null && !oldCache.isEmpty()){
                     oldCache.addAll(fastgptExtUserTag.getTagIds());
                     redisCache.setCacheObject(AI_REPLY_TAG + fastgptExtUserTag.getCorpId(),oldCache);

+ 1 - 1
fs-service/src/main/java/com/fs/feishu/service/impl/FsFeishuConfigServiceImpl.java

@@ -58,7 +58,7 @@ public class FsFeishuConfigServiceImpl extends ServiceImpl<FsFeishuConfigMapper,
     @Override
     @SuppressWarnings("unchecked")
     public FsFeishuConfig getRandomNormalConfig() {
-        List<FsFeishuConfig> list = redisCache.getCacheObject(CourseConstant.FEISHU_NORMAL_CONFIG_LIST);
+        List<FsFeishuConfig> list = redisCache.getCacheObjectList(CourseConstant.FEISHU_NORMAL_CONFIG_LIST, FsFeishuConfig.class);
         if (list == null) {
             list = baseMapper.selectNormalList();
             if (list == null) {

+ 1 - 1
fs-service/src/main/java/com/fs/his/service/impl/FsInquiryOrderServiceImpl.java

@@ -575,7 +575,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         if(user.getStatus()!=1){
             return R.error("非法用户操作");
         }
-        String orderKey= redisCache.getCacheObject("orderKey:"+param.getOrderKey());
+        String orderKey= redisCache.getCacheObject("orderKey:"+param.getOrderKey(), String.class);
         if (StringUtils.isEmpty(orderKey)) {
             return R.error("订单已过期");
         }

+ 9 - 9
fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -453,11 +453,11 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
 //                    throw new CustomException("代收金额应大于0");
 //                }
                 if (("益善缘".equals(cloudHostProper.getCompanyName()))){
-                    String key = redisCache.getCacheObject("createPackageOrderKey:" + param.getCreatePackageOrderKey());
+                    String key = redisCache.getCacheObject("createPackageOrderKey:" + param.getCreatePackageOrderKey(), String.class);
                     if (StringUtils.isEmpty(key)) {
                         throw new CustomException("订单已过期", 501);
                     }
-                    payMoney = redisCache.getCacheObject("createPackageOrderAmount:" + param.getCreatePackageOrderKey());
+                    payMoney = redisCache.getCacheObject("createPackageOrderAmount:" + param.getCreatePackageOrderKey(), BigDecimal.class);
                     if (payMoney == null) {
                         payMoney = new BigDecimal(100);
                     }
@@ -1950,11 +1950,11 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                 throw new CustomException("物流代收金额应大于等于100");
             }
         }
-        String key = redisCache.getCacheObject("createPackageOrderKey:" + createPackageOrderKey);
+        String key = redisCache.getCacheObject("createPackageOrderKey:" + createPackageOrderKey, String.class);
         if (StringUtils.isEmpty(key)) {
             throw new CustomException("订单已过期", 501);
         }
-        FsPackage fsPackage = redisCache.getCacheObject("package:"+createPackageOrderKey);
+        FsPackage fsPackage = redisCache.getCacheObject("package:"+createPackageOrderKey, FsPackage.class);
         BigDecimal totalMoney = BigDecimal.ZERO;
         if (fsPackage != null && fsPackage.getTotalPrice() != null) {
             totalMoney = fsPackage.getTotalPrice();
@@ -1971,15 +1971,15 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
 
     @Override
     public R getPackageOrder(String createPackageOrderKey) {
-        String key = redisCache.getCacheObject("createPackageOrderKey:" + createPackageOrderKey);
+        String key = redisCache.getCacheObject("createPackageOrderKey:" + createPackageOrderKey, String.class);
         if (StringUtils.isEmpty(key)) {
             throw new CustomException("套餐包订单已过期", 501);
         }
-        FsPackage fsPackage = redisCache.getCacheObject("package:" + createPackageOrderKey);
-        BigDecimal money = redisCache.getCacheObject("createPackageOrderMoney:" + createPackageOrderKey);
-        Integer payType = redisCache.getCacheObject("createPackageOrderPayType:" + createPackageOrderKey);
+        FsPackage fsPackage = redisCache.getCacheObject("package:" + createPackageOrderKey, FsPackage.class);
+        BigDecimal money = redisCache.getCacheObject("createPackageOrderMoney:" + createPackageOrderKey, BigDecimal.class);
+        Integer payType = redisCache.getCacheObject("createPackageOrderPayType:" + createPackageOrderKey, Integer.class);
         if (payType != null && payType == 2) {
-            money = redisCache.getCacheObject("createPackageOrderAmount:" + createPackageOrderKey);
+            money = redisCache.getCacheObject("createPackageOrderAmount:" + createPackageOrderKey, BigDecimal.class);
         }
         return R.ok().put("package", fsPackage).put("money", money).put("payType", payType);
     }

+ 2 - 2
fs-service/src/main/java/com/fs/his/service/impl/FsRedPacketServiceImpl.java

@@ -31,8 +31,8 @@ public class FsRedPacketServiceImpl implements IFsRedPacketService
      */
     @Override
     public FsRedPacket getInfo(Long companyId) {
-       String yesterdayBalance =redisCache.getCacheObject(FsConstants.COMPANY_MONEY_DATE_KEY+companyId+":"+ DateUtils.getDate());
-       String balance = redisCache.getCacheObject(FsConstants.COMPANY_MONEY_KEY+companyId);
+       String yesterdayBalance =redisCache.getCacheObject(FsConstants.COMPANY_MONEY_DATE_KEY+companyId+":"+ DateUtils.getDate(), String.class);
+       String balance = redisCache.getCacheObject(FsConstants.COMPANY_MONEY_KEY+companyId, String.class);
        FsRedPacket fsRedPacket = new FsRedPacket();
        if(balance!=null){
            fsRedPacket.setRedBalance(new BigDecimal( balance));

+ 2 - 2
fs-service/src/main/java/com/fs/his/utils/IdCardUtil.java

@@ -176,7 +176,7 @@ public class IdCardUtil {
 
         // ========== 0 失败次数封禁(必须前置) ==========
         String failKey = "ID_VERIFY:FAIL:" + userId;
-        Integer failCountCache = redisCache.getCacheObject(failKey);
+        Integer failCountCache = redisCache.getCacheObject(failKey, Integer.class);
         if (failCountCache != null && failCountCache >= FAIL_LIMIT) {
             throw new RuntimeException("身份证校验失败次数过多,请10分钟后再试");
         }
@@ -205,7 +205,7 @@ public class IdCardUtil {
 
         // ========== 3. 校验结果缓存 ==========
         String resultKey = "ID_VERIFY:RESULT:" + patientName + ":" + idCard;
-        Boolean cacheResult = redisCache.getCacheObject(resultKey);
+        Boolean cacheResult = redisCache.getCacheObject(resultKey, Boolean.class);
         if (cacheResult != null) {
             if (!cacheResult) {
                 throw new RuntimeException("身份证校验错误");

+ 34 - 34
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -736,18 +736,18 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     @Override
     public FsStoreOrderComputeDTO computedOrder(long uid, FsStoreOrderComputedParam param) {
         logger.info("computedOrder param:{},uid:{}", param,uid);
-        String cartIds = redisCache.getCacheObject("orderKey:" + param.getOrderKey());
+        String cartIds = redisCache.getCacheObject("orderKey:" + param.getOrderKey(), String.class);
         if (ObjectUtil.isNull(cartIds)) {
             throw new CustomException("订单已过期", 501);
         }
-        List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + param.getOrderKey());
+        List<FsStoreCartQueryVO> carts = redisCache.getCacheObjectList("orderCarts:" + param.getOrderKey(), FsStoreCartQueryVO.class);
         BigDecimal payPrice = getOrderSumPrice(carts, "truePrice");
         if (StringUtils.isNotEmpty(param.getCreateOrderKey())) {
-            Integer payType = redisCache.getCacheObject("createOrderPayType:" + param.getCreateOrderKey());
+            Integer payType = redisCache.getCacheObject("createOrderPayType:" + param.getCreateOrderKey(), Integer.class);
             if (payType != null && payType == 3) {
-                payPrice = redisCache.getCacheObject("createOrderAmount:" + param.getCreateOrderKey());
+                payPrice = redisCache.getCacheObject("createOrderAmount:" + param.getCreateOrderKey(), BigDecimal.class);
             } else {
-                BigDecimal money = redisCache.getCacheObject("createOrderMoney:" + param.getCreateOrderKey());
+                BigDecimal money = redisCache.getCacheObject("createOrderMoney:" + param.getCreateOrderKey(), BigDecimal.class);
                 if (money != null) {
                     payPrice = money;
                 }
@@ -859,8 +859,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             }
             throw e;
         }
-        String cartIds = redisCache.getCacheObject("orderKey:" + param.getOrderKey());
-        Integer payType = redisCache.getCacheObject("createOrderPayType:" + param.getCreateOrderKey());
+        String cartIds = redisCache.getCacheObject("orderKey:" + param.getOrderKey(), String.class);
+        Integer payType = redisCache.getCacheObject("createOrderPayType:" + param.getCreateOrderKey(), Integer.class);
         if (payType != null) {
             param.setPayType(payType.toString());
         }
@@ -868,7 +868,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         BigDecimal integral = BigDecimal.ZERO;
         if (cartIds != null) {
             //获取购物车列表
-            List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + param.getOrderKey());
+            List<FsStoreCartQueryVO> carts = redisCache.getCacheObjectList("orderCarts:" + param.getOrderKey(), FsStoreCartQueryVO.class);
             //获取地址
             FsUserAddressScrm address = userAddressMapper.selectFsUserAddressById(param.getAddressId());
             //生成分布式唯一值
@@ -993,7 +993,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 //全款支付
                 storeOrder.setStatus(0);
                 if("广州郑多燕".equals(cloudHostProper.getCompanyName())){
-                    BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + param.getCreateOrderKey());
+                    BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + param.getCreateOrderKey(), BigDecimal.class);
                     storeOrder.setPayDelivery(amount != null ? amount : BigDecimal.ZERO);
                 }
             } else if (param.getPayType().equals("2")) {
@@ -1032,7 +1032,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             if (storeOrder.getCustomerId() == null) {
                 storeOrder.setCustomerId(param.getCustomerId());//6.13 添加客户id
             }
-            FsStoreOrderScrm tempOrder = redisCache.getCacheObject("orderInfo:" + param.getCreateOrderKey());
+            FsStoreOrderScrm tempOrder = redisCache.getCacheObject("orderInfo:" + param.getCreateOrderKey(), FsStoreOrderScrm.class);
             if (tempOrder != null) {
                 storeOrder.setOrderType(tempOrder.getOrderType());
                 storeOrder.setOrderMedium(tempOrder.getOrderMedium());
@@ -1130,7 +1130,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             //删除推荐订单KEY
             String createOrderKey = param.getCreateOrderKey();
             if("鸿森堂".equals(cloudHostProper.getCompanyName())){
-                BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + createOrderKey);
+                BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + createOrderKey, BigDecimal.class);
                 redisCache.setCacheObject("orderAmount:" + storeOrder.getId(), amount, 24, TimeUnit.HOURS);//物流代收自定义金额
             }else {
                 if (StringUtils.isNotEmpty(createOrderKey)) {
@@ -1141,7 +1141,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                     }
 
                     //货到付款自定义金额 key改为id存储
-                    BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + createOrderKey);
+                    BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + createOrderKey, BigDecimal.class);
                     redisCache.deleteObject("createOrderAmount:" + createOrderKey);
                 }
             }
@@ -1622,7 +1622,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         } else {
             // 套餐制单
             uuid = param.getCreateOrderKey();
-            totalMoney = redisCache.getCacheObject("createOrderMoney:" + param.getCreateOrderKey());
+            totalMoney = redisCache.getCacheObject("createOrderMoney:" + param.getCreateOrderKey(), BigDecimal.class);
         }
 
         if (param.getCouponUserId() != null) {
@@ -1642,7 +1642,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     @Transactional
     public R createPackageOrder(long uid, FsStorePackageOrderCreateParam param) {
         //计算金额
-        String packageId = redisCache.getCacheObject("orderKey:" + param.getOrderKey());
+        String packageId = redisCache.getCacheObject("orderKey:" + param.getOrderKey(), String.class);
         if (packageId != null) {
             FsStoreProductPackageScrm storeProductPackage = productPackageService.selectFsStoreProductPackageById(param.getPackageId());
             if (storeProductPackage.getStatus().equals(0)) {
@@ -1675,7 +1675,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             List<StorePackageProductDTO> goodsList = JSONUtil.toList(jsonArray, StorePackageProductDTO.class);
             //检测库存
             Integer totalNum = 0;
-            List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + param.getOrderKey());
+            List<FsStoreCartQueryVO> carts = redisCache.getCacheObjectList("orderCarts:" + param.getOrderKey(), FsStoreCartQueryVO.class);
             String joinCartIds = null;
             if(carts == null || carts.isEmpty()){
                 carts = new ArrayList<>();
@@ -1725,7 +1725,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             }
             BigDecimal totalMoney;
             if(param.getIsPackage() != null && param.getIsPackage() == 1){
-                totalMoney = redisCache.getCacheObject("createOrderMoney:" + param.getOrderKey());
+                totalMoney = redisCache.getCacheObject("createOrderMoney:" + param.getOrderKey(), BigDecimal.class);
             } else {
                 totalMoney = storeProductPackage.getPayMoney();
             }
@@ -1773,7 +1773,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             storeOrder.setPayType(storeProductPackage.getPayType().toString());
             storeOrder.setPayPrice(totalMoney);
             if("广州郑多燕".equals(cloudHostProper.getCompanyName())){
-                BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + param.getOrderKey());
+                BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + param.getOrderKey(), BigDecimal.class);
                 storeOrder.setPayDelivery(amount != null ? amount : BigDecimal.ZERO);
             }
             storeOrder.setIsPackage(1);
@@ -2722,13 +2722,13 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
 
     @Override
     public R getSalesOrder(String createOrderKey) {
-        String key = redisCache.getCacheObject("createOrderKey:" + createOrderKey);
-        List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + createOrderKey);
-        BigDecimal money = redisCache.getCacheObject("createOrderMoney:" + createOrderKey);
-        Integer payType = redisCache.getCacheObject("createOrderPayType:" + createOrderKey);
+        String key = redisCache.getCacheObject("createOrderKey:" + createOrderKey, String.class);
+        List<FsStoreCartQueryVO> carts = redisCache.getCacheObjectList("orderCarts:" + createOrderKey, FsStoreCartQueryVO.class);
+        BigDecimal money = redisCache.getCacheObject("createOrderMoney:" + createOrderKey, BigDecimal.class);
+        Integer payType = redisCache.getCacheObject("createOrderPayType:" + createOrderKey, Integer.class);
         //展示代收金额
         if (payType != null && payType == 3) {
-            money = redisCache.getCacheObject("createOrderAmount:" + createOrderKey);
+            money = redisCache.getCacheObject("createOrderAmount:" + createOrderKey, BigDecimal.class);
         }
         if (StringUtils.isEmpty(key)) {
             throw new CustomException("订单已过期", 501);
@@ -2739,8 +2739,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     @Override
     @Transactional
     public R addUserCart(long userId, String createOrderKey) {
-        String key = redisCache.getCacheObject("createOrderKey:" + createOrderKey);
-        List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + createOrderKey);
+        String key = redisCache.getCacheObject("createOrderKey:" + createOrderKey, String.class);
+        List<FsStoreCartQueryVO> carts = redisCache.getCacheObjectList("orderCarts:" + createOrderKey, FsStoreCartQueryVO.class);
         if (StringUtils.isEmpty(key)) {
             throw new CustomException("订单已过期", 501);
         }
@@ -2787,11 +2787,11 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
 //        if(money.compareTo(BigDecimal.ZERO)<=0){
 //            return R.error("价格应大于0");
 //        }
-        String key = redisCache.getCacheObject("createOrderKey:" + createOrderKey);
+        String key = redisCache.getCacheObject("createOrderKey:" + createOrderKey, String.class);
         if (StringUtils.isEmpty(key)) {
             throw new CustomException("订单已过期", 501);
         }
-        List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + createOrderKey);
+        List<FsStoreCartQueryVO> carts = redisCache.getCacheObjectList("orderCarts:" + createOrderKey, FsStoreCartQueryVO.class);
         BigDecimal totalMoney = BigDecimal.ZERO;
         if(isPackage == 0){
             for (FsStoreCartQueryVO vo : carts) {
@@ -2799,7 +2799,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             }
         } else {
             //套餐制单,这个金额是套餐的金额
-            totalMoney = redisCache.getCacheObject("createOrderMoney:" + createOrderKey);
+            totalMoney = redisCache.getCacheObject("createOrderMoney:" + createOrderKey, BigDecimal.class);
         }
         if (money.compareTo(totalMoney) == 1) {
             throw new CustomException("价格不能大于商品总价", 501);
@@ -3514,11 +3514,11 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
 
         String createOrderKey = param.getCreateOrderKey();
-        String key = redisCache.getCacheObject("createOrderKey:" + createOrderKey);
+        String key = redisCache.getCacheObject("createOrderKey:" + createOrderKey, String.class);
         if (StringUtils.isEmpty(key)) {
             throw new CustomException("订单已过期", 501);
         }
-//        List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + createOrderKey);
+//        List<FsStoreCartQueryVO> carts = redisCache.getCacheObjectList("orderCarts:" + createOrderKey, FsStoreCartQueryVO.class);
         List<FsStoreCartQueryVO> carts = param.getCarts();
         if (carts.isEmpty()) {
             return R.error("购物车不能为空");
@@ -4225,7 +4225,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         if(order.getStatus()!= OrderInfoEnum.STATUS_0.getValue()){
             return R.error("订单状态不正确");
         }
-        String orderId=redisCache.getCacheObject("isPaying:"+param.getOrderId());
+        String orderId=redisCache.getCacheObject("isPaying:"+param.getOrderId(), String.class);
         if(StringUtils.isNotEmpty(orderId)&&orderId.equals(order.getId().toString())){
             return R.error("正在支付中...");
         }
@@ -4261,7 +4261,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 else if(param.getPayType().equals(3)){
                     //货到付款
                     order.setPayType("3");
-                    BigDecimal amount=redisCache.getCacheObject("orderAmount:"+order.getId());
+                    BigDecimal amount=redisCache.getCacheObject("orderAmount:"+order.getId(), BigDecimal.class);
                     BigDecimal payMoney = BigDecimal.ZERO;
                     if (amount != null){
                         payMoney=amount;
@@ -4558,7 +4558,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 return R.error("此订单没有可支付的金额");
             }
 
-            String orderId=redisCache.getCacheObject("isPaying:"+order.getId());
+            String orderId=redisCache.getCacheObject("isPaying:"+order.getId(), String.class);
             if(StringUtils.isNotEmpty(orderId)&&orderId.equals(order.getId().toString())){
                 return R.error("正在支付中...");
             }
@@ -4775,7 +4775,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         if(!Objects.equals(order.getStatus(), OrderInfoEnum.STATUS_0.getValue())){
             return R.error("订单状态不正确");
         }
-        String orderId=redisCache.getCacheObject("isPaying:"+order.getId());
+        String orderId=redisCache.getCacheObject("isPaying:"+order.getId(), String.class);
         if(StringUtils.isNotEmpty(orderId)&&orderId.equals(order.getId().toString())){
             return R.error("正在支付中...");
         }
@@ -4820,7 +4820,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 else if(param.getPayType().equals(3)){
                     //货到付款
                     order.setPayType("3");
-                    BigDecimal amount=redisCache.getCacheObject("orderAmount:"+order.getId());
+                    BigDecimal amount=redisCache.getCacheObject("orderAmount:"+order.getId(), BigDecimal.class);
                     BigDecimal payMoney = BigDecimal.ZERO;
                     if (amount != null){
                         payMoney=amount;

+ 6 - 6
fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -1912,7 +1912,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 
     @Override
     public LiveOrderComputeDTO computedReward(long l, LiveOrderComputedParam param) {
-        String orderKey= redisCache.getCacheObject("orderKey:"+param.getOrderKey());
+        String orderKey= redisCache.getCacheObject("orderKey:"+param.getOrderKey(), String.class);
         if (StringUtils.isEmpty(orderKey)) {
             return null;
         }
@@ -1951,7 +1951,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 
     @Override
     public R createRewardLiveOrder(LiveOrder liveOrder) {
-        String orderKey= redisCache.getCacheObject("orderKey:"+liveOrder.getOrderKey());
+        String orderKey= redisCache.getCacheObject("orderKey:"+liveOrder.getOrderKey(), String.class);
         if (StringUtils.isEmpty(orderKey)) {
             return R.error("订单已过期");
         }
@@ -2079,7 +2079,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 
     @Override
     public LiveOrderComputeDTO computedOrder(long userId, LiveOrderComputedParam param) {
-        String orderKey= redisCache.getCacheObject("orderKey:"+param.getOrderKey());
+        String orderKey= redisCache.getCacheObject("orderKey:"+param.getOrderKey(), String.class);
         if (StringUtils.isEmpty(orderKey)) {
             log.error("订单已失效");
             return null;
@@ -3076,7 +3076,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         if(order.getStatus()!= OrderInfoEnum.STATUS_0.getValue()){
             return R.error("订单状态不正确");
         }
-        String orderId=redisCache.getCacheObject("isPaying:"+order.getOrderId());
+        String orderId=redisCache.getCacheObject("isPaying:"+order.getOrderId(), String.class);
         if(StringUtils.isNotEmpty(orderId)&&order.getOrderId().toString().equals(orderId)){
             return R.error(501,"正在支付中...");
         }
@@ -3122,7 +3122,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                 else if(param.getPayType().equals(3)){
                     //货到付款
                     order.setPayType("3");
-                    BigDecimal amount=redisCache.getCacheObject("orderAmount:"+order.getOrderId());
+                    BigDecimal amount=redisCache.getCacheObject("orderAmount:"+order.getOrderId(), BigDecimal.class);
                     BigDecimal payMoney = BigDecimal.ZERO;
                     if (amount != null){
                         payMoney=amount;
@@ -3573,7 +3573,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 //        if(user.getStatus()!=1){
 //            return R.error("非法用户操作");
 //        }
-        String orderKey= redisCache.getCacheObject("orderKey:"+liveOrder.getOrderKey());
+        String orderKey= redisCache.getCacheObject("orderKey:"+liveOrder.getOrderKey(), String.class);
         if (StringUtils.isEmpty(orderKey)) {
             return R.error("订单已过期");
         }

+ 2 - 2
fs-service/src/main/java/com/fs/live/service/impl/LiveRedConfServiceImpl.java

@@ -398,7 +398,7 @@ public class LiveRedConfServiceImpl implements ILiveRedConfService {
     // 获取剩余红包数量
     public Integer getRemaining(Long redId) {
         String key = REDPACKET_REMAININGLOTS_KEY + redId;
-        Integer value = redisCache.getCacheObject(key);
+        Integer value = redisCache.getCacheObject(key, Integer.class);
         return value == null ? 0 : value;
     }
     // 获取剩余红包数量
@@ -409,7 +409,7 @@ public class LiveRedConfServiceImpl implements ILiveRedConfService {
     // 获取剩余红包金额数量
     public Integer getRemainingNum(Long redId) {
         String key = REDPACKET_REMAININGNUM_KEY + redId;
-        String value = redisCache.getCacheObject(key);
+        String value = redisCache.getCacheObject(key, String.class);
         return value == null ? 0 : Integer.parseInt(value);
     }
 

+ 1 - 1
fs-service/src/main/java/com/fs/live/service/impl/LiveServiceImpl.java

@@ -182,7 +182,7 @@ public class LiveServiceImpl implements ILiveService
     public Live selectLiveByLiveId(Long liveId){
         // 先从缓存中获取
         String cacheKey = String.format(LiveKeysConstant.LIVE_DATA_CACHE, liveId);
-        Live cachedLive = redisCache.getCacheObject(cacheKey);
+        Live cachedLive = redisCache.getCacheObject(cacheKey, Live.class);
         if (cachedLive != null) {
             return cachedLive;
         }

+ 1 - 1
fs-service/src/main/java/com/fs/live/service/impl/LiveUserFirstEntryServiceImpl.java

@@ -125,7 +125,7 @@ public class LiveUserFirstEntryServiceImpl implements ILiveUserFirstEntryService
         String cacheKey = "live:user:first:entry:" + liveId + ":" + userId;
         
         // 先从缓存中获取
-        LiveUserFirstEntry cachedEntry = redisCache.getCacheObject(cacheKey);
+        LiveUserFirstEntry cachedEntry = redisCache.getCacheObject(cacheKey, LiveUserFirstEntry.class);
         if (cachedEntry != null) {
             return cachedEntry;
         }

+ 1 - 1
fs-service/src/main/java/com/fs/live/service/impl/LiveVideoServiceImpl.java

@@ -200,7 +200,7 @@ public class LiveVideoServiceImpl implements ILiveVideoService
         String cacheKey = "live:video:list:" + liveId + ":" + type;
 
         // 先从缓存中获取
-        List<LiveVideo> cachedVideos = redisCache.getCacheObject(cacheKey);
+        List<LiveVideo> cachedVideos = redisCache.getCacheObjectList(cacheKey, LiveVideo.class);
         if (cachedVideos != null && !cachedVideos.isEmpty()) {
             return cachedVideos;
         }

+ 1 - 1
fs-service/src/main/java/com/fs/live/service/impl/LiveWatchLogServiceImpl.java

@@ -153,7 +153,7 @@ public class LiveWatchLogServiceImpl extends ServiceImpl<LiveWatchLogMapper, Liv
         
         // 先从缓存中获取
         String cacheKey = String.format(LIVE_WATCH_LOG_CACHE_KEY, logId);
-        List<LiveWatchLog> cachedLog = redisCache.getCacheObject(cacheKey);
+        List<LiveWatchLog> cachedLog = redisCache.getCacheObjectList(cacheKey, LiveWatchLog.class);
         if (cachedLog != null) {
             return cachedLog;
         }

+ 2 - 2
fs-service/src/main/java/com/fs/live/service/impl/LiveWatchUserServiceImpl.java

@@ -271,7 +271,7 @@ public class LiveWatchUserServiceImpl implements ILiveWatchUserService {
         String cacheKey = String.format(LiveKeysConstant.LIVE_FLAG_CACHE, liveId);
 
         // 先查缓存
-        Map<String, Integer> cached = redisCache.getCacheObject(cacheKey);
+        Map cached = redisCache.getCacheObject(cacheKey, Map.class);
         if (cached != null && cached.containsKey("liveFlag") && cached.containsKey("replayFlag")) {
             return cached;
         }
@@ -399,7 +399,7 @@ public class LiveWatchUserServiceImpl implements ILiveWatchUserService {
         try {
             // 从 Redis 获取用户进入时间
             String entryTimeKey = String.format(USER_ENTRY_TIME_KEY, liveId, userId);
-            Long entryTime = redisCache.getCacheObject(entryTimeKey);
+            Long entryTime = redisCache.getCacheObject(entryTimeKey, Long.class);
             // 获取当前直播/回放状态
             Map<String, Integer> flagMap = this.getLiveFlagWithCache(liveId);
             Integer currentLiveFlag = flagMap.get("liveFlag");

+ 1 - 1
fs-service/src/main/java/com/fs/qw/service/impl/QwCompanyServiceImpl.java

@@ -49,7 +49,7 @@ public class QwCompanyServiceImpl implements IQwCompanyService
 
     @Override
     public QwCompany getQwCompanyByRedis(String corpId) {
-        String key =(String) redisCache.getCacheObject("qwCompany:"+corpId);
+        String key = redisCache.getCacheObject("qwCompany:"+corpId, String.class);
         if (!StringUtil.strIsNullOrEmpty(key)){
             return JSON.parseObject(key, QwCompany.class);
         }

+ 6 - 6
fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -2183,7 +2183,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
     }
 
     public QwUser getQwUserByRedis(String corpId,String userID){
-        String key =(String)redisCache.getCacheObject("qwUserRd:"+corpId+":"+userID);
+        String key = redisCache.getCacheObject("qwUserRd:"+corpId+":"+userID, String.class);
         if (!StringUtil.strIsNullOrEmpty(key)){
             return JSON.parseObject(key, QwUser.class);
         }
@@ -2205,7 +2205,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         String redisKey = "qwUserRdById:" + qwUserId;
 
         // 直接从Redis获取JSON字符串
-        String cachedJson = (String) redisCache.getCacheObject(redisKey);
+        String cachedJson = redisCache.getCacheObject(redisKey, String.class);
         if (!StringUtil.strIsNullOrEmpty(cachedJson)) {
             try {
                 return JSON.parseObject(cachedJson, QwUser.class);
@@ -2231,7 +2231,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
     public void insertQwExternalContactByExternalUserId(String externalUserID, String userID, Long companyId, String corpId, String state, String welcomeCode) throws ParseException {
 
 
-//        String qwApiExternal=redisCache.getCacheObject("qwApiExternal:"+userID+":"+corpId+":"+externalUserID);
+//        String qwApiExternal = redisCache.getCacheObject("qwApiExternal:"+userID+":"+corpId+":"+externalUserID, String.class);
 //        if (!StringUtil.strIsNullOrEmpty(qwApiExternal)){
 //            return;
 //        }else {
@@ -3873,7 +3873,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
 
                         try {
 
-                            String mediaId =(String)redisCache.getCacheObject("miniprogram:"+corpId+":"+att.getMiniprogram().getCourseId());
+                            String mediaId = redisCache.getCacheObject("miniprogram:"+corpId+":"+att.getMiniprogram().getCourseId(), String.class);
                             if (!StringUtil.strIsNullOrEmpty(mediaId)){
 
                                 FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();
@@ -5350,7 +5350,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
 
 
     public R syncAddMyQwExternalContactByRedis(QwUser qwUser) {
-        List<String> externalUserid = redisCache.getCacheObject("qwUserIds:" + qwUser.getId());
+        List<String> externalUserid = redisCache.getCacheObjectList("qwUserIds:" + qwUser.getId(), String.class);
         if(StringUtils.isNotEmpty(externalUserid)&&externalUserid.size()>0){
             String userID = qwUser.getQwUserId();
                 //库里的
@@ -6134,7 +6134,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
     public Boolean getSopAiChatByRedis(String qwUserId,String corpId,String externalUserId){
 
         try {
-            String key =(String)redisCache.getCacheObject("qwNewChat:"+qwUserId+":"+corpId+":"+externalUserId);
+            String key = redisCache.getCacheObject("qwNewChat:"+qwUserId+":"+corpId+":"+externalUserId, String.class);
             if (!StringUtil.strIsNullOrEmpty(key)){
                 return true;
             }else {

+ 1 - 1
fs-service/src/main/java/com/fs/qw/service/impl/QwGroupMsgServiceImpl.java

@@ -267,7 +267,7 @@ public class QwGroupMsgServiceImpl implements IQwGroupMsgService
                     return  R.error("该主体没有绑定 小程序,请联系管理员");
                 }
 
-                String mediaId =(String)redisCache.getCacheObject("miniprogram:"+qwGroupMsgParam.getCorpId()+":"+qwGroupMsgParam.getCourseId());
+                String mediaId = redisCache.getCacheObject("miniprogram:"+qwGroupMsgParam.getCorpId()+":"+qwGroupMsgParam.getCourseId(), String.class);
                 if (StringUtil.strIsNullOrEmpty(mediaId)){
                     return R.error("该课程封面未上传 至企业微信,请联系管理员");
                 }

+ 8 - 8
fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -405,7 +405,7 @@ public class QwUserServiceImpl implements IQwUserService
         String cacheKey = "QwLoginCode:" + param.getAppKey();  // Redis 缓存的 Key
 
         // 从缓存中获取数据
-        base64 = redisCache.getCacheObject(cacheKey);
+        base64 = redisCache.getCacheObject(cacheKey, String.class);
 
         // 如果缓存值为空,尝试重新获取
         if (StringUtil.strIsNullOrEmpty(base64)) {
@@ -417,7 +417,7 @@ public class QwUserServiceImpl implements IQwUserService
                     logger.error("线程被中断"+e.getMessage());
                 }
 
-                base64 = redisCache.getCacheObject(cacheKey);
+                base64 = redisCache.getCacheObject(cacheKey, String.class);
                 if (!StringUtil.strIsNullOrEmpty(base64)) {
                     break;  // 如果成功获取到值,退出循环
                 }
@@ -1235,11 +1235,11 @@ public class QwUserServiceImpl implements IQwUserService
 
     @Override
     public R qrCodeStatus(QwLoginHookParam loginParam) {
-        String uid = redisCache.getCacheObject("qrCodeUid:qwUserId:" + loginParam.getQwUserId());
+        String uid = redisCache.getCacheObject("qrCodeUid:qwUserId:" + loginParam.getQwUserId(), String.class);
         if (uid == null) {
             return R.error("未获取到Uid");
         }
-        Integer status = redisCache.getCacheObject("qrCodeUid:" + uid);
+        Integer status = redisCache.getCacheObject("qrCodeUid:" + uid, Integer.class);
         if (status==null){
             return R.ok("100000");
         }
@@ -1251,8 +1251,8 @@ public class QwUserServiceImpl implements IQwUserService
     @Override
     public R qrCodeVerify(QwLoginHookParam loginParam) {
 
-        String key = redisCache.getCacheObject("qrCode:qwUserId:" + loginParam.getQwUserId());
-        String uid = redisCache.getCacheObject("qrCodeUid:qwUserId:" + loginParam.getQwUserId());
+        String key = redisCache.getCacheObject("qrCode:qwUserId:" + loginParam.getQwUserId(), String.class);
+        String uid = redisCache.getCacheObject("qrCodeUid:qwUserId:" + loginParam.getQwUserId(), String.class);
         if (key==null||uid==null){
             return R.error("初始化错误请重新登录");
         }
@@ -1349,11 +1349,11 @@ public class QwUserServiceImpl implements IQwUserService
     }
     @Override
     public R getTwoCodeStatus(QwLoginHookParam loginParam) {
-        String uid = redisCache.getCacheObject("qrCodeUid:qwUserId:" + loginParam.getQwUserId());
+        String uid = redisCache.getCacheObject("qrCodeUid:qwUserId:" + loginParam.getQwUserId(), String.class);
         if (uid == null) {
             return R.error("未获取到Uid");
         }
-        Integer status = redisCache.getCacheObject("twoCodeUid:" + uid);
+        Integer status = redisCache.getCacheObject("twoCodeUid:" + uid, Integer.class);
         if (status==null){
             return R.ok("100000");
         }

+ 8 - 8
fs-service/src/main/java/com/fs/qwApi/service/impl/QwApiServiceImpl.java

@@ -922,7 +922,7 @@ public class QwApiServiceImpl implements QwApiService {
 
     @Override
     public String getToken(String corpId,String corpSecret) {
-        String key =(String)redisCache.getCacheObject("qwServer:corpId:" + corpId + ":" + corpSecret);
+        String key =redisCache.getCacheObject("qwServer:corpId:" + corpId + ":" + corpSecret, String.class);
         if (!StringUtil.strIsNullOrEmpty(key)){
             return key;
         }
@@ -999,7 +999,7 @@ public class QwApiServiceImpl implements QwApiService {
      */
     @Override
     public String getSuiteToken(QwSuiteTokenParams param) {
-        String suite_access_token =(String) redisCache.getCacheObject("qwServer:suite_access_token:" + param.getSuite_id());
+        String suite_access_token =redisCache.getCacheObject("qwServer:suite_access_token:" + param.getSuite_id(), String.class);
         String token="";
         if (StringUtils.isNotBlank(suite_access_token)) {
             return suite_access_token;
@@ -1026,7 +1026,7 @@ public class QwApiServiceImpl implements QwApiService {
      */
     @Override
     public String getProviderToken(QwProviderTokenParams params) {
-        String providerToken =(String) redisCache.getCacheObject("qwServer:provider_access_token:" + params.getCorpid());
+        String providerToken =redisCache.getCacheObject("qwServer:provider_access_token:" + params.getCorpid(), String.class);
         if (StringUtils.isNotBlank(providerToken)) {
             return providerToken;
         }
@@ -1054,7 +1054,7 @@ public class QwApiServiceImpl implements QwApiService {
      */
     @Override
     public String getBookAccessToken(QwGetCorpTokenParam param,String suite_access_token) {
-        String providerToken =(String) redisCache.getCacheObject("qwServer:serverBook_access_token:" + param.getAuth_corpid());
+        String providerToken =redisCache.getCacheObject("qwServer:serverBook_access_token:" + param.getAuth_corpid(), String.class);
         if (StringUtils.isNotBlank(providerToken)) {
             return providerToken;
         }
@@ -1138,7 +1138,7 @@ public class QwApiServiceImpl implements QwApiService {
     public QwJsapiTicketResult getJsapiTicket(String bookCorpId,String bookSecret) {
 
 //        String jsApiTicket =(String) redisTemplate.opsForValue().get("ticket:corpId" + ":" + corpId);
-        String jsApiTicket =(String) redisCache.getCacheObject("ticket:corpId" + ":" + bookCorpId);
+        String jsApiTicket =redisCache.getCacheObject("ticket:corpId" + ":" + bookCorpId, String.class);
 
         QwJsapiTicketResult qwResult=new QwJsapiTicketResult();
         if (jsApiTicket!=null&&jsApiTicket!=""){
@@ -1174,7 +1174,7 @@ public class QwApiServiceImpl implements QwApiService {
     public QwJsapiTicketResult getJsapiTicketApp(String corpId,String appSecret) {
 
 //        String jsApiTicket =(String) redisTemplate.opsForValue().get("ticketApp:corpId" + ":" + corpId);
-        String jsApiTicket =(String) redisCache.getCacheObject("ticketApp:corpId" + ":" + corpId);
+        String jsApiTicket =redisCache.getCacheObject("ticketApp:corpId" + ":" + corpId, String.class);
 
         QwJsapiTicketResult qwResult=new QwJsapiTicketResult();
 
@@ -1354,7 +1354,7 @@ public class QwApiServiceImpl implements QwApiService {
     }
 
     String getAppSecret(String corpId){
-        String key =(String)redisCache.getCacheObject("appSecret:corpId:" + corpId);
+        String key =redisCache.getCacheObject("appSecret:corpId:" + corpId, String.class);
         if (!StringUtil.strIsNullOrEmpty(key)){
             return key;
         }
@@ -1464,7 +1464,7 @@ public class QwApiServiceImpl implements QwApiService {
 //
 //        //这里获取存在redis里的通讯录的suite_ticket
 ////        String bookSuiteTicket = (String) redisTemplate.opsForValue().get("qwServer:bookServer_suite_ticket");
-//        String bookSuiteTicket = (String) redisCache.getCacheObject("qwServer:bookServer_suite_ticket");
+//        String bookSuiteTicket = redisCache.getCacheObject("qwServer:bookServer_suite_ticket", String.class);
 //
 //        //获取通讯录的suite_token(所有企业通用suite_token)
 ////        CompanyConfig bookServerConfig = companyConfigService.selectCompanyConfigByServerKey("sys:qwBookServer:config");

+ 3 - 3
fs-service/src/main/java/com/fs/sop/service/impl/QwSopLogsServiceImpl.java

@@ -1204,7 +1204,7 @@ public class QwSopLogsServiceImpl extends ServiceImpl<QwSopLogsMapper, QwSopLogs
             if (qwSopLogsByJsApiNext != null && !StringUtil.strIsNullOrEmpty(qwSopLogsByJsApiNext.getExternalUserId())){
                 //过滤非外部联系人
                 try{
-                    List<String> exIds=redisCache.getCacheObject("qwUserExtIds:"+param.getCorpId()+":"+param.getQwUserId());
+                    List<String> exIds=redisCache.getCacheObjectList("qwUserExtIds:"+param.getCorpId()+":"+param.getQwUserId(), String.class);
                     if(StringUtils.isNotEmpty(exIds)&& !exIds.isEmpty()){
                         //查询外部联系人是否存在,如果不存在,返回下一个外部联系人
                         if(!exIds.contains(qwSopLogsByJsApiNext.getExternalUserId())){
@@ -1902,7 +1902,7 @@ public class QwSopLogsServiceImpl extends ServiceImpl<QwSopLogsMapper, QwSopLogs
 //        if (StringUtils.isNotEmpty(set.getMiniprogramPage())) {
 //            try {
 //                String key = String.format("miniprogram:%s:%s", corpId, courseId);
-//                String mediaId = redisCache.getCacheObject(key);
+//                String mediaId = redisCache.getCacheObject(key, String.class);
 //
 //                if (StringUtils.isNotEmpty(mediaId)) {
 //
@@ -2159,7 +2159,7 @@ public class QwSopLogsServiceImpl extends ServiceImpl<QwSopLogsMapper, QwSopLogs
         if (StringUtils.isNotEmpty(set.getMiniprogramPage())) {
             try {
                 String key = String.format("miniprogram:%s:%s", corpId, courseId);
-                String mediaId = redisCache.getCacheObject(key);
+                String mediaId = redisCache.getCacheObject(key, String.class);
 
                 if (StringUtils.isNotEmpty(mediaId)) {
 

+ 1 - 1
fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsServiceImpl.java

@@ -904,7 +904,7 @@ public class SopUserLogsServiceImpl implements ISopUserLogsService {
 
             Integer countDays = item.getCountDays();
 
-            Integer sopTemIdNum = redisCache.getCacheObject("sop-tempId:" + item.getSopTempId());
+            Integer sopTemIdNum = redisCache.getCacheObject("sop-tempId:" + item.getSopTempId(), Integer.class);
 
             if (sopTemIdNum == null) {
                 sopTemIdNum = qwSopTempDayService.getDayNumByIdLimitOne(item.getSopTempId());

+ 1 - 1
fs-service/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java

@@ -1109,7 +1109,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
         if (param.getType() != null && param.getType() == 5) {
             redisData = "";
         } else {
-            redisData = redisCache.getCacheObject(FsConstants.WATCH_COURSE_STATISTICS_GROUP_COMPANY + param.getType());
+            redisData = redisCache.getCacheObject(FsConstants.WATCH_COURSE_STATISTICS_GROUP_COMPANY + param.getType(), String.class);
         }
 
         List<WatchCourseStatisticsResultDTO> watchCourseStatisticsDTOS = new ArrayList<>();

+ 2 - 2
fs-service/src/main/java/com/fs/system/service/impl/SysConfigServiceImpl.java

@@ -68,7 +68,7 @@ public class SysConfigServiceImpl implements ISysConfigService
     @Override
     public String selectConfigByKey(String configKey)
     {
-        String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
+        String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey), String.class));
         if (StringUtils.isNotEmpty(configValue))
         {
             return configValue;
@@ -76,7 +76,7 @@ public class SysConfigServiceImpl implements ISysConfigService
         Object keyLock = KEY_LOCKS.computeIfAbsent(configKey, k -> new Object());
 
         synchronized (keyLock){
-            configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
+            configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey), String.class));
             if (StringUtils.isNotEmpty(configValue))
             {
                 return configValue;

+ 1 - 1
fs-service/src/main/java/com/fs/tzBankPay/util/TzBankSendUtil.java

@@ -21,7 +21,7 @@ public class TzBankSendUtil {
     TzBankUtil tzBankUtil=new TzBankUtil();
 
     public TokenResult getToken(){
-//        String token=redisCache.getCacheObject("TzBankToken");
+//        String token = redisCache.getCacheObject("TzBankToken", String.class);
 //        if (token!=null&&token!=""){
 //            return JSON.parseObject(token, TokenResult.class);
 //        }

+ 2 - 2
fs-service/src/main/java/com/fs/wxwork/service/WxWorkServiceImpl.java

@@ -32,7 +32,7 @@ public class WxWorkServiceImpl implements WxWorkService {
     @Autowired
     AiHostProper aiHostProper;
     public String getUrl(Long serverId) {
-        String url = redisCache.getCacheObject("serverId:" + serverId);
+        String url = redisCache.getCacheObject("serverId:" + serverId, String.class);
         if (url != null && !url.isEmpty()) {
             return url;
         }
@@ -226,7 +226,7 @@ public class WxWorkServiceImpl implements WxWorkService {
 
     @Override
     public String getCorpId(String uuid, Long corpId,Long serverId) {
-        String sCorpId = redisCache.getCacheObject("ipad:corpId:" + corpId);
+        String sCorpId = redisCache.getCacheObject("ipad:corpId:" + corpId, String.class);
         if (sCorpId != null&& !sCorpId.isEmpty()) {
 
             return sCorpId;

+ 2 - 2
fs-service/src/main/java/com/fs/wxwork/service/WxWorkServiceNew.java

@@ -33,7 +33,7 @@ public class WxWorkServiceNew {
     private final IQwIpadServerService qwIpadServerService;
 
     public String getUrl(Long serverId) {
-        String url = redisCache.getCacheObject("serverId:" + serverId);
+        String url = redisCache.getCacheObject("serverId:" + serverId, String.class);
         if (url != null && !url.isEmpty()) {
             return url;
         }
@@ -99,7 +99,7 @@ public class WxWorkServiceNew {
     }
 
     public String getCorpId(String uuid, Long corpId,Long serverId) {
-        String sCorpId = redisCache.getCacheObject("ipad:corpId:" + corpId);
+        String sCorpId = redisCache.getCacheObject("ipad:corpId:" + corpId, String.class);
         if (sCorpId != null&& !sCorpId.isEmpty()) {
 
             return sCorpId;

+ 1 - 1
fs-store/src/main/java/com/fs/framework/service/LoginService.java

@@ -97,7 +97,7 @@ public class LoginService
     public void validateCaptcha(String username, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {

+ 1 - 1
fs-store/src/main/java/com/fs/framework/service/LoginServiceScrm.java

@@ -98,7 +98,7 @@ public class LoginServiceScrm
     public void validateCaptcha(String username, String code, String uuid)
     {
         String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
+        String captcha = redisCache.getCacheObject(verifyKey, String.class);
         redisCache.deleteObject(verifyKey);
         if (captcha == null)
         {

+ 1 - 1
fs-store/src/main/java/com/fs/framework/service/TokenServiceScrm.java

@@ -72,7 +72,7 @@ public class TokenServiceScrm
                 // 解析对应的权限以及用户信息
                 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
                 String userKey = getTokenKey(uuid);
-                StoreLoginUserScrm user = redisCache.getCacheObject(userKey);
+                StoreLoginUserScrm user = redisCache.getCacheObject(userKey, StoreLoginUserScrm.class);
                 return user;
             }
             catch (Exception e)

+ 1 - 1
fs-user-app-ai-chat/src/main/java/com/fs/app/controller/AppBaseController.java

@@ -45,7 +45,7 @@ public class AppBaseController {
 	}
 	public Long getCompanyUserId( )
 	{
-		Long companyUesrId=redisCache.getCacheObject("company-user-token:"+ ServletUtils.getRequest().getHeader("companyUserToken"));
+		Long companyUesrId=redisCache.getCacheObject("company-user-token:"+ ServletUtils.getRequest().getHeader("companyUserToken"), Long.class);
 		if(companyUesrId== null){
 			throw  new CustomException("未登录",403);
 		}

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/AppBaseController.java

@@ -45,7 +45,7 @@ public class AppBaseController {
 	}
 	public Long getCompanyUserId( )
 	{
-		Long companyUesrId=redisCache.getCacheObject("company-user-token:"+ ServletUtils.getRequest().getHeader("companyUserToken"));
+		Long companyUesrId=redisCache.getCacheObject("company-user-token:"+ ServletUtils.getRequest().getHeader("companyUserToken"), Long.class);
 		if(companyUesrId== null){
 			throw  new CustomException("未登录",403);
 		}

+ 6 - 6
fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -218,7 +218,7 @@ public class AppLoginController extends AppBaseController{
         if (!CollectionUtil.isEmpty(users)){
             return R.error("此账号已经注册");
         }
-        String redisCode = redisCache.getCacheObject("sms:code:" + phone);
+        String redisCode = redisCache.getCacheObject("sms:code:" + phone, String.class);
         if (StringUtils.isEmpty(redisCode)){
             return R.error("验证码已过期,请重新发送");
         }
@@ -253,7 +253,7 @@ public class AppLoginController extends AppBaseController{
         if (user==null){
             return R.error("用户不存在");
         }
-        String code = redisCache.getCacheObject(user.getPhone());
+        String code = redisCache.getCacheObject(user.getPhone(), String.class);
         if(StringUtils.isEmpty(code)){
             return R.error("验证码已过期");
         }
@@ -462,7 +462,7 @@ public class AppLoginController extends AppBaseController{
             //如果出现了一个手机号多个用户的情况,找出登陆过app的那个用户
             user.removeIf(fsUser -> StringUtils.isEmpty(fsUser.getHistoryApp()));
         }
-        String redisCode = redisCache.getCacheObject("sms:code:" + phone);
+        String redisCode = redisCache.getCacheObject("sms:code:" + phone, String.class);
         if (StringUtils.isEmpty(redisCode)){
             return R.error("验证码已过期,请重新发送");
         }
@@ -490,7 +490,7 @@ public class AppLoginController extends AppBaseController{
         if (CollectionUtil.isEmpty(user)){
             return R.error("此电话号码未绑定用户");
         }
-        String redisCode = redisCache.getCacheObject("sms:code:" + phone);
+        String redisCode = redisCache.getCacheObject("sms:code:" + phone, String.class);
         if (StringUtils.isEmpty(redisCode)){
             return R.error("验证码已过期,请重新发送");
         }
@@ -579,7 +579,7 @@ public class AppLoginController extends AppBaseController{
         //验证码绑定,需要校验验证码
         if (param.getBindType()!=null){
             String encryptPhone = encryptPhone(param.getPhone());
-            String redisCode = redisCache.getCacheObject("sms:code:" + encryptPhone);
+            String redisCode = redisCache.getCacheObject("sms:code:" + encryptPhone, String.class);
             if (StringUtils.isEmpty(redisCode)){
                 return R.error("验证码已过期,请重新发送");
             }
@@ -673,7 +673,7 @@ public class AppLoginController extends AppBaseController{
 
         //验证码绑定,需要校验验证码
         if (param.getBindType()!=null){
-            String redisCode = redisCache.getCacheObject("sms:code:" + param.getPhone());
+            String redisCode = redisCache.getCacheObject("sms:code:" + param.getPhone(), String.class);
             if (StringUtils.isEmpty(redisCode)){
                 return R.error("验证码已过期,请重新发送");
             }

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/CommonController.java

@@ -656,7 +656,7 @@ public class CommonController {
 	@GetMapping("/getDomain")
 	public R getDomain(@RequestParam String projectCode) {
 		String redisKey = "projectCode:" + projectCode;
-		FsProjectAddressConfig config = redisCache.getCacheObject(redisKey);
+		FsProjectAddressConfig config = redisCache.getCacheObject(redisKey, FsProjectAddressConfig.class);
 		if (Objects.isNull(config)) {
 			config = projectAddressConfigService.selectDomainByCode(projectCode);
 			redisCache.setCacheObject(redisKey, config, 5, TimeUnit.MINUTES);

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -241,7 +241,7 @@ public class CompanyUserController extends  AppBaseController {
     @GetMapping("/getCompanyWxaCodeByPayment")
     public R getCompanyWxaCodeByPayment(@RequestParam("companyId")Long companyId,@RequestParam("appId")String appId,HttpServletRequest request){
         //获取用户码
-        String WxaCode = redisCache.getCacheObject("company-wxa-code:"+companyId+":"+appId);
+        String WxaCode = redisCache.getCacheObject("company-wxa-code:"+companyId+":"+appId, String.class);
         return R.ok().put("data",WxaCode);
     }
 

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/CouponController.java

@@ -88,7 +88,7 @@ public class CouponController extends  AppBaseController {
         if (param.getCode() == null || param.getCode().isEmpty()) {
             return R.error("领取码不能为空");
         }
-        String couponId=redisCache.getCacheObject(param.getCode());
+        String couponId=redisCache.getCacheObject(param.getCode(), String.class);
         if(couponId==null){
             return R.error("此券已过期");
         }

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/IndexController.java

@@ -159,7 +159,7 @@ public class IndexController extends AppBaseController {
 	public R queryIsTownOn(String bock,String appId)
 	{
 		String key = appId+"start_status_001";
-		String start = redisCache.getCacheObject(key);
+		String start = redisCache.getCacheObject(key, String.class);
 		if (ObjectUtil.isNotEmpty(bock)){
 			if (bock.equals("001")){
 				redisCache.setCacheObject(key,bock);

+ 3 - 3
fs-user-app/src/main/java/com/fs/app/controller/PackageOrderController.java

@@ -210,7 +210,7 @@ public class PackageOrderController extends  AppBaseController {
         if(!allowed){
             String companyUserToken = request.getHeader("companyUserToken");
             if(StringUtils.isNotEmpty(companyUserToken)){
-                Long companyUserId = redisCache.getCacheObject("company-user-token:" + companyUserToken);
+                Long companyUserId = redisCache.getCacheObject("company-user-token:" + companyUserToken, Long.class);
                 allowed = companyUserId != null && order.getCompanyUserId() != null && companyUserId.equals(order.getCompanyUserId());
             }
         }
@@ -268,7 +268,7 @@ public class PackageOrderController extends  AppBaseController {
     public R createSalesOrder(@RequestParam("token")String token,
                               @RequestParam("packageId")Long packageId,
                               HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+        Long userId = redisCache.getCacheObject("company-user-token:"+token, Long.class);
         if(userId==null){
             return R.error(403,"用户失效");
         }
@@ -290,7 +290,7 @@ public class PackageOrderController extends  AppBaseController {
                                    @RequestParam(value = "payAmount",required = false) BigDecimal payAmount,
                                    @RequestParam(value = "payType",required = false) Integer payType,
                                    HttpServletRequest request){
-        Long userId = redisCache.getCacheObject("company-user-token:"+token);
+        Long userId = redisCache.getCacheObject("company-user-token:"+token, Long.class);
         if(userId==null){
             return R.error(403,"用户失效");
         }

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/PrescribeController.java

@@ -76,7 +76,7 @@ public class PrescribeController extends  AppBaseController {
         if(!allowed && isCompanyUser != null && isCompanyUser == 1){
             String companyUserToken = ServletUtils.getRequest().getHeader("companyUserToken");
             if(StringUtils.isNotEmpty(companyUserToken)){
-                Long companyUserId = redisCache.getCacheObject("company-user-token:" + companyUserToken);
+                Long companyUserId = redisCache.getCacheObject("company-user-token:" + companyUserToken, Long.class);
                 if(companyUserId != null && prescribe.getStoreOrderId() != null){
                     FsStoreOrder order = storeOrderService.selectFsStoreOrderByOrderId(prescribe.getStoreOrderId());
                     allowed = order != null && companyUserId.equals(order.getCompanyUserId());

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/VideoTestController.java

@@ -199,7 +199,7 @@ public class VideoTestController{
     public R test2() {
         Collection<String> keys = redisCache.keys("course:finish:*");
         for (String key : keys) {
-            QwSopLogs logs = redisCache.getCacheObject(key);
+            QwSopLogs logs = redisCache.getCacheObject(key, QwSopLogs.class);
             redisCache.deleteObject(key);
         }
         return R.ok();

+ 3 - 3
fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwController.java

@@ -180,7 +180,7 @@ public class CourseQwController extends AppBaseController {
             }
             // 从Redis中获取观看时长
             String redisKey = "h5user:watch:duration:" + param.getQwUserId()+ ":" + param.getQwExternalId() + ":" + param.getVideoId();
-            String durationStr = redisCache.getCacheObject(redisKey);
+            String durationStr = redisCache.getCacheObject(redisKey, String.class);
             FsCourseWatchLog log = courseWatchLogService.getWatchCourseVideo(param.getUserId(),param.getVideoId(),param.getQwUserId(),param.getQwExternalId());
             if (log==null){
                 return R.error("记录不存在,请联系客服!");
@@ -204,7 +204,7 @@ public class CourseQwController extends AppBaseController {
 
             //将视频时长也存到redis
             String videoRedisKey = "h5user:video:duration:" + param.getVideoId();
-            Long videoDuration = redisCache.getCacheObject(videoRedisKey);
+            Long videoDuration = redisCache.getCacheObject(videoRedisKey, Long.class);
             if (videoDuration==null){
 
                 redisCache.setCacheObject(videoRedisKey,course.getDuration());
@@ -221,7 +221,7 @@ public class CourseQwController extends AppBaseController {
             int isFinish = 0;
             // 从Redis中获取观看时长
             String redisKey = "h5OpenUser:watch:duration:" + param.getUserId() + ":" + param.getVideoId();
-            String durationStr = redisCache.getCacheObject(redisKey);
+            String durationStr = redisCache.getCacheObject(redisKey, String.class);
             FsCourseWatchLog log = courseWatchLogService.getWatchCourseVideoIsOpen(param.getUserId(),param.getVideoId());
             if (log==null){
                 return R.error("记录不存在,请联系客服!");

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/live/LiveController.java

@@ -340,7 +340,7 @@ public class LiveController extends AppBaseController {
 			
 			// 从 Redis 缓存中获取 access_token
 			String cacheKey = "wx:access_token:" + appId;
-			String access_token = redisCache.getCacheObject(cacheKey);
+			String access_token = redisCache.getCacheObject(cacheKey, String.class);
 			
 			// 如果缓存中没有或已过期,则重新获取
 			if (StringUtils.isEmpty(access_token)) {

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/live/LiveGoodsController.java

@@ -140,7 +140,7 @@ public class LiveGoodsController extends AppBaseController
     {
         // 先从缓存中获取商品详情
         String cacheKey = String.format(LiveKeysConstant.PRODUCT_DETAIL_CACHE, productId);
-        Map<String, Object> cachedData = redisCache.getCacheObject(cacheKey);
+        Map cachedData = redisCache.getCacheObject(cacheKey, Map.class);
         
         FsStoreProductScrm product;
         List<FsStoreProductAttrScrm> productAttr;

+ 1 - 1
fs-user-app/src/main/java/com/fs/app/controller/store/AppLoginScrmController.java

@@ -98,7 +98,7 @@ public class AppLoginScrmController extends AppBaseController {
         if (user==null){
             return R.error("用户不存在");
         }
-        String code = redisCache.getCacheObject(user.getPhone());
+        String code = redisCache.getCacheObject(user.getPhone(), String.class);
         if(StringUtils.isEmpty(code)){
             return R.error("验证码已过期");
         }

+ 3 - 3
fs-user-app/src/main/java/com/fs/app/controller/store/CompanyOrderScrmController.java

@@ -74,7 +74,7 @@ public class CompanyOrderScrmController extends AppBaseController {
                               @RequestParam(value = "isPackage", required = false, defaultValue = "0")Integer isPackage,
                               @RequestParam(value = "packageId", required = false)String packageId,
                               HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+        Long userId = redisCache.getCacheObject("company-user-token:"+token, Long.class);
         if(userId==null){
             return R.error(403,"用户失效");
         }
@@ -108,7 +108,7 @@ public class CompanyOrderScrmController extends AppBaseController {
                                    @RequestParam(value = "payType",required = false) Integer payType,
                                    @RequestParam(value = "isPackage",required = false,defaultValue = "0")Integer isPackage,
                                    HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+        Long userId = redisCache.getCacheObject("company-user-token:"+token, Long.class);
         if(userId==null){
             return R.error(403,"用户失效");
         }
@@ -150,7 +150,7 @@ public class CompanyOrderScrmController extends AppBaseController {
     @GetMapping("/editOrderMoney")
     @Transactional
     public R editOrderMoney(@RequestParam("token")String token,@RequestParam("orderId")Long orderId, @RequestParam("money") BigDecimal money, HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+        Long userId = redisCache.getCacheObject("company-user-token:"+token, Long.class);
         if(userId==null){
             return R.error(403,"用户失效");
         }

+ 4 - 4
fs-user-app/src/main/java/com/fs/app/controller/store/CompanyUserScrmController.java

@@ -135,7 +135,7 @@ public class CompanyUserScrmController extends AppBaseController {
     @ApiOperation("获取销售信息")
     @GetMapping("/getUserInfo")
     public R getUserInfo(@RequestParam("token")String token, HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+        Long userId = redisCache.getCacheObject("company-user-token:"+token, Long.class);
         if(userId==null){
             return R.error(403,"用户失效");
         }
@@ -175,7 +175,7 @@ public class CompanyUserScrmController extends AppBaseController {
     @ApiOperation("获取支付宝收款码")
     @GetMapping("/getQrImg")
     public R getQrImg(@RequestParam("token")String token,HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+        Long userId = redisCache.getCacheObject("company-user-token:"+token, Long.class);
         try {
             CompanyUser companyUser=companyUserService.selectCompanyUserById(userId);
             File newFile = new File("qr.jpg");
@@ -265,9 +265,9 @@ public class CompanyUserScrmController extends AppBaseController {
         //获取用户码
         String WxaCode;
         if(CloudHostUtils.hasCloudHostName("鸿森堂")) {
-            WxaCode = redisCache.getCacheObject("company-wxa-code:" + companyId + ":" + appId + ":" + companyUserId);
+            WxaCode = redisCache.getCacheObject("company-wxa-code:" + companyId + ":" + appId + ":" + companyUserId, String.class);
         } else {
-            WxaCode = redisCache.getCacheObject("company-wxa-code:" + companyId + ":" + appId);
+            WxaCode = redisCache.getCacheObject("company-wxa-code:" + companyId + ":" + appId, String.class);
         }
         return R.ok().put("data",WxaCode);
     }

Some files were not shown because too many files changed in this diff