org.springframework.boot
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/AddressController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/AddressController.java
index 370191d..e9c8f0d 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/AddressController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/AddressController.java
@@ -5,17 +5,17 @@ import com.wayn.common.core.domain.shop.Address;
import com.wayn.common.core.service.shop.IAddressService;
import com.wayn.common.util.R;
import com.wayn.mobile.framework.security.util.MobileSecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
import java.util.Objects;
@RestController
+@AllArgsConstructor
@RequestMapping("address")
public class AddressController {
- @Autowired
private IAddressService iAddressService;
@GetMapping("list")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CartController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CartController.java
index 96a799d..663b652 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CartController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CartController.java
@@ -8,9 +8,8 @@ import com.wayn.common.util.R;
import com.wayn.mobile.api.domain.Cart;
import com.wayn.mobile.api.service.ICartService;
import com.wayn.mobile.framework.security.util.MobileSecurityUtils;
+import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.flyway.FlywayDataSource;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
@@ -26,10 +25,10 @@ import java.util.List;
*/
@Slf4j
@RestController
+@AllArgsConstructor
@RequestMapping("cart")
public class CartController extends BaseController {
- @Autowired
private ICartService iCartService;
@GetMapping("list")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CommentController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CommentController.java
index fd9a86e..50890ed 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CommentController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/CommentController.java
@@ -9,7 +9,7 @@ import com.wayn.common.core.domain.vo.CommentVO;
import com.wayn.common.core.service.shop.ICommentService;
import com.wayn.common.util.R;
import com.wayn.mobile.framework.security.util.MobileSecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
@RestController
+@AllArgsConstructor
@RequestMapping("comment")
public class CommentController extends BaseController {
- @Autowired
private ICommentService iCommentService;
@PostMapping("list")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/DiamondController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/DiamondController.java
index e5bf48d..150647f 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/DiamondController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/DiamondController.java
@@ -8,7 +8,7 @@ import com.wayn.common.core.service.shop.IDiamondService;
import com.wayn.common.util.R;
import com.wayn.mobile.design.strategy.context.DiamondJumpContext;
import com.wayn.mobile.design.strategy.strategy.DiamondJumpType;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -16,13 +16,12 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
+@AllArgsConstructor
@RequestMapping("diamond")
public class DiamondController extends BaseController {
- @Autowired
private IDiamondService iDiamondService;
- @Autowired
private DiamondJumpContext diamondJumpContext;
@GetMapping("getGoodsList")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/GoodsController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/GoodsController.java
index 40376dd..7d284c6 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/GoodsController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/GoodsController.java
@@ -2,17 +2,17 @@ package com.wayn.mobile.api.controller;
import com.wayn.common.util.R;
import com.wayn.mobile.api.service.IGoodsDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
+@AllArgsConstructor
@RequestMapping("goods")
public class GoodsController {
- @Autowired
private IGoodsDetailService iGoodsDetailService;
@GetMapping("detail/{goodsId}")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/HomeController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/HomeController.java
index 177bf6e..0bb393f 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/HomeController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/HomeController.java
@@ -5,17 +5,17 @@ import com.wayn.common.base.controller.BaseController;
import com.wayn.common.core.domain.shop.Goods;
import com.wayn.common.util.R;
import com.wayn.mobile.api.service.IHomeService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
+@AllArgsConstructor
@RequestMapping("home")
public class HomeController extends BaseController {
- @Autowired
private IHomeService IHomeService;
@PostMapping("index")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/LoginController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/LoginController.java
index f5c42e2..8f7c3cc 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/LoginController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/LoginController.java
@@ -18,8 +18,8 @@ import com.wayn.mobile.framework.security.LoginObj;
import com.wayn.mobile.framework.security.RegistryObj;
import com.wayn.mobile.framework.security.service.LoginService;
import com.wf.captcha.SpecCaptcha;
+import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Collections;
@@ -27,18 +27,15 @@ import java.util.Date;
import java.util.concurrent.TimeUnit;
@RestController
+@AllArgsConstructor
public class LoginController {
- @Autowired
private LoginService loginService;
- @Autowired
private RedisCache redisCache;
- @Autowired
private IMemberService iMemberService;
- @Autowired
private IMailConfigService mailConfigService;
@PostMapping("/login")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/OrderController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/OrderController.java
index 21126c0..78fcc78 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/OrderController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/OrderController.java
@@ -9,19 +9,18 @@ import com.wayn.common.core.domain.shop.Order;
import com.wayn.common.core.domain.vo.OrderVO;
import com.wayn.common.util.R;
import com.wayn.mobile.api.service.IOrderService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@Slf4j
@RestController
+@AllArgsConstructor
@RequestMapping("order")
public class OrderController extends BaseController {
- @Autowired
private IOrderService iOrderService;
@GetMapping("detail/{orderSn}")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SearchController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SearchController.java
index 82d28b0..170f410 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SearchController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SearchController.java
@@ -17,6 +17,7 @@ import com.wayn.mobile.api.domain.SearchHistory;
import com.wayn.mobile.api.service.ISearchHistoryService;
import com.wayn.mobile.framework.manager.thread.AsyncManager;
import com.wayn.mobile.framework.security.util.MobileSecurityUtils;
+import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.common.unit.TimeValue;
@@ -27,7 +28,6 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.sort.FieldSortBuilder;
import org.elasticsearch.search.sort.SortOrder;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -48,19 +48,16 @@ import java.util.stream.Collectors;
* @since 2020-09-23
*/
@RestController
+@AllArgsConstructor
@RequestMapping("search")
public class SearchController extends BaseController {
- @Autowired
private IGoodsService iGoodsService;
- @Autowired
private ISearchHistoryService iSearchHistoryService;
- @Autowired
private IKeywordService iKeywordService;
- @Autowired
private ElasticDocument elasticDocument;
@GetMapping("result")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SearchHistoryController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SearchHistoryController.java
index ef8b7ff..12cfb69 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SearchHistoryController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SearchHistoryController.java
@@ -7,7 +7,7 @@ import com.wayn.common.util.R;
import com.wayn.mobile.api.domain.SearchHistory;
import com.wayn.mobile.api.service.ISearchHistoryService;
import com.wayn.mobile.framework.security.util.MobileSecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
/**
@@ -19,10 +19,10 @@ import org.springframework.web.bind.annotation.*;
* @since 2020-09-23
*/
@RestController
+@AllArgsConstructor
@RequestMapping("searchHistory")
public class SearchHistoryController extends BaseController {
- @Autowired
private ISearchHistoryService iSearchHistoryService;
@GetMapping("list")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SeckillController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SeckillController.java
index 14e4091..064eb03 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SeckillController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/SeckillController.java
@@ -4,7 +4,7 @@ package com.wayn.mobile.api.controller;
import com.wayn.common.base.controller.BaseController;
import com.wayn.common.util.R;
import com.wayn.mobile.api.service.ISeckillService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -18,10 +18,10 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2020-08-04
*/
@RestController
+@AllArgsConstructor
@RequestMapping("seckill")
public class SeckillController extends BaseController {
- @Autowired
private ISeckillService iSeckillService;
@GetMapping("update")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/UserController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/UserController.java
index 02545cc..2eef207 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/UserController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/UserController.java
@@ -19,8 +19,8 @@ import com.wayn.mobile.framework.security.RegistryObj;
import com.wayn.mobile.framework.security.service.TokenService;
import com.wayn.mobile.framework.security.util.MobileSecurityUtils;
import com.wf.captcha.SpecCaptcha;
+import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDate;
@@ -29,19 +29,16 @@ import java.util.Objects;
import java.util.concurrent.TimeUnit;
@RestController
+@AllArgsConstructor
@RequestMapping("user")
public class UserController {
- @Autowired
private TokenService tokenService;
- @Autowired
private IMemberService iMemberService;
- @Autowired
private RedisCache redisCache;
- @Autowired
private IMailConfigService mailConfigService;
@GetMapping("info")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/message/EmailController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/message/EmailController.java
index a623a19..0a8917c 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/message/EmailController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/message/EmailController.java
@@ -5,7 +5,7 @@ import com.wayn.common.core.domain.vo.SendMailVO;
import com.wayn.common.core.service.tool.IMailConfigService;
import com.wayn.common.util.R;
import com.wayn.common.util.mail.MailUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -13,10 +13,10 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
+@AllArgsConstructor
@RequestMapping("message/email")
public class EmailController {
- @Autowired
private IMailConfigService mailConfigService;
@PostMapping
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/message/SubmitOrderController.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/message/SubmitOrderController.java
index 1393749..fe60c9e 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/message/SubmitOrderController.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/message/SubmitOrderController.java
@@ -4,16 +4,16 @@ import com.alibaba.fastjson.JSON;
import com.wayn.common.util.R;
import com.wayn.message.core.messsage.OrderDTO;
import com.wayn.mobile.api.service.IOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
+@AllArgsConstructor
@RequestMapping("message/order")
public class SubmitOrderController {
- @Autowired
private IOrderService iOrderService;
@PostMapping("submit")
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/IOrderService.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/IOrderService.java
index 46c8348..a52aa2b 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/IOrderService.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/IOrderService.java
@@ -7,9 +7,8 @@ import com.wayn.common.core.domain.shop.Order;
import com.wayn.common.core.domain.vo.OrderVO;
import com.wayn.common.util.R;
import com.wayn.message.core.messsage.OrderDTO;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
/**
*
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/OrderServiceImpl.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/OrderServiceImpl.java
index a718d50..764f25e 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/OrderServiceImpl.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/OrderServiceImpl.java
@@ -48,6 +48,8 @@ import com.wayn.mobile.api.service.IOrderService;
import com.wayn.mobile.api.task.OrderUnpaidTask;
import com.wayn.mobile.api.util.OrderSnGenUtil;
import com.wayn.mobile.framework.security.util.MobileSecurityUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -62,8 +64,6 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
@@ -442,7 +442,7 @@ public class OrderServiceImpl extends ServiceImpl implements
return R.error(ReturnCodeEnum.ORDER_SET_PAY_ERROR);
}
switch (Objects.requireNonNull(PayTypeEnum.of(payType))) {
- case WX:
+ case WX -> {
WxPayMpOrderResult result;
try {
WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
@@ -462,7 +462,8 @@ public class OrderServiceImpl extends ServiceImpl implements
log.error(e.getMessage(), e);
return R.error(ReturnCodeEnum.ORDER_CANNOT_PAY_ERROR);
}
- case ALI:
+ }
+ case ALI -> {
// 初始化
AlipayClient alipayClient = new DefaultAlipayClient(alipayConfig.getGateway(), alipayConfig.getAppId(),
alipayConfig.getRsaPrivateKey(), alipayConfig.getFormat(), alipayConfig.getCharset(), alipayConfig.getAlipayPublicKey(),
@@ -502,7 +503,8 @@ public class OrderServiceImpl extends ServiceImpl implements
log.error(e.getMessage(), e);
return R.error(ReturnCodeEnum.ORDER_SUBMIT_ERROR);
}
- case ALI_TEST:
+ }
+ case ALI_TEST -> {
// 支付宝test，直接更新支付状态为已支付
order.setPayId("xxxxx0987654321-ali");
order.setPayTime(LocalDateTime.now());
@@ -523,8 +525,10 @@ public class OrderServiceImpl extends ServiceImpl implements
// 取消订单超时未支付任务
taskService.removeTask(new OrderUnpaidTask(order.getId()));
return R.success();
- default:
+ }
+ default -> {
return R.error(ReturnCodeEnum.ORDER_NOT_SUPPORT_PAYWAY_ERROR);
+ }
}
}
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/SearchHistoryServiceImpl.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/SearchHistoryServiceImpl.java
index e3a70f4..9289893 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/SearchHistoryServiceImpl.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/api/service/impl/SearchHistoryServiceImpl.java
@@ -5,7 +5,7 @@ import com.wayn.mobile.api.domain.SearchHistory;
import com.wayn.mobile.api.mapper.SearchHistoryMapper;
import com.wayn.mobile.api.service.ISearchHistoryService;
import com.wayn.mobile.framework.security.util.MobileSecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -19,9 +19,9 @@ import java.util.List;
* @since 2020-09-23
*/
@Service
+@AllArgsConstructor
public class SearchHistoryServiceImpl extends ServiceImpl implements ISearchHistoryService {
- @Autowired
private SearchHistoryMapper searchHistoryMapper;
@Override
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/design/strategy/concretestrategy/CategoryStrategy.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/design/strategy/concretestrategy/CategoryStrategy.java
index 9c2f3b0..0b70b05 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/design/strategy/concretestrategy/CategoryStrategy.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/design/strategy/concretestrategy/CategoryStrategy.java
@@ -6,7 +6,7 @@ import com.wayn.common.core.domain.shop.Goods;
import com.wayn.common.core.mapper.shop.GoodsMapper;
import com.wayn.mobile.design.strategy.JumpTypeEnum;
import com.wayn.mobile.design.strategy.strategy.DiamondJumpType;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -15,9 +15,9 @@ import java.util.List;
* 分类跳转策略
*/
@Component
+@AllArgsConstructor
public class CategoryStrategy implements DiamondJumpType {
- @Autowired
private GoodsMapper goodsMapper;
@Override
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/design/strategy/concretestrategy/ColumnStrategy.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/design/strategy/concretestrategy/ColumnStrategy.java
index 17fab74..befff33 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/design/strategy/concretestrategy/ColumnStrategy.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/design/strategy/concretestrategy/ColumnStrategy.java
@@ -7,7 +7,7 @@ import com.wayn.common.core.service.shop.IColumnGoodsRelationService;
import com.wayn.common.core.service.shop.IGoodsService;
import com.wayn.mobile.design.strategy.JumpTypeEnum;
import com.wayn.mobile.design.strategy.strategy.DiamondJumpType;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -16,12 +16,11 @@ import java.util.List;
* 栏目跳转策略
*/
@Component
+@AllArgsConstructor
public class ColumnStrategy implements DiamondJumpType {
- @Autowired
private IColumnGoodsRelationService iColumnGoodsRelationService;
- @Autowired
private IGoodsService iGoodsService;
@Override
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/HikariCpConfig.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/HikariCpConfig.java
index c81f473..a35eaa4 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/HikariCpConfig.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/HikariCpConfig.java
@@ -1,6 +1,7 @@
package com.wayn.mobile.framework.config;
-import com.wayn.mobile.framework.config.properties.HikariProperties;
+import com.zaxxer.hikari.HikariDataSource;
+import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -9,9 +10,10 @@ import javax.sql.DataSource;
@Configuration
public class HikariCpConfig {
-
- @Bean
- public DataSource dataSource(HikariProperties hikariProperties) {
- return hikariProperties.dataSource();
+ @Bean(name = "masterDataSource")
+ @ConfigurationProperties(prefix = "spring.datasource.master")
+ public DataSource masterDataSource() {
+ return new HikariDataSource();
}
+
}
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/SecurityConfig.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/SecurityConfig.java
index 6955881..3b27959 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/SecurityConfig.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/SecurityConfig.java
@@ -4,12 +4,12 @@ import com.wayn.mobile.framework.security.filter.JwtAuthenticationTokenFilter;
import com.wayn.mobile.framework.security.handle.AuthenticationEntryPointImpl;
import com.wayn.mobile.framework.security.handle.LogoutSuccessHandlerImpl;
import com.wayn.mobile.framework.security.service.UserDetailsServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.http.SessionCreationPolicy;
@@ -20,21 +20,18 @@ import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.CorsConfigurationSource;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-@EnableWebSecurity
@Configuration
-@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true, jsr250Enabled = true)
+@EnableWebSecurity
+@AllArgsConstructor
+@EnableMethodSecurity(securedEnabled = true, jsr250Enabled = true)
public class SecurityConfig {
- @Autowired
private UserDetailsServiceImpl userDetailsService;
- @Autowired
private AuthenticationEntryPointImpl unauthorizedHandler;
- @Autowired
private JwtAuthenticationTokenFilter jwtAuthenticationTokenFilter;
- @Autowired
private LogoutSuccessHandlerImpl logoutSuccessHandler;
@Bean
@@ -49,19 +46,19 @@ public class SecurityConfig {
// 基于token，所以不需要session
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
// 过滤请求
- .authorizeRequests()
+ .authorizeHttpRequests()
// 对于登录login 验证码captchaImage 允许匿名访问
- .antMatchers("favicon.ico", "/actuator/**", "/login", "/registry", "/sendEmailCode", "/test/**", "/seckill/**", "/captcha").anonymous()
- .antMatchers("/home/**", "/category/**", "/comment/**", "/goods/detail/**", "/cart/goodsCount", "/diamond/**").permitAll()
- .antMatchers("/upload/**").anonymous()
- .antMatchers("/common/download**").anonymous()
- .antMatchers("/doc.html").anonymous()
- .antMatchers("/swagger-ui/**").anonymous()
- .antMatchers("/swagger-resources/**").anonymous()
- .antMatchers("/webjars/**").anonymous()
- .antMatchers("/*/api-docs").anonymous()
- .antMatchers("/druid/**").anonymous()
- .antMatchers("/message/**").anonymous()
+ .requestMatchers("favicon.ico", "/actuator/**", "/login", "/registry", "/sendEmailCode", "/test/**", "/seckill/**", "/captcha").anonymous()
+ .requestMatchers("/home/**", "/category/**", "/comment/**", "/goods/detail/**", "/cart/goodsCount", "/diamond/**").permitAll()
+ .requestMatchers("/upload/**").anonymous()
+ .requestMatchers("/common/download**").anonymous()
+ .requestMatchers("/doc.html").anonymous()
+ .requestMatchers("/swagger-ui/**").anonymous()
+ .requestMatchers("/swagger-resources/**").anonymous()
+ .requestMatchers("/webjars/**").anonymous()
+ .requestMatchers("/*/api-docs").anonymous()
+ .requestMatchers("/druid/**").anonymous()
+ .requestMatchers("/message/**").anonymous()
// 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated().and()
.headers().frameOptions().disable();
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/ThreadPoolConfig.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/ThreadPoolConfig.java
index 6b697ce..47497c4 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/ThreadPoolConfig.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/ThreadPoolConfig.java
@@ -20,25 +20,23 @@ import java.util.concurrent.ThreadPoolExecutor;
@Configuration
public class ThreadPoolConfig {
// 核心线程池大小
- private int corePoolSize = 20;
+ private final int corePoolSize = 20;
// 最大可创建的线程数
- private int maxPoolSize = 100;
+ private final int maxPoolSize = 50;
// 队列最大长度
- private int queueCapacity = 200;
+ private final int queueCapacity = 2000;
// 线程池维护线程所允许的空闲时间
- private int keepAliveSeconds = 300;
+ private final int keepAliveSeconds = 300;
@Bean(name = "homeThreadPoolTaskExecutor")
public ThreadPoolTaskExecutor homeThreadPoolTaskExecutor() {
ThreadPoolTaskExecutor executor = getThreadPoolTaskExecutor();
BasicThreadFactory build = new BasicThreadFactory.Builder()
.namingPattern("home-task-%d")
- .uncaughtExceptionHandler((t, e) -> {
- log.error("dongXinTaskExecutor:{},error:{}", t.getName(), e.getMessage(), e);
- })
+ .uncaughtExceptionHandler((t, e) -> log.error("dongXinTaskExecutor:{},error:{}", t.getName(), e.getMessage(), e))
.build();
executor.setThreadFactory(build);
executor.initialize();
@@ -64,9 +62,7 @@ public class ThreadPoolConfig {
ThreadPoolTaskExecutor executor = getThreadPoolTaskExecutor();
BasicThreadFactory build = new BasicThreadFactory.Builder()
.namingPattern("category-task-%d")
- .uncaughtExceptionHandler((t, e) -> {
- log.error("dongXinTaskExecutor:{},error:{}", t.getName(), e.getMessage(), e);
- })
+ .uncaughtExceptionHandler((t, e) -> log.error("dongXinTaskExecutor:{},error:{}", t.getName(), e.getMessage(), e))
.build();
executor.setThreadFactory(build);
executor.initialize();
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/WxConfig.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/WxConfig.java
index 12186bf..4ef81e4 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/WxConfig.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/WxConfig.java
@@ -3,13 +3,13 @@ package com.wayn.mobile.framework.config;
import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.service.WxPayService;
import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.AllArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
+@AllArgsConstructor
public class WxConfig {
- @Autowired
private WxProperties properties;
@Bean
@@ -32,4 +32,4 @@ public class WxConfig {
wxPayService.setConfig(payConfig);
return wxPayService;
}
-}
\ No newline at end of file
+}
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/properties/HikariProperties.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/properties/HikariProperties.java
deleted file mode 100644
index 07d39c7..0000000
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/properties/HikariProperties.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.wayn.mobile.framework.config.properties;
-
-import com.zaxxer.hikari.HikariConfig;
-import com.zaxxer.hikari.HikariDataSource;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class HikariProperties {
-
- @Value("${spring.datasource.master.url}")
- private String jdbcUrl;
- @Value("${spring.datasource.master.username}")
- private String username;
- @Value("${spring.datasource.master.password}")
- private String password;
-
-
- @Value("${spring.datasource.hikari.poolName}")
- private String poolName;
-
- @Value("${spring.datasource.hikari.minimumIdle}")
- private int minimumIdle;
-
- @Value("${spring.datasource.hikari.maximumPoolSize}")
- private int maximumPoolSize;
-
- @Value("${spring.datasource.hikari.autoCommit}")
- private boolean autoCommit;
-
- @Value("${spring.datasource.hikari.idleTimeout}")
- private int idleTimeout;
-
- @Value("${spring.datasource.hikari.maxLifetime}")
- private int maxLifetime;
-
- @Value("${spring.datasource.hikari.connectionTimeout}")
- private int connectionTimeout;
-
- @Value("${spring.datasource.hikari.connectionTestQuery}")
- private String connectionTestQuery;
-
- @Value("${spring.datasource.hikari.cachePrepStmts}")
- private boolean cachePrepStmts;
- @Value("${spring.datasource.hikari.prepStmtCacheSize}")
- private int prepStmtCacheSize;
- @Value("${spring.datasource.hikari.prepStmtCacheSqlLimit}")
- private int prepStmtCacheSqlLimit;
- @Value("${spring.datasource.hikari.useServerPrepStmts}")
- private boolean useServerPrepStmts;
- @Value("${spring.datasource.hikari.useLocalSessionState}")
- private boolean useLocalSessionState;
- @Value("${spring.datasource.hikari.rewriteBatchedStatements}")
- private boolean rewriteBatchedStatements;
- @Value("${spring.datasource.hikari.cacheResultSetMetadata}")
- private boolean cacheResultSetMetadata;
- @Value("${spring.datasource.hikari.elideSetAutoCommits}")
- private boolean elideSetAutoCommits;
- @Value("${spring.datasource.hikari.maintainTimeStats}")
- private boolean maintainTimeStats;
-
- public HikariDataSource dataSource() {
- HikariConfig config = new HikariConfig();
- config.setJdbcUrl(jdbcUrl);
- config.setUsername(username);
- config.setPassword(password);
-
- config.setPoolName(poolName);
- config.setMinimumIdle(minimumIdle);
- config.setMaximumPoolSize(maximumPoolSize);
- config.setAutoCommit(autoCommit);
- config.setIdleTimeout(idleTimeout);
- config.setMaxLifetime(maxLifetime);
- config.setConnectionTimeout(connectionTimeout);
- config.setConnectionTestQuery(connectionTestQuery);
- config.addDataSourceProperty("cachePrepStmts", cachePrepStmts);
- config.addDataSourceProperty("prepStmtCacheSize", prepStmtCacheSize);
- config.addDataSourceProperty("prepStmtCacheSqlLimit", prepStmtCacheSqlLimit);
- config.addDataSourceProperty("useServerPrepStmts", useServerPrepStmts);
- config.addDataSourceProperty("useLocalSessionState", useLocalSessionState);
- config.addDataSourceProperty("rewriteBatchedStatements", rewriteBatchedStatements);
- config.addDataSourceProperty("cacheResultSetMetadata", cacheResultSetMetadata);
- config.addDataSourceProperty("elideSetAutoCommits", elideSetAutoCommits);
- config.addDataSourceProperty("maintainTimeStats", maintainTimeStats);
-
- return new HikariDataSource(config);
- }
-}
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/datasource/RoutingDataSource.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/datasource/RoutingDataSource.java
deleted file mode 100644
index 33639bf..0000000
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/datasource/RoutingDataSource.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.wayn.mobile.framework.manager.datasource;
-
-import com.wayn.mobile.framework.manager.datasource.thread.DataSourceHolder;
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
-
-import javax.sql.DataSource;
-import java.util.Map;
-
-/**
- * 数据源切换类，
- * 根据determineCurrentLookupKey方法返回key值，切换到对应的数据源
- */
-public class RoutingDataSource extends AbstractRoutingDataSource {
-
- public RoutingDataSource(DataSource defaultTargetDataSource, Map targetDataSources) {
- super.setDefaultTargetDataSource(defaultTargetDataSource);
- super.setTargetDataSources(targetDataSources);
- super.afterPropertiesSet();
- }
-
- @Override
- protected Object determineCurrentLookupKey() {
- return DataSourceHolder.get();
- }
-}
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/datasource/thread/DataSourceHolder.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/datasource/thread/DataSourceHolder.java
deleted file mode 100644
index 2fe56b9..0000000
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/datasource/thread/DataSourceHolder.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.wayn.mobile.framework.manager.datasource.thread;
-
-
-import com.wayn.common.enums.DataSourceEnum;
-
-/**
- * 数据库切换threadLocal
- */
-public class DataSourceHolder {
- private static ThreadLocal dataSourceEnumThreadLocal = ThreadLocal.withInitial(() -> DataSourceEnum.MASTER);
-
- public static void set(DataSourceEnum dataSourceEnum) {
- dataSourceEnumThreadLocal.set(dataSourceEnum);
- }
-
- public static DataSourceEnum get() {
- return dataSourceEnumThreadLocal.get();
- }
-
- public static void remove() {
- dataSourceEnumThreadLocal.remove();
- }
-
-}
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/thread/AsyncManager.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/thread/AsyncManager.java
index 274c4d3..013c573 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/thread/AsyncManager.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/thread/AsyncManager.java
@@ -10,15 +10,13 @@ import java.util.concurrent.TimeUnit;
/**
* 异步任务管理器
- *
- * @author ruoyi
*/
public class AsyncManager {
- private static AsyncManager me = new AsyncManager();
+ private static final AsyncManager me = new AsyncManager();
/**
* 异步操作任务调度线程池
*/
- private ScheduledExecutorService executor = SpringContextUtil.getBean("scheduledExecutorService");
+ private final ScheduledExecutorService executor = SpringContextUtil.getBean("scheduledExecutorService");
/**
* 单例模式
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/thread/ShutdownManager.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/thread/ShutdownManager.java
index eb84182..2641ffe 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/thread/ShutdownManager.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/thread/ShutdownManager.java
@@ -1,15 +1,13 @@
package com.wayn.mobile.framework.manager.thread;
import com.wayn.common.constant.Constants;
+import jakarta.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
-import javax.annotation.PreDestroy;
/**
* 确保应用退出时能关闭后台线程
- *
- * @author ruoyi
*/
@Slf4j
@Component
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/filter/JwtAuthenticationTokenFilter.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/filter/JwtAuthenticationTokenFilter.java
index 7a580be..0c7d999 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/filter/JwtAuthenticationTokenFilter.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/filter/JwtAuthenticationTokenFilter.java
@@ -3,31 +3,29 @@ package com.wayn.mobile.framework.security.filter;
import com.wayn.common.util.ThreadMdcUtil;
import com.wayn.mobile.framework.security.LoginUserDetail;
import com.wayn.mobile.framework.security.service.TokenService;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Objects;
/**
* token过滤器 验证token有效性
- *
- * @author ruoyi
*/
@Slf4j
@Component
+@AllArgsConstructor
public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
- @Autowired
private TokenService tokenService;
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/handle/AuthenticationEntryPointImpl.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/handle/AuthenticationEntryPointImpl.java
index f76c45d..cbf2321 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/handle/AuthenticationEntryPointImpl.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/handle/AuthenticationEntryPointImpl.java
@@ -2,13 +2,13 @@ package com.wayn.mobile.framework.security.handle;
import com.wayn.common.util.R;
import com.wayn.common.util.json.JsonUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.http.HttpStatus;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.AuthenticationEntryPoint;
import org.springframework.stereotype.Component;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.Serial;
import java.io.Serializable;
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/handle/LogoutSuccessHandlerImpl.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/handle/LogoutSuccessHandlerImpl.java
index c4e5500..1558121 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/handle/LogoutSuccessHandlerImpl.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/handle/LogoutSuccessHandlerImpl.java
@@ -4,27 +4,24 @@ import com.wayn.common.util.R;
import com.wayn.common.util.json.JsonUtil;
import com.wayn.mobile.framework.security.LoginUserDetail;
import com.wayn.mobile.framework.security.service.TokenService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpStatus;
import org.springframework.security.core.Authentication;
import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.util.Objects;
/**
* 自定义退出处理类 返回成功
- *
- * @author ruoyi
*/
@Configuration
+@AllArgsConstructor
public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler {
-
- @Autowired
private TokenService tokenService;
@SneakyThrows
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/LoginService.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/LoginService.java
index 2570967..f914aba 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/LoginService.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/LoginService.java
@@ -2,9 +2,9 @@ package com.wayn.mobile.framework.security.service;
import com.wayn.common.exception.BusinessException;
import com.wayn.mobile.framework.security.LoginUserDetail;
+import lombok.AllArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -13,15 +13,13 @@ import org.springframework.stereotype.Component;
@Slf4j
@Component
+@AllArgsConstructor
public class LoginService {
- @Autowired
private AuthenticationManager authenticationManager;
- @Autowired
private TokenService tokenService;
-
@SneakyThrows
public String login(String mobile, String password) {
// 用户验证
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/MyAuthenticationFailureHandler.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/MyAuthenticationFailureHandler.java
index e65a3ff..dbcafb5 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/MyAuthenticationFailureHandler.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/MyAuthenticationFailureHandler.java
@@ -3,15 +3,14 @@ package com.wayn.mobile.framework.security.service;
import com.wayn.common.enums.ReturnCodeEnum;
import com.wayn.common.util.R;
import com.wayn.common.util.json.JsonUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.AuthenticationFailureHandler;
import org.springframework.stereotype.Component;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
@Slf4j
@Component
public class MyAuthenticationFailureHandler implements AuthenticationFailureHandler {
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/TokenService.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/TokenService.java
index f09a321..90ed172 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/TokenService.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/TokenService.java
@@ -1,41 +1,30 @@
package com.wayn.mobile.framework.security.service;
import com.auth0.jwt.interfaces.DecodedJWT;
+import com.wayn.common.config.TokenConfig;
import com.wayn.common.constant.SysConstants;
-import com.wayn.common.core.service.system.IUserService;
import com.wayn.common.util.jwt.JwtUtil;
import com.wayn.data.redis.constant.CacheConstants;
import com.wayn.data.redis.manager.RedisCache;
import com.wayn.mobile.framework.security.LoginUserDetail;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-import javax.servlet.http.HttpServletRequest;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
@Component
+@AllArgsConstructor
public class TokenService {
protected static final long MILLIS_SECOND = 1000;
protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
protected static final long MILLIS_DAY = 24 * 60 * MILLIS_MINUTE;
private static final Long MILLIS_DAY_FIVE = 5 * 24 * 60 * MILLIS_MINUTE;
- // 令牌自定义标识
- @Value("${token.header}")
- private String header;
- // 令牌秘钥
- @Value("${token.secret}")
- private String secret;
- // 令牌有效期（默认30分钟）
- @Value("${token.expireTime}")
- private int expireTime;
- @Autowired
private RedisCache redisCache;
- @Autowired
- private IUserService iUserService;
+ private TokenConfig config;
public LoginUserDetail getLoginUser(HttpServletRequest request) {
// 获取请求携带的令牌
@@ -54,7 +43,7 @@ public class TokenService {
String token = UUID.randomUUID().toString().replaceAll("-", "");
loginUser.setToken(token);
refreshToken(loginUser);
- return JwtUtil.sign(token, secret);
+ return JwtUtil.sign(token, config.getSecret());
}
public void delLoginUser(String token) {
@@ -66,10 +55,10 @@ public class TokenService {
public void refreshToken(LoginUserDetail loginUser) {
loginUser.setLoginTime(System.currentTimeMillis());
- loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_DAY);
+ loginUser.setExpireTime(loginUser.getLoginTime() + config.getExpireTime() * MILLIS_DAY);
// 根据uuid将loginUser缓存
String userKey = CacheConstants.LOGIN_TOKEN_KEY + loginUser.getToken();
- redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.DAYS);
+ redisCache.setCacheObject(userKey, loginUser, config.getExpireTime(), TimeUnit.DAYS);
}
public void verifyToken(LoginUserDetail loginUser) {
@@ -87,7 +76,7 @@ public class TokenService {
* @return token
*/
private String getToken(HttpServletRequest request) {
- String token = request.getHeader(header);
+ String token = request.getHeader(config.getHeader());
if (StringUtils.isNotEmpty(token) && token.startsWith(SysConstants.TOKEN_PREFIX)) {
token = token.replace(SysConstants.TOKEN_PREFIX, "");
}
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/UserDetailsServiceImpl.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/UserDetailsServiceImpl.java
index 7a8a894..9d3c801 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/UserDetailsServiceImpl.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/UserDetailsServiceImpl.java
@@ -8,8 +8,8 @@ import com.wayn.common.util.ip.IpUtils;
import com.wayn.mobile.framework.config.ThreadPoolConfig;
import com.wayn.mobile.framework.manager.thread.AsyncManager;
import com.wayn.mobile.framework.security.LoginUserDetail;
+import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.DisabledException;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
@@ -22,12 +22,11 @@ import java.util.TimerTask;
@Slf4j
@Service
+@AllArgsConstructor
public class UserDetailsServiceImpl implements UserDetailsService {
- @Autowired
private IMemberService iMemberService;
- @Autowired
private ThreadPoolConfig threadPoolConfig;
@Override
diff --git a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/util/MobileSecurityUtils.java b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/util/MobileSecurityUtils.java
index 1fa4790..01b8806 100644
--- a/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/util/MobileSecurityUtils.java
+++ b/waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/util/MobileSecurityUtils.java
@@ -9,8 +9,6 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
* 安全服务工具类
- *
- * @author ruoyi
*/
public class MobileSecurityUtils {
/**
diff --git a/waynboot-mobile-api/src/main/resources/application-hikari.yml b/waynboot-mobile-api/src/main/resources/application-hikari.yml
deleted file mode 100644
index 04d91e7..0000000
--- a/waynboot-mobile-api/src/main/resources/application-hikari.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# hikari数据源配置
-spring:
- datasource:
- hikari:
- poolName: hikariCP
- minimumIdle: 10
- maximumPoolSize: 50
- autoCommit: true
- idleTimeout: 10000
- maxLifetime: 30000
- connectionTimeout: 30000
- connectionTestQuery: SELECT 1
- cachePrepStmts: true
- prepStmtCacheSize: 250
- prepStmtCacheSqlLimit: 2048
- useServerPrepStmts: true
- useLocalSessionState: true
- rewriteBatchedStatements: true
- cacheResultSetMetadata: true
- cacheServerConfiguration: true
- elideSetAutoCommits: true
- maintainTimeStats: false
diff --git a/waynboot-mobile-api/src/main/resources/application.yml b/waynboot-mobile-api/src/main/resources/application.yml
index b4339ff..d870bfa 100644
--- a/waynboot-mobile-api/src/main/resources/application.yml
+++ b/waynboot-mobile-api/src/main/resources/application.yml
@@ -1,20 +1,12 @@
server:
port: 82
shutdown: graceful # 优雅关机
-# https配置，放开HttpsConfiguration文件注释即可
-# port: 443
-# ssl:
-# enabled: true
-# key-store: classpath:mall.wayn.ltd.jks
-# key-store-password: idFXdK.Rnm3CgZp
-# key-store-type: JKS
-#http-port: 82
spring:
application:
name: waynboot-mobile-api
profiles:
- active: dev,hikari
+ active: dev
thymeleaf:
cache: false
suffix: .html
@@ -61,7 +53,7 @@ mybatis-plus:
# wayn配置
wayn:
name: wayn
- version: 1.1.0
+ version: 1.2.0
email: 166738430@qq.com
uploadDir: ${UPLOAD_DIR:D:/wayn/upload}
adminUrl: http://localhost:81
diff --git a/waynboot-mobile-api/src/main/resources/logback-spring.xml b/waynboot-mobile-api/src/main/resources/logback-spring.xml
index c24fdd9..a406832 100644
--- a/waynboot-mobile-api/src/main/resources/logback-spring.xml
+++ b/waynboot-mobile-api/src/main/resources/logback-spring.xml
@@ -43,7 +43,7 @@
-
+
diff --git a/waynboot-monitor/pom.xml b/waynboot-monitor/pom.xml
index e524eaa..a7a941e 100644
--- a/waynboot-monitor/pom.xml
+++ b/waynboot-monitor/pom.xml
@@ -5,7 +5,7 @@
waynboot
com.wayn
- 1.1.0
+ 1.2.0
4.0.0
@@ -40,9 +40,6 @@
${main-class}
ZIP
-
-
-
diff --git a/waynboot-monitor/src/main/java/com/wayn/monitor/config/WebSecurityConfigurer.java b/waynboot-monitor/src/main/java/com/wayn/monitor/config/WebSecurityConfigurer.java
index 04657ec..0fce137 100644
--- a/waynboot-monitor/src/main/java/com/wayn/monitor/config/WebSecurityConfigurer.java
+++ b/waynboot-monitor/src/main/java/com/wayn/monitor/config/WebSecurityConfigurer.java
@@ -22,10 +22,9 @@ public class WebSecurityConfigurer {
successHandler.setTargetUrlParameter("redirectTo");
successHandler.setDefaultTargetUrl(adminContextPath + "/");
- http
- .headers().frameOptions().disable()
- .and().authorizeRequests()
- .antMatchers(adminContextPath + "/assets/**"
+ http.headers().frameOptions().disable()
+ .and().authorizeHttpRequests()
+ .requestMatchers(adminContextPath + "/assets/**"
, adminContextPath + "/login"
, adminContextPath + "/actuator/**"
, adminContextPath + "/instances/**"
@@ -39,7 +38,7 @@ public class WebSecurityConfigurer {
.httpBasic().and()
.csrf()
.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
- .ignoringAntMatchers(
+ .ignoringRequestMatchers(
"/instances",
"/actuator/**"
);
diff --git a/waynboot-monitor/src/main/resources/application.yml b/waynboot-monitor/src/main/resources/application.yml
index 0591273..37a77f4 100644
--- a/waynboot-monitor/src/main/resources/application.yml
+++ b/waynboot-monitor/src/main/resources/application.yml
@@ -6,8 +6,8 @@ server:
spring:
security:
user:
- name: user
- password: admin123
+ name: admin
+ password: admin
management:
endpoints: