From ce22c9b7ff101a674637157b6413d777e04f7bea Mon Sep 17 00:00:00 2001
From: lifenlong <pikachu1995@126.com>
Date: Tue, 3 Aug 2021 23:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=EF=BC=8C=E6=8C=89=E7=85=A7=E8=A7=84=E6=A0=BC=E5=8E=BB=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=B4=A2=E5=BC=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/application.yml                                |  4 ++--
 .../serviceimpl/VerificationSourceServiceImpl.java    | 11 ++++++-----
 .../controller/other/ElasticsearchController.java     |  5 ++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/application.yml b/config/application.yml
index a119cd71..b3516405 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/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://192.168.0.116:3306/lanshan?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
         username: root
         password: lilishop
         maxActive: 20
@@ -118,7 +118,7 @@ spring:
     props:
       #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
       sql:
-        show: true
+        show: false
 
 # 忽略鉴权url
 ignored:
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 9ffb5915..329823ba 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,10 +48,11 @@ public class VerificationSourceServiceImpl extends ServiceImpl<VerificationSourc
 
     @Override
     public VerificationDTO getVerificationCache() {
-        VerificationDTO verificationDTO = cache.get(VERIFICATION_CACHE);
-        if (verificationDTO == null) {
-            return initCache();
-        }
-        return verificationDTO;
+        return initCache();
+//        VerificationDTO verificationDTO = cache.get(VERIFICATION_CACHE);
+//        if (verificationDTO == null) {
+//
+//        }
+//        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 083e91f0..2f5e6421 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
@@ -2,8 +2,8 @@ package cn.lili.controller.other;
 
 import cn.hutool.json.JSONUtil;
 import cn.lili.modules.goods.entity.dos.Goods;
-import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
+import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
 import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import cn.lili.modules.goods.service.GoodsService;
@@ -66,7 +66,6 @@ public class ElasticsearchController {
         String goodsId = null;
         //库存锁是在redis做的，所以生成索引，同时更新一下redis中的库存数量
         for (GoodsSku goodsSku : list) {
-            if (goodsId == null || !goodsId.equals(goodsSku.getGoodsId())) {
                 goodsId = goodsSku.getGoodsId();
                 Goods goods = goodsService.getById(goodsId);
                 EsGoodsIndex index = new EsGoodsIndex(goodsSku);
@@ -78,7 +77,7 @@ public class ElasticsearchController {
                 index.setPromotionMap(goodsCurrentPromotionMap);
                 esGoodsIndices.add(index);
                 stringRedisTemplate.opsForValue().set(GoodsSkuService.getStockCacheKey(goodsSku.getId()), goodsSku.getQuantity().toString());
-            }
+
         }
         //初始化商品索引
         esGoodsIndexService.initIndex(esGoodsIndices);