map = new LinkedHashMap<>();
map.put("integral",integral);
diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java
index 7cdc0922..8485c58d 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java
@@ -10,7 +10,7 @@ package co.yixiang.modules.user.rest;
import co.yixiang.api.ApiResult;
-import co.yixiang.logging.aop.log.AppLog;
+import co.yixiang.modules.logging.aop.log.AppLog;
import co.yixiang.common.bean.LocalUser;
import co.yixiang.common.interceptor.AuthCheck;
import co.yixiang.constant.SystemConfigConstants;
diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java
index 744008c0..f50048aa 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java
@@ -12,7 +12,7 @@ import cn.hutool.core.bean.BeanUtil;
import co.yixiang.api.ApiResult;
import co.yixiang.api.YshopException;
import co.yixiang.enums.ShopCommonEnum;
-import co.yixiang.logging.aop.log.AppLog;
+import co.yixiang.modules.logging.aop.log.AppLog;
import co.yixiang.common.bean.LocalUser;
import co.yixiang.common.interceptor.AuthCheck;
import co.yixiang.constant.ShopConstants;
diff --git a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java
index b06b5fa7..fb49ba0d 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java
@@ -14,7 +14,7 @@ import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import co.yixiang.api.YshopException;
import co.yixiang.constant.ShopConstants;
-import co.yixiang.logging.aop.log.AppLog;
+import co.yixiang.modules.logging.aop.log.AppLog;
import co.yixiang.common.bean.LocalUser;
import co.yixiang.common.interceptor.AuthCheck;
import co.yixiang.modules.user.domain.YxUser;
@@ -24,12 +24,10 @@ import co.yixiang.modules.wechat.rest.param.WxPhoneParam;
import co.yixiang.modules.mp.config.WxMaConfiguration;
import co.yixiang.utils.RedisUtil;
import co.yixiang.utils.RedisUtils;
-import co.yixiang.utils.SecurityUtils;
import co.yixiang.utils.ShopKeyUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
diff --git a/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java b/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java
index 5fc4b31c..2c5bafb6 100644
--- a/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java
+++ b/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java
@@ -6,7 +6,7 @@ import co.yixiang.api.ApiResult;
import co.yixiang.api.YshopException;
import co.yixiang.common.bean.LocalUser;
import co.yixiang.common.interceptor.AuthCheck;
-import co.yixiang.logging.aop.log.AppLog;
+import co.yixiang.modules.logging.aop.log.AppLog;
import co.yixiang.modules.order.domain.YxExpress;
import co.yixiang.modules.order.service.YxExpressService;
import co.yixiang.modules.order.service.dto.YxExpressQueryCriteria;
diff --git a/yshop-app/src/main/resources/config/application.yml b/yshop-app/src/main/resources/config/application.yml
index 08663572..9bd144e5 100644
--- a/yshop-app/src/main/resources/config/application.yml
+++ b/yshop-app/src/main/resources/config/application.yml
@@ -9,8 +9,12 @@ server:
tomcat:
uri-encoding: UTF-8
-
spring:
+ mvc:
+ pathmatch:
+ matching-strategy: ant_path_matcher
+ main:
+ allow-circular-references: true
freemarker:
check-template-location: false
profiles:
diff --git a/yshop-common/pom.xml b/yshop-common/pom.xml
index 54601282..85b675c4 100644
--- a/yshop-common/pom.xml
+++ b/yshop-common/pom.xml
@@ -12,7 +12,7 @@
yshop-common
公共模块
- 4.2.0
+ 4.3.0
diff --git a/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java b/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java
index 067f7c2e..85e1cdf5 100644
--- a/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java
+++ b/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java
@@ -7,7 +7,6 @@ package co.yixiang.aspect;
import co.yixiang.annotation.Limit;
import co.yixiang.exception.BadLimitRequestException;
-import co.yixiang.exception.BadRequestException;
import co.yixiang.utils.RequestHolder;
import co.yixiang.utils.StringUtils;
import com.google.common.collect.ImmutableList;
@@ -63,8 +62,8 @@ public class LimitAspect {
ImmutableList
diff --git a/yshop-mproot/pom.xml b/yshop-mproot/pom.xml
index e3401ec9..e82b0d60 100644
--- a/yshop-mproot/pom.xml
+++ b/yshop-mproot/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
MyBatisPlus模块
diff --git a/yshop-shop/pom.xml b/yshop-shop/pom.xml
index f9cba5dc..9d938852 100644
--- a/yshop-shop/pom.xml
+++ b/yshop-shop/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -20,7 +20,7 @@
co.yixiang
yshop-weixin
- 3.2
+ 3.3
diff --git a/yshop-tools/pom.xml b/yshop-tools/pom.xml
index 5ccb3f84..d6c1dac0 100644
--- a/yshop-tools/pom.xml
+++ b/yshop-tools/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -23,7 +23,7 @@
co.yixiang
yshop-logging
- 3.2
+ 3.3
diff --git a/yshop-weixin/pom.xml b/yshop-weixin/pom.xml
index c785d0f9..cdfae60a 100644
--- a/yshop-weixin/pom.xml
+++ b/yshop-weixin/pom.xml
@@ -5,7 +5,7 @@
yshop
co.yixiang
- 3.2
+ 3.3
4.0.0
@@ -21,7 +21,7 @@
co.yixiang
yshop-mall
- 3.2
+ 3.3
From 7328c454e83752f204dba41358bc441bacf575be Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Sun, 1 May 2022 18:02:04 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E7=A7=92=E6=9D=80=E5=80=92=E8=AE=A1?=
=?UTF-8?q?=E6=97=B6=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../activity/rest/StoreSeckillController.java | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
index cbb4a100..9fc25ce3 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
@@ -42,9 +42,13 @@ import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.Date;
import java.util.List;
+import java.util.OptionalInt;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
/**
*
@@ -143,8 +147,8 @@ public class StoreSeckillController {
seckillTimeDto.setState("即将开始");
seckillTimeDto.setTime(jsonObject.get("time").toString().length() > 1 ? jsonObject.get("time").toString() + ":00" : "0" + jsonObject.get("time").toString() + ":00");
seckillTimeDto.setStatus(2);
- seckillTimeDto.setStop(OrderUtil.dateToTimestamp(new Date()) + activityEndHour * 3600);
- } else if (currentHour >= activityEndHour) {
+ seckillTimeDto.setStop(today + time * 3600);
+ } else {
seckillTimeDto.setState("已结束");
seckillTimeDto.setTime(jsonObject.get("time").toString().length() > 1 ? jsonObject.get("time").toString() + ":00" : "0" + jsonObject.get("time").toString() + ":00");
seckillTimeDto.setStatus(0);
@@ -153,8 +157,15 @@ public class StoreSeckillController {
}
list.add(seckillTimeDto);
});
- seckillConfigVo.setSeckillTimeIndex(seckillTimeIndex.get());
- seckillConfigVo.setSeckillTime(list);
+
+ List seckillTimeDtoList = list.stream()
+ .sorted(Comparator.comparing(SeckillTimeDto::getTime))
+ .collect(Collectors.toList());
+ OptionalInt optionalInt = IntStream.range(0, seckillTimeDtoList.size())
+ .filter(i -> seckillTimeDtoList.get(i).getStatus().equals(1))
+ .findFirst();
+ seckillConfigVo.setSeckillTimeIndex(optionalInt.isPresent() ? optionalInt.getAsInt() : 0);
+ seckillConfigVo.setSeckillTime(seckillTimeDtoList);
return ApiResult.ok(seckillConfigVo);
}
}
From c07ffd933b95b9247ab4fcfcde2fa7f677c4cc02 Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Sun, 15 May 2022 17:34:00 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E5=8D=87=E7=BA=A7druid=E4=B8=BA1.2.9,?=
=?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=89=8B=E5=8A=A8=E5=BC=95=E5=85=A5=E7=9A=84?=
=?UTF-8?q?logback=E4=BE=9D=E8=B5=96,logback=E6=97=A5=E5=BF=97=E8=A7=84?=
=?UTF-8?q?=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 19 -------------------
.../{logback.xml => logback-spring.xml} | 0
.../{logback.xml => logback-spring.xml} | 0
3 files changed, 19 deletions(-)
rename yshop-admin/src/main/resources/{logback.xml => logback-spring.xml} (100%)
rename yshop-app/src/main/resources/{logback.xml => logback-spring.xml} (100%)
diff --git a/pom.xml b/pom.xml
index 3bdfb778..09b107d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,6 @@
- 1.2.11
UTF-8
UTF-8
1.8
@@ -67,24 +66,6 @@
test