Merge remote-tracking branch 'origin/quanku_0914' into quanku_0914

ch-admin-api/src/test/java/com/wwdz/ch/admin/impl/ElasticsearchUtilTest.java

@@ -56,15 +56,25 @@ public class ElasticsearchUtilTest {
     @Test
     public void find() {
         EsSearchRequestDto esSearchRequestDto = new EsSearchRequestDto();
-     //   esSearchRequestDto.setContent("清代");
+    //    esSearchRequestDto.setContent("清代");
      //   esSearchRequestDto.setIncludes(Arrays.asList("id", "source", "name","images","updateTime", "createTime"));
         esSearchRequestDto.setPage(1);
-        esSearchRequestDto.setSize(20);
+        esSearchRequestDto.setSize(40);
         EsPageInfo esPageInfo = itemEsDao.findList(esSearchRequestDto);
         logger.info("esPageInfo = {}", esPageInfo);
 
     }
 
+    @Test
+    public void getCuewords() {
+        EsSearchRequestDto esSearchRequestDto = new EsSearchRequestDto();
+        esSearchRequestDto.setContent("清代");
+        esSearchRequestDto.setSize(20);
+        List<ItemOfEs> itemOfEsList = itemEsDao.getCuewords(esSearchRequestDto);
+        logger.info("getCuewords = {}", itemOfEsList);
+    }
+
+
  /*   @Test
     public void find2() throws IOException {
         EsSearchRequestDto esSearchRequestDto = new EsSearchRequestDto();

ch-dao/pom.xml

@@ -214,6 +214,15 @@
             </plugin>
         </plugins>
 
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
+
     </build>
 
 </project>

ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java

@@ -30,9 +30,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 		registry.addInterceptor(loginInterceptor())
 				.addPathPatterns("/**")
 				.excludePathPatterns("/*.html", "/**/*.html", "/**/*.css", "/**/*.js"
-						, "/wx/user/loginByWx", "/wx/user/loginByMobile", "/wx/user/loginRegCaptcha", "/wx/user/updateRegCaptcha", "/wx/user/login", "/wx/user/fillCode");
-//						, "/wx/item/page", "/wx/item/info", "/wx/item/findNames"
-//						, "/wx/favorites/info", "/wx/favorites/itemList"
-//						, "/wx/keyword/recommend", "/wx/queryPrice/**");
+						, "/wx/user/loginByWx", "/wx/user/loginByMobile", "/wx/user/loginRegCaptcha", "/wx/user/updateRegCaptcha", "/wx/user/login", "/wx/user/fillCode"
+						, "/wx/queryPrice/**");
 	}
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java

@@ -560,55 +560,6 @@ public class ItemServiceImpl implements ItemService {
             item.setUpdateTime(now);
             itemDao.update(item);
 
-            // 更新收藏册
-            List<Long> favoritesIds = new ArrayList<>();
-            FavoritesItemsRelation beforeRelation = favoritesItemsRelationDao.selectByUserIdItemId(dto.getUserId(), dto.getId());
-            if (Objects.isNull(beforeRelation)) {
-                if (Objects.nonNull(dto.getFavoritesId()) && !dto.getFavoritesId().equals(0L)) {
-                    // 新增藏品和收藏册关联
-                    FavoritesItemsRelation favoritesItemsRelation = new FavoritesItemsRelation();
-                    favoritesItemsRelation.setUserId(dto.getUserId());
-                    favoritesItemsRelation.setFavoritesId(dto.getFavoritesId());
-                    favoritesItemsRelation.setItemId(item.getId());
-                    favoritesItemsRelation.setAddTime(now);
-                    favoritesItemsRelation.setUpdateTime(now);
-                    favoritesItemsRelationDao.insert(favoritesItemsRelation);
-
-                    // 加入更新列表
-                    favoritesIds.add(dto.getFavoritesId());
-                }
-            } else {
-                Long beforeFavoritesId = beforeRelation.getFavoritesId();
-                if (Objects.isNull(dto.getFavoritesId()) || dto.getFavoritesId().equals(0L)) {
-                    // 删除原来藏品和收藏册关联
-                    favoritesItemsRelationDao.deleteByUserIdItemId(dto.getUserId(), dto.getId());
-
-                    // 加入更新列表
-                    favoritesIds.add(beforeFavoritesId);
-                } else {
-                    if (!beforeRelation.getFavoritesId().equals(dto.getFavoritesId())) {
-                        // 删除原来藏品和收藏册关联
-                        favoritesItemsRelationDao.deleteByUserIdItemId(dto.getUserId(), dto.getId());
-
-                        // 新增藏品和收藏册关联
-                        FavoritesItemsRelation favoritesItemsRelation = new FavoritesItemsRelation();
-                        favoritesItemsRelation.setUserId(dto.getUserId());
-                        favoritesItemsRelation.setFavoritesId(dto.getFavoritesId());
-                        favoritesItemsRelation.setItemId(item.getId());
-                        favoritesItemsRelation.setAddTime(now);
-                        favoritesItemsRelation.setUpdateTime(now);
-                        favoritesItemsRelationDao.insert(favoritesItemsRelation);
-
-                        // 加入更新列表
-                        favoritesIds.add(beforeFavoritesId);
-                        favoritesIds.add(dto.getFavoritesId());
-                    }
-                }
-            }
-            if (CollectionUtils.isNotEmpty(favoritesIds)) {
-                favoritesDao.updateTime(null, favoritesIds);
-            }
-
             Map<String, Object> map = new HashMap<>();
             map.put("id", dto.getId());
             return Result.success(map);

ch-wx-api/src/main/java/com/wwdz/ch/wx/interceptor/LoginInterceptor.java

@@ -44,7 +44,9 @@ public class LoginInterceptor implements HandlerInterceptor {
         String token = request.getHeader("Authorization");
         Switch switchh = switchService.findOnly();
         boolean isOpen = Objects.nonNull(switchh) && switchh.getState() == 1;
+        logger.info("isOpen:" + isOpen);
         String url = request.getRequestURI();
+        logger.info("url:" + url);
         if (!isOpen) {
             if (Arrays.asList(excludeUrl).contains(url)) {
                 return true;