gitee/ruoyi-vue-pro
1
0
Fork 0
mirror of https://gitee.com/zhijiantianya/ruoyi-vue-pro.git synced 2025-12-26 00:26:20 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	yudao-server/src/main/resources/application-dev.yaml
#	yudao-server/src/main/resources/application-local.yaml
This commit is contained in:
YunaiV 2025-11-29 09:59:28 +08:00
commit ffd822c703
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java
View File

@ -68,7 +68,7 @@ public class SocialClientSaveReqVO {
@JsonIgnore
public boolean isPublicKeyValid() {
// 如果是支付宝，必须填写 publicKey 属性
return !Objects.equals(socialType, SocialTypeEnum.ALIPAY.getType())
return !Objects.equals(socialType, SocialTypeEnum.ALIPAY_MINI_PROGRAM.getType())
|| !StrUtil.isEmpty(publicKey);
}

1
yudao-server/src/main/resources/application-dev.yaml
View File

@ -202,7 +202,6 @@ justauth:
client-secret: xx
alipay-public-key: xx
ignore-check-redirect-uri: true
redirect-uri: http://yunai.natapp1.cc
ignore-check-state: true
cache:
type: REDIS

1
yudao-server/src/main/resources/application-local.yaml
View File

@ -267,7 +267,6 @@ justauth:
client-secret: xx
alipay-public-key: xx
ignore-check-redirect-uri: true
redirect-uri: http://yunai.natapp1.cc
ignore-check-state: true
cache:
type: REDIS