鉴权修改

leromro-admin/src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.leromro.LeromroApplication
+

leromro-core/src/main/java/com/leromro/core/controller/SearchHistoryController.java

@@ -37,22 +37,25 @@ public class SearchHistoryController {
     @ApiOperation(value = "在redis中获取首页搜索记录")
     @GetMapping("/businessTireNameHistory")
     public R<List<String>> searchHistory(){
-        Long userId = SecurityUtils.getUserId();
-        List<String> searchList = new ArrayList<>();
-        String key = CacheConstants.SEARCH_HISTORY_KEY + userId;
-        long start = 1;
-        long size = 10;
-        Set<ZSetOperations.TypedTuple> historySet = redisTemplate.opsForZSet().reverseRangeWithScores(key, start - 1, size - 1);
-        Iterator<ZSetOperations.TypedTuple> iterator = historySet.iterator();
-        BigDecimal bigDecimal = null;
-        while (iterator.hasNext()){
-            ZSetOperations.TypedTuple next = iterator.next();
-            BigDecimal decimal = BigDecimal.valueOf(next.getScore());
-            if (next.getValue() != null){
-                searchList.add(next.getValue().toString());
+        try {
+            Long userId = SecurityUtils.getUserId();
+            List<String> searchList = new ArrayList<>();
+            String key = CacheConstants.SEARCH_HISTORY_KEY + userId;
+            long start = 1;
+            long size = 10;
+            Set<ZSetOperations.TypedTuple> historySet = redisTemplate.opsForZSet().reverseRangeWithScores(key, start - 1, size - 1);
+            Iterator<ZSetOperations.TypedTuple> iterator = historySet.iterator();
+            BigDecimal bigDecimal = null;
+            while (iterator.hasNext()){
+                ZSetOperations.TypedTuple next = iterator.next();
+                BigDecimal decimal = BigDecimal.valueOf(next.getScore());
+                if (next.getValue() != null){
+                    searchList.add(next.getValue().toString());
+                }
             }
+            return R.ok(searchList);
+        }catch (Exception e){
+            return R.ok();
         }
-        return R.ok(searchList);
     }
-
 }

leromro-core/src/main/java/com/leromro/core/mapper/LSlideshowMapper.java

@@ -16,11 +16,11 @@ public interface LSlideshowMapper extends BaseMapper<Slideshow>
 {
     /**
      * 查询主页轮播图或后续其他广告图片
-     * 
+     *
      * @param slideshowType 主页轮播图或后续其他广告图片主键
      * @return 主页轮播图或后续其他广告图片
      */
-    public Slideshow selectLSlideshowBySlideshowType(ListPermission listPermission ,@Param("slideshowType") Long slideshowType);
+    public Slideshow selectLSlideshowBySlideshowType(@Param("slideshowType") Long slideshowType);
 
     /**
      * 查询主页轮播图或后续其他广告图片列表

leromro-core/src/main/java/com/leromro/core/service/impl/LSlideshowServiceImpl.java

@@ -41,8 +41,8 @@ public class LSlideshowServiceImpl extends ServiceImpl<LSlideshowMapper, Slidesh
      */
     @Override
     public Slideshow selectLSlideshowBySlideshowType(Long slideshowType)
-    {
-        Slideshow slideshow = lSlideshowMapper.selectLSlideshowBySlideshowType(new ListPermission(Slideshow.class, CommonConstants.CHECK_PROVINCE_CITY_DISTRICT),slideshowType);
+    {   //new ListPermission(Slideshow.class, CommonConstants.CHECK_PROVINCE_CITY_DISTRICT),
+        Slideshow slideshow = lSlideshowMapper.selectLSlideshowBySlideshowType(slideshowType);
         if (slideshow==null){
             return lSlideshowMapper.selectDefultSlideshowByType(slideshowType);
         }

leromro-core/src/main/java/com/leromro/core/service/impl/VolunteerInfoServiceImpl.java

@@ -188,9 +188,14 @@ public class VolunteerInfoServiceImpl extends ServiceImpl<VolunteerInfoMapper, V
         //查询出志愿者信息
         List<VolunteerInfoVO> infos = volunteerInfoMapper.selectVolunteerInfoSimple(volunteerInfo);
         //把搜索历史记录放在redis中
-        Long userId = SecurityUtils.getUserId();
-        redisTemplate.opsForZSet().add(CacheConstants.SEARCH_HISTORY_KEY + userId, volunteerInfo.getBusinessTierName(), System.currentTimeMillis());
-        insertSearchSort(CacheConstants.SEARCH_HISTORY_KEY + userId, volunteerInfo.getBusinessTierName());
+        try {
+            Long userId = SecurityUtils.getUserId();
+            redisTemplate.opsForZSet().add(CacheConstants.SEARCH_HISTORY_KEY + userId, volunteerInfo.getBusinessTierName(), System.currentTimeMillis());
+            insertSearchSort(CacheConstants.SEARCH_HISTORY_KEY + userId, volunteerInfo.getBusinessTierName());
+        }catch (Exception e){
+
+        }
+
         //查询出所有服务名称
        /* Map<Long, String> idMapTierName = businessManagementService.list().stream().collect(Collectors.toMap(BusinessManagement::getBusinessManagementId, BusinessManagement::getBusinessTierName));
         if (ObjectUtil.isNotEmpty(infos)){

leromro-framework/src/main/java/com/leromro/framework/config/SecurityConfig.java

@@ -112,7 +112,7 @@ public class SecurityConfig
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 requests.antMatchers("/login","/loginWeb", "/register", "/captchaImage","/system/dict/**,","/websocket/**",
-                                "/core/users/orders/payNotify","/core/users/orders/refundNotify","/system/config/getHomeRollText","/system/config/serviceUrl/**").permitAll()
+                                "/core/users/orders/payNotify","/core/users/orders/refundNotify","/system/config/getHomeRollText","/system/config/serviceUrl/**","/core/searchHistory/info/businessTireNameHistory","/core/volunteer/info/searchBusinessTypeList").permitAll()
                     //微信小程序需要提供部分预览功能
                     .antMatchers("/core/volunteer/info/list","/core/volunteer/info/getDetails",
                                 "/web/core/slideshow/**","/core/business/management/**",