szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 

# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
This commit is contained in:
YunaiV 2024-10-01 16:11:13 +08:00
parent eae97e1b33 0acda7e874
commit 5e9bdcb21f
6 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/util/JdbcUtils.java
View File

@ -79,7 +79,7 @@ public class JdbcUtils {
/** /**
* 判断 JDBC 连接是否为 SQLServer 数据库 * 判断 JDBC 连接是否为 SQLServer 数据库
* *
* @param url JDBC 连接 * @param dbType DB 类型
* @return 是否为 SQLServer 数据库 * @return 是否为 SQLServer 数据库
*/ */
public static boolean isSQLServer(DbType dbType) { public static boolean isSQLServer(DbType dbType) {

1
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/discount/dto/DiscountProductRespDTO.java
View File

@ -55,5 +55,4 @@ public class DiscountProductRespDTO {
*/ */
private LocalDateTime activityEndTime; private LocalDateTime activityEndTime;
} }

1
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
View File

@ -97,7 +97,6 @@ public class TradePriceServiceImpl implements TradePriceService {
} }
private List<ProductSpuRespDTO> checkSpuList(List<ProductSkuRespDTO> skuList) { private List<ProductSpuRespDTO> checkSpuList(List<ProductSkuRespDTO> skuList) {
// 获得商品 SPU 数组
return productSpuApi.validateSpuList(convertSet(skuList, ProductSkuRespDTO::getSpuId)); return productSpuApi.validateSpuList(convertSet(skuList, ProductSkuRespDTO::getSpuId));
} }

3
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppMemberUserController.java
View File

@ -76,5 +76,4 @@ public class AppMemberUserController {
return success(true); return success(true);
} }
} }

7
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java
View File

@ -210,6 +210,13 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest {
String mobile = randomString(); String mobile = randomString();
String code = randomString(); String code = randomString();
AuthSmsLoginReqVO reqVO = new AuthSmsLoginReqVO(mobile, code); AuthSmsLoginReqVO reqVO = new AuthSmsLoginReqVO(mobile, code);
// mock 方法（验证码）
doNothing().when(smsCodeApi).useSmsCode((argThat(smsCodeUseReqDTO -> {
assertEquals(mobile, smsCodeUseReqDTO.getMobile());
assertEquals(code, smsCodeUseReqDTO.getCode());
assertEquals(SmsSceneEnum.ADMIN_MEMBER_LOGIN.getScene(), smsCodeUseReqDTO.getScene());
return true;
})));
// mock 方法（用户信息） // mock 方法（用户信息）
AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L)); AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L));
when(userService.getUserByMobile(eq(mobile))).thenReturn(user); when(userService.getUserByMobile(eq(mobile))).thenReturn(user);

60
yudao-server/pom.xml
View File

@ -33,11 +33,11 @@
</dependency> </dependency>
<!-- 会员中心。默认注释，保证编译速度 --> <!-- 会员中心。默认注释，保证编译速度 -->
<!-- <dependency>--> <dependency>
<!-- <groupId>cn.iocoder.boot</groupId>--> <groupId>cn.iocoder.boot</groupId>
<!-- <artifactId>yudao-module-member-biz</artifactId>--> <artifactId>yudao-module-member-biz</artifactId>
<!-- <version>${revision}</version>--> <version>${revision}</version>
<!-- </dependency>--> </dependency>
<!-- 数据报表。默认注释，保证编译速度 --> <!-- 数据报表。默认注释，保证编译速度 -->
<!-- <dependency>--> <!-- <dependency>-->
@ -52,11 +52,11 @@
<!-- <version>${revision}</version>--> <!-- <version>${revision}</version>-->
<!-- </dependency>--> <!-- </dependency>-->
<!-- 支付服务。默认注释，保证编译速度 --> <!-- 支付服务。默认注释，保证编译速度 -->
<!-- <dependency>--> <dependency>
<!-- <groupId>cn.iocoder.boot</groupId>--> <groupId>cn.iocoder.boot</groupId>
<!-- <artifactId>yudao-module-pay-biz</artifactId>--> <artifactId>yudao-module-pay-biz</artifactId>
<!-- <version>${revision}</version>--> <version>${revision}</version>
<!-- </dependency>--> </dependency>
<!-- 微信公众号模块。默认注释，保证编译速度 --> <!-- 微信公众号模块。默认注释，保证编译速度 -->
<!-- <dependency>--> <!-- <dependency>-->
@ -66,26 +66,26 @@
<!-- </dependency>--> <!-- </dependency>-->
<!-- 商城相关模块。默认注释，保证编译速度--> <!-- 商城相关模块。默认注释，保证编译速度-->
<!-- <dependency>--> <dependency>
<!-- <groupId>cn.iocoder.boot</groupId>--> <groupId>cn.iocoder.boot</groupId>
<!-- <artifactId>yudao-module-promotion-biz</artifactId>--> <artifactId>yudao-module-promotion-biz</artifactId>
<!-- <version>${revision}</version>--> <version>${revision}</version>
<!-- </dependency>--> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>cn.iocoder.boot</groupId>--> <groupId>cn.iocoder.boot</groupId>
<!-- <artifactId>yudao-module-product-biz</artifactId>--> <artifactId>yudao-module-product-biz</artifactId>
<!-- <version>${revision}</version>--> <version>${revision}</version>
<!-- </dependency>--> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>cn.iocoder.boot</groupId>--> <groupId>cn.iocoder.boot</groupId>
<!-- <artifactId>yudao-module-trade-biz</artifactId>--> <artifactId>yudao-module-trade-biz</artifactId>
<!-- <version>${revision}</version>--> <version>${revision}</version>
<!-- </dependency>--> </dependency>
<!-- <dependency>--> <dependency>
<!-- <groupId>cn.iocoder.boot</groupId>--> <groupId>cn.iocoder.boot</groupId>
<!-- <artifactId>yudao-module-statistics-biz</artifactId>--> <artifactId>yudao-module-statistics-biz</artifactId>
<!-- <version>${revision}</version>--> <version>${revision}</version>
<!-- </dependency>--> </dependency>
<!-- CRM 相关模块。默认注释，保证编译速度 --> <!-- CRM 相关模块。默认注释，保证编译速度 -->
<!-- <dependency>--> <!-- <dependency>-->