Merge branch 'master' into dev

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/appBase/controller/AppSwiperController.java

@@ -151,4 +151,29 @@ public class AppSwiperController extends BaseController
         map.put("user", sysUser);
         return CommonResult.success(map);
     }
+//    @GetMapping("/getJcWorkerInfo")
+//    public CommonResult getJcWorkerInfo()
+//    {
+//
+//        LambdaQueryWrapper<PartnerWorker> queryWrapper =new LambdaQueryWrapper<>();
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        queryWrapper.eq(PartnerWorker::getUserId,user.getUserId());
+//        PartnerWorker worker = jcWorkerService.getOne(queryWrapper);
+//        if (ObjectUtil.isNotEmpty(worker)){
+//            LambdaQueryWrapper<ShopMallPartners> queryWrapper1 =new LambdaQueryWrapper<>();
+//            queryWrapper1.eq(ShopMallPartners::getPartnerId,worker.getPartnerId()).eq(ShopMallPartners::getType,"jc").eq(ShopMallPartners::getIsBanned,"0");
+//            ShopMallPartners partner = partnersService.getOne(queryWrapper1);
+//            if (ObjectUtil.isEmpty(partner)){
+//                return error("信息有误");
+//            }
+//            ajax.put("partnerInfo", partner);
+//        }else {
+//            return error("信息有误");
+//        }
+//        SysUser sysUser = userService.selectUserById(user.getUserId());
+//
+//        ajax.put("user", sysUser);
+//
+//        return ajax;
+//    }
 }

dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/SysConfigServiceImpl.java

@@ -66,15 +66,11 @@ public class SysConfigServiceImpl implements ISysConfigService {
      */
     @Override
     public String selectConfigByKey(String configKey) {
-        String configValue = Convert.toStr(redisCache2.getCacheObject(getCacheKey(configKey)));
+
-        if (StringUtils.isNotEmpty(configValue)) {
-            return configValue;
-        }
         SysConfig config = new SysConfig();
         config.setConfigKey(configKey);
         SysConfig retConfig = configMapper2.selectConfig(config);
         if (StringUtils.isNotNull(retConfig)) {
-            redisCache2.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
             return retConfig.getConfigValue();
         }
         return StringUtils.EMPTY;