gitee/mall4j
1
1
Fork 0
mirror of https://gitee.com/gz-yami/mall4j.git synced 2025-12-26 07:56:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

最低版本要求jdk17, 升级spring boot3.0

Browse Source
This commit is contained in:
FrozenWatermelon 2023-03-16 15:37:04 +08:00
parent 07f919b8ab
commit 324d91bc0a
84 changed files with 248 additions and 455 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
README.md
View File

@ -46,19 +46,18 @@ uni-app：https://gitee.com/gz-yami/mall4uni
## 技术选型
| 技术 | 版本 | 说明 |
|----------------------|--------|------------------------------|
| Spring Boot | 2.7.0 | MVC核心框架 |
| Spring Security web | 2.7.0 | web应用安全防护 |
| MyBatis | 3.5.0 | ORM框架 |
| MyBatisPlus | 3.1.0 | 基于mybatis，使用lambda表达式的 |
| spring-doc | 1.6.9 | 接口文档工具 |
| Hibernator-Validator | 6.0.17 | 验证框架 |
| redisson | 3.10.6 | 对redis进行封装、集成分布式锁等 |
| hikari | 3.2.0 | 数据库连接池 |
| logback | 1.2.11 | log日志工具 |
| orika | 1.5.4 | 更快的bean复制工具 |
| lombok | 1.18.8 | 简化对象封装工具 |
| hutool | 5.7.22 | 更适合国人的java工具集 |
|---------------------|---------|------------------------------|
| Spring Boot | 3.0.4 | MVC核心框架 |
| Spring Security web | 3.0.4 | web应用安全防护 |
| MyBatis | 3.5.10 | ORM框架 |
| MyBatisPlus | 3.5.3.1 | 基于mybatis，使用lambda表达式的 |
| spring-doc | 2.0.0 | 接口文档工具 |
| jakarta-validation | 3.0.2 | 验证框架 |
| redisson | 3.19.3 | 对redis进行封装、集成分布式锁等 |
| hikari | 5.0.1 | 数据库连接池 |
| logback | 1.4.5 | log日志工具 |
| lombok | 1.18.26 | 简化对象封装工具 |
| hutool | 5.8.15 | 更适合国人的java工具集 |
| knife4j | 4.0.0 | 基于swagger，更便于国人使用的swagger ui |

1
db/Dockerfile
View File

@ -1,6 +1,5 @@
FROM mysql:5.7
MAINTAINER opgames(opgames.cn@gmail.com)
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

2
doc/接口设计/3. 订单设计-提交订单.md
View File

@ -70,7 +70,7 @@ public class SubmitOrderListener {
```java
// 把订单地址保存到数据库
UserAddrOrder userAddrOrder = mapperFacade.map(mergerOrder.getUserAddr(), UserAddrOrder.class);
UserAddrOrder userAddrOrder = BeanUtil.copyProperties(mergerOrder.getUserAddr(), UserAddrOrder.class);
if (userAddrOrder == null) {
throw new YamiShopBindException("请填写收货地址");
}

38
pom.xml
View File

@ -22,24 +22,22 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
<spring-boot.version>2.7.0</spring-boot.version>
<java.version>1.8</java.version>
<spring-boot.version>3.0.4</spring-boot.version>
<java.version>17</java.version>
<guava.version>31.1-jre</guava.version>
<hutool.version>5.7.22</hutool.version>
<hutool.version>5.8.15</hutool.version>
<jsoup.version>1.15.3</jsoup.version>
<poi.version>5.2.3</poi.version>
<qiniu.version>7.2.18</qiniu.version>
<weixin.version>3.5.0</weixin.version>
<orika.version>1.5.4</orika.version>
<aliyun-core.version>4.3.9</aliyun-core.version>
<aliyun-dysmsapi.version>1.1.0</aliyun-dysmsapi.version>
<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
<redisson.version>3.12.5</redisson.version>
<redisson.version>3.19.3</redisson.version>
<transmittable-thread-local.version>2.12.1</transmittable-thread-local.version>
<log4j.version>2.17.2</log4j.version>
<knife4j.version>4.0.0</knife4j.version>
<xxl-job.version>2.3.1</xxl-job.version>
<spring-cloud-commons.version>3.1.1</spring-cloud-commons.version>
<spring-cloud-commons.version>4.0.1</spring-cloud-commons.version>
</properties>
<dependencyManagement>
@ -58,26 +56,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId>
<version>${weixin.version}</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId>
<version>${weixin.version}</version>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-mp</artifactId>
<version>${weixin.version}</version>
</dependency>
<dependency>
<groupId>ma.glasnost.orika</groupId>
<artifactId>orika-core</artifactId>
<version>${orika.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
@ -169,11 +147,7 @@
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
</dependency>
</dependencies>

3
yami-shop-admin/Dockerfile
View File

@ -1,6 +1,5 @@
FROM anapsix/alpine-java:8_server-jre_unlimited
FROM openjdk:17.0.2
MAINTAINER opgames(opgames.cn@gmail.com)
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

2
yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java
View File

@ -13,7 +13,7 @@ package com.yami.shop.admin.config;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.info.License;
import org.springdoc.core.GroupedOpenApi;
import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

3
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AdminLoginController.java
View File

@ -31,12 +31,11 @@ import com.yami.shop.sys.service.SysUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AreaController.java
View File

@ -22,7 +22,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.List;
import java.util.Objects;

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/AttributeController.java
View File

@ -22,7 +22,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Objects;
/**

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BrandController.java
View File

@ -22,7 +22,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Objects;

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/HotSearchController.java
View File

@ -22,7 +22,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Date;
import java.util.List;

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/IndexImgController.java
View File

@ -24,7 +24,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Date;
import java.util.Objects;

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/NoticeController.java
View File

@ -22,7 +22,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Date;
/**

4
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/OrderController.java
View File

@ -37,8 +37,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Arrays;
import java.util.Date;

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/PickAddrController.java
View File

@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Arrays;
import java.util.Objects;

3
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdCommController.java
View File

@ -18,7 +18,7 @@ import com.yami.shop.common.util.Json;
import com.yami.shop.service.ProdCommService;
import lombok.AllArgsConstructor;
import javax.validation.Valid;
import jakarta.validation.Valid;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
@ -30,7 +30,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.yami.shop.common.util.PageParam;
import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.ArrayList;
import java.util.Date;
/**

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagController.java
View File

@ -25,7 +25,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Date;
import java.util.List;

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProdTagReferenceController.java
View File

@ -22,7 +22,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
/**
* 分组标签引用

10
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ProductController.java
View File

@ -26,12 +26,12 @@ import com.yami.shop.service.BasketService;
import com.yami.shop.service.ProdTagReferenceService;
import com.yami.shop.service.ProductService;
import com.yami.shop.service.SkuService;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@ -49,8 +49,6 @@ public class ProductController {
@Autowired
private ProductService productService;
@Autowired
private MapperFacade mapperFacade;
@Autowired
private SkuService skuService;
@ -103,7 +101,7 @@ public class ProductController {
public ServerResponseEntity<String> save(@Valid @RequestBody ProductParam productParam) {
checkParam(productParam);
Product product = mapperFacade.map(productParam, Product.class);
Product product = BeanUtil.copyProperties(productParam, Product.class);
product.setDeliveryMode(Json.toJsonString(productParam.getDeliveryModeVo()));
product.setShopId(SecurityUtils.getSysUser().getShopId());
product.setUpdateTime(new Date());
@ -130,7 +128,7 @@ public class ProductController {
List<Sku> dbSkus = skuService.listByProdId(dbProduct.getProdId());
Product product = mapperFacade.map(productParam, Product.class);
Product product = BeanUtil.copyProperties(productParam, Product.class);
product.setDeliveryMode(Json.toJsonString(productParam.getDeliveryModeVo()));
product.setUpdateTime(new Date());

11
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/ShopDetailController.java
View File

@ -18,14 +18,14 @@ import com.yami.shop.bean.param.ShopDetailParam;
import com.yami.shop.common.util.PageParam;
import com.yami.shop.security.admin.util.SecurityUtils;
import com.yami.shop.service.ShopDetailService;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import org.springframework.beans.factory.annotation.Autowired;
import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@ -43,9 +43,6 @@ public class ShopDetailController {
@Autowired
private ShopDetailService shopDetailService;
@Autowired
private MapperFacade mapperFacade;
/**
* 修改分销开关
@ -101,7 +98,7 @@ public class ShopDetailController {
@PostMapping
@PreAuthorize("@pms.hasPermission('shop:shopDetail:save')")
public ServerResponseEntity<Void> save(@Valid ShopDetailParam shopDetailParam){
ShopDetail shopDetail = mapperFacade.map(shopDetailParam, ShopDetail.class);
ShopDetail shopDetail = BeanUtil.copyProperties(shopDetailParam, ShopDetail.class);
shopDetail.setCreateTime(new Date());
shopDetail.setShopStatus(1);
shopDetailService.save(shopDetail);
@ -115,7 +112,7 @@ public class ShopDetailController {
@PreAuthorize("@pms.hasPermission('shop:shopDetail:update')")
public ServerResponseEntity<Void> update(@Valid ShopDetailParam shopDetailParam){
ShopDetail daShopDetail = shopDetailService.getShopDetailByShopId(shopDetailParam.getShopId());
ShopDetail shopDetail = mapperFacade.map(shopDetailParam, ShopDetail.class);
ShopDetail shopDetail = BeanUtil.copyProperties(shopDetailParam, ShopDetail.class);
shopDetail.setUpdateTime(new Date());
shopDetailService.updateShopDetail(shopDetail,daShopDetail);
return ServerResponseEntity.success();

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/SpecController.java
View File

@ -25,7 +25,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.List;
import java.util.Objects;

2
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserAddrController.java
View File

@ -21,7 +21,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
/**
* 用户地址管理

5
yami-shop-admin/src/main/resources/application-dev.yml
View File

@ -13,10 +13,7 @@ spring:
idle-timeout: 10000
auto-commit: true
connection-test-query: SELECT 1
cache:
type: redis
redis:
cache-null-values: true
data:
redis:
host: 127.0.0.1
port: 6379

1
yami-shop-admin/src/main/resources/application-docker.yml
View File

@ -13,6 +13,7 @@ spring:
idle-timeout: 25000
auto-commit: true
connection-test-query: SELECT 1
data:
redis:
host: ${REDIS_HOST}
port: ${REDIS_PORT}

1
yami-shop-admin/src/main/resources/application-prod.yml
View File

@ -13,6 +13,7 @@ spring:
idle-timeout: 25000
auto-commit: true
connection-test-query: SELECT 1
data:
redis:
host: 127.0.0.1
port: 6379

3
yami-shop-api/Dockerfile
View File

@ -1,6 +1,5 @@
FROM anapsix/alpine-java:8_server-jre_unlimited
FROM openjdk:17.0.2
MAINTAINER opgames(opgames.cn@gmail.com)
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

2
yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java
View File

@ -13,7 +13,7 @@ package com.yami.shop.api.config;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.info.License;
import org.springdoc.core.GroupedOpenApi;
import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

14
yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java
View File

@ -22,11 +22,11 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Date;
import java.util.List;
@ -39,8 +39,6 @@ import java.util.List;
@AllArgsConstructor
public class AddrController {
@Autowired
private MapperFacade mapperFacade;
@Autowired
private UserAddrService userAddrService;
@ -52,7 +50,7 @@ public class AddrController {
public ServerResponseEntity<List<UserAddrDto>> dvyList() {
String userId = SecurityUtils.getUser().getUserId();
List<UserAddr> userAddrs = userAddrService.list(new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId, userId).orderByDesc(UserAddr::getCommonAddr).orderByDesc(UserAddr::getUpdateTime));
return ServerResponseEntity.success(mapperFacade.mapAsList(userAddrs, UserAddrDto.class));
return ServerResponseEntity.success(BeanUtil.copyToList(userAddrs, UserAddrDto.class));
}
@PostMapping("/addAddr")
@ -64,7 +62,7 @@ public class AddrController {
return ServerResponseEntity.showFailMsg("该地址已存在");
}
long addrCount = userAddrService.count(new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId, userId));
UserAddr userAddr = mapperFacade.map(addrParam, UserAddr.class);
UserAddr userAddr = BeanUtil.copyProperties(addrParam, UserAddr.class);
if (addrCount == 0) {
userAddr.setCommonAddr(1);
@ -96,7 +94,7 @@ public class AddrController {
return ServerResponseEntity.showFailMsg("该地址已被删除");
}
UserAddr userAddr = mapperFacade.map(addrParam, UserAddr.class);
UserAddr userAddr = BeanUtil.copyProperties(addrParam, UserAddr.class);
userAddr.setUserId(userId);
userAddr.setUpdateTime(new Date());
userAddrService.updateById(userAddr);
@ -154,7 +152,7 @@ public class AddrController {
if (userAddr == null) {
throw new YamiShopBindException("该地址已被删除");
}
return ServerResponseEntity.success(mapperFacade.map(userAddr, UserAddrDto.class));
return ServerResponseEntity.success(BeanUtil.copyProperties(userAddr, UserAddrDto.class));
}
}

6
yami-shop-api/src/main/java/com/yami/shop/api/controller/CategoryController.java
View File

@ -26,7 +26,7 @@ import com.yami.shop.service.CategoryService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
/**
* @author lanhai
@ -39,8 +39,6 @@ public class CategoryController {
@Autowired
private CategoryService categoryService;
@Autowired
private MapperFacade mapperFacade;
/**
* 分类信息列表接口
@ -50,7 +48,7 @@ public class CategoryController {
@Parameter(name = "parentId", description = "分类ID", required = false)
public ServerResponseEntity<List<CategoryDto>> categoryInfo(@RequestParam(value = "parentId", defaultValue = "0") Long parentId) {
List<Category> categories = categoryService.listByParentId(parentId);
List<CategoryDto> categoryDtos = mapperFacade.mapAsList(categories, CategoryDto.class);
List<CategoryDto> categoryDtos = BeanUtil.copyToList(categories, CategoryDto.class);
return ServerResponseEntity.success(categoryDtos);
}

6
yami-shop-api/src/main/java/com/yami/shop/api/controller/IndexImgController.java
View File

@ -15,7 +15,7 @@ import com.yami.shop.bean.model.IndexImg;
import com.yami.shop.service.IndexImgService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import org.springframework.beans.factory.annotation.Autowired;
import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
@ -29,8 +29,6 @@ import java.util.List;
@RestController
@Tag(name = "首页轮播图接口")
public class IndexImgController {
@Autowired
private MapperFacade mapperFacade;
@Autowired
private IndexImgService indexImgService;
@ -42,7 +40,7 @@ public class IndexImgController {
@Operation(summary = "首页轮播图" , description = "获取首页轮播图列表信息")
public ServerResponseEntity<List<IndexImgDto>> indexImgs() {
List<IndexImg> indexImgList = indexImgService.listIndexImg();
List<IndexImgDto> indexImgDtos = mapperFacade.mapAsList(indexImgList, IndexImgDto.class);
List<IndexImgDto> indexImgDtos = BeanUtil.copyToList(indexImgList, IndexImgDto.class);
return ServerResponseEntity.success(indexImgDtos);
}
}

8
yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java
View File

@ -27,7 +27,7 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.web.bind.annotation.*;
@ -46,7 +46,7 @@ public class MyOrderController {
private final OrderService orderService;
private final MapperFacade mapperFacade;
private final UserAddrOrderService userAddrOrderService;
@ -83,9 +83,9 @@ public class MyOrderController {
ShopDetail shopDetail = shopDetailService.getShopDetailByShopId(order.getShopId());
UserAddrOrder userAddrOrder = userAddrOrderService.getById(order.getAddrOrderId());
UserAddrDto userAddrDto = mapperFacade.map(userAddrOrder, UserAddrDto.class);
UserAddrDto userAddrDto = BeanUtil.copyProperties(userAddrOrder, UserAddrDto.class);
List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(orderNumber);
List<OrderItemDto> orderItemDtos = mapperFacade.mapAsList(orderItems, OrderItemDto.class);
List<OrderItemDto> orderItemDtos = BeanUtil.copyToList(orderItems, OrderItemDto.class);
orderShopDto.setShopId(shopDetail.getShopId());
orderShopDto.setShopName(shopDetail.getShopName());

8
yami-shop-api/src/main/java/com/yami/shop/api/controller/NoticeController.java
View File

@ -20,7 +20,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -40,7 +40,7 @@ public class NoticeController {
private NoticeService noticeService;
private MapperFacade mapperFacade;
/**
* 置顶公告列表接口
@ -50,7 +50,7 @@ public class NoticeController {
@JsonView(NoticeDto.NoContent.class)
public ServerResponseEntity<List<NoticeDto>> getTopNoticeList() {
List<Notice> noticeList = noticeService.listNotice();
List<NoticeDto> noticeDtoList = mapperFacade.mapAsList(noticeList, NoticeDto.class);
List<NoticeDto> noticeDtoList = BeanUtil.copyToList(noticeList, NoticeDto.class);
return ServerResponseEntity.success(noticeDtoList);
}
@ -62,7 +62,7 @@ public class NoticeController {
@JsonView(NoticeDto.WithContent.class)
public ServerResponseEntity<NoticeDto> getNoticeById(@PathVariable("id") Long id) {
Notice notice = noticeService.getNoticeById(id);
NoticeDto noticeDto = mapperFacade.map(notice, NoticeDto.class);
NoticeDto noticeDto = BeanUtil.copyProperties(notice, NoticeDto.class);
return ServerResponseEntity.success(noticeDto);
}

8
yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java
View File

@ -24,7 +24,7 @@ import com.yami.shop.security.api.util.SecurityUtils;
import com.yami.shop.service.*;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import com.yami.shop.common.response.ServerResponseEntity;
@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@ -49,8 +49,6 @@ public class OrderController {
@Autowired
private OrderService orderService;
@Autowired
private MapperFacade mapperFacade;
@Autowired
private SkuService skuService;
@Autowired
private ProductService productService;
@ -72,7 +70,7 @@ public class OrderController {
// 订单的地址信息
UserAddr userAddr = userAddrService.getUserAddrByUserId(orderParam.getAddrId(), userId);
UserAddrDto userAddrDto = mapperFacade.map(userAddr, UserAddrDto.class);
UserAddrDto userAddrDto = BeanUtil.copyProperties(userAddr, UserAddrDto.class);
// 组装获取用户提交的购物车商品项

3
yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java
View File

@ -10,7 +10,6 @@
package com.yami.shop.api.controller;
import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
import com.yami.shop.bean.app.param.PayParam;
import com.yami.shop.bean.pay.PayInfoDto;
import com.yami.shop.security.api.model.YamiUser;
@ -42,7 +41,7 @@ public class PayController {
*/
@PostMapping("/pay")
@Operation(summary = "根据订单号进行支付" , description = "根据订单号进行支付")
public ServerResponseEntity<WxPayMpOrderResult> pay(@RequestBody PayParam payParam) {
public ServerResponseEntity<Void> pay(@RequestBody PayParam payParam) {
YamiUser user = SecurityUtils.getUser();
String userId = user.getUserId();

6
yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdController.java
View File

@ -26,7 +26,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -47,8 +47,6 @@ public class ProdController {
@Autowired
private ProductService prodService;
@Autowired
private MapperFacade mapperFacade;
@Autowired
private SkuService skuService;
@ -82,7 +80,7 @@ public class ProdController {
// 启用的sku列表
List<Sku> useSkuList = skuList.stream().filter(sku -> sku.getStatus() == 1).collect(Collectors.toList());
product.setSkuList(useSkuList);
ProductDto productDto = mapperFacade.map(product, ProductDto.class);
ProductDto productDto = BeanUtil.copyProperties(product, ProductDto.class);
// 商品的配送方式

6
yami-shop-api/src/main/java/com/yami/shop/api/controller/ProdTagController.java
View File

@ -16,7 +16,7 @@ import com.yami.shop.service.ProdTagService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -35,7 +35,7 @@ public class ProdTagController {
private ProdTagService prodTagService;
private MapperFacade mapperFacade;
/**
* 商品分组标签列表接口
@ -44,7 +44,7 @@ public class ProdTagController {
@Operation(summary = "商品分组标签列表" , description = "获取所有的商品分组列表")
public ServerResponseEntity<List<ProdTagDto>> getProdTagList() {
List<ProdTag> prodTagList = prodTagService.listProdTag();
List<ProdTagDto> prodTagDtoList = mapperFacade.mapAsList(prodTagList, ProdTagDto.class);
List<ProdTagDto> prodTagDtoList = BeanUtil.copyToList(prodTagList, ProdTagDto.class);
return ServerResponseEntity.success(prodTagDtoList);
}

2
yami-shop-api/src/main/java/com/yami/shop/api/controller/ShopCartController.java
View File

@ -32,7 +32,7 @@ import org.springframework.context.ApplicationContext;
import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Collections;
import java.util.List;
import java.util.Map;

6
yami-shop-api/src/main/java/com/yami/shop/api/controller/SkuController.java
View File

@ -18,7 +18,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -37,7 +37,7 @@ public class SkuController {
private final SkuService skuService;
private final MapperFacade mapperFacade;
@GetMapping("/getSkuList")
@Operation(summary = "通过prodId获取商品全部规格列表" , description = "通过prodId获取商品全部规格列表")
@ -48,7 +48,7 @@ public class SkuController {
.eq(Sku::getIsDelete, 0)
.eq(Sku::getProdId, prodId)
);
List<SkuDto> skuDtoList = mapperFacade.mapAsList(skus, SkuDto.class);
List<SkuDto> skuDtoList = BeanUtil.copyToList(skus, SkuDto.class);
return ServerResponseEntity.success(skuDtoList);
}
}

6
yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java
View File

@ -18,7 +18,7 @@ import com.yami.shop.service.UserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.web.bind.annotation.*;
/**
@ -32,7 +32,7 @@ public class UserController {
private final UserService userService;
private final MapperFacade mapperFacade;
/**
* 查看用户接口
*/
@ -41,7 +41,7 @@ public class UserController {
public ServerResponseEntity<UserDto> userInfo() {
String userId = SecurityUtils.getUser().getUserId();
User user = userService.getById(userId);
UserDto userDto = mapperFacade.map(user, UserDto.class);
UserDto userDto = BeanUtil.copyProperties(user, UserDto.class);
return ServerResponseEntity.success(userDto);
}

2
yami-shop-api/src/main/java/com/yami/shop/api/controller/UserRegisterController.java
View File

@ -20,7 +20,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Date;
/**

6
yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java
View File

@ -29,7 +29,7 @@ import com.yami.shop.service.ProductService;
import com.yami.shop.service.SkuService;
import com.yami.shop.service.UserAddrOrderService;
import lombok.AllArgsConstructor;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import org.springframework.context.event.EventListener;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
@ -46,7 +46,7 @@ import java.util.*;
public class SubmitOrderListener {
private final MapperFacade mapperFacade;
private final UserAddrOrderService userAddrOrderService;
@ -89,7 +89,7 @@ public class SubmitOrderListener {
Map<Long, Product> prodStocksMap = new HashMap<>(16);
// 把订单地址保存到数据库
UserAddrOrder userAddrOrder = mapperFacade.map(mergerOrder.getUserAddr(), UserAddrOrder.class);
UserAddrOrder userAddrOrder = BeanUtil.copyProperties(mergerOrder.getUserAddr(), UserAddrOrder.class);
if (userAddrOrder == null) {
throw new YamiShopBindException("请填写收货地址");
}

1
yami-shop-api/src/main/resources/application-dev.yml
View File

@ -12,6 +12,7 @@ spring:
maximum-pool-size: 20
idle-timeout: 10000
connection-test-query: select 1
data:
redis:
host: 127.0.0.1
port: 6379

1
yami-shop-api/src/main/resources/application-docker.yml
View File

@ -12,6 +12,7 @@ spring:
minimum-idle: 0
maximum-pool-size: 20
connection-test-query: select 1
data:
redis:
host: ${REDIS_HOST}
port: ${REDIS_PORT}

1
yami-shop-api/src/main/resources/application-prod.yml
View File

@ -12,6 +12,7 @@ spring:
minimum-idle: 0
maximum-pool-size: 20
connection-test-query: select 1
data:
redis:
host: 127.0.0.1
port: 6379

2
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/AddrParam.java
View File

@ -12,7 +12,7 @@ package com.yami.shop.bean.app.param;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
/**
* @author lanhai

2
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ChangeShopCartParam.java
View File

@ -10,7 +10,7 @@
package com.yami.shop.bean.app.param;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

4
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderItemParam.java
View File

@ -13,8 +13,8 @@ package com.yami.shop.bean.app.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
/**
* @author lanhai

2
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java
View File

@ -13,7 +13,7 @@ package com.yami.shop.bean.app.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
import java.util.List;
/**

2
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundExpressParam.java
View File

@ -3,7 +3,7 @@ package com.yami.shop.bean.app.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotEmpty;
/**
* @author lanhai

4
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderRefundParam.java
View File

@ -3,8 +3,8 @@ package com.yami.shop.bean.app.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
/**
* @author lanhai

4
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/PayParam.java
View File

@ -10,8 +10,8 @@
package com.yami.shop.bean.app.param;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import io.swagger.v3.oas.annotations.media.Schema;

2
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/ProdCommParam.java
View File

@ -13,7 +13,7 @@ package com.yami.shop.bean.app.param;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;
/**
* @author lanhai

2
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SendSmsParam.java
View File

@ -12,7 +12,7 @@ package com.yami.shop.bean.app.param;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.Pattern;
import jakarta.validation.constraints.Pattern;
/**
* @author lanhai

4
yami-shop-bean/src/main/java/com/yami/shop/bean/model/ProdProp.java
View File

@ -15,8 +15,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import java.io.Serializable;
import java.util.List;

2
yami-shop-bean/src/main/java/com/yami/shop/bean/param/DeliveryOrderParam.java
View File

@ -12,7 +12,7 @@ package com.yami.shop.bean.param;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotBlank;
/**
* @author lanhai

6
yami-shop-bean/src/main/java/com/yami/shop/bean/param/ProductParam.java
View File

@ -14,9 +14,9 @@ import com.yami.shop.bean.model.Product;
import com.yami.shop.bean.model.Sku;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.util.List;
/**

4
yami-shop-bean/src/main/java/com/yami/shop/bean/param/ShopDetailParam.java
View File

@ -10,8 +10,8 @@
package com.yami.shop.bean.param;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
/**
* @author lanhai

20
yami-shop-common/pom.xml
View File

@ -41,8 +41,8 @@
<artifactId>qiniu-java-sdk</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<!-- 开始spring 缓存 -->
<dependency>
@ -56,10 +56,6 @@
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>ma.glasnost.orika</groupId>
<artifactId>orika-core</artifactId>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
@ -69,18 +65,6 @@
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-pay</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-miniapp</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-mp</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>transmittable-thread-local</artifactId>

36
yami-shop-common/src/main/java/com/yami/shop/common/config/OrikaConfig.java
View File

@ -1,36 +0,0 @@
/*
* Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
*
* https://www.mall4j.com/
*
* 未经允许，不可做商业用途！
*
* 版权所有，侵权必究！
*/
package com.yami.shop.common.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import ma.glasnost.orika.MapperFacade;
import ma.glasnost.orika.MapperFactory;
import ma.glasnost.orika.impl.DefaultMapperFactory;
/**
* MapperFacade 用于dto ->entity的转换
* @author lgh
*/
@Configuration
public class OrikaConfig {
@Bean
public MapperFactory mapperFactory() {
return new DefaultMapperFactory.Builder().build();
}
@Bean
public MapperFacade mapperFacade() {
return mapperFactory().getMapperFacade();
}
}

103
yami-shop-common/src/main/java/com/yami/shop/common/config/Swagger2Config.java
View File

@ -1,103 +0,0 @@
package com.yami.shop.common.config;
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.yami.shop.common.util.PageParam;
import io.swagger.v3.oas.annotations.Hidden;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.springdoc.api.annotations.ParameterObject;
import org.springdoc.core.DelegatingMethodParameter;
import org.springdoc.core.GenericParameterService;
import org.springdoc.core.PropertyResolverUtils;
import org.springdoc.core.SpringDocUtils;
import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer;
import org.springdoc.core.providers.ObjectMapperProvider;
import org.springdoc.core.providers.WebConversionServiceProvider;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.MethodParameter;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @author FrozenWatermelon
* @date 2022/4/24
*/
@Configuration
public class Swagger2Config {
static {
SpringDocUtils.getConfig().addAnnotationsToIgnore(JsonIgnore.class);
}
@Bean
public GenericParameterService parameterBuilder(PropertyResolverUtils propertyResolverUtils, Optional<WebConversionServiceProvider> optionalWebConversionServiceProvider, ObjectMapperProvider objectMapperProvider) {
return new GenericParameterService(propertyResolverUtils, delegatingMethodParameterCustomizer(),
optionalWebConversionServiceProvider,objectMapperProvider);
}
/**
* 解决@ParameterObject和@Hidden, JsonIgnore同时使用不生效的问题
* @return
*/
private Optional<DelegatingMethodParameterCustomizer> delegatingMethodParameterCustomizer() {
// NOSONAR
return Optional.of((originalMethodParam, methodParam) -> {
// 这个方法类拥有的注解
Annotation[] annotations = originalMethodParam.getParameterType().getAnnotations();
boolean typeContainParameterObject = false;
if (annotations.length > 0) {
List<? extends Class<? extends Annotation>> annotationTypes = Arrays.stream(annotations).map(Annotation::annotationType).collect(Collectors.toList());
typeContainParameterObject = annotationTypes.contains(ParameterObject.class);
}
boolean hasParameterAnnotations = (originalMethodParam.hasParameterAnnotations() && originalMethodParam.hasParameterAnnotation(ParameterObject.class));
if (typeContainParameterObject || hasParameterAnnotations) {
try {
if (isParameterIgnore(originalMethodParam, methodParam)) {
Field field = FieldUtils.getDeclaredField(DelegatingMethodParameter.class, "additionalParameterAnnotations", true);
try {
field.set(methodParam, new Annotation[] {new Hidden() { // NOSONAR
@Override
public Class<? extends Annotation> annotationType() {
return Hidden.class;
}}
});
} catch (IllegalArgumentException|IllegalAccessException e) {
e.printStackTrace();
}
}
} catch (NoSuchFieldException | SecurityException e) {
e.printStackTrace();
}
}
});
}
private boolean isParameterIgnore(MethodParameter originalMethodParam, MethodParameter methodParam) throws NoSuchFieldException, SecurityException {
String searchCount = "searchCount";
String parameterName = StrUtil.isBlank(methodParam.getParameterName())? "":methodParam.getParameterName();
String fieldName = parameterName.indexOf('.') == -1 ? parameterName : parameterName.substring(0, parameterName.indexOf('.'));
// 解决mybatis-plus返回的查询参数污染的问题
if (originalMethodParam.getParameterType().isAssignableFrom(PageParam.class)) {
if (searchCount.equals(fieldName)) {
return true;
}
}
Field declaredField;
try {
declaredField = originalMethodParam.getParameterType().getDeclaredField(fieldName);
} catch (NoSuchFieldException e) {
e.printStackTrace();
declaredField = originalMethodParam.getParameterType().getSuperclass().getDeclaredField(fieldName);
}
return Stream.of(declaredField.getAnnotations())
.filter(annot -> Arrays.asList(Hidden.class, JsonIgnore.class).contains(annot.annotationType())).count() > 0;
}
}

6
yami-shop-common/src/main/java/com/yami/shop/common/filter/XssFilter.java
View File

@ -15,9 +15,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
/**

2
yami-shop-common/src/main/java/com/yami/shop/common/handler/HttpHandler.java
View File

@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Objects;

2
yami-shop-common/src/main/java/com/yami/shop/common/util/HttpContextUtils.java
View File

@ -13,7 +13,7 @@ package com.yami.shop.common.util;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* @author lanhai

2
yami-shop-common/src/main/java/com/yami/shop/common/util/IpHelper.java
View File

@ -10,7 +10,7 @@
package com.yami.shop.common.util;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* IP帮助工具

2
yami-shop-common/src/main/java/com/yami/shop/common/util/PageParam.java
View File

@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.media.Schema;
import org.springdoc.api.annotations.ParameterObject;
import org.springdoc.core.annotations.ParameterObject;
import java.util.List;
/**

4
yami-shop-common/src/main/java/com/yami/shop/common/xss/XssWrapper.java
View File

@ -12,8 +12,8 @@ package com.yami.shop.common.xss;
import cn.hutool.core.util.StrUtil;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
/**
* xss 攻击过滤

2
yami-shop-security/yami-shop-security-api/src/main/java/com/yami/shop/security/api/controller/LoginController.java
View File

@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import jakarta.validation.Valid;
/**
* @author 菠萝凤梨

2
yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/adapter/MallWebSecurityConfigurerAdapter.java
View File

@ -23,7 +23,7 @@ public class MallWebSecurityConfigurerAdapter {
.and().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
.and().authorizeRequests().requestMatchers(CorsUtils::isPreFlightRequest).permitAll()
.and()
.authorizeRequests().antMatchers(
.authorizeRequests().requestMatchers(
"/**").permitAll().and().build();
}

2
yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/config/AuthConfig.java
View File

@ -21,7 +21,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
import javax.servlet.DispatcherType;
import jakarta.servlet.DispatcherType;
/**
* 授权配置

2
yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/controller/LogoutController.java
View File

@ -18,7 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
/**
* @author 菠萝凤梨

8
yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/controller/TokenController.java
View File

@ -15,13 +15,13 @@ import com.yami.shop.security.common.dto.RefreshTokenDTO;
import com.yami.shop.security.common.manager.TokenStore;
import com.yami.shop.security.common.vo.TokenInfoVO;
import io.swagger.v3.oas.annotations.tags.Tag;
import ma.glasnost.orika.MapperFacade;
import cn.hutool.core.bean.BeanUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
import jakarta.validation.Valid;
/**
* @author 菠萝凤梨
@ -34,15 +34,13 @@ public class TokenController {
@Autowired
private TokenStore tokenStore;
@Autowired
private MapperFacade mapperFacade;
@PostMapping("/token/refresh")
public ServerResponseEntity<TokenInfoVO> refreshToken(@Valid @RequestBody RefreshTokenDTO refreshTokenDTO) {
TokenInfoBO tokenInfoServerResponseEntity = tokenStore
.refreshToken(refreshTokenDTO.getRefreshToken());
return ServerResponseEntity
.success(mapperFacade.map(tokenInfoServerResponseEntity, TokenInfoVO.class));
.success(BeanUtil.copyProperties(tokenInfoServerResponseEntity, TokenInfoVO.class));
}
}

2
yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/dto/AuthenticationDTO.java
View File

@ -12,7 +12,7 @@ package com.yami.shop.security.common.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotBlank;
/**
* 用于登陆传递账号密码

2
yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/dto/RefreshTokenDTO.java
View File

@ -11,7 +11,7 @@ package com.yami.shop.security.common.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotBlank;
/**
* 刷新token

6
yami-shop-security/yami-shop-security-common/src/main/java/com/yami/shop/security/common/filter/AuthFilter.java
View File

@ -25,9 +25,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.AntPathMatcher;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;

6
yami-shop-service/src/main/java/com/yami/shop/service/impl/CategoryServiceImpl.java
View File

@ -12,6 +12,7 @@ package com.yami.shop.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.yami.shop.bean.model.Category;
@ -20,8 +21,6 @@ import com.yami.shop.dao.CategoryMapper;
import com.yami.shop.dao.CategoryPropMapper;
import com.yami.shop.service.AttachFileService;
import com.yami.shop.service.CategoryService;
import ma.glasnost.orika.MapperFacade;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -48,9 +47,6 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
@Autowired
private AttachFileService attachFileService;
@Autowired
private MapperFacade mapperFacade;
@Override
public List<Category> listByParentId(Long parentId) {
return categoryMapper.listByParentId(parentId);

2
yami-shop-service/src/main/java/com/yami/shop/service/impl/ProdPropServiceImpl.java
View File

@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.Objects;
/**

2
yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysConfigController.java
View File

@ -11,7 +11,7 @@
package com.yami.shop.sys.controller;
import javax.validation.Valid;
import jakarta.validation.Valid;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

2
yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysMenuController.java
View File

@ -25,7 +25,7 @@ import com.yami.shop.common.response.ServerResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.List;
import java.util.Map;
import java.util.Objects;

2
yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java
View File

@ -34,7 +34,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import jakarta.validation.Valid;
import java.util.List;
import java.util.Objects;

4
yami-shop-sys/src/main/java/com/yami/shop/sys/dto/UpdatePasswordDto.java
View File

@ -13,8 +13,8 @@ package com.yami.shop.sys.dto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
/**
* @author lanhai
*/

2
yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysConfig.java
View File

@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotBlank;
/**
* 系统配置信息

4
yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysMenu.java
View File

@ -16,8 +16,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;

2
yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysRole.java
View File

@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

8
yami-shop-sys/src/main/java/com/yami/shop/sys/model/SysUser.java
View File

@ -18,10 +18,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import java.io.Serializable;
import java.util.Date;
import java.util.List;