From cd374f2d984d8b83d7105c80c34d0af53f2bc218 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Fri, 18 Feb 2022 15:38:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=B3=E9=97=ADconsumer=20spring=20secur?=
 =?UTF-8?q?ity=E8=BA=AB=E4=BB=BD=E9=AA=8C=E8=AF=81=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lili/sucurity/ConsumerSecurityConfig.java  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 consumer/src/main/java/cn/lili/sucurity/ConsumerSecurityConfig.java

diff --git a/consumer/src/main/java/cn/lili/sucurity/ConsumerSecurityConfig.java b/consumer/src/main/java/cn/lili/sucurity/ConsumerSecurityConfig.java
new file mode 100644
index 00000000..761290bd
--- /dev/null
+++ b/consumer/src/main/java/cn/lili/sucurity/ConsumerSecurityConfig.java
@@ -0,0 +1,18 @@
+package cn.lili.sucurity;
+
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author paulG
+ * @since 2022/2/18
+ **/
+@Component
+public class ConsumerSecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.formLogin().disable();
+    }
+}

From f555f6423a18e2892a618cb6327cbcc9f126bda5 Mon Sep 17 00:00:00 2001
From: paulGao <paulgao0831@gmail.com>
Date: Fri, 18 Feb 2022 20:26:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/impl/promotion/PromotionEverydayExecute.java    | 6 ++++--
 .../java/cn/lili/modules/promotion/entity/dos/Seckill.java  | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
index 3d9dc61a..970ff34d 100644
--- a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
+++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
@@ -62,14 +62,16 @@ public class PromotionEverydayExecute implements EveryDayExecute {
     /**
      * 添加秒杀活动
      * 从系统设置中获取秒杀活动的配置
-     * 添加30天后的秒杀活动
+     * 添加明天后的秒杀活动
      */
     private void addSeckill() {
         Setting setting = settingService.get(SettingEnum.SECKILL_SETTING.name());
         SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class);
+        log.info("生成秒杀活动设置：{}", seckillSetting);
         for (int i = 1; i <= SeckillService.PRE_CREATION; i++) {
             Seckill seckill = new Seckill(i, seckillSetting.getHours(), seckillSetting.getSeckillRule());
-            seckillService.savePromotions(seckill);
+            boolean result = seckillService.savePromotions(seckill);
+            log.info("生成秒杀活动参数：{},结果：{}", seckill, result);
         }
     }
 }
diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java
index fbe4232d..c15d19e2 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java
@@ -1,6 +1,5 @@
 package cn.lili.modules.promotion.entity.dos;
 
-import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.lili.modules.promotion.entity.vos.SeckillVO;
@@ -59,8 +58,8 @@ public class Seckill extends BasePromotions {
 
     public Seckill(int day, String hours, String seckillRule) {
         //默认创建*天后的秒杀活动
-        DateTime dateTime = DateUtil.beginOfDay(DateUtil.offset(new DateTime(), DateField.DAY_OF_YEAR, day));
-        this.applyEndTime = dateTime;
+        DateTime dateTime = DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), day));
+        this.applyEndTime = DateUtil.offsetHour(new Date(), Integer.parseInt(hours) - 1);
         this.hours = hours;
         this.seckillRule = seckillRule;
         this.goodsNum = 0;