Commit f7042897ff715f85dbed7bd7a7a1e40a0133d181

Authored by YunaiV
1 parent 86de4684

同步:https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1464/files

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/vo/client/SocialClientSaveReqVO.java
@@ -65,7 +65,7 @@ public class SocialClientSaveReqVO { @@ -65,7 +65,7 @@ public class SocialClientSaveReqVO {
65 @JsonIgnore 65 @JsonIgnore
66 public boolean isPublicKeyValid() { 66 public boolean isPublicKeyValid() {
67 // 如果是支付宝,必须填写 publicKey 属性 67 // 如果是支付宝,必须填写 publicKey 属性
68 - return !Objects.equals(socialType, SocialTypeEnum.ALIPAY.getType()) 68 + return !Objects.equals(socialType, SocialTypeEnum.ALIPAY_MINI_PROGRAM.getType())
69 || !StrUtil.isEmpty(publicKey); 69 || !StrUtil.isEmpty(publicKey);
70 } 70 }
71 71
yudao-server/src/main/resources/application-dev.yaml
@@ -198,6 +198,12 @@ justauth: @@ -198,6 +198,12 @@ justauth:
198 client-id: ${wx.mp.app-id} 198 client-id: ${wx.mp.app-id}
199 client-secret: ${wx.mp.secret} 199 client-secret: ${wx.mp.secret}
200 ignore-check-redirect-uri: true 200 ignore-check-redirect-uri: true
  201 + ALIPAY: # 支付宝小程序
  202 + client-id: xx
  203 + client-secret: xx
  204 + alipay-public-key: xx
  205 + ignore-check-redirect-uri: true
  206 + ignore-check-state: true
201 cache: 207 cache:
202 type: REDIS 208 type: REDIS
203 prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE:: 209 prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
yudao-server/src/main/resources/application-local.yaml
@@ -262,6 +262,12 @@ justauth: @@ -262,6 +262,12 @@ justauth:
262 client-id: ${wx.mp.app-id} 262 client-id: ${wx.mp.app-id}
263 client-secret: ${wx.mp.secret} 263 client-secret: ${wx.mp.secret}
264 ignore-check-redirect-uri: true 264 ignore-check-redirect-uri: true
  265 + ALIPAY: # 支付宝小程序
  266 + client-id: xx
  267 + client-secret: xx
  268 + alipay-public-key: xx
  269 + ignore-check-redirect-uri: true
  270 + ignore-check-state: true
265 cache: 271 cache:
266 type: REDIS 272 type: REDIS
267 prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE:: 273 prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::