Merge remote-tracking branch 'origin/master' 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-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/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;