From 77a30459cdc7b6a0c3a8254716a1903e893fb9f6 Mon Sep 17 00:00:00 2001
From: lifenlong <pikachu1995@126.com>
Date: Wed, 4 Aug 2021 09:27:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/application.yml                                |  2 +-
 .../search/serviceimpl/EsGoodsSearchServiceImpl.java  |  6 +++---
 .../serviceimpl/VerificationSourceServiceImpl.java    | 11 +++++------
 .../controller/other/ElasticsearchController.java     |  4 ----
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/config/application.yml b/config/application.yml
index b3516405..f3d8b6bb 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -74,7 +74,7 @@ spring:
       default-datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.0.116:3306/lanshan?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://192.168.0.116:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
         username: root
         password: lilishop
         maxActive: 20
diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
index 2ad41f23..1da832ea 100644
--- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
@@ -104,12 +104,12 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
     @Override
     public List<String> getHotWords(Integer count) {
         List<String> hotWords = new ArrayList<>();
-        if (hotWords.isEmpty() || hotWords == null) {
-            return null;
-        }
         //下表从0开始，所以count-1
         count = count - 1;
         Set<DefaultTypedTuple> set = cache.reverseRangeWithScores(CachePrefix.HOT_WORD.getPrefix(), count);
+        if (set.isEmpty() || set == null) {
+            return null;
+        }
         for (DefaultTypedTuple defaultTypedTuple : set) {
             hotWords.add(Objects.requireNonNull(defaultTypedTuple.getValue()).toString());
         }
diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java
index 329823ba..9ffb5915 100644
--- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java
@@ -48,11 +48,10 @@ public class VerificationSourceServiceImpl extends ServiceImpl<VerificationSourc
 
     @Override
     public VerificationDTO getVerificationCache() {
-        return initCache();
-//        VerificationDTO verificationDTO = cache.get(VERIFICATION_CACHE);
-//        if (verificationDTO == null) {
-//
-//        }
-//        return verificationDTO;
+        VerificationDTO verificationDTO = cache.get(VERIFICATION_CACHE);
+        if (verificationDTO == null) {
+            return initCache();
+        }
+        return verificationDTO;
     }
 }
\ No newline at end of file
diff --git a/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java b/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
index 2f5e6421..e5d9ba79 100644
--- a/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
+++ b/manager-api/src/main/java/cn/lili/controller/other/ElasticsearchController.java
@@ -8,7 +8,6 @@ import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import cn.lili.modules.goods.service.GoodsService;
 import cn.lili.modules.goods.service.GoodsSkuService;
-import cn.lili.modules.goods.service.ParametersService;
 import cn.lili.modules.promotion.service.PromotionService;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import cn.lili.modules.search.service.EsGoodsIndexService;
@@ -51,9 +50,6 @@ public class ElasticsearchController {
     @Autowired
     private PromotionService promotionService;
 
-    @Autowired
-    private ParametersService parametersService;
-
     @GetMapping
     public void init() {
         //查询商品信息